metro 0.75.0 → 0.75.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.75.0",
+  "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.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",
+    "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,10 +70,10 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.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",
+    "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"

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,7 +29,7 @@ class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
   _addedFiles = new Set();
-  _hasSymlinkChanges = false;
+  _requiresReset = false;
   constructor(entryPoints, changeEventSource, options) {
     super();
     this._options = options;
@@ -78,13 +82,13 @@ class DeltaCalculator extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
-    const hasSymlinkChanges = this._hasSymlinkChanges;
-    this._hasSymlinkChanges = false;
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
 
-    // Revisit all files if changes include symlinks - resolutions may be
+    // 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 (hasSymlinkChanges) {
+    if (requiresReset) {
       const markModified = (file) => {
         if (!addedFiles.has(file) && !deletedFiles.has(file)) {
           modifiedFiles.add(file);
@@ -165,12 +169,15 @@ class DeltaCalculator extends EventEmitter {
    */
   _handleFileChange = ({ type, filePath, metadata }, logger) => {
     debug("Handling %s: %s (type: %s)", type, filePath, metadata.type);
-    if (metadata.type === "l") {
-      this._hasSymlinkChanges = true;
+    if (
+      metadata.type === "l" ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(_path.default.sep + "package.json"))
+    ) {
+      this._requiresReset = true;
       this.emit("change", {
         logger,
       });
-      return;
     }
     let state;
     if (this._deletedFiles.has(filePath)) {
@@ -233,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,7 +34,7 @@ class DeltaCalculator<T> extends EventEmitter {
   _deletedFiles: Set<string> = new Set();
   _modifiedFiles: Set<string> = new Set();
   _addedFiles: Set<string> = new Set();
-  _hasSymlinkChanges = false;
+  _requiresReset = false;
 
   _graph: Graph<T>;
 
@@ -104,13 +105,13 @@ class DeltaCalculator<T> extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
-    const hasSymlinkChanges = this._hasSymlinkChanges;
-    this._hasSymlinkChanges = false;
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
 
-    // Revisit all files if changes include symlinks - resolutions may be
+    // 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 (hasSymlinkChanges) {
+    if (requiresReset) {
       const markModified = (file: string) => {
         if (!addedFiles.has(file) && !deletedFiles.has(file)) {
           modifiedFiles.add(file);
@@ -207,10 +208,13 @@ class DeltaCalculator<T> extends EventEmitter {
     logger: ?RootPerfLogger,
   ): mixed => {
     debug('Handling %s: %s (type: %s)', type, filePath, metadata.type);
-    if (metadata.type === 'l') {
-      this._hasSymlinkChanges = true;
+    if (
+      metadata.type === 'l' ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(path.sep + 'package.json'))
+    ) {
+      this._requiresReset = true;
       this.emit('change', {logger});
-      return;
     }
     let state: void | 'deleted' | 'modified' | 'added';
     if (this._deletedFiles.has(filePath)) {
@@ -281,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/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

@@ -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

@@ -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/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

@@ -74,6 +74,7 @@ class ModuleResolver {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
+      unstable_getRealPath,
     } = this._options;
     try {
       var _resolverOptions$cust;
@@ -93,6 +94,8 @@ class ModuleResolver {
           unstable_conditionNames,
           unstable_conditionsByPlatform,
           unstable_enablePackageExports,
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
           customResolverOptions:
             (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
               null && _resolverOptions$cust !== void 0
@@ -202,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,6 +15,7 @@ import type {
   CustomResolver,
   DoesFileExist,
   FileCandidates,
+  GetRealPath,
   IsAssetFile,
   Resolution,
   ResolveAsset,
@@ -30,6 +31,7 @@ const createDefaultContext = require('metro-resolver/src/createDefaultContext');
 const path = require('path');
 const util = require('util');
 import type {BundlerResolution} from '../../DeltaBundler/types.flow';
+import type {Reporter} from '../../lib/reporting';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
@@ -66,6 +68,7 @@ type Options<TPackage> = $ReadOnly<{
   nodeModulesPaths: $ReadOnlyArray<string>,
   preferNativePlatform: boolean,
   projectRoot: string,
+  reporter: Reporter,
   resolveAsset: ResolveAsset,
   resolveRequest: ?CustomResolver,
   sourceExts: $ReadOnlyArray<string>,
@@ -74,6 +77,7 @@ type Options<TPackage> = $ReadOnly<{
     [platform: string]: $ReadOnlyArray<string>,
   }>,
   unstable_enablePackageExports: boolean,
+  unstable_getRealPath: ?GetRealPath,
 }>;
 
 class ModuleResolver<TPackage: Packageish> {
@@ -136,6 +140,7 @@ class ModuleResolver<TPackage: Packageish> {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
+      unstable_getRealPath,
     } = this._options;
 
     try {
@@ -155,6 +160,8 @@ class ModuleResolver<TPackage: Packageish> {
           unstable_conditionNames,
           unstable_conditionsByPlatform,
           unstable_enablePackageExports,
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
           customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
           resolveHasteModule: (name: string) =>
@@ -268,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.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) {