Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the server src files as entry points for the builds/tests #21683

Merged
merged 2 commits into from
Jun 14, 2021
Merged

Use the server src files as entry points for the builds/tests #21683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4025adf
Use the server src files as entry points for the builds/tests
sebmarkbage Jun 14, 2021
3849e6a
Same thing but with the modern entry point
sebmarkbage Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fixtures/fizz-ssr-browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ <h1>Fizz Example</h1>
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-unstable-fizz.browser.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel">
let controller = new AbortController();
let stream = ReactDOMFizzServer.renderToReadableStream(
let stream = ReactDOMServer.renderToReadableStream(
<html>
<body>Success</body>
</html>,
Expand Down
2 changes: 1 addition & 1 deletion fixtures/ssr/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {unstable_createRoot as createRoot} from 'react-dom';
import {createRoot} from 'react-dom';

import App from './components/App';

Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/npm/server.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom-server.browser.production.min.js');
module.exports = require('./cjs/react-dom-server-legacy.browser.production.min.js');
} else {
module.exports = require('./cjs/react-dom-server.browser.development.js');
module.exports = require('./cjs/react-dom-server-legacy.browser.development.js');
}
4 changes: 2 additions & 2 deletions packages/react-dom/npm/server.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom-server.node.production.min.js');
module.exports = require('./cjs/react-dom-server-legacy.node.production.min.js');
} else {
module.exports = require('./cjs/react-dom-server.node.development.js');
module.exports = require('./cjs/react-dom-server-legacy.node.development.js');
}
4 changes: 2 additions & 2 deletions packages/react-dom/npm/unstable-fizz.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom-unstable-fizz.browser.production.min.js');
module.exports = require('./cjs/react-dom-server.browser.production.min.js');
} else {
module.exports = require('./cjs/react-dom-unstable-fizz.browser.development.js');
module.exports = require('./cjs/react-dom-server.browser.development.js');
}
4 changes: 2 additions & 2 deletions packages/react-dom/npm/unstable-fizz.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-dom-unstable-fizz.node.production.min.js');
module.exports = require('./cjs/react-dom-server.node.production.min.js');
} else {
module.exports = require('./cjs/react-dom-unstable-fizz.node.development.js');
module.exports = require('./cjs/react-dom-server.node.development.js');
}
2 changes: 1 addition & 1 deletion ...es/react-dom/server.browser.classic.fb.js → ...ReactDOMLegacyServerBrowser.classic.fb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export {
renderToNodeStream,
renderToStaticNodeStream,
version,
} from './src/server/ReactDOMServerLegacyPartialRendererBrowser';
} from './ReactDOMServerLegacyPartialRendererBrowser';
29 changes: 16 additions & 13 deletions scripts/rollup/bundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ const bundles = [
? [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD]
: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD],
moduleType: RENDERER,
entry: 'react-dom/server.browser',
entry: 'react-dom/src/server/ReactDOMLegacyServerBrowser',
name: 'react-dom-server-legacy.browser',
global: 'ReactDOMServer',
externals: ['react'],
babel: opts =>
Expand All @@ -247,7 +248,8 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-dom/server.node',
entry: 'react-dom/src/server/ReactDOMLegacyServerNode',
name: 'react-dom-server-legacy.node',
externals: ['react', 'stream'],
babel: opts =>
Object.assign({}, opts, {
Expand All @@ -261,23 +263,25 @@ const bundles = [
{
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
moduleType: RENDERER,
entry: 'react-dom/unstable-fizz.browser',
global: 'ReactDOMFizzServer',
externals: ['react', 'react-dom/server'],
entry: 'react-dom/src/server/ReactDOMFizzServerBrowser',
name: 'react-dom-server.browser',
global: 'ReactDOMServer',
externals: ['react'],
},
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-dom/unstable-fizz.node',
global: 'ReactDOMFizzServer',
externals: ['react', 'react-dom/server'],
entry: 'react-dom/src/server/ReactDOMFizzServerNode',
name: 'react-dom-server.node',
global: 'ReactDOMServer',
externals: ['react'],
},
{
bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [],
moduleType: RENDERER,
entry: 'react-server-dom-relay/src/ReactDOMServerFB',
global: 'ReactDOMServer',
externals: ['react', 'react-dom/server'],
externals: ['react'],
},

/******* React Server DOM Webpack Writer *******/
Expand All @@ -286,14 +290,14 @@ const bundles = [
moduleType: RENDERER,
entry: 'react-server-dom-webpack/writer.browser.server',
global: 'ReactServerDOMWriter',
externals: ['react', 'react-dom/server'],
externals: ['react'],
},
{
bundleTypes: [NODE_DEV, NODE_PROD],
moduleType: RENDERER,
entry: 'react-server-dom-webpack/writer.node.server',
global: 'ReactServerDOMWriter',
externals: ['react', 'react-dom/server'],
externals: ['react'],
},

/******* React Server DOM Webpack Reader *******/
Expand Down Expand Up @@ -340,7 +344,6 @@ const bundles = [
global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
externals: [
'react',
'react-dom/server',
'ReactFlightDOMRelayServerIntegration',
'JSResourceReference',
],
Expand Down Expand Up @@ -785,7 +788,7 @@ deepFreeze(bundleTypes);
deepFreeze(moduleTypes);

function getOriginalFilename(bundle, bundleType) {
let name = bundle.entry;
let name = bundle.name || bundle.entry;
const globalName = bundle.global;
// we do this to replace / to -, for react-dom/server
name = name.replace('/index.', '.').replace('/', '-');
Expand Down
9 changes: 6 additions & 3 deletions scripts/shared/inlinedHostConfigs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = [
entryPoints: [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.node',
'react-dom/src/server/ReactDOMFizzServerNode',
'react-server-dom-webpack/writer.node.server',
'react-server-dom-webpack',
],
Expand All @@ -36,7 +36,7 @@ module.exports = [
entryPoints: [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.browser',
'react-dom/src/server/ReactDOMFizzServerBrowser',
'react-server-dom-webpack/writer.browser.server',
'react-server-dom-webpack',
],
Expand All @@ -55,7 +55,10 @@ module.exports = [
},
{
shortName: 'dom-legacy',
entryPoints: ['react-dom/server.browser', 'react-dom/server.node'],
entryPoints: [
'react-dom/src/server/ReactDOMLegacyServerBrowser', // react-dom/server.browser
'react-dom/src/server/ReactDOMLegacyServerNode', // react-dom/server.node
],
paths: [
'react-dom',
'react-dom/server',
Expand Down