metro 0.74.0 → 0.74.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.74.0",
+  "version": "0.74.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.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.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",
     "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.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.74.1",
+    "metro-memory-fs": "0.74.1",
+    "metro-react-native-babel-preset": "0.74.1",
+    "metro-react-native-babel-transformer": "0.74.1",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

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");
 
 /**
@@ -145,7 +146,8 @@ 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);
     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');
 
 /**
@@ -178,13 +180,16 @@ 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);
     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/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

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

@@ -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,21 @@ function formatBundlingError(error) {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
+      // $FlowFixMe[missing-empty-array-annot]
       errors: [],
       message: error.message,
     };

package/src/lib/formatBundlingError.js.flow

@@ -74,18 +74,21 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: 'GraphNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
       errors: [],
       message: error.message,
     };
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: 'RevisionNotFoundError',
+      // $FlowFixMe[missing-empty-array-annot]
       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

@@ -126,6 +126,8 @@ class ModuleResolver {
           resolveHastePackage: (name) =>
             this._options.getHastePackagePath(name, platform),
           getPackageMainPath: this._getPackageMainPath,
+          unstable_enablePackageExports:
+            this._options.unstable_enablePackageExports,
         },
         moduleName,
         platform
@@ -180,21 +182,22 @@ class ModuleResolver {
   };
 
   /**
-   * 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;

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

@@ -27,6 +27,7 @@ const Resolver = require('metro-resolver');
 const path = require('path');
 const util = require('util');
 import type {ResolverInputOptions} from '../../shared/types.flow';
+import type {BundlerResolution} from '../../DeltaBundler/types.flow';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
@@ -44,17 +45,16 @@ export type Moduleish = interface {
   getPackage(): ?Packageish,
 };
 
-export type ModuleishCache<TModule, TPackage> = interface {
+export type ModuleishCache<TPackage> = interface {
   getPackage(
     name: string,
     platform?: string,
     supportsNativePlatform?: boolean,
   ): TPackage,
-  getModule(path: string): TModule,
   getPackageOf(modulePath: string): ?TPackage,
 };
 
-type Options<TModule, TPackage> = $ReadOnly<{
+type Options<TPackage> = $ReadOnly<{
   dirExists: DirExistsFn,
   disableHierarchicalLookup: boolean,
   doesFileExist: DoesFileExist,
@@ -64,24 +64,29 @@ type Options<TModule, TPackage> = $ReadOnly<{
   getHastePackagePath: (name: string, platform: ?string) => ?string,
   isAssetFile: IsAssetFile,
   mainFields: $ReadOnlyArray<string>,
-  moduleCache: ModuleishCache<TModule, TPackage>,
+  moduleCache: ModuleishCache<TPackage>,
   nodeModulesPaths: $ReadOnlyArray<string>,
   preferNativePlatform: boolean,
   projectRoot: string,
   resolveAsset: ResolveAsset,
   resolveRequest: ?CustomResolver,
   sourceExts: $ReadOnlyArray<string>,
+  unstable_conditionNames: $ReadOnlyArray<string>,
+  unstable_conditionsByPlatform: $ReadOnly<{
+    [platform: string]: $ReadOnlyArray<string>,
+  }>,
+  unstable_enablePackageExports: boolean,
 }>;
 
-class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
-  _options: Options<TModule, TPackage>;
+class ModuleResolver<TPackage: Packageish> {
+  _options: Options<TPackage>;
   // A module representing the project root, used as the origin when resolving `emptyModulePath`.
   _projectRootFakeModule: Moduleish;
   // An empty module, the result of resolving `emptyModulePath` from the project root.
-  _cachedEmptyModule: ?TModule;
+  _cachedEmptyModule: ?BundlerResolution;
 
   // $FlowFixMe[missing-local-annot]
-  constructor(options: Options<TModule, TPackage>) {
+  constructor(options: Options<TPackage>) {
     this._options = options;
     const {projectRoot, moduleCache} = this._options;
     this._projectRootFakeModule = {
@@ -97,7 +102,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
     };
   }
 
-  _getEmptyModule(): TModule | Moduleish {
+  _getEmptyModule(): BundlerResolution {
     let emptyModule = this._cachedEmptyModule;
     if (!emptyModule) {
       emptyModule = this.resolveDependency(
@@ -171,7 +176,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
     allowHaste: boolean,
     platform: string | null,
     resolverOptions: ResolverInputOptions,
-  ): TModule {
+  ): BundlerResolution {
     try {
       const result = Resolver.resolve(
         {
@@ -187,6 +192,8 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
           resolveHastePackage: (name: string) =>
             this._options.getHastePackagePath(name, platform),
           getPackageMainPath: this._getPackageMainPath,
+          unstable_enablePackageExports:
+            this._options.unstable_enablePackageExports,
         },
         moduleName,
         platform,
@@ -244,21 +251,19 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
   };
 
   /**
-   * 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: Resolution): TModule {
+  _getFileResolvedModule(resolution: Resolution): BundlerResolution {
     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: empty);

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

@@ -112,6 +112,7 @@ function createHasteMap(config, options) {
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
+    enableSymlinks: config.resolver.unstable_enableSymlinks,
     extensions: Array.from(
       new Set([
         ...config.resolver.sourceExts,

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

@@ -70,6 +70,7 @@ function createHasteMap(
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
+    enableSymlinks: config.resolver.unstable_enableSymlinks,
     extensions: Array.from(
       new Set([
         ...config.resolver.sourceExts,

package/src/node-haste/DependencyGraph.js

@@ -162,6 +162,11 @@ class DependencyGraph extends EventEmitter {
       },
       resolveRequest: this._config.resolver.resolveRequest,
       sourceExts: this._config.resolver.sourceExts,
+      unstable_conditionNames: this._config.resolver.unstable_conditionNames,
+      unstable_conditionsByPlatform:
+        this._config.resolver.unstable_conditionsByPlatform,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
     });
   }
   _createModuleCache() {
@@ -254,16 +259,16 @@ class DependencyGraph extends EventEmitter {
     );
     const mapByTarget = getOrCreateMap(mapByOrigin, originKey);
     const mapByPlatform = getOrCreateMap(mapByTarget, targetKey);
-    let modulePath = mapByPlatform.get(platformKey);
-    if (!modulePath) {
+    let resolution = mapByPlatform.get(platformKey);
+    if (!resolution) {
       try {
-        modulePath = this._moduleResolver.resolveDependency(
+        resolution = this._moduleResolver.resolveDependency(
           this._moduleCache.getModule(from),
           to,
           true,
           platform,
           resolverOptions
-        ).path;
+        );
       } catch (error) {
         if (error instanceof _metroFileMap.DuplicateHasteCandidatesError) {
           throw new AmbiguousModuleResolutionError(from, error);
@@ -278,8 +283,8 @@ class DependencyGraph extends EventEmitter {
         throw error;
       }
     }
-    mapByPlatform.set(platformKey, modulePath);
-    return modulePath;
+    mapByPlatform.set(platformKey, resolution);
+    return resolution;
   }
   _doesFileExist = (filePath) => {
     return this._fileSystem.exists(filePath);

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

@@ -18,7 +18,6 @@ import type MetroFileMap, {
   HealthCheckResult,
   WatcherStatus,
 } from 'metro-file-map';
-import type Module from './Module';
 
 import {DuplicateHasteCandidatesError} from 'metro-file-map';
 
@@ -37,6 +36,7 @@ const {InvalidPackageError} = require('metro-resolver');
 const nullthrows = require('nullthrows');
 const path = require('path');
 import type {ResolverInputOptions} from '../shared/types.flow';
+import type {BundlerResolution} from '../DeltaBundler/types.flow';
 
 const NULL_PLATFORM = Symbol();
 
@@ -59,7 +59,7 @@ class DependencyGraph extends EventEmitter {
   _fileSystem: FileSystem;
   _moduleCache: ModuleCache;
   _hasteModuleMap: IModuleMap;
-  _moduleResolver: ModuleResolver<Module, Package>;
+  _moduleResolver: ModuleResolver<Package>;
   _resolutionCache: Map<
     // Custom resolver options
     string | symbol,
@@ -72,7 +72,7 @@ class DependencyGraph extends EventEmitter {
         Map<
           // Platform
           string | symbol,
-          string,
+          BundlerResolution,
         >,
       >,
     >,
@@ -209,6 +209,11 @@ class DependencyGraph extends EventEmitter {
       },
       resolveRequest: this._config.resolver.resolveRequest,
       sourceExts: this._config.resolver.sourceExts,
+      unstable_conditionNames: this._config.resolver.unstable_conditionNames,
+      unstable_conditionsByPlatform:
+        this._config.resolver.unstable_conditionsByPlatform,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
     });
   }
 
@@ -284,7 +289,7 @@ class DependencyGraph extends EventEmitter {
     {assumeFlatNodeModules}: {assumeFlatNodeModules: boolean} = {
       assumeFlatNodeModules: false,
     },
-  ): string {
+  ): BundlerResolution {
     const isSensitiveToOriginFolder =
       // Resolution is always relative to the origin folder unless we assume a flat node_modules
       !assumeFlatNodeModules ||
@@ -313,17 +318,17 @@ class DependencyGraph extends EventEmitter {
     );
     const mapByTarget = getOrCreateMap(mapByOrigin, originKey);
     const mapByPlatform = getOrCreateMap(mapByTarget, targetKey);
-    let modulePath = mapByPlatform.get(platformKey);
+    let resolution: ?BundlerResolution = mapByPlatform.get(platformKey);
 
-    if (!modulePath) {
+    if (!resolution) {
       try {
-        modulePath = this._moduleResolver.resolveDependency(
+        resolution = this._moduleResolver.resolveDependency(
           this._moduleCache.getModule(from),
           to,
           true,
           platform,
           resolverOptions,
-        ).path;
+        );
       } catch (error) {
         if (error instanceof DuplicateHasteCandidatesError) {
           throw new AmbiguousModuleResolutionError(from, error);
@@ -339,8 +344,8 @@ class DependencyGraph extends EventEmitter {
       }
     }
 
-    mapByPlatform.set(platformKey, modulePath);
-    return modulePath;
+    mapByPlatform.set(platformKey, resolution);
+    return resolution;
   }
 
   _doesFileExist = (filePath: string): boolean => {