metro 0.83.0 → 0.83.2

package/src/index.flow.js.flow

@@ -9,13 +9,10 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {AssetData} from './Assets';
 import type {ReadOnlyGraph} from './DeltaBundler';
 import type {ServerOptions} from './Server';
-import type {BuildOptions} from './shared/types.flow';
-import type {OutputOptions, RequestOptions} from './shared/types.flow.js';
+import type {BuildOptions, OutputOptions, RequestOptions} from './shared/types';
 import type {HandleFunction} from 'connect';
 import type {Server as HttpServer} from 'http';
 import type {Server as HttpsServer} from 'https';
@@ -30,30 +27,31 @@ import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 import typeof Yargs from 'yargs';
 
-const makeBuildCommand = require('./commands/build');
-const makeDependenciesCommand = require('./commands/dependencies');
-const makeServeCommand = require('./commands/serve');
-const MetroHmrServer = require('./HmrServer');
-const IncrementalBundler = require('./IncrementalBundler');
-const createWebsocketServer = require('./lib/createWebsocketServer');
-const JsonReporter = require('./lib/JsonReporter');
-const TerminalReporter = require('./lib/TerminalReporter');
-const MetroServer = require('./Server');
-const outputBundle = require('./shared/output/bundle');
-const chalk = require('chalk');
-const fs = require('fs');
-const http = require('http');
-const https = require('https');
-const {
+import makeBuildCommand from './commands/build';
+import makeDependenciesCommand from './commands/dependencies';
+import makeServeCommand from './commands/serve';
+import MetroHmrServer from './HmrServer';
+import IncrementalBundler from './IncrementalBundler';
+import createWebsocketServer from './lib/createWebsocketServer';
+import JsonReporter from './lib/JsonReporter';
+import TerminalReporter from './lib/TerminalReporter';
+import MetroServer from './Server';
+import * as outputBundle from './shared/output/bundle';
+import chalk from 'chalk';
+import fs from 'fs';
+import http from 'http';
+import https from 'https';
+import {
   getDefaultConfig,
   loadConfig,
   mergeConfig,
   resolveConfig,
-} = require('metro-config');
-const {Terminal} = require('metro-core');
-const net = require('net');
-const nullthrows = require('nullthrows');
-const {parse} = require('url');
+} from 'metro-config';
+import {Terminal} from 'metro-core';
+import net from 'net';
+import nullthrows from 'nullthrows';
+
+const DEFAULTS = MetroServer.DEFAULT_BUNDLE_OPTIONS;
 
 type MetroMiddleWare = {
   attachHmrServer: (httpServer: HttpServer | HttpsServer) => void,
@@ -150,9 +148,7 @@ export type RunBuildResult = {
 type BuildCommandOptions = {} | null;
 type ServeCommandOptions = {} | null;
 
-exports.Terminal = Terminal;
-exports.JsonReporter = JsonReporter;
-exports.TerminalReporter = TerminalReporter;
+export {Terminal, JsonReporter, TerminalReporter};
 
 export type {AssetData} from './Assets';
 export type {Reporter, ReportableEvent} from './lib/reporting';
@@ -164,7 +160,7 @@ async function getConfig(config: InputConfigT): Promise<ConfigT> {
   return mergeConfig(defaultConfig, config);
 }
 
-async function runMetro(
+export async function runMetro(
   config: InputConfigT,
   options?: RunMetroOptions,
 ): Promise<MetroServer> {
@@ -207,12 +203,9 @@ async function runMetro(
   return server;
 }
 
-exports.runMetro = runMetro;
-exports.loadConfig = loadConfig;
-exports.mergeConfig = mergeConfig;
-exports.resolveConfig = resolveConfig;
+export {loadConfig, mergeConfig, resolveConfig};
 
-const createConnectMiddleware = async function (
+export const createConnectMiddleware = async function (
   config: ConfigT,
   options?: RunMetroOptions,
 ): Promise<MetroMiddleWare> {
@@ -238,7 +231,7 @@ const createConnectMiddleware = async function (
         ),
       });
       httpServer.on('upgrade', (request, socket, head) => {
-        const {pathname} = parse(request.url);
+        const {pathname} = new URL(request.url, 'resolve://');
         if (pathname === '/hot') {
           wss.handleUpgrade(request, socket, head, ws => {
             wss.emit('connection', ws, request);
@@ -255,9 +248,8 @@ const createConnectMiddleware = async function (
     },
   };
 };
-exports.createConnectMiddleware = createConnectMiddleware;
 
-exports.runServer = async (
+export const runServer = async (
   config: ConfigT,
   {
     hasReducedPerformance = false,
@@ -287,6 +279,7 @@ exports.runServer = async (
     );
   }
   // Lazy require
+  // eslint-disable-next-line import/no-commonjs
   const connect = require('connect');
 
   const serverApp = connect();
@@ -318,7 +311,7 @@ exports.runServer = async (
         ...secureServerOptions,
       };
     }
-    // $FlowFixMe[incompatible-call] 'http' and 'https' Flow types do not match
+    // $FlowFixMe[incompatible-type] 'http' and 'https' Flow types do not match
     httpServer = https.createServer(options, serverApp);
   } else {
     httpServer = http.createServer(serverApp);
@@ -352,7 +345,7 @@ exports.runServer = async (
       };
 
       httpServer.on('upgrade', (request, socket, head) => {
-        const {pathname} = parse(request.url);
+        const {pathname} = new URL(request.url, 'resolve://');
         if (pathname != null && websocketEndpoints[pathname]) {
           websocketEndpoints[pathname].handleUpgrade(
             request,
@@ -387,12 +380,12 @@ exports.runServer = async (
   });
 };
 
-exports.runBuild = async (
+export const runBuild = async (
   config: ConfigT,
   {
     assets = false,
-    customResolverOptions,
-    customTransformOptions,
+    customResolverOptions = DEFAULTS.customResolverOptions,
+    customTransformOptions = DEFAULTS.customTransformOptions,
     dev = false,
     entry,
     onBegin,
@@ -406,7 +399,7 @@ exports.runBuild = async (
     platform = 'web',
     sourceMap = false,
     sourceMapUrl,
-    unstable_transformProfile,
+    unstable_transformProfile = DEFAULTS.unstable_transformProfile,
   }: RunBuildOptions,
 ): Promise<RunBuildResult> => {
   const metroServer = await runMetro(config, {
@@ -414,13 +407,13 @@ exports.runBuild = async (
   });
 
   try {
-    const requestOptions: RequestOptions = {
+    const requestOptions = {
       dev,
       entryFile: entry,
       inlineSourceMap: sourceMap && !sourceMapUrl,
       minify,
       platform,
-      sourceMapUrl: sourceMap === false ? undefined : sourceMapUrl,
+      ...(sourceMap === false ? {} : {sourceMapUrl}),
       createModuleIdFactory: config.serializer.createModuleIdFactory,
       onProgress,
       customResolverOptions,
@@ -455,7 +448,7 @@ exports.runBuild = async (
       const sourcemapOutput =
         sourceMap === false
           ? undefined
-          : sourceMapOut ?? out?.replace(/(\.js)?$/, '.map');
+          : (sourceMapOut ?? out?.replace(/(\.js)?$/, '.map'));
 
       const outputOptions: OutputOptions = {
         bundleOutput,
@@ -478,7 +471,7 @@ exports.runBuild = async (
   }
 };
 
-exports.buildGraph = async function (
+export const buildGraph = async function (
   config: InputConfigT,
   {
     customTransformOptions = Object.create(null),
@@ -521,7 +514,7 @@ type AttachMetroCLIOptions = {
   ...
 };
 
-exports.attachMetroCli = function (
+export const attachMetroCli = function (
   yargs: Yargs,
   options?: AttachMetroCLIOptions = {},
 ): Yargs {
@@ -555,3 +548,23 @@ async function earlyPortCheck(host: void | string, port: number) {
     await new Promise(resolve => server.close(() => resolve()));
   }
 }
+
+/**
+ * Backwards-compatibility with CommonJS consumers using interopRequireDefault.
+ * Do not add to this list.
+ *
+ * @deprecated Default import from 'metro' is deprecated, use named exports.
+ */
+export default {
+  attachMetroCli,
+  runServer,
+  Terminal,
+  JsonReporter,
+  TerminalReporter,
+  loadConfig,
+  mergeConfig,
+  resolveConfig,
+  createConnectMiddleware,
+  runBuild,
+  buildGraph,
+};

package/src/index.js.flow

@@ -9,6 +9,8 @@
  * @oncall react_native
  */
 
+/* eslint-disable import/no-commonjs */
+
 'use strict';
 
 /*::

package/src/integration_tests/basic_bundle/TestBundle.js.flow

@@ -12,7 +12,8 @@
 
 const Bar = require('./Bar');
 const Foo = require('./Foo');
-// $FlowFixMe: Flow doesn't understand TypeScript
+// $FlowFixMe[untyped-import]: Flow doesn't understand TypeScript
+// $FlowFixMe[cannot-resolve-module]: Flow doesn't understand TypeScript
 const TypeScript = require('./TypeScript');
 
 Object.keys({...Bar});

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js

@@ -2,10 +2,6 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-import.js

@@ -2,10 +2,6 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/import-export/index.js

@@ -25,16 +25,12 @@ var _export = _interopRequireWildcard(require("./export-1"));
 var importStar = _interopRequireWildcard(require("./export-2"));
 var _exportNull = require("./export-null");
 var _exportPrimitiveDefault = _interopRequireWildcard(
-  require("./export-primitive-default")
+  require("./export-primitive-default"),
 );
 var _export3 = _interopRequireDefault(require("./export-3"));
 var _export4 = require("./export-4");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
@@ -47,21 +43,17 @@ function _getRequireWildcardCache(e) {
 function _interopRequireWildcard(e, r) {
   if (!r && e && e.__esModule) return e;
   if (null === e || ("object" != typeof e && "function" != typeof e))
-    return {
-      default: e,
-    };
+    return { default: e };
   var t = _getRequireWildcardCache(r);
   if (t && t.has(e)) return t.get(e);
-  var n = {
-      __proto__: null,
-    },
+  var n = { __proto__: null },
     a = Object.defineProperty && Object.getOwnPropertyDescriptor;
   for (var u in e)
     if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
       var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
       i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
     }
-  return (n.default = e), t && t.set(e, n), n;
+  return ((n.default = e), t && t.set(e, n), n);
 }
 const extraData = (exports.extraData = {
   foo: _exportNull.foo,

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

@@ -4,8 +4,8 @@ var _utils = require("./utils");
 function main() {
   return (0, _utils.awaitProperties)(
     (0, _utils.copyContextToObject)(
-      require.context("./subdir", undefined, undefined, "eager")
-    )
+      require.context("./subdir", undefined, undefined, "eager"),
+    ),
   );
 }
 module.exports = main();

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

@@ -4,8 +4,8 @@ var _utils = require("./utils");
 function main() {
   return (0, _utils.awaitProperties)(
     (0, _utils.copyContextToObject)(
-      require.context("./subdir", undefined, undefined, "lazy-once")
-    )
+      require.context("./subdir", undefined, undefined, "lazy-once"),
+    ),
   );
 }
 module.exports = main();

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

@@ -4,8 +4,8 @@ var _utils = require("./utils");
 function main() {
   return (0, _utils.awaitProperties)(
     (0, _utils.copyContextToObject)(
-      require.context("./subdir", undefined, undefined, "lazy")
-    )
+      require.context("./subdir", undefined, undefined, "lazy"),
+    ),
   );
 }
 module.exports = main();

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

@@ -3,7 +3,7 @@
 var _utils = require("./utils");
 function main() {
   return (0, _utils.copyContextToObject)(
-    require.context("./subdir", undefined, undefined, "sync")
+    require.context("./subdir", undefined, undefined, "sync"),
   );
 }
 module.exports = main();

package/src/integration_tests/basic_bundle/require-context/utils.js

@@ -13,6 +13,6 @@ function awaitProperties(obj) {
   return Promise.all(
     Object.keys(obj).map((key) => {
       return obj[key].then((value) => (result[key] = value));
-    })
+    }),
   ).then(() => result);
 }

package/src/integration_tests/execBundle.js

@@ -1,9 +1,12 @@
 "use strict";
 
-const vm = require("vm");
+var _vm = _interopRequireDefault(require("vm"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 module.exports = function execBundle(code, context = {}) {
-  if (vm.isContext(context)) {
-    return vm.runInContext(code, context);
+  if (_vm.default.isContext(context)) {
+    return _vm.default.runInContext(code, context);
   }
-  return vm.runInNewContext(code, context);
+  return _vm.default.runInNewContext(code, context);
 };

package/src/integration_tests/execBundle.js.flow

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-const vm = require('vm');
+import vm from 'vm';
 
 module.exports = function execBundle(code: string, context: any = {}): mixed {
   if (vm.isContext(context)) {

package/src/integration_tests/metro.config.js

@@ -20,10 +20,10 @@ module.exports = {
   transformer: {
     assetRegistryPath: path.join(ROOT_PATH, "AssetRegistry"),
     asyncRequireModulePath: require.resolve(
-      "metro-runtime/src/modules/asyncRequire"
+      "metro-runtime/src/modules/asyncRequire",
     ),
     babelTransformerPath: require.resolve(
-      "@react-native/metro-babel-transformer"
+      "@react-native/metro-babel-transformer",
     ),
     enableBabelRCLookup: false,
     enableBabelRuntime: false,
@@ -31,7 +31,7 @@ module.exports = {
       transform: {
         experimentalImportSupport: true,
         inlineRequires: entryFiles.some((filePath) =>
-          filePath.includes("inline-requires")
+          filePath.includes("inline-requires"),
         ),
       },
       preloadedModules: false,

package/src/lib/BatchProcessor.js

@@ -1,6 +1,13 @@
 "use strict";
 
-const invariant = require("invariant");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _invariant = _interopRequireDefault(require("invariant"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 class BatchProcessor {
   constructor(options, processBatch) {
     this._options = options;
@@ -14,7 +21,10 @@ class BatchProcessor {
     this._processQueueOnceReady();
   }
   _onBatchResults(jobs, results) {
-    invariant(results.length === jobs.length, "Not enough results returned.");
+    (0, _invariant.default)(
+      results.length === jobs.length,
+      "Not enough results returned.",
+    );
     for (let i = 0; i < jobs.length; ++i) {
       jobs[i].resolve(results[i]);
     }
@@ -34,7 +44,7 @@ class BatchProcessor {
       const jobs = this._queue.splice(0, this._options.maximumItems);
       this._processBatch(jobs.map((job) => job.item)).then(
         (results) => this._onBatchResults(jobs, results),
-        (error) => this._onBatchError(jobs, error)
+        (error) => this._onBatchError(jobs, error),
       );
     }
   }
@@ -47,7 +57,7 @@ class BatchProcessor {
     if (this._timeoutHandle == null) {
       this._timeoutHandle = setTimeout(
         () => this._processQueue(),
-        this._options.maximumDelayMs
+        this._options.maximumDelayMs,
       );
     }
   }
@@ -65,4 +75,4 @@ class BatchProcessor {
     return this._queue.length;
   }
 }
-module.exports = BatchProcessor;
+exports.default = BatchProcessor;

package/src/lib/BatchProcessor.js.flow

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 type ProcessBatch<TItem, TResult> = (
   batch: Array<TItem>,
@@ -38,7 +36,7 @@ type QueueItem<TItem, TResult> = {
  * if we have many items pending in a short amount of time, we can start
  * processing right away.
  */
-class BatchProcessor<TItem, TResult> {
+export default class BatchProcessor<TItem, TResult> {
   _currentProcessCount: number;
   _options: BatchProcessorOptions;
   _processBatch: ProcessBatch<TItem, TResult>;
@@ -124,5 +122,3 @@ class BatchProcessor<TItem, TResult> {
     return this._queue.length;
   }
 }
-
-module.exports = BatchProcessor;

package/src/lib/CountingSet.js.flow

@@ -81,7 +81,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
   }
 
   // Iterate over unique entries
-  // $FlowIssue[unsupported-syntax]
+  // $FlowFixMe[unsupported-syntax]
   [Symbol.iterator](): Iterator<T> {
     return this.values();
   }
@@ -94,7 +94,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
   */
 
   // Number of unique entries
-  // $FlowIssue[unsafe-getters-setters]
+  // $FlowFixMe[unsafe-getters-setters]
   get size(): number {
     return this.#map.size;
   }

package/src/lib/JsonReporter.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
 class JsonReporter {
   constructor(stream) {
     this._stream = stream;
@@ -16,6 +20,7 @@ class JsonReporter {
     this._stream.write(JSON.stringify(event) + "\n");
   }
 }
+exports.default = JsonReporter;
 function serializeError(e, seen = new Set()) {
   if (seen.has(e)) {
     return {
@@ -32,7 +37,7 @@ function serializeError(e, seen = new Set()) {
   if (e instanceof AggregateError) {
     serialized.errors = [...e.errors]
       .map((innerError) =>
-        innerError instanceof Error ? serializeError(innerError, seen) : null
+        innerError instanceof Error ? serializeError(innerError, seen) : null,
       )
       .filter(Boolean);
   }
@@ -41,4 +46,3 @@ function serializeError(e, seen = new Set()) {
   }
   return serialized;
 }
-module.exports = JsonReporter;

package/src/lib/JsonReporter.js.flow

@@ -9,8 +9,6 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {Writable} from 'stream';
 
 export type SerializedError = {
@@ -32,7 +30,7 @@ export type SerializedEvent<TEvent: {[string]: any, ...}> = TEvent extends {
     }
   : TEvent;
 
-class JsonReporter<TEvent: {[string]: any, ...}> {
+export default class JsonReporter<TEvent: {[string]: any, ...}> {
   _stream: Writable;
 
   constructor(stream: Writable) {
@@ -82,5 +80,3 @@ function serializeError(
   }
   return serialized;
 }
-
-module.exports = JsonReporter;

package/src/lib/RamBundleParser.js

@@ -1,12 +1,21 @@
 "use strict";
 
-const MAGIC_NUMBER = require("../shared/output/RamBundle/magic-number");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _magicNumber = _interopRequireDefault(
+  require("../shared/output/RamBundle/magic-number"),
+);
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const SIZEOF_UINT32 = 4;
 const HEADER_SIZE = 3;
 class RamBundleParser {
   constructor(buffer) {
     this._buffer = buffer;
-    if (this._readPosition(0) !== MAGIC_NUMBER) {
+    if (this._readPosition(0) !== _magicNumber.default) {
       throw new Error("File is not a RAM bundle file");
     }
     this._numModules = this._readPosition(1);
@@ -29,4 +38,4 @@ class RamBundleParser {
     return this._buffer.toString("utf8", start, end);
   }
 }
-module.exports = RamBundleParser;
+exports.default = RamBundleParser;

package/src/lib/RamBundleParser.js.flow

@@ -8,9 +8,7 @@
  * @flow strict
  */
 
-'use strict';
-
-const MAGIC_NUMBER = require('../shared/output/RamBundle/magic-number');
+import MAGIC_NUMBER from '../shared/output/RamBundle/magic-number';
 
 const SIZEOF_UINT32 = 4;
 const HEADER_SIZE = 3;
@@ -24,7 +22,7 @@ const HEADER_SIZE = 3;
  * getStartupCode(): returns the runtime and the startup code of the bundle.
  * getModule(): returns the code for the specified module.
  */
-class RamBundleParser {
+export default class RamBundleParser {
   _buffer: Buffer;
   _numModules: number;
   _startupCodeLength: number;
@@ -66,5 +64,3 @@ class RamBundleParser {
     return this._buffer.toString('utf8', start, end);
   }
 }
-
-module.exports = RamBundleParser;