metro 0.71.2 → 0.72.1

package/src/ModuleGraph/output/multiple-files-ram-bundle.js.flow

@@ -9,8 +9,6 @@
  */
 
 'use strict';
-import type {IdsForPathFn} from '../types.flow';
-
 import type {Module, OutputFn, OutputFnArg, OutputResult} from '../types.flow';
 import type {IndexMap} from 'metro-source-map';
 
@@ -30,18 +28,10 @@ function asMultipleFilesRamBundle({
   modules,
   requireCalls,
   preloadedModules,
-}: $TEMPORARY$object<{
-  dependencyMapReservedName?: ?string,
-  enableIDInlining: boolean,
-  filename: string,
-  globalPrefix: string,
-  idsForPath: IdsForPathFn,
-  modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+}: $ReadOnly<{
+  ...OutputFnArg,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
-  requireCalls: Iterable<Module>,
-  segmentID: number,
-  sourceMapPath?: ?string,
 }>): OutputResult<IndexMap> {
   const idForPath = (x: {path: string, ...}) => idsForPath(x).moduleId;
   const [startup, deferred] = partition(modules, preloadedModules);
@@ -96,7 +86,7 @@ function asMultipleFilesRamBundle({
 }
 
 function createBuilder(
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
 ): OutputFn<IndexMap> {
   return (x: OutputFnArg) =>

package/src/ModuleGraph/output/util.js

@@ -181,6 +181,7 @@ function inlineModuleIds(
       ? parseSync(code, babelConfig)
       : HermesParser.parse(code, {
           babel: true,
+          // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,
         });
   const ast = nullthrows(

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

@@ -62,11 +62,11 @@ type InlineModuleIdsOptions = $ReadOnly<{
 }>;
 
 // TS detection conditions copied from metro-react-native-babel-preset
-function isTypeScriptSource(fileName) {
+function isTypeScriptSource(fileName: string) {
   return !!fileName && fileName.endsWith('.ts');
 }
 
-function isTSXSource(fileName) {
+function isTSXSource(fileName: string) {
   return !!fileName && fileName.endsWith('.tsx');
 }
 
@@ -181,6 +181,7 @@ function inlineModuleIds(
       ? parseSync(code, babelConfig)
       : HermesParser.parse(code, {
           babel: true,
+          // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,
         });
 
@@ -317,7 +318,7 @@ exports.requireCallsTo = function* (
 // the ones loaded deferredly (lazy loaded).
 exports.partition = (
   modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
 ): Array<Array<Module>> => {
   const startup = [];
   const deferred = [];

package/src/ModuleGraph/silent-console.js

@@ -12,11 +12,12 @@
 const { Console } = require("console");
 
 const { Writable } = require("stream");
-/* $FlowFixMe(>=0.97.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.97 was deployed. To see the error delete this comment and
- * run Flow. */
 
-const write = (_, __, callback) => callback();
+const write = (_, __, callback) =>
+  /* $FlowFixMe(>=0.97.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.97 was deployed. To see the error delete this comment and
+   * run Flow. */
+  callback();
 
 module.exports = new Console(
   new Writable({

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

@@ -13,8 +13,12 @@
 const {Console} = require('console');
 const {Writable} = require('stream');
 
-/* $FlowFixMe(>=0.97.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.97 was deployed. To see the error delete this comment and
- * run Flow. */
-const write = (_, __, callback) => callback();
+const write = (
+  _: Buffer | string | Array<{chunk: Buffer | string, encoding: string, ...}>,
+  __: string | ((error?: Error) => void),
+  callback: void | ((error?: Error) => void),
+  /* $FlowFixMe(>=0.97.0 site=react_native_fb) This comment suppresses an error
+   * found when Flow v0.97 was deployed. To see the error delete this comment and
+   * run Flow. */
+) => callback();
 module.exports = (new Console(new Writable({write, writev: write})): Console);

package/src/ModuleGraph/worker/collectDependencies.js

@@ -9,6 +9,8 @@
  */
 "use strict";
 
+const crypto = require("crypto");
+
 const generate = require("@babel/generator").default;
 
 const template = require("@babel/template").default;
@@ -586,8 +588,9 @@ function createModuleNameLiteral(dependency) {
 }
 /**
  * Given an import qualifier, return a key used to register the dependency.
- * Generally this return the `ImportQualifier.name` property, but in the case
- * of `require.context` more attributes can be appended to distinguish various combinations that would otherwise conflict.
+ * Generally this return the `ImportQualifier.name` property, but more
+ * attributes can be appended to distinguish various combinations that would
+ * otherwise conflict.
  *
  * For example, the following case would have collision issues if they all utilized the `name` property:
  * ```
@@ -603,6 +606,12 @@ function createModuleNameLiteral(dependency) {
 
 function getKeyForDependency(qualifier) {
   let key = qualifier.name;
+  const { asyncType } = qualifier;
+
+  if (asyncType) {
+    key += ["", asyncType].join("\0");
+  }
+
   const { contextParams } = qualifier; // Add extra qualifiers when using `require.context` to prevent collisions.
 
   if (contextParams) {
@@ -616,7 +625,7 @@ function getKeyForDependency(qualifier) {
       String(contextParams.filter.pattern),
       String(contextParams.filter.flags),
       contextParams.mode, // Join together and append to the name:
-    ].join("__");
+    ].join("\0");
   }
 
   return key;
@@ -636,6 +645,7 @@ class DefaultModuleDependencyRegistry {
         asyncType: qualifier.asyncType,
         locs: [],
         index: this._dependencies.size,
+        key: crypto.createHash("sha1").update(key).digest("base64"),
       };
 
       if (qualifier.optional) {
@@ -647,17 +657,16 @@ class DefaultModuleDependencyRegistry {
       }
 
       dependency = newDependency;
-
-      this._dependencies.set(key, dependency);
     } else {
-      const original = dependency;
-      dependency = collapseDependencies(original, qualifier);
-
-      if (original !== dependency) {
-        this._dependencies.set(key, dependency);
+      if (dependency.isOptional && !qualifier.optional) {
+        // A previously optionally required dependency was required non-optionally.
+        // Mark it non optional for the whole module
+        dependency = { ...dependency, isOptional: false };
       }
     }
 
+    this._dependencies.set(key, dependency);
+
     return dependency;
   }
 
@@ -666,24 +675,4 @@ class DefaultModuleDependencyRegistry {
   }
 }
 
-function collapseDependencies(dependency, qualifier) {
-  let collapsed = dependency; // A previously optionally required dependency was required non-optionaly.
-  // Mark it non optional for the whole module
-
-  if (collapsed.isOptional && !qualifier.optional) {
-    collapsed = { ...dependency, isOptional: false };
-  } // A previously asynchronously (or prefetch) required module was required synchronously.
-  // Make the dependency sync.
-
-  if (collapsed.asyncType != null && qualifier.asyncType == null) {
-    collapsed = { ...dependency, asyncType: null };
-  } // A prefetched dependency was required async in the module. Mark it as async.
-
-  if (collapsed.asyncType === "prefetch" && qualifier.asyncType === "async") {
-    collapsed = { ...dependency, asyncType: "async" };
-  }
-
-  return collapsed;
-}
-
 module.exports = collectDependencies;

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

@@ -17,6 +17,7 @@ import type {
   AsyncDependencyType,
 } from 'metro/src/DeltaBundler/types.flow.js';
 
+const crypto = require('crypto');
 const generate = require('@babel/generator').default;
 const template = require('@babel/template').default;
 const traverse = require('@babel/traverse').default;
@@ -38,7 +39,7 @@ export type Dependency<TSplitCondition> = $ReadOnly<{
 }>;
 
 // TODO: Convert to a Flow enum
-type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
+export type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
 
 type ContextFilter = {pattern: string, flags: string};
 
@@ -52,6 +53,8 @@ export type RequireContextParams = $ReadOnly<{
 }>;
 
 type DependencyData<TSplitCondition> = $ReadOnly<{
+  // A locally unique key for this dependency within the current module.
+  key: string,
   // If null, then the dependency is synchronous.
   // (ex. `require('foo')`)
   asyncType: AsyncDependencyType | null,
@@ -175,7 +178,10 @@ function collectDependencies<TSplitCondition = void>(
   };
 
   const visitor = {
-    CallExpression(path, state): void {
+    CallExpression(
+      path: NodePath<BabelNodeCallExpression>,
+      state: State<TSplitCondition>,
+    ): void {
       if (visited.has(path.node)) {
         return;
       }
@@ -254,7 +260,7 @@ function collectDependencies<TSplitCondition = void>(
     ExportNamedDeclaration: collectImports,
     ExportAllDeclaration: collectImports,
 
-    Program(path, state) {
+    Program(path: NodePath<BabelNodeProgram>, state: State<TSplitCondition>) {
       state.asyncRequireModulePathStringLiteral = types.stringLiteral(
         options.asyncRequireModulePath,
       );
@@ -723,8 +729,9 @@ function createModuleNameLiteral(dependency: InternalDependency<mixed>) {
 
 /**
  * Given an import qualifier, return a key used to register the dependency.
- * Generally this return the `ImportQualifier.name` property, but in the case
- * of `require.context` more attributes can be appended to distinguish various combinations that would otherwise conflict.
+ * Generally this return the `ImportQualifier.name` property, but more
+ * attributes can be appended to distinguish various combinations that would
+ * otherwise conflict.
  *
  * For example, the following case would have collision issues if they all utilized the `name` property:
  * ```
@@ -740,6 +747,11 @@ function createModuleNameLiteral(dependency: InternalDependency<mixed>) {
 function getKeyForDependency(qualifier: ImportQualifier): string {
   let key = qualifier.name;
 
+  const {asyncType} = qualifier;
+  if (asyncType) {
+    key += ['', asyncType].join('\0');
+  }
+
   const {contextParams} = qualifier;
   // Add extra qualifiers when using `require.context` to prevent collisions.
   if (contextParams) {
@@ -754,7 +766,7 @@ function getKeyForDependency(qualifier: ImportQualifier): string {
       String(contextParams.filter.flags),
       contextParams.mode,
       // Join together and append to the name:
-    ].join('__');
+    ].join('\0');
   }
   return key;
 }
@@ -777,6 +789,7 @@ class DefaultModuleDependencyRegistry<TSplitCondition = void>
         asyncType: qualifier.asyncType,
         locs: [],
         index: this._dependencies.size,
+        key: crypto.createHash('sha1').update(key).digest('base64'),
       };
 
       if (qualifier.optional) {
@@ -787,15 +800,19 @@ class DefaultModuleDependencyRegistry<TSplitCondition = void>
       }
 
       dependency = newDependency;
-      this._dependencies.set(key, dependency);
     } else {
-      const original = dependency;
-      dependency = collapseDependencies(original, qualifier);
-      if (original !== dependency) {
-        this._dependencies.set(key, dependency);
+      if (dependency.isOptional && !qualifier.optional) {
+        // A previously optionally required dependency was required non-optionally.
+        // Mark it non optional for the whole module
+        dependency = {
+          ...dependency,
+          isOptional: false,
+        };
       }
     }
 
+    this._dependencies.set(key, dependency);
+
     return dependency;
   }
 
@@ -804,36 +821,4 @@ class DefaultModuleDependencyRegistry<TSplitCondition = void>
   }
 }
 
-function collapseDependencies<TSplitCondition>(
-  dependency: InternalDependency<TSplitCondition>,
-  qualifier: ImportQualifier,
-): InternalDependency<TSplitCondition> {
-  let collapsed = dependency;
-
-  // A previously optionally required dependency was required non-optionaly.
-  // Mark it non optional for the whole module
-  if (collapsed.isOptional && !qualifier.optional) {
-    collapsed = {
-      ...dependency,
-      isOptional: false,
-    };
-  }
-
-  // A previously asynchronously (or prefetch) required module was required synchronously.
-  // Make the dependency sync.
-  if (collapsed.asyncType != null && qualifier.asyncType == null) {
-    collapsed = {...dependency, asyncType: null};
-  }
-
-  // A prefetched dependency was required async in the module. Mark it as async.
-  if (collapsed.asyncType === 'prefetch' && qualifier.asyncType === 'async') {
-    collapsed = {
-      ...dependency,
-      asyncType: 'async',
-    };
-  }
-
-  return collapsed;
-}
-
 module.exports = collectDependencies;

package/src/Server.js

@@ -453,6 +453,8 @@ class Server {
     delete: deleteFn,
     finish,
   }) {
+    /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
+     * Flow's LTI update could not be added via codemod */
     return async function requestProcessor(req, res, bundleOptions) {
       const { entryFile, graphOptions, transformOptions, serializerOptions } =
         splitBundleOptions(bundleOptions);
@@ -469,6 +471,8 @@ class Server {
         shallow: graphOptions.shallow,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
       }); // For resources that support deletion, handle the DELETE method.
 
       if (deleteFn && req.method === "DELETE") {
@@ -660,6 +664,8 @@ class Server {
 
       const serializer =
         this._config.serializer.customSerializer ||
+        /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+         * Flow's LTI update could not be added via codemod */
         ((...args) => bundleToString(baseJSBundle(...args)).code);
 
       const bundle = await serializer(
@@ -1093,6 +1099,8 @@ class Server {
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
     });
     let revision;
 

package/src/Server.js.flow

@@ -9,6 +9,8 @@
  */
 
 'use strict';
+
+import type {StackFrameOutput} from './Server/symbolicate';
 import type {AssetData} from './Assets';
 import type {ExplodedSourceMap} from './DeltaBundler/Serializers/getExplodedSourceMap';
 import type {RamBundleInfo} from './DeltaBundler/Serializers/getRamBundleInfo';
@@ -349,7 +351,7 @@ class Server {
     res: ServerResponse,
     data: string | Buffer,
     assetPath: string,
-  ) {
+  ): Buffer | string {
     if (req.headers && req.headers.range) {
       const [rangeStart, rangeEnd] = req.headers.range
         .replace(/bytes=/, '')
@@ -371,7 +373,10 @@ class Server {
     return data;
   }
 
-  async _processSingleAssetRequest(req: IncomingMessage, res: ServerResponse) {
+  async _processSingleAssetRequest(
+    req: IncomingMessage,
+    res: ServerResponse,
+  ): Promise<void> {
     const urlObj = url.parse(decodeURI(req.url), true);
     let [, assetPath] =
       (urlObj &&
@@ -512,7 +517,13 @@ class Server {
     +build: (context: ProcessStartContext) => Promise<T>,
     +delete?: (context: ProcessDeleteContext) => Promise<void>,
     +finish: (context: ProcessEndContext<T>) => void,
-  }) {
+  }): (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> {
+    /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
+     * Flow's LTI update could not be added via codemod */
     return async function requestProcessor(
       req: IncomingMessage,
       res: ServerResponse,
@@ -533,6 +544,8 @@ class Server {
         shallow: graphOptions.shallow,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
       });
 
       // For resources that support deletion, handle the DELETE method.
@@ -690,7 +703,11 @@ class Server {
     };
   }
 
-  _processBundleRequest = this._createRequestProcessor({
+  _processBundleRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting bundle',
@@ -733,6 +750,8 @@ class Server {
 
       const serializer =
         this._config.serializer.customSerializer ||
+        /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
+         * Flow's LTI update could not be added via codemod */
         ((...args) => bundleToString(baseJSBundle(...args)).code);
 
       const bundle = await serializer(
@@ -807,7 +826,11 @@ class Server {
     },
   });
 
-  _processBytecodeBundleRequest = this._createRequestProcessor({
+  _processBytecodeBundleRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting bundle',
@@ -925,7 +948,11 @@ class Server {
     );
   }
 
-  _processSourceMapRequest = this._createRequestProcessor({
+  _processSourceMapRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting sourcemap',
@@ -975,7 +1002,11 @@ class Server {
     },
   });
 
-  _processAssetsRequest = this._createRequestProcessor({
+  _processAssetsRequest: (
+    req: IncomingMessage,
+    res: ServerResponse,
+    bundleOptions: BundleOptions,
+  ) => Promise<void> = this._createRequestProcessor({
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting assets',
@@ -1011,7 +1042,10 @@ class Server {
   });
 
   async _symbolicate(req: IncomingMessage, res: ServerResponse) {
-    const getCodeFrame = (urls, symbolicatedStack) => {
+    const getCodeFrame = (
+      urls: Set<string>,
+      symbolicatedStack: $ReadOnlyArray<StackFrameOutput>,
+    ) => {
       for (let i = 0; i < symbolicatedStack.length; i++) {
         const {collapse, column, file, lineNumber} = symbolicatedStack[i];
         const fileAbsolute = path.resolve(this._config.projectRoot, file ?? '');
@@ -1134,6 +1168,8 @@ class Server {
       shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
     });
     let revision;
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
@@ -1161,7 +1197,7 @@ class Server {
   }
 
   async _resolveRelativePath(
-    filePath,
+    filePath: string,
     {
       transformOptions,
       relativeTo,
@@ -1169,7 +1205,7 @@ class Server {
       transformOptions: TransformInputOptions,
       relativeTo: 'project' | 'server',
     }>,
-  ) {
+  ): Promise<string> {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
@@ -1231,11 +1267,11 @@ class Server {
     sourceUrl: null,
   };
 
-  _getServerRootDir() {
+  _getServerRootDir(): string {
     return this._config.server.unstable_serverRoot ?? this._config.projectRoot;
   }
 
-  _getEntryPointAbsolutePath(entryFile: string) {
+  _getEntryPointAbsolutePath(entryFile: string): string {
     return path.resolve(this._getServerRootDir(), entryFile);
   }
 

package/src/cli-utils.js.flow

@@ -27,7 +27,7 @@ exports.watchFile = async function (
 
 exports.makeAsyncCommand =
   (
-    command: (argv: YargArguments) => Promise<mixed>,
+    command: (argv: YargArguments) => Promise<void>,
   ): ((argv: YargArguments) => void) =>
   (argv: YargArguments) => {
     Promise.resolve(command(argv)).catch(error => {

package/src/commands/build.js

@@ -22,8 +22,7 @@ const updateReporter = new TerminalReporter(term);
 
 module.exports = () => ({
   command: "build <entry>",
-  description:
-    "Generates a JavaScript bundle containing the specified entrypoint and its descendants",
+  desc: "Generates a JavaScript bundle containing the specified entrypoint and its descendants",
   builder: (yargs) => {
     yargs.option("project-roots", {
       alias: "P",

package/src/commands/build.js.flow

@@ -13,6 +13,7 @@
 import type {RunBuildOptions} from '../index';
 import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
+import type {ModuleObject} from 'yargs';
 
 const {makeAsyncCommand} = require('../cli-utils');
 const TerminalReporter = require('../lib/TerminalReporter');
@@ -22,16 +23,12 @@ const {Terminal} = require('metro-core');
 const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
-module.exports = (): ({
-  builder: (yargs: Yargs) => void,
-  command: string,
-  description: string,
-  handler: (argv: YargArguments) => void,
-}) => ({
+module.exports = (): {
+  ...ModuleObject,
+  handler: Function,
+} => ({
   command: 'build <entry>',
-
-  description:
-    'Generates a JavaScript bundle containing the specified entrypoint and its descendants',
+  desc: 'Generates a JavaScript bundle containing the specified entrypoint and its descendants',
 
   builder: (yargs: Yargs): void => {
     yargs.option('project-roots', {

package/src/commands/dependencies.js

@@ -73,7 +73,7 @@ async function dependencies(args, config) {
 
 module.exports = () => ({
   command: "get-dependencies",
-  description: "List dependencies",
+  desc: "List dependencies",
   builder: (yargs) => {
     yargs.option("entry-file", {
       type: "string",

package/src/commands/serve.js

@@ -17,7 +17,8 @@ const { promisify } = require("util");
 
 module.exports = () => ({
   command: "serve",
-  description: "Starts Metro on the given port, building bundles on the fly",
+  aliases: ["start"],
+  desc: "Starts Metro on the given port, building bundles on the fly",
   builder: (yargs) => {
     yargs.option("project-roots", {
       alias: "P",

package/src/commands/serve.js.flow

@@ -13,20 +13,19 @@
 import type {RunServerOptions} from '../index';
 import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
+import type {ModuleObject} from 'yargs';
 
 const {makeAsyncCommand, watchFile} = require('../cli-utils');
 const {loadConfig, resolveConfig} = require('metro-config');
 const {promisify} = require('util');
 
-module.exports = (): ({
-  builder: (yargs: Yargs) => void,
-  command: $TEMPORARY$string<'serve'>,
-  description: string,
-  handler: (argv: YargArguments) => void,
-}) => ({
+module.exports = (): {
+  ...ModuleObject,
+  handler: Function,
+} => ({
   command: 'serve',
-
-  description: 'Starts Metro on the given port, building bundles on the fly',
+  aliases: ['start'],
+  desc: 'Starts Metro on the given port, building bundles on the fly',
 
   builder: (yargs: Yargs): void => {
     yargs.option('project-roots', {