metro 0.83.2 → 0.83.4

package/src/lib/contextModuleTemplates.js

@@ -6,28 +6,35 @@ 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,16 @@ 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 };
+  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 +21,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 +31,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

@@ -20,7 +20,11 @@ var _fs = _interopRequireDefault(require("fs"));
 var _metroCore = require("metro-core");
 var _serializeError = _interopRequireDefault(require("serialize-error"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function formatBundlingError(error) {
   if (error instanceof _metroCore.AmbiguousModuleResolutionError) {

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

@@ -12,7 +12,11 @@ var _CountingSet = _interopRequireDefault(require("./CountingSet"));
 var _countLines = _interopRequireDefault(require("./countLines"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function getAppendScripts(entryPoint, modules, options) {
   const output = [];

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

@@ -8,7 +8,11 @@ var _canonicalize = _interopRequireDefault(
   require("metro-core/private/canonicalize"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function getGraphId(
   entryFile,

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) {

package/src/lib/getPrependedScripts.js

@@ -11,31 +11,42 @@ var transformHelpers = _interopRequireWildcard(require("./transformHelpers"));
 var defaults = _interopRequireWildcard(
   require("metro-config/private/defaults/defaults"),
 );
-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,
+      };
 }
 async function getPrependedScripts(
   config,
@@ -76,6 +87,8 @@ async function getPrependedScripts(
       lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
       shallow: false,
     },
   );
@@ -84,15 +97,23 @@ async function getPrependedScripts(
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
       requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
+      unstable_forceFullRefreshPatterns:
+        config.resolver.unstable_forceFullRefreshPatterns,
     }),
     ...dependencies.values(),
   ];
 }
-function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
+function _getPrelude({
+  dev,
+  globalPrefix,
+  requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
+}) {
   const code = (0, _getPreludeCode.default)({
     isDev: dev,
     globalPrefix,
     requireCycleIgnorePatterns,
+    unstable_forceFullRefreshPatterns,
   });
   const name = "__prelude__";
   return {

package/src/lib/getPrependedScripts.js.flow

@@ -10,7 +10,7 @@
  */
 
 import type Bundler from '../Bundler';
-import type DeltaBundler, {Module} from '../DeltaBundler';
+import type {Module, default as DeltaBundler} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types';
 import type {ResolverInputOptions} from '../shared/types';
 import type {ConfigT} from 'metro-config';
@@ -27,7 +27,7 @@ export default async function getPrependedScripts(
   resolverOptions: ResolverInputOptions,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,
-): Promise<$ReadOnlyArray<Module<>>> {
+): Promise<ReadonlyArray<Module<>>> {
   // Get all the polyfills from the relevant option params (the
   // `getPolyfills()` method and the `polyfillModuleNames` variable).
   const polyfillModuleNames = config.serializer
@@ -64,6 +64,8 @@ export default async function getPrependedScripts(
       lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        config.resolver.unstable_incrementalResolution,
       shallow: false,
     },
   );
@@ -73,6 +75,8 @@ export default async function getPrependedScripts(
       dev: options.dev,
       globalPrefix: config.transformer.globalPrefix,
       requireCycleIgnorePatterns: config.resolver.requireCycleIgnorePatterns,
+      unstable_forceFullRefreshPatterns:
+        config.resolver.unstable_forceFullRefreshPatterns,
     }),
     ...dependencies.values(),
   ];
@@ -82,16 +86,19 @@ function _getPrelude({
   dev,
   globalPrefix,
   requireCycleIgnorePatterns,
+  unstable_forceFullRefreshPatterns,
 }: {
   dev: boolean,
   globalPrefix: string,
-  requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
+  requireCycleIgnorePatterns: ReadonlyArray<RegExp>,
+  unstable_forceFullRefreshPatterns: ReadonlyArray<RegExp>,
   ...
 }): Module<> {
   const code = getPreludeCode({
     isDev: dev,
     globalPrefix,
     requireCycleIgnorePatterns,
+    unstable_forceFullRefreshPatterns,
   });
   const name = '__prelude__';
 

package/src/lib/logToConsole.js

@@ -7,7 +7,11 @@ exports.default = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _util = _interopRequireDefault(require("util"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const groupStack = [];
 let collapsedGuardTimer;

package/src/lib/logToConsole.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-local
+ * @format
  */
 
 /* eslint-disable no-console */
@@ -18,7 +18,7 @@ import util from 'util';
 const groupStack = [];
 let collapsedGuardTimer;
 
-export default (terminal: Terminal, level: string, ...data: Array<mixed>) => {
+export default (terminal: Terminal, level: string, ...data: Array<unknown>) => {
   // $FlowFixMe[invalid-computed-prop]
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
   const color =

package/src/lib/parseBundleOptionsFromBundleRequestUrl.js

@@ -16,31 +16,42 @@ var _parseCustomTransformOptions = _interopRequireDefault(
 );
 var jscSafeUrl = _interopRequireWildcard(require("jsc-safe-url"));
 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 };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const debug = require("debug")(
   "Metro:Server:parseBundleOptionsFromBundleRequestUrl",

package/src/lib/parseCustomResolverOptions.js.flow

@@ -9,7 +9,7 @@
  * @oncall react_native
  */
 
-import type {CustomResolverOptions} from '../../../metro-resolver/src/types';
+import type {CustomResolverOptions} from 'metro-resolver';
 
 const PREFIX = 'resolver.';
 
@@ -18,7 +18,7 @@ export default function parseCustomResolverOptions(
 ): CustomResolverOptions {
   const customResolverOptions: {
     __proto__: null,
-    [string]: mixed,
+    [string]: unknown,
     ...
   } = Object.create(null);
 

package/src/lib/parseCustomTransformOptions.js.flow

@@ -18,7 +18,7 @@ export default function parseCustomTransformOptions(
 ): CustomTransformOptions {
   const customTransformOptions: {
     __proto__: null,
-    [string]: mixed,
+    [string]: unknown,
     ...
   } = Object.create(null);