metro 0.83.1 → 0.83.2

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -9,17 +9,16 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {DeltaResult, Options} from './types.flow';
+import type {DeltaResult, Options} from './types';
 import type {RootPerfLogger} from 'metro-config';
 import type {ChangeEvent} from 'metro-file-map';
 
 import {Graph} from './Graph';
+import EventEmitter from 'events';
 import path from 'path';
 
+// eslint-disable-next-line import/no-commonjs
 const debug = require('debug')('Metro:DeltaCalculator');
-const {EventEmitter} = require('events');
 
 /**
  * This class is in charge of calculating the delta of changed modules that
@@ -27,7 +26,7 @@ const {EventEmitter} = require('events');
  * traverse the files that have been changed between calls and avoid having to
  * traverse the whole dependency tree for trivial small changes.
  */
-class DeltaCalculator<T> extends EventEmitter {
+export default class DeltaCalculator<T> extends EventEmitter {
   _changeEventSource: EventEmitter;
   _options: Options<T>;
 
@@ -324,5 +323,3 @@ class DeltaCalculator<T> extends EventEmitter {
     };
   }
 }
-
-module.exports = DeltaCalculator;

package/src/DeltaBundler/Graph.js

@@ -8,11 +8,11 @@ var _contextModule = require("../lib/contextModule");
 var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 var _isResolvedDependency = require("../lib/isResolvedDependency");
 var _buildSubgraph = require("./buildSubgraph");
+var _invariant = _interopRequireDefault(require("invariant"));
+var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-const invariant = require("invariant");
-const nullthrows = require("nullthrows");
 function getInternalOptions({ transform, resolve, onProgress, lazy, shallow }) {
   let numProcessed = 0;
   let total = 0;
@@ -44,7 +44,7 @@ class Graph {
   async traverseDependencies(paths, options) {
     const internalOptions = getInternalOptions(options);
     const modifiedPathsInBaseGraph = new Set(
-      paths.filter((path) => this.dependencies.has(path))
+      paths.filter((path) => this.dependencies.has(path)),
     );
     const allModifiedPaths = new Set(paths);
     const delta = await this._buildDelta(
@@ -52,13 +52,15 @@ class Graph {
       internalOptions,
       (absolutePath) =>
         !this.dependencies.has(absolutePath) ||
-        allModifiedPaths.has(absolutePath)
+        allModifiedPaths.has(absolutePath),
     );
     if (delta.errors.size > 0) {
       for (const modified of modifiedPathsInBaseGraph) {
         delta.baseModuleData.set(
           modified,
-          this._moduleSnapshot(nullthrows(this.dependencies.get(modified)))
+          this._moduleSnapshot(
+            (0, _nullthrows.default)(this.dependencies.get(modified)),
+          ),
         );
       }
     }
@@ -100,15 +102,15 @@ class Graph {
         this._recursivelyCommitModule(modified, rollbackDelta, internalOptions);
       }
       this._collectCycles(delta, internalOptions);
-      invariant(
+      (0, _invariant.default)(
         rollbackDelta.added.size === 0 && rollbackDelta.deleted.size === 0,
-        "attempted to roll back a graph commit but there were still changes"
+        "attempted to roll back a graph commit but there were still changes",
       );
       throw error;
     }
     const added = new Map();
     for (const path of delta.added) {
-      added.set(path, nullthrows(this.dependencies.get(path)));
+      added.set(path, (0, _nullthrows.default)(this.dependencies.get(path)));
     }
     const modified = new Map();
     for (const path of modifiedPathsInBaseGraph) {
@@ -117,7 +119,10 @@ class Graph {
         !delta.deleted.has(path) &&
         !delta.added.has(path)
       ) {
-        modified.set(path, nullthrows(this.dependencies.get(path)));
+        modified.set(
+          path,
+          (0, _nullthrows.default)(this.dependencies.get(path)),
+        );
       }
     }
     return {
@@ -128,9 +133,9 @@ class Graph {
   }
   async initialTraverseDependencies(options) {
     const internalOptions = getInternalOptions(options);
-    invariant(
+    (0, _invariant.default)(
       this.dependencies.size === 0,
-      "initialTraverseDependencies called on nonempty graph"
+      "initialTraverseDependencies called on nonempty graph",
     );
     this.#gc.color.clear();
     this.#gc.possibleCycleRoots.clear();
@@ -172,7 +177,7 @@ class Graph {
           }
           return moduleFilter == null || moduleFilter(dependency.absolutePath);
         },
-      }
+      },
     );
     return {
       added: new Set(),
@@ -189,14 +194,14 @@ class Graph {
     options,
     commitOptions = {
       onlyRemove: false,
-    }
+    },
   ) {
     if (delta.errors.has(path)) {
       throw delta.errors.get(path);
     }
     const previousModule = this.dependencies.get(path);
-    const currentModule = nullthrows(
-      delta.updatedModuleData.get(path) ?? delta.baseModuleData.get(path)
+    const currentModule = (0, _nullthrows.default)(
+      delta.updatedModuleData.get(path) ?? delta.baseModuleData.get(path),
     );
     const previousDependencies = previousModule?.dependencies ?? new Map();
     const {
@@ -246,7 +251,7 @@ class Graph {
             curDependency,
             resolvedContexts.get(key),
             delta,
-            options
+            options,
           );
         }
       }
@@ -255,7 +260,7 @@ class Graph {
     const dependencyKeysChangedOrReordered =
       currentDependencies.size !== previousDependencies.size ||
       [...currentDependencies.keys()].some(
-        (currentKey, index) => currentKey !== previousDependencyKeys[index]
+        (currentKey, index) => currentKey !== previousDependencyKeys[index],
       );
     if (
       previousModule != null &&
@@ -271,9 +276,9 @@ class Graph {
     if (commitOptions.onlyRemove) {
       return nextModule;
     }
-    invariant(
+    (0, _invariant.default)(
       nextModule.dependencies.size === currentDependencies.size,
-      "Failed to add the correct dependencies"
+      "Failed to add the correct dependencies",
     );
     nextModule.dependencies = new Map(currentDependencies);
     return nextModule;
@@ -284,7 +289,7 @@ class Graph {
     dependency,
     requireContext,
     delta,
-    options
+    options,
   ) {
     if (options.shallow) {
     } else if (!(0, _isResolvedDependency.isResolvedDependency)(dependency)) {
@@ -369,7 +374,7 @@ class Graph {
       const mainModule = this.dependencies.get(entryPoint);
       if (!mainModule) {
         throw new ReferenceError(
-          "Module not registered in graph: " + entryPoint
+          "Module not registered in graph: " + entryPoint,
         );
       }
       this._reorderDependencies(mainModule, orderedDependencies, options);
@@ -412,12 +417,12 @@ class Graph {
   }
   _decrementImportBundleReference(dependency, parentModule) {
     const { absolutePath } = dependency;
-    const importBundleNode = nullthrows(
-      this.#importBundleNodes.get(absolutePath)
+    const importBundleNode = (0, _nullthrows.default)(
+      this.#importBundleNodes.get(absolutePath),
     );
-    invariant(
+    (0, _invariant.default)(
       importBundleNode.inverseDependencies.has(parentModule.path),
-      "lazy: import bundle inverse references"
+      "lazy: import bundle inverse references",
     );
     importBundleNode.inverseDependencies.delete(parentModule.path);
     if (importBundleNode.inverseDependencies.size === 0) {
@@ -435,7 +440,9 @@ class Graph {
       ) {
         continue;
       }
-      yield nullthrows(this.dependencies.get(dependency.absolutePath));
+      yield (0, _nullthrows.default)(
+        this.dependencies.get(dependency.absolutePath),
+      );
     }
   }
   _moduleSnapshot(module) {
@@ -447,7 +454,7 @@ class Graph {
         continue;
       }
       const resolvedContext = this.#resolvedContexts.get(
-        dependency.absolutePath
+        dependency.absolutePath,
       );
       if (resolvedContext != null) {
         resolvedContexts.set(key, resolvedContext);
@@ -496,8 +503,8 @@ class Graph {
   }
   _collectCycles(delta, options) {
     for (const path of this.#gc.possibleCycleRoots) {
-      const module = nullthrows(this.dependencies.get(path));
-      const color = nullthrows(this.#gc.color.get(path));
+      const module = (0, _nullthrows.default)(this.dependencies.get(path));
+      const color = (0, _nullthrows.default)(this.#gc.color.get(path));
       if (color === "purple") {
         this._markGray(module, options);
       } else {
@@ -512,17 +519,17 @@ class Graph {
       }
     }
     for (const path of this.#gc.possibleCycleRoots) {
-      const module = nullthrows(this.dependencies.get(path));
+      const module = (0, _nullthrows.default)(this.dependencies.get(path));
       this._scan(module, options);
     }
     for (const path of this.#gc.possibleCycleRoots) {
       this.#gc.possibleCycleRoots.delete(path);
-      const module = nullthrows(this.dependencies.get(path));
+      const module = (0, _nullthrows.default)(this.dependencies.get(path));
       this._collectWhite(module, delta);
     }
   }
   _markGray(module, options) {
-    const color = nullthrows(this.#gc.color.get(module.path));
+    const color = (0, _nullthrows.default)(this.#gc.color.get(module.path));
     if (color !== "gray") {
       this.#gc.color.set(module.path, "gray");
       for (const childModule of this._children(module, options)) {
@@ -532,7 +539,7 @@ class Graph {
     }
   }
   _scan(module, options) {
-    const color = nullthrows(this.#gc.color.get(module.path));
+    const color = (0, _nullthrows.default)(this.#gc.color.get(module.path));
     if (color === "gray") {
       if (
         module.inverseDependencies.size > 0 ||
@@ -551,14 +558,16 @@ class Graph {
     this.#gc.color.set(module.path, "black");
     for (const childModule of this._children(module, options)) {
       childModule.inverseDependencies.add(module.path);
-      const childColor = nullthrows(this.#gc.color.get(childModule.path));
+      const childColor = (0, _nullthrows.default)(
+        this.#gc.color.get(childModule.path),
+      );
       if (childColor !== "black") {
         this._scanBlack(childModule, options);
       }
     }
   }
   _collectWhite(module, delta) {
-    const color = nullthrows(this.#gc.color.get(module.path));
+    const color = (0, _nullthrows.default)(this.#gc.color.get(module.path));
     if (color === "white" && !this.#gc.possibleCycleRoots.has(module.path)) {
       this.#gc.color.set(module.path, "black");
       for (const dependency of module.dependencies.values()) {

package/src/DeltaBundler/Graph.js.flow

@@ -41,15 +41,14 @@ import type {
   Options,
   ResolvedDependency,
   TransformInputOptions,
-} from './types.flow';
+} from './types';
 
 import {fileMatchesContext} from '../lib/contextModule';
 import CountingSet from '../lib/CountingSet';
 import {isResolvedDependency} from '../lib/isResolvedDependency';
 import {buildSubgraph} from './buildSubgraph';
-
-const invariant = require('invariant');
-const nullthrows = require('nullthrows');
+import invariant from 'invariant';
+import nullthrows from 'nullthrows';
 
 // TODO: Convert to a Flow enum
 type NodeColor =

package/src/DeltaBundler/Serializers/baseJSBundle.js

@@ -1,7 +1,18 @@
 "use strict";
 
-const getAppendScripts = require("../../lib/getAppendScripts");
-const processModules = require("./helpers/processModules");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = baseJSBundle;
+var _getAppendScripts = _interopRequireDefault(
+  require("../../lib/getAppendScripts"),
+);
+var _processModules = _interopRequireDefault(
+  require("./helpers/processModules"),
+);
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 function baseJSBundle(entryPoint, preModules, graph, options) {
   for (const module of graph.dependencies.values()) {
     options.createModuleId(module.path);
@@ -18,17 +29,21 @@ function baseJSBundle(entryPoint, preModules, graph, options) {
   if (options.modulesOnly) {
     preModules = [];
   }
-  const preCode = processModules(preModules, processModulesOptions)
+  const preCode = (0, _processModules.default)(
+    preModules,
+    processModulesOptions,
+  )
     .map(([_, code]) => code)
     .join("\n");
   const modules = [...graph.dependencies.values()].sort(
-    (a, b) => options.createModuleId(a.path) - options.createModuleId(b.path)
+    (a, b) => options.createModuleId(a.path) - options.createModuleId(b.path),
   );
-  const postCode = processModules(
-    getAppendScripts(entryPoint, [...preModules, ...modules], {
+  const postCode = (0, _processModules.default)(
+    (0, _getAppendScripts.default)(entryPoint, [...preModules, ...modules], {
       asyncRequireModulePath: options.asyncRequireModulePath,
       createModuleId: options.createModuleId,
       getRunModuleStatement: options.getRunModuleStatement,
+      globalPrefix: options.globalPrefix,
       inlineSourceMap: options.inlineSourceMap,
       runBeforeMainModule: options.runBeforeMainModule,
       runModule: options.runModule,
@@ -37,17 +52,16 @@ function baseJSBundle(entryPoint, preModules, graph, options) {
       sourceUrl: options.sourceUrl,
       getSourceUrl: options.getSourceUrl,
     }),
-    processModulesOptions
+    processModulesOptions,
   )
     .map(([_, code]) => code)
     .join("\n");
   return {
     pre: preCode,
     post: postCode,
-    modules: processModules(
+    modules: (0, _processModules.default)(
       [...graph.dependencies.values()],
-      processModulesOptions
+      processModulesOptions,
     ).map(([module, code]) => [options.createModuleId(module.path), code]),
   };
 }
-module.exports = baseJSBundle;

package/src/DeltaBundler/Serializers/baseJSBundle.js.flow

@@ -9,20 +9,18 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {
   MixedOutput,
   Module,
   ReadOnlyGraph,
   SerializerOptions,
-} from '../types.flow';
-import type {Bundle} from 'metro-runtime/src/modules/types.flow';
+} from '../types';
+import type {Bundle} from 'metro-runtime/src/modules/types';
 
-const getAppendScripts = require('../../lib/getAppendScripts');
-const processModules = require('./helpers/processModules');
+import getAppendScripts from '../../lib/getAppendScripts';
+import processModules from './helpers/processModules';
 
-function baseJSBundle(
+export default function baseJSBundle(
   entryPoint: string,
   preModules: $ReadOnlyArray<Module<>>,
   graph: ReadOnlyGraph<>,
@@ -61,6 +59,7 @@ function baseJSBundle(
       asyncRequireModulePath: options.asyncRequireModulePath,
       createModuleId: options.createModuleId,
       getRunModuleStatement: options.getRunModuleStatement,
+      globalPrefix: options.globalPrefix,
       inlineSourceMap: options.inlineSourceMap,
       runBeforeMainModule: options.runBeforeMainModule,
       runModule: options.runModule,
@@ -83,5 +82,3 @@ function baseJSBundle(
     ).map(([module, code]) => [options.createModuleId(module.path), code]),
   };
 }
-
-module.exports = baseJSBundle;

package/src/DeltaBundler/Serializers/getAllFiles.js

@@ -1,7 +1,11 @@
 "use strict";
 
-const { getAssetFiles } = require("../../Assets");
-const { getJsOutput, isJsModule } = require("./helpers/js");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getAllFiles;
+var _Assets = require("../../Assets");
+var _js = require("./helpers/js");
 async function getAllFiles(pre, graph, options) {
   const modules = graph.dependencies;
   const { processModuleFilter } = options;
@@ -12,11 +16,11 @@ async function getAllFiles(pre, graph, options) {
     }
   }
   for (const module of modules.values()) {
-    if (!isJsModule(module) || !processModuleFilter(module)) {
+    if (!(0, _js.isJsModule)(module) || !processModuleFilter(module)) {
       continue;
     }
-    if (getJsOutput(module).type === "js/module/asset") {
-      promises.push(getAssetFiles(module.path, options.platform));
+    if ((0, _js.getJsOutput)(module).type === "js/module/asset") {
+      promises.push((0, _Assets.getAssetFiles)(module.path, options.platform));
     } else {
       promises.push([module.path]);
     }
@@ -28,4 +32,3 @@ async function getAllFiles(pre, graph, options) {
   }
   return output;
 }
-module.exports = getAllFiles;

package/src/DeltaBundler/Serializers/getAllFiles.js.flow

@@ -9,19 +9,17 @@
  * @oncall react_native
  */
 
-'use strict';
+import type {Module, ReadOnlyGraph} from '../types';
 
-import type {Module, ReadOnlyGraph} from '../types.flow';
-
-const {getAssetFiles} = require('../../Assets');
-const {getJsOutput, isJsModule} = require('./helpers/js');
+import {getAssetFiles} from '../../Assets';
+import {getJsOutput, isJsModule} from './helpers/js';
 
 type Options = {
   platform: ?string,
   +processModuleFilter: (module: Module<>) => boolean,
 };
 
-async function getAllFiles(
+export default async function getAllFiles(
   pre: $ReadOnlyArray<Module<>>,
   graph: ReadOnlyGraph<>,
   options: Options,
@@ -58,5 +56,3 @@ async function getAllFiles(
 
   return output;
 }
-
-module.exports = getAllFiles;

package/src/DeltaBundler/Serializers/getAssets.js

@@ -1,29 +1,36 @@
 "use strict";
 
-const { getAssetData } = require("../../Assets");
-const { getJsOutput, isJsModule } = require("./helpers/js");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = getAssets;
+var _Assets = require("../../Assets");
+var _js = require("./helpers/js");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 async function getAssets(dependencies, options) {
   const promises = [];
   const { processModuleFilter } = options;
   for (const module of dependencies.values()) {
     if (
-      isJsModule(module) &&
+      (0, _js.isJsModule)(module) &&
       processModuleFilter(module) &&
-      getJsOutput(module).type === "js/module/asset" &&
-      path.relative(options.projectRoot, module.path) !== "package.json"
+      (0, _js.getJsOutput)(module).type === "js/module/asset" &&
+      _path.default.relative(options.projectRoot, module.path) !==
+        "package.json"
     ) {
       promises.push(
-        getAssetData(
+        (0, _Assets.getAssetData)(
           module.path,
-          path.relative(options.projectRoot, module.path),
+          _path.default.relative(options.projectRoot, module.path),
           options.assetPlugins,
           options.platform,
-          options.publicPath
-        )
+          options.publicPath,
+        ),
       );
     }
   }
   return await Promise.all(promises);
 }
-module.exports = getAssets;

package/src/DeltaBundler/Serializers/getAssets.js.flow

@@ -9,14 +9,12 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {AssetData} from '../../Assets';
-import type {Module, ReadOnlyDependencies} from '../types.flow';
+import type {Module, ReadOnlyDependencies} from '../types';
 
-const {getAssetData} = require('../../Assets');
-const {getJsOutput, isJsModule} = require('./helpers/js');
-const path = require('path');
+import {getAssetData} from '../../Assets';
+import {getJsOutput, isJsModule} from './helpers/js';
+import path from 'path';
 
 type Options = {
   +processModuleFilter: (module: Module<>) => boolean,
@@ -26,7 +24,7 @@ type Options = {
   publicPath: string,
 };
 
-async function getAssets(
+export default async function getAssets(
   dependencies: ReadOnlyDependencies<>,
   options: Options,
 ): Promise<$ReadOnlyArray<AssetData>> {
@@ -54,5 +52,3 @@ async function getAssets(
 
   return await Promise.all(promises);
 }
-
-module.exports = getAssets;

package/src/DeltaBundler/Serializers/getExplodedSourceMap.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+import type {Module} from '../types';
+import type {
+  FBSourceFunctionMap,
+  MetroSourceMapSegmentTuple,
+} from 'metro-source-map';
+
+export type ExplodedSourceMap = ReadonlyArray<{
+  readonly map: Array<MetroSourceMapSegmentTuple>;
+  readonly firstLine1Based: number;
+  readonly functionMap: null | undefined | FBSourceFunctionMap;
+  readonly path: string;
+}>;
+export declare function getExplodedSourceMap(
+  modules: ReadonlyArray<Module>,
+  options: {readonly processModuleFilter: (module: Module) => boolean},
+): ExplodedSourceMap;

package/src/DeltaBundler/Serializers/getExplodedSourceMap.js

@@ -1,15 +1,19 @@
 "use strict";
 
-const { getJsOutput, isJsModule } = require("./helpers/js");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.getExplodedSourceMap = getExplodedSourceMap;
+var _js = require("./helpers/js");
 function getExplodedSourceMap(modules, options) {
   const modulesToProcess = modules
-    .filter(isJsModule)
+    .filter(_js.isJsModule)
     .filter(options.processModuleFilter);
   const result = [];
   let firstLine1Based = 1;
   for (const module of modulesToProcess) {
     const { path } = module;
-    const { lineCount, functionMap, map } = getJsOutput(module).data;
+    const { lineCount, functionMap, map } = (0, _js.getJsOutput)(module).data;
     result.push({
       firstLine1Based,
       functionMap,
@@ -20,6 +24,3 @@ function getExplodedSourceMap(modules, options) {
   }
   return result;
 }
-module.exports = {
-  getExplodedSourceMap,
-};

package/src/DeltaBundler/Serializers/getExplodedSourceMap.js.flow

@@ -9,15 +9,13 @@
  * @oncall react_native
  */
 
-'use strict';
-
-import type {Module} from '../types.flow';
+import type {Module} from '../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
 } from 'metro-source-map';
 
-const {getJsOutput, isJsModule} = require('./helpers/js');
+import {getJsOutput, isJsModule} from './helpers/js';
 
 export type ExplodedSourceMap = $ReadOnlyArray<{
   +map: Array<MetroSourceMapSegmentTuple>,
@@ -26,7 +24,7 @@ export type ExplodedSourceMap = $ReadOnlyArray<{
   +path: string,
 }>;
 
-function getExplodedSourceMap(
+export function getExplodedSourceMap(
   modules: $ReadOnlyArray<Module<>>,
   options: {
     +processModuleFilter: (module: Module<>) => boolean,
@@ -47,7 +45,3 @@ function getExplodedSourceMap(
   }
   return result;
 }
-
-module.exports = {
-  getExplodedSourceMap,
-};