diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index 93c02ce844649..6303918228036 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -144,7 +144,6 @@ function getBabelConfig( updateBabelOptions, bundleType, packageName, - externals, isDevelopment, bundle ) { @@ -354,7 +353,6 @@ function forbidFBJSImports() { function getPlugins( entry, - externals, updateBabelOptions, filename, packageName, @@ -402,8 +400,8 @@ function getPlugins( forbidFBJSImports(), // Use Node resolution mechanism. resolve({ - // skip: externals, // TODO: options.skip was removed in @rollup/plugin-node-resolve 3.0.0 - preferBuiltins: bundle.preferBuiltins, + // `external` rollup config takes care of marking builtins as externals + preferBuiltins: false, }), // Remove license headers from individual modules stripBanner({ @@ -415,7 +413,6 @@ function getPlugins( updateBabelOptions, bundleType, packageName, - externals, !isProduction, bundle ) @@ -690,7 +687,6 @@ async function createBundle(bundle, bundleType) { onwarn: handleRollupWarning, plugins: getPlugins( bundle.entry, - externals, bundle.babel, filename, packageName, diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 749548f8ec51f..33bce79e4c781 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -363,7 +363,14 @@ const bundles = [ global: 'ReactDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'crypto', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, { bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [], @@ -460,7 +467,14 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'crypto', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, { bundleTypes: [NODE_DEV, NODE_PROD], @@ -472,7 +486,14 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'crypto', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, { bundleTypes: [NODE_DEV, NODE_PROD], @@ -483,7 +504,7 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'crypto', 'async_hooks', 'react-dom'], + externals: ['react'], }, /******* React Server DOM Webpack Client *******/ @@ -588,7 +609,14 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, { bundleTypes: [NODE_DEV, NODE_PROD], @@ -599,7 +627,7 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'async_hooks', 'react-dom'], + externals: ['react'], }, /******* React Server DOM Turbopack Client *******/ @@ -656,7 +684,14 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, { bundleTypes: [NODE_DEV, NODE_PROD], @@ -667,7 +702,7 @@ const bundles = [ global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'async_hooks', 'react-dom'], + externals: ['react', 'react-dom'], }, /******* React Server DOM Parcel Client *******/ @@ -711,7 +746,14 @@ const bundles = [ condition: 'react-server', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'util', 'crypto', 'async_hooks', 'react-dom'], + externals: [ + 'react', + 'react-dom', + 'async_hooks', + 'crypto', + 'stream', + 'util', + ], }, /******* React Server DOM ESM Client *******/ @@ -729,7 +771,7 @@ const bundles = [ entry: 'react-server-dom-esm/client.node', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, - externals: ['react', 'react-dom', 'util', 'crypto'], + externals: ['react', 'react-dom', 'util'], }, /******* React Server DOM ESM Node.js Loader *******/ @@ -1215,6 +1257,8 @@ const bundles = [ 'hermes-parser', 'zod', 'zod-validation-error', + 'crypto', + 'util', ], tsconfig: './packages/eslint-plugin-react-hooks/tsconfig.json', prebuild: `mkdir -p ./compiler/packages/babel-plugin-react-compiler/dist && echo "module.exports = require('../src/index.ts');" > ./compiler/packages/babel-plugin-react-compiler/dist/index.js`,