metro 0.76.2 → 0.76.4

package/src/integration_tests/execBundle.js.flow

@@ -13,6 +13,9 @@
 
 const vm = require('vm');
 
-module.exports = function execBundle(code: string, context: {...} = {}): mixed {
+module.exports = function execBundle(code: string, context: any = {}): mixed {
+  if (vm.isContext(context)) {
+    return vm.runInContext(code, context);
+  }
   return vm.runInNewContext(code, context);
 };

package/src/integration_tests/metro.config.js

@@ -45,4 +45,9 @@ module.exports = {
       ramGroups: [],
     }),
   },
+  serializer: {
+    getPolyfills: () => [
+      require.resolve("./basic_bundle/loadBundleAsyncForTest"),
+    ],
+  },
 };

package/src/lib/getAppendScripts.js

@@ -53,6 +53,7 @@ function getAppendScripts(entryPoint, modules, options) {
           sourceMapString(modules, {
             processModuleFilter: () => true,
             excludeSource: false,
+            shouldAddToIgnoreList: options.shouldAddToIgnoreList,
           })
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/getAppendScripts.js.flow

@@ -20,17 +20,18 @@ const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
 const countLines = require('./countLines');
 const nullthrows = require('nullthrows');
 
-type Options<T: number | string> = {
-  +asyncRequireModulePath: string,
-  +createModuleId: string => T,
-  +getRunModuleStatement: T => string,
-  +inlineSourceMap: ?boolean,
-  +runBeforeMainModule: $ReadOnlyArray<string>,
-  +runModule: boolean,
-  +sourceMapUrl: ?string,
-  +sourceUrl: ?string,
+type Options<T: number | string> = $ReadOnly<{
+  asyncRequireModulePath: string,
+  createModuleId: string => T,
+  getRunModuleStatement: T => string,
+  inlineSourceMap: ?boolean,
+  runBeforeMainModule: $ReadOnlyArray<string>,
+  runModule: boolean,
+  shouldAddToIgnoreList: (Module<>) => boolean,
+  sourceMapUrl: ?string,
+  sourceUrl: ?string,
   ...
-};
+}>;
 
 function getAppendScripts<T: number | string>(
   entryPoint: string,
@@ -73,6 +74,7 @@ function getAppendScripts<T: number | string>(
           sourceMapString(modules, {
             processModuleFilter: (): boolean => true,
             excludeSource: false,
+            shouldAddToIgnoreList: options.shouldAddToIgnoreList,
           }),
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/getGraphId.js

@@ -15,12 +15,7 @@ const canonicalize = require("metro-core/src/canonicalize");
 function getGraphId(
   entryFile,
   options,
-  {
-    shallow,
-    experimentalImportBundleSupport,
-    unstable_allowRequireContext,
-    resolverOptions,
-  }
+  { shallow, lazy, unstable_allowRequireContext, resolverOptions }
 ) {
   return JSON.stringify(
     {
@@ -35,7 +30,7 @@ function getGraphId(
         unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
-        experimentalImportBundleSupport,
+        lazy,
         unstable_allowRequireContext,
         shallow,
         unstable_transformProfile:

package/src/lib/getGraphId.js.flow

@@ -23,12 +23,12 @@ function getGraphId(
   options: TransformInputOptions,
   {
     shallow,
-    experimentalImportBundleSupport,
+    lazy,
     unstable_allowRequireContext,
     resolverOptions,
   }: $ReadOnly<{
     shallow: boolean,
-    experimentalImportBundleSupport: boolean,
+    lazy: boolean,
     unstable_allowRequireContext: boolean,
     resolverOptions: ResolverInputOptions,
   }>,
@@ -46,7 +46,7 @@ function getGraphId(
         unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
-        experimentalImportBundleSupport,
+        lazy,
         unstable_allowRequireContext,
         shallow,
         unstable_transformProfile:

package/src/lib/getPrependedScripts.js

@@ -57,8 +57,7 @@ async function getPrependedScripts(
         config.transformer.unstable_allowRequireContext,
       transformOptions,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
       shallow: false,

package/src/lib/getPrependedScripts.js.flow

@@ -67,8 +67,7 @@ async function getPrependedScripts(
         config.transformer.unstable_allowRequireContext,
       transformOptions,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
       shallow: false,

package/src/lib/parseOptionsFromUrl.js

@@ -45,6 +45,7 @@ module.exports = function parseOptionsFromUrl(requestUrl, platforms) {
     excludeSource: getBoolean(query, "excludeSource", false),
     hot: true,
     inlineSourceMap: getBoolean(query, "inlineSourceMap", false),
+    lazy: getBoolean(query, "lazy", false),
     minify: getBoolean(query, "minify", false),
     modulesOnly: getBoolean(query, "modulesOnly", false),
     onProgress: null,

package/src/lib/parseOptionsFromUrl.js.flow

@@ -60,6 +60,7 @@ module.exports = function parseOptionsFromUrl(
     excludeSource: getBoolean(query, 'excludeSource', false),
     hot: true,
     inlineSourceMap: getBoolean(query, 'inlineSourceMap', false),
+    lazy: getBoolean(query, 'lazy', false),
     minify: getBoolean(query, 'minify', false),
     modulesOnly: getBoolean(query, 'modulesOnly', false),
     onProgress: null,

package/src/lib/splitBundleOptions.js

@@ -39,6 +39,7 @@ function splitBundleOptions(options) {
     },
     graphOptions: {
       shallow: options.shallow,
+      lazy: options.lazy,
     },
     onProgress: options.onProgress,
   };

package/src/lib/splitBundleOptions.js.flow

@@ -41,6 +41,7 @@ function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
     },
     graphOptions: {
       shallow: options.shallow,
+      lazy: options.lazy,
     },
     onProgress: options.onProgress,
   };

package/src/lib/transformHelpers.js

@@ -67,8 +67,7 @@ async function calcTransformerOptions(
       ),
       transformOptions: options,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:

package/src/lib/transformHelpers.js.flow

@@ -85,8 +85,7 @@ async function calcTransformerOptions(
       ),
       transformOptions: options,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:

package/src/shared/types.d.ts

@@ -46,6 +46,7 @@ export interface BundleOptions {
   readonly excludeSource: boolean;
   readonly hot: boolean;
   readonly inlineSourceMap: boolean;
+  readonly lazy: boolean;
   minify: boolean;
   readonly modulesOnly: boolean;
   onProgress?: (doneCont: number, totalCount: number) => unknown;
@@ -73,6 +74,7 @@ export interface SerializerOptions {
 }
 
 export interface GraphOptions {
+  readonly lazy: boolean;
   readonly shallow: boolean;
 }
 

package/src/shared/types.flow.js.flow

@@ -50,6 +50,7 @@ export type BundleOptions = {
   +excludeSource: boolean,
   +hot: boolean,
   +inlineSourceMap: boolean,
+  +lazy: boolean,
   minify: boolean,
   +modulesOnly: boolean,
   onProgress: ?(doneCont: number, totalCount: number) => mixed,
@@ -76,6 +77,7 @@ export type SerializerOptions = {
 };
 
 export type GraphOptions = {
+  +lazy: boolean,
   +shallow: boolean,
 };