metro 0.83.2 → 0.83.4

package/src/commands/build.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
@@ -12,7 +12,7 @@
 import type {RunBuildOptions} from '../index';
 import type {CustomTransformOptions} from 'metro-babel-transformer';
 import type {CustomResolverOptions} from 'metro-resolver';
-import type {ModuleObject} from 'yargs';
+import type {CommandModule} from 'yargs';
 import typeof Yargs from 'yargs';
 
 import {makeAsyncCommand} from '../cli-utils';
@@ -24,7 +24,9 @@ import {Terminal} from 'metro-core';
 const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
-type Args = $ReadOnly<{
+type Args = Readonly<{
+  _: unknown,
+  $0: unknown,
   config?: string,
   dev?: boolean,
   entry: string,
@@ -34,18 +36,16 @@ type Args = $ReadOnly<{
   out: string,
   outputType?: string,
   platform?: string,
-  projectRoots?: $ReadOnlyArray<string>,
+  projectRoots?: ReadonlyArray<string>,
   resetCache?: boolean,
   sourceMap?: boolean,
   sourceMapUrl?: string,
   transformOption: CustomTransformOptions,
   resolverOption: CustomResolverOptions,
+  ...
 }>;
 
-export default (): {
-  ...ModuleObject,
-  handler: Function,
-} => ({
+export default (): CommandModule => ({
   command: 'build <entry>',
   desc: 'Generates a JavaScript bundle containing the specified entrypoint and its descendants',
 
@@ -76,7 +76,7 @@ export default (): {
       type: 'string',
       array: true,
       alias: 'transformer-option',
-      coerce: (parseKeyValueParamArray: $FlowFixMe),
+      coerce: parseKeyValueParamArray as $FlowFixMe,
       describe:
         'Custom transform options of the form key=value. URL-encoded. May be specified multiple times.',
     });
@@ -84,7 +84,7 @@ export default (): {
     yargs.option('resolver-option', {
       type: 'string',
       array: true,
-      coerce: (parseKeyValueParamArray: $FlowFixMe),
+      coerce: parseKeyValueParamArray as $FlowFixMe,
       describe:
         'Custom resolver options of the form key=value. URL-encoded. May be specified multiple times.',
     });
@@ -94,6 +94,7 @@ export default (): {
   },
 
   handler: makeAsyncCommand(async (argv: Args) => {
+    // $FlowFixMe[incompatible-type] argv has extra props.
     const config = await loadConfig(argv);
     const options: RunBuildOptions = {
       entry: argv.entry,

package/src/commands/dependencies.js

@@ -11,7 +11,11 @@ var _metroConfig = require("metro-config");
 var _path = _interopRequireDefault(require("path"));
 var _util = require("util");
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 async function dependencies(args, config) {
   const rootModuleAbsolutePath = args.entryFile;

package/src/commands/dependencies.js.flow

@@ -4,13 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
 import type {ConfigT} from 'metro-config';
-import type {ModuleObject} from 'yargs';
+import type {CommandModule} from 'yargs';
 import typeof Yargs from 'yargs';
 
 import {makeAsyncCommand} from '../cli-utils';
@@ -20,7 +20,9 @@ import {loadConfig} from 'metro-config';
 import path from 'path';
 import {promisify} from 'util';
 
-type Args = $ReadOnly<{
+type Args = Readonly<{
+  _: unknown,
+  $0: unknown,
   entryFile: string,
   output?: string,
   platform?: string,
@@ -28,6 +30,7 @@ type Args = $ReadOnly<{
   maxWorkers?: number,
   dev: boolean,
   verbose: boolean,
+  ...
 }>;
 
 async function dependencies(args: Args, config: ConfigT) {
@@ -82,7 +85,7 @@ async function dependencies(args: Args, config: ConfigT) {
     : Promise.resolve();
 }
 
-export default (): {...ModuleObject, handler: Function} => ({
+export default (): CommandModule => ({
   command: 'get-dependencies [entryFile]',
   desc: 'List all dependencies that will be bundled for a given entry point',
   builder: (yargs: Yargs) => {
@@ -123,6 +126,7 @@ export default (): {...ModuleObject, handler: Function} => ({
     });
   },
   handler: makeAsyncCommand(async (argv: Args) => {
+    // $FlowFixMe[incompatible-type] argv has extra props.
     const config = await loadConfig(argv);
     await dependencies(argv, config);
   }),

package/src/commands/serve.js

@@ -80,6 +80,8 @@ var _default = () => ({
       const config = await (0, _metroConfig.loadConfig)(argv);
       const MetroApi = require("../index");
       const {
+        _,
+        $0: _0,
         config: _config,
         hmrEnabled: _hmrEnabled,
         maxWorkers: _maxWorkers,

package/src/commands/serve.js.flow

@@ -4,36 +4,37 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
-import type {ModuleObject} from 'yargs';
+import type {ServerOptions as HttpsServerOptions} from 'https';
+import type {CommandModule} from 'yargs';
 import typeof Yargs from 'yargs';
 
 import {makeAsyncCommand, watchFile} from '../cli-utils';
 import {loadConfig, resolveConfig} from 'metro-config';
 import {promisify} from 'util';
 
-type Args = $ReadOnly<{
-  projectRoots?: $ReadOnlyArray<string>,
+type Args = Readonly<{
+  _: unknown,
+  $0: unknown,
+  projectRoots?: ReadonlyArray<string>,
   host: string,
   port: number,
   maxWorkers?: number,
   secure?: boolean,
   secureKey?: string,
   secureCert?: string,
-  secureServerOptions?: string,
+  secureServerOptions?: HttpsServerOptions,
   hmrEnabled?: boolean,
   config?: string,
   resetCache?: boolean,
+  ...
 }>;
 
-export default (): {
-  ...ModuleObject,
-  handler: Function,
-} => ({
+export default (): CommandModule => ({
   command: 'serve',
   aliases: ['start'],
   desc: 'Starts Metro on the given port, building bundles on the fly',
@@ -91,6 +92,7 @@ export default (): {
         await promisify(server.close).call(server);
       }
 
+      // $FlowFixMe[incompatible-type] argv has extra props.
       const config = await loadConfig(argv);
 
       // Inline require() to avoid circular dependency with ../index
@@ -98,6 +100,8 @@ export default (): {
       const MetroApi = require('../index');
 
       const {
+        _,
+        $0: _0,
         config: _config,
         hmrEnabled: _hmrEnabled,
         maxWorkers: _maxWorkers,
@@ -108,6 +112,7 @@ export default (): {
       } = argv;
       ({httpServer: server} = await MetroApi.runServer(
         config,
+        // $FlowFixMe[incompatible-exact] argv has extra props.
         runServerOptions,
       ));
 

package/src/index.flow.js

@@ -71,31 +71,42 @@ var _metroConfig = require("metro-config");
 var _metroCore = require("metro-core");
 var _net = _interopRequireDefault(require("net"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  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]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = {
+        __proto__: null,
+        default: e,
+      };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const DEFAULTS = _Server.default.DEFAULT_BUNDLE_OPTIONS;
 async function getConfig(config) {
@@ -190,7 +201,7 @@ const runServer = async (
     secureKey,
     unstable_extraMiddleware,
     waitForBundler = false,
-    websocketEndpoints = {},
+    websocketEndpoints: userWebsocketEndpoints = {},
     watch,
   } = {},
 ) => {
@@ -219,7 +230,7 @@ const runServer = async (
   }
   serverApp.use(middleware);
   let httpServer;
-  if (secure || secureServerOptions != null) {
+  if (secure === true || secureServerOptions != null) {
     let options = secureServerOptions;
     if (typeof secureKey === "string" && typeof secureCert === "string") {
       options = {
@@ -247,8 +258,8 @@ const runServer = async (
         port,
         family,
       });
-      websocketEndpoints = {
-        ...websocketEndpoints,
+      const websocketEndpoints = {
+        ...userWebsocketEndpoints,
         "/hot": (0, _createWebsocketServer.default)({
           websocketServer: new _HmrServer.default(
             metroServer.getBundler(),
@@ -349,7 +360,7 @@ const runBuild = async (
     if (onComplete) {
       onComplete();
     }
-    if (out || bundleOut) {
+    if (out != null || bundleOut != null) {
       const bundleOutput =
         bundleOut ?? (0, _nullthrows.default)(out).replace(/(\.js)?$/, ".js");
       const sourcemapOutput =

package/src/index.flow.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
@@ -15,7 +15,10 @@ import type {ServerOptions} from './Server';
 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';
+import type {
+  Server as HttpsServer,
+  ServerOptions as HttpsServerOptions,
+} from 'https';
 import type {TransformProfile} from 'metro-babel-transformer';
 import type {
   ConfigT,
@@ -25,6 +28,7 @@ import type {
 } from 'metro-config';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
+import type {Server as WebSocketServer} from 'ws';
 import typeof Yargs from 'yargs';
 
 import makeBuildCommand from './commands/build';
@@ -65,21 +69,21 @@ export type RunMetroOptions = {
   waitForBundler?: boolean,
 };
 
-export type RunServerOptions = $ReadOnly<{
+export type RunServerOptions = Readonly<{
   hasReducedPerformance?: boolean,
   host?: string,
   onError?: (Error & {code?: string}) => void,
   onReady?: (server: HttpServer | HttpsServer) => void,
   onClose?: () => void,
-  secureServerOptions?: Object,
+  secureServerOptions?: HttpsServerOptions,
   secure?: boolean, // deprecated
   secureCert?: string, // deprecated
   secureKey?: string, // deprecated
-  unstable_extraMiddleware?: $ReadOnlyArray<HandleFunction>,
+  unstable_extraMiddleware?: ReadonlyArray<HandleFunction>,
   waitForBundler?: boolean,
   watch?: boolean,
-  websocketEndpoints?: $ReadOnly<{
-    [path: string]: ws$WebSocketServer,
+  websocketEndpoints?: Readonly<{
+    [path: string]: WebSocketServer,
   }>,
 }>;
 
@@ -88,7 +92,7 @@ export type RunServerResult = {
 };
 
 type BuildGraphOptions = {
-  entries: $ReadOnlyArray<string>,
+  entries: ReadonlyArray<string>,
   customTransformOptions?: CustomTransformOptions,
   dev?: boolean,
   minify?: boolean,
@@ -108,7 +112,7 @@ export type RunBuildOptions = {
   onComplete?: () => void,
   onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
   minify?: boolean,
-  output?: $ReadOnly<{
+  output?: Readonly<{
     build: (
       MetroServer,
       RequestOptions,
@@ -116,7 +120,7 @@ export type RunBuildOptions = {
     ) => Promise<{
       code: string,
       map: string,
-      assets?: $ReadOnlyArray<AssetData>,
+      assets?: ReadonlyArray<AssetData>,
       ...
     }>,
     save: (
@@ -127,7 +131,7 @@ export type RunBuildOptions = {
       },
       OutputOptions,
       (logMessage: string) => void,
-    ) => Promise<mixed>,
+    ) => Promise<unknown>,
     ...
   }>,
   platform?: string,
@@ -141,12 +145,13 @@ export type RunBuildOptions = {
 export type RunBuildResult = {
   code: string,
   map: string,
-  assets?: $ReadOnlyArray<AssetData>,
+  assets?: ReadonlyArray<AssetData>,
   ...
 };
 
-type BuildCommandOptions = {} | null;
-type ServeCommandOptions = {} | null;
+type BuildCommandOptions = Readonly<{[string]: unknown}> | null;
+type ServeCommandOptions = Readonly<{[string]: unknown}> | null;
+type DependenciesCommandOptions = Readonly<{[string]: unknown}> | null;
 
 export {Terminal, JsonReporter, TerminalReporter};
 
@@ -263,7 +268,7 @@ export const runServer = async (
     secureKey, // deprecated
     unstable_extraMiddleware,
     waitForBundler = false,
-    websocketEndpoints = {},
+    websocketEndpoints: userWebsocketEndpoints = {},
     watch,
   }: RunServerOptions = {},
 ): Promise<RunServerResult> => {
@@ -302,7 +307,7 @@ export const runServer = async (
 
   let httpServer;
 
-  if (secure || secureServerOptions != null) {
+  if (secure === true || secureServerOptions != null) {
     let options = secureServerOptions;
     if (typeof secureKey === 'string' && typeof secureCert === 'string') {
       options = {
@@ -333,8 +338,8 @@ export const runServer = async (
         family,
       });
 
-      websocketEndpoints = {
-        ...websocketEndpoints,
+      const websocketEndpoints = {
+        ...userWebsocketEndpoints,
         '/hot': createWebsocketServer({
           websocketServer: new MetroHmrServer(
             metroServer.getBundler(),
@@ -441,7 +446,7 @@ export const runBuild = async (
       onComplete();
     }
 
-    if (out || bundleOut) {
+    if (out != null || bundleOut != null) {
       const bundleOutput =
         bundleOut ?? nullthrows(out).replace(/(\.js)?$/, '.js');
 
@@ -510,7 +515,7 @@ export const buildGraph = async function (
 type AttachMetroCLIOptions = {
   build?: BuildCommandOptions,
   serve?: ServeCommandOptions,
-  dependencies?: any,
+  dependencies?: DependenciesCommandOptions,
   ...
 };
 

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

@@ -11,7 +11,7 @@
 'use strict';
 
 module.exports = {
-  registerAsset(data: mixed): mixed {
+  registerAsset(data: unknown): unknown {
     return data;
   },
 };

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

@@ -20,4 +20,4 @@ const calcSum = (value: string) => {
   return error;
 };
 
-module.exports = (calcSum('anything'): Error);
+module.exports = calcSum('anything') as Error;

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

@@ -2,6 +2,10 @@
 
 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/cannot-resolve-import.js.flow

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import DoesNotExist from './does-not-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js.flow

@@ -26,4 +26,4 @@ import {
   // $FlowExpectedError[cannot-resolve-module]
 } from './does-not\'"-exist';
 
-global.x = (aaaaaaaaaa: DoesNotExistT);
+global.x = aaaaaaaaaa as DoesNotExistT;

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

@@ -26,4 +26,4 @@ import {
   // $FlowExpectedError[cannot-resolve-module]
 } from './does-not-exist';
 
-global.x = (aaaaaaaaaa: DoesNotExistT);
+global.x = aaaaaaaaaa as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js.flow

@@ -14,4 +14,4 @@ import type DoesNotExistT from './foo';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./foo' /* ./foo */);
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./does-not-exist');
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js.flow

@@ -16,4 +16,4 @@ import type DoesNotExistT from './does-not\'"-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import {DoesNotExist} from './does-not\'"-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -2,6 +2,10 @@
 
 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.flow

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import DoesNotExist from './does-not-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./does-not-exist');
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -30,30 +30,41 @@ var _exportPrimitiveDefault = _interopRequireWildcard(
 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;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  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]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = {
+        __proto__: null,
+        default: e,
+      };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 const extraData = (exports.extraData = {
   foo: _exportNull.foo,

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

@@ -29,7 +29,7 @@ export const extraData = {
   importStar,
   myDefault,
   myFoo,
-  myFunction: (myFunction(): string),
+  myFunction: myFunction() as string,
   primitiveDefault,
   primitiveFoo,
 };
@@ -37,7 +37,7 @@ export const extraData = {
 export const asyncImportCJS = import('./export-5');
 export const asyncImportESM = import('./export-6');
 
-export const asyncImportMaybeSyncCJS: mixed =
+export const asyncImportMaybeSyncCJS: unknown =
   require.unstable_importMaybeSync('./export-7');
-export const asyncImportMaybeSyncESM: mixed =
+export const asyncImportMaybeSyncESM: unknown =
   require.unstable_importMaybeSync('./export-8');