hanzoai/react
2
0
Fork 0
mirror of https://github.com/hanzoai/react.git synced 2026-09-24 17:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Use the server src files as entry points for the builds/tests

We need one top level entry point to target two builds so we can't have
the top level one be the entry point for the builds.

* Same thing but with the modern entry point
This commit is contained in:
Sebastian Markbåge
2021-06-14 16:23:19 -07:00
committed by GitHub
parent 950dae4e27
commit 4e54594aac
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fixtures/fizz-ssr-browser/index.html
+2 -2
View File
@@ -17,11 +17,11 @@
</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>,
fixtures/ssr/src/index.js
+1 -1
View File
@@ -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';
packages/react-dom/npm/server.browser.js
+2 -2
View File
@@ -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');
}
packages/react-dom/npm/server.node.js
+2 -2
View File
@@ -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');
}
packages/react-dom/npm/unstable-fizz.browser.js
+2 -2
View File
@@ -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');
}
packages/react-dom/npm/unstable-fizz.node.js
+2 -2
View File
@@ -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');
}
packages/react-dom/server.browser.classic.fb.js → packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js
+1 -1
View File
@@ -13,4 +13,4 @@ export {
renderToNodeStream,
renderToStaticNodeStream,
version,
} from './src/server/ReactDOMServerLegacyPartialRendererBrowser';
} from './ReactDOMServerLegacyPartialRendererBrowser';
scripts/rollup/bundles.js
+16 -13
View File
@@ -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 =>
@@ -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, {
@@ -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 *******/
@@ -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 *******/
@@ -340,7 +344,6 @@ const bundles = [
global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
externals: [
'react',
'react-dom/server',
'ReactFlightDOMRelayServerIntegration',
'JSResourceReference',
],
@@ -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('/', '-');
scripts/shared/inlinedHostConfigs.js
+6 -3
View File
@@ -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',
],
@@ -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',
],
@@ -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',