metro 0.75.1 → 0.76.0

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

@@ -367,30 +367,16 @@ class TerminalReporter {
     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/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('./')`)

package/src/lib/contextModuleTemplates.js.flow

@@ -28,7 +28,7 @@ function createFileMap(
       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('./')`)

package/src/lib/formatBundlingError.js

@@ -59,7 +59,6 @@ function formatBundlingError(error) {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: "ResourceNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -67,7 +66,6 @@ function formatBundlingError(error) {
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: "GraphNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -75,7 +73,6 @@ function formatBundlingError(error) {
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: "RevisionNotFoundError",
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,

package/src/lib/formatBundlingError.js.flow

@@ -74,7 +74,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof ResourceNotFoundError) {
     return {
       type: 'ResourceNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -82,7 +81,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof GraphNotFoundError) {
     return {
       type: 'GraphNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,
@@ -90,7 +88,6 @@ function formatBundlingError(error: CustomError): FormattedError {
   } else if (error instanceof RevisionNotFoundError) {
     return {
       type: 'RevisionNotFoundError',
-      // $FlowFixMe[missing-empty-array-annot]
       // $FlowFixMe[incompatible-return]
       errors: [],
       message: error.message,

package/src/lib/getAppendScripts.js

@@ -39,7 +39,6 @@ function getAppendScripts(entryPoint, modules, options) {
               data: {
                 code,
                 lineCount: countLines(code),
-                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -69,7 +68,6 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -89,7 +87,6 @@ function getAppendScripts(entryPoint, modules, options) {
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getAppendScripts.js.flow

@@ -58,7 +58,6 @@ function getAppendScripts<T: number | string>(
               data: {
                 code,
                 lineCount: countLines(code),
-                // $FlowFixMe[missing-empty-array-annot]
                 map: [],
               },
             },
@@ -90,7 +89,6 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },
@@ -111,7 +109,6 @@ function getAppendScripts<T: number | string>(
           data: {
             code,
             lineCount: countLines(code),
-            // $FlowFixMe[missing-empty-array-annot]
             map: [],
           },
         },

package/src/lib/getGraphId.js

@@ -22,21 +22,12 @@ function getGraphId(
     resolverOptions,
   }
 ) {
-  var _resolverOptions$cust, _options$customTransf;
   return JSON.stringify(
     {
       entryFile,
       options: {
-        customResolverOptions:
-          (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
-            null && _resolverOptions$cust !== void 0
-            ? _resolverOptions$cust
-            : {},
-        customTransformOptions:
-          (_options$customTransf = options.customTransformOptions) !== null &&
-          _options$customTransf !== void 0
-            ? _options$customTransf
-            : null,
+        customResolverOptions: resolverOptions.customResolverOptions ?? {},
+        customTransformOptions: options.customTransformOptions ?? null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,
         hot: options.hot,

package/src/lib/getPrependedScripts.js

@@ -92,7 +92,6 @@ function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
         data: {
           code,
           lineCount: countLines(code),
-          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/getPrependedScripts.js.flow

@@ -115,7 +115,6 @@ function _getPrelude({
         data: {
           code,
           lineCount: countLines(code),
-          // $FlowFixMe[missing-empty-array-annot]
           map: [],
         },
       },

package/src/lib/transformHelpers.js

@@ -12,7 +12,12 @@
 "use strict";
 
 var _contextModuleTemplates = require("./contextModuleTemplates");
-const path = require("path");
+var _isAssetFile = _interopRequireDefault(
+  require("metro-resolver/src/utils/isAssetFile")
+);
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 const baseIgnoredInlineRequires = ["React", "react", "react-native"];
 async function calcTransformerOptions(
   entryFiles,
@@ -84,22 +89,12 @@ async function calcTransformerOptions(
   );
   return {
     ...baseOptions,
-    inlineRequires:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.inlineRequires) || false,
-    experimentalImportSupport:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.experimentalImportSupport) || false,
+    inlineRequires: transform?.inlineRequires || false,
+    experimentalImportSupport: transform?.experimentalImportSupport || false,
     unstable_disableES6Transforms:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.unstable_disableES6Transforms) || false,
+      transform?.unstable_disableES6Transforms || false,
     nonInlinedRequires:
-      (transform === null || transform === void 0
-        ? void 0
-        : transform.nonInlinedRequires) || baseIgnoredInlineRequires,
+      transform?.nonInlinedRequires || baseIgnoredInlineRequires,
     type: "module",
   };
 }
@@ -125,6 +120,7 @@ async function getTransformFn(
     options,
     resolverOptions
   );
+  const assetExts = new Set(config.resolver.assetExts);
   return async (modulePath, requireContext) => {
     let templateBuffer;
     if (requireContext) {
@@ -150,11 +146,7 @@ async function getTransformFn(
       modulePath,
       {
         ...transformOptions,
-        type: getType(
-          transformOptions.type,
-          modulePath,
-          config.resolver.assetExts
-        ),
+        type: getType(transformOptions.type, modulePath, assetExts),
         inlineRequires: removeInlineRequiresBlockListFromOptions(
           modulePath,
           inlineRequires
@@ -168,7 +160,7 @@ function getType(type, filePath, assetExts) {
   if (type === "script") {
     return type;
   }
-  if (assetExts.indexOf(path.extname(filePath).slice(1)) !== -1) {
+  if ((0, _isAssetFile.default)(filePath, assetExts)) {
     return "asset";
   }
   return "module";
@@ -179,7 +171,7 @@ async function getResolveDependencyFn(bundler, platform, resolverOptions) {
     dependencyGraph.resolveDependency(
       from,
       to,
-      platform !== null && platform !== void 0 ? platform : null,
+      platform ?? null,
       resolverOptions
     );
 }