Move experimentalImportBundleSupport option from transformer to server

Summary: `experimentalImportBundleSupport` (introduced in D15943150 (72329d0)) is never used to change the transformer's output for a given module, so having it under `transformer` is (1) confusing and (2) inefficient, because it gets added to the transformer cache key and therefore forks the transformer cache. Here we move it to `server` while keeping it as an experimental, undocumented option (for now). This change removes one of the blockers to officially releasing this feature in open source: `metro build` only ever makes sense with `experimentalImportBundleSupport: false`, but prior to this diff, it couldn't share a cache with `metro serve` running with `experimentalImportBundleSupport: true` - so enabling this feature in the server would have regressed Metro's overall perceived performance on a given machine. Changelog: [Internal] Reviewed By: jacdebug Differential Revision: D40389568 fbshipit-source-id: 644d070ff069e8396b9f44e8429147a42727eb5f
facebook · Oct 18, 2022 · 3c0e1f7 · 3c0e1f7
1 parent a557c3c
commit 3c0e1f7
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 22 deletions.
diff --git a/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap b/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap
@@ -88,6 +88,7 @@ Object {
   },
   "server": Object {
     "enhanceMiddleware": [Function],
+    "experimentalImportBundleSupport": false,
     "port": 8080,
     "rewriteRequestUrl": [Function],
     "runInspectorProxy": true,
@@ -108,7 +109,6 @@ Object {
     "dynamicDepsInPackages": "throwAtRuntime",
     "enableBabelRCLookup": true,
     "enableBabelRuntime": true,
-    "experimentalImportBundleSupport": false,
     "getTransformOptions": [Function],
     "globalPrefix": "",
     "hermesParser": false,
@@ -255,6 +255,7 @@ Object {
   },
   "server": Object {
     "enhanceMiddleware": [Function],
+    "experimentalImportBundleSupport": false,
     "port": 8080,
     "rewriteRequestUrl": [Function],
     "runInspectorProxy": true,
@@ -275,7 +276,6 @@ Object {
     "dynamicDepsInPackages": "throwAtRuntime",
     "enableBabelRCLookup": true,
     "enableBabelRuntime": true,
-    "experimentalImportBundleSupport": false,
     "getTransformOptions": [Function],
     "globalPrefix": "",
     "hermesParser": false,
@@ -422,6 +422,7 @@ Object {
   },
   "server": Object {
     "enhanceMiddleware": [Function],
+    "experimentalImportBundleSupport": false,
     "port": 8080,
     "rewriteRequestUrl": [Function],
     "runInspectorProxy": true,
@@ -442,7 +443,6 @@ Object {
     "dynamicDepsInPackages": "throwAtRuntime",
     "enableBabelRCLookup": true,
     "enableBabelRuntime": true,
-    "experimentalImportBundleSupport": false,
     "getTransformOptions": [Function],
     "globalPrefix": "",
     "hermesParser": false,
@@ -589,6 +589,7 @@ Object {
   },
   "server": Object {
     "enhanceMiddleware": [Function],
+    "experimentalImportBundleSupport": false,
     "port": 8080,
     "rewriteRequestUrl": [Function],
     "runInspectorProxy": true,
@@ -609,7 +610,6 @@ Object {
     "dynamicDepsInPackages": "throwAtRuntime",
     "enableBabelRCLookup": true,
     "enableBabelRuntime": true,
-    "experimentalImportBundleSupport": false,
     "getTransformOptions": [Function],
     "globalPrefix": "",
     "hermesParser": false,

diff --git a/packages/metro-config/src/configTypes.flow.js b/packages/metro-config/src/configTypes.flow.js
@@ -131,7 +131,6 @@ type TransformerConfigT = {
   transformVariants: TransformVariants,
   workerPath: string,
   publicPath: string,
-  experimentalImportBundleSupport: boolean,
 };
 
 type MetalConfigT = {
@@ -152,11 +151,12 @@ type MetalConfigT = {
 
 type ServerConfigT = {
   enhanceMiddleware: (Middleware, Server) => Middleware,
-  useGlobalHotkey: boolean,
+  experimentalImportBundleSupport: boolean,
   port: number,
-  unstable_serverRoot: ?string,
   rewriteRequestUrl: string => string,
   runInspectorProxy: boolean,
+  unstable_serverRoot: ?string,
+  useGlobalHotkey: boolean,
   verifyConnections: boolean,
 };
 

diff --git a/packages/metro-config/src/defaults/index.js b/packages/metro-config/src/defaults/index.js
@@ -65,13 +65,14 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({
   },
 
   server: {
-    useGlobalHotkey: true,
-    port: 8080,
     enhanceMiddleware: middleware => middleware,
+    experimentalImportBundleSupport: false,
+    port: 8080,
     rewriteRequestUrl: url => url,
     runInspectorProxy: true,
-    verifyConnections: false,
     unstable_serverRoot: null,
+    useGlobalHotkey: true,
+    verifyConnections: false,
   },
 
   symbolicator: {
@@ -86,7 +87,6 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({
     dynamicDepsInPackages: 'throwAtRuntime',
     enableBabelRCLookup: true,
     enableBabelRuntime: true,
-    experimentalImportBundleSupport: false,
     getTransformOptions: async () => ({
       transform: {
         experimentalImportSupport: false,

diff --git a/packages/metro-transform-worker/src/__tests__/index-test.js b/packages/metro-transform-worker/src/__tests__/index-test.js
@@ -53,7 +53,6 @@ const baseConfig: JsTransformerConfig = {
   dynamicDepsInPackages: 'reject',
   enableBabelRCLookup: false,
   enableBabelRuntime: true,
-  experimentalImportBundleSupport: false,
   globalPrefix: '',
   hermesParser: false,
   minifierConfig: {},

diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js
@@ -86,7 +86,6 @@ export type JsTransformerConfig = $ReadOnly<{
   dynamicDepsInPackages: DynamicRequiresBehavior,
   enableBabelRCLookup: boolean,
   enableBabelRuntime: boolean | string,
-  experimentalImportBundleSupport: boolean,
   globalPrefix: string,
   hermesParser: boolean,
   minifierConfig: MinifierConfig,

diff --git a/packages/metro/src/HmrServer.js b/packages/metro/src/HmrServer.js
@@ -129,7 +129,7 @@ class HmrServer<TClient: Client> {
       resolverOptions,
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
-        this._config.transformer.experimentalImportBundleSupport,
+        this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
     });

diff --git a/packages/metro/src/IncrementalBundler.js b/packages/metro/src/IncrementalBundler.js
@@ -127,7 +127,7 @@ class IncrementalBundler {
       transformOptions,
       onProgress: otherOptions.onProgress,
       experimentalImportBundleSupport:
-        this._config.transformer.experimentalImportBundleSupport,
+        this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
       shallow: otherOptions.shallow,
@@ -173,7 +173,7 @@ class IncrementalBundler {
         transformOptions,
         onProgress: otherOptions.onProgress,
         experimentalImportBundleSupport:
-          this._config.transformer.experimentalImportBundleSupport,
+          this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
         shallow: otherOptions.shallow,
@@ -234,7 +234,7 @@ class IncrementalBundler {
       resolverOptions,
       shallow: otherOptions.shallow,
       experimentalImportBundleSupport:
-        this._config.transformer.experimentalImportBundleSupport,
+        this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
     });

diff --git a/packages/metro/src/Server.js b/packages/metro/src/Server.js
@@ -574,7 +574,7 @@ class Server {
       });
       const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
         experimentalImportBundleSupport:
-          this._config.transformer.experimentalImportBundleSupport,
+          this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
         resolverOptions,
@@ -1231,7 +1231,7 @@ class Server {
 
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       experimentalImportBundleSupport:
-        this._config.transformer.experimentalImportBundleSupport,
+        this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
       resolverOptions,

diff --git a/packages/metro/src/__tests__/HmrServer-test.js b/packages/metro/src/__tests__/HmrServer-test.js
@@ -120,11 +120,11 @@ describe('HmrServer', () => {
       serializer: {experimentalSerializerHook: () => {}},
       reporter: {update: jest.fn()},
       transformer: {
-        experimentalImportBundleSupport: false,
         unstable_allowRequireContext: false,
       },
       resolver: {platforms: []},
       server: {
+        experimentalImportBundleSupport: false,
         rewriteRequestUrl(requrl) {
           const rewritten = requrl.replace(
             /__REMOVE_THIS_WHEN_REWRITING__/g,

diff --git a/packages/metro/src/lib/getPrependedScripts.js b/packages/metro/src/lib/getPrependedScripts.js
@@ -68,7 +68,7 @@ async function getPrependedScripts(
       transformOptions,
       onProgress: null,
       experimentalImportBundleSupport:
-        config.transformer.experimentalImportBundleSupport,
+        config.server.experimentalImportBundleSupport,
       shallow: false,
     },
   );

diff --git a/packages/metro/src/lib/transformHelpers.js b/packages/metro/src/lib/transformHelpers.js
@@ -84,7 +84,7 @@ async function calcTransformerOptions(
       transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
-        config.transformer.experimentalImportBundleSupport,
+        config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       shallow: false,