metro 0.75.0 → 0.76.0

package/src/Server.js

@@ -96,7 +96,6 @@ class Server {
     return this._createModuleId;
   }
   async build(options) {
-    var _this$_config$server$;
     const {
       entryFile,
       graphOptions,
@@ -140,10 +139,7 @@ class Server {
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
       serverRoot:
-        (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
-          null && _this$_config$server$ !== void 0
-          ? _this$_config$server$
-          : this._config.projectRoot,
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
     };
     let bundleCode = null;
     let bundleMap = null;
@@ -180,7 +176,6 @@ class Server {
     };
   }
   async getRamBundleInfo(options) {
-    var _this$_config$server$2;
     const {
       entryFile,
       graphOptions,
@@ -227,10 +222,7 @@ class Server {
       sourceUrl: serializerOptions.sourceUrl,
       inlineSourceMap: serializerOptions.inlineSourceMap,
       serverRoot:
-        (_this$_config$server$2 = this._config.server.unstable_serverRoot) !==
-          null && _this$_config$server$2 !== void 0
-          ? _this$_config$server$2
-          : this._config.projectRoot,
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
     });
   }
   async getAssets(options) {
@@ -386,24 +378,12 @@ class Server {
           bundlePerfLogger: noopLogger,
         });
       } else {
-        var _this$_config$unstabl, _this$_config$unstabl2, _this$_config;
         await this._processBundleRequest(req, res, options, {
           buildNumber,
           bundlePerfLogger:
-            (_this$_config$unstabl =
-              (_this$_config$unstabl2 = (_this$_config = this._config)
-                .unstable_perfLoggerFactory) === null ||
-              _this$_config$unstabl2 === void 0
-                ? void 0
-                : _this$_config$unstabl2.call(
-                    _this$_config,
-                    "BUNDLING_REQUEST",
-                    {
-                      key: buildNumber,
-                    }
-                  )) !== null && _this$_config$unstabl !== void 0
-              ? _this$_config$unstabl
-              : noopLogger,
+            this._config.unstable_perfLoggerFactory?.("BUNDLING_REQUEST", {
+              key: buildNumber,
+            }) ?? noopLogger,
         });
       }
       if (this._serverOptions && this._serverOptions.onBundleBuilt) {
@@ -628,7 +608,6 @@ class Server {
   }
   _processBundleRequest = this._createRequestProcessor({
     createStartEntry(context) {
-      var _context$req$headers$;
       return {
         action_name: "Requesting bundle",
         bundle_url: context.req.url,
@@ -637,11 +616,7 @@ class Server {
         build_id: getBuildID(context.buildNumber),
         bundle_options: context.bundleOptions,
         bundle_hash: context.graphId,
-        user_agent:
-          (_context$req$headers$ = context.req.headers["user-agent"]) !==
-            null && _context$req$headers$ !== void 0
-            ? _context$req$headers$
-            : "unknown",
+        user_agent: context.req.headers["user-agent"] ?? "unknown",
       };
     },
     createEndEntry(context) {
@@ -659,7 +634,6 @@ class Server {
       transformOptions,
       bundlePerfLogger,
     }) => {
-      var _this$_config$server$3;
       bundlePerfLogger.start();
       bundlePerfLogger.annotate({
         string: {
@@ -668,6 +642,11 @@ class Server {
       });
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
       bundlePerfLogger.point("resolvingAndTransformingDependencies_start");
+      bundlePerfLogger.annotate({
+        bool: {
+          initial_build: revPromise == null,
+        },
+      });
       const { delta, revision } = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(
@@ -716,11 +695,7 @@ class Server {
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
           serverRoot:
-            (_this$_config$server$3 =
-              this._config.server.unstable_serverRoot) !== null &&
-            _this$_config$server$3 !== void 0
-              ? _this$_config$server$3
-              : this._config.projectRoot,
+            this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         }
       );
       bundlePerfLogger.point("serializingBundle_end");
@@ -793,7 +768,6 @@ class Server {
       serializerOptions,
       transformOptions,
     }) => {
-      var _this$_config$server$4;
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
       const { delta, revision } = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
@@ -833,11 +807,7 @@ class Server {
           sourceUrl: serializerOptions.sourceUrl,
           inlineSourceMap: serializerOptions.inlineSourceMap,
           serverRoot:
-            (_this$_config$server$4 =
-              this._config.server.unstable_serverRoot) !== null &&
-            _this$_config$server$4 !== void 0
-              ? _this$_config$server$4
-              : this._config.projectRoot,
+            this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         })
       );
       return {
@@ -998,10 +968,7 @@ class Server {
         ) {
           continue;
         }
-        const fileAbsolute = path.resolve(
-          this._config.projectRoot,
-          file !== null && file !== void 0 ? file : ""
-        );
+        const fileAbsolute = path.resolve(this._config.projectRoot, file ?? "");
         try {
           return {
             content: codeFrameColumns(
@@ -1194,12 +1161,7 @@ class Server {
     sourceUrl: null,
   };
   _getServerRootDir() {
-    var _this$_config$server$5;
-    return (_this$_config$server$5 =
-      this._config.server.unstable_serverRoot) !== null &&
-      _this$_config$server$5 !== void 0
-      ? _this$_config$server$5
-      : this._config.projectRoot;
+    return this._config.server.unstable_serverRoot ?? this._config.projectRoot;
   }
   _getEntryPointAbsolutePath(entryFile) {
     return path.resolve(this._getServerRootDir(), entryFile);

package/src/Server.js.flow

@@ -832,6 +832,11 @@ class Server {
       const revPromise = this._bundler.getRevisionByGraphId(graphId);
 
       bundlePerfLogger.point('resolvingAndTransformingDependencies_start');
+      bundlePerfLogger.annotate({
+        bool: {
+          initial_build: revPromise == null,
+        },
+      });
       const {delta, revision} = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
         : this._bundler.initializeGraph(

package/src/commands/dependencies.js

@@ -17,7 +17,6 @@ const fs = require("fs");
 const { loadConfig } = require("metro-config");
 const path = require("path");
 async function dependencies(args, config) {
-  var _config$server$unstab;
   const rootModuleAbsolutePath = args.entryFile;
   if (!fs.existsSync(rootModuleAbsolutePath)) {
     return Promise.reject(
@@ -26,10 +25,7 @@ async function dependencies(args, config) {
   }
   config.cacheStores = [];
   const relativePath = path.relative(
-    (_config$server$unstab = config.server.unstable_serverRoot) !== null &&
-      _config$server$unstab !== void 0
-      ? _config$server$unstab
-      : config.projectRoot,
+    config.server.unstable_serverRoot ?? config.projectRoot,
     rootModuleAbsolutePath
   );
   const options = {

package/src/index.flow.js

@@ -45,8 +45,7 @@ async function runMetro(config, options) {
     port,
     type: "initialize_started",
   });
-  const { waitForBundler = false, ...serverOptions } =
-    options !== null && options !== void 0 ? options : {};
+  const { waitForBundler = false, ...serverOptions } = options ?? {};
   const server = new MetroServer(mergedConfig, serverOptions);
   const readyPromise = server
     .ready()

package/src/integration_tests/basic_bundle/TestBigInt.js

@@ -10,11 +10,8 @@
 
 "use strict";
 
-// $FlowIssue[bigint-unsupported]
 // $FlowFixMe[signature-verification-failure]
 var a = 2n;
-// $FlowIssue[bigint-unsupported]
 // $FlowFixMe[signature-verification-failure]
 var b = 3n;
-// $FlowFixMe[unsafe-addition]
 module.exports = a ** b;

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

@@ -10,11 +10,8 @@
 
 'use strict';
 
-// $FlowIssue[bigint-unsupported]
 // $FlowFixMe[signature-verification-failure]
 var a = 2n;
-// $FlowIssue[bigint-unsupported]
 // $FlowFixMe[signature-verification-failure]
 var b = 3n;
-// $FlowFixMe[unsafe-addition]
 module.exports = a ** b;

package/src/integration_tests/basic_bundle/require-context/mode-sync.js

@@ -13,6 +13,7 @@ var _utils = require("./utils");
 
 function main() {
   return (0, _utils.copyContextToObject)(
+    // $FlowFixMe[underconstrained-implicit-instantiation]
     require.context("./subdir", undefined, undefined, "sync")
   );
 }

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -15,6 +15,7 @@ declare var require: RequireWithContext;
 
 function main(): mixed {
   return copyContextToObject(
+    // $FlowFixMe[underconstrained-implicit-instantiation]
     require.context('./subdir', undefined, undefined, 'sync'),
   );
 }

package/src/integration_tests/basic_bundle/require-resolveWeak/import-and-resolveWeak.js

@@ -0,0 +1,28 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+async function main() {
+  const moduleId = require.resolveWeak("./subdir/counter-module");
+
+  // Require the module statically via its path, spelled slightly differently
+  (await import("./subdir/counter-module.js")).increment();
+  const dynamicRequire = require;
+
+  // Require the module dynamically via its ID
+  const timesIncremented = dynamicRequire(moduleId).increment();
+  return {
+    moduleId,
+    // Should be 2, proving there's just one module instance
+    timesIncremented,
+  };
+}
+module.exports = main();

package/src/integration_tests/basic_bundle/require-resolveWeak/import-and-resolveWeak.js.flow

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {RequireWithResolveWeak} from './utils';
+
+declare var require: RequireWithResolveWeak;
+
+async function main() {
+  const moduleId = require.resolveWeak('./subdir/counter-module');
+
+  // Require the module statically via its path, spelled slightly differently
+  (await import('./subdir/counter-module.js')).increment();
+
+  const dynamicRequire = require;
+
+  // Require the module dynamically via its ID
+  const timesIncremented = dynamicRequire(moduleId).increment();
+
+  return {
+    moduleId,
+    // Should be 2, proving there's just one module instance
+    timesIncremented,
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-resolveWeak/multiple.js

@@ -0,0 +1,20 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+async function main() {
+  return {
+    counterModuleId1: require.resolveWeak("./subdir/counter-module"),
+    counterModuleId2: require.resolveWeak("./subdir/counter-module.js"),
+    throwingModuleId: require.resolveWeak("./subdir/throwing-module.js"),
+  };
+}
+module.exports = main();

package/src/integration_tests/basic_bundle/require-resolveWeak/multiple.js.flow

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {RequireWithResolveWeak} from './utils';
+
+declare var require: RequireWithResolveWeak;
+
+async function main() {
+  return {
+    counterModuleId1: require.resolveWeak('./subdir/counter-module'),
+    counterModuleId2: require.resolveWeak('./subdir/counter-module.js'),
+    throwingModuleId: require.resolveWeak('./subdir/throwing-module.js'),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-resolveWeak/never-required.js

@@ -0,0 +1,18 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+function main() {
+  return {
+    moduleId: require.resolveWeak("./subdir/throwing-module"),
+  };
+}
+module.exports = main();

package/src/integration_tests/basic_bundle/require-resolveWeak/never-required.js.flow

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {RequireWithResolveWeak} from './utils';
+
+declare var require: RequireWithResolveWeak;
+
+function main() {
+  return {
+    moduleId: require.resolveWeak('./subdir/throwing-module'),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-resolveWeak/require-and-resolveWeak.js

@@ -0,0 +1,28 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+function main() {
+  const moduleId = require.resolveWeak("./subdir/counter-module");
+  const dynamicRequire = require;
+
+  // Require the module dynamically via its ID
+  dynamicRequire(moduleId).increment();
+
+  // Require the module statically via its path, spelled slightly differently
+  const timesIncremented = require("./subdir/counter-module.js").increment();
+  return {
+    moduleId,
+    // Should be 2, proving there's just one module instance
+    timesIncremented,
+  };
+}
+module.exports = main();

package/src/integration_tests/basic_bundle/require-resolveWeak/require-and-resolveWeak.js.flow

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {RequireWithResolveWeak} from './utils';
+
+declare var require: RequireWithResolveWeak;
+
+function main() {
+  const moduleId = require.resolveWeak('./subdir/counter-module');
+
+  const dynamicRequire = require;
+
+  // Require the module dynamically via its ID
+  dynamicRequire(moduleId).increment();
+
+  // Require the module statically via its path, spelled slightly differently
+  const timesIncremented = require('./subdir/counter-module.js').increment();
+
+  return {
+    moduleId,
+    // Should be 2, proving there's just one module instance
+    timesIncremented,
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-resolveWeak/subdir/counter-module.js

@@ -0,0 +1,19 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+let count = 0;
+module.exports = {
+  increment() {
+    ++count;
+    return count;
+  },
+};

package/src/integration_tests/basic_bundle/require-resolveWeak/subdir/counter-module.js.flow

@@ -0,0 +1,18 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+let count: number = 0;
+
+module.exports = {
+  increment(): number {
+    ++count;
+    return count;
+  },
+};

package/src/integration_tests/basic_bundle/require-resolveWeak/subdir/throwing-module.js

@@ -0,0 +1,13 @@
+"use strict";
+
+/**
+ * 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.
+ *
+ * @format
+ *
+ */
+
+throw new Error("This module cannot be evaluated.");

package/src/integration_tests/basic_bundle/require-resolveWeak/subdir/throwing-module.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+throw new Error('This module cannot be evaluated.');

package/src/integration_tests/basic_bundle/require-resolveWeak/utils.js

@@ -0,0 +1 @@
+"use strict";

package/src/integration_tests/basic_bundle/require-resolveWeak/utils.js.flow

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow
+ */
+
+export type RequireWithResolveWeak = {
+  (id: string | number): any,
+  resolveWeak: (id: string) => string | number,
+};

package/src/lib/CountingSet.js

@@ -79,11 +79,7 @@ class CountingSet {
     return this.#map.size;
   }
   count(item) {
-    var _this$map$get;
-    return (_this$map$get = this.#map.get(item)) !== null &&
-      _this$map$get !== void 0
-      ? _this$map$get
-      : 0;
+    return this.#map.get(item) ?? 0;
   }
   clear() {
     this.#map.clear();

package/src/lib/RamBundleParser.js

@@ -24,7 +24,6 @@ const HEADER_SIZE = 3;
  * getModule(): returns the code for the specified module.
  */
 class RamBundleParser {
-  // $FlowFixMe[missing-local-annot]
   constructor(buffer) {
     this._buffer = buffer;
     if (this._readPosition(0) !== MAGIC_NUMBER) {

package/src/lib/RamBundleParser.js.flow

@@ -29,7 +29,6 @@ class RamBundleParser {
   _startupCodeLength: number;
   _startOffset: number;
 
-  // $FlowFixMe[missing-local-annot]
   constructor(buffer: Buffer) {
     this._buffer = buffer;
 

package/src/lib/TerminalReporter.js

@@ -203,6 +203,9 @@ class TerminalReporter {
       case "global_cache_disabled":
         this._logCacheDisabled(event.reason);
         break;
+      case "resolver_warning":
+        this._logWarning(event.message);
+        break;
       case "transform_cache_reset":
         reporting.logWarning(this.terminal, "the transform cache was reset.");
         break;
@@ -360,31 +363,20 @@ class TerminalReporter {
       e
     );
   }
+  _logWarning(message) {
+    reporting.logWarning(this.terminal, message);
+  }
   _logWatcherHealthCheckResult(result) {
-    var _result$pauseReason, _this$_prevHealthChec;
     // Don't be spammy; only report changes in status.
     if (
       !this._prevHealthCheckResult ||
       result.type !== this._prevHealthCheckResult.type ||
       (result.type === "timeout" &&
         this._prevHealthCheckResult.type === "timeout" &&
-        ((_result$pauseReason = result.pauseReason) !== null &&
-        _result$pauseReason !== void 0
-          ? _result$pauseReason
-          : null) !==
-          ((_this$_prevHealthChec = this._prevHealthCheckResult.pauseReason) !==
-            null && _this$_prevHealthChec !== void 0
-            ? _this$_prevHealthChec
-            : null))
+        (result.pauseReason ?? null) !==
+          (this._prevHealthCheckResult.pauseReason ?? null))
     ) {
-      var _result$watcher;
-      const watcherName =
-        "'" +
-        ((_result$watcher = result.watcher) !== null &&
-        _result$watcher !== void 0
-          ? _result$watcher
-          : "unknown") +
-        "'";
+      const watcherName = "'" + (result.watcher ?? "unknown") + "'";
       switch (result.type) {
         case "success":
           // Only report success after a prior failure.

package/src/lib/TerminalReporter.js.flow

@@ -260,6 +260,9 @@ class TerminalReporter {
       case 'global_cache_disabled':
         this._logCacheDisabled(event.reason);
         break;
+      case 'resolver_warning':
+        this._logWarning(event.message);
+        break;
       case 'transform_cache_reset':
         reporting.logWarning(this.terminal, 'the transform cache was reset.');
         break;
@@ -435,6 +438,10 @@ class TerminalReporter {
     );
   }
 
+  _logWarning(message: string): void {
+    reporting.logWarning(this.terminal, message);
+  }
+
   _logWatcherHealthCheckResult(result: HealthCheckResult) {
     // Don't be spammy; only report changes in status.
     if (

package/src/lib/contextModuleTemplates.js

@@ -66,7 +66,7 @@ function createFileMap(modulePath, files, processModule) {
     .forEach((file) => {
       let filePath = path.relative(modulePath, file);
       if (os.platform() === "win32") {
-        filePath = filePath.replace(/\\/g, "/");
+        filePath = filePath.replaceAll("\\", "/");
       }
 
       // NOTE(EvanBacon): I'd prefer we prevent the ability for a module to require itself (`require.context('./')`)