@samitouri / QOS-React-2 / commits / 5fd9db732d

[Flight] Rename react-transport-... packages to react-server-... (#20403)

* Move files * Update paths * Rename import variables * Rename /server to /writer This is mainly because "React Server Server" is weird so we need another dimension. * Use "react-server" convention to enforce that writer is only loaded in a server

Sebastian Markbåge committed Dec 8, 2020 at 08:08 UTC 5fd9db732dff1b99c096bffef9a565b594c788de
76 files changed +154 -147
.eslintrc.js
+2 -2
@@ -185,14 +185,14 @@ module.exports = {
185 {
186 files: [
187 'packages/react-native-renderer/**/*.js',
188 - 'packages/react-transport-native-relay/**/*.js',
188 + 'packages/react-server-native-relay/**/*.js',
189 ],
190 globals: {
191 nativeFabricUIManager: true,
192 },
193 },
194 {
195 - files: ['packages/react-transport-dom-webpack/**/*.js'],
195 + files: ['packages/react-server-dom-webpack/**/*.js'],
196 globals: {
197 __webpack_chunk_load__: true,
198 __webpack_require__: true,
fixtures/flight-browser/index.html
+5 -5
@@ -19,8 +19,8 @@
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-transport-dom-webpack/umd/react-transport-dom-webpack-server.browser.development.js"></script>
23 - <script src="../../build/node_modules/react-transport-dom-webpack/umd/react-transport-dom-webpack.development.js"></script>
22 + <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-writer.browser.server.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">
26 let Suspense = React.Suspense;
@@ -60,7 +60,7 @@
60 content: <HTML />,
61 };
62
63 - let stream = ReactTransportDOMServer.renderToReadableStream(model);
63 + let stream = ReactServerDOMWriter.renderToReadableStream(model);
64 let response = new Response(stream, {
65 headers: {'Content-Type': 'text/html'},
66 });
@@ -70,13 +70,13 @@
70 let blob = await responseToDisplay.blob();
71 let url = URL.createObjectURL(blob);
72
73 - let data = ReactTransportDOMClient.createFromFetch(
73 + let data = ReactServerDOMReader.createFromFetch(
74 fetch(url)
75 );
76 // The client also supports XHR streaming.
77 // var xhr = new XMLHttpRequest();
78 // xhr.open('GET', url);
79 - // let data = ReactTransportDOMClient.createFromXHR(xhr);
79 + // let data = ReactServerDOMReader.createFromXHR(xhr);
80 // xhr.send();
81
82 renderResult(data);
fixtures/flight/config/webpack.config.js
+1 -1
@@ -1,7 +1,7 @@
1 'use strict';
2
3 // Fork Start
4 -const ReactFlightWebpackPlugin = require('react-transport-dom-webpack/plugin');
4 +const ReactFlightWebpackPlugin = require('react-server-dom-webpack/plugin');
5 // Fork End
6
7 const fs = require('fs');
fixtures/flight/loader/index.js
+1 -1
@@ -2,7 +2,7 @@ import {
2 resolve,
3 getSource,
4 transformSource as reactTransformSource,
5 -} from 'react-transport-dom-webpack/node-loader';
5 +} from 'react-server-dom-webpack/node-loader';
6
7 export {resolve, getSource};
8
fixtures/flight/server/cli.server.js
+1 -1
@@ -1,6 +1,6 @@
1 'use strict';
2
3 -const register = require('react-transport-dom-webpack/node-register');
3 +const register = require('react-server-dom-webpack/node-register');
4 register();
5
6 const babelRegister = require('@babel/register');
fixtures/flight/server/handler.server.js
+1 -1
@@ -1,6 +1,6 @@
1 'use strict';
2
3 -const {pipeToNodeWritable} = require('react-transport-dom-webpack/server');
3 +const {pipeToNodeWritable} = require('react-server-dom-webpack/writer');
4 const {readFile} = require('fs');
5 const {resolve} = require('path');
6 const React = require('react');
fixtures/flight/src/index.js
+2 -4
@@ -1,11 +1,9 @@
1 import * as React from 'react';
2 import {Suspense} from 'react';
3 import ReactDOM from 'react-dom';
4 -import ReactTransportDOMClient from 'react-transport-dom-webpack';
4 +import ReactServerDOMReader from 'react-server-dom-webpack';
5
6 -let data = ReactTransportDOMClient.createFromFetch(
7 - fetch('http://localhost:3001')
8 -);
6 +let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
7
8 function Content() {
9 return data.readRoot();
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js
+1 -1
@@ -9,4 +9,4 @@
9
10 export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js
+1 -1
@@ -7,5 +7,5 @@
7 * @flow
8 */
9
10 -export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
10 +export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
11 export * from '../ReactFlightClientHostConfigNoStream';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js
+1 -1
@@ -9,4 +9,4 @@
9
10 export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js
+1 -1
@@ -7,5 +7,5 @@
7 * @flow
8 */
9
10 -export * from 'react-transport-native-relay/src/ReactFlightNativeRelayClientHostConfig';
10 +export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
11 export * from '../ReactFlightClientHostConfigNoStream';
packages/react-server-dom-relay/index.js renamed
packages/react-server-dom-relay/package.json renamed
+2 -2
@@ -1,11 +1,11 @@
1 {
2 - "name": "react-transport-dom-relay",
2 + "name": "react-server-dom-relay",
3 "version": "0.1.0",
4 "private": true,
5 "repository": {
6 "type" : "git",
7 "url" : "https://github.com/facebook/react.git",
8 - "directory": "packages/react-transport-dom-relay"
8 + "directory": "packages/react-server-dom-relay"
9 },
10 "dependencies": {
11 "object-assign": "^4.1.1",
packages/react-server-dom-relay/server.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayClient.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayProtocol.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js renamed
packages/react-server-dom-relay/src/__mocks__/JSResourceReference.js renamed
packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js renamed
packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js renamed
packages/react-server-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js renamed
+2 -2
@@ -21,8 +21,8 @@ describe('ReactFlightDOMRelay', () => {
21 act = require('react-dom/test-utils').unstable_concurrentAct;
22 React = require('react');
23 ReactDOM = require('react-dom');
24 - ReactDOMFlightRelayServer = require('react-transport-dom-relay/server');
25 - ReactDOMFlightRelayClient = require('react-transport-dom-relay');
24 + ReactDOMFlightRelayServer = require('react-server-dom-relay/server');
25 + ReactDOMFlightRelayClient = require('react-server-dom-relay');
26 JSResourceReference = require('JSResourceReference');
27 });
28
packages/react-server-dom-webpack/README.md renamed
+1 -1
@@ -1,4 +1,4 @@
1 -# react-transport-dom-webpack
1 +# react-server-dom-webpack
2
3 Experimental React Flight bindings for DOM using Webpack.
4
packages/react-server-dom-webpack/esm/package.json renamed
packages/react-server-dom-webpack/esm/react-server-dom-webpack-node-loader.js renamed
packages/react-server-dom-webpack/index.js renamed
packages/react-server-dom-webpack/node-register.js renamed
packages/react-server-dom-webpack/npm/esm/package.json renamed
packages/react-server-dom-webpack/npm/index.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.production.min.js');
5 +} else {
6 + module.exports = require('./cjs/react-server-dom-webpack.development.js');
7 +}
packages/react-server-dom-webpack/npm/node-register.js new
+3
@@ -0,0 +1,3 @@
1 +'use strict';
2 +
3 +module.exports = require('./cjs/react-server-dom-webpack-node-register.js');
packages/react-server-dom-webpack/npm/plugin.js new
+3
@@ -0,0 +1,3 @@
1 +'use strict';
2 +
3 +module.exports = require('./cjs/react-server-dom-webpack-plugin.js');
packages/react-server-dom-webpack/npm/writer.browser.server.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-writer.browser.server.production.min.js');
5 +} else {
6 + module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.development.js');
7 +}
packages/react-server-dom-webpack/npm/writer.js new
+6
@@ -0,0 +1,6 @@
1 +'use strict';
2 +
3 +throw new Error(
4 + 'The React Server Writer cannot be used outside a react-server environment. ' +
5 + 'You must configure Node.js using the `--conditions react-server` flag.'
6 +);
packages/react-server-dom-webpack/npm/writer.node.server.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-writer.node.server.production.min.js');
5 +} else {
6 + module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.development.js');
7 +}
packages/react-server-dom-webpack/package.json renamed
+17 -11
@@ -1,6 +1,6 @@
1 {
2 - "name": "react-transport-dom-webpack",
3 - "description": "React Transport bindings for DOM using Webpack. This is intended to be integrated into meta-frameworks. It is not intended to be imported directly.",
2 + "name": "react-server-dom-webpack",
3 + "description": "React Server Components bindings for DOM using Webpack. This is intended to be integrated into meta-frameworks. It is not intended to be imported directly.",
4 "version": "0.1.0",
5 "private": true,
6 "keywords": [
@@ -14,9 +14,9 @@
14 "README.md",
15 "index.js",
16 "plugin.js",
17 - "server.js",
18 - "server.browser.js",
19 - "server.node.js",
17 + "writer.js",
18 + "writer.browser.server.js",
19 + "writer.node.server.js",
20 "node-register.js",
21 "cjs/",
22 "umd/",
@@ -25,21 +25,27 @@
25 "exports": {
26 ".": "./index.js",
27 "./plugin": "./plugin.js",
28 - "./server": "./server.js",
29 - "./server.browser": "./server.browser.js",
30 - "./server.node": "./server.node.js",
31 - "./node-loader": "./esm/react-transport-dom-webpack-node-loader.js",
28 + "./writer": {
29 + "react-server": {
30 + "node": "./writer.node.server.js",
31 + "browser": "./writer.browser.server.js"
32 + },
33 + "default": "./writer.js"
34 + },
35 + "./writer.node.server": "./writer.node.server.js",
36 + "./writer.browser.server": "./writer.browser.server.js",
37 + "./node-loader": "./esm/react-server-dom-webpack-node-loader.js",
38 "./node-register": "./node-register.js",
39 "./package.json": "./package.json"
40 },
41 "browser": {
36 - "./server.js": "./server.browser.js"
42 + "./writer.js": "./writer.browser.server.js"
43 },
44 "main": "index.js",
45 "repository": {
46 "type" : "git",
47 "url" : "https://github.com/facebook/react.git",
42 - "directory": "packages/react-transport-dom-webpack"
48 + "directory": "packages/react-server-dom-webpack"
49 },
50 "engines": {
51 "node": ">=0.10.0"
packages/react-server-dom-webpack/plugin.js renamed
packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js renamed
packages/react-server-dom-webpack/src/ReactFlightDOMClient.js renamed
packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js renamed
packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js renamed
packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js renamed
packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js renamed
packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js renamed
packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js renamed
+1 -1
@@ -50,7 +50,7 @@ type Options = {
50 manifestFilename?: string,
51 };
52
53 -const PLUGIN_NAME = 'React Transport Plugin';
53 +const PLUGIN_NAME = 'React Server Plugin';
54
55 export default class ReactFlightWebpackPlugin {
56 clientReferences: $ReadOnlyArray<ClientReferencePath>;
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js renamed
+18 -18
@@ -28,8 +28,8 @@ let act;
28 let Stream;
29 let React;
30 let ReactDOM;
31 -let ReactTransportDOMServer;
32 -let ReactTransportDOMClient;
31 +let ReactServerDOMWriter;
32 +let ReactServerDOMReader;
33
34 describe('ReactFlightDOM', () => {
35 beforeEach(() => {
@@ -40,8 +40,8 @@ describe('ReactFlightDOM', () => {
40 Stream = require('stream');
41 React = require('react');
42 ReactDOM = require('react-dom');
43 - ReactTransportDOMServer = require('react-transport-dom-webpack/server');
44 - ReactTransportDOMClient = require('react-transport-dom-webpack');
43 + ReactServerDOMWriter = require('react-server-dom-webpack/writer.node.server');
44 + ReactServerDOMReader = require('react-server-dom-webpack');
45 });
46
47 function getTestStream() {
@@ -113,8 +113,8 @@ describe('ReactFlightDOM', () => {
113 }
114
115 const {writable, readable} = getTestStream();
116 - ReactTransportDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
117 - const response = ReactTransportDOMClient.createFromReadableStream(readable);
116 + ReactServerDOMWriter.pipeToNodeWritable(<App />, writable, webpackMap);
117 + const response = ReactServerDOMReader.createFromReadableStream(readable);
118 await waitForSuspense(() => {
119 const model = response.readRoot();
120 expect(model).toEqual({
@@ -163,12 +163,12 @@ describe('ReactFlightDOM', () => {
163 }
164
165 const {writable, readable} = getTestStream();
166 - ReactTransportDOMServer.pipeToNodeWritable(
166 + ReactServerDOMWriter.pipeToNodeWritable(
167 <RootModel />,
168 writable,
169 webpackMap,
170 );
171 - const response = ReactTransportDOMClient.createFromReadableStream(readable);
171 + const response = ReactServerDOMReader.createFromReadableStream(readable);
172
173 const container = document.createElement('div');
174 const root = ReactDOM.unstable_createRoot(container);
@@ -202,12 +202,12 @@ describe('ReactFlightDOM', () => {
202 }
203
204 const {writable, readable} = getTestStream();
205 - ReactTransportDOMServer.pipeToNodeWritable(
205 + ReactServerDOMWriter.pipeToNodeWritable(
206 <RootModel />,
207 writable,
208 webpackMap,
209 );
210 - const response = ReactTransportDOMClient.createFromReadableStream(readable);
210 + const response = ReactServerDOMReader.createFromReadableStream(readable);
211
212 const container = document.createElement('div');
213 const root = ReactDOM.unstable_createRoot(container);
@@ -239,12 +239,12 @@ describe('ReactFlightDOM', () => {
239 }
240
241 const {writable, readable} = getTestStream();
242 - ReactTransportDOMServer.pipeToNodeWritable(
242 + ReactServerDOMWriter.pipeToNodeWritable(
243 <RootModel />,
244 writable,
245 webpackMap,
246 );
247 - const response = ReactTransportDOMClient.createFromReadableStream(readable);
247 + const response = ReactServerDOMReader.createFromReadableStream(readable);
248
249 const container = document.createElement('div');
250 const root = ReactDOM.unstable_createRoot(container);
@@ -374,8 +374,8 @@ describe('ReactFlightDOM', () => {
374 }
375
376 const {writable, readable} = getTestStream();
377 - ReactTransportDOMServer.pipeToNodeWritable(model, writable, webpackMap);
378 - const response = ReactTransportDOMClient.createFromReadableStream(readable);
377 + ReactServerDOMWriter.pipeToNodeWritable(model, writable, webpackMap);
378 + const response = ReactServerDOMReader.createFromReadableStream(readable);
379
380 const container = document.createElement('div');
381 const root = ReactDOM.unstable_createRoot(container);
@@ -473,12 +473,12 @@ describe('ReactFlightDOM', () => {
473 const root = ReactDOM.unstable_createRoot(container);
474
475 const stream1 = getTestStream();
476 - ReactTransportDOMServer.pipeToNodeWritable(
476 + ReactServerDOMWriter.pipeToNodeWritable(
477 <App color="red" />,
478 stream1.writable,
479 webpackMap,
480 );
481 - const response1 = ReactTransportDOMClient.createFromReadableStream(
481 + const response1 = ReactServerDOMReader.createFromReadableStream(
482 stream1.readable,
483 );
484 await act(async () => {
@@ -501,12 +501,12 @@ describe('ReactFlightDOM', () => {
501 inputB.value = 'goodbye';
502
503 const stream2 = getTestStream();
504 - ReactTransportDOMServer.pipeToNodeWritable(
504 + ReactServerDOMWriter.pipeToNodeWritable(
505 <App color="blue" />,
506 stream2.writable,
507 webpackMap,
508 );
509 - const response2 = ReactTransportDOMClient.createFromReadableStream(
509 + const response2 = ReactServerDOMReader.createFromReadableStream(
510 stream2.readable,
511 );
512 await act(async () => {
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js renamed
+6 -6
@@ -16,15 +16,15 @@ global.TextEncoder = require('util').TextEncoder;
16 global.TextDecoder = require('util').TextDecoder;
17
18 let React;
19 -let ReactTransportDOMServer;
20 -let ReactTransportDOMClient;
19 +let ReactServerDOMWriter;
20 +let ReactServerDOMReader;
21
22 describe('ReactFlightDOMBrowser', () => {
23 beforeEach(() => {
24 jest.resetModules();
25 React = require('react');
26 - ReactTransportDOMServer = require('react-transport-dom-webpack/server.browser');
27 - ReactTransportDOMClient = require('react-transport-dom-webpack');
26 + ReactServerDOMWriter = require('react-server-dom-webpack/writer.browser.server');
27 + ReactServerDOMReader = require('react-server-dom-webpack');
28 });
29
30 async function waitForSuspense(fn) {
@@ -61,8 +61,8 @@ describe('ReactFlightDOMBrowser', () => {
61 return model;
62 }
63
64 - const stream = ReactTransportDOMServer.renderToReadableStream(<App />);
65 - const response = ReactTransportDOMClient.createFromReadableStream(stream);
64 + const stream = ReactServerDOMWriter.renderToReadableStream(<App />);
65 + const response = ReactServerDOMReader.createFromReadableStream(stream);
66 await waitForSuspense(() => {
67 const model = response.readRoot();
68 expect(model).toEqual({
packages/react-server-dom-webpack/writer.browser.server.js renamed
packages/react-server-dom-webpack/writer.js renamed
+4 -1
@@ -7,4 +7,7 @@
7 * @flow
8 */
9
10 -export * from './server.node';
10 +throw new Error(
11 + 'The React Server Writer 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/writer.node.server.js renamed
packages/react-server-native-relay/index.js renamed
packages/react-server-native-relay/package.json renamed
+2 -2
@@ -1,11 +1,11 @@
1 {
2 - "name": "react-transport-native-relay",
2 + "name": "react-server-native-relay",
3 "version": "0.1.0",
4 "private": true,
5 "repository": {
6 "type" : "git",
7 "url" : "https://github.com/facebook/react.git",
8 - "directory": "packages/react-transport-native-relay"
8 + "directory": "packages/react-server-native-relay"
9 },
10 "dependencies": {
11 "object-assign": "^4.1.1",
packages/react-server-native-relay/server.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayClient.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayProtocol.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js renamed
packages/react-server-native-relay/src/__mocks__/JSResourceReferenceImpl.js renamed
packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayClientIntegration.js renamed
packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayServerIntegration.js renamed
packages/react-server-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js renamed
+2 -2
@@ -36,8 +36,8 @@ describe('ReactFlightNativeRelay', () => {
36 uiViewClassName: 'RCTText',
37 }));
38
39 - ReactNativeFlightRelayServer = require('react-transport-native-relay/server');
40 - ReactNativeFlightRelayClient = require('react-transport-native-relay');
39 + ReactNativeFlightRelayServer = require('react-server-native-relay/server');
40 + ReactNativeFlightRelayClient = require('react-server-native-relay');
41 JSResourceReferenceImpl = require('JSResourceReferenceImpl');
42 });
43
packages/react-server-native-relay/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap renamed
packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
10 +export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
packages/react-server/src/forks/ReactFlightServerConfig.dom.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export * from 'react-transport-native-relay/src/ReactFlightNativeRelayServerHostConfig';
10 +export * from 'react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig';
packages/react-transport-dom-webpack/npm/index.js deleted
-7
@@ -1,7 +0,0 @@
1 -'use strict';
2 -
3 -if (process.env.NODE_ENV === 'production') {
4 - module.exports = require('./cjs/react-transport-dom-webpack.production.min.js');
5 -} else {
6 - module.exports = require('./cjs/react-transport-dom-webpack.development.js');
7 -}
packages/react-transport-dom-webpack/npm/node-register.js deleted
-3
@@ -1,3 +0,0 @@
1 -'use strict';
2 -
3 -module.exports = require('./cjs/react-transport-dom-webpack-node-register.js');
packages/react-transport-dom-webpack/npm/plugin.js deleted
-3
@@ -1,3 +0,0 @@
1 -'use strict';
2 -
3 -module.exports = require('./cjs/react-transport-dom-webpack-plugin.js');
packages/react-transport-dom-webpack/npm/server.browser.js deleted
-7
@@ -1,7 +0,0 @@
1 -'use strict';
2 -
3 -if (process.env.NODE_ENV === 'production') {
4 - module.exports = require('./cjs/react-transport-dom-webpack-server.browser.production.min.js');
5 -} else {
6 - module.exports = require('./cjs/react-transport-dom-webpack-server.browser.development.js');
7 -}
packages/react-transport-dom-webpack/npm/server.js deleted
-3
@@ -1,3 +0,0 @@
1 -'use strict';
2 -
3 -module.exports = require('./server.node');
packages/react-transport-dom-webpack/npm/server.node.js deleted
-7
@@ -1,7 +0,0 @@
1 -'use strict';
2 -
3 -if (process.env.NODE_ENV === 'production') {
4 - module.exports = require('./cjs/react-transport-dom-webpack-server.node.production.min.js');
5 -} else {
6 - module.exports = require('./cjs/react-transport-dom-webpack-server.node.development.js');
7 -}
scripts/rollup/bundles.js
+28 -28
@@ -270,64 +270,64 @@ const bundles = [
270 externals: ['react', 'react-dom/server'],
271 },
272
273 - /******* React Transport DOM Server Webpack *******/
273 + /******* React Server DOM Webpack Writer *******/
274 {
275 bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
276 moduleType: RENDERER,
277 - entry: 'react-transport-dom-webpack/server.browser',
278 - global: 'ReactTransportDOMServer',
277 + entry: 'react-server-dom-webpack/writer.browser.server',
278 + global: 'ReactServerDOMWriter',
279 externals: ['react', 'react-dom/server'],
280 },
281 {
282 bundleTypes: [NODE_DEV, NODE_PROD],
283 moduleType: RENDERER,
284 - entry: 'react-transport-dom-webpack/server.node',
285 - global: 'ReactTransportDOMServer',
284 + entry: 'react-server-dom-webpack/writer.node.server',
285 + global: 'ReactServerDOMWriter',
286 externals: ['react', 'react-dom/server'],
287 },
288
289 - /******* React Transport DOM Client Webpack *******/
289 + /******* React Server DOM Webpack Reader *******/
290 {
291 bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
292 moduleType: RENDERER,
293 - entry: 'react-transport-dom-webpack',
294 - global: 'ReactTransportDOMClient',
293 + entry: 'react-server-dom-webpack',
294 + global: 'ReactServerDOMReader',
295 externals: ['react'],
296 },
297
298 - /******* React Transport DOM Webpack Plugin *******/
298 + /******* React Server DOM Webpack Plugin *******/
299 {
300 bundleTypes: [NODE_ES2015],
301 moduleType: RENDERER_UTILS,
302 - entry: 'react-transport-dom-webpack/plugin',
303 - global: 'ReactFlightWebpackPlugin',
302 + entry: 'react-server-dom-webpack/plugin',
303 + global: 'ReactServerWebpackPlugin',
304 externals: ['fs', 'path', 'url', 'neo-async'],
305 },
306
307 - /******* React Transport DOM Webpack Node.js Loader *******/
307 + /******* React Server DOM Webpack Node.js Loader *******/
308 {
309 bundleTypes: [NODE_ESM],
310 moduleType: RENDERER_UTILS,
311 - entry: 'react-transport-dom-webpack/node-loader',
312 - global: 'ReactFlightWebpackNodeLoader',
311 + entry: 'react-server-dom-webpack/node-loader',
312 + global: 'ReactServerWebpackNodeLoader',
313 externals: ['acorn'],
314 },
315
316 - /******* React Transport DOM Webpack Node.js CommonJS Loader *******/
316 + /******* React Server DOM Webpack Node.js CommonJS Loader *******/
317 {
318 bundleTypes: [NODE_ES2015],
319 moduleType: RENDERER_UTILS,
320 - entry: 'react-transport-dom-webpack/node-register',
320 + entry: 'react-server-dom-webpack/node-register',
321 global: 'ReactFlightWebpackNodeRegister',
322 externals: ['url', 'module'],
323 },
324
325 - /******* React Transport DOM Server Relay *******/
325 + /******* React Server DOM Relay Writer *******/
326 {
327 bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
328 moduleType: RENDERER,
329 - entry: 'react-transport-dom-relay/server',
330 - global: 'ReactFlightDOMRelayServer',
329 + entry: 'react-server-dom-relay/server',
330 + global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
331 externals: [
332 'react',
333 'react-dom/server',
@@ -336,12 +336,12 @@ const bundles = [
336 ],
337 },
338
339 - /******* React Transport DOM Client Relay *******/
339 + /******* React Server DOM Relay Reader *******/
340 {
341 bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
342 moduleType: RENDERER,
343 - entry: 'react-transport-dom-relay',
344 - global: 'ReactFlightDOMRelayClient',
343 + entry: 'react-server-dom-relay',
344 + global: 'ReactFlightDOMRelayClient', // TODO: Rename to Reader
345 externals: [
346 'react',
347 'ReactFlightDOMRelayClientIntegration',
@@ -349,12 +349,12 @@ const bundles = [
349 ],
350 },
351
352 - /******* React Transport Native Server Relay *******/
352 + /******* React Server Native Relay Writer *******/
353 {
354 bundleTypes: [RN_FB_DEV, RN_FB_PROD],
355 moduleType: RENDERER,
356 - entry: 'react-transport-native-relay/server',
357 - global: 'ReactFlightNativeRelayServer',
356 + entry: 'react-server-native-relay/server',
357 + global: 'ReactFlightNativeRelayServer', // TODO: Rename to Writer
358 externals: [
359 'react',
360 'ReactFlightNativeRelayServerIntegration',
@@ -362,12 +362,12 @@ const bundles = [
362 ],
363 },
364
365 - /******* React Transport Native Client Relay *******/
365 + /******* React Server Native Relay Reader *******/
366 {
367 bundleTypes: [RN_FB_DEV, RN_FB_PROD],
368 moduleType: RENDERER,
369 - entry: 'react-transport-native-relay',
370 - global: 'ReactFlightNativeRelayClient',
369 + entry: 'react-server-native-relay',
370 + global: 'ReactFlightNativeRelayClient', // TODO: Rename to Reader
371 externals: [
372 'react',
373 'ReactFlightNativeRelayClientIntegration',
scripts/rollup/packaging.js
+1 -1
@@ -82,7 +82,7 @@ function getBundleOutputPath(bundleType, filename, packageName) {
82 /\.js$/,
83 '.fb.js'
84 )}`;
85 - case 'react-transport-native-relay':
85 + case 'react-server-native-relay':
86 return `build/facebook-relay/flight/${filename}`;
87 default:
88 throw new Error('Unknown RN package.');
scripts/shared/inlinedHostConfigs.js
+16 -19
@@ -13,18 +13,18 @@ module.exports = [
13 'react-dom',
14 'react-dom/testing',
15 'react-dom/unstable-fizz.node',
16 - 'react-transport-dom-webpack/server.node',
17 - 'react-transport-dom-webpack',
16 + 'react-server-dom-webpack/writer.node.server',
17 + 'react-server-dom-webpack',
18 ],
19 paths: [
20 'react-dom',
21 'react-dom/unstable-fizz',
22 'react-dom/unstable-fizz.node',
23 'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
24 - 'react-transport-dom-webpack',
25 - 'react-transport-dom-webpack/server',
26 - 'react-transport-dom-webpack/server.node',
27 - 'react-transport-dom-webpack/src/ReactFlightDOMServerNode.js', // react-transport-dom-webpack/server.browser
24 + 'react-server-dom-webpack',
25 + 'react-server-dom-webpack/writer',
26 + 'react-server-dom-webpack/writer.node.server',
27 + 'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/writer.node.server
28 'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
29 'react-interactions',
30 ],
@@ -37,17 +37,17 @@ module.exports = [
37 'react-dom',
38 'react-dom/testing',
39 'react-dom/unstable-fizz.browser',
40 - 'react-transport-dom-webpack/server.browser',
41 - 'react-transport-dom-webpack',
40 + 'react-server-dom-webpack/writer.browser.server',
41 + 'react-server-dom-webpack',
42 ],
43 paths: [
44 'react-dom',
45 'react-dom/testing',
46 'react-dom/unstable-fizz.browser',
47 'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
48 - 'react-transport-dom-webpack',
49 - 'react-transport-dom-webpack/server.browser',
50 - 'react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-transport-dom-webpack/server.browser
48 + 'react-server-dom-webpack',
49 + 'react-server-dom-webpack/writer.browser.server',
50 + 'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/writer.browser.server
51 'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
52 ],
53 isFlowTyped: true,
@@ -83,21 +83,18 @@ module.exports = [
83 },
84 {
85 shortName: 'dom-relay',
86 - entryPoints: [
87 - 'react-transport-dom-relay',
88 - 'react-transport-dom-relay/server',
89 - ],
90 - paths: ['react-dom', 'react-transport-dom-relay'],
86 + entryPoints: ['react-server-dom-relay', 'react-server-dom-relay/server'],
87 + paths: ['react-dom', 'react-server-dom-relay'],
88 isFlowTyped: true,
89 isServerSupported: true,
90 },
91 {
92 shortName: 'native-relay',
93 entryPoints: [
97 - 'react-transport-native-relay',
98 - 'react-transport-native-relay/server',
94 + 'react-server-native-relay',
95 + 'react-server-native-relay/server',
96 ],
100 - paths: ['react-native-renderer', 'react-transport-native-relay'],
97 + paths: ['react-native-renderer', 'react-server-native-relay'],
98 isFlowTyped: true,
99 isServerSupported: true,
100 },