Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Flight] Make PG and FS server-only #20424

Merged
merged 2 commits into from
Dec 10, 2020
Merged

[Flight] Make PG and FS server-only #20424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fcbd1b
Make react-fs server-only
gaearon Dec 10, 2020
5be2b32
Make react-pg server-only
gaearon Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 packages/react-fs/index.browser.js → packages/react-fs/index.browser.server.js
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions packages/react-fs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* @flow
*/

'use strict';

export * from './index.node';
throw new Error(
'React FS cannot be used outside a react-server environment. ' +
'You must configure Node.js using the `--conditions react-server` flag.',
);
0 packages/react-fs/index.node.js → packages/react-fs/index.node.server.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/react-fs/npm/index.browser.js → ...ages/react-fs/npm/index.browser.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-fs.browser.production.min.js');
module.exports = require('./cjs/react-fs.browser.production.min.server.js');
} else {
module.exports = require('./cjs/react-fs.browser.development.js');
module.exports = require('./cjs/react-fs.browser.development.server.js');
}
5 changes: 4 additions & 1 deletion packages/react-fs/npm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
'use strict';

module.exports = require('./index.node');
throw new Error(
'React FS cannot be used outside a react-server environment. ' +
'You must configure Node.js using the `--conditions react-server` flag.'
);
7 changes: 0 additions & 7 deletions packages/react-fs/npm/index.node.js
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions packages/react-fs/npm/index.node.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-fs.node.production.min.server.js');
} else {
module.exports = require('./cjs/react-fs.node.development.server.js');
}
19 changes: 14 additions & 5 deletions packages/react-fs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,23 @@
"README.md",
"build-info.json",
"index.js",
"index.node.js",
"index.browser.js",
"index.node.server.js",
"index.browser.server.js",
"cjs/"
],
"exports": {
".": {
"react-server": {
"node": "./index.node.server.js",
"browser": "./index.browser.server.js"
},
"default": "./index.js"
},
"./index.node.server": "./index.node.server.js",
"./index.browser.server": "./index.browser.server.js",
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "^17.0.0"
},
"browser": {
"./index.js": "./index.browser.js"
}
}
0 packages/react-pg/index.browser.js → packages/react-pg/index.browser.server.js
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions packages/react-pg/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* @flow
*/

'use strict';

export * from './index.node';
throw new Error(
'React PG cannot be used outside a react-server environment. ' +
'You must configure Node.js using the `--conditions react-server` flag.',
);
0 packages/react-pg/index.node.js → packages/react-pg/index.node.server.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/react-pg/npm/index.browser.js → ...ages/react-pg/npm/index.browser.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-pg.browser.production.min.js');
module.exports = require('./cjs/react-pg.browser.production.min.server.js');
} else {
module.exports = require('./cjs/react-pg.browser.development.js');
module.exports = require('./cjs/react-pg.browser.development.server.js');
}
5 changes: 4 additions & 1 deletion packages/react-pg/npm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
'use strict';

module.exports = require('./index.node');
throw new Error(
'React PG cannot be used outside a react-server environment. ' +
'You must configure Node.js using the `--conditions react-server` flag.'
);
7 changes: 0 additions & 7 deletions packages/react-pg/npm/index.node.js
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions packages/react-pg/npm/index.node.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-pg.node.production.min.server.js');
} else {
module.exports = require('./cjs/react-pg.node.development.server.js');
}
19 changes: 14 additions & 5 deletions packages/react-pg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,24 @@
"README.md",
"build-info.json",
"index.js",
"index.node.js",
"index.browser.js",
"index.node.server.js",
"index.browser.server.js",
"cjs/"
],
"exports": {
".": {
"react-server": {
"node": "./index.node.server.js",
"browser": "./index.browser.server.js"
},
"default": "./index.js"
},
"./index.node.server": "./index.node.server.js",
"./index.browser.server": "./index.browser.server.js",
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "^17.0.0",
"pg": "*"
},
"browser": {
"./index.js": "./index.browser.js"
}
}
3 changes: 0 additions & 3 deletions packages/react-server-dom-webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
"./node-register": "./node-register.js",
"./package.json": "./package.json"
},
"browser": {
"./writer.js": "./writer.browser.server.js"
},
"main": "index.js",
"repository": {
"type" : "git",
Expand Down
8 changes: 4 additions & 4 deletions scripts/rollup/bundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: ISOMORPHIC,
entry: 'react-fs/index.browser',
entry: 'react-fs/index.browser.server',
global: 'ReactFilesystem',
externals: [],
},
Expand All @@ -166,7 +166,7 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: ISOMORPHIC,
entry: 'react-fs/index.node',
entry: 'react-fs/index.node.server',
global: 'ReactFilesystem',
externals: ['react', 'fs/promises', 'path'],
},
Expand All @@ -175,7 +175,7 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: ISOMORPHIC,
entry: 'react-pg/index.browser',
entry: 'react-pg/index.browser.server',
global: 'ReactPostgres',
externals: [],
},
Expand All @@ -184,7 +184,7 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: ISOMORPHIC,
entry: 'react-pg/index.node',
entry: 'react-pg/index.node.server',
global: 'ReactPostgres',
externals: ['react', 'pg'],
},
Expand Down