metro 0.80.1 → 0.80.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.80.1",
+  "version": "0.80.2",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -28,25 +28,25 @@
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.17.1",
+    "hermes-parser": "0.18.0",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.80.1",
-    "metro-cache": "0.80.1",
-    "metro-cache-key": "0.80.1",
-    "metro-config": "0.80.1",
-    "metro-core": "0.80.1",
-    "metro-file-map": "0.80.1",
-    "metro-minify-terser": "0.80.1",
-    "metro-resolver": "0.80.1",
-    "metro-runtime": "0.80.1",
-    "metro-source-map": "0.80.1",
-    "metro-symbolicate": "0.80.1",
-    "metro-transform-plugins": "0.80.1",
-    "metro-transform-worker": "0.80.1",
+    "metro-babel-transformer": "0.80.2",
+    "metro-cache": "0.80.2",
+    "metro-cache-key": "0.80.2",
+    "metro-config": "0.80.2",
+    "metro-core": "0.80.2",
+    "metro-file-map": "0.80.2",
+    "metro-minify-terser": "0.80.2",
+    "metro-resolver": "0.80.2",
+    "metro-runtime": "0.80.2",
+    "metro-source-map": "0.80.2",
+    "metro-symbolicate": "0.80.2",
+    "metro-transform-plugins": "0.80.2",
+    "metro-transform-worker": "0.80.2",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -67,8 +67,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.80.1",
-    "metro-memory-fs": "0.80.1",
+    "metro-babel-register": "0.80.2",
+    "metro-memory-fs": "0.80.2",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Bundler.js.flow

@@ -13,8 +13,8 @@
 
 import type {TransformResultWithSource} from './DeltaBundler';
 import type {TransformOptions} from './DeltaBundler/Worker';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type EventEmitter from 'events';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 const Transformer = require('./DeltaBundler/Transformer');
 const DependencyGraph = require('./node-haste/DependencyGraph');

package/src/DeltaBundler/DeltaCalculator.js

@@ -11,8 +11,8 @@
 
 "use strict";
 
-var _path = _interopRequireDefault(require("path"));
 var _Graph = require("./Graph");
+var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -11,12 +11,13 @@
 
 'use strict';
 
-import path from 'path';
-import {Graph} from './Graph';
 import type {DeltaResult, Options} from './types.flow';
 import type {RootPerfLogger} from 'metro-config';
 import type {ChangeEventMetadata} from 'metro-file-map';
 
+import {Graph} from './Graph';
+import path from 'path';
+
 const debug = require('debug')('Metro:DeltaCalculator');
 const {EventEmitter} = require('events');
 

package/src/DeltaBundler/Graph.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.Graph = void 0;
-var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 var _contextModule = require("../lib/contextModule");
+var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 var path = _interopRequireWildcard(require("path"));
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
@@ -161,7 +161,7 @@ class Graph {
         );
       }
     }
-    this._collectCycles(delta);
+    this._collectCycles(delta, internalOptions);
     const added = new Map();
     for (const path of delta.added) {
       added.set(path, nullthrows(this.dependencies.get(path)));
@@ -584,6 +584,18 @@ class Graph {
     this.#gc.color.set(module.path, "black");
   }
 
+  // Iterate "children" of the given module - i.e. non-weak / async
+  // dependencies having a corresponding inverse dependency.
+  *_children(module, options) {
+    for (const dependency of module.dependencies.values()) {
+      const asyncType = dependency.data.data.asyncType;
+      if (asyncType === "weak" || (options.lazy && asyncType != null)) {
+        continue;
+      }
+      yield nullthrows(this.dependencies.get(dependency.absolutePath));
+    }
+  }
+
   // Delete an unreachable module (and its outbound edges) from the graph
   // immediately.
   // Called when the reference count of a module has reached 0.
@@ -624,13 +636,13 @@ class Graph {
   }
 
   // Collect any unreachable cycles in the graph.
-  _collectCycles(delta) {
+  _collectCycles(delta, options) {
     // Mark recursively from roots (trial deletion)
     for (const path of this.#gc.possibleCycleRoots) {
       const module = nullthrows(this.dependencies.get(path));
       const color = nullthrows(this.#gc.color.get(path));
       if (color === "purple") {
-        this._markGray(module);
+        this._markGray(module, options);
       } else {
         this.#gc.possibleCycleRoots.delete(path);
         if (
@@ -645,7 +657,7 @@ class Graph {
     // Scan recursively from roots (undo unsuccessful trial deletions)
     for (const path of this.#gc.possibleCycleRoots) {
       const module = nullthrows(this.dependencies.get(path));
-      this._scan(module);
+      this._scan(module, options);
     }
     // Collect recursively from roots (free unreachable cycles)
     for (const path of this.#gc.possibleCycleRoots) {
@@ -654,50 +666,41 @@ class Graph {
       this._collectWhite(module, delta);
     }
   }
-  _markGray(module) {
+  _markGray(module, options) {
     const color = nullthrows(this.#gc.color.get(module.path));
     if (color !== "gray") {
       this.#gc.color.set(module.path, "gray");
-      for (const dependency of module.dependencies.values()) {
-        const childModule = nullthrows(
-          this.dependencies.get(dependency.absolutePath)
-        );
+      for (const childModule of this._children(module, options)) {
         // The inverse dependency will be restored during the scan phase if this module remains live.
         childModule.inverseDependencies.delete(module.path);
-        this._markGray(childModule);
+        this._markGray(childModule, options);
       }
     }
   }
-  _scan(module) {
+  _scan(module, options) {
     const color = nullthrows(this.#gc.color.get(module.path));
     if (color === "gray") {
       if (
         module.inverseDependencies.size > 0 ||
         this.entryPoints.has(module.path)
       ) {
-        this._scanBlack(module);
+        this._scanBlack(module, options);
       } else {
         this.#gc.color.set(module.path, "white");
-        for (const dependency of module.dependencies.values()) {
-          const childModule = nullthrows(
-            this.dependencies.get(dependency.absolutePath)
-          );
-          this._scan(childModule);
+        for (const childModule of this._children(module, options)) {
+          this._scan(childModule, options);
         }
       }
     }
   }
-  _scanBlack(module) {
+  _scanBlack(module, options) {
     this.#gc.color.set(module.path, "black");
-    for (const dependency of module.dependencies.values()) {
-      const childModule = nullthrows(
-        this.dependencies.get(dependency.absolutePath)
-      );
+    for (const childModule of this._children(module, options)) {
       // The inverse dependency must have been deleted during the mark phase.
       childModule.inverseDependencies.add(module.path);
       const childColor = nullthrows(this.#gc.color.get(childModule.path));
       if (childColor !== "black") {
-        this._scanBlack(childModule);
+        this._scanBlack(childModule, options);
       }
     }
   }

package/src/DeltaBundler/Graph.js.flow

@@ -29,8 +29,8 @@
  *    nodes and entries in the importBundleNodes set.
  */
 
-import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
 import type {RequireContext} from '../lib/contextModule';
+import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
 import type {
   Dependencies,
   Dependency,
@@ -42,13 +42,13 @@ import type {
   TransformResultDependency,
 } from './types.flow';
 
-import CountingSet from '../lib/CountingSet';
 import {
   deriveAbsolutePathFromContext,
   fileMatchesContext,
 } from '../lib/contextModule';
-
+import CountingSet from '../lib/CountingSet';
 import * as path from 'path';
+
 const invariant = require('invariant');
 const nullthrows = require('nullthrows');
 
@@ -202,7 +202,7 @@ export class Graph<T = MixedOutput> {
       }
     }
 
-    this._collectCycles(delta);
+    this._collectCycles(delta, internalOptions);
 
     const added = new Map<string, Module<T>>();
     for (const path of delta.added) {
@@ -709,6 +709,21 @@ export class Graph<T = MixedOutput> {
     this.#gc.color.set(module.path, 'black');
   }
 
+  // Iterate "children" of the given module - i.e. non-weak / async
+  // dependencies having a corresponding inverse dependency.
+  *_children(
+    module: Module<T>,
+    options: InternalOptions<T>,
+  ): Iterator<Module<T>> {
+    for (const dependency of module.dependencies.values()) {
+      const asyncType = dependency.data.data.asyncType;
+      if (asyncType === 'weak' || (options.lazy && asyncType != null)) {
+        continue;
+      }
+      yield nullthrows(this.dependencies.get(dependency.absolutePath));
+    }
+  }
+
   // Delete an unreachable module (and its outbound edges) from the graph
   // immediately.
   // Called when the reference count of a module has reached 0.
@@ -749,13 +764,13 @@ export class Graph<T = MixedOutput> {
   }
 
   // Collect any unreachable cycles in the graph.
-  _collectCycles(delta: Delta) {
+  _collectCycles(delta: Delta, options: InternalOptions<T>) {
     // Mark recursively from roots (trial deletion)
     for (const path of this.#gc.possibleCycleRoots) {
       const module = nullthrows(this.dependencies.get(path));
       const color = nullthrows(this.#gc.color.get(path));
       if (color === 'purple') {
-        this._markGray(module);
+        this._markGray(module, options);
       } else {
         this.#gc.possibleCycleRoots.delete(path);
         if (
@@ -770,7 +785,7 @@ export class Graph<T = MixedOutput> {
     // Scan recursively from roots (undo unsuccessful trial deletions)
     for (const path of this.#gc.possibleCycleRoots) {
       const module = nullthrows(this.dependencies.get(path));
-      this._scan(module);
+      this._scan(module, options);
     }
     // Collect recursively from roots (free unreachable cycles)
     for (const path of this.#gc.possibleCycleRoots) {
@@ -780,52 +795,43 @@ export class Graph<T = MixedOutput> {
     }
   }
 
-  _markGray(module: Module<T>) {
+  _markGray(module: Module<T>, options: InternalOptions<T>) {
     const color = nullthrows(this.#gc.color.get(module.path));
     if (color !== 'gray') {
       this.#gc.color.set(module.path, 'gray');
-      for (const dependency of module.dependencies.values()) {
-        const childModule = nullthrows(
-          this.dependencies.get(dependency.absolutePath),
-        );
+      for (const childModule of this._children(module, options)) {
         // The inverse dependency will be restored during the scan phase if this module remains live.
         childModule.inverseDependencies.delete(module.path);
-        this._markGray(childModule);
+        this._markGray(childModule, options);
       }
     }
   }
 
-  _scan(module: Module<T>) {
+  _scan(module: Module<T>, options: InternalOptions<T>) {
     const color = nullthrows(this.#gc.color.get(module.path));
     if (color === 'gray') {
       if (
         module.inverseDependencies.size > 0 ||
         this.entryPoints.has(module.path)
       ) {
-        this._scanBlack(module);
+        this._scanBlack(module, options);
       } else {
         this.#gc.color.set(module.path, 'white');
-        for (const dependency of module.dependencies.values()) {
-          const childModule = nullthrows(
-            this.dependencies.get(dependency.absolutePath),
-          );
-          this._scan(childModule);
+        for (const childModule of this._children(module, options)) {
+          this._scan(childModule, options);
         }
       }
     }
   }
 
-  _scanBlack(module: Module<T>) {
+  _scanBlack(module: Module<T>, options: InternalOptions<T>) {
     this.#gc.color.set(module.path, 'black');
-    for (const dependency of module.dependencies.values()) {
-      const childModule = nullthrows(
-        this.dependencies.get(dependency.absolutePath),
-      );
+    for (const childModule of this._children(module, options)) {
       // The inverse dependency must have been deleted during the mark phase.
       childModule.inverseDependencies.add(module.path);
       const childColor = nullthrows(this.#gc.color.get(childModule.path));
       if (childColor !== 'black') {
-        this._scanBlack(childModule);
+        this._scanBlack(childModule, options);
       }
     }
   }

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

@@ -136,7 +136,7 @@ function isJsModule(module: Module<>): boolean {
   return module.output.filter(isJsOutput).length > 0;
 }
 
-function isJsOutput(output: MixedOutput): boolean %checks {
+function isJsOutput(output: MixedOutput): boolean {
   return output.type.startsWith('js/');
 }
 

package/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -23,7 +23,7 @@ function generateModules(sourceModules, graph, options) {
       // Construct a bundle URL for this specific module only
       const getURL = (extension) => {
         options.clientUrl.pathname = path.relative(
-          options.projectRoot,
+          options.serverRoot ?? options.projectRoot,
           path.join(
             path.dirname(module.path),
             path.basename(module.path, path.extname(module.path)) +
@@ -59,6 +59,7 @@ function prepareModule(module, graph, options) {
   const inverseDependenciesById = Object.create(null);
   Object.keys(inverseDependencies).forEach((path) => {
     // $FlowFixMe[prop-missing]
+    // $FlowFixMe[invalid-computed-prop]
     inverseDependenciesById[options.createModuleId(path)] = inverseDependencies[
       path
     ].map(options.createModuleId);

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

@@ -42,7 +42,7 @@ function generateModules(
       // Construct a bundle URL for this specific module only
       const getURL = (extension: 'bundle' | 'map') => {
         options.clientUrl.pathname = path.relative(
-          options.projectRoot,
+          options.serverRoot ?? options.projectRoot,
           path.join(
             path.dirname(module.path),
             path.basename(module.path, path.extname(module.path)) +
@@ -87,6 +87,7 @@ function prepareModule(
   const inverseDependenciesById = Object.create(null);
   Object.keys(inverseDependencies).forEach((path: string) => {
     // $FlowFixMe[prop-missing]
+    // $FlowFixMe[invalid-computed-prop]
     inverseDependenciesById[options.createModuleId(path)] = inverseDependencies[
       path
     ].map(options.createModuleId);

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

@@ -13,12 +13,6 @@
 
 import type {Module} from '../types.flow';
 
-export type SourceMapGeneratorOptions = $ReadOnly<{
-  excludeSource: boolean,
-  processModuleFilter: (module: Module<>) => boolean,
-  shouldAddToIgnoreList: (module: Module<>) => boolean,
-}>;
-
 const getSourceMapInfo = require('./helpers/getSourceMapInfo');
 const {isJsModule} = require('./helpers/js');
 const {
@@ -26,6 +20,12 @@ const {
   fromRawMappingsNonBlocking,
 } = require('metro-source-map');
 
+export type SourceMapGeneratorOptions = $ReadOnly<{
+  excludeSource: boolean,
+  processModuleFilter: (module: Module<>) => boolean,
+  shouldAddToIgnoreList: (module: Module<>) => boolean,
+}>;
+
 function getSourceMapInfosImpl(
   isBlocking: boolean,
   onDone: ($ReadOnlyArray<ReturnType<typeof getSourceMapInfo>>) => void,

package/src/DeltaBundler/Transformer.js.flow

@@ -14,6 +14,7 @@
 import type {TransformResult, TransformResultWithSource} from '../DeltaBundler';
 import type {TransformerConfig, TransformOptions} from './Worker';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
+
 import crypto from 'crypto';
 
 const getTransformCacheKey = require('./getTransformCacheKey');

package/src/DeltaBundler/types.flow.js.flow

@@ -11,8 +11,8 @@
 
 'use strict';
 
-import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
 import type {RequireContext} from '../lib/contextModule';
+import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
 import type {Graph} from './Graph';
 import type {JsTransformOptions} from 'metro-transform-worker';
 

package/src/ModuleGraph/worker/collectDependencies.js

@@ -10,11 +10,11 @@
 
 "use strict";
 
-const crypto = require("crypto");
 const generate = require("@babel/generator").default;
 const template = require("@babel/template").default;
 const traverse = require("@babel/traverse").default;
 const types = require("@babel/types");
+const crypto = require("crypto");
 const nullthrows = require("nullthrows");
 const { isImport } = types;
 /**

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

@@ -17,11 +17,11 @@ 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;
 const types = require('@babel/types');
+const crypto = require('crypto');
 const nullthrows = require('nullthrows');
 
 const {isImport} = types;

package/src/Server/MultipartResponse.js.flow

@@ -11,6 +11,7 @@
 
 'use strict';
 import type {IncomingMessage, ServerResponse} from 'http';
+
 const accepts = require('accepts');
 
 const CRLF = '\r\n';

package/src/Server/symbolicate.js.flow

@@ -11,10 +11,9 @@
 
 'use strict';
 import type {
-  MetroSourceMapSegmentTuple,
   FBSourceFunctionMap,
+  MetroSourceMapSegmentTuple,
 } from '../../../metro-source-map/src/source-map';
-
 import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 

package/src/Server.js

@@ -28,11 +28,13 @@ const getGraphId = require("./lib/getGraphId");
 const parseOptionsFromUrl = require("./lib/parseOptionsFromUrl");
 const splitBundleOptions = require("./lib/splitBundleOptions");
 const transformHelpers = require("./lib/transformHelpers");
+const {
+  UnableToResolveError,
+} = require("./node-haste/DependencyGraph/ModuleResolution");
 const parsePlatformFilePath = require("./node-haste/lib/parsePlatformFilePath");
+const MultipartResponse = require("./Server/MultipartResponse");
 const symbolicate = require("./Server/symbolicate");
 const { codeFrameColumns } = require("@babel/code-frame");
-const MultipartResponse = require("./Server/MultipartResponse");
-const { performance } = require("perf_hooks");
 const debug = require("debug")("Metro:Server");
 const fs = require("graceful-fs");
 const invariant = require("invariant");
@@ -44,6 +46,7 @@ const {
 const mime = require("mime-types");
 const nullthrows = require("nullthrows");
 const path = require("path");
+const { performance } = require("perf_hooks");
 const querystring = require("querystring");
 const url = require("url");
 const noopLogger = {
@@ -448,11 +451,22 @@ class Server {
        * `entryFile` is relative to projectRoot, we need to use resolution function
        * to find the appropriate file with supported extensions.
        */
-      const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-        relativeTo: "server",
-        resolverOptions,
-        transformOptions,
-      });
+      let resolvedEntryFilePath;
+      try {
+        resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
+          relativeTo: "server",
+          resolverOptions,
+          transformOptions,
+        });
+      } catch (error) {
+        const formattedError = formatBundlingError(error);
+        const status = error instanceof UnableToResolveError ? 404 : 500;
+        res.writeHead(status, {
+          "Content-Type": "application/json; charset=UTF-8",
+        });
+        res.end(JSON.stringify(formattedError));
+        return;
+      }
       const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,

package/src/Server.js.flow

@@ -11,7 +11,6 @@
 
 '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';
@@ -25,6 +24,7 @@ import type {
 import type {RevisionId} from './IncrementalBundler';
 import type {GraphId} from './lib/getGraphId';
 import type {Reporter} from './lib/reporting';
+import type {StackFrameOutput} from './Server/symbolicate';
 import type {
   BundleOptions,
   GraphOptions,
@@ -60,11 +60,13 @@ const getGraphId = require('./lib/getGraphId');
 const parseOptionsFromUrl = require('./lib/parseOptionsFromUrl');
 const splitBundleOptions = require('./lib/splitBundleOptions');
 const transformHelpers = require('./lib/transformHelpers');
+const {
+  UnableToResolveError,
+} = require('./node-haste/DependencyGraph/ModuleResolution');
 const parsePlatformFilePath = require('./node-haste/lib/parsePlatformFilePath');
+const MultipartResponse = require('./Server/MultipartResponse');
 const symbolicate = require('./Server/symbolicate');
 const {codeFrameColumns} = require('@babel/code-frame');
-const MultipartResponse = require('./Server/MultipartResponse');
-const {performance} = require('perf_hooks');
 const debug = require('debug')('Metro:Server');
 const fs = require('graceful-fs');
 const invariant = require('invariant');
@@ -73,10 +75,10 @@ const {
   Logger,
   Logger: {createActionStartEntry, createActionEndEntry, log},
 } = require('metro-core');
-
 const mime = require('mime-types');
 const nullthrows = require('nullthrows');
 const path = require('path');
+const {performance} = require('perf_hooks');
 const querystring = require('querystring');
 const url = require('url');
 
@@ -611,11 +613,23 @@ class Server {
        * `entryFile` is relative to projectRoot, we need to use resolution function
        * to find the appropriate file with supported extensions.
        */
-      const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-        relativeTo: 'server',
-        resolverOptions,
-        transformOptions,
-      });
+      let resolvedEntryFilePath;
+      try {
+        resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
+          relativeTo: 'server',
+          resolverOptions,
+          transformOptions,
+        });
+      } catch (error) {
+        const formattedError = formatBundlingError(error);
+
+        const status = error instanceof UnableToResolveError ? 404 : 500;
+        res.writeHead(status, {
+          'Content-Type': 'application/json; charset=UTF-8',
+        });
+        res.end(JSON.stringify(formattedError));
+        return;
+      }
       const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,

package/src/commands/build.js.flow

@@ -9,13 +9,13 @@
  * @oncall react_native
  */
 
-import parseKeyValueParamArray from '../cli/parseKeyValueParamArray';
-
+import type {RunBuildOptions} from '../index';
 import type {CustomTransformOptions} from 'metro-babel-transformer';
 import type {CustomResolverOptions} from 'metro-resolver';
-import type {RunBuildOptions} from '../index';
-import typeof Yargs from 'yargs';
 import type {ModuleObject} from 'yargs';
+import typeof Yargs from 'yargs';
+
+import parseKeyValueParamArray from '../cli/parseKeyValueParamArray';
 
 const {makeAsyncCommand} = require('../cli-utils');
 const TerminalReporter = require('../lib/TerminalReporter');

package/src/commands/dependencies.js.flow

@@ -12,8 +12,8 @@
 'use strict';
 
 import type {ConfigT} from 'metro-config';
-import typeof Yargs from 'yargs';
 import type {ModuleObject} from 'yargs';
+import typeof Yargs from 'yargs';
 
 const {makeAsyncCommand} = require('../cli-utils');
 const Server = require('../Server');

package/src/commands/serve.js.flow

@@ -11,8 +11,8 @@
 
 'use strict';
 
-import typeof Yargs from 'yargs';
 import type {ModuleObject} from 'yargs';
+import typeof Yargs from 'yargs';
 
 const {makeAsyncCommand, watchFile} = require('../cli-utils');
 const {loadConfig, resolveConfig} = require('metro-config');

package/src/index.flow.js.flow

@@ -11,11 +11,10 @@
 
 'use strict';
 
-import type {HandleFunction} from 'connect';
-import type {CustomResolverOptions} from 'metro-resolver';
 import type {ReadOnlyGraph} from './DeltaBundler';
 import type {ServerOptions} from './Server';
 import type {OutputOptions, RequestOptions} from './shared/types.flow.js';
+import type {HandleFunction} from 'connect';
 import type {Server as HttpServer} from 'http';
 import type {Server as HttpsServer} from 'https';
 import type {
@@ -24,6 +23,7 @@ import type {
   MetroConfig,
   Middleware,
 } from 'metro-config/src/configTypes.flow';
+import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 import typeof Yargs from 'yargs';
 

package/src/integration_tests/basic_bundle/require-context/conflict.js.flow

@@ -12,9 +12,9 @@ import type {RequireWithContext} from './utils';
 
 import {copyContextToObject} from './utils';
 
-declare var require: RequireWithContext;
-
 const normalModule = require('./subdir-conflict');
+
+declare var require: RequireWithContext;
 const contextModule = require.context<$FlowFixMe>('./subdir-conflict');
 
 function main() {

package/src/integration_tests/basic_bundle/require-context/mode-eager.js.flow

@@ -8,9 +8,10 @@
  * @flow strict-local
  */
 
-import {copyContextToObject, awaitProperties} from './utils';
 import type {RequireWithContext} from './utils';
 
+import {awaitProperties, copyContextToObject} from './utils';
+
 declare var require: RequireWithContext;
 
 function main() {

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js.flow

@@ -8,9 +8,10 @@
  * @flow strict-local
  */
 
-import {copyContextToObject, awaitProperties} from './utils';
 import type {RequireWithContext} from './utils';
 
+import {awaitProperties, copyContextToObject} from './utils';
+
 declare var require: RequireWithContext;
 
 function main() {

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js.flow

@@ -8,9 +8,10 @@
  * @flow strict-local
  */
 
-import {copyContextToObject, awaitProperties} from './utils';
 import type {RequireWithContext} from './utils';
 
+import {awaitProperties, copyContextToObject} from './utils';
+
 declare var require: RequireWithContext;
 
 function main() {

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -8,9 +8,10 @@
  * @flow strict-local
  */
 
-import {copyContextToObject} from './utils';
 import type {RequireWithContext} from './utils';
 
+import {copyContextToObject} from './utils';
+
 declare var require: RequireWithContext;
 
 function main(): mixed {

package/src/lib/contextModule.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.deriveAbsolutePathFromContext = deriveAbsolutePathFromContext;
 exports.fileMatchesContext = fileMatchesContext;
 var _crypto = _interopRequireDefault(require("crypto"));
-var _path = _interopRequireDefault(require("path"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
+var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }

package/src/lib/contextModule.js.flow

@@ -9,13 +9,14 @@
  * @oncall react_native
  */
 
-import crypto from 'crypto';
-import path from 'path';
 import type {
   ContextMode,
   RequireContextParams,
 } from '../ModuleGraph/worker/collectDependencies';
+
+import crypto from 'crypto';
 import nullthrows from 'nullthrows';
+import path from 'path';
 
 export type RequireContext = $ReadOnly<{
   /* Should search for files recursively. Optional, default `true` when `require.context` is used */

package/src/lib/contextModuleTemplates.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.getContextModuleTemplate = getContextModuleTemplate;
-var path = _interopRequireWildcard(require("path"));
 var os = _interopRequireWildcard(require("os"));
+var path = _interopRequireWildcard(require("path"));
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
   var cacheBabelInterop = new WeakMap();

package/src/lib/contextModuleTemplates.js.flow

@@ -9,10 +9,11 @@
  * @oncall react_native
  */
 
-import * as path from 'path';
-import * as os from 'os';
 import type {ContextMode} from '../ModuleGraph/worker/collectDependencies';
 
+import * as os from 'os';
+import * as path from 'path';
+
 function createFileMap(
   modulePath: string,
   files: string[],

package/src/lib/reporting.js.flow

@@ -11,10 +11,10 @@
 
 'use strict';
 
+import type {Terminal} from 'metro-core';
+import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
-import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
-import type {Terminal} from 'metro-core';
 
 const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');

package/src/lib/transformHelpers.js.flow

@@ -19,15 +19,14 @@ import type {
   TransformResultDependency,
 } from '../DeltaBundler/types.flow';
 import type {TransformOptions} from '../DeltaBundler/Worker';
+import type {ResolverInputOptions} from '../shared/types.flow';
+import type {RequireContext} from './contextModule';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type {Type} from 'metro-transform-worker';
-import type {RequireContext} from './contextModule';
 
 import {getContextModuleTemplate} from './contextModuleTemplates';
 import isAssetFile from 'metro-resolver/src/utils/isAssetFile';
 
-import type {ResolverInputOptions} from '../shared/types.flow';
-
 type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
 type TransformOptionsWithRawInlines = {

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

@@ -11,6 +11,12 @@
 
 'use strict';
 
+import type {
+  BundlerResolution,
+  TransformResultDependency,
+} from '../../DeltaBundler/types.flow';
+import type {Reporter} from '../../lib/reporting';
+import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {
   CustomResolver,
   DoesFileExist,
@@ -19,7 +25,6 @@ import type {
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
-import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {PackageInfo, PackageJson} from 'metro-resolver/src/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
@@ -29,11 +34,6 @@ const Resolver = require('metro-resolver');
 const createDefaultContext = require('metro-resolver/src/createDefaultContext');
 const path = require('path');
 const util = require('util');
-import type {
-  BundlerResolution,
-  TransformResultDependency,
-} from '../../DeltaBundler/types.flow';
-import type {Reporter} from '../../lib/reporting';
 
 export type DirExistsFn = (filePath: string) => boolean;
 

package/src/node-haste/DependencyGraph.js

@@ -12,7 +12,6 @@ var _metroFileMap = require("metro-file-map");
  * @oncall react_native
  */
 
-const canonicalize = require("metro-core/src/canonicalize");
 const createFileMap = require("./DependencyGraph/createFileMap");
 const { ModuleResolver } = require("./DependencyGraph/ModuleResolution");
 const ModuleCache = require("./ModuleCache");
@@ -23,6 +22,7 @@ const {
   Logger: { createActionStartEntry, createActionEndEntry, log },
   PackageResolutionError,
 } = require("metro-core");
+const canonicalize = require("metro-core/src/canonicalize");
 const { InvalidPackageError } = require("metro-resolver");
 const nullthrows = require("nullthrows");
 const path = require("path");

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

@@ -9,6 +9,11 @@
  * @oncall react_native
  */
 
+import type {
+  BundlerResolution,
+  TransformResultDependency,
+} from '../DeltaBundler/types.flow';
+import type {ResolverInputOptions} from '../shared/types.flow';
 import type Package from './Package';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type MetroFileMap, {
@@ -21,7 +26,6 @@ import type MetroFileMap, {
 
 import {DuplicateHasteCandidatesError} from 'metro-file-map';
 
-const canonicalize = require('metro-core/src/canonicalize');
 const createFileMap = require('./DependencyGraph/createFileMap');
 const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
 const ModuleCache = require('./ModuleCache');
@@ -32,14 +36,10 @@ const {
   Logger: {createActionStartEntry, createActionEndEntry, log},
   PackageResolutionError,
 } = require('metro-core');
+const canonicalize = require('metro-core/src/canonicalize');
 const {InvalidPackageError} = require('metro-resolver');
 const nullthrows = require('nullthrows');
 const path = require('path');
-import type {ResolverInputOptions} from '../shared/types.flow';
-import type {
-  BundlerResolution,
-  TransformResultDependency,
-} from '../DeltaBundler/types.flow';
 
 const NULL_PLATFORM = Symbol();
 

package/src/shared/types.flow.js.flow

@@ -16,6 +16,7 @@ import type {
   TransformInputOptions,
 } from '../DeltaBundler/types.flow';
 import type {TransformProfile} from 'metro-babel-transformer';
+import type {CustomResolverOptions} from 'metro-resolver';
 import type {
   MetroSourceMapSegmentTuple,
   MixedSourceMap,
@@ -24,7 +25,6 @@ import type {
   CustomTransformOptions,
   MinifierOptions,
 } from 'metro-transform-worker';
-import type {CustomResolverOptions} from 'metro-resolver';
 
 type BundleType =
   | 'bundle'