metro 0.65.2 → 0.67.0

package/src/node-haste/DependencyGraph.js

@@ -1,5 +1,9 @@
+"use strict";
+
+var _jestHasteMap = require("jest-haste-map");
+
 /**
- * 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.
@@ -7,37 +11,31 @@
  *
  * @format
  */
-"use strict";
-
-const { AmbiguousModuleResolutionError } = require("metro-core");
-
-const { DuplicateHasteCandidatesError } = require("jest-haste-map").ModuleMap;
+const createHasteMap = require("./DependencyGraph/createHasteMap");
 
-const { InvalidPackageError } = require("metro-resolver");
-
-const { PackageResolutionError } = require("metro-core");
-
-const JestHasteMap = require("jest-haste-map");
+const { ModuleResolver } = require("./DependencyGraph/ModuleResolution");
 
 const Module = require("./Module");
 
 const ModuleCache = require("./ModuleCache");
 
-const ci = require("ci-info");
+const { EventEmitter } = require("events");
 
 const fs = require("fs");
 
-const path = require("path");
+const {
+  AmbiguousModuleResolutionError,
+  Logger: { createActionStartEntry, createActionEndEntry, log },
+  PackageResolutionError,
+} = require("metro-core");
 
-const { ModuleResolver } = require("./DependencyGraph/ModuleResolution");
+const { InvalidPackageError } = require("metro-resolver");
 
-const { EventEmitter } = require("events");
+const nullthrows = require("nullthrows");
 
-const {
-  Logger: { createActionStartEntry, createActionEndEntry, log }
-} = require("metro-core");
+const path = require("path");
 
-const JEST_HASTE_MAP_CACHE_BREAKER = 5;
+const { DuplicateHasteCandidatesError } = _jestHasteMap.ModuleMap;
 
 function getOrCreate(map, field) {
   let subMap = map.get(field);
@@ -51,7 +49,6 @@ function getOrCreate(map, field) {
 }
 
 class DependencyGraph extends EventEmitter {
-  // $FlowFixMe[value-as-type]
   constructor({ config, haste, initialHasteFS, initialModuleMap }) {
     super();
     this._config = config;
@@ -59,8 +56,8 @@ class DependencyGraph extends EventEmitter {
     this._hasteFS = initialHasteFS;
     this._moduleMap = initialModuleMap;
     this._assetExtensions = new Set(
-      config.resolver.assetExts.map(asset => "." + asset)
-    );
+      config.resolver.assetExts.map((asset) => "." + asset)
+    ); // $FlowFixMe[method-unbinding] added when improving typing for this parameters
 
     this._haste.on("change", this._onHasteChange.bind(this));
 
@@ -70,86 +67,32 @@ class DependencyGraph extends EventEmitter {
     this._createModuleResolver();
   }
 
-  static _getIgnorePattern(config) {
-    /*
-      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, watch) {
-    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, options) {
+    const { hasReducedPerformance, watch } =
+      options !== null && options !== void 0 ? options : {};
     const initializingMetroLogEntry = log(
       createActionStartEntry("Initializing Metro")
     );
     config.reporter.update({
       type: "dep_graph_loading",
-      hasReducedPerformance: options
-        ? Boolean(options.hasReducedPerformance)
-        : false
+      hasReducedPerformance: !!hasReducedPerformance,
     });
+    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.
 
-    const haste = DependencyGraph._createHaste(
-      config,
-      options && options.watch
-    );
-
+    haste.setMaxListeners(1000);
     const { hasteFS, moduleMap } = await haste.build();
     log(createActionEndEntry(initializingMetroLogEntry));
     config.reporter.update({
-      type: "dep_graph_loaded"
+      type: "dep_graph_loaded",
     });
     return new DependencyGraph({
       haste,
       initialHasteFS: hasteFS,
       initialModuleMap: moduleMap,
-      config
+      config,
     });
   }
 
@@ -186,16 +129,19 @@ class DependencyGraph extends EventEmitter {
 
   _createModuleResolver() {
     this._moduleResolver = new ModuleResolver({
-      dirExists: filePath => {
+      dirExists: (filePath) => {
         try {
           return fs.lstatSync(filePath).isDirectory();
         } 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)),
+      isAssetFile: (file) => this._assetExtensions.has(path.extname(file)),
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       moduleMap: this._moduleMap,
@@ -207,19 +153,20 @@ class DependencyGraph extends EventEmitter {
         const assets = [
           basePath + extension,
           ...this._config.resolver.assetResolutions.map(
-            resolution => basePath + "@" + resolution + "x" + extension
-          )
-        ].filter(candidate => this._hasteFS.exists(candidate));
+            (resolution) => basePath + "@" + resolution + "x" + extension
+          ),
+        ].filter((candidate) => this._hasteFS.exists(candidate));
         return assets.length ? assets : null;
       },
       resolveRequest: this._config.resolver.resolveRequest,
-      sourceExts: this._config.resolver.sourceExts
+      sourceExts: this._config.resolver.sourceExts,
     });
   }
 
   _createModuleCache() {
     return new ModuleCache({
-      getClosestPackage: this._getClosestPackage.bind(this)
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      getClosestPackage: this._getClosestPackage.bind(this),
     });
   }
 
@@ -248,7 +195,7 @@ class DependencyGraph extends EventEmitter {
     }
 
     return sha1;
-  } // $FlowFixMe[value-as-type]
+  }
 
   getWatcher() {
     return this._haste;
@@ -263,25 +210,22 @@ class DependencyGraph extends EventEmitter {
     to,
     platform,
     { assumeFlatNodeModules } = {
-      assumeFlatNodeModules: false
+      assumeFlatNodeModules: false,
     }
   ) {
-    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 === ".." ||
+      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 {
         modulePath = this._moduleResolver.resolveDependency(
@@ -289,18 +233,7 @@ class DependencyGraph extends EventEmitter {
           to,
           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
-          );
-        }
+        ).path;
       } catch (error) {
         if (error instanceof DuplicateHasteCandidatesError) {
           throw new AmbiguousModuleResolutionError(from, error);
@@ -310,7 +243,7 @@ class DependencyGraph extends EventEmitter {
           throw new PackageResolutionError({
             packageError: error,
             originModulePath: from,
-            targetModuleName: to
+            targetModuleName: to,
           });
         }
 
@@ -322,7 +255,7 @@ class DependencyGraph extends EventEmitter {
     return modulePath;
   }
 
-  _doesFileExist = filePath => {
+  _doesFileExist = (filePath) => {
     return this._hasteFS.exists(filePath);
   };
 
@@ -337,7 +270,7 @@ class DependencyGraph extends EventEmitter {
   }
 
   getDependencies(filePath) {
-    return this._hasteFS.getDependencies(filePath);
+    return nullthrows(this._hasteFS.getDependencies(filePath));
   }
 }
 

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,
   |}) {
@@ -79,90 +72,32 @@ class DependencyGraph extends EventEmitter {
     this._assetExtensions = new Set(
       config.resolver.assetExts.map(asset => '.' + asset),
     );
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._haste.on('change', this._onHasteChange.bind(this));
     this._resolutionCache = new Map();
     this._moduleCache = this._createModuleCache();
     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));
@@ -209,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,
@@ -235,6 +173,7 @@ class DependencyGraph extends EventEmitter {
 
   _createModuleCache() {
     return new ModuleCache({
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       getClosestPackage: this._getClosestPackage.bind(this),
     });
   }
@@ -270,8 +209,7 @@ class DependencyGraph extends EventEmitter {
     return sha1;
   }
 
-  // $FlowFixMe[value-as-type]
-  getWatcher(): JestHasteMap {
+  getWatcher(): EventEmitter {
     return this._haste;
   }
 
@@ -287,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 {
@@ -310,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);
@@ -356,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;