metro 0.70.3 → 0.71.2

package/src/lib/JsonReporter.js.flow

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const {Writable} = require('stream');
+import type {Writable} from 'stream';
 
 class JsonReporter<TEvent: {[string]: any, ...}> {
   _stream: Writable;

package/src/lib/bundleToBytecode.js.flow

@@ -49,10 +49,10 @@ function addModuleHeader(buffer: Buffer): [Buffer, Buffer] {
  * ...
  *
  */
-function bundleToBytecode(bundle: BytecodeBundle): {|
+function bundleToBytecode(bundle: BytecodeBundle): {
   +bytecode: Buffer,
   +metadata: BundleMetadata,
-|} {
+} {
   const buffers = [];
 
   if (bundle.pre.length) {

package/src/lib/bundleToString.js.flow

@@ -18,10 +18,10 @@ import type {
 /**
  * Serializes a bundle into a plain JS bundle.
  */
-function bundleToString(bundle: Bundle): {|
+function bundleToString(bundle: Bundle): {
   +code: string,
   +metadata: BundleMetadata,
-|} {
+} {
   let code = bundle.pre.length > 0 ? bundle.pre + '\n' : '';
   const modules = [];
 

package/src/lib/getAppendScripts.js

@@ -9,6 +9,12 @@
  */
 "use strict";
 
+var _CountingSet = _interopRequireDefault(require("./CountingSet"));
+
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
 
 const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
@@ -38,7 +44,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
       path: "$$importBundleNames",
       dependencies: new Map(),
       getSource: () => Buffer.from(""),
-      inverseDependencies: new Set(),
+      inverseDependencies: new _CountingSet.default(),
       output: [
         {
           type: "js/script/virtual",
@@ -64,7 +70,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
           path: `require-${path}`,
           dependencies: new Map(),
           getSource: () => Buffer.from(""),
-          inverseDependencies: new Set(),
+          inverseDependencies: new _CountingSet.default(),
           output: [
             {
               type: "js/script/virtual",
@@ -94,7 +100,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
       path: "source-map",
       dependencies: new Map(),
       getSource: () => Buffer.from(""),
-      inverseDependencies: new Set(),
+      inverseDependencies: new _CountingSet.default(),
       output: [
         {
           type: "js/script/virtual",
@@ -114,7 +120,7 @@ function getAppendScripts(entryPoint, modules, importBundleNames, options) {
       path: "source-url",
       dependencies: new Map(),
       getSource: () => Buffer.from(""),
-      inverseDependencies: new Set(),
+      inverseDependencies: new _CountingSet.default(),
       output: [
         {
           type: "js/script/virtual",

package/src/lib/getAppendScripts.js.flow

@@ -12,6 +12,8 @@
 
 import type {Module} from '../DeltaBundler';
 
+import CountingSet from './CountingSet';
+
 const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
 const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
 const countLines = require('./countLines');
@@ -56,7 +58,7 @@ function getAppendScripts<T: number | string>(
       path: '$$importBundleNames',
       dependencies: new Map(),
       getSource: (): Buffer => Buffer.from(''),
-      inverseDependencies: new Set(),
+      inverseDependencies: new CountingSet(),
       output: [
         {
           type: 'js/script/virtual',
@@ -82,7 +84,7 @@ function getAppendScripts<T: number | string>(
           path: `require-${path}`,
           dependencies: new Map(),
           getSource: (): Buffer => Buffer.from(''),
-          inverseDependencies: new Set(),
+          inverseDependencies: new CountingSet(),
           output: [
             {
               type: 'js/script/virtual',
@@ -113,7 +115,7 @@ function getAppendScripts<T: number | string>(
       path: 'source-map',
       dependencies: new Map(),
       getSource: (): Buffer => Buffer.from(''),
-      inverseDependencies: new Set(),
+      inverseDependencies: new CountingSet(),
       output: [
         {
           type: 'js/script/virtual',
@@ -133,7 +135,7 @@ function getAppendScripts<T: number | string>(
       path: 'source-url',
       dependencies: new Map(),
       getSource: (): Buffer => Buffer.from(''),
-      inverseDependencies: new Set(),
+      inverseDependencies: new CountingSet(),
       output: [
         {
           type: 'js/script/virtual',

package/src/lib/getPreludeCode.js

@@ -9,14 +9,32 @@
  */
 "use strict";
 
-function getPreludeCode({ extraVars, isDev, globalPrefix }) {
+function getPreludeCode({
+  extraVars,
+  isDev,
+  globalPrefix,
+  requireCycleIgnorePatterns,
+}) {
   const vars = [
+    // Ensure these variable names match the ones referenced in metro-runtime
+    // require.js
     "__BUNDLE_START_TIME__=this.nativePerformanceNow?nativePerformanceNow():Date.now()",
     `__DEV__=${String(isDev)}`,
     ...formatExtraVars(extraVars),
     "process=this.process||{}",
     `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`,
   ];
+
+  if (isDev) {
+    // Ensure these variable names match the ones referenced in metro-runtime
+    // require.js
+    vars.push(
+      `${globalPrefix}__requireCycleIgnorePatterns=[${requireCycleIgnorePatterns
+        .map((regex) => regex.toString())
+        .join(",")}]`
+    );
+  }
+
   return `var ${vars.join(",")};${processEnv(
     isDev ? "development" : "production"
   )}`;

package/src/lib/getPreludeCode.js.flow

@@ -14,18 +14,33 @@ function getPreludeCode({
   extraVars,
   isDev,
   globalPrefix,
-}: {|
+  requireCycleIgnorePatterns,
+}: {
   +extraVars?: {[string]: mixed, ...},
   +isDev: boolean,
   +globalPrefix: string,
-|}): string {
+  +requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
+}): string {
   const vars = [
+    // Ensure these variable names match the ones referenced in metro-runtime
+    // require.js
     '__BUNDLE_START_TIME__=this.nativePerformanceNow?nativePerformanceNow():Date.now()',
     `__DEV__=${String(isDev)}`,
     ...formatExtraVars(extraVars),
     'process=this.process||{}',
     `__METRO_GLOBAL_PREFIX__='${globalPrefix}'`,
   ];
+
+  if (isDev) {
+    // Ensure these variable names match the ones referenced in metro-runtime
+    // require.js
+    vars.push(
+      `${globalPrefix}__requireCycleIgnorePatterns=[${requireCycleIgnorePatterns
+        .map(regex => regex.toString())
+        .join(',')}]`,
+    );
+  }
+
   return `var ${vars.join(',')};${processEnv(
     isDev ? 'development' : 'production',
   )}`;

package/src/lib/getPrependedScripts.js

@@ -9,6 +9,12 @@
  */
 "use strict";
 
+var _CountingSet = _interopRequireDefault(require("./CountingSet"));
+
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+
 const countLines = require("./countLines");
 
 const getPreludeCode = require("./getPreludeCode");
@@ -53,21 +59,23 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
     _getPrelude({
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
+      requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
     }),
     ...dependencies.values(),
   ];
 }
 
-function _getPrelude({ dev, globalPrefix }) {
+function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
   const code = getPreludeCode({
     isDev: dev,
     globalPrefix,
+    requireCycleIgnorePatterns,
   });
   const name = "__prelude__";
   return {
     dependencies: new Map(),
     getSource: () => Buffer.from(code),
-    inverseDependencies: new Set(),
+    inverseDependencies: new _CountingSet.default(),
     path: name,
     output: [
       {

package/src/lib/getPrependedScripts.js.flow

@@ -15,6 +15,8 @@ import type DeltaBundler, {Module} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
+import CountingSet from './CountingSet';
+
 const countLines = require('./countLines');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
@@ -69,6 +71,7 @@ async function getPrependedScripts(
     _getPrelude({
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
+      requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
     }),
     ...dependencies.values(),
   ];
@@ -77,18 +80,24 @@ async function getPrependedScripts(
 function _getPrelude({
   dev,
   globalPrefix,
+  requireCycleIgnorePatterns,
 }: {
   dev: boolean,
   globalPrefix: string,
+  requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
   ...
 }): Module<> {
-  const code = getPreludeCode({isDev: dev, globalPrefix});
+  const code = getPreludeCode({
+    isDev: dev,
+    globalPrefix,
+    requireCycleIgnorePatterns,
+  });
   const name = '__prelude__';
 
   return {
     dependencies: new Map(),
     getSource: (): Buffer => Buffer.from(code),
-    inverseDependencies: new Set(),
+    inverseDependencies: new CountingSet(),
     path: name,
     output: [
       {

package/src/lib/reporting.js

@@ -11,8 +11,6 @@
 
 const chalk = require("chalk");
 
-const { Terminal } = require("metro-core");
-
 const stripAnsi = require("strip-ansi");
 
 const util = require("util");

package/src/lib/reporting.js.flow

@@ -10,8 +10,9 @@
 
 'use strict';
 
+import type {Terminal} from 'metro-core';
+
 const chalk = require('chalk');
-const {Terminal} = require('metro-core');
 const stripAnsi = require('strip-ansi');
 const util = require('util');
 

package/src/lib/transformHelpers.js.flow

@@ -21,10 +21,10 @@ const path = require('path');
 
 type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
-type TransformOptionsWithRawInlines = {|
+type TransformOptionsWithRawInlines = {
   ...TransformOptions,
   +inlineRequires: InlineRequiresRaw,
-|};
+};
 
 const baseIgnoredInlineRequires = ['React', 'react', 'react-native'];
 

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

@@ -144,12 +144,16 @@ class ModuleResolver {
             `  * ${Resolver.formatFileCandidates(
               this._removeRoot(candidates.dir)
             )}`,
-          ].join("\n")
+          ].join("\n"),
+          {
+            cause: error,
+          }
         );
       }
 
       if (error instanceof Resolver.FailedToResolveNameError) {
-        const { dirPaths, extraPaths } = error;
+        const dirPaths = error.dirPaths;
+        const extraPaths = error.extraPaths;
         const displayDirPaths = dirPaths
           .filter((dirPath) => this._options.dirExists(dirPath))
           .map((dirPath) => path.relative(this._options.projectRoot, dirPath))
@@ -161,7 +165,10 @@ class ModuleResolver {
           [
             `${moduleName} could not be found within the project${hint || "."}`,
             ...displayDirPaths.map((dirPath) => `  ${dirPath}`),
-          ].join("\n")
+          ].join("\n"),
+          {
+            cause: error,
+          }
         );
       }
 
@@ -237,7 +244,11 @@ class UnableToResolveError extends Error {
    * The name of the module that was required, no necessarily a path,
    * ex. `./bar`, or `invariant`.
    */
-  constructor(originModulePath, targetModuleName, message) {
+
+  /**
+   * Original error that causes this error
+   */
+  constructor(originModulePath, targetModuleName, message, options) {
     super();
     this.originModulePath = originModulePath;
     this.targetModuleName = targetModuleName;
@@ -249,6 +260,8 @@ class UnableToResolveError extends Error {
         originModulePath,
         message
       ) + (codeFrameMessage ? "\n" + codeFrameMessage : "");
+    this.cause =
+      options === null || options === void 0 ? void 0 : options.cause;
   }
 
   buildCodeFrameMessage() {

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

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {ModuleMap} from './types';
+import type {ModuleMap} from 'metro-file-map';
 import type {
   CustomResolver,
   DoesFileExist,
@@ -53,7 +53,7 @@ export type ModuleishCache<TModule, TPackage> = interface {
   getPackageOf(modulePath: string): ?TPackage,
 };
 
-type Options<TModule, TPackage> = {|
+type Options<TModule, TPackage> = {
   +dirExists: DirExistsFn,
   +disableHierarchicalLookup: boolean,
   +doesFileExist: DoesFileExist,
@@ -69,7 +69,7 @@ type Options<TModule, TPackage> = {|
   +resolveAsset: ResolveAsset,
   +resolveRequest: ?CustomResolver,
   +sourceExts: $ReadOnlyArray<string>,
-|};
+};
 
 class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
   _options: Options<TModule, TPackage>;
@@ -201,18 +201,14 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
               this._removeRoot(candidates.dir),
             )}`,
           ].join('\n'),
+          {
+            cause: error,
+          },
         );
       }
       if (error instanceof Resolver.FailedToResolveNameError) {
-        const {
-          dirPaths,
-          extraPaths,
-        }: {
-          // $flowfixme these types are defined explicitly in FailedToResolveNameError but Flow refuses to recognize them here
-          dirPaths: $ReadOnlyArray<string>,
-          extraPaths: $ReadOnlyArray<string>,
-          ...
-        } = error;
+        const dirPaths = error.dirPaths;
+        const extraPaths = error.extraPaths;
         const displayDirPaths = dirPaths
           .filter((dirPath: string) => this._options.dirExists(dirPath))
           .map(dirPath => path.relative(this._options.projectRoot, dirPath))
@@ -227,6 +223,9 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
             `${moduleName} could not be found within the project${hint || '.'}`,
             ...displayDirPaths.map((dirPath: string) => `  ${dirPath}`),
           ].join('\n'),
+          {
+            cause: error,
+          },
         );
       }
       throw error;
@@ -294,11 +293,18 @@ class UnableToResolveError extends Error {
    * ex. `./bar`, or `invariant`.
    */
   targetModuleName: string;
+  /**
+   * Original error that causes this error
+   */
+  cause: ?Error;
 
   constructor(
     originModulePath: string,
     targetModuleName: string,
     message: string,
+    options?: $ReadOnly<{
+      cause?: Error,
+    }>,
   ) {
     super();
     this.originModulePath = originModulePath;
@@ -311,6 +317,8 @@ class UnableToResolveError extends Error {
         originModulePath,
         message,
       ) + (codeFrameMessage ? '\n' + codeFrameMessage : '');
+
+    this.cause = options?.cause;
   }
 
   buildCodeFrameMessage(): ?string {

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

@@ -1,9 +1,47 @@
 "use strict";
 
-var _jestHasteMap = _interopRequireDefault(require("jest-haste-map"));
+var _metroFileMap = _interopRequireWildcard(require("metro-file-map"));
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function") return null;
+  var cacheBabelInterop = new WeakMap();
+  var cacheNodeInterop = new WeakMap();
+  return (_getRequireWildcardCache = function (nodeInterop) {
+    return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+
+function _interopRequireWildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
+    return { default: obj };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor =
+    Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor
+        ? Object.getOwnPropertyDescriptor(obj, key)
+        : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
 }
 
 /**
@@ -15,13 +53,10 @@ function _interopRequireDefault(obj) {
  *
  * @format
  */
-// $FlowFixMe: Types for `jest-haste-map`
 const ci = require("ci-info");
 
 const path = require("path");
 
-const JEST_HASTE_MAP_CACHE_BREAKER = 5;
-
 function getIgnorePattern(config) {
   // For now we support both options
   const { blockList, blacklistRE } = config.resolver;
@@ -46,7 +81,10 @@ function getIgnorePattern(config) {
 }
 
 function createHasteMap(config, options) {
-  var _options$name, _options$throwOnModul;
+  var _config$unstable_file,
+    _config$unstable_perf,
+    _config$unstable_perf2,
+    _options$throwOnModul;
 
   const dependencyExtractor =
     (options === null || options === void 0
@@ -55,25 +93,48 @@ function createHasteMap(config, options) {
       ? null
       : config.resolver.dependencyExtractor;
   const computeDependencies = dependencyExtractor != null;
-  const hasteConfig = {
-    cacheDirectory: config.hasteMapCacheDirectory,
+  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,
+            });
+          },
+    perfLogger:
+      (_config$unstable_perf =
+        (_config$unstable_perf2 = config.unstable_perfLogger) === null ||
+        _config$unstable_perf2 === void 0
+          ? void 0
+          : _config$unstable_perf2.subSpan("hasteMap")) !== null &&
+      _config$unstable_perf !== void 0
+        ? _config$unstable_perf
+        : null,
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
     extensions: config.resolver.sourceExts.concat(config.resolver.assetExts),
     forceNodeFilesystemAPI: !config.resolver.useWatchman,
     hasteImplModulePath: config.resolver.hasteImplModulePath,
-    hasteMapModulePath: config.resolver.unstable_hasteMapModulePath,
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,
     mocksPattern: "",
-    name: `${
-      (_options$name =
-        options === null || options === void 0 ? void 0 : options.name) !==
-        null && _options$name !== void 0
-        ? _options$name
-        : "metro"
-    }-${JEST_HASTE_MAP_CACHE_BREAKER}`,
     platforms: config.resolver.platforms,
     retainAllFiles: true,
     resetCache: config.resetCache,
@@ -92,8 +153,8 @@ function createHasteMap(config, options) {
       (options === null || options === void 0 ? void 0 : options.watch) == null
         ? !ci.isCI
         : options.watch,
-  };
-  return _jestHasteMap.default.create(hasteConfig);
+    watchmanDeferStates: config.watcher.watchman.deferStates,
+  });
 }
 
 module.exports = createHasteMap;

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

@@ -8,17 +8,13 @@
  * @format
  */
 
-import type {HasteConfig, HasteMap} from './types';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
-// $FlowFixMe: Types for `jest-haste-map`
-import JestHasteMap from 'jest-haste-map';
+import MetroFileMap, {DiskCacheManager} from 'metro-file-map';
 
 const ci = require('ci-info');
 const path = require('path');
 
-const JEST_HASTE_MAP_CACHE_BREAKER = 5;
-
 function getIgnorePattern(config: ConfigT): RegExp {
   // For now we support both options
   const {blockList, blacklistRE} = config.resolver;
@@ -50,28 +46,35 @@ function createHasteMap(
     extractDependencies?: boolean,
     watch?: boolean,
     throwOnModuleCollision?: boolean,
-    name?: string,
+    cacheFilePrefix?: string,
   }>,
-): HasteMap {
+): MetroFileMap {
   const dependencyExtractor =
     options?.extractDependencies === false
       ? null
       : config.resolver.dependencyExtractor;
   const computeDependencies = dependencyExtractor != null;
 
-  const hasteConfig: HasteConfig = {
-    cacheDirectory: config.hasteMapCacheDirectory,
+  return MetroFileMap.create({
+    cacheManagerFactory:
+      config?.unstable_fileMapCacheManagerFactory ??
+      (buildParameters =>
+        new DiskCacheManager({
+          buildParameters,
+          cacheDirectory:
+            config.fileMapCacheDirectory ?? config.hasteMapCacheDirectory,
+          cacheFilePrefix: options?.cacheFilePrefix,
+        })),
+    perfLogger: config.unstable_perfLogger?.subSpan('hasteMap') ?? null,
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
     extensions: config.resolver.sourceExts.concat(config.resolver.assetExts),
     forceNodeFilesystemAPI: !config.resolver.useWatchman,
     hasteImplModulePath: config.resolver.hasteImplModulePath,
-    hasteMapModulePath: config.resolver.unstable_hasteMapModulePath,
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,
     mocksPattern: '',
-    name: `${options?.name ?? 'metro'}-${JEST_HASTE_MAP_CACHE_BREAKER}`,
     platforms: config.resolver.platforms,
     retainAllFiles: true,
     resetCache: config.resetCache,
@@ -80,9 +83,8 @@ function createHasteMap(
     throwOnModuleCollision: options?.throwOnModuleCollision ?? true,
     useWatchman: config.resolver.useWatchman,
     watch: options?.watch == null ? !ci.isCI : options.watch,
-  };
-
-  return JestHasteMap.create(hasteConfig);
+    watchmanDeferStates: config.watcher.watchman.deferStates,
+  });
 }
 
 module.exports = createHasteMap;