metro 0.71.1 → 0.72.0

package/src/lib/CountingSet.js

@@ -0,0 +1,116 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+
+/**
+ * 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.
+ *
+ *
+ * @format
+ */
+
+/**
+ * A Set that only deletes a given item when the number of delete(item) calls
+ * matches the number of add(item) calls. Iteration and `size` are in terms of
+ * *unique* items.
+ */
+class CountingSet {
+  #map = new Map();
+
+  constructor(items) {
+    if (items) {
+      if (items instanceof CountingSet) {
+        this.#map = new Map(items.#map);
+      } else {
+        for (const item of items) {
+          this.add(item);
+        }
+      }
+    }
+  }
+
+  has(item) {
+    return this.#map.has(item);
+  }
+
+  add(item) {
+    const newCount = this.count(item) + 1;
+    this.#map.set(item, newCount);
+  }
+
+  delete(item) {
+    const newCount = this.count(item) - 1;
+
+    if (newCount <= 0) {
+      this.#map.delete(item);
+    } else {
+      this.#map.set(item, newCount);
+    }
+  }
+
+  keys() {
+    return this.#map.keys();
+  }
+
+  values() {
+    return this.#map.keys();
+  }
+
+  *entries() {
+    for (const item of this) {
+      yield [item, item];
+    }
+  } // Iterate over unique entries
+  // $FlowIssue[unsupported-syntax]
+
+  [Symbol.iterator]() {
+    return this.values();
+  }
+  /*::
+  // For Flow's benefit
+  @@iterator(): Iterator<T> {
+    return this.values();
+  }
+  */
+  // Number of unique entries
+  // $FlowIssue[unsafe-getters-setters]
+
+  get size() {
+    return this.#map.size;
+  }
+
+  count(item) {
+    var _this$map$get;
+
+    return (_this$map$get = this.#map.get(item)) !== null &&
+      _this$map$get !== void 0
+      ? _this$map$get
+      : 0;
+  }
+
+  clear() {
+    this.#map.clear();
+  }
+
+  forEach(callbackFn, thisArg) {
+    for (const item of this) {
+      callbackFn.call(thisArg, item, item, this);
+    }
+  } // For Jest purposes. Ideally a custom serializer would be enough, but in
+  // practice there is hardcoded magic for Set in toEqual (etc) that we cannot
+  // extend to custom collection classes. Instead let's assume values are
+  // sortable ( = strings) and make this look like an array with some stable
+  // order.
+
+  toJSON() {
+    return [...this].sort();
+  }
+}
+
+exports.default = CountingSet;

package/src/lib/CountingSet.js.flow

@@ -0,0 +1,126 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+export interface ReadOnlyCountingSet<T> extends Iterable<T> {
+  has(item: T): boolean;
+  @@iterator(): Iterator<T>;
+  +size: number;
+  count(item: T): number;
+  forEach<ThisT>(
+    callbackFn: (
+      this: ThisT,
+      value: T,
+      key: T,
+      set: ReadOnlyCountingSet<T>,
+    ) => mixed,
+
+    // NOTE: Should be optional, but Flow seems happy to infer undefined here
+    // which is what we want.
+    thisArg: ThisT,
+  ): void;
+}
+
+/**
+ * A Set that only deletes a given item when the number of delete(item) calls
+ * matches the number of add(item) calls. Iteration and `size` are in terms of
+ * *unique* items.
+ */
+export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
+  #map: Map<T, number> = new Map();
+
+  constructor(items?: Iterable<T>) {
+    if (items) {
+      if (items instanceof CountingSet) {
+        this.#map = new Map(items.#map);
+      } else {
+        for (const item of items) {
+          this.add(item);
+        }
+      }
+    }
+  }
+
+  has(item: T): boolean {
+    return this.#map.has(item);
+  }
+
+  add(item: T): void {
+    const newCount = this.count(item) + 1;
+    this.#map.set(item, newCount);
+  }
+
+  delete(item: T): void {
+    const newCount = this.count(item) - 1;
+    if (newCount <= 0) {
+      this.#map.delete(item);
+    } else {
+      this.#map.set(item, newCount);
+    }
+  }
+
+  keys(): Iterator<T> {
+    return this.#map.keys();
+  }
+
+  values(): Iterator<T> {
+    return this.#map.keys();
+  }
+
+  *entries(): Iterator<[T, T]> {
+    for (const item of this) {
+      yield [item, item];
+    }
+  }
+
+  // Iterate over unique entries
+  // $FlowIssue[unsupported-syntax]
+  [Symbol.iterator](): Iterator<T> {
+    return this.values();
+  }
+
+  /*::
+  // For Flow's benefit
+  @@iterator(): Iterator<T> {
+    return this.values();
+  }
+  */
+
+  // Number of unique entries
+  // $FlowIssue[unsafe-getters-setters]
+  get size(): number {
+    return this.#map.size;
+  }
+
+  count(item: T): number {
+    return this.#map.get(item) ?? 0;
+  }
+
+  clear(): void {
+    this.#map.clear();
+  }
+
+  forEach<ThisT>(
+    callbackFn: (this: ThisT, value: T, key: T, set: CountingSet<T>) => mixed,
+    thisArg: ThisT,
+  ): void {
+    for (const item of this) {
+      callbackFn.call(thisArg, item, item, this);
+    }
+  }
+
+  // For Jest purposes. Ideally a custom serializer would be enough, but in
+  // practice there is hardcoded magic for Set in toEqual (etc) that we cannot
+  // extend to custom collection classes. Instead let's assume values are
+  // sortable ( = strings) and make this look like an array with some stable
+  // order.
+  toJSON(): mixed {
+    return [...this].sort();
+  }
+}

package/src/lib/JsonReporter.js

@@ -9,8 +9,6 @@
  */
 "use strict";
 
-const { Writable } = require("stream");
-
 class JsonReporter {
   constructor(stream) {
     this._stream = stream;

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/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,
+  +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/node-haste/DependencyGraph/createHasteMap.js

@@ -129,7 +129,13 @@ function createHasteMap(config, options) {
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
-    extensions: config.resolver.sourceExts.concat(config.resolver.assetExts),
+    extensions: Array.from(
+      new Set([
+        ...config.resolver.sourceExts,
+        ...config.resolver.assetExts,
+        ...config.watcher.additionalExts,
+      ])
+    ),
     forceNodeFilesystemAPI: !config.resolver.useWatchman,
     hasteImplModulePath: config.resolver.hasteImplModulePath,
     ignorePattern: getIgnorePattern(config),
@@ -153,6 +159,7 @@ function createHasteMap(config, options) {
       (options === null || options === void 0 ? void 0 : options.watch) == null
         ? !ci.isCI
         : options.watch,
+    watchmanDeferStates: config.watcher.watchman.deferStates,
   });
 }
 

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

@@ -25,7 +25,7 @@ function getIgnorePattern(config: ConfigT): RegExp {
     return / ^/;
   }
 
-  const combine = regexes =>
+  const combine = (regexes: Array<RegExp>) =>
     new RegExp(
       regexes
         .map(regex => '(' + regex.source.replace(/\//g, path.sep) + ')')
@@ -69,7 +69,13 @@ function createHasteMap(
     computeDependencies,
     computeSha1: true,
     dependencyExtractor: config.resolver.dependencyExtractor,
-    extensions: config.resolver.sourceExts.concat(config.resolver.assetExts),
+    extensions: Array.from(
+      new Set([
+        ...config.resolver.sourceExts,
+        ...config.resolver.assetExts,
+        ...config.watcher.additionalExts,
+      ]),
+    ),
     forceNodeFilesystemAPI: !config.resolver.useWatchman,
     hasteImplModulePath: config.resolver.hasteImplModulePath,
     ignorePattern: getIgnorePattern(config),
@@ -83,6 +89,7 @@ function createHasteMap(
     throwOnModuleCollision: options?.throwOnModuleCollision ?? true,
     useWatchman: config.resolver.useWatchman,
     watch: options?.watch == null ? !ci.isCI : options.watch,
+    watchmanDeferStates: config.watcher.watchman.deferStates,
   });
 }
 

package/src/node-haste/DependencyGraph.js

@@ -15,8 +15,6 @@ const createHasteMap = require("./DependencyGraph/createHasteMap");
 
 const { ModuleResolver } = require("./DependencyGraph/ModuleResolution");
 
-const Module = require("./Module");
-
 const ModuleCache = require("./ModuleCache");
 
 const { EventEmitter } = require("events");
@@ -117,6 +115,8 @@ class DependencyGraph extends EventEmitter {
 
     return null;
   }
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
 
   _onHasteChange({ eventsQueue, hasteFS, moduleMap }) {
     this._hasteFS = hasteFS;

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

@@ -11,12 +11,12 @@
 import type Package from './Package';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type MetroFileMap, {HasteFS} from 'metro-file-map';
+import type Module from './Module';
 
 import {ModuleMap as MetroFileMapModuleMap} from 'metro-file-map';
 
 const createHasteMap = require('./DependencyGraph/createHasteMap');
 const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
-const Module = require('./Module');
 const ModuleCache = require('./ModuleCache');
 const {EventEmitter} = require('events');
 const fs = require('fs');
@@ -33,7 +33,7 @@ const {DuplicateHasteCandidatesError} = MetroFileMapModuleMap;
 
 function getOrCreate<T>(
   map: Map<string, Map<string, T>>,
-  field,
+  field: string,
 ): Map<string, T> {
   let subMap = map.get(field);
   if (!subMap) {
@@ -131,6 +131,8 @@ class DependencyGraph extends EventEmitter {
     return null;
   }
 
+  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
+   * LTI update could not be added via codemod */
   _onHasteChange({eventsQueue, hasteFS, moduleMap}) {
     this._hasteFS = hasteFS;
     this._resolutionCache = new Map();