Skip to content

Commit 7afac56

Browse files
sebmarkbagesebmarkbage
committed
Move Flight DOM to Webpack Specific Packagee
We'll have Webpack specific coupling so we need to ensure that it can be versioned separately from various Webpack versions. We'll also have builds for other bundlers in the future.
1 parent 38dd17a commit 7afac56

30 files changed

+130
-53
lines changed

‎fixtures/flight-browser/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ <h1>Flight Example</h1>
1919
<script src="../../build/dist/react.development.js"></script>
2020
<script src="../../build/dist/react-dom.development.js"></script>
2121
<script src="../../build/dist/react-dom-server.browser.development.js"></script>
22-
<script src="../../build/dist/react-dom-unstable-flight-server.browser.development.js"></script>
23-
<script src="../../build/dist/react-dom-unstable-flight-client.development.js"></script>
22+
<script src="../../build/dist/react-flight-dom-webpack-server.browser.development.js"></script>
23+
<script src="../../build/dist/react-flight-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;

‎packages/react-dom/npm/unstable-flight-client.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/react-dom/npm/unstable-flight-server.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/react-dom/package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,13 @@
3939
"unstable-fizz.js",
4040
"unstable-fizz.browser.js",
4141
"unstable-fizz.node.js",
42-
"unstable-flight-client.js",
43-
"unstable-flight-server.js",
44-
"unstable-flight-server.browser.js",
45-
"unstable-flight-server.node.js",
4642
"unstable-native-dependencies.js",
4743
"cjs/",
4844
"umd/"
4945
],
5046
"browser": {
5147
"./server.js": "./server.browser.js",
52-
"./unstable-fizz.js": "./unstable-fizz.browser.js",
53-
"./unstable-flight-server.js": "./unstable-flight-server.browser.js"
48+
"./unstable-fizz.js": "./unstable-fizz.browser.js"
5449
},
5550
"browserify": {
5651
"transform": [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ describe('ReactFlightDOM', () => {
2424
jest.resetModules();
2525
Stream = require('stream');
2626
React = require('react');
27-
ReactFlightDOMServer = require('react-dom/unstable-flight-server');
28-
ReactFlightDOMClient = require('react-dom/unstable-flight-client');
27+
ReactFlightDOMServer = require('react-flight-dom-webpack/server');
28+
ReactFlightDOMClient = require('react-flight-dom-webpack');
2929
});
3030

3131
function getTestStream() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ describe('ReactFlightDOMBrowser', () => {
2323
beforeEach(() => {
2424
jest.resetModules();
2525
React = require('react');
26-
ReactFlightDOMServer = require('react-dom/unstable-flight-server.browser');
27-
ReactFlightDOMClient = require('react-dom/unstable-flight-client');
26+
ReactFlightDOMServer = require('react-flight-dom-webpack/server.browser');
27+
ReactFlightDOMClient = require('react-flight-dom-webpack');
2828
});
2929

3030
async function waitForSuspense(fn) {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# react-flight-dom-webpack
2+
3+
Experimental React Flight bindings for DOM using Webpack.
4+
5+
**Use it at your own risk.**

‎packages/react-dom/unstable-flight-client.js renamed to ‎packages/react-flight-dom-webpack/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
const ReactFlightDOMClient = require('./src/client/flight/ReactFlightDOMClient');
12+
const ReactFlightDOMClient = require('./src/ReactFlightDOMClient');
1313

1414
// TODO: decide on the top-level export form.
1515
// This is hacky but makes it work with both Rollup and Jest

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

Lines changed: 7 additions & 0 deletions
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-flight-dom-webpack.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-flight-dom-webpack.development.js');
7+
}

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

Lines changed: 7 additions & 0 deletions
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-flight-dom-webpack-server.browser.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-flight-dom-webpack-server.browser.development.js');
7+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = require('./server.node');

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

Lines changed: 7 additions & 0 deletions
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-flight-dom-webpack-server.node.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-flight-dom-webpack-server.node.development.js');
7+
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"name": "react-flight-dom-webpack",
3+
"description": "React Flight bindings for DOM using Webpack.",
4+
"version": "0.1.0",
5+
"private": true,
6+
"keywords": [
7+
"react"
8+
],
9+
"homepage": "https://reactjs.org/",
10+
"bugs": "https://github.com/facebook/react/issues",
11+
"license": "MIT",
12+
"files": [
13+
"LICENSE",
14+
"README.md",
15+
"index.js",
16+
"server.js",
17+
"server.browser.js",
18+
"server.node.js",
19+
"cjs/",
20+
"umd/"
21+
],
22+
"browser": {
23+
"./server.js": "./server.browser.js"
24+
},
25+
"main": "index.js",
26+
"repository": {
27+
"type" : "git",
28+
"url" : "https://github.com/facebook/react.git",
29+
"directory": "packages/react-flight-dom-webpack"
30+
},
31+
"engines": {
32+
"node": ">=0.10.0"
33+
},
34+
"peerDependencies": {
35+
"react": "^16.0.0",
36+
"react-dom": "^16.0.0"
37+
},
38+
"dependencies": {
39+
"loose-envify": "^1.1.0",
40+
"object-assign": "^4.1.1",
41+
"webpack": "^4.41.2"
42+
},
43+
"browserify": {
44+
"transform": [
45+
"loose-envify"
46+
]
47+
}
48+
}

‎packages/react-dom/unstable-flight-server.browser.js renamed to ‎packages/react-flight-dom-webpack/server.browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
const ReactFlightDOMServerBrowser = require('./src/server/flight/ReactFlightDOMServerBrowser');
12+
const ReactFlightDOMServerBrowser = require('./src/ReactFlightDOMServerBrowser');
1313

1414
// TODO: decide on the top-level export form.
1515
// This is hacky but makes it work with both Rollup and Jest

‎packages/react-dom/unstable-flight-server.js renamed to ‎packages/react-flight-dom-webpack/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
'use strict';
1111

12-
module.exports = require('./unstable-flight-server.node');
12+
module.exports = require('./server.node');

‎packages/react-dom/unstable-flight-server.node.js renamed to ‎packages/react-flight-dom-webpack/server.node.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
const ReactFlightDOMServerNode = require('./src/server/flight/ReactFlightDOMServerNode');
12+
const ReactFlightDOMServerNode = require('./src/ReactFlightDOMServerNode');
1313

1414
// TODO: decide on the top-level export form.
1515
// This is hacky but makes it work with both Rollup and Jest

‎packages/react-dom/src/client/flight/ReactFlightDOMClient.js renamed to ‎packages/react-flight-dom-webpack/src/ReactFlightDOMClient.js

File renamed without changes.

‎packages/react-dom/src/server/flight/ReactFlightDOMServerBrowser.js renamed to ‎packages/react-flight-dom-webpack/src/ReactFlightDOMServerBrowser.js

File renamed without changes.

‎packages/react-dom/src/server/flight/ReactFlightDOMServerNode.js renamed to ‎packages/react-flight-dom-webpack/src/ReactFlightDOMServerNode.js

File renamed without changes.

‎packages/react-dom/src/client/flight/ReactFlightDOMHostConfig.js renamed to ‎packages/react-flight/src/ReactFlightHostConfigBrowser.js

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from 'react-dom/src/client/flight/ReactFlightDOMHostConfig';
10+
export * from 'react-flight/src/ReactFlightHostConfigBrowser';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from 'react-dom/src/client/flight/ReactFlightDOMHostConfig';
10+
export * from 'react-flight/src/ReactFlightHostConfigBrowser';

‎packages/react-dom/src/server/ReactDOMServerFormatConfig.js renamed to ‎packages/react-server/src/ReactDOMServerFormatConfig.js

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
10+
export * from '../ReactDOMServerFormatConfig';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
10+
export * from '../ReactDOMServerFormatConfig';

‎scripts/rollup/bundles.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,23 @@ const bundles = [
170170
externals: ['react', 'react-dom/server'],
171171
},
172172

173-
/******* React DOM Flight Server *******/
173+
/******* React DOM Flight Server Webpack *******/
174174
{
175175
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
176176
moduleType: RENDERER,
177-
entry: 'react-dom/unstable-flight-server.browser',
177+
entry: 'react-flight-dom-webpack/server.browser',
178178
global: 'ReactFlightDOMServer',
179179
externals: ['react', 'react-dom/server'],
180180
},
181181
{
182182
bundleTypes: [NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD],
183183
moduleType: RENDERER,
184-
entry: 'react-dom/unstable-flight-server.node',
184+
entry: 'react-flight-dom-webpack/server.node',
185185
global: 'ReactFlightDOMServer',
186186
externals: ['react', 'react-dom/server'],
187187
},
188188

189-
/******* React DOM Flight Client *******/
189+
/******* React DOM Flight Client Webpack *******/
190190
{
191191
bundleTypes: [
192192
NODE_DEV,
@@ -197,7 +197,7 @@ const bundles = [
197197
FB_WWW_PROD,
198198
],
199199
moduleType: RENDERER,
200-
entry: 'react-dom/unstable-flight-client',
200+
entry: 'react-flight-dom-webpack',
201201
global: 'ReactFlightDOMClient',
202202
externals: ['react'],
203203
},

‎scripts/shared/inlinedHostConfigs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ module.exports = [
1212
entryPoints: [
1313
'react-dom',
1414
'react-dom/unstable-fizz.node',
15-
'react-dom/unstable-flight-server.node',
16-
'react-dom/unstable-flight-client',
15+
'react-flight-dom-webpack/server.node',
16+
'react-flight-dom-webpack',
1717
],
1818
isFlowTyped: true,
1919
isServerSupported: true,
@@ -22,8 +22,8 @@ module.exports = [
2222
shortName: 'dom-browser',
2323
entryPoints: [
2424
'react-dom/unstable-fizz.browser',
25-
'react-dom/unstable-flight-server.browser',
26-
'react-dom/unstable-flight-client',
25+
'react-flight-dom-webpack/server.browser',
26+
'react-flight-dom-webpack',
2727
],
2828
isFlowTyped: true,
2929
isServerSupported: true,

‎yarn.lock

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13268,6 +13268,35 @@ webpack@^4.26.0:
1326813268
watchpack "^1.6.0"
1326913269
webpack-sources "^1.4.1"
1327013270

13271+
webpack@^4.41.2:
13272+
version "4.41.2"
13273+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
13274+
integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
13275+
dependencies:
13276+
"@webassemblyjs/ast" "1.8.5"
13277+
"@webassemblyjs/helper-module-context" "1.8.5"
13278+
"@webassemblyjs/wasm-edit" "1.8.5"
13279+
"@webassemblyjs/wasm-parser" "1.8.5"
13280+
acorn "^6.2.1"
13281+
ajv "^6.10.2"
13282+
ajv-keywords "^3.4.1"
13283+
chrome-trace-event "^1.0.2"
13284+
enhanced-resolve "^4.1.0"
13285+
eslint-scope "^4.0.3"
13286+
json-parse-better-errors "^1.0.2"
13287+
loader-runner "^2.4.0"
13288+
loader-utils "^1.2.3"
13289+
memory-fs "^0.4.1"
13290+
micromatch "^3.1.10"
13291+
mkdirp "^0.5.1"
13292+
neo-async "^2.6.1"
13293+
node-libs-browser "^2.2.1"
13294+
schema-utils "^1.0.0"
13295+
tapable "^1.1.3"
13296+
terser-webpack-plugin "^1.4.1"
13297+
watchpack "^1.6.0"
13298+
webpack-sources "^1.4.1"
13299+
1327113300
websocket-driver@>=0.5.1:
1327213301
version "0.7.3"
1327313302
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"

0 commit comments

Comments
 (0)