metro 0.83.0 → 0.83.2

package/src/DeltaBundler.js.flow

@@ -9,8 +9,6 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {
   DeltaResult,
   Graph,
@@ -18,10 +16,10 @@ import type {
   MixedOutput,
   Options,
   ReadOnlyGraph,
-} from './DeltaBundler/types.flow';
+} from './DeltaBundler/types';
 import type EventEmitter from 'events';
 
-const DeltaCalculator = require('./DeltaBundler/DeltaCalculator');
+import DeltaCalculator from './DeltaBundler/DeltaCalculator';
 
 export type {
   DeltaResult,
@@ -34,7 +32,7 @@ export type {
   TransformResult,
   TransformResultDependency,
   TransformResultWithSource,
-} from './DeltaBundler/types.flow';
+} from './DeltaBundler/types';
 
 /**
  * `DeltaBundler` uses the `DeltaTransformer` to build bundle deltas. This
@@ -42,7 +40,7 @@ export type {
  * concurrent clients requesting their own deltas. This is done through the
  * `clientId` param (which maps a client to a specific delta transformer).
  */
-class DeltaBundler<T = MixedOutput> {
+export default class DeltaBundler<T = MixedOutput> {
   _changeEventSource: EventEmitter;
   _deltaCalculators: Map<Graph<T>, DeltaCalculator<T>> = new Map();
 
@@ -140,5 +138,3 @@ class DeltaBundler<T = MixedOutput> {
     this._deltaCalculators.delete(graph);
   }
 }
-
-module.exports = DeltaBundler;

package/src/HmrServer.js

@@ -1,19 +1,64 @@
 "use strict";
 
-const hmrJSBundle = require("./DeltaBundler/Serializers/hmrJSBundle");
-const GraphNotFoundError = require("./IncrementalBundler/GraphNotFoundError");
-const RevisionNotFoundError = require("./IncrementalBundler/RevisionNotFoundError");
-const debounceAsyncQueue = require("./lib/debounceAsyncQueue");
-const formatBundlingError = require("./lib/formatBundlingError");
-const getGraphId = require("./lib/getGraphId");
-const parseOptionsFromUrl = require("./lib/parseOptionsFromUrl");
-const splitBundleOptions = require("./lib/splitBundleOptions");
-const transformHelpers = require("./lib/transformHelpers");
-const {
-  Logger: { createActionStartEntry, createActionEndEntry, log },
-} = require("metro-core");
-const nullthrows = require("nullthrows");
-const url = require("url");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _hmrJSBundle = _interopRequireDefault(
+  require("./DeltaBundler/Serializers/hmrJSBundle"),
+);
+var _GraphNotFoundError = _interopRequireDefault(
+  require("./IncrementalBundler/GraphNotFoundError"),
+);
+var _RevisionNotFoundError = _interopRequireDefault(
+  require("./IncrementalBundler/RevisionNotFoundError"),
+);
+var _debounceAsyncQueue = _interopRequireDefault(
+  require("./lib/debounceAsyncQueue"),
+);
+var _formatBundlingError = _interopRequireDefault(
+  require("./lib/formatBundlingError"),
+);
+var _getGraphId = _interopRequireDefault(require("./lib/getGraphId"));
+var _parseBundleOptionsFromBundleRequestUrl = _interopRequireDefault(
+  require("./lib/parseBundleOptionsFromBundleRequestUrl"),
+);
+var _splitBundleOptions = _interopRequireDefault(
+  require("./lib/splitBundleOptions"),
+);
+var transformHelpers = _interopRequireWildcard(
+  require("./lib/transformHelpers"),
+);
+var _metroCore = require("metro-core");
+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]);
+    }
+  return ((n.default = e), t && t.set(e, n), n);
+}
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
+const debug = require("debug")("Metro:HMR");
+const { createActionStartEntry, createActionEndEntry, log } = _metroCore.Logger;
 function send(sendFns, message) {
   const strMessage = JSON.stringify(message);
   sendFns.forEach((sendFn) => sendFn(strMessage));
@@ -33,18 +78,20 @@ class HmrServer {
     };
   };
   async _registerEntryPoint(client, requestUrl, sendFn) {
+    debug("Registering entry point: %s", requestUrl);
     requestUrl = this._config.server.rewriteRequestUrl(requestUrl);
-    const clientUrl = nullthrows(url.parse(requestUrl, true));
-    const { bundleType: _bundleType, ...options } = parseOptionsFromUrl(
+    debug("Rewritten as: %s", requestUrl);
+    const { bundleType: _bundleType, ...options } = (0,
+    _parseBundleOptionsFromBundleRequestUrl.default)(
       requestUrl,
-      new Set(this._config.resolver.platforms)
+      new Set(this._config.resolver.platforms),
     );
-    const { entryFile, resolverOptions, transformOptions, graphOptions } =
-      splitBundleOptions(options);
+    const { entryFile, resolverOptions, transformOptions, graphOptions } = (0,
+    _splitBundleOptions.default)(options);
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
-      resolverOptions
+      resolverOptions,
     );
     const resolvedEntryFilePath = resolutionFn(
       (this._config.server.unstable_serverRoot ?? this._config.projectRoot) +
@@ -57,20 +104,26 @@ class HmrServer {
           isESMImport: false,
           locs: [],
         },
-      }
+      },
     ).filePath;
-    const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
-      resolverOptions,
-      shallow: graphOptions.shallow,
-      lazy: graphOptions.lazy,
-      unstable_allowRequireContext:
-        this._config.transformer.unstable_allowRequireContext,
-    });
+    const graphId = (0, _getGraphId.default)(
+      resolvedEntryFilePath,
+      transformOptions,
+      {
+        resolverOptions,
+        shallow: graphOptions.shallow,
+        lazy: graphOptions.lazy,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
+      },
+    );
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
     if (!revPromise) {
       send([sendFn], {
         type: "error",
-        body: formatBundlingError(new GraphNotFoundError(graphId)),
+        body: (0, _formatBundlingError.default)(
+          new _GraphNotFoundError.default(graphId),
+        ),
       });
       return;
     }
@@ -80,41 +133,36 @@ class HmrServer {
     if (clientGroup != null) {
       clientGroup.clients.add(client);
     } else {
+      const clientUrl = new URL(requestUrl);
       clientUrl.protocol = "http";
-      const {
-        dev,
-        minify,
-        runModule,
-        bundleEntry: _bundleEntry,
-        ...query
-      } = clientUrl.query || {};
-      clientUrl.query = {
-        ...query,
-        dev: dev || "true",
-        minify: minify || "false",
-        modulesOnly: "true",
-        runModule: runModule || "false",
-        shallow: "true",
-      };
-      clientUrl.search = "";
+      const clientQuery = clientUrl.searchParams;
+      clientQuery.delete("bundleEntry");
+      clientQuery.set("dev", clientQuery.get("dev") || "true");
+      clientQuery.set("minify", clientQuery.get("minify") || "false");
+      clientQuery.set("modulesOnly", "true");
+      clientQuery.set("runModule", clientQuery.get("runModule") || "false");
+      clientQuery.set("shallow", "true");
       clientGroup = {
         clients: new Set([client]),
-        clientUrl,
+        clientUrl: new URL(clientUrl),
         revisionId: id,
         graphOptions,
         unlisten: () => unlisten(),
       };
       this._clientGroups.set(id, clientGroup);
       let latestEventArgs = [];
-      const debounceCallHandleFileChange = debounceAsyncQueue(async () => {
-        await this._handleFileChange(
-          nullthrows(clientGroup),
-          {
-            isInitialUpdate: false,
-          },
-          ...latestEventArgs
-        );
-      }, 50);
+      const debounceCallHandleFileChange = (0, _debounceAsyncQueue.default)(
+        async () => {
+          await this._handleFileChange(
+            (0, _nullthrows.default)(clientGroup),
+            {
+              isInitialUpdate: false,
+            },
+            ...latestEventArgs,
+          );
+        },
+        50,
+      );
       const unlisten = this._bundler
         .getDeltaBundler()
         .listen(graph, async (...args) => {
@@ -136,7 +184,7 @@ class HmrServer {
     } catch (error) {
       send([sendFn], {
         type: "error",
-        body: formatBundlingError(error),
+        body: (0, _formatBundlingError.default)(error),
       });
       return Promise.resolve();
     }
@@ -145,8 +193,8 @@ class HmrServer {
         case "register-entrypoints":
           return Promise.all(
             data.entryPoints.map((entryPoint) =>
-              this._registerEntryPoint(client, entryPoint, sendFn)
-            )
+              this._registerEntryPoint(client, entryPoint, sendFn),
+            ),
           );
         case "log":
           if (this._config.server.forwardClientLogs) {
@@ -194,14 +242,14 @@ class HmrServer {
       logger.point("hmrPrepareAndSendMessage_start");
     }
     const optedIntoHMR = [...group.clients].some(
-      (client) => client.optedIntoHMR
+      (client) => client.optedIntoHMR,
     );
     const processingHmrChange = log(
       createActionStartEntry({
         action_name: optedIntoHMR
           ? "Processing HMR change"
           : "Processing HMR change (no client opt-in)",
-      })
+      }),
     );
     const sendFns = [...group.clients].map((client) => client.sendFn);
     send(sendFns, {
@@ -232,29 +280,29 @@ class HmrServer {
       if (!revPromise) {
         return {
           type: "error",
-          body: formatBundlingError(
-            new RevisionNotFoundError(group.revisionId)
+          body: (0, _formatBundlingError.default)(
+            new _RevisionNotFoundError.default(group.revisionId),
           ),
         };
       }
       logger?.point("updateGraph_start");
       const { revision, delta } = await this._bundler.updateGraph(
         await revPromise,
-        false
+        false,
       );
       logger?.point("updateGraph_end");
       this._clientGroups.delete(group.revisionId);
       group.revisionId = revision.id;
       for (const client of group.clients) {
         client.revisionIds = client.revisionIds.filter(
-          (revisionId) => revisionId !== group.revisionId
+          (revisionId) => revisionId !== group.revisionId,
         );
         client.revisionIds.push(revision.id);
       }
       this._clientGroups.set(group.revisionId, group);
       logger?.point("serialize_start");
-      const hmrUpdate = hmrJSBundle(delta, revision.graph, {
-        clientUrl: group.clientUrl,
+      const hmrUpdate = (0, _hmrJSBundle.default)(delta, revision.graph, {
+        clientUrl: new URL(group.clientUrl),
         createModuleId: this._createModuleId,
         includeAsyncPaths: group.graphOptions.lazy,
         projectRoot: this._config.projectRoot,
@@ -271,7 +319,7 @@ class HmrServer {
         },
       };
     } catch (error) {
-      const formattedError = formatBundlingError(error);
+      const formattedError = (0, _formatBundlingError.default)(error);
       this._config.reporter.update({
         type: "bundling_error",
         error,
@@ -283,4 +331,4 @@ class HmrServer {
     }
   }
 }
-module.exports = HmrServer;
+exports.default = HmrServer;

package/src/HmrServer.js.flow

@@ -8,35 +8,32 @@
  * @flow
  */
 
-'use strict';
-
 import type IncrementalBundler, {RevisionId} from './IncrementalBundler';
-import type {GraphOptions} from './shared/types.flow';
+import type {GraphOptions} from './shared/types';
 import type {ConfigT, RootPerfLogger} from 'metro-config';
 import type {
   HmrClientMessage,
   HmrErrorMessage,
   HmrMessage,
   HmrUpdateMessage,
-} from 'metro-runtime/src/modules/types.flow';
-import type {UrlWithParsedQuery} from 'url';
-
-const hmrJSBundle = require('./DeltaBundler/Serializers/hmrJSBundle');
-const GraphNotFoundError = require('./IncrementalBundler/GraphNotFoundError');
-const RevisionNotFoundError = require('./IncrementalBundler/RevisionNotFoundError');
-const debounceAsyncQueue = require('./lib/debounceAsyncQueue');
-const formatBundlingError = require('./lib/formatBundlingError');
-const getGraphId = require('./lib/getGraphId');
-const parseOptionsFromUrl = require('./lib/parseOptionsFromUrl');
-const splitBundleOptions = require('./lib/splitBundleOptions');
-const transformHelpers = require('./lib/transformHelpers');
-const {
-  Logger: {createActionStartEntry, createActionEndEntry, log},
-} = require('metro-core');
-const nullthrows = require('nullthrows');
-const url = require('url');
-
-export type EntryPointURL = UrlWithParsedQuery;
+} from 'metro-runtime/src/modules/types';
+
+import hmrJSBundle from './DeltaBundler/Serializers/hmrJSBundle';
+import GraphNotFoundError from './IncrementalBundler/GraphNotFoundError';
+import RevisionNotFoundError from './IncrementalBundler/RevisionNotFoundError';
+import debounceAsyncQueue from './lib/debounceAsyncQueue';
+import formatBundlingError from './lib/formatBundlingError';
+import getGraphId from './lib/getGraphId';
+import parseBundleOptionsFromBundleRequestUrl from './lib/parseBundleOptionsFromBundleRequestUrl';
+import splitBundleOptions from './lib/splitBundleOptions';
+import * as transformHelpers from './lib/transformHelpers';
+import {Logger} from 'metro-core';
+import nullthrows from 'nullthrows';
+
+// eslint-disable-next-line import/no-commonjs
+const debug = require('debug')('Metro:HMR');
+
+const {createActionStartEntry, createActionEndEntry, log} = Logger;
 
 export type Client = {
   optedIntoHMR: boolean,
@@ -46,7 +43,7 @@ export type Client = {
 
 type ClientGroup = {
   +clients: Set<Client>,
-  clientUrl: EntryPointURL,
+  clientUrl: URL,
   revisionId: RevisionId,
   +unlisten: () => void,
   +graphOptions: GraphOptions,
@@ -66,7 +63,7 @@ function send(sendFns: Array<(string) => void>, message: HmrMessage): void {
  * getting connected, disconnected or having errors (through the
  * `onClientConnect`, `onClientDisconnect` and `onClientError` methods).
  */
-class HmrServer<TClient: Client> {
+export default class HmrServer<TClient: Client> {
   _config: ConfigT;
   _bundler: IncrementalBundler;
   _createModuleId: (path: string) => number;
@@ -99,12 +96,15 @@ class HmrServer<TClient: Client> {
     requestUrl: string,
     sendFn: (data: string) => void,
   ): Promise<void> {
+    debug('Registering entry point: %s', requestUrl);
     requestUrl = this._config.server.rewriteRequestUrl(requestUrl);
-    const clientUrl = nullthrows(url.parse(requestUrl, true));
-    const {bundleType: _bundleType, ...options} = parseOptionsFromUrl(
-      requestUrl,
-      new Set(this._config.resolver.platforms),
-    );
+    debug('Rewritten as: %s', requestUrl);
+
+    const {bundleType: _bundleType, ...options} =
+      parseBundleOptionsFromBundleRequestUrl(
+        requestUrl,
+        new Set(this._config.resolver.platforms),
+      );
     const {entryFile, resolverOptions, transformOptions, graphOptions} =
       splitBundleOptions(options);
 
@@ -153,31 +153,22 @@ class HmrServer<TClient: Client> {
     if (clientGroup != null) {
       clientGroup.clients.add(client);
     } else {
+      const clientUrl = new URL(requestUrl);
+
       // Prepare the clientUrl to be used as sourceUrl in HMR updates.
       clientUrl.protocol = 'http';
-      const {
-        dev,
-        minify,
-        runModule,
-        bundleEntry: _bundleEntry,
-        ...query
-      } = clientUrl.query || {};
-      clientUrl.query = {
-        ...query,
-        dev: dev || 'true',
-        minify: minify || 'false',
-        modulesOnly: 'true',
-        runModule: runModule || 'false',
-        shallow: 'true',
-      };
-      // the legacy url object is parsed with both "search" and "query" fields.
-      // for the "query" field to be used when formatting the object bach to string, the "search" field must be empty.
-      // https://nodejs.org/api/url.html#urlformaturlobject:~:text=If%20the%20urlObject.search%20property%20is%20undefined
-      clientUrl.search = '';
+
+      const clientQuery = clientUrl.searchParams;
+      clientQuery.delete('bundleEntry');
+      clientQuery.set('dev', clientQuery.get('dev') || 'true');
+      clientQuery.set('minify', clientQuery.get('minify') || 'false');
+      clientQuery.set('modulesOnly', 'true');
+      clientQuery.set('runModule', clientQuery.get('runModule') || 'false');
+      clientQuery.set('shallow', 'true');
 
       clientGroup = {
         clients: new Set([client]),
-        clientUrl,
+        clientUrl: new URL(clientUrl),
         revisionId: id,
         graphOptions,
         unlisten: (): void => unlisten(),
@@ -369,7 +360,7 @@ class HmrServer<TClient: Client> {
       logger?.point('serialize_start');
 
       const hmrUpdate = hmrJSBundle(delta, revision.graph, {
-        clientUrl: group.clientUrl,
+        clientUrl: new URL(group.clientUrl),
         createModuleId: this._createModuleId,
         includeAsyncPaths: group.graphOptions.lazy,
         projectRoot: this._config.projectRoot,
@@ -396,5 +387,3 @@ class HmrServer<TClient: Client> {
     }
   }
 }
-
-module.exports = HmrServer;

package/src/IncrementalBundler/GraphNotFoundError.js

@@ -1,9 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
 class GraphNotFoundError extends Error {
   constructor(graphId) {
     super(`The graph \`${graphId}\` was not found.`);
     this.graphId = graphId;
   }
 }
-module.exports = GraphNotFoundError;
+exports.default = GraphNotFoundError;

package/src/IncrementalBundler/GraphNotFoundError.js.flow

@@ -9,11 +9,9 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {GraphId} from '../lib/getGraphId';
 
-class GraphNotFoundError extends Error {
+export default class GraphNotFoundError extends Error {
   graphId: GraphId;
 
   constructor(graphId: GraphId) {
@@ -21,5 +19,3 @@ class GraphNotFoundError extends Error {
     this.graphId = graphId;
   }
 }
-
-module.exports = GraphNotFoundError;

package/src/IncrementalBundler/ResourceNotFoundError.js

@@ -1,9 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
 class ResourceNotFoundError extends Error {
   constructor(resourcePath) {
     super(`The resource \`${resourcePath}\` was not found.`);
     this.resourcePath = resourcePath;
   }
 }
-module.exports = ResourceNotFoundError;
+exports.default = ResourceNotFoundError;

package/src/IncrementalBundler/ResourceNotFoundError.js.flow

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-class ResourceNotFoundError extends Error {
+export default class ResourceNotFoundError extends Error {
   resourcePath: string;
 
   constructor(resourcePath: string) {
@@ -19,5 +17,3 @@ class ResourceNotFoundError extends Error {
     this.resourcePath = resourcePath;
   }
 }
-
-module.exports = ResourceNotFoundError;

package/src/IncrementalBundler/RevisionNotFoundError.js

@@ -1,9 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
 class RevisionNotFoundError extends Error {
   constructor(revisionId) {
     super(`The revision \`${revisionId}\` was not found.`);
     this.revisionId = revisionId;
   }
 }
-module.exports = RevisionNotFoundError;
+exports.default = RevisionNotFoundError;

package/src/IncrementalBundler/RevisionNotFoundError.js.flow

@@ -9,11 +9,9 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {RevisionId} from '../IncrementalBundler';
 
-class RevisionNotFoundError extends Error {
+export default class RevisionNotFoundError extends Error {
   revisionId: RevisionId;
 
   constructor(revisionId: RevisionId) {
@@ -21,5 +19,3 @@ class RevisionNotFoundError extends Error {
     this.revisionId = revisionId;
   }
 }
-
-module.exports = RevisionNotFoundError;