metro 0.76.8 → 0.76.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.76.8",
+  "version": "0.76.9",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -35,22 +35,21 @@
     "jest-worker": "^27.2.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.76.8",
-    "metro-cache": "0.76.8",
-    "metro-cache-key": "0.76.8",
-    "metro-config": "0.76.8",
-    "metro-core": "0.76.8",
-    "metro-file-map": "0.76.8",
-    "metro-inspector-proxy": "0.76.8",
-    "metro-minify-terser": "0.76.8",
-    "metro-minify-uglify": "0.76.8",
-    "metro-react-native-babel-preset": "0.76.8",
-    "metro-resolver": "0.76.8",
-    "metro-runtime": "0.76.8",
-    "metro-source-map": "0.76.8",
-    "metro-symbolicate": "0.76.8",
-    "metro-transform-plugins": "0.76.8",
-    "metro-transform-worker": "0.76.8",
+    "metro-babel-transformer": "0.76.9",
+    "metro-cache": "0.76.9",
+    "metro-cache-key": "0.76.9",
+    "metro-config": "0.76.9",
+    "metro-core": "0.76.9",
+    "metro-file-map": "0.76.9",
+    "metro-inspector-proxy": "0.76.9",
+    "metro-minify-uglify": "0.76.9",
+    "metro-react-native-babel-preset": "0.76.9",
+    "metro-resolver": "0.76.9",
+    "metro-runtime": "0.76.9",
+    "metro-source-map": "0.76.9",
+    "metro-symbolicate": "0.76.9",
+    "metro-transform-plugins": "0.76.9",
+    "metro-transform-worker": "0.76.9",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -68,10 +67,10 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.76.8",
-    "metro-memory-fs": "0.76.8",
-    "metro-react-native-babel-preset": "0.76.8",
-    "metro-react-native-babel-transformer": "0.76.8",
+    "metro-babel-register": "0.76.9",
+    "metro-memory-fs": "0.76.9",
+    "metro-react-native-babel-preset": "0.76.9",
+    "metro-react-native-babel-transformer": "0.76.9",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/DeltaBundler/DeltaCalculator.js

@@ -14,7 +14,11 @@
 var _path = _interopRequireDefault(require("path"));
 var _Graph = require("./Graph");
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");

package/src/DeltaBundler/Graph.js

@@ -20,7 +20,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj,
+    };
   }
   var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {
@@ -48,7 +50,11 @@ function _interopRequireWildcard(obj, nodeInterop) {
   return newObj;
 }
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -394,14 +400,17 @@ class Graph {
       // Weak dependencies are excluded from the bundle.
       return;
     }
+    const module = this.dependencies.get(absolutePath);
     if (options.lazy && dependency.data.data.asyncType != null) {
       this._decrementImportBundleReference(dependency, parentModule);
+    } else if (module) {
+      // Decrement inverseDependencies only if the dependency is not async,
+      // mirroring the increment conditions in _addDependency.
+      module.inverseDependencies.delete(parentModule.path);
     }
-    const module = this.dependencies.get(absolutePath);
     if (!module) {
       return;
     }
-    module.inverseDependencies.delete(parentModule.path);
     if (
       module.inverseDependencies.size > 0 ||
       this.entryPoints.has(absolutePath)
@@ -715,6 +724,7 @@ class Graph {
 
   /** End of garbage collection functions */
 }
+
 exports.Graph = Graph;
 function dependenciesEqual(a, b, options) {
   return (

package/src/DeltaBundler/Graph.js.flow

@@ -485,16 +485,19 @@ export class Graph<T = MixedOutput> {
       return;
     }
 
+    const module = this.dependencies.get(absolutePath);
+
     if (options.lazy && dependency.data.data.asyncType != null) {
       this._decrementImportBundleReference(dependency, parentModule);
+    } else if (module) {
+      // Decrement inverseDependencies only if the dependency is not async,
+      // mirroring the increment conditions in _addDependency.
+      module.inverseDependencies.delete(parentModule.path);
     }
 
-    const module = this.dependencies.get(absolutePath);
-
     if (!module) {
       return;
     }
-    module.inverseDependencies.delete(parentModule.path);
     if (
       module.inverseDependencies.size > 0 ||
       this.entryPoints.has(absolutePath)

package/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -23,7 +23,7 @@ function generateModules(sourceModules, graph, options) {
       // Construct a bundle URL for this specific module only
       const getURL = (extension) => {
         options.clientUrl.pathname = path.relative(
-          options.projectRoot,
+          options.serverRoot ?? options.projectRoot,
           path.join(
             path.dirname(module.path),
             path.basename(module.path, path.extname(module.path)) +

package/src/DeltaBundler/Serializers/hmrJSBundle.js.flow

@@ -42,7 +42,7 @@ function generateModules(
       // Construct a bundle URL for this specific module only
       const getURL = (extension: 'bundle' | 'map') => {
         options.clientUrl.pathname = path.relative(
-          options.projectRoot,
+          options.serverRoot ?? options.projectRoot,
           path.join(
             path.dirname(module.path),
             path.basename(module.path, path.extname(module.path)) +

package/src/DeltaBundler/Transformer.js

@@ -13,7 +13,11 @@
 
 var _crypto = _interopRequireDefault(require("crypto"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const getTransformCacheKey = require("./getTransformCacheKey");
 const WorkerFarm = require("./WorkerFarm");

package/src/DeltaBundler/WorkerFarm.js

@@ -17,9 +17,10 @@ class WorkerFarm {
   constructor(config, transformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
+    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
-        this._config.transformer.workerPath,
+        absoluteWorkerPath,
         ["transform"],
         this._config.maxWorkers
       );
@@ -69,13 +70,13 @@ class WorkerFarm {
       }
     }
   }
-  _makeFarm(workerPath, exposedMethods, numWorkers) {
+  _makeFarm(absoluteWorkerPath, exposedMethods, numWorkers) {
     const env = {
       ...process.env,
       // Force color to print syntax highlighted code frames.
       FORCE_COLOR: 1,
     };
-    return new JestWorker(workerPath, {
+    return new JestWorker(absoluteWorkerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           // $FlowFixMe[incompatible-call]

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -39,10 +39,11 @@ class WorkerFarm {
   constructor(config: ConfigT, transformerConfig: TransformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
+    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
 
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
-        this._config.transformer.workerPath,
+        absoluteWorkerPath,
         ['transform'],
         this._config.maxWorkers,
       );
@@ -107,7 +108,7 @@ class WorkerFarm {
   }
 
   _makeFarm(
-    workerPath: string,
+    absoluteWorkerPath: string,
     exposedMethods: $ReadOnlyArray<string>,
     numWorkers: number,
   ): any {
@@ -117,7 +118,7 @@ class WorkerFarm {
       FORCE_COLOR: 1,
     };
 
-    return new JestWorker(workerPath, {
+    return new JestWorker(absoluteWorkerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           // $FlowFixMe[incompatible-call]

package/src/DeltaBundler/types.flow.js

@@ -13,5 +13,9 @@
 
 var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -27,7 +27,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj,
+    };
   }
   var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {
@@ -55,7 +57,11 @@ function _interopRequireWildcard(obj, nodeInterop) {
   return newObj;
 }
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const WRAP_NAME = "$$_REQUIRE"; // note: babel will prefix this with _
 

package/src/cli/parseKeyValueParamArray.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = coerceKeyValueArray;
 var _querystring = _interopRequireDefault(require("querystring"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.

package/src/commands/build.js

@@ -4,7 +4,11 @@ var _parseKeyValueParamArray = _interopRequireDefault(
   require("../cli/parseKeyValueParamArray")
 );
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.

package/src/integration_tests/basic_bundle/import-export/index.js

@@ -36,7 +36,11 @@ var _exportPrimitiveDefault = _interopRequireWildcard(
 var _export3 = _interopRequireDefault(require("./export-3"));
 var _export4 = require("./export-4");
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 function _getRequireWildcardCache(nodeInterop) {
   if (typeof WeakMap !== "function") return null;
@@ -51,7 +55,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj,
+    };
   }
   var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {

package/src/integration_tests/basic_bundle/require-context/empty.js

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 const empty = require.context("./no-such-dir");
 function main() {
   try {

package/src/integration_tests/basic_bundle/require-context/matching.js

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 const ab = require.context("./subdir", false, /\/(a|b)\.js$/);
 const abc = require.context("./subdir", false);
 const abcd = require.context("./subdir", true);

package/src/integration_tests/basic_bundle/require-context/subdir/a.js

@@ -9,5 +9,4 @@
  * @format
  *
  */
-
 module.exports = "a";

package/src/integration_tests/basic_bundle/require-context/subdir/c.js

@@ -9,5 +9,4 @@
  * @format
  *
  */
-
 module.exports = "c";

package/src/integration_tests/basic_bundle/require-context/subdir/nested/d.js

@@ -9,5 +9,4 @@
  * @format
  *
  */
-
 module.exports = "d";

package/src/integration_tests/basic_bundle/require-context/subdir-conflict/index.js

@@ -9,5 +9,4 @@
  * @format
  *
  */
-
 module.exports = "contents of subdir-conflict/index.js";

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

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 async function main() {
   const moduleId = require.resolveWeak("./subdir/counter-module");
 

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

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 async function main() {
   return {
     counterModuleId1: require.resolveWeak("./subdir/counter-module"),

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

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 function main() {
   return {
     moduleId: require.resolveWeak("./subdir/throwing-module"),

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

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 function main() {
   const moduleId = require.resolveWeak("./subdir/counter-module");
   const dynamicRequire = require;

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

@@ -9,7 +9,6 @@
  * @format
  *
  */
-
 let count = 0;
 module.exports = {
   increment() {

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

@@ -9,5 +9,4 @@
  * @format
  *
  */
-
 throw new Error("This module cannot be evaluated.");

package/src/lib/contextModule.js

@@ -9,7 +9,11 @@ var _crypto = _interopRequireDefault(require("crypto"));
 var _path = _interopRequireDefault(require("path"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.

package/src/lib/contextModuleTemplates.js

@@ -19,7 +19,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj,
+    };
   }
   var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {

package/src/lib/createWebsocketServer.js

@@ -2,7 +2,11 @@
 
 var _ws = _interopRequireDefault(require("ws"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.

package/src/lib/getAppendScripts.js

@@ -13,7 +13,11 @@
 
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
 const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");

package/src/lib/getPrependedScripts.js

@@ -13,7 +13,11 @@
 
 var _CountingSet = _interopRequireDefault(require("./CountingSet"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const countLines = require("./countLines");
 const getPreludeCode = require("./getPreludeCode");

package/src/lib/parseOptionsFromUrl.js

@@ -60,7 +60,9 @@ module.exports = function parseOptionsFromUrl(normalizedRequestUrl, platforms) {
       // protocol-relative URLs, which is why we must force the HTTP protocol
       // when loading the bundle for either Android or iOS.
       protocol:
-        platform != null && platform.match(/^(android|ios)$/) ? "http" : "",
+        platform != null && platform.match(/^(android|ios|vr|windows|macos)$/)
+          ? "http"
+          : "",
       pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),

package/src/lib/parseOptionsFromUrl.js.flow

@@ -75,7 +75,9 @@ module.exports = function parseOptionsFromUrl(
       // protocol-relative URLs, which is why we must force the HTTP protocol
       // when loading the bundle for either Android or iOS.
       protocol:
-        platform != null && platform.match(/^(android|ios)$/) ? 'http' : '',
+        platform != null && platform.match(/^(android|ios|vr|windows|macos)$/)
+          ? 'http'
+          : '',
       pathname: pathname.replace(/\.(bundle|delta)$/, '.map'),
     }),
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),

package/src/lib/transformHelpers.js

@@ -16,7 +16,11 @@ var _isAssetFile = _interopRequireDefault(
   require("metro-resolver/src/utils/isAssetFile")
 );
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const baseIgnoredInlineRequires = ["React", "react", "react-native"];
 async function calcTransformerOptions(

package/src/node-haste/DependencyGraph/createHasteMap.js

@@ -14,7 +14,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return obj;
   }
   if (obj === null || (typeof obj !== "object" && typeof obj !== "function")) {
-    return { default: obj };
+    return {
+      default: obj,
+    };
   }
   var cache = _getRequireWildcardCache(nodeInterop);
   if (cache && cache.has(obj)) {

package/src/node-haste/Module.js

@@ -13,7 +13,11 @@
 
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 class Module {
   constructor(file, moduleCache) {

package/src/shared/output/RamBundle/util.js

@@ -13,7 +13,11 @@
 
 var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
 function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  return obj && obj.__esModule
+    ? obj
+    : {
+        default: obj,
+      };
 }
 const invariant = require("invariant");
 function lineToLineSourceMap(source, filename = "") {