metro 0.65.2 → 0.67.0

package/src/DeltaBundler.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,18 +10,18 @@
 
 'use strict';
 
-const DeltaCalculator = require('./DeltaBundler/DeltaCalculator');
-
 import type Bundler from './Bundler';
 import type {
   DeltaResult,
-  Graph,
   Dependencies,
+  Graph,
   // eslint-disable-next-line no-unused-vars
   MixedOutput,
   Options,
 } from './DeltaBundler/types.flow';
 
+const DeltaCalculator = require('./DeltaBundler/DeltaCalculator');
+
 export type {
   DeltaResult,
   Graph,

package/src/HmrServer.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,10 +9,12 @@
  */
 "use strict";
 
-const GraphNotFoundError = require("./IncrementalBundler/GraphNotFoundError");
+const hmrJSBundle = require("./DeltaBundler/Serializers/hmrJSBundle");
 
 const IncrementalBundler = require("./IncrementalBundler");
 
+const GraphNotFoundError = require("./IncrementalBundler/GraphNotFoundError");
+
 const RevisionNotFoundError = require("./IncrementalBundler/RevisionNotFoundError");
 
 const debounceAsyncQueue = require("./lib/debounceAsyncQueue");
@@ -21,27 +23,25 @@ const formatBundlingError = require("./lib/formatBundlingError");
 
 const getGraphId = require("./lib/getGraphId");
 
-const hmrJSBundle = require("./DeltaBundler/Serializers/hmrJSBundle");
-
-const nullthrows = require("nullthrows");
-
 const parseOptionsFromUrl = require("./lib/parseOptionsFromUrl");
 
 const splitBundleOptions = require("./lib/splitBundleOptions");
 
 const transformHelpers = require("./lib/transformHelpers");
 
-const url = require("url");
-
 const {
-  Logger: { createActionStartEntry, createActionEndEntry, log }
+  Logger: { createActionStartEntry, createActionEndEntry, log },
 } = require("metro-core");
 
 const { VERSION: BYTECODE_VERSION } = require("metro-hermes-compiler");
 
+const nullthrows = require("nullthrows");
+
+const url = require("url");
+
 function send(sendFns, message) {
   const strMessage = JSON.stringify(message);
-  sendFns.forEach(sendFn => sendFn(strMessage));
+  sendFns.forEach((sendFn) => sendFn(strMessage));
 }
 /**
  * The HmrServer (Hot Module Reloading) implements a lightweight interface
@@ -61,15 +61,17 @@ class HmrServer {
     this._clientGroups = new Map();
   }
 
-  async onClientConnect(requestUrl, sendFn) {
+  onClientConnect = async (requestUrl, sendFn) => {
     return {
       sendFn,
       revisionIds: [],
-      optedIntoHMR: false
+      optedIntoHMR: false,
     };
-  }
+  };
 
   async _registerEntryPoint(client, requestUrl, sendFn) {
+    var _this$_config$server$;
+
     requestUrl = this._config.server.rewriteRequestUrl(requestUrl);
     const clientUrl = nullthrows(url.parse(requestUrl, true));
     const options = parseOptionsFromUrl(
@@ -77,9 +79,8 @@ class HmrServer {
       new Set(this._config.resolver.platforms),
       BYTECODE_VERSION
     );
-    const { entryFile, transformOptions, graphOptions } = splitBundleOptions(
-      options
-    );
+    const { entryFile, transformOptions, graphOptions } =
+      splitBundleOptions(options);
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
      * to find the appropriate file with supported extensions.
@@ -90,13 +91,16 @@ class HmrServer {
       transformOptions.platform
     );
     const resolvedEntryFilePath = resolutionFn(
-      this._config.projectRoot + "/.",
+      ((_this$_config$server$ = this._config.server.unstable_serverRoot) !==
+        null && _this$_config$server$ !== void 0
+        ? _this$_config$server$
+        : this._config.projectRoot) + "/.",
       entryFile
     );
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       shallow: graphOptions.shallow,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
     });
 
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
@@ -104,7 +108,7 @@ class HmrServer {
     if (!revPromise) {
       send([sendFn], {
         type: "error",
-        body: formatBundlingError(new GraphNotFoundError(graphId))
+        body: formatBundlingError(new GraphNotFoundError(graphId)),
       });
       return;
     }
@@ -119,23 +123,27 @@ class HmrServer {
     } else {
       // Prepare the clientUrl to be used as sourceUrl in HMR updates.
       clientUrl.protocol = "http";
-      const { dev, minify, runModule, bundleEntry: _bundleEntry, ...query } =
-        clientUrl.query || {}; // $FlowFixMe[incompatible-type]
-
+      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"
+        shallow: "true",
       };
       clientUrl.search = "";
       clientGroup = {
         clients: new Set([client]),
         clientUrl,
         revisionId: id,
-        unlisten: () => unlisten()
+        unlisten: () => unlisten(),
       };
 
       this._clientGroups.set(id, clientGroup);
@@ -143,8 +151,9 @@ class HmrServer {
       const unlisten = this._bundler.getDeltaBundler().listen(
         graph,
         debounceAsyncQueue(
+          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           this._handleFileChange.bind(this, clientGroup, {
-            isInitialUpdate: false
+            isInitialUpdate: false,
           }),
           50
         )
@@ -152,14 +161,14 @@ class HmrServer {
     }
 
     await this._handleFileChange(clientGroup, {
-      isInitialUpdate: true
+      isInitialUpdate: true,
     });
     send([sendFn], {
-      type: "bundle-registered"
+      type: "bundle-registered",
     });
   }
 
-  async onClientMessage(client, message, sendFn) {
+  onClientMessage = async (client, message, sendFn) => {
     let data;
 
     try {
@@ -167,7 +176,7 @@ class HmrServer {
     } catch (error) {
       send([sendFn], {
         type: "error",
-        body: formatBundlingError(error)
+        body: formatBundlingError(error),
       });
       return Promise.resolve();
     }
@@ -176,7 +185,7 @@ class HmrServer {
       switch (data.type) {
         case "register-entrypoints":
           return Promise.all(
-            data.entryPoints.map(entryPoint =>
+            data.entryPoints.map((entryPoint) =>
               this._registerEntryPoint(client, entryPoint, sendFn)
             )
           );
@@ -185,7 +194,8 @@ class HmrServer {
           this._config.reporter.update({
             type: "client_log",
             level: data.level,
-            data: data.data
+            data: data.data,
+            mode: data.mode,
           });
 
           break;
@@ -200,19 +210,17 @@ class HmrServer {
     }
 
     return Promise.resolve();
-  }
-
-  onClientError(client, e) {
+  };
+  onClientError = (client, e) => {
     this._config.reporter.update({
       type: "hmr_client_error",
-      error: e
+      error: e.error,
     });
 
     this.onClientDisconnect(client);
-  }
-
-  onClientDisconnect(client) {
-    client.revisionIds.forEach(revisionId => {
+  };
+  onClientDisconnect = (client) => {
+    client.revisionIds.forEach((revisionId) => {
       const group = this._clientGroups.get(revisionId);
 
       if (group != null) {
@@ -225,10 +233,12 @@ class HmrServer {
         }
       }
     });
-  }
+  };
 
   async _handleFileChange(group, options) {
-    const optedIntoHMR = [...group.clients].some(client => client.optedIntoHMR);
+    const optedIntoHMR = [...group.clients].some(
+      (client) => client.optedIntoHMR
+    );
     const processingHmrChange = log(
       createActionStartEntry({
         // Even when HMR is disabled on the client, this function still
@@ -239,36 +249,40 @@ class HmrServer {
         // that didn't explicitly opt into HMR.
         action_name: optedIntoHMR
           ? "Processing HMR change"
-          : "Processing HMR change (no client opt-in)"
+          : "Processing HMR change (no client opt-in)",
       })
     );
-    const sendFns = [...group.clients].map(client => client.sendFn);
+    const sendFns = [...group.clients].map((client) => client.sendFn);
     send(sendFns, {
       type: "update-start",
-      body: options
+      body: options,
     });
     const message = await this._prepareMessage(group, options);
     send(sendFns, message);
     send(sendFns, {
-      type: "update-done"
+      type: "update-done",
     });
     log({
       ...createActionEndEntry(processingHmrChange),
       outdated_modules:
         message.type === "update"
           ? message.body.added.length + message.body.modified.length
-          : undefined
+          : undefined,
     });
   }
 
   async _prepareMessage(group, options) {
     try {
+      var _this$_config$server$2;
+
       const revPromise = this._bundler.getRevision(group.revisionId);
 
       if (!revPromise) {
         return {
           type: "error",
-          body: formatBundlingError(new RevisionNotFoundError(group.revisionId))
+          body: formatBundlingError(
+            new RevisionNotFoundError(group.revisionId)
+          ),
         };
       }
 
@@ -283,7 +297,7 @@ class HmrServer {
 
       for (const client of group.clients) {
         client.revisionIds = client.revisionIds.filter(
-          revisionId => revisionId !== group.revisionId
+          (revisionId) => revisionId !== group.revisionId
         );
         client.revisionIds.push(revision.id);
       }
@@ -292,28 +306,32 @@ class HmrServer {
 
       const hmrUpdate = hmrJSBundle(delta, revision.graph, {
         createModuleId: this._createModuleId,
-        projectRoot: this._config.projectRoot,
-        clientUrl: group.clientUrl
+        projectRoot:
+          (_this$_config$server$2 = this._config.server.unstable_serverRoot) !==
+            null && _this$_config$server$2 !== void 0
+            ? _this$_config$server$2
+            : this._config.projectRoot,
+        clientUrl: group.clientUrl,
       });
       return {
         type: "update",
         body: {
           revisionId: revision.id,
           isInitialUpdate: options.isInitialUpdate,
-          ...hmrUpdate
-        }
+          ...hmrUpdate,
+        },
       };
     } catch (error) {
       const formattedError = formatBundlingError(error);
 
       this._config.reporter.update({
         type: "bundling_error",
-        error
+        error,
       });
 
       return {
         type: "error",
-        body: formattedError
+        body: formattedError,
       };
     }
   }

package/src/HmrServer.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,33 +10,31 @@
 
 'use strict';
 
-const GraphNotFoundError = require('./IncrementalBundler/GraphNotFoundError');
+import type {RevisionId} from './IncrementalBundler';
+import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {
+  HmrClientMessage,
+  HmrErrorMessage,
+  HmrMessage,
+  HmrUpdateMessage,
+} from 'metro-runtime/src/modules/types.flow';
+
+const hmrJSBundle = require('./DeltaBundler/Serializers/hmrJSBundle');
 const IncrementalBundler = require('./IncrementalBundler');
+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 hmrJSBundle = require('./DeltaBundler/Serializers/hmrJSBundle');
-const nullthrows = require('nullthrows');
 const parseOptionsFromUrl = require('./lib/parseOptionsFromUrl');
 const splitBundleOptions = require('./lib/splitBundleOptions');
 const transformHelpers = require('./lib/transformHelpers');
-const url = require('url');
-
 const {
   Logger: {createActionStartEntry, createActionEndEntry, log},
 } = require('metro-core');
 const {VERSION: BYTECODE_VERSION} = require('metro-hermes-compiler');
-
-import type {RevisionId} from './IncrementalBundler';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
-import type {
-  HmrMessage,
-  HmrClientMessage,
-  HmrUpdateMessage,
-  HmrErrorMessage,
-} from 'metro-runtime/src/modules/types.flow';
+const nullthrows = require('nullthrows');
+const url = require('url');
 
 type $ReturnType<F> = $Call<<A, R>((...A) => R) => R, F>;
 export type EntryPointURL = $ReturnType<typeof url.parse>;
@@ -85,16 +83,16 @@ class HmrServer<TClient: Client> {
     this._clientGroups = new Map();
   }
 
-  async onClientConnect(
+  onClientConnect: (
     requestUrl: string,
     sendFn: (data: string) => void,
-  ): Promise<Client> {
+  ) => Promise<Client> = async (requestUrl, sendFn) => {
     return {
       sendFn,
       revisionIds: [],
       optedIntoHMR: false,
     };
-  }
+  };
 
   async _registerEntryPoint(
     client: Client,
@@ -108,9 +106,8 @@ class HmrServer<TClient: Client> {
       new Set(this._config.resolver.platforms),
       BYTECODE_VERSION,
     );
-    const {entryFile, transformOptions, graphOptions} = splitBundleOptions(
-      options,
-    );
+    const {entryFile, transformOptions, graphOptions} =
+      splitBundleOptions(options);
 
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
@@ -121,13 +118,14 @@ class HmrServer<TClient: Client> {
       transformOptions.platform,
     );
     const resolvedEntryFilePath = resolutionFn(
-      this._config.projectRoot + '/.',
+      (this._config.server.unstable_serverRoot ?? this._config.projectRoot) +
+        '/.',
       entryFile,
     );
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
       shallow: graphOptions.shallow,
-      experimentalImportBundleSupport: this._config.transformer
-        .experimentalImportBundleSupport,
+      experimentalImportBundleSupport:
+        this._config.transformer.experimentalImportBundleSupport,
     });
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
     if (!revPromise) {
@@ -147,9 +145,13 @@ class HmrServer<TClient: Client> {
     } else {
       // Prepare the clientUrl to be used as sourceUrl in HMR updates.
       clientUrl.protocol = 'http';
-      const {dev, minify, runModule, bundleEntry: _bundleEntry, ...query} =
-        clientUrl.query || {};
-      // $FlowFixMe[incompatible-type]
+      const {
+        dev,
+        minify,
+        runModule,
+        bundleEntry: _bundleEntry,
+        ...query
+      } = clientUrl.query || {};
       clientUrl.query = {
         ...query,
         dev: dev || 'true',
@@ -172,6 +174,7 @@ class HmrServer<TClient: Client> {
       const unlisten = this._bundler.getDeltaBundler().listen(
         graph,
         debounceAsyncQueue(
+          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           this._handleFileChange.bind(this, clientGroup, {
             isInitialUpdate: false,
           }),
@@ -184,11 +187,11 @@ class HmrServer<TClient: Client> {
     send([sendFn], {type: 'bundle-registered'});
   }
 
-  async onClientMessage(
+  onClientMessage: (
     client: TClient,
     message: string,
     sendFn: (data: string) => void,
-  ): Promise<void> {
+  ) => Promise<void> = async (client, message, sendFn) => {
     let data: HmrClientMessage;
     try {
       data = JSON.parse(message);
@@ -212,6 +215,7 @@ class HmrServer<TClient: Client> {
             type: 'client_log',
             level: data.level,
             data: data.data,
+            mode: data.mode,
           });
           break;
         case 'log-opt-in':
@@ -222,17 +226,17 @@ class HmrServer<TClient: Client> {
       }
     }
     return Promise.resolve();
-  }
+  };
 
-  onClientError(client: TClient, e: Error): void {
+  onClientError: (client: TClient, e: ErrorEvent) => void = (client, e) => {
     this._config.reporter.update({
       type: 'hmr_client_error',
-      error: e,
+      error: e.error,
     });
     this.onClientDisconnect(client);
-  }
+  };
 
-  onClientDisconnect(client: TClient): void {
+  onClientDisconnect: (client: TClient) => void = client => {
     client.revisionIds.forEach(revisionId => {
       const group = this._clientGroups.get(revisionId);
       if (group != null) {
@@ -244,7 +248,7 @@ class HmrServer<TClient: Client> {
         }
       }
     });
-  }
+  };
 
   async _handleFileChange(
     group: ClientGroup,
@@ -318,7 +322,8 @@ class HmrServer<TClient: Client> {
 
       const hmrUpdate = hmrJSBundle(delta, revision.graph, {
         createModuleId: this._createModuleId,
-        projectRoot: this._config.projectRoot,
+        projectRoot:
+          this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         clientUrl: group.clientUrl,
       });
 

package/src/IncrementalBundler/GraphNotFoundError.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/IncrementalBundler/GraphNotFoundError.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/IncrementalBundler/ResourceNotFoundError.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/IncrementalBundler/ResourceNotFoundError.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/IncrementalBundler/RevisionNotFoundError.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/src/IncrementalBundler/RevisionNotFoundError.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.