Rename Flight to Transport (#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
This commit is contained in:
Sebastian Markbåge
2020-05-03 11:33:48 -07:00
committed by GitHub
parent 93e078ddf2
commit 64d4b84204
51 changed files with 126 additions and 120 deletions

View File

@@ -160,7 +160,7 @@ module.exports = {
},
},
{
files: ['packages/react-flight-dom-webpack/**/*.js'],
files: ['packages/react-transport-dom-webpack/**/*.js'],
globals: {
__webpack_chunk_load__: true,
__webpack_require__: true,

View File

@@ -19,8 +19,8 @@
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="../../build/node_modules/react-flight-dom-webpack/umd/react-flight-dom-webpack-server.browser.development.js"></script>
<script src="../../build/node_modules/react-flight-dom-webpack/umd/react-flight-dom-webpack.development.js"></script>
<script src="../../build/node_modules/react-transport-dom-webpack/umd/react-transport-dom-webpack-server.browser.development.js"></script>
<script src="../../build/node_modules/react-transport-dom-webpack/umd/react-transport-dom-webpack.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
let Suspense = React.Suspense;
@@ -60,7 +60,7 @@
content: <HTML />,
};
let stream = ReactFlightDOMServer.renderToReadableStream(model);
let stream = ReactTransportDOMServer.renderToReadableStream(model);
let response = new Response(stream, {
headers: {'Content-Type': 'text/html'},
});
@@ -70,13 +70,13 @@
let blob = await responseToDisplay.blob();
let url = URL.createObjectURL(blob);
let data = ReactFlightDOMClient.createFromFetch(
let data = ReactTransportDOMClient.createFromFetch(
fetch(url)
);
// The client also supports XHR streaming.
// var xhr = new XMLHttpRequest();
// xhr.open('GET', url);
// let data = ReactFlightDOMClient.createFromXHR(xhr);
// let data = ReactTransportDOMClient.createFromXHR(xhr);
// xhr.send();
renderResult(data);

View File

@@ -1,7 +1,7 @@
'use strict';
// Fork Start
const ReactFlightWebpackPlugin = require('react-flight-dom-webpack/plugin');
const ReactFlightWebpackPlugin = require('react-transport-dom-webpack/plugin');
// Fork End
const fs = require('fs');

View File

@@ -1,6 +1,6 @@
'use strict';
const ReactFlightDOMServer = require('react-flight-dom-webpack/server');
const ReactTransportDOMServer = require('react-transport-dom-webpack/server');
const React = require('react');
const Stream = require('stream');
@@ -22,5 +22,5 @@ module.exports = function(req, res) {
let model = {
content: <HTML />,
};
ReactFlightDOMServer.pipeToNodeWritable(model, res);
ReactTransportDOMServer.pipeToNodeWritable(model, res);
};

View File

@@ -1,8 +1,10 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactFlightDOMClient from 'react-flight-dom-webpack';
import ReactTransportDOMClient from 'react-transport-dom-webpack';
import App from './App';
let data = ReactFlightDOMClient.createFromFetch(fetch('http://localhost:3001'));
let data = ReactTransportDOMClient.createFromFetch(
fetch('http://localhost:3001')
);
ReactDOM.render(<App data={data} />, document.getElementById('root'));

View File

@@ -9,4 +9,4 @@
export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
export * from 'react-client/src/ReactFlightClientHostConfigStream';
export * from 'react-flight-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';

View File

@@ -7,5 +7,5 @@
* @flow
*/
export * from 'react-flight-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
export * from '../ReactFlightClientHostConfigNoStream';

View File

@@ -9,4 +9,4 @@
export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
export * from 'react-client/src/ReactFlightClientHostConfigStream';
export * from 'react-flight-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';

View File

@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-flight-dom-webpack.production.min.js');
} else {
module.exports = require('./cjs/react-flight-dom-webpack.development.js');
}

View File

@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-flight-dom-webpack-plugin.production.min.js');
} else {
module.exports = require('./cjs/react-flight-dom-webpack-plugin.development.js');
}

View File

@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-flight-dom-webpack-server-runtime.production.min.js');
} else {
module.exports = require('./cjs/react-flight-dom-webpack-server-runtime.development.js');
}

View File

@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-flight-dom-webpack-server.browser.production.min.js');
} else {
module.exports = require('./cjs/react-flight-dom-webpack-server.browser.development.js');
}

View File

@@ -1,7 +0,0 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-flight-dom-webpack-server.node.production.min.js');
} else {
module.exports = require('./cjs/react-flight-dom-webpack-server.node.development.js');
}

View File

@@ -8,4 +8,4 @@
*/
export * from '../ReactFlightServerConfigStream';
export * from 'react-flight-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';

View File

@@ -7,4 +7,4 @@
* @flow
*/
export * from 'react-flight-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig';

View File

@@ -8,4 +8,4 @@
*/
export * from '../ReactFlightServerConfigStream';
export * from 'react-flight-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';

View File

@@ -1,11 +1,11 @@
{
"name": "react-flight-dom-relay",
"name": "react-transport-dom-relay",
"version": "0.1.0",
"private": true,
"repository": {
"type" : "git",
"url" : "https://github.com/facebook/react.git",
"directory": "packages/react-flight-dom-relay"
"directory": "packages/react-transport-dom-relay"
},
"dependencies": {
"object-assign": "^4.1.1",

View File

@@ -21,9 +21,9 @@ describe('ReactFlightDOMRelay', () => {
act = require('react-dom/test-utils').act;
React = require('react');
ReactDOM = require('react-dom');
ReactDOMFlightRelayServer = require('react-flight-dom-relay/server');
ReactDOMFlightRelayServerRuntime = require('react-flight-dom-relay/server-runtime');
ReactDOMFlightRelayClient = require('react-flight-dom-relay');
ReactDOMFlightRelayServer = require('react-transport-dom-relay/server');
ReactDOMFlightRelayServerRuntime = require('react-transport-dom-relay/server-runtime');
ReactDOMFlightRelayClient = require('react-transport-dom-relay');
});
function readThrough(data) {

View File

@@ -1,4 +1,4 @@
# react-flight-dom-webpack
# react-transport-dom-webpack
Experimental React Flight bindings for DOM using Webpack.

View File

@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-transport-dom-webpack.production.min.js');
} else {
module.exports = require('./cjs/react-transport-dom-webpack.development.js');
}

View File

@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-transport-dom-webpack-plugin.production.min.js');
} else {
module.exports = require('./cjs/react-transport-dom-webpack-plugin.development.js');
}

View File

@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-transport-dom-webpack-server-runtime.production.min.js');
} else {
module.exports = require('./cjs/react-transport-dom-webpack-server-runtime.development.js');
}

View File

@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-transport-dom-webpack-server.browser.production.min.js');
} else {
module.exports = require('./cjs/react-transport-dom-webpack-server.browser.development.js');
}

View File

@@ -0,0 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-transport-dom-webpack-server.node.production.min.js');
} else {
module.exports = require('./cjs/react-transport-dom-webpack-server.node.development.js');
}

View File

@@ -1,6 +1,6 @@
{
"name": "react-flight-dom-webpack",
"description": "React Flight bindings for DOM using Webpack.",
"name": "react-transport-dom-webpack",
"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.",
"version": "0.1.0",
"private": true,
"keywords": [
@@ -28,7 +28,7 @@
"repository": {
"type" : "git",
"url" : "https://github.com/facebook/react.git",
"directory": "packages/react-flight-dom-webpack"
"directory": "packages/react-transport-dom-webpack"
},
"engines": {
"node": ">=0.10.0"

View File

@@ -28,9 +28,9 @@ let act;
let Stream;
let React;
let ReactDOM;
let ReactFlightDOMServer;
let ReactFlightDOMServerRuntime;
let ReactFlightDOMClient;
let ReactTransportDOMServer;
let ReactTransportDOMServerRuntime;
let ReactTransportDOMClient;
describe('ReactFlightDOM', () => {
beforeEach(() => {
@@ -41,9 +41,9 @@ describe('ReactFlightDOM', () => {
Stream = require('stream');
React = require('react');
ReactDOM = require('react-dom');
ReactFlightDOMServer = require('react-flight-dom-webpack/server');
ReactFlightDOMServerRuntime = require('react-flight-dom-webpack/server-runtime');
ReactFlightDOMClient = require('react-flight-dom-webpack');
ReactTransportDOMServer = require('react-transport-dom-webpack/server');
ReactTransportDOMServerRuntime = require('react-transport-dom-webpack/server-runtime');
ReactTransportDOMClient = require('react-transport-dom-webpack');
});
function getTestStream() {
@@ -76,14 +76,14 @@ describe('ReactFlightDOM', () => {
};
if (load === undefined) {
return () => {
return ReactFlightDOMServerRuntime.serverBlockNoData('path/' + idx);
return ReactTransportDOMServerRuntime.serverBlockNoData('path/' + idx);
};
}
return function(...args) {
const curriedLoad = () => {
return load(...args);
};
return ReactFlightDOMServerRuntime.serverBlock(
return ReactTransportDOMServerRuntime.serverBlock(
'path/' + idx,
curriedLoad,
);
@@ -125,8 +125,8 @@ describe('ReactFlightDOM', () => {
}
const {writable, readable} = getTestStream();
ReactFlightDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
const response = ReactFlightDOMClient.createFromReadableStream(readable);
ReactTransportDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
const response = ReactTransportDOMClient.createFromReadableStream(readable);
await waitForSuspense(() => {
const model = response.readRoot();
expect(model).toEqual({
@@ -175,12 +175,12 @@ describe('ReactFlightDOM', () => {
}
const {writable, readable} = getTestStream();
ReactFlightDOMServer.pipeToNodeWritable(
ReactTransportDOMServer.pipeToNodeWritable(
<RootModel />,
writable,
webpackMap,
);
const response = ReactFlightDOMClient.createFromReadableStream(readable);
const response = ReactTransportDOMClient.createFromReadableStream(readable);
const container = document.createElement('div');
const root = ReactDOM.createRoot(container);
@@ -214,12 +214,12 @@ describe('ReactFlightDOM', () => {
}
const {writable, readable} = getTestStream();
ReactFlightDOMServer.pipeToNodeWritable(
ReactTransportDOMServer.pipeToNodeWritable(
<RootModel />,
writable,
webpackMap,
);
const response = ReactFlightDOMClient.createFromReadableStream(readable);
const response = ReactTransportDOMClient.createFromReadableStream(readable);
const container = document.createElement('div');
const root = ReactDOM.createRoot(container);
@@ -251,12 +251,12 @@ describe('ReactFlightDOM', () => {
}
const {writable, readable} = getTestStream();
ReactFlightDOMServer.pipeToNodeWritable(
ReactTransportDOMServer.pipeToNodeWritable(
<RootModel />,
writable,
webpackMap,
);
const response = ReactFlightDOMClient.createFromReadableStream(readable);
const response = ReactTransportDOMClient.createFromReadableStream(readable);
const container = document.createElement('div');
const root = ReactDOM.createRoot(container);
@@ -410,8 +410,12 @@ describe('ReactFlightDOM', () => {
}
const {writable, readable} = getTestStream();
ReactFlightDOMServer.pipeToNodeWritable(profileModel, writable, webpackMap);
const response = ReactFlightDOMClient.createFromReadableStream(readable);
ReactTransportDOMServer.pipeToNodeWritable(
profileModel,
writable,
webpackMap,
);
const response = ReactTransportDOMClient.createFromReadableStream(readable);
const container = document.createElement('div');
const root = ReactDOM.createRoot(container);

View File

@@ -16,15 +16,15 @@ global.TextEncoder = require('util').TextEncoder;
global.TextDecoder = require('util').TextDecoder;
let React;
let ReactFlightDOMServer;
let ReactFlightDOMClient;
let ReactTransportDOMServer;
let ReactTransportDOMClient;
describe('ReactFlightDOMBrowser', () => {
beforeEach(() => {
jest.resetModules();
React = require('react');
ReactFlightDOMServer = require('react-flight-dom-webpack/server.browser');
ReactFlightDOMClient = require('react-flight-dom-webpack');
ReactTransportDOMServer = require('react-transport-dom-webpack/server.browser');
ReactTransportDOMClient = require('react-transport-dom-webpack');
});
async function waitForSuspense(fn) {
@@ -61,8 +61,8 @@ describe('ReactFlightDOMBrowser', () => {
return model;
}
const stream = ReactFlightDOMServer.renderToReadableStream(<App />);
const response = ReactFlightDOMClient.createFromReadableStream(stream);
const stream = ReactTransportDOMServer.renderToReadableStream(<App />);
const response = ReactTransportDOMClient.createFromReadableStream(stream);
await waitForSuspense(() => {
const model = response.readRoot();
expect(model).toEqual({

View File

@@ -237,43 +237,43 @@ const bundles = [
externals: ['react', 'react-dom/server'],
},
/******* React DOM Flight Server Webpack *******/
/******* React Transport DOM Server Webpack *******/
{
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-webpack/server.browser',
global: 'ReactFlightDOMServer',
entry: 'react-transport-dom-webpack/server.browser',
global: 'ReactTransportDOMServer',
externals: ['react', 'react-dom/server'],
},
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-webpack/server.node',
global: 'ReactFlightDOMServer',
entry: 'react-transport-dom-webpack/server.node',
global: 'ReactTransportDOMServer',
externals: ['react', 'react-dom/server'],
},
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-webpack/server-runtime',
global: 'ReactFlightDOMServerRuntime',
entry: 'react-transport-dom-webpack/server-runtime',
global: 'ReactTransportDOMServerRuntime',
externals: ['react'],
},
/******* React DOM Flight Client Webpack *******/
/******* React Transport DOM Client Webpack *******/
{
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-webpack',
global: 'ReactFlightDOMClient',
entry: 'react-transport-dom-webpack',
global: 'ReactTransportDOMClient',
externals: ['react'],
},
/******* React DOM Flight Webpack Plugin *******/
/******* React Transport DOM Webpack Plugin *******/
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER_UTILS,
entry: 'react-flight-dom-webpack/plugin',
entry: 'react-transport-dom-webpack/plugin',
global: 'ReactFlightWebpackPlugin',
externals: [],
babel: opts =>
@@ -289,11 +289,11 @@ const bundles = [
}),
},
/******* React DOM Flight Server Relay *******/
/******* React Transport DOM Server Relay *******/
{
bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-relay/server',
entry: 'react-transport-dom-relay/server',
global: 'ReactFlightDOMRelayServer',
externals: [
'react',
@@ -304,7 +304,7 @@ const bundles = [
{
bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-relay/server-runtime',
entry: 'react-transport-dom-relay/server-runtime',
global: 'ReactFlightDOMRelayServerRuntime',
externals: ['react', 'ReactFlightDOMRelayServerIntegration'],
},
@@ -313,7 +313,7 @@ const bundles = [
{
bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
moduleType: RENDERER,
entry: 'react-flight-dom-relay',
entry: 'react-transport-dom-relay',
global: 'ReactFlightDOMRelayClient',
externals: ['react', 'ReactFlightDOMRelayClientIntegration'],
},

View File

@@ -13,20 +13,20 @@ module.exports = [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.node',
'react-flight-dom-webpack/server.node',
'react-flight-dom-webpack/server-runtime',
'react-flight-dom-webpack',
'react-transport-dom-webpack/server.node',
'react-transport-dom-webpack/server-runtime',
'react-transport-dom-webpack',
],
paths: [
'react-dom',
'react-dom/unstable-fizz',
'react-dom/unstable-fizz.node',
'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
'react-flight-dom-webpack',
'react-flight-dom-webpack/server',
'react-flight-dom-webpack/server.node',
'react-flight-dom-webpack/server-runtime',
'react-flight-dom-webpack/src/ReactFlightDOMServerNode.js', // react-flight-dom-webpack/server.browser
'react-transport-dom-webpack',
'react-transport-dom-webpack/server',
'react-transport-dom-webpack/server.node',
'react-transport-dom-webpack/server-runtime',
'react-transport-dom-webpack/src/ReactFlightDOMServerNode.js', // react-transport-dom-webpack/server.browser
'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
'react-interactions',
],
@@ -39,19 +39,19 @@ module.exports = [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.browser',
'react-flight-dom-webpack/server.browser',
'react-flight-dom-webpack/server-runtime',
'react-flight-dom-webpack',
'react-transport-dom-webpack/server.browser',
'react-transport-dom-webpack/server-runtime',
'react-transport-dom-webpack',
],
paths: [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.browser',
'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
'react-flight-dom-webpack',
'react-flight-dom-webpack/server.browser',
'react-flight-dom-webpack/server-runtime',
'react-flight-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-flight-dom-webpack/server.browser
'react-transport-dom-webpack',
'react-transport-dom-webpack/server.browser',
'react-transport-dom-webpack/server-runtime',
'react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-transport-dom-webpack/server.browser
'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
],
isFlowTyped: true,
@@ -88,11 +88,11 @@ module.exports = [
{
shortName: 'dom-relay',
entryPoints: [
'react-flight-dom-relay',
'react-flight-dom-relay/server',
'react-flight-dom-relay/server-runtime',
'react-transport-dom-relay',
'react-transport-dom-relay/server',
'react-transport-dom-relay/server-runtime',
],
paths: ['react-dom', 'react-flight-dom-relay'],
paths: ['react-dom', 'react-transport-dom-relay'],
isFlowTyped: true,
isServerSupported: true,
},