metro 0.66.2 → 0.69.0

package/src/ModuleGraph/output/util.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,31 +9,30 @@
  */
 "use strict";
 
+const virtualModule = require("../module").virtual;
+
 const generate = require("../worker/generate");
 
 const mergeSourceMaps = require("../worker/mergeSourceMaps");
 
-const nullthrows = require("nullthrows");
-
 const reverseDependencyMapReferences = require("./reverse-dependency-map-references");
 
-const { addParamsToDefineCall } = require("metro-transform-plugins");
+const { parseSync, transformFromAstSync } = require("@babel/core");
 
-const virtualModule = require("../module").virtual; // flowlint-next-line untyped-import:off
+const HermesParser = require("hermes-parser"); // flowlint-next-line untyped-import:off
 
 const { passthroughSyntaxPlugins } = require("metro-react-native-babel-preset");
 
-const { parseSync, transformFromAstSync } = require("@babel/core");
-
-const HermesParser = require("hermes-parser");
+const { addParamsToDefineCall } = require("metro-transform-plugins");
 
-// Transformed modules have the form
+const nullthrows = require("nullthrows"); // Transformed modules have the form
 //   __d(function(require, module, global, exports, dependencyMap) {
 //       /* code */
 //   });
 //
 // This function adds the numeric module ID, and an array with dependencies of
 // the dependencies of the module before the closing parenthesis.
+
 function addModuleIdsToModuleWrapper(module, idForPath) {
   const { dependencies, file } = module;
   const { code } = file; // calling `idForPath` on the module itself first gives us a lower module id
@@ -68,7 +67,7 @@ function inlineModuleIds(
     dependencyMapReservedName,
     globalPrefix,
     ignoreMissingDependencyMapReference = false,
-    hermesParser = false
+    hermesParser = false,
   }
 ) {
   const { dependencies, file } = module;
@@ -84,7 +83,7 @@ function inlineModuleIds(
     return {
       fileId,
       moduleCode: code,
-      moduleMap: map
+      moduleMap: map,
     };
   }
 
@@ -119,7 +118,7 @@ function inlineModuleIds(
         return {
           fileId,
           moduleCode: code,
-          moduleMap: map
+          moduleMap: map,
         };
       } // If we're here, the module was probably generated by some code that
       // doesn't make the dependency map name externally configurable, or a
@@ -144,8 +143,9 @@ function inlineModuleIds(
         if (idStr.length > match.length) {
           // Stop the build rather than silently emit an incorrect source map.
           throw new Error(
-            `Module ID doesn't fit in available space; add ${idStr.length -
-              match.length} more characters to 'dependencyMapReservedName'.`
+            `Module ID doesn't fit in available space; add ${
+              idStr.length - match.length
+            } more characters to 'dependencyMapReservedName'.`
           );
         }
 
@@ -155,7 +155,7 @@ function inlineModuleIds(
     return {
       fileId,
       moduleCode: inlinedCode,
-      moduleMap: map
+      moduleMap: map,
     };
   }
 
@@ -171,17 +171,17 @@ function inlineModuleIds(
         reverseDependencyMapReferences,
         {
           dependencyIds,
-          globalPrefix
-        }
-      ]
-    ]
+          globalPrefix,
+        },
+      ],
+    ],
   };
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
       : HermesParser.parse(code, {
           babel: true,
-          sourceType: babelConfig.sourceType
+          sourceType: babelConfig.sourceType,
         });
   const ast = nullthrows(
     transformFromAstSync(sourceAst, code, babelConfig).ast
@@ -190,7 +190,7 @@ function inlineModuleIds(
   return {
     fileId,
     moduleCode: generatedCode,
-    moduleMap: map && generatedMap && mergeSourceMaps(path, map, generatedMap)
+    moduleMap: map && generatedMap && mergeSourceMaps(path, map, generatedMap),
   };
 }
 
@@ -202,12 +202,13 @@ function inlineModuleIdsAndAddParamsToDefineCall(module, idForPath, options) {
   );
   return {
     moduleCode: addParamsToDefineCall(moduleCode, fileId),
-    moduleMap
+    moduleMap,
   };
 }
 
 exports.inlineModuleIds = inlineModuleIds;
-exports.inlineModuleIdsAndAddParamsToDefineCall = inlineModuleIdsAndAddParamsToDefineCall;
+exports.inlineModuleIdsAndAddParamsToDefineCall =
+  inlineModuleIdsAndAddParamsToDefineCall;
 
 function escapeRegex(str) {
   // From http://stackoverflow.com/questions/14076210/
@@ -235,7 +236,7 @@ function getModuleCodeAndMap(module, idForPath, options) {
       idForPath,
       {
         dependencyMapReservedName: options.dependencyMapReservedName,
-        globalPrefix: options.globalPrefix
+        globalPrefix: options.globalPrefix,
       }
     ));
   }
@@ -248,11 +249,11 @@ function getModuleCodeAndMap(module, idForPath, options) {
     }
 
     moduleMap = { ...moduleMap, x_facebook_sources };
-  } // $FlowFixMe[incompatible-return]
+  }
 
   return {
     moduleCode,
-    moduleMap
+    moduleMap,
   };
 }
 
@@ -281,7 +282,7 @@ exports.createIdForPathFn = () => {
 }; // creates a series of virtual modules with require calls to the passed-in
 // modules.
 
-exports.requireCallsTo = function*(modules, idForPath, getRunModuleStatement) {
+exports.requireCallsTo = function* (modules, idForPath, getRunModuleStatement) {
   for (const module of modules) {
     const id = idForPath(module.file);
     yield virtualModule(
@@ -313,11 +314,11 @@ function toModuleTransport(
   const { dependencies, file } = module;
   const { moduleCode, moduleMap } = getModuleCodeAndMap(
     module,
-    x => idsForPath(x).moduleId,
+    (x) => idsForPath(x).moduleId,
     {
       dependencyMapReservedName,
       enableIDInlining: true,
-      globalPrefix
+      globalPrefix,
     }
   );
   return {
@@ -327,7 +328,7 @@ function toModuleTransport(
     id: file.type === "module" ? nullthrows(idsForPath(file).localId) : -1,
     map: moduleMap,
     name: file.path,
-    sourcePath: file.path
+    sourcePath: file.path,
   };
 }
 

package/src/ModuleGraph/output/util.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,21 +10,19 @@
 
 'use strict';
 
+import type {Dependency, IdsForPathFn, Module} from '../types.flow';
+import type {BasicSourceMap} from 'metro-source-map';
+
+const virtualModule = require('../module').virtual;
 const generate = require('../worker/generate');
 const mergeSourceMaps = require('../worker/mergeSourceMaps');
-const nullthrows = require('nullthrows');
 const reverseDependencyMapReferences = require('./reverse-dependency-map-references');
-
-const {addParamsToDefineCall} = require('metro-transform-plugins');
-const virtualModule = require('../module').virtual;
-
-// flowlint-next-line untyped-import:off
-const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
 const {parseSync, transformFromAstSync} = require('@babel/core');
 const HermesParser = require('hermes-parser');
-
-import type {Dependency, IdsForPathFn, Module} from '../types.flow';
-import type {BasicSourceMap} from 'metro-source-map';
+// flowlint-next-line untyped-import:off
+const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
+const {addParamsToDefineCall} = require('metro-transform-plugins');
+const nullthrows = require('nullthrows');
 
 // Transformed modules have the form
 //   __d(function(require, module, global, exports, dependencyMap) {
@@ -151,8 +149,9 @@ function inlineModuleIds(
         if (idStr.length > match.length) {
           // Stop the build rather than silently emit an incorrect source map.
           throw new Error(
-            `Module ID doesn't fit in available space; add ${idStr.length -
-              match.length} more characters to 'dependencyMapReservedName'.`,
+            `Module ID doesn't fit in available space; add ${
+              idStr.length - match.length
+            } more characters to 'dependencyMapReservedName'.`,
           );
         }
         return idStr.padEnd(match.length);
@@ -216,7 +215,8 @@ function inlineModuleIdsAndAddParamsToDefineCall(
 }
 
 exports.inlineModuleIds = inlineModuleIds;
-exports.inlineModuleIdsAndAddParamsToDefineCall = inlineModuleIdsAndAddParamsToDefineCall;
+exports.inlineModuleIdsAndAddParamsToDefineCall =
+  inlineModuleIdsAndAddParamsToDefineCall;
 
 function escapeRegex(str: string): string {
   // From http://stackoverflow.com/questions/14076210/
@@ -268,7 +268,6 @@ function getModuleCodeAndMap(
     }
     moduleMap = {...moduleMap, x_facebook_sources};
   }
-  // $FlowFixMe[incompatible-return]
   return {moduleCode, moduleMap};
 }
 
@@ -300,7 +299,7 @@ exports.createIdForPathFn = (): (({path: string, ...}) => number) => {
 
 // creates a series of virtual modules with require calls to the passed-in
 // modules.
-exports.requireCallsTo = function*(
+exports.requireCallsTo = function* (
   modules: Iterable<Module>,
   idForPath: IdForPathFn,
   getRunModuleStatement: (id: number | string) => string,

package/src/ModuleGraph/silent-console.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -21,6 +21,6 @@ const write = (_, __, callback) => callback();
 module.exports = new Console(
   new Writable({
     write,
-    writev: write
+    writev: write,
   })
 );

package/src/ModuleGraph/silent-console.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/ModuleGraph/test-helpers.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -14,19 +14,19 @@ const { toMatchSnapshot } = require("jest-snapshot");
 
 const generateOptions = {
   concise: true,
-  sourceType: "module"
+  sourceType: "module",
 };
 
-const codeFromAst = ast => generate(ast, generateOptions).code;
+const codeFromAst = (ast) => generate(ast, generateOptions).code;
 
-const comparableCode = code => code.trim().replace(/\s+/g, " ");
+const comparableCode = (code) => code.trim().replace(/\s+/g, " ");
 
 function toEqualComparableCode(received, expected) {
   const comparableExpected = comparableCode(expected);
   const pass = received === comparableExpected;
   const options = {
     isNot: this.isNot,
-    promise: this.promise
+    promise: this.promise,
   };
   const message = pass
     ? () =>
@@ -61,7 +61,7 @@ function toEqualComparableCode(received, expected) {
   return {
     actual: received,
     message,
-    pass
+    pass,
   };
 } // See https://superuser.com/questions/380772/removing-ansi-color-codes-from-text-stream
 
@@ -87,5 +87,5 @@ module.exports = {
   codeFromAst,
   comparableCode,
   toEqualComparableCode,
-  toMatchCodeFrameSnapshot
+  toMatchCodeFrameSnapshot,
 };

package/src/ModuleGraph/types.flow.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/ModuleGraph/types.flow.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,9 +11,9 @@
 'use strict';
 
 import type {
-  MixedSourceMap,
-  FBSourceFunctionMap,
   BasicSourceMap,
+  FBSourceFunctionMap,
+  MixedSourceMap,
 } from 'metro-source-map';
 import type {TransformResultDependency} from 'metro/src/DeltaBundler';
 
@@ -108,9 +108,8 @@ export type OutputFnArg = {|
   enableIDInlining: boolean,
   segmentID: number,
 |};
-export type OutputFn<
-  M: MixedSourceMap = MixedSourceMap,
-> = OutputFnArg => OutputResult<M>;
+export type OutputFn<M: MixedSourceMap = MixedSourceMap> =
+  OutputFnArg => OutputResult<M>;
 
 export type OutputResult<M: MixedSourceMap> = {|
   code: string | Buffer,
@@ -256,7 +255,7 @@ export type AssetContents = {
 };
 export type AssetContentsByPath = {
   +[moduleFilePath: string]: $ReadOnlyArray<AssetContents>,
-  ...,
+  ...
 };
 
 export type ResolvedCodeFile = {|
@@ -298,4 +297,5 @@ export type ResolvedLibrary = {|
   +files: $ReadOnlyArray<ResolvedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
+  +isPartiallyResolved?: boolean,
 |};

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -21,7 +21,7 @@ function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();
   var cacheNodeInterop = new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop) {
+  return (_getRequireWildcardCache = function (nodeInterop) {
     return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
   })(nodeInterop);
 }
@@ -90,7 +90,7 @@ function wrapModule(
   const requireName = renameRequires(ast);
   return {
     ast,
-    requireName
+    requireName,
   };
 }
 
@@ -114,7 +114,7 @@ function wrapJson(source, globalPrefix) {
   return [
     `${globalPrefix}__d(function(${moduleFactoryParameters.join(", ")}) {`,
     `  ${jsonToCommonJS(source)}`,
-    "});"
+    "});",
   ].join("\n");
 }
 
@@ -138,7 +138,7 @@ function buildParameters(importDefaultName, importAllName, dependencyMapName) {
     importAllName,
     "module",
     "exports",
-    dependencyMapName
+    dependencyMapName,
   ];
 } // Renaming requires should ideally only be done when generating for the target
 // that expects the custom require name in the optimize step.
@@ -157,7 +157,7 @@ function renameRequires(ast) {
       );
       newRequireName = body.scope.generateUid(WRAP_NAME);
       body.scope.rename("require", newRequireName);
-    }
+    },
   });
   return newRequireName;
 }
@@ -167,5 +167,5 @@ module.exports = {
   wrapJson,
   jsonToCommonJS,
   wrapModule,
-  wrapPolyfill
+  wrapPolyfill,
 };

package/src/ModuleGraph/worker/JsFileWrapping.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,10 +10,11 @@
 
 'use strict';
 
+import type {FunctionExpression, Identifier, Program} from '@babel/types';
+
 import template from '@babel/template';
 import traverse from '@babel/traverse';
 import * as t from '@babel/types';
-import type {Program, FunctionExpression, Identifier} from '@babel/types';
 import invariant from 'invariant';
 
 const WRAP_NAME = '$$_REQUIRE'; // note: babel will prefix this with _

package/src/ModuleGraph/worker/Platforms.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -17,5 +17,5 @@
 
 const VALID_PLATFORMS = new Set(["ios", "android", "web"]);
 module.exports = {
-  VALID_PLATFORMS
+  VALID_PLATFORMS,
 };

package/src/ModuleGraph/worker/Platforms.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/ModuleGraph/worker/collectDependencies.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,10 +9,6 @@
  */
 "use strict";
 
-const invariant = require("invariant");
-
-const nullthrows = require("nullthrows");
-
 const generate = require("@babel/generator").default;
 
 const template = require("@babel/template").default;
@@ -21,6 +17,10 @@ const traverse = require("@babel/traverse").default;
 
 const types = require("@babel/types");
 
+const invariant = require("invariant");
+
+const nullthrows = require("nullthrows");
+
 const { isImport } = types;
 
 /**
@@ -52,7 +52,7 @@ function collectDependencies(ast, options) {
     dependencyMapIdentifier: null,
     dynamicRequires: options.dynamicRequires,
     keepRequireNames: options.keepRequireNames,
-    allowOptionalDependencies: options.allowOptionalDependencies
+    allowOptionalDependencies: options.allowOptionalDependencies,
   };
   const visitor = {
     CallExpression(path, state) {
@@ -65,14 +65,14 @@ function collectDependencies(ast, options) {
 
       if (isImport(callee)) {
         processImportCall(path, state, {
-          asyncType: "async"
+          asyncType: "async",
         });
         return;
       }
 
       if (name === "__prefetchImport" && !path.scope.getBinding(name)) {
         processImportCall(path, state, {
-          asyncType: "prefetch"
+          asyncType: "prefetch",
         });
         return;
       }
@@ -80,7 +80,7 @@ function collectDependencies(ast, options) {
       if (name === "__jsResource" && !path.scope.getBinding(name)) {
         processImportCall(path, state, {
           asyncType: "async",
-          jsResource: true
+          jsResource: true,
         });
         return;
       }
@@ -94,7 +94,7 @@ function collectDependencies(ast, options) {
         processImportCall(path, state, {
           asyncType: "async",
           jsResource: true,
-          splitCondition: args[1]
+          splitCondition: args[1],
         });
         return;
       }
@@ -123,13 +123,12 @@ function collectDependencies(ast, options) {
           options.dependencyMapName
         );
       } else {
-        state.dependencyMapIdentifier = path.scope.generateUidIdentifier(
-          "dependencyMap"
-        );
+        state.dependencyMapIdentifier =
+          path.scope.generateUidIdentifier("dependencyMap");
       }
 
       state.dependencyCalls = new Set(["require", ...options.inlineableCalls]);
-    }
+    },
   };
   traverse(ast, visitor, null, state);
   const collectedDependencies = state.dependencyRegistry.getDependencies(); // Compute the list of dependencies.
@@ -139,14 +138,14 @@ function collectDependencies(ast, options) {
   for (const { index, name, ...dependencyData } of collectedDependencies) {
     dependencies[index] = {
       name,
-      data: dependencyData
+      data: dependencyData,
     };
   }
 
   return {
     ast,
     dependencies,
-    dependencyMapName: nullthrows(state.dependencyMapIdentifier).name
+    dependencyMapName: nullthrows(state.dependencyMapIdentifier).name,
   };
 }
 
@@ -157,7 +156,7 @@ function collectImports(path, state) {
       {
         name: path.node.source.value,
         asyncType: null,
-        optional: false
+        optional: false,
       },
       path
     );
@@ -177,7 +176,7 @@ function processImportCall(path, state, options) {
       name,
       asyncType: options.asyncType,
       splitCondition: options.splitCondition,
-      optional: isOptionalDependency(name, path, state)
+      optional: isOptionalDependency(name, path, state),
     },
     path
   );
@@ -210,7 +209,7 @@ function processRequireCall(path, state) {
     {
       name,
       asyncType: null,
-      optional: isOptionalDependency(name, path, state)
+      optional: isOptionalDependency(name, path, state),
     },
     path
   );
@@ -361,7 +360,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -373,7 +372,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -385,7 +384,7 @@ const DefaultDependencyTransformer = {
           state.asyncRequireModulePathStringLiteral
         ),
         MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency)
+        MODULE_NAME: createModuleNameLiteral(dependency),
       })
     );
   },
@@ -404,10 +403,10 @@ const DefaultDependencyTransformer = {
             _path$node$loc$start$ !== void 0
             ? _path$node$loc$start$
             : 0
-        )
+        ),
       })
     );
-  }
+  },
 };
 
 function createModuleIDExpression(dependency, state) {
@@ -433,7 +432,7 @@ class DefaultModuleDependencyRegistry {
         name: qualifier.name,
         asyncType: qualifier.asyncType,
         locs: [],
-        index: this._dependencies.size
+        index: this._dependencies.size,
       };
 
       if (qualifier.optional) {