metro 0.74.0 → 0.75.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.74.0",
+  "version": "0.75.0",
   "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.0",
-    "metro-cache": "0.74.0",
-    "metro-cache-key": "0.74.0",
-    "metro-config": "0.74.0",
-    "metro-core": "0.74.0",
-    "metro-file-map": "0.74.0",
-    "metro-hermes-compiler": "0.74.0",
-    "metro-inspector-proxy": "0.74.0",
-    "metro-minify-terser": "0.74.0",
-    "metro-minify-uglify": "0.74.0",
-    "metro-react-native-babel-preset": "0.74.0",
-    "metro-resolver": "0.74.0",
-    "metro-runtime": "0.74.0",
-    "metro-source-map": "0.74.0",
-    "metro-symbolicate": "0.74.0",
-    "metro-transform-plugins": "0.74.0",
-    "metro-transform-worker": "0.74.0",
+    "metro-babel-transformer": "0.75.0",
+    "metro-cache": "0.75.0",
+    "metro-cache-key": "0.75.0",
+    "metro-config": "0.75.0",
+    "metro-core": "0.75.0",
+    "metro-file-map": "0.75.0",
+    "metro-hermes-compiler": "0.75.0",
+    "metro-inspector-proxy": "0.75.0",
+    "metro-minify-terser": "0.75.0",
+    "metro-minify-uglify": "0.75.0",
+    "metro-react-native-babel-preset": "0.75.0",
+    "metro-resolver": "0.75.0",
+    "metro-runtime": "0.75.0",
+    "metro-source-map": "0.75.0",
+    "metro-symbolicate": "0.75.0",
+    "metro-transform-plugins": "0.75.0",
+    "metro-transform-worker": "0.75.0",
     "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.0",
-    "metro-memory-fs": "0.74.0",
-    "metro-react-native-babel-preset": "0.74.0",
-    "metro-react-native-babel-transformer": "0.74.0",
+    "metro-babel-register": "0.75.0",
+    "metro-memory-fs": "0.75.0",
+    "metro-react-native-babel-preset": "0.75.0",
+    "metro-react-native-babel-transformer": "0.75.0",
     "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

@@ -12,6 +12,7 @@
 "use strict";
 
 var _Graph = require("./Graph");
+const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");
 
 /**
@@ -24,6 +25,7 @@ class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
   _addedFiles = new Set();
+  _hasSymlinkChanges = false;
   constructor(entryPoints, changeEventSource, options) {
     super();
     this._options = options;
@@ -60,6 +62,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) {
@@ -75,6 +78,21 @@ class DeltaCalculator extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
+    const hasSymlinkChanges = this._hasSymlinkChanges;
+    this._hasSymlinkChanges = false;
+
+    // Revisit all files if changes include symlinks - resolutions may be
+    // invalidated but we don't yet know which. This should be optimized in the
+    // future.
+    if (hasSymlinkChanges) {
+      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
@@ -145,7 +163,15 @@ class DeltaCalculator extends EventEmitter {
    * the listener only stores the modified file, which will then be used later
    * when the delta needs to be calculated.
    */
-  _handleFileChange = ({ type, filePath }, logger) => {
+  _handleFileChange = ({ type, filePath, metadata }, logger) => {
+    debug("Handling %s: %s (type: %s)", type, filePath, metadata.type);
+    if (metadata.type === "l") {
+      this._hasSymlinkChanges = true;
+      this.emit("change", {
+        logger,
+      });
+      return;
+    }
     let state;
     if (this._deletedFiles.has(filePath)) {
       state = "deleted";

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -14,7 +14,9 @@
 import {Graph} from './Graph';
 import type {DeltaResult, Options} from './types.flow';
 import type {RootPerfLogger} from 'metro-config';
+import type {ChangeEventMetadata} from 'metro-file-map';
 
+const debug = require('debug')('Metro:DeltaCalculator');
 const {EventEmitter} = require('events');
 
 /**
@@ -31,6 +33,7 @@ class DeltaCalculator<T> extends EventEmitter {
   _deletedFiles: Set<string> = new Set();
   _modifiedFiles: Set<string> = new Set();
   _addedFiles: Set<string> = new Set();
+  _hasSymlinkChanges = false;
 
   _graph: Graph<T>;
 
@@ -85,6 +88,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) {
@@ -100,6 +104,21 @@ class DeltaCalculator<T> extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
+    const hasSymlinkChanges = this._hasSymlinkChanges;
+    this._hasSymlinkChanges = false;
+
+    // Revisit all files if changes include symlinks - resolutions may be
+    // invalidated but we don't yet know which. This should be optimized in the
+    // future.
+    if (hasSymlinkChanges) {
+      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
@@ -178,13 +197,21 @@ class DeltaCalculator<T> extends EventEmitter {
     {
       type,
       filePath,
+      metadata,
     }: {
       type: string,
       filePath: string,
+      metadata: ChangeEventMetadata,
       ...
     },
     logger: ?RootPerfLogger,
   ): mixed => {
+    debug('Handling %s: %s (type: %s)', type, filePath, metadata.type);
+    if (metadata.type === 'l') {
+      this._hasSymlinkChanges = true;
+      this.emit('change', {logger});
+      return;
+    }
     let state: void | 'deleted' | 'modified' | 'added';
     if (this._deletedFiles.has(filePath)) {
       state = 'deleted';

package/src/DeltaBundler/Graph.js

@@ -429,7 +429,7 @@ class Graph {
       } else {
         try {
           resolvedDep = {
-            absolutePath: options.resolve(parentPath, dep.name),
+            absolutePath: options.resolve(parentPath, dep.name).filePath,
             data: dep,
           };
 

package/src/DeltaBundler/Graph.js.flow

@@ -503,7 +503,7 @@ export class Graph<T = MixedOutput> {
       } else {
         try {
           resolvedDep = {
-            absolutePath: options.resolve(parentPath, dep.name),
+            absolutePath: options.resolve(parentPath, dep.name).filePath,
             data: dep,
           };
 

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

@@ -126,8 +126,13 @@ export type AllowOptionalDependencies =
   | boolean
   | AllowOptionalDependenciesWithOptions;
 
+export type BundlerResolution = $ReadOnly<{
+  type: 'sourceFile',
+  filePath: string,
+}>;
+
 export type Options<T = MixedOutput> = {
-  +resolve: (from: string, to: string) => string,
+  +resolve: (from: string, to: string) => BundlerResolution,
   +transform: TransformFn<T>,
   +transformOptions: TransformInputOptions,
   +onProgress: ?(numProcessed: number, total: number) => mixed,

package/src/HmrServer.js

@@ -82,7 +82,7 @@ class HmrServer {
         ? _this$_config$server$
         : this._config.projectRoot) + "/.",
       entryFile
-    );
+    ).filePath;
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       resolverOptions,
       shallow: graphOptions.shallow,

package/src/HmrServer.js.flow

@@ -124,7 +124,7 @@ class HmrServer<TClient: Client> {
       (this._config.server.unstable_serverRoot ?? this._config.projectRoot) +
         '/.',
       entryFile,
-    );
+    ).filePath;
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       resolverOptions,
       shallow: graphOptions.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(
@@ -1162,7 +1162,7 @@ class Server {
       relativeTo === "server"
         ? this._getServerRootDir()
         : this._config.projectRoot;
-    return resolutionFn(`${rootDir}/.`, filePath);
+    return resolutionFn(`${rootDir}/.`, filePath).filePath;
   }
   getNewBuildNumber() {
     return this._nextBundleBuildNumber++;

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,
         });
@@ -1364,7 +1364,7 @@ class Server {
       relativeTo === 'server'
         ? this._getServerRootDir()
         : this._config.projectRoot;
-    return resolutionFn(`${rootDir}/.`, filePath);
+    return resolutionFn(`${rootDir}/.`, filePath).filePath;
   }
 
   getNewBuildNumber(): number {

package/src/lib/formatBundlingError.js

@@ -59,18 +59,24 @@ function formatBundlingError(error) {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };

package/src/lib/formatBundlingError.js.flow

@@ -74,18 +74,24 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: 'GraphNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: 'RevisionNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
+      // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
     };

package/src/lib/getAppendScripts.js

@@ -39,6 +39,7 @@ function getAppendScripts(entryPoint, modules, options) {
               data: {
                 code,
                 lineCount: countLines(code),
+                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -68,6 +69,7 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
+            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -87,6 +89,7 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
+            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getAppendScripts.js.flow

@@ -58,6 +58,7 @@ function getAppendScripts<T: number | string>(
               data: {
                 code,
                 lineCount: countLines(code),
+                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -89,6 +90,7 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
+            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -109,6 +111,7 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
+            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getPrependedScripts.js

@@ -90,6 +90,7 @@ function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
         data: {
           code,
           lineCount: countLines(code),
+          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/getPrependedScripts.js.flow

@@ -113,6 +113,7 @@ function _getPrelude({
         data: {
           code,
           lineCount: countLines(code),
+          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/transformHelpers.js.flow

@@ -13,7 +13,10 @@
 
 import type Bundler from '../Bundler';
 import type DeltaBundler, {TransformFn} from '../DeltaBundler';
-import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {
+  BundlerResolution,
+  TransformInputOptions,
+} from '../DeltaBundler/types.flow';
 import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
@@ -203,7 +206,7 @@ async function getResolveDependencyFn(
   bundler: Bundler,
   platform: ?string,
   resolverOptions: ResolverInputOptions,
-): Promise<(from: string, to: string) => string> {
+): Promise<(from: string, to: string) => BundlerResolution> {
   const dependencyGraph = await await bundler.getDependencyGraph();
 
   return (from: string, to: string) =>

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,27 +60,53 @@ class ModuleResolver {
     platform,
     resolverOptions
   ) {
+    const {
+      disableHierarchicalLookup,
+      doesFileExist,
+      extraNodeModules,
+      isAssetFile,
+      mainFields,
+      nodeModulesPaths,
+      preferNativePlatform,
+      resolveAsset,
+      resolveRequest,
+      sourceExts,
+      unstable_conditionNames,
+      unstable_conditionsByPlatform,
+      unstable_enablePackageExports,
+    } = 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,
           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,
-        },
+          getPackage: this._getPackage,
+          getPackageForModule: (modulePath) =>
+            this._getPackageForModule(fromModule, modulePath),
+        }),
         moduleName,
         platform
       );
@@ -174,27 +154,48 @@ 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;
   };
 
   /**
-   * FIXME: get rid of this function and of the reliance on `TModule`
-   * altogether, return strongly typed resolutions at the top-level instead.
+   * TODO: Return Resolution instead of coercing to BundlerResolution here
    */
   _getFileResolvedModule(resolution) {
     switch (resolution.type) {
       case "sourceFile":
-        return this._options.moduleCache.getModule(resolution.filePath);
+        return resolution;
       case "assetFiles":
         // FIXME: we should forward ALL the paths/metadata,
         // not just an arbitrary item!
         const arbitrary = getArrayLowestItem(resolution.filePaths);
         invariant(arbitrary != null, "invalid asset resolution");
-        return this._options.moduleCache.getModule(arbitrary);
+        return {
+          type: "sourceFile",
+          filePath: arbitrary,
+        };
       case "empty":
-        // $FlowFixMe[incompatible-return]
         return this._getEmptyModule();
       default:
         resolution.type;