Skip to content

Commit 64d4b84

Browse files
sebmarkbagesebmarkbage
authored
Rename Flight to Transport (facebook#18808)
* Rename Flight to Transport Flight is still the codename for the implementation details (like Fiber). However, now the public package is react-transport-... which is only intended to be used directly by integrators. * Rename names
1 parent 93e078d commit 64d4b84

Some content is hidden

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

51 files changed

+126
-120
lines changed

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ module.exports = {
160160
},
161161
},
162162
{
163-
files: ['packages/react-flight-dom-webpack/**/*.js'],
163+
files: ['packages/react-transport-dom-webpack/**/*.js'],
164164
globals: {
165165
__webpack_chunk_load__: true,
166166
__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-flight-dom-webpack/umd/react-flight-dom-webpack-server.browser.development.js"></script>
23-
<script src="../../build/node_modules/react-flight-dom-webpack/umd/react-flight-dom-webpack.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>
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 = ReactFlightDOMServer.renderToReadableStream(model);
63+
let stream = ReactTransportDOMServer.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 = ReactFlightDOMClient.createFromFetch(
73+
let data = ReactTransportDOMClient.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 = ReactFlightDOMClient.createFromXHR(xhr);
79+
// let data = ReactTransportDOMClient.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-flight-dom-webpack/plugin');
4+
const ReactFlightWebpackPlugin = require('react-transport-dom-webpack/plugin');
55
// Fork End
66

77
const fs = require('fs');

‎fixtures/flight/server/handler.js

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

3-
const ReactFlightDOMServer = require('react-flight-dom-webpack/server');
3+
const ReactTransportDOMServer = require('react-transport-dom-webpack/server');
44
const React = require('react');
55
const Stream = require('stream');
66

@@ -22,5 +22,5 @@ module.exports = function(req, res) {
2222
let model = {
2323
content: <HTML />,
2424
};
25-
ReactFlightDOMServer.pipeToNodeWritable(model, res);
25+
ReactTransportDOMServer.pipeToNodeWritable(model, res);
2626
};

‎fixtures/flight/src/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import ReactFlightDOMClient from 'react-flight-dom-webpack';
3+
import ReactTransportDOMClient from 'react-transport-dom-webpack';
44
import App from './App';
55

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

810
ReactDOM.render(<App data={data} />, document.getElementById('root'));

‎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-flight-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
12+
export * from 'react-transport-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-flight-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
10+
export * from 'react-transport-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-flight-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
12+
export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';

‎packages/react-flight-dom-webpack/npm/index.js

-7
This file was deleted.

‎packages/react-flight-dom-webpack/npm/plugin.js

-7
This file was deleted.

‎packages/react-flight-dom-webpack/npm/server-runtime.js

-7
This file was deleted.

‎packages/react-flight-dom-webpack/npm/server.browser.js

-7
This file was deleted.

‎packages/react-flight-dom-webpack/npm/server.node.js

-7
This file was deleted.

‎packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
*/
99

1010
export * from '../ReactFlightServerConfigStream';
11-
export * from 'react-flight-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11+
export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';

‎packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js

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

10-
export * from 'react-flight-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
10+
export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig';

‎packages/react-server/src/forks/ReactFlightServerConfig.dom.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
*/
99

1010
export * from '../ReactFlightServerConfigStream';
11-
export * from 'react-flight-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11+
export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';

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

File renamed without changes.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "react-flight-dom-relay",
2+
"name": "react-transport-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-flight-dom-relay"
8+
"directory": "packages/react-transport-dom-relay"
99
},
1010
"dependencies": {
1111
"object-assign": "^4.1.1",

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ describe('ReactFlightDOMRelay', () => {
2121
act = require('react-dom/test-utils').act;
2222
React = require('react');
2323
ReactDOM = require('react-dom');
24-
ReactDOMFlightRelayServer = require('react-flight-dom-relay/server');
25-
ReactDOMFlightRelayServerRuntime = require('react-flight-dom-relay/server-runtime');
26-
ReactDOMFlightRelayClient = require('react-flight-dom-relay');
24+
ReactDOMFlightRelayServer = require('react-transport-dom-relay/server');
25+
ReactDOMFlightRelayServerRuntime = require('react-transport-dom-relay/server-runtime');
26+
ReactDOMFlightRelayClient = require('react-transport-dom-relay');
2727
});
2828

2929
function readThrough(data) {

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

+1-1

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

File renamed without changes.

‎packages/react-transport-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-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/plugin.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-transport-dom-webpack-plugin.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-transport-dom-webpack-plugin.development.js');
7+
}

‎packages/react-transport-dom-webpack/npm/server-runtime.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-transport-dom-webpack-server-runtime.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-transport-dom-webpack-server-runtime.development.js');
7+
}

‎packages/react-transport-dom-webpack/npm/server.browser.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-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-flight-dom-webpack/npm/server.js ‎packages/react-transport-dom-webpack/npm/server.js

File renamed without changes.

‎packages/react-transport-dom-webpack/npm/server.node.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-transport-dom-webpack-server.node.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-transport-dom-webpack-server.node.development.js');
7+
}

‎packages/react-flight-dom-webpack/package.json ‎packages/react-transport-dom-webpack/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "react-flight-dom-webpack",
3-
"description": "React Flight bindings for DOM using Webpack.",
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.",
44
"version": "0.1.0",
55
"private": true,
66
"keywords": [
@@ -28,7 +28,7 @@
2828
"repository": {
2929
"type" : "git",
3030
"url" : "https://github.com/facebook/react.git",
31-
"directory": "packages/react-flight-dom-webpack"
31+
"directory": "packages/react-transport-dom-webpack"
3232
},
3333
"engines": {
3434
"node": ">=0.10.0"

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

File renamed without changes.

‎packages/react-flight-dom-webpack/server-runtime.js ‎packages/react-transport-dom-webpack/server-runtime.js

File renamed without changes.

‎packages/react-flight-dom-webpack/server.browser.js ‎packages/react-transport-dom-webpack/server.browser.js

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

+22-18
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ let act;
2828
let Stream;
2929
let React;
3030
let ReactDOM;
31-
let ReactFlightDOMServer;
32-
let ReactFlightDOMServerRuntime;
33-
let ReactFlightDOMClient;
31+
let ReactTransportDOMServer;
32+
let ReactTransportDOMServerRuntime;
33+
let ReactTransportDOMClient;
3434

3535
describe('ReactFlightDOM', () => {
3636
beforeEach(() => {
@@ -41,9 +41,9 @@ describe('ReactFlightDOM', () => {
4141
Stream = require('stream');
4242
React = require('react');
4343
ReactDOM = require('react-dom');
44-
ReactFlightDOMServer = require('react-flight-dom-webpack/server');
45-
ReactFlightDOMServerRuntime = require('react-flight-dom-webpack/server-runtime');
46-
ReactFlightDOMClient = require('react-flight-dom-webpack');
44+
ReactTransportDOMServer = require('react-transport-dom-webpack/server');
45+
ReactTransportDOMServerRuntime = require('react-transport-dom-webpack/server-runtime');
46+
ReactTransportDOMClient = require('react-transport-dom-webpack');
4747
});
4848

4949
function getTestStream() {
@@ -76,14 +76,14 @@ describe('ReactFlightDOM', () => {
7676
};
7777
if (load === undefined) {
7878
return () => {
79-
return ReactFlightDOMServerRuntime.serverBlockNoData('path/' + idx);
79+
return ReactTransportDOMServerRuntime.serverBlockNoData('path/' + idx);
8080
};
8181
}
8282
return function(...args) {
8383
const curriedLoad = () => {
8484
return load(...args);
8585
};
86-
return ReactFlightDOMServerRuntime.serverBlock(
86+
return ReactTransportDOMServerRuntime.serverBlock(
8787
'path/' + idx,
8888
curriedLoad,
8989
);
@@ -125,8 +125,8 @@ describe('ReactFlightDOM', () => {
125125
}
126126

127127
const {writable, readable} = getTestStream();
128-
ReactFlightDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
129-
const response = ReactFlightDOMClient.createFromReadableStream(readable);
128+
ReactTransportDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
129+
const response = ReactTransportDOMClient.createFromReadableStream(readable);
130130
await waitForSuspense(() => {
131131
const model = response.readRoot();
132132
expect(model).toEqual({
@@ -175,12 +175,12 @@ describe('ReactFlightDOM', () => {
175175
}
176176

177177
const {writable, readable} = getTestStream();
178-
ReactFlightDOMServer.pipeToNodeWritable(
178+
ReactTransportDOMServer.pipeToNodeWritable(
179179
<RootModel />,
180180
writable,
181181
webpackMap,
182182
);
183-
const response = ReactFlightDOMClient.createFromReadableStream(readable);
183+
const response = ReactTransportDOMClient.createFromReadableStream(readable);
184184

185185
const container = document.createElement('div');
186186
const root = ReactDOM.createRoot(container);
@@ -214,12 +214,12 @@ describe('ReactFlightDOM', () => {
214214
}
215215

216216
const {writable, readable} = getTestStream();
217-
ReactFlightDOMServer.pipeToNodeWritable(
217+
ReactTransportDOMServer.pipeToNodeWritable(
218218
<RootModel />,
219219
writable,
220220
webpackMap,
221221
);
222-
const response = ReactFlightDOMClient.createFromReadableStream(readable);
222+
const response = ReactTransportDOMClient.createFromReadableStream(readable);
223223

224224
const container = document.createElement('div');
225225
const root = ReactDOM.createRoot(container);
@@ -251,12 +251,12 @@ describe('ReactFlightDOM', () => {
251251
}
252252

253253
const {writable, readable} = getTestStream();
254-
ReactFlightDOMServer.pipeToNodeWritable(
254+
ReactTransportDOMServer.pipeToNodeWritable(
255255
<RootModel />,
256256
writable,
257257
webpackMap,
258258
);
259-
const response = ReactFlightDOMClient.createFromReadableStream(readable);
259+
const response = ReactTransportDOMClient.createFromReadableStream(readable);
260260

261261
const container = document.createElement('div');
262262
const root = ReactDOM.createRoot(container);
@@ -410,8 +410,12 @@ describe('ReactFlightDOM', () => {
410410
}
411411

412412
const {writable, readable} = getTestStream();
413-
ReactFlightDOMServer.pipeToNodeWritable(profileModel, writable, webpackMap);
414-
const response = ReactFlightDOMClient.createFromReadableStream(readable);
413+
ReactTransportDOMServer.pipeToNodeWritable(
414+
profileModel,
415+
writable,
416+
webpackMap,
417+
);
418+
const response = ReactTransportDOMClient.createFromReadableStream(readable);
415419

416420
const container = document.createElement('div');
417421
const root = ReactDOM.createRoot(container);

‎packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js ‎packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ global.TextEncoder = require('util').TextEncoder;
1616
global.TextDecoder = require('util').TextDecoder;
1717

1818
let React;
19-
let ReactFlightDOMServer;
20-
let ReactFlightDOMClient;
19+
let ReactTransportDOMServer;
20+
let ReactTransportDOMClient;
2121

2222
describe('ReactFlightDOMBrowser', () => {
2323
beforeEach(() => {
2424
jest.resetModules();
2525
React = require('react');
26-
ReactFlightDOMServer = require('react-flight-dom-webpack/server.browser');
27-
ReactFlightDOMClient = require('react-flight-dom-webpack');
26+
ReactTransportDOMServer = require('react-transport-dom-webpack/server.browser');
27+
ReactTransportDOMClient = require('react-transport-dom-webpack');
2828
});
2929

3030
async function waitForSuspense(fn) {
@@ -61,8 +61,8 @@ describe('ReactFlightDOMBrowser', () => {
6161
return model;
6262
}
6363

64-
const stream = ReactFlightDOMServer.renderToReadableStream(<App />);
65-
const response = ReactFlightDOMClient.createFromReadableStream(stream);
64+
const stream = ReactTransportDOMServer.renderToReadableStream(<App />);
65+
const response = ReactTransportDOMClient.createFromReadableStream(stream);
6666
await waitForSuspense(() => {
6767
const model = response.readRoot();
6868
expect(model).toEqual({

0 commit comments

Comments
 (0)