metro 0.80.5 → 0.80.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.80.5",
+  "version": "0.80.7",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -28,24 +28,24 @@
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.18.2",
+    "hermes-parser": "0.20.1",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.80.5",
-    "metro-cache": "0.80.5",
-    "metro-cache-key": "0.80.5",
-    "metro-config": "0.80.5",
-    "metro-core": "0.80.5",
-    "metro-file-map": "0.80.5",
-    "metro-resolver": "0.80.5",
-    "metro-runtime": "0.80.5",
-    "metro-source-map": "0.80.5",
-    "metro-symbolicate": "0.80.5",
-    "metro-transform-plugins": "0.80.5",
-    "metro-transform-worker": "0.80.5",
+    "metro-babel-transformer": "0.80.7",
+    "metro-cache": "0.80.7",
+    "metro-cache-key": "0.80.7",
+    "metro-config": "0.80.7",
+    "metro-core": "0.80.7",
+    "metro-file-map": "0.80.7",
+    "metro-resolver": "0.80.7",
+    "metro-runtime": "0.80.7",
+    "metro-source-map": "0.80.7",
+    "metro-symbolicate": "0.80.7",
+    "metro-transform-plugins": "0.80.7",
+    "metro-transform-worker": "0.80.7",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -66,8 +66,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.80.5",
-    "metro-memory-fs": "0.80.5",
+    "metro-babel-register": "0.80.7",
+    "metro-memory-fs": "0.80.7",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Assets.js

@@ -1,14 +1,3 @@
-/**
- * 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
- * @oncall react_native
- */
-
 "use strict";
 
 const AssetPaths = require("./node-haste/lib/AssetPaths");
@@ -19,8 +8,6 @@ const getImageSize = require("image-size");
 const path = require("path");
 const readDir = denodeify(fs.readdir);
 const readFile = denodeify(fs.readFile);
-// Test extension against all types supported by image-size module.
-// If it's not one of these, we won't treat it as an image.
 function isAssetTypeAnImage(type) {
   return (
     [
@@ -155,14 +142,9 @@ async function getAssetData(
   platform = null,
   publicPath
 ) {
-  // If the path of the asset is outside of the projectRoot, we don't want to
-  // use `path.join` since this will generate an incorrect URL path. In that
-  // case we just concatenate the publicPath with the relative path.
   let assetUrlPath = localPath.startsWith("..")
     ? publicPath.replace(/\/$/, "") + "/" + path.dirname(localPath)
     : path.join(publicPath, path.dirname(localPath));
-
-  // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === "\\") {
     assetUrlPath = assetUrlPath.replaceAll("\\", "/");
   }
@@ -192,31 +174,14 @@ async function applyAssetDataPlugins(assetDataPlugins, assetData) {
     return assetData;
   }
   const [currentAssetPlugin, ...remainingAssetPlugins] = assetDataPlugins;
-  // $FlowFixMe: impossible to type a dynamic require.
   const assetPluginFunction = require(currentAssetPlugin);
   const resultAssetData = await assetPluginFunction(assetData);
   return await applyAssetDataPlugins(remainingAssetPlugins, resultAssetData);
 }
-
-/**
- * Returns all the associated files (for different resolutions) of an asset.
- **/
 async function getAssetFiles(assetPath, platform = null) {
   const assetData = await getAbsoluteAssetRecord(assetPath, platform);
   return assetData.files;
 }
-
-/**
- * Return a buffer with the actual image given a request for an image by path.
- * The relativePath can contain a resolution postfix, in this case we need to
- * find that image (or the closest one to it's resolution) in one of the
- * project roots:
- *
- * 1. We first parse the directory of the asset
- * 2. We then build a map of all assets and their scales in this directory
- * 3. Then try to pick platform-specific asset records
- * 4. Then pick the closest resolution (rounding up) to the requested one
- */
 async function getAsset(
   relativePath,
   projectRoot,

package/src/Bundler/util.js

@@ -1,14 +1,3 @@
-/**
- * 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
- * @oncall react_native
- */
-
 "use strict";
 
 const babylon = require("@babel/parser");
@@ -20,14 +9,10 @@ function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {
     assetDescriptor,
     assetPropertyBlockList
   );
-
-  // {...}
   const descriptorAst = babylon.parseExpression(
     JSON.stringify(properDescriptor)
   );
   const t = babelTypes;
-
-  // require('AssetRegistry').registerAsset({...})
   const buildRequire = template.statement(`
     module.exports = require(ASSET_REGISTRY_PATH).registerAsset(DESCRIPTOR_AST)
   `);
@@ -45,48 +30,35 @@ function filterObject(object, blockList) {
     ...object,
   };
   for (const key of blockList) {
-    // $FlowFixMe[prop-missing]
     delete copied[key];
   }
   return copied;
 }
 function createRamBundleGroups(ramGroups, groupableModules, subtree) {
-  // build two maps that allow to lookup module data
-  // by path or (numeric) module id;
   const byPath = new Map();
   const byId = new Map();
   groupableModules.forEach((m) => {
     byPath.set(m.sourcePath, m);
     byId.set(m.id, m.sourcePath);
   });
-
-  // build a map of group root IDs to an array of module IDs in the group
   const result = new Map(
     ramGroups.map((modulePath) => {
       const root = byPath.get(modulePath);
       if (root == null) {
         throw Error(`Group root ${modulePath} is not part of the bundle`);
       }
-      return [
-        root.id,
-        // `subtree` yields the IDs of all transitive dependencies of a module
-        new Set(subtree(root, byPath)),
-      ];
+      return [root.id, new Set(subtree(root, byPath))];
     })
   );
   if (ramGroups.length > 1) {
-    // build a map of all grouped module IDs to an array of group root IDs
     const all = new ArrayMap();
     for (const [parent, children] of result) {
       for (const module of children) {
         all.get(module).push(parent);
       }
     }
-
-    // find all module IDs that are part of more than one group
     const doubles = filter(all, ([, parents]) => parents.length > 1);
     for (const [moduleId, parents] of doubles) {
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       const parentNames = parents.map(byId.get, byId);
       const lastName = parentNames.pop();
       throw new Error(

package/src/Bundler.d.ts

@@ -11,8 +11,8 @@
 import type {TransformResultWithSource} from './DeltaBundler';
 import type {TransformOptions} from './DeltaBundler/Worker';
 import type DependencyGraph from './node-haste/DependencyGraph';
-import type {ConfigT} from 'metro-config';
 import type {EventEmitter} from 'events';
+import type {ConfigT} from 'metro-config';
 
 export interface BundlerOptions {
   readonly hasReducedPerformance?: boolean;

package/src/Bundler.js

@@ -1,14 +1,3 @@
-/**
- * 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
- * @oncall react_native
- */
-
 "use strict";
 
 const Transformer = require("./DeltaBundler/Transformer");
@@ -49,13 +38,7 @@ class Bundler {
     await this._depGraph.ready();
     return this._depGraph;
   }
-  async transformFile(
-    filePath,
-    transformOptions /** Optionally provide the file contents, this can be used to provide virtual contents for a file. */,
-    fileBuffer
-  ) {
-    // We need to be sure that the DependencyGraph has been initialized.
-    // TODO: Remove this ugly hack!
+  async transformFile(filePath, transformOptions, fileBuffer) {
     await this._depGraph.ready();
     return this._transformer.transformFile(
       filePath,
@@ -63,8 +46,6 @@ class Bundler {
       fileBuffer
     );
   }
-
-  // Waits for the bundler to become ready.
   async ready() {
     await this._readyPromise;
   }

package/src/DeltaBundler/DeltaCalculator.js

@@ -1,14 +1,3 @@
-/**
- * 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
- * @oncall react_native
- */
-
 "use strict";
 
 var _Graph = require("./Graph");
@@ -18,13 +7,6 @@ function _interopRequireDefault(obj) {
 }
 const debug = require("debug")("Metro:DeltaCalculator");
 const { EventEmitter } = require("events");
-
-/**
- * This class is in charge of calculating the delta of changed modules that
- * happen between calls. To do so, it subscribes to file changes, so it can
- * traverse the files that have been changed between calls and avoid having to
- * traverse the whole dependency tree for trivial small changes.
- */
 class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
@@ -40,18 +22,12 @@ class DeltaCalculator extends EventEmitter {
     });
     this._changeEventSource.on("change", this._handleMultipleFileChanges);
   }
-
-  /**
-   * Stops listening for file changes and clears all the caches.
-   */
   end() {
     this._changeEventSource.removeListener(
       "change",
       this._handleMultipleFileChanges
     );
     this.removeAllListeners();
-
-    // Clean up all the cache data structures to deallocate memory.
     this._graph = new _Graph.Graph({
       entryPoints: this._graph.entryPoints,
       transformOptions: this._options.transformOptions,
@@ -60,22 +36,11 @@ class DeltaCalculator extends EventEmitter {
     this._deletedFiles = new Set();
     this._addedFiles = new Set();
   }
-
-  /**
-   * Main method to calculate the delta of modules. It returns a DeltaResult,
-   * which contain the modified/added modules and the removed modules.
-   */
   async getDelta({ reset, shallow }) {
     debug("Calculating delta (reset: %s, shallow: %s)", reset, shallow);
-    // If there is already a build in progress, wait until it finish to start
-    // processing a new one (delta server doesn't support concurrent builds).
     if (this._currentBuildPromise) {
       await this._currentBuildPromise;
     }
-
-    // We don't want the modified files Set to be modified while building the
-    // bundle, so we isolate them by using the current instance for the bundling
-    // and creating a new instance for the file watcher.
     const modifiedFiles = this._modifiedFiles;
     this._modifiedFiles = new Set();
     const deletedFiles = this._deletedFiles;
@@ -84,10 +49,6 @@ class DeltaCalculator extends EventEmitter {
     this._addedFiles = new Set();
     const requiresReset = this._requiresReset;
     this._requiresReset = false;
-
-    // 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 (requiresReset) {
       const markModified = (file) => {
         if (!addedFiles.has(file) && !deletedFiles.has(file)) {
@@ -97,10 +58,6 @@ class DeltaCalculator extends EventEmitter {
       this._graph.dependencies.forEach((_, key) => markModified(key));
       this._graph.entryPoints.forEach(markModified);
     }
-
-    // Concurrent requests should reuse the same bundling process. To do so,
-    // this method stores the promise as an instance variable, and then it's
-    // removed after it gets resolved.
     this._currentBuildPromise = this._getChangedDependencies(
       modifiedFiles,
       deletedFiles,
@@ -110,10 +67,6 @@ class DeltaCalculator extends EventEmitter {
     try {
       result = await this._currentBuildPromise;
     } catch (error) {
-      // In case of error, we don't want to mark the modified files as
-      // processed (since we haven't actually created any delta). If we do not
-      // do so, asking for a delta after an error will produce an empty Delta,
-      // which is not correct.
       modifiedFiles.forEach((file) => this._modifiedFiles.add(file));
       deletedFiles.forEach((file) => this._deletedFiles.add(file));
       addedFiles.forEach((file) => this._addedFiles.add(file));
@@ -121,8 +74,6 @@ class DeltaCalculator extends EventEmitter {
     } finally {
       this._currentBuildPromise = null;
     }
-
-    // Return all the modules if the client requested a reset delta.
     if (reset) {
       this._graph.reorderGraph({
         shallow,
@@ -136,29 +87,14 @@ class DeltaCalculator extends EventEmitter {
     }
     return result;
   }
-
-  /**
-   * Returns the graph with all the dependencies. Each module contains the
-   * needed information to do the traversing (dependencies, inverseDependencies)
-   * plus some metadata.
-   */
   getGraph() {
     return this._graph;
   }
-
-  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
-   * LTI update could not be added via codemod */
   _handleMultipleFileChanges = (changeEvent) => {
     changeEvent.eventsQueue.forEach((eventInfo) => {
       this._handleFileChange(eventInfo, changeEvent.logger);
     });
   };
-
-  /**
-   * Handles a single file change. To avoid doing any work before it's needed,
-   * the listener only stores the modified file, which will then be used later
-   * when the delta needs to be calculated.
-   */
   _handleFileChange = ({ type, filePath, metadata }, logger) => {
     debug("Handling %s: %s (type: %s)", type, filePath, metadata.type);
     if (
@@ -183,11 +119,8 @@ class DeltaCalculator extends EventEmitter {
     if (type === "delete") {
       nextState = "deleted";
     } else if (type === "add") {
-      // A deleted+added file is modified
       nextState = state === "deleted" ? "modified" : "added";
     } else {
-      // type === 'change'
-      // An added+modified file is added
       nextState = state === "added" ? "added" : "modified";
     }
     switch (nextState) {
@@ -209,9 +142,6 @@ class DeltaCalculator extends EventEmitter {
       default:
         nextState;
     }
-
-    // Notify users that there is a change in some of the bundle files. This
-    // way the client can choose to refetch the bundle.
     this.emit("change", {
       logger,
     });
@@ -228,39 +158,23 @@ class DeltaCalculator extends EventEmitter {
         reset: true,
       };
     }
-
-    // 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 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(modifiedModulePath)) {
           modifiedFiles.add(modifiedModulePath);
         }
       }
     });
-
-    // NOTE(EvanBacon): This check adds extra complexity so we feature gate it
-    // to enable users to opt out.
     if (this._options.unstable_allowRequireContext) {
-      // Check if any added or removed files are matched in a context module.
-      // We only need to do this for added files because (1) deleted files will have a context
-      // module as an inverse dependency, (2) modified files don't invalidate the contents
-      // of the context module.
       addedFiles.forEach((filePath) => {
         this._graph.markModifiedContextModules(filePath, modifiedFiles);
       });
     }
-
-    // We only want to process files that are in the bundle.
     const modifiedDependencies = Array.from(modifiedFiles).filter((filePath) =>
       this._graph.dependencies.has(filePath)
     );
-
-    // No changes happened. Return empty delta.
     if (modifiedDependencies.length === 0) {
       return {
         added: new Map(),