metro 0.75.0 → 0.76.0

package/src/lib/contextModuleTemplates.js.flow

@@ -28,7 +28,7 @@ function createFileMap(
       let filePath = path.relative(modulePath, file);
 
       if (os.platform() === 'win32') {
-        filePath = filePath.replace(/\\/g, '/');
+        filePath = filePath.replaceAll('\\', '/');
       }
 
       // NOTE(EvanBacon): I'd prefer we prevent the ability for a module to require itself (`require.context('./')`)

package/src/lib/formatBundlingError.js

@@ -59,7 +59,6 @@ function formatBundlingError(error) {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -67,7 +66,6 @@ function formatBundlingError(error) {
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -75,7 +73,6 @@ function formatBundlingError(error) {
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,

package/src/lib/formatBundlingError.js.flow

@@ -74,7 +74,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -82,7 +81,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: 'GraphNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -90,7 +88,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: 'RevisionNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,

package/src/lib/getAppendScripts.js

@@ -39,7 +39,6 @@ function getAppendScripts(entryPoint, modules, options) {
               data: {
                 code,
                 lineCount: countLines(code),
-                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -69,7 +68,6 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -89,7 +87,6 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getAppendScripts.js.flow

@@ -58,7 +58,6 @@ function getAppendScripts<T: number | string>(
               data: {
                 code,
                 lineCount: countLines(code),
-                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -90,7 +89,6 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -111,7 +109,6 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getGraphId.js

@@ -22,21 +22,12 @@ function getGraphId(
     resolverOptions,
   }
 ) {
-  var _resolverOptions$cust, _options$customTransf;
   return JSON.stringify(
     {
       entryFile,
       options: {
-        customResolverOptions:
-          (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
-            null && _resolverOptions$cust !== void 0
-            ? _resolverOptions$cust
-            : {},
-        customTransformOptions:
-          (_options$customTransf = options.customTransformOptions) !== null &&
-          _options$customTransf !== void 0
-            ? _options$customTransf
-            : null,
+        customResolverOptions: resolverOptions.customResolverOptions ?? {},
+        customTransformOptions: options.customTransformOptions ?? null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,
         hot: options.hot,

package/src/lib/getPrependedScripts.js

@@ -59,6 +59,8 @@ async function getPrependedScripts(
       onProgress: null,
       experimentalImportBundleSupport:
         config.server.experimentalImportBundleSupport,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     }
   );
@@ -90,7 +92,6 @@ function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
         data: {
           code,
           lineCount: countLines(code),
-          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/getPrependedScripts.js.flow

@@ -69,6 +69,8 @@ async function getPrependedScripts(
       onProgress: null,
       experimentalImportBundleSupport:
         config.server.experimentalImportBundleSupport,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     },
   );
@@ -113,7 +115,6 @@ function _getPrelude({
         data: {
           code,
           lineCount: countLines(code),
-          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/reporting.js.flow

@@ -127,6 +127,10 @@ export type ReportableEvent =
       mode: 'BRIDGE' | 'NOBRIDGE',
       ...
     }
+  | {
+      type: 'resolver_warning',
+      message: string,
+    }
   | {
       type: 'transformer_load_started',
     }

package/src/lib/transformHelpers.js

@@ -12,7 +12,12 @@
 "use strict";
 
 var _contextModuleTemplates = require("./contextModuleTemplates");
-const path = require("path");
+var _isAssetFile = _interopRequireDefault(
+  require("metro-resolver/src/utils/isAssetFile")
+);
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 const baseIgnoredInlineRequires = ["React", "react", "react-native"];
 async function calcTransformerOptions(
   entryFiles,
@@ -67,6 +72,8 @@ async function calcTransformerOptions(
         config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     });
     return Array.from(dependencies.keys());
@@ -82,22 +89,12 @@ async function calcTransformerOptions(
   );
   return {
     ...baseOptions,
-    inlineRequires:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.inlineRequires) || false,
-    experimentalImportSupport:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.experimentalImportSupport) || false,
+    inlineRequires: transform?.inlineRequires || false,
+    experimentalImportSupport: transform?.experimentalImportSupport || false,
     unstable_disableES6Transforms:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.unstable_disableES6Transforms) || false,
+      transform?.unstable_disableES6Transforms || false,
     nonInlinedRequires:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.nonInlinedRequires) || baseIgnoredInlineRequires,
+      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
     type: "module",
   };
 }
@@ -123,6 +120,7 @@ async function getTransformFn(
     options,
     resolverOptions
   );
+  const assetExts = new Set(config.resolver.assetExts);
   return async (modulePath, requireContext) => {
     let templateBuffer;
     if (requireContext) {
@@ -148,11 +146,7 @@ async function getTransformFn(
       modulePath,
       {
         ...transformOptions,
-        type: getType(
-          transformOptions.type,
-          modulePath,
-          config.resolver.assetExts
-        ),
+        type: getType(transformOptions.type, modulePath, assetExts),
         inlineRequires: removeInlineRequiresBlockListFromOptions(
           modulePath,
           inlineRequires
@@ -166,7 +160,7 @@ function getType(type, filePath, assetExts) {
   if (type === "script") {
     return type;
   }
-  if (assetExts.indexOf(path.extname(filePath).slice(1)) !== -1) {
+  if ((0, _isAssetFile.default)(filePath, assetExts)) {
     return "asset";
   }
   return "module";
@@ -177,7 +171,7 @@ async function getResolveDependencyFn(bundler, platform, resolverOptions) {
     dependencyGraph.resolveDependency(
       from,
       to,
-      platform !== null && platform !== void 0 ? platform : null,
+      platform ?? null,
       resolverOptions
     );
 }

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;
@@ -90,6 +90,8 @@ async function calcTransformerOptions(
         config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        config.resolver.unstable_enablePackageExports,
       shallow: false,
     });
 
@@ -141,6 +143,7 @@ async function getTransformFn(
     options,
     resolverOptions,
   );
+  const assetExts = new Set(config.resolver.assetExts);
 
   return async (modulePath: string, requireContext: ?RequireContext) => {
     let templateBuffer: Buffer;
@@ -171,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,
@@ -189,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,
@@ -74,16 +73,16 @@ class ModuleResolver {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
+      unstable_getRealPath,
     } = this._options;
     try {
-      var _resolverOptions$cust;
       const result = Resolver.resolve(
         createDefaultContext({
           allowHaste,
+          assetExts,
           disableHierarchicalLookup,
           doesFileExist,
           extraNodeModules,
-          isAssetFile,
           mainFields,
           nodeModulesPaths,
           preferNativePlatform,
@@ -93,11 +92,9 @@ class ModuleResolver {
           unstable_conditionNames,
           unstable_conditionsByPlatform,
           unstable_enablePackageExports,
-          customResolverOptions:
-            (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
-              null && _resolverOptions$cust !== void 0
-              ? _resolverOptions$cust
-              : {},
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
+          customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
           resolveHasteModule: (name) =>
             this._options.getHasteModulePath(name, platform),
@@ -202,6 +199,12 @@ class ModuleResolver {
         throw new Error("invalid type");
     }
   }
+  _logWarning = (message) => {
+    this._options.reporter.update({
+      type: "resolver_warning",
+      message,
+    });
+  };
   _removeRoot(candidates) {
     if (candidates.filePathPrefix) {
       candidates.filePathPrefix = path.relative(
@@ -250,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

@@ -15,7 +15,7 @@ import type {
   CustomResolver,
   DoesFileExist,
   FileCandidates,
-  IsAssetFile,
+  GetRealPath,
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
@@ -30,6 +30,7 @@ const createDefaultContext = require('metro-resolver/src/createDefaultContext');
 const path = require('path');
 const util = require('util');
 import type {BundlerResolution} from '../../DeltaBundler/types.flow';
+import type {Reporter} from '../../lib/reporting';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
@@ -53,6 +54,7 @@ export type ModuleishCache<TPackage> = interface {
 };
 
 type Options<TPackage> = $ReadOnly<{
+  assetExts: $ReadOnlySet<string>,
   dirExists: DirExistsFn,
   disableHierarchicalLookup: boolean,
   doesFileExist: DoesFileExist,
@@ -60,12 +62,12 @@ 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>,
   preferNativePlatform: boolean,
   projectRoot: string,
+  reporter: Reporter,
   resolveAsset: ResolveAsset,
   resolveRequest: ?CustomResolver,
   sourceExts: $ReadOnlyArray<string>,
@@ -74,6 +76,7 @@ type Options<TPackage> = $ReadOnly<{
     [platform: string]: $ReadOnlyArray<string>,
   }>,
   unstable_enablePackageExports: boolean,
+  unstable_getRealPath: ?GetRealPath,
 }>;
 
 class ModuleResolver<TPackage: Packageish> {
@@ -83,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;
@@ -123,10 +125,10 @@ class ModuleResolver<TPackage: Packageish> {
     resolverOptions: ResolverInputOptions,
   ): BundlerResolution {
     const {
+      assetExts,
       disableHierarchicalLookup,
       doesFileExist,
       extraNodeModules,
-      isAssetFile,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -136,16 +138,17 @@ class ModuleResolver<TPackage: Packageish> {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
+      unstable_getRealPath,
     } = this._options;
 
     try {
       const result = Resolver.resolve(
         createDefaultContext({
           allowHaste,
+          assetExts,
           disableHierarchicalLookup,
           doesFileExist,
           extraNodeModules,
-          isAssetFile,
           mainFields,
           nodeModulesPaths,
           preferNativePlatform,
@@ -155,6 +158,8 @@ class ModuleResolver<TPackage: Packageish> {
           unstable_conditionNames,
           unstable_conditionsByPlatform,
           unstable_enablePackageExports,
+          unstable_getRealPath,
+          unstable_logWarning: this._logWarning,
           customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
           resolveHasteModule: (name: string) =>
@@ -268,6 +273,13 @@ class ModuleResolver<TPackage: Packageish> {
     }
   }
 
+  _logWarning = (message: string): void => {
+    this._options.reporter.update({
+      type: 'resolver_warning',
+      message,
+    });
+  };
+
   _removeRoot(candidates: FileCandidates): FileCandidates {
     if (candidates.filePathPrefix) {
       candidates.filePathPrefix = path.relative(

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,