Rename react-server-dom-webpack entry points to /client and /server (#25504)
Sebastian Markbåge committed
Oct 18, 2022 at 10:15 UTC
3bb71dfd4bfc68920e758cd5fcf9fbfa44b99a21
21 files changed
+81
-55
fixtures/flight-browser/index.html
+1
-1
@@ -19,7 +19,7 @@
19
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
21
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
22
- <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-writer.browser.development.server.js"></script>
22
+ <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
23
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack.development.js"></script>
24
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
25
<script type="text/babel">
fixtures/flight/server/handler.server.js
+1
-1
@@ -1,6 +1,6 @@
1
'use strict';
2
3
-const {renderToPipeableStream} = require('react-server-dom-webpack/writer');
3
+const {renderToPipeableStream} = require('react-server-dom-webpack/server');
4
const {readFile} = require('fs');
5
const {resolve} = require('path');
6
const React = require('react');
fixtures/flight/src/index.js
+1
-1
@@ -1,7 +1,7 @@
1
import * as React from 'react';
2
import {Suspense} from 'react';
3
import ReactDOM from 'react-dom/client';
4
-import ReactServerDOMReader from 'react-server-dom-webpack';
4
+import ReactServerDOMReader from 'react-server-dom-webpack/client';
5
6
let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
7
packages/react-server-dom-webpack/client.js
new
+10
@@ -0,0 +1,10 @@
1
+/**
2
+ * Copyright (c) Facebook, Inc. and its affiliates.
3
+ *
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
6
+ *
7
+ * @flow
8
+ */
9
+
10
+export * from './src/ReactFlightDOMClient';
packages/react-server-dom-webpack/index.js
+1
-1
@@ -7,4 +7,4 @@
7
* @flow
8
*/
9
10
-export * from './src/ReactFlightDOMClient';
10
+throw new Error('Use react-server-dom-webpack/client instead.');
packages/react-server-dom-webpack/npm/client.js
new
+7
@@ -0,0 +1,7 @@
1
+'use strict';
2
+
3
+if (process.env.NODE_ENV === 'production') {
4
+ module.exports = require('./cjs/react-server-dom-webpack-client.production.min.js');
5
+} else {
6
+ module.exports = require('./cjs/react-server-dom-webpack-client.development.js');
7
+}
packages/react-server-dom-webpack/npm/index.js
+10
-5
@@ -1,7 +1,12 @@
1
+/**
2
+ * Copyright (c) Facebook, Inc. and its affiliates.
3
+ *
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
6
+ *
7
+ * @flow
8
+ */
9
+
10
'use strict';
11
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-server-dom-webpack.production.min.js');
5
-} else {
6
- module.exports = require('./cjs/react-server-dom-webpack.development.js');
7
-}
12
+throw new Error('Use react-server-dom-webpack/client instead.');
packages/react-server-dom-webpack/npm/server.browser.js
new
+7
@@ -0,0 +1,7 @@
1
+'use strict';
2
+
3
+if (process.env.NODE_ENV === 'production') {
4
+ module.exports = require('./cjs/react-server-dom-webpack-server.browser.production.min.js');
5
+} else {
6
+ module.exports = require('./cjs/react-server-dom-webpack-server.browser.development.js');
7
+}
packages/react-server-dom-webpack/npm/server.js
renamed
packages/react-server-dom-webpack/npm/server.node.js
new
+7
@@ -0,0 +1,7 @@
1
+'use strict';
2
+
3
+if (process.env.NODE_ENV === 'production') {
4
+ module.exports = require('./cjs/react-server-dom-webpack-server.node.production.min.js');
5
+} else {
6
+ module.exports = require('./cjs/react-server-dom-webpack-server.node.development.js');
7
+}
packages/react-server-dom-webpack/npm/writer.browser.server.js
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-server-dom-webpack-writer.browser.production.min.server.js');
5
-} else {
6
- module.exports = require('./cjs/react-server-dom-webpack-writer.browser.development.server.js');
7
-}
packages/react-server-dom-webpack/npm/writer.node.server.js
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-server-dom-webpack-writer.node.production.min.server.js');
5
-} else {
6
- module.exports = require('./cjs/react-server-dom-webpack-writer.node.development.server.js');
7
-}
packages/react-server-dom-webpack/package.json
+11
-9
@@ -13,9 +13,10 @@
13
"README.md",
14
"index.js",
15
"plugin.js",
16
- "writer.js",
17
- "writer.browser.server.js",
18
- "writer.node.server.js",
16
+ "client.js",
17
+ "server.js",
18
+ "server.browser.js",
19
+ "server.node.js",
20
"node-register.js",
21
"cjs/",
22
"umd/",
@@ -24,15 +25,16 @@
25
"exports": {
26
".": "./index.js",
27
"./plugin": "./plugin.js",
27
- "./writer": {
28
+ "./client": "./client.js",
29
+ "./server": {
30
"react-server": {
29
- "node": "./writer.node.server.js",
30
- "browser": "./writer.browser.server.js"
31
+ "node": "./server.node.js",
32
+ "browser": "./server.browser.js"
33
},
32
- "default": "./writer.js"
34
+ "default": "./server.js"
35
},
34
- "./writer.node.server": "./writer.node.server.js",
35
- "./writer.browser.server": "./writer.browser.server.js",
36
+ "./server.node": "./server.node.js",
37
+ "./server.browser": "./server.browser.js",
38
"./node-loader": "./esm/react-server-dom-webpack-node-loader.js",
39
"./node-register": "./node-register.js",
40
"./src/*": "./src/*",
packages/react-server-dom-webpack/server.browser.js
renamed
packages/react-server-dom-webpack/server.js
renamed
+1
-1
@@ -8,6 +8,6 @@
8
*/
9
10
throw new Error(
11
- 'The React Server Writer cannot be used outside a react-server environment. ' +
11
+ 'The React Server cannot be used outside a react-server environment. ' +
12
'You must configure Node.js using the `--conditions react-server` flag.',
13
);
packages/react-server-dom-webpack/server.node.js
renamed
packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+1
-1
@@ -39,7 +39,7 @@ class ClientReferenceDependency extends ModuleDependency {
39
// We use the Flight client implementation because you can't get to these
40
// without the client runtime so it's the first time in the loading sequence
41
// you might want them.
42
-const clientImportName = 'react-server-dom-webpack';
42
+const clientImportName = 'react-server-dom-webpack/client';
43
const clientFileName = require.resolve('../');
44
45
type ClientReferenceSearchPath = {
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+2
-2
@@ -44,8 +44,8 @@ describe('ReactFlightDOM', () => {
44
use = React.experimental_use;
45
Suspense = React.Suspense;
46
ReactDOMClient = require('react-dom/client');
47
- ReactServerDOMWriter = require('react-server-dom-webpack/writer.node.server');
48
- ReactServerDOMReader = require('react-server-dom-webpack');
47
+ ReactServerDOMWriter = require('react-server-dom-webpack/server.node');
48
+ ReactServerDOMReader = require('react-server-dom-webpack/client');
49
50
ErrorBoundary = class extends React.Component {
51
state = {hasError: false, error: null};
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
+2
-2
@@ -37,8 +37,8 @@ describe('ReactFlightDOMBrowser', () => {
37
React = require('react');
38
ReactDOMClient = require('react-dom/client');
39
ReactDOMServer = require('react-dom/server.browser');
40
- ReactServerDOMWriter = require('react-server-dom-webpack/writer.browser.server');
41
- ReactServerDOMReader = require('react-server-dom-webpack');
40
+ ReactServerDOMWriter = require('react-server-dom-webpack/server.browser');
41
+ ReactServerDOMReader = require('react-server-dom-webpack/client');
42
Suspense = React.Suspense;
43
use = React.experimental_use;
44
});
scripts/rollup/bundles.js
+8
-8
@@ -377,12 +377,12 @@ const bundles = [
377
externals: ['react'],
378
},
379
380
- /******* React Server DOM Webpack Writer *******/
380
+ /******* React Server DOM Webpack Server *******/
381
{
382
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
383
moduleType: RENDERER,
384
- entry: 'react-server-dom-webpack/writer.browser.server',
385
- global: 'ReactServerDOMWriter',
384
+ entry: 'react-server-dom-webpack/server.browser',
385
+ global: 'ReactServerDOMServer',
386
minifyWithProdErrorCodes: false,
387
wrapWithModuleBoundaries: false,
388
externals: ['react', 'react-dom'],
@@ -390,19 +390,19 @@ const bundles = [
390
{
391
bundleTypes: [NODE_DEV, NODE_PROD],
392
moduleType: RENDERER,
393
- entry: 'react-server-dom-webpack/writer.node.server',
394
- global: 'ReactServerDOMWriter',
393
+ entry: 'react-server-dom-webpack/server.node',
394
+ global: 'ReactServerDOMServer',
395
minifyWithProdErrorCodes: false,
396
wrapWithModuleBoundaries: false,
397
externals: ['react', 'util', 'react-dom'],
398
},
399
400
- /******* React Server DOM Webpack Reader *******/
400
+ /******* React Server DOM Webpack Client *******/
401
{
402
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
403
moduleType: RENDERER,
404
- entry: 'react-server-dom-webpack',
405
- global: 'ReactServerDOMReader',
404
+ entry: 'react-server-dom-webpack/client',
405
+ global: 'ReactServerDOMClient',
406
minifyWithProdErrorCodes: false,
407
wrapWithModuleBoundaries: false,
408
externals: ['react'],
scripts/shared/inlinedHostConfigs.js
+11
-9
@@ -16,8 +16,8 @@ module.exports = [
16
'react-dom/static.node',
17
'react-dom/server-rendering-stub',
18
'react-dom/src/server/ReactDOMServerExternalRuntime.js',
19
- 'react-server-dom-webpack/writer.node.server',
20
- 'react-server-dom-webpack',
19
+ 'react-server-dom-webpack/server.node',
20
+ 'react-server-dom-webpack/client',
21
],
22
paths: [
23
'react-dom',
@@ -30,9 +30,10 @@ module.exports = [
30
'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/server.node
31
'react-dom/src/server/ReactDOMFizzStaticNode.js',
32
'react-server-dom-webpack',
33
- 'react-server-dom-webpack/writer',
34
- 'react-server-dom-webpack/writer.node.server',
35
- 'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/writer.node.server
33
+ 'react-server-dom-webpack/client',
34
+ 'react-server-dom-webpack/server',
35
+ 'react-server-dom-webpack/server.node',
36
+ 'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
37
'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
38
'react-devtools',
39
'react-devtools-core',
@@ -53,8 +54,8 @@ module.exports = [
54
'react-dom/static.browser',
55
'react-dom/server-rendering-stub',
56
'react-dom/src/server/ReactDOMServerExternalRuntime.js',
56
- 'react-server-dom-webpack/writer.browser.server',
57
- 'react-server-dom-webpack',
57
+ 'react-server-dom-webpack/server.browser',
58
+ 'react-server-dom-webpack/client',
59
],
60
paths: [
61
'react-dom',
@@ -66,8 +67,9 @@ module.exports = [
67
'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/server.browser
68
'react-dom/src/server/ReactDOMFizzStaticBrowser.js',
69
'react-server-dom-webpack',
69
- 'react-server-dom-webpack/writer.browser.server',
70
- 'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/writer.browser.server
70
+ 'react-server-dom-webpack/client',
71
+ 'react-server-dom-webpack/server.browser',
72
+ 'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser
73
'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
74
'react-devtools',
75
'react-devtools-core',