metro 0.83.3 → 0.84.0

package/src/lib/JsonReporter.js

@@ -9,15 +9,17 @@ class JsonReporter {
     this._stream = stream;
   }
   update(event) {
+    let eventToWrite = event;
     if (event.error instanceof Error) {
       const { message, stack } = event.error;
-      event = Object.assign(event, {
+      eventToWrite = {
+        ...eventToWrite,
         error: serializeError(event.error),
         message,
         stack,
-      });
+      };
     }
-    this._stream.write(JSON.stringify(event) + "\n");
+    this._stream.write(JSON.stringify(eventToWrite) + "\n");
   }
 }
 exports.default = JsonReporter;

package/src/lib/JsonReporter.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
  */
@@ -14,23 +14,24 @@ import type {Writable} from 'stream';
 export type SerializedError = {
   message: string,
   stack: string,
-  errors?: $ReadOnlyArray<SerializedError>,
+  errors?: ReadonlyArray<SerializedError>,
   cause?: SerializedError,
   ...
 };
 
-export type SerializedEvent<TEvent: {[string]: any, ...}> = TEvent extends {
-  error: Error,
-  ...
-}
-  ? {
-      ...Omit<TEvent, 'error'>,
-      error: SerializedError,
-      ...
-    }
-  : TEvent;
+export type SerializedEvent<TEvent: {+[string]: unknown, ...}> =
+  TEvent extends {
+    error: Error,
+    ...
+  }
+    ? {
+        ...Omit<TEvent, 'error'>,
+        error: SerializedError,
+        ...
+      }
+    : TEvent;
 
-export default class JsonReporter<TEvent: {[string]: any, ...}> {
+export default class JsonReporter<TEvent: {+[string]: unknown, ...}> {
   _stream: Writable;
 
   constructor(stream: Writable) {
@@ -42,19 +43,20 @@ export default class JsonReporter<TEvent: {[string]: any, ...}> {
    * (Perhaps we should switch in favor of plain object?)
    */
   update(event: TEvent): void {
+    let eventToWrite = event;
     if (event.error instanceof Error) {
       const {message, stack} = event.error;
-      // $FlowFixMe[unsafe-object-assign]
-      event = Object.assign(event, {
+      eventToWrite = {
+        ...eventToWrite,
         error: serializeError(event.error),
         // TODO: Preexisting issue - this writes message, stack, etc. as
         // top-level siblings of event.error (which was serialized to {}), whereas it was presumably
         // intended to nest them _under_ error. Fix this in a breaking change.
         message,
         stack,
-      });
+      };
     }
-    this._stream.write(JSON.stringify(event) + '\n');
+    this._stream.write(JSON.stringify(eventToWrite) + '\n');
   }
 }
 

package/src/lib/RamBundleParser.js.flow

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict
+ * @format
  */
 
 import MAGIC_NUMBER from '../shared/output/RamBundle/magic-number';

package/src/lib/TerminalReporter.js

@@ -10,28 +10,32 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash.throttle"));
 var _metroCore = require("metro-core");
 var _path = _interopRequireDefault(require("path"));
-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 };
@@ -60,9 +64,6 @@ class TerminalReporter {
     },
     phase,
   ) {
-    if (isPrefetch) {
-      bundleType = "PREBUNDLE";
-    }
     const localPath = _path.default.relative(".", entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
     const bundleTypeColor =
@@ -81,7 +82,9 @@ class TerminalReporter {
           _chalk.default.dim(`(${transformedFileCount}/${totalFileCount})`)
         : "";
     return (
-      bundleTypeColor.inverse.bold(` ${bundleType.toUpperCase()} `) +
+      bundleTypeColor.inverse.bold(
+        ` ${isPrefetch === true ? "PREBUNDLE" : bundleType.toUpperCase()} `,
+      ) +
       _chalk.default.reset.dim(` ${_path.default.dirname(localPath)}/`) +
       _chalk.default.bold(_path.default.basename(localPath)) +
       " " +
@@ -261,8 +264,9 @@ class TerminalReporter {
         message = error.stack;
       }
     }
-    if (error.filename && !message.includes(error.filename)) {
-      message += ` [${error.filename}]`;
+    const filename = error.filename;
+    if (filename?.length && !message.includes(filename)) {
+      message += ` [${filename}]`;
     }
     if (error.snippet != null) {
       message += "\n" + error.snippet;

package/src/lib/TerminalReporter.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
  */
@@ -16,6 +16,7 @@ import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 import logToConsole from './logToConsole';
 import * as reporting from './reporting';
 import chalk from 'chalk';
+// $FlowFixMe[untyped-import] lodash.throttle
 import throttle from 'lodash.throttle';
 import {AmbiguousModuleResolutionError} from 'metro-core';
 import path from 'path';
@@ -41,7 +42,7 @@ export type TerminalReportableEvent =
   | {
       type: 'unstable_server_log',
       level: 'info' | 'warn' | 'error',
-      data: string | Array<mixed>,
+      data: string | Array<unknown>,
       ...
     }
   | {
@@ -56,11 +57,11 @@ export type TerminalReportableEvent =
 
 type BuildPhase = 'in_progress' | 'done' | 'failed';
 
-type SnippetError = ErrnoError &
-  interface {
-    filename?: string,
-    snippet?: string,
-  };
+interface SnippetError extends Error {
+  code?: string;
+  filename?: string;
+  snippet?: string;
+}
 
 const DARK_BLOCK_CHAR = '\u2593';
 const LIGHT_BLOCK_CHAR = '\u2591';
@@ -117,10 +118,6 @@ export default class TerminalReporter {
     }: BundleProgress,
     phase: BuildPhase,
   ): string {
-    if (isPrefetch) {
-      bundleType = 'PREBUNDLE';
-    }
-
     const localPath = path.relative('.', entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
     const bundleTypeColor =
@@ -140,7 +137,9 @@ export default class TerminalReporter {
         : '';
 
     return (
-      bundleTypeColor.inverse.bold(` ${bundleType.toUpperCase()} `) +
+      bundleTypeColor.inverse.bold(
+        ` ${isPrefetch === true ? 'PREBUNDLE' : bundleType.toUpperCase()} `,
+      ) +
       chalk.reset.dim(` ${path.dirname(localPath)}/`) +
       chalk.bold(path.basename(localPath)) +
       ' ' +
@@ -273,6 +272,7 @@ export default class TerminalReporter {
       case 'dep_graph_loading':
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
         // eslint-disable-next-line import/no-commonjs
+        // $FlowFixMe[untyped-import] package.json
         const version = 'v' + require('../../package.json').version;
         this.terminal.log(
           color.bold(
@@ -331,9 +331,9 @@ export default class TerminalReporter {
       }
     }
 
-    if (error.filename && !message.includes(error.filename)) {
-      // $FlowFixMe[incompatible-type]
-      message += ` [${error.filename}]`;
+    const filename = error.filename;
+    if (filename?.length && !message.includes(filename)) {
+      message += ` [${filename}]`;
     }
 
     if (error.snippet != null) {

package/src/lib/contextModule.js.flow

@@ -18,7 +18,7 @@ import crypto from 'crypto';
 import nullthrows from 'nullthrows';
 import path from 'path';
 
-export type RequireContext = $ReadOnly<{
+export type RequireContext = Readonly<{
   /* Should search for files recursively. Optional, default `true` when `require.context` is used */
   recursive: boolean,
   /* Filename filter pattern for use in `require.context`. Optional, default `.*` (any file) when `require.context` is used */

package/src/lib/contextModuleTemplates.js

@@ -6,28 +6,32 @@ Object.defineProperty(exports, "__esModule", {
 exports.getContextModuleTemplate = getContextModuleTemplate;
 var os = _interopRequireWildcard(require("os"));
 var path = _interopRequireWildcard(require("path"));
-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 createFileMap(modulePath, files, processModule) {
   let mapString = "\n";

package/src/lib/countLines.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.default = void 0;
+exports.default = countLines;
 const newline = /\r\n?|\n|\u2028|\u2029/g;
-const countLines = (string) => (string.match(newline) || []).length + 1;
-var _default = (exports.default = countLines);
+function countLines(string) {
+  return (string.match(newline) || []).length + 1;
+}

package/src/lib/countLines.js.flow

@@ -11,7 +11,6 @@
 
 const newline = /\r\n?|\n|\u2028|\u2029/g;
 
-const countLines = (string: string): number =>
-  (string.match(newline) || []).length + 1;
-
-export default countLines;
+export default function countLines(string: string): number {
+  return (string.match(newline) || []).length + 1;
+}

package/src/lib/createWebsocketServer.js

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = createWebsocketServer;
+var _timers = require("timers");
 var _ws = _interopRequireDefault(require("ws"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
+const KEEP_ALIVE_INTERVAL_MS = 20000;
 function createWebsocketServer({ websocketServer }) {
   const wss = new _ws.default.Server({
     noServer: true,
@@ -15,9 +17,9 @@ function createWebsocketServer({ websocketServer }) {
   wss.on("connection", async (ws, req) => {
     let connected = true;
     const url = req.url;
-    const sendFn = (...args) => {
+    const sendFn = (data) => {
       if (connected) {
-        ws.send(...args);
+        ws.send(data);
       }
     };
     const client = await websocketServer.onClientConnect(url, sendFn);
@@ -25,10 +27,15 @@ function createWebsocketServer({ websocketServer }) {
       ws.close();
       return;
     }
+    const keepAliveInterval = (0, _timers.setInterval)(
+      () => ws.ping(),
+      KEEP_ALIVE_INTERVAL_MS,
+    ).unref();
     ws.on("error", (e) => {
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
     ws.on("close", () => {
+      (0, _timers.clearInterval)(keepAliveInterval);
       websocketServer.onClientDisconnect &&
         websocketServer.onClientDisconnect(client);
       connected = false;

package/src/lib/createWebsocketServer.js.flow

@@ -4,11 +4,12 @@
  * 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
  * @format
  * @oncall react_native
  */
 
+import {clearInterval, setInterval} from 'timers';
 import ws from 'ws';
 
 type WebsocketServiceInterface<T> = interface {
@@ -16,13 +17,13 @@ type WebsocketServiceInterface<T> = interface {
     url: string,
     sendFn: (data: string) => void,
   ) => Promise<?T>,
-  +onClientDisconnect?: (client: T) => mixed,
-  +onClientError?: (client: T, e: ErrorEvent) => mixed,
+  +onClientDisconnect?: (client: T) => unknown,
+  +onClientError?: (client: T, e: Error) => unknown,
   +onClientMessage?: (
     client: T,
     message: string | Buffer | ArrayBuffer | Array<Buffer>,
     sendFn: (data: string) => void,
-  ) => mixed,
+  ) => unknown,
 };
 
 type HMROptions<TClient> = {
@@ -30,6 +31,8 @@ type HMROptions<TClient> = {
   ...
 };
 
+const KEEP_ALIVE_INTERVAL_MS = 20000;
+
 /**
  * Returns a WebSocketServer to be attached to an existing HTTP instance. It forwards
  * the received events on the given "websocketServer" parameter. It must be an
@@ -41,7 +44,7 @@ type HMROptions<TClient> = {
  *   - onClientDisconnect
  */
 
-export default function createWebsocketServer<TClient: Object>({
+export default function createWebsocketServer<TClient>({
   websocketServer,
 }: HMROptions<TClient>): ws.Server {
   const wss = new ws.Server({
@@ -52,10 +55,9 @@ export default function createWebsocketServer<TClient: Object>({
     let connected = true;
     const url = req.url;
 
-    const sendFn = (...args: Array<string>) => {
+    const sendFn = (data: string) => {
       if (connected) {
-        // $FlowFixMe[incompatible-type]
-        ws.send(...args);
+        ws.send(data);
       }
     };
 
@@ -66,12 +68,17 @@ export default function createWebsocketServer<TClient: Object>({
       return;
     }
 
+    const keepAliveInterval = setInterval(
+      () => ws.ping(),
+      KEEP_ALIVE_INTERVAL_MS,
+    ).unref();
+
     ws.on('error', e => {
-      // $FlowFixMe[incompatible-type]
       websocketServer.onClientError && websocketServer.onClientError(client, e);
     });
 
     ws.on('close', () => {
+      clearInterval(keepAliveInterval);
       websocketServer.onClientDisconnect &&
         websocketServer.onClientDisconnect(client);
       connected = false;

package/src/lib/debounceAsyncQueue.js.flow

@@ -33,7 +33,7 @@ export default function debounceAsyncQueue<T>(
   }
 
   return () =>
-    new Promise((resolve: T => void, reject: mixed => void) => {
+    new Promise((resolve: T => void, reject: unknown => void) => {
       callbacks.push(resolve);
 
       if (!executing) {

package/src/lib/formatBundlingError.js.flow

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 import type {FormattedError} from 'metro-runtime/src/modules/types';

package/src/lib/getAppendScripts.js.flow

@@ -18,13 +18,13 @@ import CountingSet from './CountingSet';
 import countLines from './countLines';
 import nullthrows from 'nullthrows';
 
-type Options<T: number | string> = $ReadOnly<{
+type Options<T: number | string> = Readonly<{
   asyncRequireModulePath: string,
   createModuleId: string => T,
   getRunModuleStatement: (moduleId: T, globalPrefix: string) => string,
   globalPrefix: string,
   inlineSourceMap: ?boolean,
-  runBeforeMainModule: $ReadOnlyArray<string>,
+  runBeforeMainModule: ReadonlyArray<string>,
   runModule: boolean,
   shouldAddToIgnoreList: (Module<>) => boolean,
   sourceMapUrl: ?string,
@@ -35,9 +35,9 @@ type Options<T: number | string> = $ReadOnly<{
 
 export default function getAppendScripts<T: number | string>(
   entryPoint: string,
-  modules: $ReadOnlyArray<Module<>>,
+  modules: ReadonlyArray<Module<>>,
   options: Options<T>,
-): $ReadOnlyArray<Module<>> {
+): ReadonlyArray<Module<>> {
   const output: Array<Module<>> = [];
 
   if (options.runModule) {

package/src/lib/getGraphId.js.flow

@@ -24,7 +24,7 @@ export default function getGraphId(
     lazy,
     unstable_allowRequireContext,
     resolverOptions,
-  }: $ReadOnly<{
+  }: Readonly<{
     shallow: boolean,
     lazy: boolean,
     unstable_allowRequireContext: boolean,

package/src/lib/getPreludeCode.js

@@ -9,6 +9,7 @@ function getPreludeCode({
   isDev,
   globalPrefix,
   requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
 }) {
   const vars = [
     "__BUNDLE_START_TIME__=globalThis.nativePerformanceNow?nativePerformanceNow():Date.now()",
@@ -21,6 +22,9 @@ function getPreludeCode({
     vars.push(
       `${globalPrefix}__requireCycleIgnorePatterns=[${requireCycleIgnorePatterns.map((regex) => regex.toString()).join(",")}]`,
     );
+    vars.push(
+      `${globalPrefix}__unstable_forceFullRefreshPatterns=[${unstable_forceFullRefreshPatterns.map((regex) => regex.toString()).join(",")}]`,
+    );
   }
   return `var ${vars.join(",")};${processEnv(isDev ? "development" : "production")}`;
 }

package/src/lib/getPreludeCode.js.flow

@@ -14,11 +14,13 @@ export default function getPreludeCode({
   isDev,
   globalPrefix,
   requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
 }: {
-  +extraVars?: {[string]: mixed, ...},
+  +extraVars?: {[string]: unknown, ...},
   +isDev: boolean,
   +globalPrefix: string,
-  +requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
+  +requireCycleIgnorePatterns: ReadonlyArray<RegExp>,
+  +unstable_forceFullRefreshPatterns: ReadonlyArray<RegExp>,
 }): string {
   const vars = [
     // Ensure these variable names match the ones referenced in metro-runtime
@@ -38,6 +40,11 @@ export default function getPreludeCode({
         .map(regex => regex.toString())
         .join(',')}]`,
     );
+    vars.push(
+      `${globalPrefix}__unstable_forceFullRefreshPatterns=[${unstable_forceFullRefreshPatterns
+        .map(regex => regex.toString())
+        .join(',')}]`,
+    );
   }
 
   return `var ${vars.join(',')};${processEnv(
@@ -47,7 +54,7 @@ export default function getPreludeCode({
 
 const excluded = new Set(['__BUNDLE_START_TIME__', '__DEV__', 'process']);
 
-function formatExtraVars(extraVars: ?{[string]: mixed, ...}): Array<string> {
+function formatExtraVars(extraVars: ?{[string]: unknown, ...}): Array<string> {
   const assignments = [];
 
   for (const key in extraVars) {