metro 0.80.8 → 0.80.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.80.8",
+  "version": "0.80.10",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -27,34 +27,34 @@
     "debug": "^2.2.0",
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
+    "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.20.1",
+    "hermes-parser": "0.23.0",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.80.8",
-    "metro-cache": "0.80.8",
-    "metro-cache-key": "0.80.8",
-    "metro-config": "0.80.8",
-    "metro-core": "0.80.8",
-    "metro-file-map": "0.80.8",
-    "metro-resolver": "0.80.8",
-    "metro-runtime": "0.80.8",
-    "metro-source-map": "0.80.8",
-    "metro-symbolicate": "0.80.8",
-    "metro-transform-plugins": "0.80.8",
-    "metro-transform-worker": "0.80.8",
+    "metro-babel-transformer": "0.80.10",
+    "metro-cache": "0.80.10",
+    "metro-cache-key": "0.80.10",
+    "metro-config": "0.80.10",
+    "metro-core": "0.80.10",
+    "metro-file-map": "0.80.10",
+    "metro-resolver": "0.80.10",
+    "metro-runtime": "0.80.10",
+    "metro-source-map": "0.80.10",
+    "metro-symbolicate": "0.80.10",
+    "metro-transform-plugins": "0.80.10",
+    "metro-transform-worker": "0.80.10",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
-    "rimraf": "^3.0.2",
     "serialize-error": "^2.1.0",
     "source-map": "^0.5.6",
     "strip-ansi": "^6.0.0",
     "throat": "^5.0.0",
-    "ws": "^7.5.1",
+    "ws": "^7.5.10",
     "yargs": "^17.6.2"
   },
   "devDependencies": {
@@ -66,8 +66,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.80.8",
-    "metro-memory-fs": "0.80.8",
+    "metro-babel-register": "0.80.10",
+    "metro-memory-fs": "0.80.10",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/DeltaBundler/Serializers/baseJSBundle.js

@@ -35,6 +35,7 @@ function baseJSBundle(entryPoint, preModules, graph, options) {
       shouldAddToIgnoreList: options.shouldAddToIgnoreList,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      getSourceUrl: options.getSourceUrl,
     }),
     processModulesOptions
   )

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

@@ -67,6 +67,7 @@ function baseJSBundle(
       shouldAddToIgnoreList: options.shouldAddToIgnoreList,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      getSourceUrl: options.getSourceUrl,
     }),
     processModulesOptions,
   )

package/src/DeltaBundler/Serializers/getRamBundleInfo.js

@@ -21,6 +21,7 @@ async function getRamBundleInfo(entryPoint, pre, graph, options) {
         excludeSource: options.excludeSource,
         processModuleFilter: options.processModuleFilter,
         shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+        getSourceUrl: options.getSourceUrl,
       }),
       name: path.basename(module.path),
       sourcePath: module.path,

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

@@ -65,6 +65,7 @@ async function getRamBundleInfo(
         excludeSource: options.excludeSource,
         processModuleFilter: options.processModuleFilter,
         shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+        getSourceUrl: options.getSourceUrl,
       }),
       name: path.basename(module.path),
       sourcePath: module.path,

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

@@ -5,7 +5,7 @@ function getSourceMapInfo(module, options) {
   return {
     ...getJsOutput(module).data,
     isIgnored: options.shouldAddToIgnoreList(module),
-    path: module.path,
+    path: options?.getSourceUrl?.(module) ?? module.path,
     source: options.excludeSource ? "" : getModuleSource(module),
   };
 }

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

@@ -24,6 +24,7 @@ function getSourceMapInfo(
   options: {
     +excludeSource: boolean,
     +shouldAddToIgnoreList: (Module<>) => boolean,
+    getSourceUrl: ?(module: Module<>) => string,
   },
 ): {
   +map: Array<MetroSourceMapSegmentTuple>,
@@ -37,7 +38,7 @@ function getSourceMapInfo(
   return {
     ...getJsOutput(module).data,
     isIgnored: options.shouldAddToIgnoreList(module),
-    path: module.path,
+    path: options?.getSourceUrl?.(module) ?? module.path,
     source: options.excludeSource ? '' : getModuleSource(module),
   };
 }

package/src/DeltaBundler/Serializers/sourceMapGenerator.js

@@ -19,6 +19,7 @@ function getSourceMapInfosImpl(isBlocking, onDone, modules, options) {
     const info = getSourceMapInfo(mod, {
       excludeSource: options.excludeSource,
       shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+      getSourceUrl: options.getSourceUrl,
     });
     sourceMapInfos.push(info);
     return false;

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

@@ -24,6 +24,7 @@ export type SourceMapGeneratorOptions = $ReadOnly<{
   excludeSource: boolean,
   processModuleFilter: (module: Module<>) => boolean,
   shouldAddToIgnoreList: (module: Module<>) => boolean,
+  getSourceUrl: ?(module: Module<>) => string,
 }>;
 
 function getSourceMapInfosImpl(
@@ -43,9 +44,11 @@ function getSourceMapInfosImpl(
     }
 
     const mod = modulesToProcess.shift();
+    // $FlowFixMe[incompatible-call]
     const info = getSourceMapInfo(mod, {
       excludeSource: options.excludeSource,
       shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+      getSourceUrl: options.getSourceUrl,
     });
     sourceMapInfos.push(info);
     return false;

package/src/DeltaBundler/Serializers/sourceMapString.js

@@ -1,9 +1,21 @@
 "use strict";
 
-const { sourceMapGenerator } = require("./sourceMapGenerator");
+const {
+  sourceMapGenerator,
+  sourceMapGeneratorNonBlocking,
+} = require("./sourceMapGenerator");
 function sourceMapString(modules, options) {
   return sourceMapGenerator(modules, options).toString(undefined, {
     excludeSource: options.excludeSource,
   });
 }
-module.exports = sourceMapString;
+async function sourceMapStringNonBlocking(modules, options) {
+  const generator = await sourceMapGeneratorNonBlocking(modules, options);
+  return generator.toString(undefined, {
+    excludeSource: options.excludeSource,
+  });
+}
+module.exports = {
+  sourceMapString,
+  sourceMapStringNonBlocking,
+};

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

@@ -14,7 +14,10 @@
 import type {Module} from '../types.flow';
 import type {SourceMapGeneratorOptions} from './sourceMapGenerator';
 
-const {sourceMapGenerator} = require('./sourceMapGenerator');
+const {
+  sourceMapGenerator,
+  sourceMapGeneratorNonBlocking,
+} = require('./sourceMapGenerator');
 
 function sourceMapString(
   modules: $ReadOnlyArray<Module<>>,
@@ -25,4 +28,17 @@ function sourceMapString(
   });
 }
 
-module.exports = sourceMapString;
+async function sourceMapStringNonBlocking(
+  modules: $ReadOnlyArray<Module<>>,
+  options: SourceMapGeneratorOptions,
+): Promise<string> {
+  const generator = await sourceMapGeneratorNonBlocking(modules, options);
+  return generator.toString(undefined, {
+    excludeSource: options.excludeSource,
+  });
+}
+
+module.exports = {
+  sourceMapString,
+  sourceMapStringNonBlocking,
+};

package/src/DeltaBundler/Transformer.js

@@ -64,7 +64,7 @@ class Transformer {
     const localPath = path.relative(this._config.projectRoot, filePath);
     const partialKey = stableHash([
       this._baseHash,
-      localPath,
+      path.sep === "/" ? localPath : localPath.replaceAll(path.sep, "/"),
       customTransformOptions,
       dev,
       experimentalImportSupport,
@@ -88,7 +88,16 @@ class Transformer {
       sha1 = this._getSha1(filePath);
     }
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, "hex")]);
-    const result = await cache.get(fullKey);
+    let result;
+    try {
+      result = await cache.get(fullKey);
+    } catch (error) {
+      this._config.reporter.update({
+        type: "cache_read_error",
+        error,
+      });
+      throw error;
+    }
     const data = result
       ? {
           result,
@@ -102,7 +111,12 @@ class Transformer {
     if (sha1 !== data.sha1) {
       fullKey = Buffer.concat([partialKey, Buffer.from(data.sha1, "hex")]);
     }
-    void cache.set(fullKey, data.result);
+    cache.set(fullKey, data.result).catch((error) => {
+      this._config.reporter.update({
+        type: "cache_write_error",
+        error,
+      });
+    });
     return {
       ...data.result,
       unstable_transformResultKey: fullKey.toString(),

package/src/DeltaBundler/Transformer.js.flow

@@ -105,8 +105,10 @@ class Transformer {
       // This is the hash related to the global Bundler config.
       this._baseHash,
 
-      // Path.
-      localPath,
+      // Project-relative, posix-separated path for portability. Necessary in
+      // addition to content hash because transformers receive path as an
+      // input, and may apply e.g. extension-based logic.
+      path.sep === '/' ? localPath : localPath.replaceAll(path.sep, '/'),
 
       customTransformOptions,
       dev,
@@ -131,7 +133,16 @@ class Transformer {
     }
 
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, 'hex')]);
-    const result = await cache.get(fullKey);
+    let result;
+    try {
+      result = await cache.get(fullKey);
+    } catch (error) {
+      this._config.reporter.update({
+        type: 'cache_read_error',
+        error,
+      });
+      throw error;
+    }
 
     // A valid result from the cache is used directly; otherwise we call into
     // the transformer to computed the corresponding result.
@@ -154,7 +165,12 @@ class Transformer {
     }
 
     // Fire-and-forget cache set promise.
-    void cache.set(fullKey, data.result);
+    cache.set(fullKey, data.result).catch(error => {
+      this._config.reporter.update({
+        type: 'cache_write_error',
+        error,
+      });
+    });
 
     return {
       ...data.result,

package/src/DeltaBundler/types.flow.js.flow

@@ -23,7 +23,7 @@ export type MixedOutput = {
   +type: string,
 };
 
-export type AsyncDependencyType = 'async' | 'prefetch' | 'weak';
+export type AsyncDependencyType = 'async' | 'maybeSync' | 'prefetch' | 'weak';
 
 export type TransformResultDependency = $ReadOnly<{
   /**
@@ -175,4 +175,5 @@ export type SerializerOptions = $ReadOnly<{
   shouldAddToIgnoreList: (Module<>) => boolean,
   sourceMapUrl: ?string,
   sourceUrl: ?string,
+  getSourceUrl: ?(Module<>) => string,
 }>;

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -56,7 +56,8 @@ function wrapModule(
   importDefaultName,
   importAllName,
   dependencyMapName,
-  globalPrefix
+  globalPrefix,
+  skipRequireRename
 ) {
   const params = buildParameters(
     importDefaultName,
@@ -66,7 +67,7 @@ function wrapModule(
   const factory = functionFromProgram(fileAst.program, params);
   const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [factory]);
   const ast = t.file(t.program([t.expressionStatement(def)]));
-  const requireName = renameRequires(ast);
+  const requireName = skipRequireRename ? "require" : renameRequires(ast);
   return {
     ast,
     requireName,

package/src/ModuleGraph/worker/JsFileWrapping.js.flow

@@ -32,6 +32,7 @@ function wrapModule(
   importAllName: string,
   dependencyMapName: string,
   globalPrefix: string,
+  skipRequireRename: boolean,
 ): {
   ast: BabelNodeFile,
   requireName: string,
@@ -45,7 +46,9 @@ function wrapModule(
   const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [factory]);
   const ast = t.file(t.program([t.expressionStatement(def)]));
 
-  const requireName = renameRequires(ast);
+  // `require` doesn't need to be scoped when Metro serializes to iife because the local function
+  // `require` will be used instead of the global one.
+  const requireName = skipRequireRename ? 'require' : renameRequires(ast);
 
   return {ast, requireName};
 }

package/src/ModuleGraph/worker/collectDependencies.js

@@ -67,6 +67,21 @@ function collectDependencies(ast, options) {
         visited.add(path.node);
         return;
       }
+      if (
+        callee.type === "MemberExpression" &&
+        callee.object.type === "Identifier" &&
+        callee.object.name === "require" &&
+        callee.property.type === "Identifier" &&
+        callee.property.name === "unstable_importMaybeSync" &&
+        !callee.computed &&
+        !path.scope.getBinding("require")
+      ) {
+        processImportCall(path, state, {
+          asyncType: "maybeSync",
+        });
+        visited.add(path.node);
+        return;
+      }
       if (
         name != null &&
         state.dependencyCalls.has(name) &&
@@ -261,10 +276,21 @@ function processImportCall(path, state, options) {
     path
   );
   const transformer = state.dependencyTransformer;
-  if (options.asyncType === "async") {
-    transformer.transformImportCall(path, dep, state);
-  } else {
-    transformer.transformPrefetch(path, dep, state);
+  switch (options.asyncType) {
+    case "async":
+      transformer.transformImportCall(path, dep, state);
+      break;
+    case "maybeSync":
+      transformer.transformImportMaybeSyncCall(path, dep, state);
+      break;
+    case "prefetch":
+      transformer.transformPrefetch(path, dep, state);
+      break;
+    case "weak":
+      throw new Error("Unreachable");
+    default:
+      options.asyncType;
+      throw new Error("Unreachable");
   }
 }
 function processRequireCall(path, state) {
@@ -380,6 +406,12 @@ const makeAsyncPrefetchTemplate = template.expression(`
 const makeAsyncPrefetchTemplateWithName = template.expression(`
   require(ASYNC_REQUIRE_MODULE_PATH).prefetch(MODULE_ID, DEPENDENCY_MAP.paths, MODULE_NAME)
 `);
+const makeAsyncImportMaybeSyncTemplate = template.expression(`
+  require(ASYNC_REQUIRE_MODULE_PATH).unstable_importMaybeSync(MODULE_ID, DEPENDENCY_MAP.paths)
+`);
+const makeAsyncImportMaybeSyncTemplateWithName = template.expression(`
+  require(ASYNC_REQUIRE_MODULE_PATH).unstable_importMaybeSync(MODULE_ID, DEPENDENCY_MAP.paths, MODULE_NAME)
+`);
 const makeResolveWeakTemplate = template.expression(`
   MODULE_ID
 `);
@@ -409,6 +441,24 @@ const DefaultDependencyTransformer = {
     };
     path.replaceWith(makeNode(opts));
   },
+  transformImportMaybeSyncCall(path, dependency, state) {
+    const makeNode = state.keepRequireNames
+      ? makeAsyncImportMaybeSyncTemplateWithName
+      : makeAsyncImportMaybeSyncTemplate;
+    const opts = {
+      ASYNC_REQUIRE_MODULE_PATH: nullthrows(
+        state.asyncRequireModulePathStringLiteral
+      ),
+      MODULE_ID: createModuleIDExpression(dependency, state),
+      DEPENDENCY_MAP: nullthrows(state.dependencyMapIdentifier),
+      ...(state.keepRequireNames
+        ? {
+            MODULE_NAME: createModuleNameLiteral(dependency),
+          }
+        : null),
+    };
+    path.replaceWith(makeNode(opts));
+  },
   transformPrefetch(path, dependency, state) {
     const makeNode = state.keepRequireNames
       ? makeAsyncPrefetchTemplateWithName

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -112,6 +112,11 @@ export interface DependencyTransformer {
     dependency: InternalDependency,
     state: State,
   ): void;
+  transformImportMaybeSyncCall(
+    path: NodePath<>,
+    dependency: InternalDependency,
+    state: State,
+  ): void;
   transformPrefetch(
     path: NodePath<>,
     dependency: InternalDependency,
@@ -214,6 +219,26 @@ function collectDependencies(
         return;
       }
 
+      // Match `require.unstable_importMaybeSync`
+      if (
+        callee.type === 'MemberExpression' &&
+        // `require`
+        callee.object.type === 'Identifier' &&
+        callee.object.name === 'require' &&
+        // `unstable_importMaybeSync`
+        callee.property.type === 'Identifier' &&
+        callee.property.name === 'unstable_importMaybeSync' &&
+        !callee.computed &&
+        // Ensure `require` refers to the global and not something else.
+        !path.scope.getBinding('require')
+      ) {
+        processImportCall(path, state, {
+          asyncType: 'maybeSync',
+        });
+        visited.add(path.node);
+        return;
+      }
+
       if (
         name != null &&
         state.dependencyCalls.has(name) &&
@@ -456,10 +481,21 @@ function processImportCall(
 
   const transformer = state.dependencyTransformer;
 
-  if (options.asyncType === 'async') {
-    transformer.transformImportCall(path, dep, state);
-  } else {
-    transformer.transformPrefetch(path, dep, state);
+  switch (options.asyncType) {
+    case 'async':
+      transformer.transformImportCall(path, dep, state);
+      break;
+    case 'maybeSync':
+      transformer.transformImportMaybeSyncCall(path, dep, state);
+      break;
+    case 'prefetch':
+      transformer.transformPrefetch(path, dep, state);
+      break;
+    case 'weak':
+      throw new Error('Unreachable');
+    default:
+      options.asyncType as empty;
+      throw new Error('Unreachable');
   }
 }
 
@@ -639,6 +675,14 @@ const makeAsyncPrefetchTemplateWithName = template.expression(`
   require(ASYNC_REQUIRE_MODULE_PATH).prefetch(MODULE_ID, DEPENDENCY_MAP.paths, MODULE_NAME)
 `);
 
+const makeAsyncImportMaybeSyncTemplate = template.expression(`
+  require(ASYNC_REQUIRE_MODULE_PATH).unstable_importMaybeSync(MODULE_ID, DEPENDENCY_MAP.paths)
+`);
+
+const makeAsyncImportMaybeSyncTemplateWithName = template.expression(`
+  require(ASYNC_REQUIRE_MODULE_PATH).unstable_importMaybeSync(MODULE_ID, DEPENDENCY_MAP.paths, MODULE_NAME)
+`);
+
 const makeResolveWeakTemplate = template.expression(`
   MODULE_ID
 `);
@@ -683,6 +727,27 @@ const DefaultDependencyTransformer: DependencyTransformer = {
     path.replaceWith(makeNode(opts));
   },
 
+  transformImportMaybeSyncCall(
+    path: NodePath<>,
+    dependency: InternalDependency,
+    state: State,
+  ): void {
+    const makeNode = state.keepRequireNames
+      ? makeAsyncImportMaybeSyncTemplateWithName
+      : makeAsyncImportMaybeSyncTemplate;
+    const opts = {
+      ASYNC_REQUIRE_MODULE_PATH: nullthrows(
+        state.asyncRequireModulePathStringLiteral,
+      ),
+      MODULE_ID: createModuleIDExpression(dependency, state),
+      DEPENDENCY_MAP: nullthrows(state.dependencyMapIdentifier),
+      ...(state.keepRequireNames
+        ? {MODULE_NAME: createModuleNameLiteral(dependency)}
+        : null),
+    };
+    path.replaceWith(makeNode(opts));
+  },
+
   transformPrefetch(
     path: NodePath<>,
     dependency: InternalDependency,