metro 0.71.1 → 0.71.2

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

@@ -153,6 +153,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

@@ -83,6 +83,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");

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