Skip to content

Commit b15d6e9

Browse files
gaearongaearon
authored
[Flight] Make PG and FS server-only (#20424)
* Make react-fs server-only * Make react-pg server-only
1 parent 40ff239 commit b15d6e9

18 files changed

+66
-43
lines changed

‎packages/react-fs/index.browser.js ‎packages/react-fs/index.browser.server.js

File renamed without changes.

‎packages/react-fs/index.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @flow
88
*/
99

10-
'use strict';
11-
12-
export * from './index.node';
10+
throw new Error(
11+
'React FS cannot be used outside a react-server environment. ' +
12+
'You must configure Node.js using the `--conditions react-server` flag.',
13+
);

‎packages/react-fs/index.node.js ‎packages/react-fs/index.node.server.js

File renamed without changes.

‎packages/react-fs/npm/index.browser.js ‎packages/react-fs/npm/index.browser.server.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
if (process.env.NODE_ENV === 'production') {
4-
module.exports = require('./cjs/react-fs.browser.production.min.js');
4+
module.exports = require('./cjs/react-fs.browser.production.min.server.js');
55
} else {
6-
module.exports = require('./cjs/react-fs.browser.development.js');
6+
module.exports = require('./cjs/react-fs.browser.development.server.js');
77
}

‎packages/react-fs/npm/index.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
'use strict';
22

3-
module.exports = require('./index.node');
3+
throw new Error(
4+
'React FS cannot be used outside a react-server environment. ' +
5+
'You must configure Node.js using the `--conditions react-server` flag.'
6+
);

‎packages/react-fs/npm/index.node.js

-7
This file was deleted.

‎packages/react-fs/npm/index.node.server.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
if (process.env.NODE_ENV === 'production') {
4+
module.exports = require('./cjs/react-fs.node.production.min.server.js');
5+
} else {
6+
module.exports = require('./cjs/react-fs.node.development.server.js');
7+
}

‎packages/react-fs/package.json

+14-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,23 @@
1313
"README.md",
1414
"build-info.json",
1515
"index.js",
16-
"index.node.js",
17-
"index.browser.js",
16+
"index.node.server.js",
17+
"index.browser.server.js",
1818
"cjs/"
1919
],
20+
"exports": {
21+
".": {
22+
"react-server": {
23+
"node": "./index.node.server.js",
24+
"browser": "./index.browser.server.js"
25+
},
26+
"default": "./index.js"
27+
},
28+
"./index.node.server": "./index.node.server.js",
29+
"./index.browser.server": "./index.browser.server.js",
30+
"./package.json": "./package.json"
31+
},
2032
"peerDependencies": {
2133
"react": "^17.0.0"
22-
},
23-
"browser": {
24-
"./index.js": "./index.browser.js"
2534
}
2635
}

‎packages/react-pg/index.browser.js ‎packages/react-pg/index.browser.server.js

File renamed without changes.

‎packages/react-pg/index.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @flow
88
*/
99

10-
'use strict';
11-
12-
export * from './index.node';
10+
throw new Error(
11+
'React PG cannot be used outside a react-server environment. ' +
12+
'You must configure Node.js using the `--conditions react-server` flag.',
13+
);

‎packages/react-pg/index.node.js ‎packages/react-pg/index.node.server.js

File renamed without changes.

‎packages/react-pg/npm/index.browser.js ‎packages/react-pg/npm/index.browser.server.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
if (process.env.NODE_ENV === 'production') {
4-
module.exports = require('./cjs/react-pg.browser.production.min.js');
4+
module.exports = require('./cjs/react-pg.browser.production.min.server.js');
55
} else {
6-
module.exports = require('./cjs/react-pg.browser.development.js');
6+
module.exports = require('./cjs/react-pg.browser.development.server.js');
77
}

‎packages/react-pg/npm/index.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
'use strict';
22

3-
module.exports = require('./index.node');
3+
throw new Error(
4+
'React PG cannot be used outside a react-server environment. ' +
5+
'You must configure Node.js using the `--conditions react-server` flag.'
6+
);

‎packages/react-pg/npm/index.node.js

-7
This file was deleted.

‎packages/react-pg/npm/index.node.server.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
if (process.env.NODE_ENV === 'production') {
4+
module.exports = require('./cjs/react-pg.node.production.min.server.js');
5+
} else {
6+
module.exports = require('./cjs/react-pg.node.development.server.js');
7+
}

‎packages/react-pg/package.json

+14-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,24 @@
1313
"README.md",
1414
"build-info.json",
1515
"index.js",
16-
"index.node.js",
17-
"index.browser.js",
16+
"index.node.server.js",
17+
"index.browser.server.js",
1818
"cjs/"
1919
],
20+
"exports": {
21+
".": {
22+
"react-server": {
23+
"node": "./index.node.server.js",
24+
"browser": "./index.browser.server.js"
25+
},
26+
"default": "./index.js"
27+
},
28+
"./index.node.server": "./index.node.server.js",
29+
"./index.browser.server": "./index.browser.server.js",
30+
"./package.json": "./package.json"
31+
},
2032
"peerDependencies": {
2133
"react": "^17.0.0",
2234
"pg": "*"
23-
},
24-
"browser": {
25-
"./index.js": "./index.browser.js"
2635
}
2736
}

‎packages/react-server-dom-webpack/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
"./node-register": "./node-register.js",
3939
"./package.json": "./package.json"
4040
},
41-
"browser": {
42-
"./writer.js": "./writer.browser.server.js"
43-
},
4441
"main": "index.js",
4542
"repository": {
4643
"type" : "git",

‎scripts/rollup/bundles.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const bundles = [
157157
{
158158
bundleTypes: [NODE_DEV, NODE_PROD],
159159
moduleType: ISOMORPHIC,
160-
entry: 'react-fs/index.browser',
160+
entry: 'react-fs/index.browser.server',
161161
global: 'ReactFilesystem',
162162
externals: [],
163163
},
@@ -166,7 +166,7 @@ const bundles = [
166166
{
167167
bundleTypes: [NODE_DEV, NODE_PROD],
168168
moduleType: ISOMORPHIC,
169-
entry: 'react-fs/index.node',
169+
entry: 'react-fs/index.node.server',
170170
global: 'ReactFilesystem',
171171
externals: ['react', 'fs/promises', 'path'],
172172
},
@@ -175,7 +175,7 @@ const bundles = [
175175
{
176176
bundleTypes: [NODE_DEV, NODE_PROD],
177177
moduleType: ISOMORPHIC,
178-
entry: 'react-pg/index.browser',
178+
entry: 'react-pg/index.browser.server',
179179
global: 'ReactPostgres',
180180
externals: [],
181181
},
@@ -184,7 +184,7 @@ const bundles = [
184184
{
185185
bundleTypes: [NODE_DEV, NODE_PROD],
186186
moduleType: ISOMORPHIC,
187-
entry: 'react-pg/index.node',
187+
entry: 'react-pg/index.node.server',
188188
global: 'ReactPostgres',
189189
externals: ['react', 'pg'],
190190
},

0 commit comments

Comments
 (0)