metro 0.72.1 → 0.72.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.72.1",
+  "version": "0.72.2",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -36,22 +36,22 @@
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.72.1",
-    "metro-cache": "0.72.1",
-    "metro-cache-key": "0.72.1",
-    "metro-config": "0.72.1",
-    "metro-core": "0.72.1",
-    "metro-file-map": "0.72.1",
-    "metro-hermes-compiler": "0.72.1",
-    "metro-inspector-proxy": "0.72.1",
-    "metro-minify-uglify": "0.72.1",
-    "metro-react-native-babel-preset": "0.72.1",
-    "metro-resolver": "0.72.1",
-    "metro-runtime": "0.72.1",
-    "metro-source-map": "0.72.1",
-    "metro-symbolicate": "0.72.1",
-    "metro-transform-plugins": "0.72.1",
-    "metro-transform-worker": "0.72.1",
+    "metro-babel-transformer": "0.72.2",
+    "metro-cache": "0.72.2",
+    "metro-cache-key": "0.72.2",
+    "metro-config": "0.72.2",
+    "metro-core": "0.72.2",
+    "metro-file-map": "0.72.2",
+    "metro-hermes-compiler": "0.72.2",
+    "metro-inspector-proxy": "0.72.2",
+    "metro-minify-uglify": "0.72.2",
+    "metro-react-native-babel-preset": "0.72.2",
+    "metro-resolver": "0.72.2",
+    "metro-runtime": "0.72.2",
+    "metro-source-map": "0.72.2",
+    "metro-symbolicate": "0.72.2",
+    "metro-transform-plugins": "0.72.2",
+    "metro-transform-worker": "0.72.2",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,10 +70,12 @@
     "babel-jest": "^26.6.3",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-babel-register": "0.72.1",
-    "metro-memory-fs": "0.72.1",
-    "metro-react-native-babel-preset": "0.72.1",
-    "metro-react-native-babel-transformer": "0.72.1",
+    "metro-babel-register": "0.72.2",
+    "metro-memory-fs": "0.72.2",
+    "metro-react-native-babel-preset": "0.72.2",
+    "metro-react-native-babel-transformer": "0.72.2",
+    "mock-req": "^0.2.0",
+    "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/DeltaBundler/Serializers/baseBytecodeBundle.js

@@ -15,8 +15,6 @@ const { getJsOutput } = require("./helpers/js");
 
 const processBytecodeModules = require("./helpers/processBytecodeModules");
 
-const { compile } = require("metro-hermes-compiler");
-
 function baseBytecodeBundle(entryPoint, preModules, graph, options) {
   for (const module of graph.dependencies.values()) {
     options.createModuleId(module.path);
@@ -36,6 +34,9 @@ function baseBytecodeBundle(entryPoint, preModules, graph, options) {
   const modules = [...graph.dependencies.values()].sort(
     (a, b) => options.createModuleId(a.path) - options.createModuleId(b.path)
   );
+
+  const { compile } = require("metro-hermes-compiler");
+
   const post = processBytecodeModules(
     getAppendScripts(
       entryPoint,

package/src/DeltaBundler/Serializers/baseBytecodeBundle.js.flow

@@ -21,7 +21,6 @@ import type {BytecodeBundle} from 'metro-runtime/src/modules/types.flow';
 const getAppendScripts = require('../../lib/getAppendScripts');
 const {getJsOutput} = require('./helpers/js');
 const processBytecodeModules = require('./helpers/processBytecodeModules');
-const {compile} = require('metro-hermes-compiler');
 
 function baseBytecodeBundle(
   entryPoint: string,
@@ -50,6 +49,8 @@ function baseBytecodeBundle(
       options.createModuleId(a.path) - options.createModuleId(b.path),
   );
 
+  const {compile} = require('metro-hermes-compiler');
+
   const post = processBytecodeModules(
     getAppendScripts(
       entryPoint,

package/src/DeltaBundler/Serializers/helpers/bytecode.js

@@ -11,8 +11,6 @@
 
 const invariant = require("invariant");
 
-const { compile } = require("metro-hermes-compiler");
-
 const path = require("path");
 
 function wrapModule(module, options) {
@@ -39,6 +37,8 @@ function wrapModule(module, options) {
     );
   }
 
+  const { compile } = require("metro-hermes-compiler");
+
   const headerCode = `globalThis.$$METRO_D=[${params.join(",")}];`;
   return [
     compile(headerCode, {

package/src/DeltaBundler/Serializers/helpers/bytecode.js.flow

@@ -14,7 +14,6 @@ import type {Module} from '../../types.flow';
 import type {BytecodeOutput} from 'metro-transform-worker';
 
 const invariant = require('invariant');
-const {compile} = require('metro-hermes-compiler');
 const path = require('path');
 
 export type Options = {
@@ -48,6 +47,8 @@ function wrapModule(module: Module<>, options: Options): Array<Buffer> {
     );
   }
 
+  const {compile} = require('metro-hermes-compiler');
+
   const headerCode = `globalThis.$$METRO_D=[${params.join(',')}];`;
   return [
     compile(headerCode, {

package/src/DeltaBundler.js.flow

@@ -112,7 +112,7 @@ class DeltaBundler<T = MixedOutput> {
     return await deltaCalculator.getDelta({reset, shallow});
   }
 
-  listen(graph: Graph<T>, callback: () => mixed): () => void {
+  listen(graph: Graph<T>, callback: () => Promise<void>): () => void {
     const deltaCalculator = this._deltaCalculators.get(graph);
 
     if (!deltaCalculator) {

package/src/HmrServer.js

@@ -31,12 +31,14 @@ const {
   Logger: { createActionStartEntry, createActionEndEntry, log },
 } = require("metro-core");
 
-const { VERSION: BYTECODE_VERSION } = require("metro-hermes-compiler");
-
 const nullthrows = require("nullthrows");
 
 const url = require("url");
 
+function getBytecodeVersion() {
+  return require("metro-hermes-compiler").VERSION;
+}
+
 function send(sendFns, message) {
   const strMessage = JSON.stringify(message);
   sendFns.forEach((sendFn) => sendFn(strMessage));
@@ -75,9 +77,9 @@ class HmrServer {
     const options = parseOptionsFromUrl(
       requestUrl,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION
+      getBytecodeVersion()
     );
-    const { entryFile, transformOptions, graphOptions } =
+    const { entryFile, resolverOptions, transformOptions, graphOptions } =
       splitBundleOptions(options);
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
@@ -86,7 +88,8 @@ class HmrServer {
 
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
-      transformOptions.platform
+      transformOptions.platform,
+      resolverOptions
     );
     const resolvedEntryFilePath = resolutionFn(
       ((_this$_config$server$ = this._config.server.unstable_serverRoot) !==
@@ -96,6 +99,7 @@ class HmrServer {
       entryFile
     );
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
+      resolverOptions,
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,

package/src/HmrServer.js.flow

@@ -31,14 +31,13 @@ const transformHelpers = require('./lib/transformHelpers');
 const {
   Logger: {createActionStartEntry, createActionEndEntry, log},
 } = require('metro-core');
-const {VERSION: BYTECODE_VERSION} = require('metro-hermes-compiler');
 const nullthrows = require('nullthrows');
 const url = require('url');
 
 type $ReturnType<F> = $Call<<A, R>((...A) => R) => R, F>;
 export type EntryPointURL = $ReturnType<typeof url.parse>;
 
-type Client = {
+export type Client = {
   optedIntoHMR: boolean,
   revisionIds: Array<RevisionId>,
   +sendFn: string => void,
@@ -51,6 +50,10 @@ type ClientGroup = {
   +unlisten: () => void,
 };
 
+function getBytecodeVersion() {
+  return require('metro-hermes-compiler').VERSION;
+}
+
 function send(sendFns: Array<(string) => void>, message: HmrMessage): void {
   const strMessage = JSON.stringify(message);
   sendFns.forEach((sendFn: string => void) => sendFn(strMessage));
@@ -103,9 +106,9 @@ class HmrServer<TClient: Client> {
     const options = parseOptionsFromUrl(
       requestUrl,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION,
+      getBytecodeVersion(),
     );
-    const {entryFile, transformOptions, graphOptions} =
+    const {entryFile, resolverOptions, transformOptions, graphOptions} =
       splitBundleOptions(options);
 
     /**
@@ -115,6 +118,7 @@ class HmrServer<TClient: Client> {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
+      resolverOptions,
     );
     const resolvedEntryFilePath = resolutionFn(
       (this._config.server.unstable_serverRoot ?? this._config.projectRoot) +
@@ -122,6 +126,7 @@ class HmrServer<TClient: Client> {
       entryFile,
     );
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
+      resolverOptions,
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,

package/src/IncrementalBundler.js

@@ -71,6 +71,7 @@ class IncrementalBundler {
   async buildGraphForEntries(
     entryFiles,
     transformOptions,
+    resolverOptions,
     otherOptions = {
       onProgress: null,
       shallow: false,
@@ -80,14 +81,16 @@ class IncrementalBundler {
     const graph = await this._deltaBundler.buildGraph(absoluteEntryFiles, {
       resolve: await transformHelpers.getResolveDependencyFn(
         this._bundler,
-        transformOptions.platform
+        transformOptions.platform,
+        resolverOptions
       ),
       transform: await transformHelpers.getTransformFn(
         absoluteEntryFiles,
         this._bundler,
         this._deltaBundler,
         this._config,
-        transformOptions
+        transformOptions,
+        resolverOptions
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
@@ -111,6 +114,7 @@ class IncrementalBundler {
   async getDependencies(
     entryFiles,
     transformOptions,
+    resolverOptions,
     otherOptions = {
       onProgress: null,
       shallow: false,
@@ -122,14 +126,16 @@ class IncrementalBundler {
       {
         resolve: await transformHelpers.getResolveDependencyFn(
           this._bundler,
-          transformOptions.platform
+          transformOptions.platform,
+          resolverOptions
         ),
         transform: await transformHelpers.getTransformFn(
           absoluteEntryFiles,
           this._bundler,
           this._deltaBundler,
           this._config,
-          transformOptions
+          transformOptions,
+          resolverOptions
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
@@ -146,6 +152,7 @@ class IncrementalBundler {
   async buildGraph(
     entryFile,
     transformOptions,
+    resolverOptions,
     otherOptions = {
       onProgress: null,
       shallow: false,
@@ -154,12 +161,14 @@ class IncrementalBundler {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,
+      resolverOptions,
       otherOptions
     );
     const { type: _, ...transformOptionsWithoutType } = transformOptions;
     const prepend = await getPrependedScripts(
       this._config,
       transformOptionsWithoutType,
+      resolverOptions,
       this._bundler,
       this._deltaBundler
     );
@@ -173,12 +182,14 @@ class IncrementalBundler {
   async initializeGraph(
     entryFile,
     transformOptions,
+    resolverOptions,
     otherOptions = {
       onProgress: null,
       shallow: false,
     }
   ) {
     const graphId = getGraphId(entryFile, transformOptions, {
+      resolverOptions,
       shallow: otherOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
@@ -191,6 +202,7 @@ class IncrementalBundler {
       const { graph, prepend } = await this.buildGraph(
         entryFile,
         transformOptions,
+        resolverOptions,
         otherOptions
       );
       return {

package/src/IncrementalBundler.js.flow

@@ -17,6 +17,7 @@ import type {
   TransformInputOptions,
 } from './DeltaBundler/types.flow';
 import type {GraphId} from './lib/getGraphId';
+import type {ResolverInputOptions} from './shared/types.flow';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 const Bundler = require('./Bundler');
@@ -33,10 +34,10 @@ export opaque type RevisionId: string = string;
 
 export type OutputGraph = Graph<>;
 
-type OtherOptions = {
-  +onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
-  +shallow: boolean,
-};
+type OtherOptions = $ReadOnly<{
+  onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
+  shallow: boolean,
+}>;
 
 export type GraphRevision = {
   // Identifies the last computed revision.
@@ -100,6 +101,7 @@ class IncrementalBundler {
   async buildGraphForEntries(
     entryFiles: $ReadOnlyArray<string>,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -111,6 +113,7 @@ class IncrementalBundler {
       resolve: await transformHelpers.getResolveDependencyFn(
         this._bundler,
         transformOptions.platform,
+        resolverOptions,
       ),
       transform: await transformHelpers.getTransformFn(
         absoluteEntryFiles,
@@ -118,6 +121,7 @@ class IncrementalBundler {
         this._deltaBundler,
         this._config,
         transformOptions,
+        resolverOptions,
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
@@ -141,6 +145,7 @@ class IncrementalBundler {
   async getDependencies(
     entryFiles: $ReadOnlyArray<string>,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -154,6 +159,7 @@ class IncrementalBundler {
         resolve: await transformHelpers.getResolveDependencyFn(
           this._bundler,
           transformOptions.platform,
+          resolverOptions,
         ),
         transform: await transformHelpers.getTransformFn(
           absoluteEntryFiles,
@@ -161,6 +167,7 @@ class IncrementalBundler {
           this._deltaBundler,
           this._config,
           transformOptions,
+          resolverOptions,
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
@@ -178,6 +185,7 @@ class IncrementalBundler {
   async buildGraph(
     entryFile: string,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -186,6 +194,7 @@ class IncrementalBundler {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,
+      resolverOptions,
       otherOptions,
     );
 
@@ -194,6 +203,7 @@ class IncrementalBundler {
     const prepend = await getPrependedScripts(
       this._config,
       transformOptionsWithoutType,
+      resolverOptions,
       this._bundler,
       this._deltaBundler,
     );
@@ -209,6 +219,7 @@ class IncrementalBundler {
   async initializeGraph(
     entryFile: string,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -219,6 +230,7 @@ class IncrementalBundler {
     ...
   }> {
     const graphId = getGraphId(entryFile, transformOptions, {
+      resolverOptions,
       shallow: otherOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
@@ -230,6 +242,7 @@ class IncrementalBundler {
       const {graph, prepend} = await this.buildGraph(
         entryFile,
         transformOptions,
+        resolverOptions,
         otherOptions,
       );
       return {

package/src/ModuleGraph/node-haste/Package.js.flow

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {PackageData} from '../types.flow';
+import type {PackageData, Replacements} from '../types.flow';
 
 const nullthrows = require('nullthrows');
 const path = require('path');
@@ -57,7 +57,7 @@ module.exports = class Package {
     return !!this.data.name;
   }
 
-  redirectRequire(name: string): any | boolean | string {
+  redirectRequire(name: string): string | false {
     // Copied from node-haste/Package.js
     const replacements = getReplacements(this.data);
 
@@ -104,7 +104,7 @@ function getMain(pkg: PackageData): string {
 }
 
 // Copied from node-haste/Package.js
-function getReplacements(pkg: PackageData) {
+function getReplacements(pkg: PackageData): ?(string | Replacements) {
   let rn = pkg['react-native'];
   let browser = pkg.browser;
   if (rn == null) {
@@ -117,11 +117,11 @@ function getReplacements(pkg: PackageData) {
 
   const main = getMain(pkg);
   if (typeof rn !== 'object') {
-    rn = {[main]: rn};
+    rn = ({[main]: rn}: Replacements);
   }
 
   if (typeof browser !== 'object') {
-    browser = {[main]: browser};
+    browser = ({[main]: browser}: Replacements);
   }
 
   // merge with "browser" as default,

package/src/ModuleGraph/node-haste/node-haste.js

@@ -147,7 +147,6 @@ exports.createResolveFn = function (options) {
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
-    // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
     moduleMap: new _metroFileMap.ModuleMap({
       duplicates: new Map(),
@@ -181,8 +180,13 @@ exports.createResolveFn = function (options) {
     const from =
       sourcePath != null
         ? new Module(sourcePath, moduleCache, getTransformedFile(sourcePath))
-        : NULL_MODULE; // $FlowFixMe -- error revealed by types-first codemod
-
-    return moduleResolver.resolveDependency(from, id, true, platform).path;
+        : NULL_MODULE;
+    return moduleResolver.resolveDependency(
+      from,
+      id,
+      true,
+      platform,
+      options.resolverOptions
+    ).path;
   };
 };

package/src/ModuleGraph/node-haste/node-haste.js.flow

@@ -9,6 +9,7 @@
  */
 
 import type {Moduleish} from '../../node-haste/DependencyGraph/ModuleResolution';
+import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {ResolveFn, TransformedCodeFile} from '../types.flow';
 import type {Path} from './node-haste.flow';
 import type {ModuleMapData, ModuleMapItem} from 'metro-file-map';
@@ -26,13 +27,7 @@ const ModuleCache = require('./ModuleCache');
 const defaults = require('metro-config/src/defaults/defaults');
 const path = require('path');
 
-type ResolveOptions = {
-  /**
-   * (Used by the resolver) The extensions tried (in order) to implicitly
-   * locate a source file.
-   */
-  sourceExts: $ReadOnlyArray<string>,
-
+type ResolveOptions = $ReadOnly<{
   /**
    * The additional extensions to include in the file map as source files that
    * can be explicitly imported.
@@ -41,16 +36,24 @@ type ResolveOptions = {
 
   assetExts: $ReadOnlyArray<string>,
   assetResolutions: $ReadOnlyArray<string>,
-  +disableHierarchicalLookup: boolean,
-  +emptyModulePath: string,
+  disableHierarchicalLookup: boolean,
+  emptyModulePath: string,
   extraNodeModules: {[id: string]: string, ...},
   mainFields: $ReadOnlyArray<string>,
   nodeModulesPaths: $ReadOnlyArray<string>,
-  +platform: string,
+  platform: string,
   platforms?: $ReadOnlyArray<string>,
   resolveRequest?: ?CustomResolver,
+  resolverOptions: ResolverInputOptions,
+
+  /**
+   * (Used by the resolver) The extensions tried (in order) to implicitly
+   * locate a source file.
+   */
+  sourceExts: $ReadOnlyArray<string>,
+
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
-};
+}>;
 
 const NATIVE_PLATFORM = 'native';
 const GENERIC_PLATFORM = 'g';
@@ -173,7 +176,6 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
-    // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
     moduleMap: new ModuleMap({
       duplicates: new Map(),
@@ -213,7 +215,12 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
       sourcePath != null
         ? new Module(sourcePath, moduleCache, getTransformedFile(sourcePath))
         : NULL_MODULE;
-    // $FlowFixMe -- error revealed by types-first codemod
-    return moduleResolver.resolveDependency(from, id, true, platform).path;
+    return moduleResolver.resolveDependency(
+      from,
+      id,
+      true,
+      platform,
+      options.resolverOptions,
+    ).path;
   };
 };

package/src/ModuleGraph/output/util.js

@@ -17,9 +17,7 @@ const mergeSourceMaps = require("../worker/mergeSourceMaps");
 
 const reverseDependencyMapReferences = require("./reverse-dependency-map-references");
 
-const { parseSync, transformFromAstSync } = require("@babel/core");
-
-const HermesParser = require("hermes-parser"); // flowlint-next-line untyped-import:off
+const { parseSync, transformFromAstSync } = require("@babel/core"); // flowlint-next-line untyped-import:off
 
 const { passthroughSyntaxPlugins } = require("metro-react-native-babel-preset");
 
@@ -179,7 +177,7 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require("hermes-parser").parse(code, {
           babel: true,
           // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,

package/src/ModuleGraph/output/util.js.flow

@@ -18,7 +18,6 @@ const generate = require('../worker/generate');
 const mergeSourceMaps = require('../worker/mergeSourceMaps');
 const reverseDependencyMapReferences = require('./reverse-dependency-map-references');
 const {parseSync, transformFromAstSync} = require('@babel/core');
-const HermesParser = require('hermes-parser');
 // flowlint-next-line untyped-import:off
 const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
 const {addParamsToDefineCall} = require('metro-transform-plugins');
@@ -179,7 +178,7 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require('hermes-parser').parse(code, {
           babel: true,
           // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,