metro 0.75.0 → 0.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -20,7 +20,6 @@
     "@babel/template": "^7.0.0",
     "@babel/traverse": "^7.20.0",
     "@babel/types": "^7.20.0",
-    "absolute-path": "^0.0.0",
     "accepts": "^1.3.7",
     "async": "^3.2.2",
     "chalk": "^4.0.0",
@@ -35,23 +34,23 @@
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.75.0",
-    "metro-cache": "0.75.0",
-    "metro-cache-key": "0.75.0",
-    "metro-config": "0.75.0",
-    "metro-core": "0.75.0",
-    "metro-file-map": "0.75.0",
-    "metro-hermes-compiler": "0.75.0",
-    "metro-inspector-proxy": "0.75.0",
-    "metro-minify-terser": "0.75.0",
-    "metro-minify-uglify": "0.75.0",
-    "metro-react-native-babel-preset": "0.75.0",
-    "metro-resolver": "0.75.0",
-    "metro-runtime": "0.75.0",
-    "metro-source-map": "0.75.0",
-    "metro-symbolicate": "0.75.0",
-    "metro-transform-plugins": "0.75.0",
-    "metro-transform-worker": "0.75.0",
+    "metro-babel-transformer": "0.76.0",
+    "metro-cache": "0.76.0",
+    "metro-cache-key": "0.76.0",
+    "metro-config": "0.76.0",
+    "metro-core": "0.76.0",
+    "metro-file-map": "0.76.0",
+    "metro-hermes-compiler": "0.76.0",
+    "metro-inspector-proxy": "0.76.0",
+    "metro-minify-terser": "0.76.0",
+    "metro-minify-uglify": "0.76.0",
+    "metro-react-native-babel-preset": "0.76.0",
+    "metro-resolver": "0.76.0",
+    "metro-runtime": "0.76.0",
+    "metro-source-map": "0.76.0",
+    "metro-symbolicate": "0.76.0",
+    "metro-transform-plugins": "0.76.0",
+    "metro-transform-worker": "0.76.0",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,16 +69,16 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.75.0",
-    "metro-memory-fs": "0.75.0",
-    "metro-react-native-babel-preset": "0.75.0",
-    "metro-react-native-babel-transformer": "0.75.0",
+    "metro-babel-register": "0.76.0",
+    "metro-memory-fs": "0.76.0",
+    "metro-react-native-babel-preset": "0.76.0",
+    "metro-react-native-babel-transformer": "0.76.0",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16"
   }
 }

package/src/Assets.js

@@ -93,7 +93,7 @@ async function getAbsoluteAssetRecord(assetPath, platform = null) {
   if (!record) {
     throw new Error(
       `Asset not found: ${assetPath} for platform: ${
-        platform !== null && platform !== void 0 ? platform : "(unspecified)"
+        platform ?? "(unspecified)"
       }`
     );
   }
@@ -134,7 +134,7 @@ async function getAssetData(
 
   // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === "\\") {
-    assetUrlPath = assetUrlPath.replace(/\\/g, "/");
+    assetUrlPath = assetUrlPath.replaceAll("\\", "/");
   }
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));
   const assetInfo = await getAbsoluteAssetInfo(assetPath, platform);

package/src/Assets.js.flow

@@ -200,7 +200,7 @@ async function getAssetData(
 
   // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === '\\') {
-    assetUrlPath = assetUrlPath.replace(/\\/g, '/');
+    assetUrlPath = assetUrlPath.replaceAll('\\', '/');
   }
 
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));

package/src/DeltaBundler/DeltaCalculator.js

@@ -11,7 +11,11 @@
 
 "use strict";
 
+var _path = _interopRequireDefault(require("path"));
 var _Graph = require("./Graph");
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");
 
@@ -25,7 +29,7 @@ class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
   _addedFiles = new Set();
-  _hasSymlinkChanges = false;
+  _requiresReset = false;
   constructor(entryPoints, changeEventSource, options) {
     super();
     this._options = options;
@@ -78,13 +82,13 @@ class DeltaCalculator extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
-    const hasSymlinkChanges = this._hasSymlinkChanges;
-    this._hasSymlinkChanges = false;
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
 
-    // Revisit all files if changes include symlinks - resolutions may be
+    // Revisit all files if changes require a graph reset - resolutions may be
     // invalidated but we don't yet know which. This should be optimized in the
     // future.
-    if (hasSymlinkChanges) {
+    if (requiresReset) {
       const markModified = (file) => {
         if (!addedFiles.has(file) && !deletedFiles.has(file)) {
           modifiedFiles.add(file);
@@ -165,12 +169,15 @@ class DeltaCalculator extends EventEmitter {
    */
   _handleFileChange = ({ type, filePath, metadata }, logger) => {
     debug("Handling %s: %s (type: %s)", type, filePath, metadata.type);
-    if (metadata.type === "l") {
-      this._hasSymlinkChanges = true;
+    if (
+      metadata.type === "l" ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(_path.default.sep + "package.json"))
+    ) {
+      this._requiresReset = true;
       this.emit("change", {
         logger,
       });
-      return;
     }
     let state;
     if (this._deletedFiles.has(filePath)) {
@@ -233,13 +240,13 @@ class DeltaCalculator extends EventEmitter {
     // If a file has been deleted, we want to invalidate any other file that
     // depends on it, so we can process it and correctly return an error.
     deletedFiles.forEach((filePath) => {
-      for (const path of this._graph.getModifiedModulesForDeletedPath(
+      for (const modifiedModulePath of this._graph.getModifiedModulesForDeletedPath(
         filePath
       )) {
         // Only mark the inverse dependency as modified if it's not already
         // marked as deleted (in that case we can just ignore it).
-        if (!deletedFiles.has(path)) {
-          modifiedFiles.add(path);
+        if (!deletedFiles.has(modifiedModulePath)) {
+          modifiedFiles.add(modifiedModulePath);
         }
       }
     });

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -11,6 +11,7 @@
 
 'use strict';
 
+import path from 'path';
 import {Graph} from './Graph';
 import type {DeltaResult, Options} from './types.flow';
 import type {RootPerfLogger} from 'metro-config';
@@ -33,7 +34,7 @@ class DeltaCalculator<T> extends EventEmitter {
   _deletedFiles: Set<string> = new Set();
   _modifiedFiles: Set<string> = new Set();
   _addedFiles: Set<string> = new Set();
-  _hasSymlinkChanges = false;
+  _requiresReset = false;
 
   _graph: Graph<T>;
 
@@ -104,13 +105,13 @@ class DeltaCalculator<T> extends EventEmitter {
     this._deletedFiles = new Set();
     const addedFiles = this._addedFiles;
     this._addedFiles = new Set();
-    const hasSymlinkChanges = this._hasSymlinkChanges;
-    this._hasSymlinkChanges = false;
+    const requiresReset = this._requiresReset;
+    this._requiresReset = false;
 
-    // Revisit all files if changes include symlinks - resolutions may be
+    // Revisit all files if changes require a graph reset - resolutions may be
     // invalidated but we don't yet know which. This should be optimized in the
     // future.
-    if (hasSymlinkChanges) {
+    if (requiresReset) {
       const markModified = (file: string) => {
         if (!addedFiles.has(file) && !deletedFiles.has(file)) {
           modifiedFiles.add(file);
@@ -207,10 +208,13 @@ class DeltaCalculator<T> extends EventEmitter {
     logger: ?RootPerfLogger,
   ): mixed => {
     debug('Handling %s: %s (type: %s)', type, filePath, metadata.type);
-    if (metadata.type === 'l') {
-      this._hasSymlinkChanges = true;
+    if (
+      metadata.type === 'l' ||
+      (this._options.unstable_enablePackageExports &&
+        filePath.endsWith(path.sep + 'package.json'))
+    ) {
+      this._requiresReset = true;
       this.emit('change', {logger});
-      return;
     }
     let state: void | 'deleted' | 'modified' | 'added';
     if (this._deletedFiles.has(filePath)) {
@@ -281,13 +285,13 @@ class DeltaCalculator<T> extends EventEmitter {
     // If a file has been deleted, we want to invalidate any other file that
     // depends on it, so we can process it and correctly return an error.
     deletedFiles.forEach((filePath: string) => {
-      for (const path of this._graph.getModifiedModulesForDeletedPath(
+      for (const modifiedModulePath of this._graph.getModifiedModulesForDeletedPath(
         filePath,
       )) {
         // Only mark the inverse dependency as modified if it's not already
         // marked as deleted (in that case we can just ignore it).
-        if (!deletedFiles.has(path)) {
-          modifiedFiles.add(path);
+        if (!deletedFiles.has(modifiedModulePath)) {
+          modifiedFiles.add(modifiedModulePath);
         }
       }
     });

package/src/DeltaBundler/Graph.js

@@ -284,6 +284,8 @@ class Graph {
     let module = this.dependencies.get(path);
     if (options.shallow) {
       // Don't add a node for the module if the graph is shallow (single-module).
+    } else if (dependency.data.data.asyncType === "weak") {
+      // Exclude weak dependencies from the bundle.
     } else if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -332,6 +334,10 @@ class Graph {
   _removeDependency(parentModule, key, dependency, delta, options) {
     parentModule.dependencies.delete(key);
     const { absolutePath } = dependency;
+    if (dependency.data.data.asyncType === "weak") {
+      // Weak dependencies are excluded from the bundle.
+      return;
+    }
     if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -376,26 +382,8 @@ class Graph {
    * traverseDependencies. Note that the list may contain duplicates.
    */
   *getModifiedModulesForDeletedPath(filePath) {
-    var _this$dependencies$ge,
-      _this$dependencies$ge2,
-      _this$importBundleNod,
-      _this$importBundleNod2;
-    yield* (_this$dependencies$ge =
-      (_this$dependencies$ge2 = this.dependencies.get(filePath)) === null ||
-      _this$dependencies$ge2 === void 0
-        ? void 0
-        : _this$dependencies$ge2.inverseDependencies) !== null &&
-    _this$dependencies$ge !== void 0
-      ? _this$dependencies$ge
-      : [];
-    yield* (_this$importBundleNod =
-      (_this$importBundleNod2 = this.#importBundleNodes.get(filePath)) ===
-        null || _this$importBundleNod2 === void 0
-        ? void 0
-        : _this$importBundleNod2.inverseDependencies) !== null &&
-    _this$importBundleNod !== void 0
-      ? _this$importBundleNod
-      : [];
+    yield* this.dependencies.get(filePath)?.inverseDependencies ?? [];
+    yield* this.#importBundleNodes.get(filePath)?.inverseDependencies ?? [];
   }
   _resolveDependencies(parentPath, dependencies, options) {
     const maybeResolvedDeps = new Map();
@@ -511,15 +499,10 @@ class Graph {
 
   // Add an entry to importBundleNodes (or record an inverse dependency of an existing one)
   _incrementImportBundleReference(dependency, parentModule) {
-    var _this$importBundleNod3;
     const { absolutePath } = dependency;
-    const importBundleNode =
-      (_this$importBundleNod3 = this.#importBundleNodes.get(absolutePath)) !==
-        null && _this$importBundleNod3 !== void 0
-        ? _this$importBundleNod3
-        : {
-            inverseDependencies: new _CountingSet.default(),
-          };
+    const importBundleNode = this.#importBundleNodes.get(absolutePath) ?? {
+      inverseDependencies: new _CountingSet.default(),
+    };
     importBundleNode.inverseDependencies.add(parentModule.path);
     this.#importBundleNodes.set(absolutePath, importBundleNode);
   }

package/src/DeltaBundler/Graph.js.flow

@@ -355,6 +355,8 @@ export class Graph<T = MixedOutput> {
 
     if (options.shallow) {
       // Don't add a node for the module if the graph is shallow (single-module).
+    } else if (dependency.data.data.asyncType === 'weak') {
+      // Exclude weak dependencies from the bundle.
     } else if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -414,6 +416,11 @@ export class Graph<T = MixedOutput> {
 
     const {absolutePath} = dependency;
 
+    if (dependency.data.data.asyncType === 'weak') {
+      // Weak dependencies are excluded from the bundle.
+      return;
+    }
+
     if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null

package/src/DeltaBundler/Serializers/helpers/js.js

@@ -63,23 +63,18 @@ function getModuleParams(module, options) {
   return params;
 }
 function getJsOutput(module) {
-  var _module$path, _module$path2;
   const jsModules = module.output.filter(({ type }) => type.startsWith("js/"));
   invariant(
     jsModules.length === 1,
     `Modules must have exactly one JS output, but ${
-      (_module$path = module.path) !== null && _module$path !== void 0
-        ? _module$path
-        : "unknown module"
+      module.path ?? "unknown module"
     } has ${jsModules.length} JS outputs.`
   );
   const jsOutput = jsModules[0];
   invariant(
     Number.isFinite(jsOutput.data.lineCount),
     `JS output must populate lineCount, but ${
-      (_module$path2 = module.path) !== null && _module$path2 !== void 0
-        ? _module$path2
-        : "unknown module"
+      module.path ?? "unknown module"
     } has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`
   );
   return jsOutput;

package/src/DeltaBundler/types.flow.js.flow

@@ -23,7 +23,7 @@ export type MixedOutput = {
   +type: string,
 };
 
-export type AsyncDependencyType = 'async' | 'prefetch';
+export type AsyncDependencyType = 'async' | 'prefetch' | 'weak';
 
 export type TransformResultDependency = {
   /**
@@ -44,12 +44,6 @@ export type TransformResultDependency = {
      * If not null, this dependency is due to a dynamic `import()` or `__prefetchImport()` call.
      */
     +asyncType: AsyncDependencyType | null,
-    /**
-     * The condition for splitting on this dependency edge.
-     */
-    +splitCondition?: {
-      +mobileConfigName: string,
-    },
     /**
      * The dependency is enclosed in a try/catch block.
      */
@@ -138,6 +132,7 @@ export type Options<T = MixedOutput> = {
   +onProgress: ?(numProcessed: number, total: number) => mixed,
   +experimentalImportBundleSupport: boolean,
   +unstable_allowRequireContext: boolean,
+  +unstable_enablePackageExports: boolean,
   +shallow: boolean,
 };
 

package/src/HmrServer.js

@@ -56,7 +56,6 @@ class HmrServer {
     };
   };
   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,10 +76,8 @@ class HmrServer {
       resolverOptions
     );
     const resolvedEntryFilePath = resolutionFn(
-      ((_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) +
+        "/.",
       entryFile
     ).filePath;
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
@@ -212,11 +209,7 @@ class HmrServer {
     });
   };
   async _handleFileChange(group, options, changeEvent) {
-    const logger = !options.isInitialUpdate
-      ? changeEvent === null || changeEvent === void 0
-        ? void 0
-        : changeEvent.logger
-      : null;
+    const logger = !options.isInitialUpdate ? changeEvent?.logger : null;
     if (logger) {
       logger.point("fileChange_end");
       logger.point("hmrPrepareAndSendMessage_start");
@@ -260,13 +253,8 @@ class HmrServer {
     }
   }
   async _prepareMessage(group, options, changeEvent) {
-    const logger = !options.isInitialUpdate
-      ? changeEvent === null || changeEvent === void 0
-        ? void 0
-        : changeEvent.logger
-      : null;
+    const logger = !options.isInitialUpdate ? changeEvent?.logger : null;
     try {
-      var _this$_config$server$2;
       const revPromise = this._bundler.getRevision(group.revisionId);
       if (!revPromise) {
         return {
@@ -276,16 +264,12 @@ class HmrServer {
           ),
         };
       }
-      logger === null || logger === void 0
-        ? void 0
-        : logger.point("updateGraph_start");
+      logger?.point("updateGraph_start");
       const { revision, delta } = await this._bundler.updateGraph(
         await revPromise,
         false
       );
-      logger === null || logger === void 0
-        ? void 0
-        : logger.point("updateGraph_end");
+      logger?.point("updateGraph_end");
       this._clientGroups.delete(group.revisionId);
       group.revisionId = revision.id;
       for (const client of group.clients) {
@@ -295,23 +279,16 @@ class HmrServer {
         client.revisionIds.push(revision.id);
       }
       this._clientGroups.set(group.revisionId, group);
-      logger === null || logger === void 0
-        ? void 0
-        : logger.point("serialize_start");
+      logger?.point("serialize_start");
       const hmrUpdate = hmrJSBundle(delta, revision.graph, {
         clientUrl: group.clientUrl,
         createModuleId: this._createModuleId,
         includeAsyncPaths: this._config.server.experimentalImportBundleSupport,
         projectRoot: this._config.projectRoot,
         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,
       });
-      logger === null || logger === void 0
-        ? void 0
-        : logger.point("serialize_end");
+      logger?.point("serialize_end");
       return {
         type: "update",
         body: {

package/src/IncrementalBundler.js

@@ -81,6 +81,8 @@ class IncrementalBundler {
         this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
       shallow: otherOptions.shallow,
     });
     this._config.serializer.experimentalSerializerHook(graph, {
@@ -123,6 +125,8 @@ class IncrementalBundler {
           this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
+        unstable_enablePackageExports:
+          this._config.resolver.unstable_enablePackageExports,
         shallow: otherOptions.shallow,
       }
     );
@@ -253,16 +257,12 @@ class IncrementalBundler {
     this._revisionsById.delete(revision.id);
   }
   async _getAbsoluteEntryFiles(entryFiles) {
-    const absoluteEntryFiles = entryFiles.map((entryFile) => {
-      var _this$_config$server$;
-      return path.resolve(
-        (_this$_config$server$ = this._config.server.unstable_serverRoot) !==
-          null && _this$_config$server$ !== void 0
-          ? _this$_config$server$
-          : this._config.projectRoot,
+    const absoluteEntryFiles = entryFiles.map((entryFile) =>
+      path.resolve(
+        this._config.server.unstable_serverRoot ?? this._config.projectRoot,
         entryFile
-      );
-    });
+      )
+    );
     await Promise.all(
       absoluteEntryFiles.map(
         (entryFile) =>

package/src/IncrementalBundler.js.flow

@@ -130,6 +130,8 @@ class IncrementalBundler {
         this._config.server.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
+      unstable_enablePackageExports:
+        this._config.resolver.unstable_enablePackageExports,
       shallow: otherOptions.shallow,
     });
 
@@ -176,6 +178,8 @@ class IncrementalBundler {
           this._config.server.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
+        unstable_enablePackageExports:
+          this._config.resolver.unstable_enablePackageExports,
         shallow: otherOptions.shallow,
       },
     );