From 0b7350e2ef163bc448697740929a742b175b1304 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 26 Apr 2024 02:46:10 -0500 Subject: [PATCH 1/5] fix: react server condition for `react/jsx-dev-runtime` --- packages/react/jsx-dev-runtime.react-server.js | 10 ++++++++++ packages/react/package.json | 5 ++++- scripts/rollup/bundles.js | 13 +++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/react/jsx-dev-runtime.react-server.js diff --git a/packages/react/jsx-dev-runtime.react-server.js b/packages/react/jsx-dev-runtime.react-server.js new file mode 100644 index 0000000000000..0ba4fcb82a637 --- /dev/null +++ b/packages/react/jsx-dev-runtime.react-server.js @@ -0,0 +1,10 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export {Fragment, jsxDEV} from './src/jsx/ReactJSXServer'; diff --git a/packages/react/package.json b/packages/react/package.json index b7d511806cbbf..187e1dc862228 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -29,7 +29,10 @@ "react-server": "./jsx-runtime.react-server.js", "default": "./jsx-runtime.js" }, - "./jsx-dev-runtime": "./jsx-dev-runtime.js", + "./jsx-dev-runtime": { + "react-server": "./jsx-dev-runtime.js", + "default": "./jsx-dev-runtime.js" + }, "./src/*": "./src/*" }, "repository": { diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index f84f556d17550..428f2c61a109a 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -149,6 +149,19 @@ const bundles = [ externals: ['react', 'ReactNativeInternalFeatureFlags'], }, + /******* React JSX DEV Runtime React Server *******/ + { + bundleTypes: [NODE_DEV, NODE_PROD], + moduleType: ISOMORPHIC, + entry: 'react/src/jsx/ReactJSXServer.js', + name: 'react-jsx-dev-runtime.react-server', + condition: 'react-server', + global: 'JSXDEVRuntime', + minifyWithProdErrorCodes: false, + wrapWithModuleBoundaries: false, + externals: ['react', 'ReactNativeInternalFeatureFlags'], + }, + /******* React DOM *******/ { bundleTypes: [NODE_DEV, NODE_PROD], From 377f9a3578d21bee19db247d29d8ed1fe4d71bc1 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 26 Apr 2024 02:50:21 -0500 Subject: [PATCH 2/5] fix: react-server --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 187e1dc862228..0bee6d970473e 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,7 +30,7 @@ "default": "./jsx-runtime.js" }, "./jsx-dev-runtime": { - "react-server": "./jsx-dev-runtime.js", + "react-server": "./jsx-dev-runtime.react-server.js", "default": "./jsx-dev-runtime.js" }, "./src/*": "./src/*" From 4717c8e42b362023e4c76bb4b2cd3f6ccc65d5bd Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 26 Apr 2024 02:54:30 -0500 Subject: [PATCH 3/5] fix: copy file --- packages/react/npm/jsx-dev-runtime.react-server.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/react/npm/jsx-dev-runtime.react-server.js diff --git a/packages/react/npm/jsx-dev-runtime.react-server.js b/packages/react/npm/jsx-dev-runtime.react-server.js new file mode 100644 index 0000000000000..cd80277331d46 --- /dev/null +++ b/packages/react/npm/jsx-dev-runtime.react-server.js @@ -0,0 +1,7 @@ +'use strict'; + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./cjs/react-jsx-runtime.react-server.production.min.js'); +} else { + module.exports = require('./cjs/react-jsx-runtime.react-server.development.js'); +} From 52a138d2da35872d288d352104648c9be11f1a27 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 26 Apr 2024 02:55:19 -0500 Subject: [PATCH 4/5] fix: file path --- packages/react/npm/jsx-dev-runtime.react-server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react/npm/jsx-dev-runtime.react-server.js b/packages/react/npm/jsx-dev-runtime.react-server.js index cd80277331d46..184f1201d00a0 100644 --- a/packages/react/npm/jsx-dev-runtime.react-server.js +++ b/packages/react/npm/jsx-dev-runtime.react-server.js @@ -1,7 +1,7 @@ 'use strict'; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-jsx-runtime.react-server.production.min.js'); + module.exports = require('./cjs/react-jsx-dev-runtime.react-server.production.min.js'); } else { - module.exports = require('./cjs/react-jsx-runtime.react-server.development.js'); + module.exports = require('./cjs/react-jsx-dev-runtime.react-server.development.js'); } From faf1bc67f535615c5be3e6788594ccd6473924c1 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 26 Apr 2024 03:05:20 -0500 Subject: [PATCH 5/5] fix: files --- packages/react/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react/package.json b/packages/react/package.json index 0bee6d970473e..d19f37f1135f2 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -16,6 +16,7 @@ "jsx-runtime.js", "jsx-runtime.react-server.js", "jsx-dev-runtime.js", + "jsx-dev-runtime.react-server.js", "react.react-server.js" ], "main": "index.js",