metro 0.66.2 → 0.69.0

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,33 +8,28 @@
  * @format
  */
 
-'use strict';
+import type {HasteFS, HasteMap, ModuleMap} from './DependencyGraph/types';
+import type Package from './Package';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
-const {AmbiguousModuleResolutionError} = require('metro-core');
-const {DuplicateHasteCandidatesError} = require('jest-haste-map').ModuleMap;
-const {InvalidPackageError} = require('metro-resolver');
-const {PackageResolutionError} = require('metro-core');
+import {ModuleMap as JestHasteModuleMap} from 'jest-haste-map';
 
-const JestHasteMap = require('jest-haste-map');
+const createHasteMap = require('./DependencyGraph/createHasteMap');
+const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
 const Module = require('./Module');
 const ModuleCache = require('./ModuleCache');
-
-const ci = require('ci-info');
-const fs = require('fs');
-const path = require('path');
-
-const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
 const {EventEmitter} = require('events');
+const fs = require('fs');
 const {
+  AmbiguousModuleResolutionError,
   Logger: {createActionStartEntry, createActionEndEntry, log},
+  PackageResolutionError,
 } = require('metro-core');
+const {InvalidPackageError} = require('metro-resolver');
+const nullthrows = require('nullthrows');
+const path = require('path');
 
-import type {ModuleMap} from './DependencyGraph/ModuleResolution';
-import type Package from './Package';
-import type {HasteFS} from './types';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
-
-const JEST_HASTE_MAP_CACHE_BREAKER = 5;
+const {DuplicateHasteCandidatesError} = JestHasteModuleMap;
 
 function getOrCreate<T>(
   map: Map<string, Map<string, T>>,
@@ -51,8 +46,7 @@ function getOrCreate<T>(
 class DependencyGraph extends EventEmitter {
   _assetExtensions: Set<string>;
   _config: ConfigT;
-  // $FlowFixMe[value-as-type]
-  _haste: JestHasteMap;
+  _haste: HasteMap;
   _hasteFS: HasteFS;
   _moduleCache: ModuleCache;
   _moduleMap: ModuleMap;
@@ -66,8 +60,7 @@ class DependencyGraph extends EventEmitter {
     initialModuleMap,
   }: {|
     +config: ConfigT,
-    // $FlowFixMe[value-as-type]
-    +haste: JestHasteMap,
+    +haste: HasteMap,
     +initialHasteFS: HasteFS,
     +initialModuleMap: ModuleMap,
   |}) {
@@ -86,84 +79,25 @@ class DependencyGraph extends EventEmitter {
     this._createModuleResolver();
   }
 
-  static _getIgnorePattern(config: ConfigT): RegExp {
-    /*
-      For now we support both blockList and blacklistRE options
-    */
-    const {blockList, blacklistRE} = config.resolver;
-
-    const combine = regexes =>
-      new RegExp(
-        regexes
-          .map(regex => '(' + regex.source.replace(/\//g, path.sep) + ')')
-          .join('|'),
-      );
-
-    // If `blacklistRE` is set - use it,
-    // if `blockList` is set - use it
-    const ignorePattern = blacklistRE || blockList;
-
-    // If neither option has been set, use default pattern
-    if (!ignorePattern) {
-      return / ^/;
-    }
-
-    // If ignorePattern is an array, merge it into one
-    if (Array.isArray(ignorePattern)) {
-      return combine(ignorePattern);
-    }
-
-    return ignorePattern;
-  }
-
-  // $FlowFixMe[value-as-type]
-  static _createHaste(config: ConfigT, watch?: boolean): JestHasteMap {
-    const haste = new JestHasteMap({
-      cacheDirectory: config.hasteMapCacheDirectory,
-      dependencyExtractor: config.resolver.dependencyExtractor,
-      computeSha1: true,
-      extensions: config.resolver.sourceExts.concat(config.resolver.assetExts),
-      forceNodeFilesystemAPI: !config.resolver.useWatchman,
-      hasteImplModulePath: config.resolver.hasteImplModulePath,
-      ignorePattern: this._getIgnorePattern(config),
-      maxWorkers: config.maxWorkers,
-      mocksPattern: '',
-      name: 'metro-' + JEST_HASTE_MAP_CACHE_BREAKER,
-      platforms: config.resolver.platforms,
-      retainAllFiles: true,
-      resetCache: config.resetCache,
-      rootDir: config.projectRoot,
-      roots: config.watchFolders,
-      throwOnModuleCollision: true,
-      useWatchman: config.resolver.useWatchman,
-      watch: watch == null ? !ci.isCI : watch,
-    });
-
-    // We can have a lot of graphs listening to Haste for changes.
-    // Bump this up to silence the max listeners EventEmitter warning.
-    haste.setMaxListeners(1000);
-
-    return haste;
-  }
-
   static async load(
     config: ConfigT,
     options?: {|+hasReducedPerformance?: boolean, +watch?: boolean|},
   ): Promise<DependencyGraph> {
+    const {hasReducedPerformance, watch} = options ?? {};
     const initializingMetroLogEntry = log(
       createActionStartEntry('Initializing Metro'),
     );
 
     config.reporter.update({
       type: 'dep_graph_loading',
-      hasReducedPerformance: options
-        ? Boolean(options.hasReducedPerformance)
-        : false,
+      hasReducedPerformance: !!hasReducedPerformance,
     });
-    const haste = DependencyGraph._createHaste(
-      config,
-      options && options.watch,
-    );
+    const haste = createHasteMap(config, {watch});
+
+    // We can have a lot of graphs listening to Haste for changes.
+    // Bump this up to silence the max listeners EventEmitter warning.
+    haste.setMaxListeners(1000);
+
     const {hasteFS, moduleMap} = await haste.build();
 
     log(createActionEndEntry(initializingMetroLogEntry));
@@ -210,7 +144,10 @@ class DependencyGraph extends EventEmitter {
         } catch (e) {}
         return false;
       },
+      disableHierarchicalLookup:
+        this._config.resolver.disableHierarchicalLookup,
       doesFileExist: this._doesFileExist,
+      emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
       isAssetFile: file => this._assetExtensions.has(path.extname(file)),
       mainFields: this._config.resolver.resolverMainFields,
@@ -272,8 +209,7 @@ class DependencyGraph extends EventEmitter {
     return sha1;
   }
 
-  // $FlowFixMe[value-as-type]
-  getWatcher(): JestHasteMap {
+  getWatcher(): EventEmitter {
     return this._haste;
   }
 
@@ -289,20 +225,21 @@ class DependencyGraph extends EventEmitter {
       assumeFlatNodeModules: false,
     },
   ): string {
-    const isPath =
+    const isSensitiveToOriginFolder =
+      // Resolution is always relative to the origin folder unless we assume a flat node_modules
+      !assumeFlatNodeModules ||
+      // Path requests are resolved relative to the origin folder
       to.includes('/') ||
       to === '.' ||
       to === '..' ||
+      // Preserve standard assumptions under node_modules
       from.includes(path.sep + 'node_modules' + path.sep);
     const mapByDirectory = getOrCreate(
       this._resolutionCache,
-      isPath ? path.dirname(from) : '',
+      isSensitiveToOriginFolder ? path.dirname(from) : '',
     );
-    let mapByPlatform = getOrCreate(mapByDirectory, to);
+    const mapByPlatform = getOrCreate(mapByDirectory, to);
     let modulePath = mapByPlatform.get(platform);
-    if (!modulePath) {
-      modulePath = this._moduleMap.getModule(to, platform, true);
-    }
 
     if (!modulePath) {
       try {
@@ -312,18 +249,6 @@ class DependencyGraph extends EventEmitter {
           true,
           platform,
         ).path;
-
-        // If we cannot assume that only one node_modules folder exists in the project,
-        // we need to cache packages by directory instead of globally.
-        if (
-          !assumeFlatNodeModules &&
-          modulePath.includes(path.sep + 'node_modules' + path.sep)
-        ) {
-          mapByPlatform = getOrCreate(
-            getOrCreate(this._resolutionCache, path.dirname(from)),
-            to,
-          );
-        }
       } catch (error) {
         if (error instanceof DuplicateHasteCandidatesError) {
           throw new AmbiguousModuleResolutionError(from, error);
@@ -358,7 +283,7 @@ class DependencyGraph extends EventEmitter {
   }
 
   getDependencies(filePath: string): Array<string> {
-    return this._hasteFS.getDependencies(filePath);
+    return nullthrows(this._hasteFS.getDependencies(filePath));
   }
 }
 

package/src/node-haste/Module.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,11 +10,11 @@
 
 'use strict';
 
-const isAbsolutePath = require('absolute-path');
-
 import type ModuleCache from './ModuleCache';
 import type Package from './Package';
 
+const isAbsolutePath = require('absolute-path');
+
 class Module {
   path: string;
 

package/src/node-haste/ModuleCache.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,11 +14,14 @@ const Module = require("./Module");
 const Package = require("./Package");
 
 class ModuleCache {
+  // Cache for "closest package.json" queries by module path.
+  // The inverse of _packagePathByModulePath.
   constructor(options) {
     this._getClosestPackage = options.getClosestPackage;
     this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
-    this._packageModuleMap = new WeakMap();
+    this._packagePathByModulePath = Object.create(null);
+    this._modulePathsByPackagePath = Object.create(null);
   }
 
   getModule(filePath) {
@@ -32,7 +35,7 @@ class ModuleCache {
   getPackage(filePath) {
     if (!this._packageCache[filePath]) {
       this._packageCache[filePath] = new Package({
-        file: filePath
+        file: filePath,
       });
     }
 
@@ -40,24 +43,32 @@ class ModuleCache {
   }
 
   getPackageForModule(module) {
-    let packagePath = this._packageModuleMap.get(module);
+    return this.getPackageOf(module.path);
+  }
 
-    if (packagePath) {
-      if (this._packageCache[packagePath]) {
-        return this._packageCache[packagePath];
-      } else {
-        this._packageModuleMap.delete(module);
-      }
+  getPackageOf(modulePath) {
+    var _this$_modulePathsByP;
+
+    let packagePath = this._packagePathByModulePath[modulePath];
+
+    if (packagePath && this._packageCache[packagePath]) {
+      return this._packageCache[packagePath];
     }
 
-    packagePath = this._getClosestPackage(module.path);
+    packagePath = this._getClosestPackage(modulePath);
 
     if (!packagePath) {
       return null;
     }
 
-    this._packageModuleMap.set(module, packagePath);
-
+    this._packagePathByModulePath[modulePath] = packagePath;
+    const modulePaths =
+      (_this$_modulePathsByP = this._modulePathsByPackagePath[packagePath]) !==
+        null && _this$_modulePathsByP !== void 0
+        ? _this$_modulePathsByP
+        : new Set();
+    modulePaths.add(modulePath);
+    this._modulePathsByPackagePath[packagePath] = modulePaths;
     return this.getPackage(packagePath);
   }
 
@@ -73,6 +84,36 @@ class ModuleCache {
 
       delete this._packageCache[filePath];
     }
+
+    if (this._packagePathByModulePath[filePath]) {
+      // filePath is a module inside a package.
+      const packagePath = this._packagePathByModulePath[filePath];
+      delete this._packagePathByModulePath[filePath]; // This change doesn't invalidate any cached "closest package.json"
+      // queries for the package's other modules. Clean up only this module.
+
+      const modulePaths = this._modulePathsByPackagePath[packagePath];
+
+      if (modulePaths) {
+        modulePaths.delete(filePath);
+
+        if (modulePaths.size === 0) {
+          delete this._modulePathsByPackagePath[packagePath];
+        }
+      }
+    }
+
+    if (this._modulePathsByPackagePath[filePath]) {
+      // filePath is a package. This change invalidates all cached "closest
+      // package.json" queries for modules inside this package.
+      const modulePaths = this._modulePathsByPackagePath[filePath];
+
+      for (const modulePath of modulePaths) {
+        delete this._packagePathByModulePath[modulePath];
+      }
+
+      modulePaths.clear();
+      delete this._modulePathsByPackagePath[filePath];
+    }
   }
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,13 +27,25 @@ class ModuleCache {
     __proto__: null,
     ...
   };
-  _packageModuleMap: WeakMap<Module, string>;
+  // Cache for "closest package.json" queries by module path.
+  _packagePathByModulePath: {
+    [filePath: string]: string,
+    __proto__: null,
+    ...
+  };
+  // The inverse of _packagePathByModulePath.
+  _modulePathsByPackagePath: {
+    [filePath: string]: Set<string>,
+    __proto__: null,
+    ...
+  };
 
   constructor(options: {getClosestPackage: GetClosestPackageFn, ...}) {
     this._getClosestPackage = options.getClosestPackage;
     this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
-    this._packageModuleMap = new WeakMap();
+    this._packagePathByModulePath = Object.create(null);
+    this._modulePathsByPackagePath = Object.create(null);
   }
 
   getModule(filePath: string): Module {
@@ -53,21 +65,26 @@ class ModuleCache {
   }
 
   getPackageForModule(module: Module): ?Package {
-    let packagePath = this._packageModuleMap.get(module);
-    if (packagePath) {
-      if (this._packageCache[packagePath]) {
-        return this._packageCache[packagePath];
-      } else {
-        this._packageModuleMap.delete(module);
-      }
+    return this.getPackageOf(module.path);
+  }
+
+  getPackageOf(modulePath: string): ?Package {
+    let packagePath = this._packagePathByModulePath[modulePath];
+    if (packagePath && this._packageCache[packagePath]) {
+      return this._packageCache[packagePath];
     }
 
-    packagePath = this._getClosestPackage(module.path);
+    packagePath = this._getClosestPackage(modulePath);
     if (!packagePath) {
       return null;
     }
 
-    this._packageModuleMap.set(module, packagePath);
+    this._packagePathByModulePath[modulePath] = packagePath;
+    const modulePaths =
+      this._modulePathsByPackagePath[packagePath] ?? new Set();
+    modulePaths.add(modulePath);
+    this._modulePathsByPackagePath[packagePath] = modulePaths;
+
     return this.getPackage(packagePath);
   }
 
@@ -80,6 +97,30 @@ class ModuleCache {
       this._packageCache[filePath].invalidate();
       delete this._packageCache[filePath];
     }
+    if (this._packagePathByModulePath[filePath]) {
+      // filePath is a module inside a package.
+      const packagePath = this._packagePathByModulePath[filePath];
+      delete this._packagePathByModulePath[filePath];
+      // This change doesn't invalidate any cached "closest package.json"
+      // queries for the package's other modules. Clean up only this module.
+      const modulePaths = this._modulePathsByPackagePath[packagePath];
+      if (modulePaths) {
+        modulePaths.delete(filePath);
+        if (modulePaths.size === 0) {
+          delete this._modulePathsByPackagePath[packagePath];
+        }
+      }
+    }
+    if (this._modulePathsByPackagePath[filePath]) {
+      // filePath is a package. This change invalidates all cached "closest
+      // package.json" queries for modules inside this package.
+      const modulePaths = this._modulePathsByPackagePath[filePath];
+      for (const modulePath of modulePaths) {
+        delete this._packagePathByModulePath[modulePath];
+      }
+      modulePaths.clear();
+      delete this._modulePathsByPackagePath[filePath];
+    }
   }
 }
 

package/src/node-haste/Package.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -42,21 +42,19 @@ class Package {
     const replacements = getReplacements(json, mainFields);
 
     if (replacements) {
-      const variants = [main]; // $FlowFixMe[incompatible-use]
+      const variants = [main];
 
       if (main.slice(0, 2) === "./") {
-        // $FlowFixMe[incompatible-use]
         variants.push(main.slice(2));
       } else {
-        // $FlowFixMe[incompatible-type]
         variants.push("./" + main);
       }
 
       for (const variant of variants) {
-        const winner = // $FlowFixMe[incompatible-type]
-          replacements[variant] || // $FlowFixMe[incompatible-type]
-          replacements[variant + ".js"] || // $FlowFixMe[incompatible-type]
-          replacements[variant + ".json"] || // $FlowFixMe[incompatible-use]
+        const winner =
+          replacements[variant] ||
+          replacements[variant + ".js"] ||
+          replacements[variant + ".json"] ||
           replacements[variant.replace(/(\.js|\.json)$/, "")];
 
         if (winner) {
@@ -127,7 +125,7 @@ class Package {
 
 function getReplacements(pkg, mainFields) {
   const replacements = mainFields
-    .map(name => {
+    .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") {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -57,24 +57,17 @@ class Package {
     const replacements = getReplacements(json, mainFields);
     if (replacements) {
       const variants = [main];
-      // $FlowFixMe[incompatible-use]
       if (main.slice(0, 2) === './') {
-        // $FlowFixMe[incompatible-use]
         variants.push(main.slice(2));
       } else {
-        // $FlowFixMe[incompatible-type]
         variants.push('./' + main);
       }
 
       for (const variant of variants) {
         const winner =
-          // $FlowFixMe[incompatible-type]
           replacements[variant] ||
-          // $FlowFixMe[incompatible-type]
           replacements[variant + '.js'] ||
-          // $FlowFixMe[incompatible-type]
           replacements[variant + '.json'] ||
-          // $FlowFixMe[incompatible-use]
           replacements[variant.replace(/(\.js|\.json)$/, '')];
 
         if (winner) {

package/src/node-haste/lib/AssetPaths.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -30,14 +30,14 @@ function parseBaseName(baseName) {
     if (!Number.isNaN(resolution)) {
       return {
         rootName,
-        resolution
+        resolution,
       };
     }
   }
 
   return {
     rootName,
-    resolution: 1
+    resolution: 1,
   };
 }
 /**
@@ -59,7 +59,7 @@ function tryParse(filePath, platforms) {
     name: rootName,
     platform,
     resolution,
-    type: extension
+    type: extension,
   };
 }
 
@@ -75,5 +75,5 @@ function parse(filePath, platforms) {
 
 module.exports = {
   parse,
-  tryParse
+  tryParse,
 };

package/src/node-haste/lib/AssetPaths.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -23,9 +23,7 @@ export type AssetPath = {|
 
 const ASSET_BASE_NAME_RE = /(.+?)(@([\d.]+)x)?$/;
 
-function parseBaseName(
-  baseName: string,
-): {
+function parseBaseName(baseName: string): {
   resolution: number,
   rootName: string,
   ...

package/src/node-haste/lib/parsePlatformFilePath.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,7 +27,7 @@ function parsePlatformFilePath(filePath, platforms) {
       dirPath,
       baseName: fileName,
       platform: null,
-      extension: null
+      extension: null,
     };
   }
 
@@ -39,7 +39,7 @@ function parsePlatformFilePath(filePath, platforms) {
       dirPath,
       baseName: match[1],
       platform,
-      extension
+      extension,
     };
   }
 
@@ -48,7 +48,7 @@ function parsePlatformFilePath(filePath, platforms) {
     dirPath,
     baseName,
     platform: null,
-    extension
+    extension,
   };
 }
 

package/src/node-haste/lib/parsePlatformFilePath.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.