metro 0.75.0 → 0.76.0

package/src/node-haste/DependencyGraph.js

@@ -39,11 +39,7 @@ class DependencyGraph extends EventEmitter {
   constructor(config, options) {
     super();
     this._config = config;
-    this._assetExtensions = new Set(
-      config.resolver.assetExts.map((asset) => "." + asset)
-    );
-    const { hasReducedPerformance, watch } =
-      options !== null && options !== void 0 ? options : {};
+    const { hasReducedPerformance, watch } = options ?? {};
     const initializingMetroLogEntry = log(
       createActionStartEntry("Initializing Metro")
     );
@@ -129,6 +125,7 @@ class DependencyGraph extends EventEmitter {
   }
   _createModuleResolver() {
     this._moduleResolver = new ModuleResolver({
+      assetExts: new Set(this._config.resolver.assetExts),
       dirExists: (filePath) => {
         try {
           return fs.lstatSync(filePath).isDirectory();
@@ -144,20 +141,29 @@ class DependencyGraph extends EventEmitter {
         this._hasteModuleMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
         this._hasteModuleMap.getPackage(name, platform, true),
-      isAssetFile: (file) => this._assetExtensions.has(path.extname(file)),
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       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 +173,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 +195,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.
@@ -224,7 +237,6 @@ class DependencyGraph extends EventEmitter {
       assumeFlatNodeModules: false,
     }
   ) {
-    var _JSON$stringify, _resolverOptions$cust;
     const isSensitiveToOriginFolder =
       // Resolution is always relative to the origin folder unless we assume a flat node_modules
       !assumeFlatNodeModules ||
@@ -237,19 +249,13 @@ class DependencyGraph extends EventEmitter {
 
     // Compound key for the resolver cache
     const resolverOptionsKey =
-      (_JSON$stringify = JSON.stringify(
-        (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
-          null && _resolverOptions$cust !== void 0
-          ? _resolverOptions$cust
-          : {},
+      JSON.stringify(
+        resolverOptions.customResolverOptions ?? {},
         canonicalize
-      )) !== null && _JSON$stringify !== void 0
-        ? _JSON$stringify
-        : "";
+      ) ?? "";
     const originKey = isSensitiveToOriginFolder ? path.dirname(from) : "";
     const targetKey = to;
-    const platformKey =
-      platform !== null && platform !== void 0 ? platform : NULL_PLATFORM;
+    const platformKey = platform ?? NULL_PLATFORM;
 
     // Traverse the resolver cache, which is a tree of maps
     const mapByResolverOptions = this._resolutionCache;

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

@@ -53,7 +53,6 @@ function getOrCreateMap<T>(
 }
 
 class DependencyGraph extends EventEmitter {
-  _assetExtensions: Set<string>;
   _config: ConfigT;
   _haste: MetroFileMap;
   _fileSystem: FileSystem;
@@ -89,9 +88,6 @@ class DependencyGraph extends EventEmitter {
     super();
 
     this._config = config;
-    this._assetExtensions = new Set(
-      config.resolver.assetExts.map(asset => '.' + asset),
-    );
 
     const {hasReducedPerformance, watch} = options ?? {};
     const initializingMetroLogEntry = log(
@@ -176,6 +172,7 @@ class DependencyGraph extends EventEmitter {
 
   _createModuleResolver() {
     this._moduleResolver = new ModuleResolver({
+      assetExts: new Set(this._config.resolver.assetExts),
       dirExists: (filePath: string) => {
         try {
           return fs.lstatSync(filePath).isDirectory();
@@ -191,20 +188,31 @@ class DependencyGraph extends EventEmitter {
         this._hasteModuleMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
         this._hasteModuleMap.getPackage(name, platform, true),
-      isAssetFile: file => this._assetExtensions.has(path.extname(file)),
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       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 +222,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 +247,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) {

package/src/node-haste/Module.js

@@ -11,11 +11,13 @@
 
 "use strict";
 
-const isAbsolutePath = require("absolute-path");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 class Module {
-  // $FlowFixMe[missing-local-annot]
   constructor(file, moduleCache) {
-    if (!isAbsolutePath(file)) {
+    if (!_path.default.isAbsolute(file)) {
       throw new Error("Expected file to be absolute path but got " + file);
     }
     this.path = file;

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

@@ -14,7 +14,7 @@
 import type ModuleCache from './ModuleCache';
 import type Package from './Package';
 
-const isAbsolutePath = require('absolute-path');
+import path from 'path';
 
 class Module {
   path: string;
@@ -22,9 +22,8 @@ class Module {
   _moduleCache: ModuleCache;
   _sourceCode: ?string;
 
-  // $FlowFixMe[missing-local-annot]
   constructor(file: string, moduleCache: ModuleCache) {
-    if (!isAbsolutePath(file)) {
+    if (!path.isAbsolute(file)) {
       throw new Error('Expected file to be absolute path but got ' + file);
     }
 

package/src/node-haste/ModuleCache.js

@@ -43,7 +43,6 @@ class ModuleCache {
     return this.getPackageOf(module.path);
   }
   getPackageOf(modulePath) {
-    var _this$_modulePathsByP;
     let packagePath = this._packagePathByModulePath[modulePath];
     if (packagePath && this._packageCache[packagePath]) {
       return this._packageCache[packagePath];
@@ -54,10 +53,7 @@ class ModuleCache {
     }
     this._packagePathByModulePath[modulePath] = packagePath;
     const modulePaths =
-      (_this$_modulePathsByP = this._modulePathsByPackagePath[packagePath]) !==
-        null && _this$_modulePathsByP !== void 0
-        ? _this$_modulePathsByP
-        : new Set();
+      this._modulePathsByPackagePath[packagePath] ?? new Set();
     modulePaths.add(modulePath);
     this._modulePathsByPackagePath[packagePath] = modulePaths;
     return this.getPackage(packagePath);