metro 0.75.1 → 0.76.0

package/src/lib/transformHelpers.js.flow

@@ -23,8 +23,8 @@ import type {Type} from 'metro-transform-worker';
 import type {RequireContext} from './contextModule';
 
 import {getContextModuleTemplate} from './contextModuleTemplates';
+import isAssetFile from 'metro-resolver/src/utils/isAssetFile';
 
-const path = require('path');
 import type {ResolverInputOptions} from '../shared/types.flow';
 
 type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
@@ -143,6 +143,7 @@ async function getTransformFn(
     options,
     resolverOptions,
   );
+  const assetExts = new Set(config.resolver.assetExts);
 
   return async (modulePath: string, requireContext: ?RequireContext) => {
     let templateBuffer: Buffer;
@@ -173,11 +174,7 @@ async function getTransformFn(
       modulePath,
       {
         ...transformOptions,
-        type: getType(
-          transformOptions.type,
-          modulePath,
-          config.resolver.assetExts,
-        ),
+        type: getType(transformOptions.type, modulePath, assetExts),
         inlineRequires: removeInlineRequiresBlockListFromOptions(
           modulePath,
           inlineRequires,
@@ -191,13 +188,13 @@ async function getTransformFn(
 function getType(
   type: string,
   filePath: string,
-  assetExts: $ReadOnlyArray<string>,
+  assetExts: $ReadOnlySet<string>,
 ): Type {
   if (type === 'script') {
     return type;
   }
 
-  if (assetExts.indexOf(path.extname(filePath).slice(1)) !== -1) {
+  if (isAssetFile(filePath, assetExts)) {
     return 'asset';
   }
 

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

@@ -23,7 +23,6 @@ class ModuleResolver {
 
   // An empty module, the result of resolving `emptyModulePath` from the project root.
 
-  // $FlowFixMe[missing-local-annot]
   constructor(options) {
     this._options = options;
     const { projectRoot, moduleCache } = this._options;
@@ -61,10 +60,10 @@ class ModuleResolver {
     resolverOptions
   ) {
     const {
+      assetExts,
       disableHierarchicalLookup,
       doesFileExist,
       extraNodeModules,
-      isAssetFile,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -77,14 +76,13 @@ class ModuleResolver {
       unstable_getRealPath,
     } = this._options;
     try {
-      var _resolverOptions$cust;
       const result = Resolver.resolve(
         createDefaultContext({
           allowHaste,
+          assetExts,
           disableHierarchicalLookup,
           doesFileExist,
           extraNodeModules,
-          isAssetFile,
           mainFields,
           nodeModulesPaths,
           preferNativePlatform,
@@ -96,11 +94,7 @@ class ModuleResolver {
           unstable_enablePackageExports,
           unstable_getRealPath,
           unstable_logWarning: this._logWarning,
-          customResolverOptions:
-            (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
-              null && _resolverOptions$cust !== void 0
-              ? _resolverOptions$cust
-              : {},
+          customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
           resolveHasteModule: (name) =>
             this._options.getHasteModulePath(name, platform),
@@ -259,8 +253,7 @@ class UnableToResolveError extends Error {
         originModulePath,
         message
       ) + (codeFrameMessage ? "\n" + codeFrameMessage : "");
-    this.cause =
-      options === null || options === void 0 ? void 0 : options.cause;
+    this.cause = options?.cause;
   }
   buildCodeFrameMessage() {
     let file;

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

@@ -16,7 +16,6 @@ import type {
   DoesFileExist,
   FileCandidates,
   GetRealPath,
-  IsAssetFile,
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
@@ -55,6 +54,7 @@ export type ModuleishCache<TPackage> = interface {
 };
 
 type Options<TPackage> = $ReadOnly<{
+  assetExts: $ReadOnlySet<string>,
   dirExists: DirExistsFn,
   disableHierarchicalLookup: boolean,
   doesFileExist: DoesFileExist,
@@ -62,7 +62,6 @@ type Options<TPackage> = $ReadOnly<{
   extraNodeModules: ?Object,
   getHasteModulePath: (name: string, platform: ?string) => ?string,
   getHastePackagePath: (name: string, platform: ?string) => ?string,
-  isAssetFile: IsAssetFile,
   mainFields: $ReadOnlyArray<string>,
   moduleCache: ModuleishCache<TPackage>,
   nodeModulesPaths: $ReadOnlyArray<string>,
@@ -87,7 +86,6 @@ class ModuleResolver<TPackage: Packageish> {
   // An empty module, the result of resolving `emptyModulePath` from the project root.
   _cachedEmptyModule: ?BundlerResolution;
 
-  // $FlowFixMe[missing-local-annot]
   constructor(options: Options<TPackage>) {
     this._options = options;
     const {projectRoot, moduleCache} = this._options;
@@ -127,10 +125,10 @@ class ModuleResolver<TPackage: Packageish> {
     resolverOptions: ResolverInputOptions,
   ): BundlerResolution {
     const {
+      assetExts,
       disableHierarchicalLookup,
       doesFileExist,
       extraNodeModules,
-      isAssetFile,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -147,10 +145,10 @@ class ModuleResolver<TPackage: Packageish> {
       const result = Resolver.resolve(
         createDefaultContext({
           allowHaste,
+          assetExts,
           disableHierarchicalLookup,
           doesFileExist,
           extraNodeModules,
-          isAssetFile,
           mainFields,
           nodeModulesPaths,
           preferNativePlatform,

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

@@ -66,7 +66,7 @@ function getIgnorePattern(config) {
   const combine = (regexes) =>
     new RegExp(
       regexes
-        .map((regex) => "(" + regex.source.replace(/\//g, path.sep) + ")")
+        .map((regex) => "(" + regex.source.replaceAll("/", path.sep) + ")")
         .join("|")
     );
 
@@ -77,37 +77,21 @@ function getIgnorePattern(config) {
   return ignorePattern;
 }
 function createHasteMap(config, options) {
-  var _config$unstable_file, _options$throwOnModul;
   const dependencyExtractor =
-    (options === null || options === void 0
-      ? void 0
-      : options.extractDependencies) === false
+    options?.extractDependencies === false
       ? null
       : config.resolver.dependencyExtractor;
   const computeDependencies = dependencyExtractor != null;
   return _metroFileMap.default.create({
     cacheManagerFactory:
-      (_config$unstable_file =
-        config === null || config === void 0
-          ? void 0
-          : config.unstable_fileMapCacheManagerFactory) !== null &&
-      _config$unstable_file !== void 0
-        ? _config$unstable_file
-        : (buildParameters) => {
-            var _config$fileMapCacheD;
-            return new _metroFileMap.DiskCacheManager({
-              buildParameters,
-              cacheDirectory:
-                (_config$fileMapCacheD = config.fileMapCacheDirectory) !==
-                  null && _config$fileMapCacheD !== void 0
-                  ? _config$fileMapCacheD
-                  : config.hasteMapCacheDirectory,
-              cacheFilePrefix:
-                options === null || options === void 0
-                  ? void 0
-                  : options.cacheFilePrefix,
-            });
-          },
+      config?.unstable_fileMapCacheManagerFactory ??
+      ((buildParameters) =>
+        new _metroFileMap.DiskCacheManager({
+          buildParameters,
+          cacheDirectory:
+            config.fileMapCacheDirectory ?? config.hasteMapCacheDirectory,
+          cacheFilePrefix: options?.cacheFilePrefix,
+        })),
     perfLoggerFactory: config.unstable_perfLoggerFactory,
     computeDependencies,
     computeSha1: true,
@@ -131,19 +115,10 @@ function createHasteMap(config, options) {
     resetCache: config.resetCache,
     rootDir: config.projectRoot,
     roots: config.watchFolders,
-    throwOnModuleCollision:
-      (_options$throwOnModul =
-        options === null || options === void 0
-          ? void 0
-          : options.throwOnModuleCollision) !== null &&
-      _options$throwOnModul !== void 0
-        ? _options$throwOnModul
-        : true,
+    throwOnModuleCollision: options?.throwOnModuleCollision ?? true,
+    unstable_preferTreeFS: config.watcher.unstable_preferTreeFS,
     useWatchman: config.resolver.useWatchman,
-    watch:
-      (options === null || options === void 0 ? void 0 : options.watch) == null
-        ? !ci.isCI
-        : options.watch,
+    watch: options?.watch == null ? !ci.isCI : options.watch,
     watchmanDeferStates: config.watcher.watchman.deferStates,
   });
 }

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

@@ -29,7 +29,7 @@ function getIgnorePattern(config: ConfigT): RegExp {
   const combine = (regexes: Array<RegExp>) =>
     new RegExp(
       regexes
-        .map(regex => '(' + regex.source.replace(/\//g, path.sep) + ')')
+        .map(regex => '(' + regex.source.replaceAll('/', path.sep) + ')')
         .join('|'),
     );
 
@@ -90,6 +90,7 @@ function createHasteMap(
     rootDir: config.projectRoot,
     roots: config.watchFolders,
     throwOnModuleCollision: options?.throwOnModuleCollision ?? true,
+    unstable_preferTreeFS: config.watcher.unstable_preferTreeFS,
     useWatchman: config.resolver.useWatchman,
     watch: options?.watch == null ? !ci.isCI : options.watch,
     watchmanDeferStates: config.watcher.watchman.deferStates,

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,7 +141,6 @@ 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,
@@ -241,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 ||
@@ -254,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,7 +188,6 @@ 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,

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);