metro 0.74.1 → 0.75.1

package/package.json

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

package/src/DeltaBundler/DeltaCalculator.js

@@ -11,7 +11,11 @@
 
 "use strict";
 
+var _path = _interopRequireDefault(require("path"));
 var _Graph = require("./Graph");
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");
 
@@ -25,6 +29,7 @@ class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
   _addedFiles = new Set();
+  _requiresReset = false;
   constructor(entryPoints, changeEventSource, options) {
     super();
     this._options = options;
@@ -61,6 +66,7 @@ class DeltaCalculator extends EventEmitter {
    * which contain the modified/added modules and the removed modules.
    */
   async getDelta({ reset, shallow }) {
+    debug("Calculating delta (reset: %s, shallow: %s)", reset, shallow);
     // If there is already a build in progress, wait until it finish to start
     // processing a new one (delta server doesn't support concurrent builds).
     if (this._currentBuildPromise) {
@@ -76,6 +82,21 @@ class DeltaCalculator extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
+
+    // Revisit all files if changes require a graph reset - resolutions may be
+    // invalidated but we don't yet know which. This should be optimized in the
+    // future.
+    if (requiresReset) {
+      const markModified = (file) => {
+        if (!addedFiles.has(file) && !deletedFiles.has(file)) {
+          modifiedFiles.add(file);
+        }
+      };
+      this._graph.dependencies.forEach((_, key) => markModified(key));
+      this._graph.entryPoints.forEach(markModified);
+    }
 
     // Concurrent requests should reuse the same bundling process. To do so,
     // this method stores the promise as an instance variable, and then it's
@@ -148,6 +169,16 @@ class DeltaCalculator extends EventEmitter {
    */
   _handleFileChange = ({ type, filePath, metadata }, logger) => {
     debug("Handling %s: %s (type: %s)", type, filePath, metadata.type);
+    if (
+      metadata.type === "l" ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(_path.default.sep + "package.json"))
+    ) {
+      this._requiresReset = true;
+      this.emit("change", {
+        logger,
+      });
+    }
     let state;
     if (this._deletedFiles.has(filePath)) {
       state = "deleted";
@@ -209,13 +240,13 @@ class DeltaCalculator extends EventEmitter {
     // If a file has been deleted, we want to invalidate any other file that
     // depends on it, so we can process it and correctly return an error.
     deletedFiles.forEach((filePath) => {
-      for (const path of this._graph.getModifiedModulesForDeletedPath(
+      for (const modifiedModulePath of this._graph.getModifiedModulesForDeletedPath(
         filePath
       )) {
         // Only mark the inverse dependency as modified if it's not already
         // marked as deleted (in that case we can just ignore it).
-        if (!deletedFiles.has(path)) {
-          modifiedFiles.add(path);
+        if (!deletedFiles.has(modifiedModulePath)) {
+          modifiedFiles.add(modifiedModulePath);
         }
       }
     });

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -11,6 +11,7 @@
 
 'use strict';
 
+import path from 'path';
 import {Graph} from './Graph';
 import type {DeltaResult, Options} from './types.flow';
 import type {RootPerfLogger} from 'metro-config';
@@ -33,6 +34,7 @@ class DeltaCalculator<T> extends EventEmitter {
   _deletedFiles: Set<string> = new Set();
   _modifiedFiles: Set<string> = new Set();
   _addedFiles: Set<string> = new Set();
+  _requiresReset = false;
 
   _graph: Graph<T>;
 
@@ -87,6 +89,7 @@ class DeltaCalculator<T> extends EventEmitter {
     shallow: boolean,
     ...
   }): Promise<DeltaResult<T>> {
+    debug('Calculating delta (reset: %s, shallow: %s)', reset, shallow);
     // If there is already a build in progress, wait until it finish to start
     // processing a new one (delta server doesn't support concurrent builds).
     if (this._currentBuildPromise) {
@@ -102,6 +105,21 @@ class DeltaCalculator<T> extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
+
+    // Revisit all files if changes require a graph reset - resolutions may be
+    // invalidated but we don't yet know which. This should be optimized in the
+    // future.
+    if (requiresReset) {
+      const markModified = (file: string) => {
+        if (!addedFiles.has(file) && !deletedFiles.has(file)) {
+          modifiedFiles.add(file);
+        }
+      };
+      this._graph.dependencies.forEach((_, key) => markModified(key));
+      this._graph.entryPoints.forEach(markModified);
+    }
 
     // Concurrent requests should reuse the same bundling process. To do so,
     // this method stores the promise as an instance variable, and then it's
@@ -190,6 +208,14 @@ class DeltaCalculator<T> extends EventEmitter {
     logger: ?RootPerfLogger,
   ): mixed => {
     debug('Handling %s: %s (type: %s)', type, filePath, metadata.type);
+    if (
+      metadata.type === 'l' ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(path.sep + 'package.json'))
+    ) {
+      this._requiresReset = true;
+      this.emit('change', {logger});
+    }
     let state: void | 'deleted' | 'modified' | 'added';
     if (this._deletedFiles.has(filePath)) {
       state = 'deleted';
@@ -259,13 +285,13 @@ class DeltaCalculator<T> extends EventEmitter {
     // If a file has been deleted, we want to invalidate any other file that
     // depends on it, so we can process it and correctly return an error.
     deletedFiles.forEach((filePath: string) => {
-      for (const path of this._graph.getModifiedModulesForDeletedPath(
+      for (const modifiedModulePath of this._graph.getModifiedModulesForDeletedPath(
         filePath,
       )) {
         // Only mark the inverse dependency as modified if it's not already
         // marked as deleted (in that case we can just ignore it).
-        if (!deletedFiles.has(path)) {
-          modifiedFiles.add(path);
+        if (!deletedFiles.has(modifiedModulePath)) {
+          modifiedFiles.add(modifiedModulePath);
         }
       }
     });

package/src/DeltaBundler/WorkerFarm.js

@@ -78,6 +78,7 @@ class WorkerFarm {
     return new JestWorker(workerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+          // $FlowFixMe[incompatible-call]
           this._computeWorkerKey
         : undefined,
       exposedMethods,

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -120,6 +120,7 @@ class WorkerFarm {
     return new JestWorker(workerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+          // $FlowFixMe[incompatible-call]
           this._computeWorkerKey
         : undefined,
       exposedMethods,

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

@@ -138,6 +138,7 @@ export type Options<T = MixedOutput> = {
   +onProgress: ?(numProcessed: number, total: number) => mixed,
   +experimentalImportBundleSupport: boolean,
   +unstable_allowRequireContext: boolean,
+  +unstable_enablePackageExports: boolean,
   +shallow: boolean,
 };
 

package/src/IncrementalBundler.js

@@ -81,6 +81,8 @@ class IncrementalBundler {
         this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
       shallow: otherOptions.shallow,
     });
     this._config.serializer.experimentalSerializerHook(graph, {
@@ -123,6 +125,8 @@ class IncrementalBundler {
           this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
+        unstable_enablePackageExports:
+          this._config.resolver.unstable_enablePackageExports,
         shallow: otherOptions.shallow,
       }
     );

package/src/IncrementalBundler.js.flow

@@ -130,6 +130,8 @@ class IncrementalBundler {
         this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
       shallow: otherOptions.shallow,
     });
 
@@ -176,6 +178,8 @@ class IncrementalBundler {
           this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
+        unstable_enablePackageExports:
+          this._config.resolver.unstable_enablePackageExports,
         shallow: otherOptions.shallow,
       },
     );

package/src/Server.js

@@ -392,7 +392,7 @@ class Server {
           bundlePerfLogger:
             (_this$_config$unstabl =
               (_this$_config$unstabl2 = (_this$_config = this._config)
-                .unstable_perfLogger) === null ||
+                .unstable_perfLoggerFactory) === null ||
               _this$_config$unstabl2 === void 0
                 ? void 0
                 : _this$_config$unstabl2.call(
@@ -668,6 +668,11 @@ class Server {
       });
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
       bundlePerfLogger.point("resolvingAndTransformingDependencies_start");
+      bundlePerfLogger.annotate({
+        bool: {
+          initial_build: revPromise == null,
+        },
+      });
       const { delta, revision } = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(

package/src/Server.js.flow

@@ -519,7 +519,7 @@ class Server {
         await this._processBundleRequest(req, res, options, {
           buildNumber,
           bundlePerfLogger:
-            this._config.unstable_perfLogger?.('BUNDLING_REQUEST', {
+            this._config.unstable_perfLoggerFactory?.('BUNDLING_REQUEST', {
               key: buildNumber,
             }) ?? noopLogger,
         });
@@ -832,6 +832,11 @@ class Server {
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
       bundlePerfLogger.point('resolvingAndTransformingDependencies_start');
+      bundlePerfLogger.annotate({
+        bool: {
+          initial_build: revPromise == null,
+        },
+      });
       const {delta, revision} = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(

package/src/integration_tests/basic_bundle/require-context/mode-sync.js

@@ -13,6 +13,7 @@ var _utils = require("./utils");
 
 function main() {
   return (0, _utils.copyContextToObject)(
+    // $FlowFixMe[underconstrained-implicit-instantiation]
     require.context("./subdir", undefined, undefined, "sync")
   );
 }

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -15,6 +15,7 @@ declare var require: RequireWithContext;
 
 function main(): mixed {
   return copyContextToObject(
+    // $FlowFixMe[underconstrained-implicit-instantiation]
     require.context('./subdir', undefined, undefined, 'sync'),
   );
 }

package/src/lib/TerminalReporter.js

@@ -203,6 +203,9 @@ class TerminalReporter {
       case "global_cache_disabled":
         this._logCacheDisabled(event.reason);
         break;
+      case "resolver_warning":
+        this._logWarning(event.message);
+        break;
       case "transform_cache_reset":
         reporting.logWarning(this.terminal, "the transform cache was reset.");
         break;
@@ -360,6 +363,9 @@ class TerminalReporter {
       e
     );
   }
+  _logWarning(message) {
+    reporting.logWarning(this.terminal, message);
+  }
   _logWatcherHealthCheckResult(result) {
     var _result$pauseReason, _this$_prevHealthChec;
     // Don't be spammy; only report changes in status.

package/src/lib/TerminalReporter.js.flow

@@ -260,6 +260,9 @@ class TerminalReporter {
       case 'global_cache_disabled':
         this._logCacheDisabled(event.reason);
         break;
+      case 'resolver_warning':
+        this._logWarning(event.message);
+        break;
       case 'transform_cache_reset':
         reporting.logWarning(this.terminal, 'the transform cache was reset.');
         break;
@@ -435,6 +438,10 @@ class TerminalReporter {
     );
   }
 
+  _logWarning(message: string): void {
+    reporting.logWarning(this.terminal, message);
+  }
+
   _logWatcherHealthCheckResult(result: HealthCheckResult) {
     // Don't be spammy; only report changes in status.
     if (

package/src/lib/formatBundlingError.js

@@ -60,6 +60,7 @@ function formatBundlingError(error) {
     return {
       type: "ResourceNotFoundError",
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
@@ -67,6 +68,7 @@ function formatBundlingError(error) {
     return {
       type: "GraphNotFoundError",
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
@@ -74,6 +76,7 @@ function formatBundlingError(error) {
     return {
       type: "RevisionNotFoundError",
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };

package/src/lib/formatBundlingError.js.flow

@@ -75,6 +75,7 @@ function formatBundlingError(error: CustomError): FormattedError {
     return {
       type: 'ResourceNotFoundError',
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
@@ -82,6 +83,7 @@ function formatBundlingError(error: CustomError): FormattedError {
     return {
       type: 'GraphNotFoundError',
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
@@ -89,6 +91,7 @@ function formatBundlingError(error: CustomError): FormattedError {
     return {
       type: 'RevisionNotFoundError',
       // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };

package/src/lib/getPrependedScripts.js

@@ -59,6 +59,8 @@ async function getPrependedScripts(
       onProgress: null,
       experimentalImportBundleSupport:
         config.server.experimentalImportBundleSupport,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     }
   );

package/src/lib/getPrependedScripts.js.flow

@@ -69,6 +69,8 @@ async function getPrependedScripts(
       onProgress: null,
       experimentalImportBundleSupport:
         config.server.experimentalImportBundleSupport,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     },
   );

package/src/lib/reporting.js.flow

@@ -127,6 +127,10 @@ export type ReportableEvent =
       mode: 'BRIDGE' | 'NOBRIDGE',
       ...
     }
+  | {
+      type: 'resolver_warning',
+      message: string,
+    }
   | {
       type: 'transformer_load_started',
     }

package/src/lib/transformHelpers.js

@@ -67,6 +67,8 @@ async function calcTransformerOptions(
         config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     });
     return Array.from(dependencies.keys());

package/src/lib/transformHelpers.js.flow

@@ -90,6 +90,8 @@ async function calcTransformerOptions(
         config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     });
 

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -15,6 +15,7 @@ const { codeFrameColumns } = require("@babel/code-frame");
 const fs = require("fs");
 const invariant = require("invariant");
 const Resolver = require("metro-resolver");
+const createDefaultContext = require("metro-resolver/src/createDefaultContext");
 const path = require("path");
 const util = require("util");
 class ModuleResolver {
@@ -52,53 +53,6 @@ class ModuleResolver {
     }
     return emptyModule;
   }
-  _redirectRequire(fromModule, modulePath) {
-    const moduleCache = this._options.moduleCache;
-    try {
-      if (modulePath.startsWith(".")) {
-        const fromPackage = fromModule.getPackage();
-        if (fromPackage) {
-          // We need to convert the module path from module-relative to
-          // package-relative, so that we can easily match it against the
-          // "browser" map (where all paths are relative to the package root)
-          const fromPackagePath =
-            "./" +
-            path.relative(
-              path.dirname(fromPackage.path),
-              path.resolve(path.dirname(fromModule.path), modulePath)
-            );
-          let redirectedPath = fromPackage.redirectRequire(
-            fromPackagePath,
-            this._options.mainFields
-          );
-
-          // Since the redirected path is still relative to the package root,
-          // we have to transform it back to be module-relative (as it
-          // originally was)
-          if (redirectedPath !== false) {
-            redirectedPath =
-              "./" +
-              path.relative(
-                path.dirname(fromModule.path),
-                path.resolve(path.dirname(fromPackage.path), redirectedPath)
-              );
-          }
-          return redirectedPath;
-        }
-      } else {
-        const pck = path.isAbsolute(modulePath)
-          ? moduleCache.getPackageOf(modulePath)
-          : fromModule.getPackage();
-        if (pck) {
-          return pck.redirectRequire(modulePath, this._options.mainFields);
-        }
-      }
-    } catch (err) {
-      // Do nothing. The standard module cache does not trigger any error, but
-      // the ModuleGraph one does, if the module does not exist.
-    }
-    return modulePath;
-  }
   resolveDependency(
     fromModule,
     moduleName,
@@ -106,29 +60,56 @@ class ModuleResolver {
     platform,
     resolverOptions
   ) {
+    const {
+      disableHierarchicalLookup,
+      doesFileExist,
+      extraNodeModules,
+      isAssetFile,
+      mainFields,
+      nodeModulesPaths,
+      preferNativePlatform,
+      resolveAsset,
+      resolveRequest,
+      sourceExts,
+      unstable_conditionNames,
+      unstable_conditionsByPlatform,
+      unstable_enablePackageExports,
+      unstable_getRealPath,
+    } = this._options;
     try {
       var _resolverOptions$cust;
       const result = Resolver.resolve(
-        {
-          ...this._options,
+        createDefaultContext({
+          allowHaste,
+          disableHierarchicalLookup,
+          doesFileExist,
+          extraNodeModules,
+          isAssetFile,
+          mainFields,
+          nodeModulesPaths,
+          preferNativePlatform,
+          resolveAsset,
+          resolveRequest,
+          sourceExts,
+          unstable_conditionNames,
+          unstable_conditionsByPlatform,
+          unstable_enablePackageExports,
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
           customResolverOptions:
             (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
               null && _resolverOptions$cust !== void 0
               ? _resolverOptions$cust
               : {},
           originModulePath: fromModule.path,
-          redirectModulePath: (modulePath) =>
-            this._redirectRequire(fromModule, modulePath),
-          allowHaste,
-          platform,
           resolveHasteModule: (name) =>
             this._options.getHasteModulePath(name, platform),
           resolveHastePackage: (name) =>
             this._options.getHastePackagePath(name, platform),
-          getPackageMainPath: this._getPackageMainPath,
-          unstable_enablePackageExports:
-            this._options.unstable_enablePackageExports,
-        },
+          getPackage: this._getPackage,
+          getPackageForModule: (modulePath) =>
+            this._getPackageForModule(fromModule, modulePath),
+        }),
         moduleName,
         platform
       );
@@ -176,9 +157,29 @@ class ModuleResolver {
       throw error;
     }
   }
-  _getPackageMainPath = (packageJsonPath) => {
-    const package_ = this._options.moduleCache.getPackage(packageJsonPath);
-    return package_.getMain(this._options.mainFields);
+  _getPackage = (packageJsonPath) => {
+    try {
+      return this._options.moduleCache.getPackage(packageJsonPath).read();
+    } catch (e) {
+      // Do nothing. The standard module cache does not trigger any error, but
+      // the ModuleGraph one does, if the module does not exist.
+    }
+    return null;
+  };
+  _getPackageForModule = (fromModule, modulePath) => {
+    let pkg;
+    try {
+      pkg = this._options.moduleCache.getPackageOf(modulePath);
+    } catch (e) {
+      // Do nothing. The standard module cache does not trigger any error, but
+      // the ModuleGraph one does, if the module does not exist.
+    }
+    return pkg != null
+      ? {
+          rootPath: path.dirname(pkg.path),
+          packageJson: pkg.read(),
+        }
+      : null;
   };
 
   /**
@@ -204,6 +205,12 @@ class ModuleResolver {
         throw new Error("invalid type");
     }
   }
+  _logWarning = (message) => {
+    this._options.reporter.update({
+      type: "resolver_warning",
+      message,
+    });
+  };
   _removeRoot(candidates) {
     if (candidates.filePathPrefix) {
       candidates.filePathPrefix = path.relative(

package/src/node-haste/DependencyGraph/ModuleResolution.js.flow

@@ -15,29 +15,29 @@ import type {
   CustomResolver,
   DoesFileExist,
   FileCandidates,
+  GetRealPath,
   IsAssetFile,
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
+import type {ResolverInputOptions} from '../../shared/types.flow';
+import type {PackageInfo, PackageJson} from 'metro-resolver/src/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
 const fs = require('fs');
 const invariant = require('invariant');
 const Resolver = require('metro-resolver');
+const createDefaultContext = require('metro-resolver/src/createDefaultContext');
 const path = require('path');
 const util = require('util');
-import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {BundlerResolution} from '../../DeltaBundler/types.flow';
+import type {Reporter} from '../../lib/reporting';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
 export type Packageish = interface {
   path: string,
-  redirectRequire(
-    toModuleName: string,
-    mainFields: $ReadOnlyArray<string>,
-  ): string | false,
-  getMain(mainFields: $ReadOnlyArray<string>): string,
+  read(): PackageJson,
 };
 
 export type Moduleish = interface {
@@ -68,6 +68,7 @@ type Options<TPackage> = $ReadOnly<{
   nodeModulesPaths: $ReadOnlyArray<string>,
   preferNativePlatform: boolean,
   projectRoot: string,
+  reporter: Reporter,
   resolveAsset: ResolveAsset,
   resolveRequest: ?CustomResolver,
   sourceExts: $ReadOnlyArray<string>,
@@ -76,6 +77,7 @@ type Options<TPackage> = $ReadOnly<{
     [platform: string]: $ReadOnlyArray<string>,
   }>,
   unstable_enablePackageExports: boolean,
+  unstable_getRealPath: ?GetRealPath,
 }>;
 
 class ModuleResolver<TPackage: Packageish> {
@@ -117,59 +119,6 @@ class ModuleResolver<TPackage: Packageish> {
     return emptyModule;
   }
 
-  _redirectRequire(fromModule: Moduleish, modulePath: string): string | false {
-    const moduleCache = this._options.moduleCache;
-    try {
-      if (modulePath.startsWith('.')) {
-        const fromPackage = fromModule.getPackage();
-
-        if (fromPackage) {
-          // We need to convert the module path from module-relative to
-          // package-relative, so that we can easily match it against the
-          // "browser" map (where all paths are relative to the package root)
-          const fromPackagePath =
-            './' +
-            path.relative(
-              path.dirname(fromPackage.path),
-              path.resolve(path.dirname(fromModule.path), modulePath),
-            );
-
-          let redirectedPath = fromPackage.redirectRequire(
-            fromPackagePath,
-            this._options.mainFields,
-          );
-
-          // Since the redirected path is still relative to the package root,
-          // we have to transform it back to be module-relative (as it
-          // originally was)
-          if (redirectedPath !== false) {
-            redirectedPath =
-              './' +
-              path.relative(
-                path.dirname(fromModule.path),
-                path.resolve(path.dirname(fromPackage.path), redirectedPath),
-              );
-          }
-
-          return redirectedPath;
-        }
-      } else {
-        const pck = path.isAbsolute(modulePath)
-          ? moduleCache.getPackageOf(modulePath)
-          : fromModule.getPackage();
-
-        if (pck) {
-          return pck.redirectRequire(modulePath, this._options.mainFields);
-        }
-      }
-    } catch (err) {
-      // Do nothing. The standard module cache does not trigger any error, but
-      // the ModuleGraph one does, if the module does not exist.
-    }
-
-    return modulePath;
-  }
-
   resolveDependency(
     fromModule: Moduleish,
     moduleName: string,
@@ -177,24 +126,52 @@ class ModuleResolver<TPackage: Packageish> {
     platform: string | null,
     resolverOptions: ResolverInputOptions,
   ): BundlerResolution {
+    const {
+      disableHierarchicalLookup,
+      doesFileExist,
+      extraNodeModules,
+      isAssetFile,
+      mainFields,
+      nodeModulesPaths,
+      preferNativePlatform,
+      resolveAsset,
+      resolveRequest,
+      sourceExts,
+      unstable_conditionNames,
+      unstable_conditionsByPlatform,
+      unstable_enablePackageExports,
+      unstable_getRealPath,
+    } = this._options;
+
     try {
       const result = Resolver.resolve(
-        {
-          ...this._options,
+        createDefaultContext({
+          allowHaste,
+          disableHierarchicalLookup,
+          doesFileExist,
+          extraNodeModules,
+          isAssetFile,
+          mainFields,
+          nodeModulesPaths,
+          preferNativePlatform,
+          resolveAsset,
+          resolveRequest,
+          sourceExts,
+          unstable_conditionNames,
+          unstable_conditionsByPlatform,
+          unstable_enablePackageExports,
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
           customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
-          redirectModulePath: (modulePath: string) =>
-            this._redirectRequire(fromModule, modulePath),
-          allowHaste,
-          platform,
           resolveHasteModule: (name: string) =>
             this._options.getHasteModulePath(name, platform),
           resolveHastePackage: (name: string) =>
             this._options.getHastePackagePath(name, platform),
-          getPackageMainPath: this._getPackageMainPath,
-          unstable_enablePackageExports:
-            this._options.unstable_enablePackageExports,
-        },
+          getPackage: this._getPackage,
+          getPackageForModule: (modulePath: string) =>
+            this._getPackageForModule(fromModule, modulePath),
+        }),
         moduleName,
         platform,
       );
@@ -245,9 +222,36 @@ class ModuleResolver<TPackage: Packageish> {
     }
   }
 
-  _getPackageMainPath = (packageJsonPath: string): string => {
-    const package_ = this._options.moduleCache.getPackage(packageJsonPath);
-    return package_.getMain(this._options.mainFields);
+  _getPackage = (packageJsonPath: string): ?PackageJson => {
+    try {
+      return this._options.moduleCache.getPackage(packageJsonPath).read();
+    } catch (e) {
+      // Do nothing. The standard module cache does not trigger any error, but
+      // the ModuleGraph one does, if the module does not exist.
+    }
+
+    return null;
+  };
+
+  _getPackageForModule = (
+    fromModule: Moduleish,
+    modulePath: string,
+  ): ?PackageInfo => {
+    let pkg;
+
+    try {
+      pkg = this._options.moduleCache.getPackageOf(modulePath);
+    } catch (e) {
+      // Do nothing. The standard module cache does not trigger any error, but
+      // the ModuleGraph one does, if the module does not exist.
+    }
+
+    return pkg != null
+      ? {
+          rootPath: path.dirname(pkg.path),
+          packageJson: pkg.read(),
+        }
+      : null;
   };
 
   /**
@@ -271,6 +275,13 @@ class ModuleResolver<TPackage: Packageish> {
     }
   }
 
+  _logWarning = (message: string): void => {
+    this._options.reporter.update({
+      type: 'resolver_warning',
+      message,
+    });
+  };
+
   _removeRoot(candidates: FileCandidates): FileCandidates {
     if (candidates.filePathPrefix) {
       candidates.filePathPrefix = path.relative(

package/src/node-haste/DependencyGraph/createHasteMap.js

@@ -108,7 +108,7 @@ function createHasteMap(config, options) {
                   : options.cacheFilePrefix,
             });
           },
-    perfLoggerFactory: config.unstable_perfLogger,
+    perfLoggerFactory: config.unstable_perfLoggerFactory,
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,

package/src/node-haste/DependencyGraph/createHasteMap.js.flow

@@ -66,7 +66,7 @@ function createHasteMap(
             config.fileMapCacheDirectory ?? config.hasteMapCacheDirectory,
           cacheFilePrefix: options?.cacheFilePrefix,
         })),
-    perfLoggerFactory: config.unstable_perfLogger,
+    perfLoggerFactory: config.unstable_perfLoggerFactory,
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,

package/src/node-haste/DependencyGraph.js

@@ -150,14 +150,24 @@ class DependencyGraph extends EventEmitter {
       nodeModulesPaths: this._config.resolver.nodeModulesPaths,
       preferNativePlatform: true,
       projectRoot: this._config.projectRoot,
+      reporter: this._config.reporter,
       resolveAsset: (dirPath, assetName, extension) => {
         const basePath = dirPath + path.sep + assetName;
-        const assets = [
+        let assets = [
           basePath + extension,
           ...this._config.resolver.assetResolutions.map(
             (resolution) => basePath + "@" + resolution + "x" + extension
           ),
-        ].filter((candidate) => this._fileSystem.exists(candidate));
+        ];
+        if (this._config.resolver.unstable_enableSymlinks) {
+          assets = assets
+            .map((candidate) => this._fileSystem.getRealPath(candidate))
+            .filter(Boolean);
+        } else {
+          assets = assets.filter((candidate) =>
+            this._fileSystem.exists(candidate)
+          );
+        }
         return assets.length ? assets : null;
       },
       resolveRequest: this._config.resolver.resolveRequest,
@@ -167,6 +177,9 @@ class DependencyGraph extends EventEmitter {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_getRealPath: this._config.resolver.unstable_enableSymlinks
+        ? (path) => this._fileSystem.getRealPath(path)
+        : null,
     });
   }
   _createModuleCache() {
@@ -186,14 +199,18 @@ class DependencyGraph extends EventEmitter {
     const containerName =
       splitIndex !== -1 ? filename.slice(0, splitIndex + 4) : filename;
 
-    // TODO Calling realpath allows us to get a hash for a given path even when
+    // Prior to unstable_enableSymlinks:
+    // Calling realpath allows us to get a hash for a given path even when
     // it's a symlink to a file, which prevents Metro from crashing in such a
     // case. However, it doesn't allow Metro to track changes to the target file
     // of the symlink. We should fix this by implementing a symlink map into
     // Metro (or maybe by implementing those "extra transformation sources" we've
     // been talking about for stuff like CSS or WASM).
-
-    const resolvedPath = fs.realpathSync(containerName);
+    //
+    // This is unnecessary with a symlink-aware fileSystem implementation.
+    const resolvedPath = this._config.resolver.unstable_enableSymlinks
+      ? containerName
+      : fs.realpathSync(containerName);
     const sha1 = this._fileSystem.getSha1(resolvedPath);
     if (!sha1) {
       throw new ReferenceError(`SHA-1 for file ${filename} (${resolvedPath}) is not computed.

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

@@ -197,14 +197,26 @@ class DependencyGraph extends EventEmitter {
       nodeModulesPaths: this._config.resolver.nodeModulesPaths,
       preferNativePlatform: true,
       projectRoot: this._config.projectRoot,
+      reporter: this._config.reporter,
       resolveAsset: (dirPath: string, assetName: string, extension: string) => {
         const basePath = dirPath + path.sep + assetName;
-        const assets = [
+        let assets = [
           basePath + extension,
           ...this._config.resolver.assetResolutions.map(
             resolution => basePath + '@' + resolution + 'x' + extension,
           ),
-        ].filter(candidate => this._fileSystem.exists(candidate));
+        ];
+
+        if (this._config.resolver.unstable_enableSymlinks) {
+          assets = assets
+            .map(candidate => this._fileSystem.getRealPath(candidate))
+            .filter(Boolean);
+        } else {
+          assets = assets.filter(candidate =>
+            this._fileSystem.exists(candidate),
+          );
+        }
+
         return assets.length ? assets : null;
       },
       resolveRequest: this._config.resolver.resolveRequest,
@@ -214,6 +226,9 @@ class DependencyGraph extends EventEmitter {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_getRealPath: this._config.resolver.unstable_enableSymlinks
+        ? path => this._fileSystem.getRealPath(path)
+        : null,
     });
   }
 
@@ -236,14 +251,19 @@ class DependencyGraph extends EventEmitter {
     const containerName =
       splitIndex !== -1 ? filename.slice(0, splitIndex + 4) : filename;
 
-    // TODO Calling realpath allows us to get a hash for a given path even when
+    // Prior to unstable_enableSymlinks:
+    // Calling realpath allows us to get a hash for a given path even when
     // it's a symlink to a file, which prevents Metro from crashing in such a
     // case. However, it doesn't allow Metro to track changes to the target file
     // of the symlink. We should fix this by implementing a symlink map into
     // Metro (or maybe by implementing those "extra transformation sources" we've
     // been talking about for stuff like CSS or WASM).
+    //
+    // This is unnecessary with a symlink-aware fileSystem implementation.
+    const resolvedPath = this._config.resolver.unstable_enableSymlinks
+      ? containerName
+      : fs.realpathSync(containerName);
 
-    const resolvedPath = fs.realpathSync(containerName);
     const sha1 = this._fileSystem.getSha1(resolvedPath);
 
     if (!sha1) {

package/src/node-haste/Package.js

@@ -19,85 +19,9 @@ class Package {
     this._root = path.dirname(this.path);
     this._content = null;
   }
-
-  /**
-   * The `browser` field and replacement behavior is specified in
-   * https://github.com/defunctzombie/package-browser-field-spec.
-   */
-  getMain(mainFields) {
-    const json = this.read();
-    let main;
-    for (const name of mainFields) {
-      if (typeof json[name] === "string") {
-        main = json[name];
-        break;
-      }
-    }
-
-    // flowlint-next-line sketchy-null-string:off
-    if (!main) {
-      main = "index";
-    }
-    const replacements = getReplacements(json, mainFields);
-    if (replacements) {
-      const variants = [main];
-      if (main.slice(0, 2) === "./") {
-        variants.push(main.slice(2));
-      } else {
-        variants.push("./" + main);
-      }
-      for (const variant of variants) {
-        const winner =
-          replacements[variant] ||
-          replacements[variant + ".js"] ||
-          replacements[variant + ".json"] ||
-          replacements[variant.replace(/(\.js|\.json)$/, "")];
-        if (winner) {
-          main = winner;
-          break;
-        }
-      }
-    }
-    return path.join(this._root, main);
-  }
   invalidate() {
     this._content = null;
   }
-  redirectRequire(name, mainFields) {
-    const json = this.read();
-    const replacements = getReplacements(json, mainFields);
-    if (!replacements) {
-      return name;
-    }
-    if (!name.startsWith(".") && !path.isAbsolute(name)) {
-      const replacement = replacements[name];
-      // support exclude with "someDependency": false
-      return replacement === false ? false : replacement || name;
-    }
-    let relPath =
-      "./" + path.relative(this._root, path.resolve(this._root, name));
-    if (path.sep !== "/") {
-      relPath = relPath.replace(new RegExp("\\" + path.sep, "g"), "/");
-    }
-    let redirect = replacements[relPath];
-
-    // false is a valid value
-    if (redirect == null) {
-      redirect = replacements[relPath + ".js"];
-      if (redirect == null) {
-        redirect = replacements[relPath + ".json"];
-      }
-    }
-
-    // support exclude with "./someFile": false
-    if (redirect === false) {
-      return false;
-    }
-    if (redirect) {
-      return path.join(this._root, redirect);
-    }
-    return name;
-  }
   read() {
     if (this._content == null) {
       this._content = JSON.parse(fs.readFileSync(this.path, "utf8"));
@@ -105,20 +29,4 @@ class Package {
     return this._content;
   }
 }
-function getReplacements(pkg, mainFields) {
-  const replacements = mainFields
-    .map((name) => {
-      // If the field is a string, that doesn't mean we want to redirect the
-      //  `main` file itself to anything else. See the spec.
-      if (!pkg[name] || typeof pkg[name] === "string") {
-        return null;
-      }
-      return pkg[name];
-    })
-    .filter(Boolean);
-  if (!replacements.length) {
-    return null;
-  }
-  return Object.assign({}, ...replacements.reverse());
-}
 module.exports = Package;

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

@@ -11,22 +11,16 @@
 
 'use strict';
 
+import type {PackageJson} from 'metro-resolver/src/types';
+
 const fs = require('fs');
 const path = require('path');
 
-type PackageContent = {
-  name: string,
-  'react-native': mixed,
-  browser: mixed,
-  main: ?string,
-  ...
-};
-
 class Package {
   path: string;
 
   _root: string;
-  _content: ?PackageContent;
+  _content: ?PackageJson;
 
   constructor({file}: {file: string, ...}) {
     this.path = path.resolve(file);
@@ -34,104 +28,11 @@ class Package {
     this._content = null;
   }
 
-  /**
-   * The `browser` field and replacement behavior is specified in
-   * https://github.com/defunctzombie/package-browser-field-spec.
-   */
-  getMain(mainFields: $ReadOnlyArray<string>): string {
-    const json = this.read();
-
-    let main;
-
-    for (const name of mainFields) {
-      if (typeof json[name] === 'string') {
-        main = json[name];
-        break;
-      }
-    }
-
-    // flowlint-next-line sketchy-null-string:off
-    if (!main) {
-      main = 'index';
-    }
-
-    const replacements = getReplacements(json, mainFields);
-    if (replacements) {
-      const variants = [main];
-      if (main.slice(0, 2) === './') {
-        variants.push(main.slice(2));
-      } else {
-        variants.push('./' + main);
-      }
-
-      for (const variant of variants) {
-        const winner =
-          replacements[variant] ||
-          replacements[variant + '.js'] ||
-          replacements[variant + '.json'] ||
-          replacements[variant.replace(/(\.js|\.json)$/, '')];
-
-        if (winner) {
-          main = winner;
-          break;
-        }
-      }
-    }
-
-    return path.join(this._root, main);
-  }
-
   invalidate() {
     this._content = null;
   }
 
-  redirectRequire(
-    name: string,
-    mainFields: $ReadOnlyArray<string>,
-  ): string | false {
-    const json = this.read();
-    const replacements = getReplacements(json, mainFields);
-
-    if (!replacements) {
-      return name;
-    }
-
-    if (!name.startsWith('.') && !path.isAbsolute(name)) {
-      const replacement = replacements[name];
-      // support exclude with "someDependency": false
-      return replacement === false ? false : replacement || name;
-    }
-
-    let relPath =
-      './' + path.relative(this._root, path.resolve(this._root, name));
-
-    if (path.sep !== '/') {
-      relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
-    }
-
-    let redirect = replacements[relPath];
-
-    // false is a valid value
-    if (redirect == null) {
-      redirect = replacements[relPath + '.js'];
-      if (redirect == null) {
-        redirect = replacements[relPath + '.json'];
-      }
-    }
-
-    // support exclude with "./someFile": false
-    if (redirect === false) {
-      return false;
-    }
-
-    if (redirect) {
-      return path.join(this._root, redirect);
-    }
-
-    return name;
-  }
-
-  read(): PackageContent {
+  read(): PackageJson {
     if (this._content == null) {
       this._content = JSON.parse(fs.readFileSync(this.path, 'utf8'));
     }
@@ -139,27 +40,4 @@ class Package {
   }
 }
 
-function getReplacements(
-  pkg: PackageContent,
-  mainFields: $ReadOnlyArray<string>,
-): ?{[string]: string | false, ...} {
-  const replacements = mainFields
-    .map((name: string) => {
-      // If the field is a string, that doesn't mean we want to redirect the
-      //  `main` file itself to anything else. See the spec.
-      if (!pkg[name] || typeof pkg[name] === 'string') {
-        return null;
-      }
-
-      return pkg[name];
-    })
-    .filter(Boolean);
-
-  if (!replacements.length) {
-    return null;
-  }
-
-  return Object.assign({}, ...replacements.reverse());
-}
-
 module.exports = Package;