Skip to content

Commit 5fd9db7

Browse files
sebmarkbagesebmarkbage
authored
[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
1 parent ce40f1d commit 5fd9db7

File tree

76 files changed

+154
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+154
-147
lines changed

‎.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ module.exports = {
185185
{
186186
files: [
187187
'packages/react-native-renderer/**/*.js',
188-
'packages/react-transport-native-relay/**/*.js',
188+
'packages/react-server-native-relay/**/*.js',
189189
],
190190
globals: {
191191
nativeFabricUIManager: true,
192192
},
193193
},
194194
{
195-
files: ['packages/react-transport-dom-webpack/**/*.js'],
195+
files: ['packages/react-server-dom-webpack/**/*.js'],
196196
globals: {
197197
__webpack_chunk_load__: true,
198198
__webpack_require__: true,

‎fixtures/flight-browser/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ <h1>Flight Example</h1>
1919
<script src="../../build/node_modules/react/umd/react.development.js"></script>
2020
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
2121
<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>
2424
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2525
<script type="text/babel">
2626
let Suspense = React.Suspense;
@@ -60,7 +60,7 @@ <h1>Flight Example</h1>
6060
content: <HTML />,
6161
};
6262

63-
let stream = ReactTransportDOMServer.renderToReadableStream(model);
63+
let stream = ReactServerDOMWriter.renderToReadableStream(model);
6464
let response = new Response(stream, {
6565
headers: {'Content-Type': 'text/html'},
6666
});
@@ -70,13 +70,13 @@ <h1>Flight Example</h1>
7070
let blob = await responseToDisplay.blob();
7171
let url = URL.createObjectURL(blob);
7272

73-
let data = ReactTransportDOMClient.createFromFetch(
73+
let data = ReactServerDOMReader.createFromFetch(
7474
fetch(url)
7575
);
7676
// The client also supports XHR streaming.
7777
// var xhr = new XMLHttpRequest();
7878
// xhr.open('GET', url);
79-
// let data = ReactTransportDOMClient.createFromXHR(xhr);
79+
// let data = ReactServerDOMReader.createFromXHR(xhr);
8080
// xhr.send();
8181

8282
renderResult(data);

‎fixtures/flight/config/webpack.config.js

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

33
// Fork Start
4-
const ReactFlightWebpackPlugin = require('react-transport-dom-webpack/plugin');
4+
const ReactFlightWebpackPlugin = require('react-server-dom-webpack/plugin');
55
// Fork End
66

77
const fs = require('fs');

‎fixtures/flight/loader/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
resolve,
33
getSource,
44
transformSource as reactTransformSource,
5-
} from 'react-transport-dom-webpack/node-loader';
5+
} from 'react-server-dom-webpack/node-loader';
66

77
export {resolve, getSource};
88

‎fixtures/flight/server/cli.server.js

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

3-
const register = require('react-transport-dom-webpack/node-register');
3+
const register = require('react-server-dom-webpack/node-register');
44
register();
55

66
const babelRegister = require('@babel/register');

‎fixtures/flight/server/handler.server.js

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

3-
const {pipeToNodeWritable} = require('react-transport-dom-webpack/server');
3+
const {pipeToNodeWritable} = require('react-server-dom-webpack/writer');
44
const {readFile} = require('fs');
55
const {resolve} = require('path');
66
const React = require('react');

‎fixtures/flight/src/index.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import * as React from 'react';
22
import {Suspense} from 'react';
33
import ReactDOM from 'react-dom';
4-
import ReactTransportDOMClient from 'react-transport-dom-webpack';
4+
import ReactServerDOMReader from 'react-server-dom-webpack';
55

6-
let data = ReactTransportDOMClient.createFromFetch(
7-
fetch('http://localhost:3001')
8-
);
6+
let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
97

108
function Content() {
119
return data.readRoot();

‎packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
1111
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
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
* @flow
88
*/
99

10-
export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
10+
export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
1111
export * from '../ReactFlightClientHostConfigNoStream';

‎packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
1111
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
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
* @flow
88
*/
99

10-
export * from 'react-transport-native-relay/src/ReactFlightNativeRelayClientHostConfig';
10+
export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
1111
export * from '../ReactFlightClientHostConfigNoStream';

‎packages/react-transport-dom-relay/index.js ‎packages/react-server-dom-relay/index.js

File renamed without changes.

‎packages/react-transport-dom-relay/package.json ‎packages/react-server-dom-relay/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "react-transport-dom-relay",
2+
"name": "react-server-dom-relay",
33
"version": "0.1.0",
44
"private": true,
55
"repository": {
66
"type" : "git",
77
"url" : "https://github.com/facebook/react.git",
8-
"directory": "packages/react-transport-dom-relay"
8+
"directory": "packages/react-server-dom-relay"
99
},
1010
"dependencies": {
1111
"object-assign": "^4.1.1",

‎packages/react-transport-dom-relay/server.js ‎packages/react-server-dom-relay/server.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/ReactFlightDOMRelayClient.js ‎packages/react-server-dom-relay/src/ReactFlightDOMRelayClient.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js ‎packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/ReactFlightDOMRelayProtocol.js ‎packages/react-server-dom-relay/src/ReactFlightDOMRelayProtocol.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/ReactFlightDOMRelayServer.js ‎packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js ‎packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/__mocks__/JSResourceReference.js ‎packages/react-server-dom-relay/src/__mocks__/JSResourceReference.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js ‎packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js ‎packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js

File renamed without changes.

‎packages/react-transport-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js ‎packages/react-server-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ describe('ReactFlightDOMRelay', () => {
2121
act = require('react-dom/test-utils').unstable_concurrentAct;
2222
React = require('react');
2323
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');
2626
JSResourceReference = require('JSResourceReference');
2727
});
2828

‎packages/react-transport-dom-webpack/README.md ‎packages/react-server-dom-webpack/README.md

+1-1

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

File renamed without changes.

‎packages/react-transport-dom-webpack/esm/react-transport-dom-webpack-node-loader.js ‎packages/react-server-dom-webpack/esm/react-server-dom-webpack-node-loader.js

File renamed without changes.

‎packages/react-transport-dom-webpack/index.js ‎packages/react-server-dom-webpack/index.js

File renamed without changes.

‎packages/react-transport-dom-webpack/node-register.js ‎packages/react-server-dom-webpack/node-register.js

File renamed without changes.

‎packages/react-transport-dom-webpack/npm/esm/package.json ‎packages/react-server-dom-webpack/npm/esm/package.json

File renamed without changes.

‎packages/react-server-dom-webpack/npm/index.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-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

+3
Original file line numberDiff line numberDiff line change
@@ -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

+3
Original file line numberDiff line numberDiff line change
@@ -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

+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-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

+6
Original file line numberDiff line numberDiff line change
@@ -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

+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-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-transport-dom-webpack/package.json ‎packages/react-server-dom-webpack/package.json

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
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.",
44
"version": "0.1.0",
55
"private": true,
66
"keywords": [
@@ -14,9 +14,9 @@
1414
"README.md",
1515
"index.js",
1616
"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",
2020
"node-register.js",
2121
"cjs/",
2222
"umd/",
@@ -25,21 +25,27 @@
2525
"exports": {
2626
".": "./index.js",
2727
"./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",
3238
"./node-register": "./node-register.js",
3339
"./package.json": "./package.json"
3440
},
3541
"browser": {
36-
"./server.js": "./server.browser.js"
42+
"./writer.js": "./writer.browser.server.js"
3743
},
3844
"main": "index.js",
3945
"repository": {
4046
"type" : "git",
4147
"url" : "https://github.com/facebook/react.git",
42-
"directory": "packages/react-transport-dom-webpack"
48+
"directory": "packages/react-server-dom-webpack"
4349
},
4450
"engines": {
4551
"node": ">=0.10.0"

‎packages/react-transport-dom-webpack/plugin.js ‎packages/react-server-dom-webpack/plugin.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js ‎packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightDOMClient.js ‎packages/react-server-dom-webpack/src/ReactFlightDOMClient.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js ‎packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightDOMServerNode.js ‎packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js ‎packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeLoader.js ‎packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeRegister.js ‎packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js

File renamed without changes.

‎packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js ‎packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Options = {
5050
manifestFilename?: string,
5151
};
5252

53-
const PLUGIN_NAME = 'React Transport Plugin';
53+
const PLUGIN_NAME = 'React Server Plugin';
5454

5555
export default class ReactFlightWebpackPlugin {
5656
clientReferences: $ReadOnlyArray<ClientReferencePath>;

‎packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOM-test.js ‎packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ let act;
2828
let Stream;
2929
let React;
3030
let ReactDOM;
31-
let ReactTransportDOMServer;
32-
let ReactTransportDOMClient;
31+
let ReactServerDOMWriter;
32+
let ReactServerDOMReader;
3333

3434
describe('ReactFlightDOM', () => {
3535
beforeEach(() => {
@@ -40,8 +40,8 @@ describe('ReactFlightDOM', () => {
4040
Stream = require('stream');
4141
React = require('react');
4242
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');
4545
});
4646

4747
function getTestStream() {
@@ -113,8 +113,8 @@ describe('ReactFlightDOM', () => {
113113
}
114114

115115
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);
118118
await waitForSuspense(() => {
119119
const model = response.readRoot();
120120
expect(model).toEqual({
@@ -163,12 +163,12 @@ describe('ReactFlightDOM', () => {
163163
}
164164

165165
const {writable, readable} = getTestStream();
166-
ReactTransportDOMServer.pipeToNodeWritable(
166+
ReactServerDOMWriter.pipeToNodeWritable(
167167
<RootModel />,
168168
writable,
169169
webpackMap,
170170
);
171-
const response = ReactTransportDOMClient.createFromReadableStream(readable);
171+
const response = ReactServerDOMReader.createFromReadableStream(readable);
172172

173173
const container = document.createElement('div');
174174
const root = ReactDOM.unstable_createRoot(container);
@@ -202,12 +202,12 @@ describe('ReactFlightDOM', () => {
202202
}
203203

204204
const {writable, readable} = getTestStream();
205-
ReactTransportDOMServer.pipeToNodeWritable(
205+
ReactServerDOMWriter.pipeToNodeWritable(
206206
<RootModel />,
207207
writable,
208208
webpackMap,
209209
);
210-
const response = ReactTransportDOMClient.createFromReadableStream(readable);
210+
const response = ReactServerDOMReader.createFromReadableStream(readable);
211211

212212
const container = document.createElement('div');
213213
const root = ReactDOM.unstable_createRoot(container);
@@ -239,12 +239,12 @@ describe('ReactFlightDOM', () => {
239239
}
240240

241241
const {writable, readable} = getTestStream();
242-
ReactTransportDOMServer.pipeToNodeWritable(
242+
ReactServerDOMWriter.pipeToNodeWritable(
243243
<RootModel />,
244244
writable,
245245
webpackMap,
246246
);
247-
const response = ReactTransportDOMClient.createFromReadableStream(readable);
247+
const response = ReactServerDOMReader.createFromReadableStream(readable);
248248

249249
const container = document.createElement('div');
250250
const root = ReactDOM.unstable_createRoot(container);
@@ -374,8 +374,8 @@ describe('ReactFlightDOM', () => {
374374
}
375375

376376
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);
379379

380380
const container = document.createElement('div');
381381
const root = ReactDOM.unstable_createRoot(container);
@@ -473,12 +473,12 @@ describe('ReactFlightDOM', () => {
473473
const root = ReactDOM.unstable_createRoot(container);
474474

475475
const stream1 = getTestStream();
476-
ReactTransportDOMServer.pipeToNodeWritable(
476+
ReactServerDOMWriter.pipeToNodeWritable(
477477
<App color="red" />,
478478
stream1.writable,
479479
webpackMap,
480480
);
481-
const response1 = ReactTransportDOMClient.createFromReadableStream(
481+
const response1 = ReactServerDOMReader.createFromReadableStream(
482482
stream1.readable,
483483
);
484484
await act(async () => {
@@ -501,12 +501,12 @@ describe('ReactFlightDOM', () => {
501501
inputB.value = 'goodbye';
502502

503503
const stream2 = getTestStream();
504-
ReactTransportDOMServer.pipeToNodeWritable(
504+
ReactServerDOMWriter.pipeToNodeWritable(
505505
<App color="blue" />,
506506
stream2.writable,
507507
webpackMap,
508508
);
509-
const response2 = ReactTransportDOMClient.createFromReadableStream(
509+
const response2 = ReactServerDOMReader.createFromReadableStream(
510510
stream2.readable,
511511
);
512512
await act(async () => {

0 commit comments

Comments
 (0)