metro 0.80.4 → 0.80.6

package/src/HmrServer.js.flow

@@ -228,12 +228,14 @@ class HmrServer<TClient: Client> {
             ),
           );
         case 'log':
-          this._config.reporter.update({
-            type: 'client_log',
-            level: data.level,
-            data: data.data,
-            mode: data.mode,
-          });
+          if (this._config.server.forwardClientLogs) {
+            this._config.reporter.update({
+              type: 'client_log',
+              level: data.level,
+              data: data.data,
+              mode: data.mode,
+            });
+          }
           break;
         case 'log-opt-in':
           client.optedIntoHMR = true;

package/src/IncrementalBundler/GraphNotFoundError.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";
 
 class GraphNotFoundError extends Error {

package/src/IncrementalBundler/ResourceNotFoundError.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";
 
 class ResourceNotFoundError extends Error {

package/src/IncrementalBundler/RevisionNotFoundError.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";
 
 class RevisionNotFoundError extends Error {

package/src/IncrementalBundler.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 Bundler = require("./Bundler");
@@ -37,7 +26,6 @@ class IncrementalBundler {
   }
   end() {
     this._deltaBundler.end();
-    // $FlowFixMe[unused-promise]
     this._bundler.end();
   }
   getBundler() {
@@ -162,9 +150,6 @@ class IncrementalBundler {
       graph,
     };
   }
-
-  // TODO T34760750 (alexkirsz) Eventually, I'd like to get to a point where
-  // this class exposes only initializeGraph and updateGraph.
   async initializeGraph(
     entryFile,
     transformOptions,
@@ -213,8 +198,6 @@ class IncrementalBundler {
         delta,
       };
     } catch (err) {
-      // Evict a bad revision from the cache since otherwise
-      // we'll keep getting it even after the build is fixed.
       this._revisionsById.delete(revisionId);
       this._revisionsByGraphId.delete(graphId);
       throw err;
@@ -234,8 +217,6 @@ class IncrementalBundler {
       this._revisionsById.delete(revision.id);
       revision = {
         ...revision,
-        // Generate a new revision id, to be used to verify the next incremental
-        // request.
         id: crypto.randomBytes(8).toString("hex"),
         date: new Date(),
       };
@@ -269,8 +250,6 @@ class IncrementalBundler {
       absoluteEntryFiles.map(
         (entryFile) =>
           new Promise((resolve, reject) => {
-            // This should throw an error if the file doesn't exist.
-            // Using this instead of fs.exists to account for SimLinks.
             fs.realpath(entryFile, (err) => {
               if (err) {
                 reject(new ResourceNotFoundError(entryFile));
@@ -283,8 +262,6 @@ class IncrementalBundler {
     );
     return absoluteEntryFiles;
   }
-
-  // Wait for the bundler to become ready.
   async ready() {
     await this._bundler.ready();
   }

package/src/ModuleGraph/test-helpers.js

@@ -1,13 +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 generate = require("@babel/generator").default;
@@ -61,17 +51,10 @@ function toEqualComparableCode(received, expected) {
     pass,
   };
 }
-
-// See https://superuser.com/questions/380772/removing-ansi-color-codes-from-text-stream
 const ANSI_PATTERN = /\x1b\[[0-9;]*m/g;
 function trimANSICodes(input) {
   return input.replace(ANSI_PATTERN, "");
 }
-
-/**
- * Matches a text that contains ANSI control codes (e.g. [39m^) against a snapshot.
- * Usage: Call expect.extend({toMatchCodeFrameSnapshot}) to add the matcher in your test
- */
 function toMatchCodeFrameSnapshot(received) {
   return toMatchSnapshot.call(
     this,

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -1,13 +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
- *
- */
-
 "use strict";
 
 var _template = _interopRequireDefault(require("@babel/template"));
@@ -57,11 +47,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
-const WRAP_NAME = "$$_REQUIRE"; // note: babel will prefix this with _
-
-// Check first the `global` variable as the global object. This way serializers
-// can create a local variable called global to fake it as a global object
-// without having to pollute the window object on web.
+const WRAP_NAME = "$$_REQUIRE";
 const IIFE_PARAM = _template.default.expression(
   "typeof globalThis !== 'undefined' ? globalThis : typeof global !== 'undefined' ? global : typeof window !== 'undefined' ? window : this"
 );
@@ -95,7 +81,6 @@ function jsonToCommonJS(source) {
   return `module.exports = ${source};`;
 }
 function wrapJson(source, globalPrefix) {
-  // Unused parameters; remember that's wrapping JSON.
   const moduleFactoryParameters = buildParameters(
     "_importDefaultUnused",
     "_importAllUnused",
@@ -128,12 +113,6 @@ function buildParameters(importDefaultName, importAllName, dependencyMapName) {
     dependencyMapName,
   ];
 }
-
-// Renaming requires should ideally only be done when generating for the target
-// that expects the custom require name in the optimize step.
-// This visitor currently renames all `require` references even if the module
-// contains a custom `require` declaration. This should be fixed by only renaming
-// if the `require` symbol hasn't been redeclared.
 function renameRequires(ast) {
   let newRequireName = WRAP_NAME;
   (0, _traverse.default)(ast, {

package/src/ModuleGraph/worker/collectDependencies.js

@@ -1,13 +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
- *
- */
-
 "use strict";
 
 const generate = require("@babel/generator").default;
@@ -17,15 +7,6 @@ const types = require("@babel/types");
 const crypto = require("crypto");
 const nullthrows = require("nullthrows");
 const { isImport } = types;
-/**
- * Transform all the calls to `require()` and `import()` in a file into ID-
- * independent code, and return the list of dependencies. For example, a call
- * like `require('Foo')` could be transformed to `require(_depMap[3], 'Foo')`
- * where `_depMap` is provided by the outer scope. As such, we don't need to
- * know the actual module ID.
- *
- * The second argument is only provided for debugging purposes.
- */
 function collectDependencies(ast, options) {
   const visited = new WeakSet();
   const state = {
@@ -59,38 +40,27 @@ function collectDependencies(ast, options) {
         });
         return;
       }
-
-      // Match `require.context`
       if (
-        // Feature gate, defaults to `false`.
         state.unstable_allowRequireContext &&
         callee.type === "MemberExpression" &&
-        // `require`
         callee.object.type === "Identifier" &&
         callee.object.name === "require" &&
-        // `context`
         callee.property.type === "Identifier" &&
         callee.property.name === "context" &&
         !callee.computed &&
-        // Ensure `require` refers to the global and not something else.
         !path.scope.getBinding("require")
       ) {
         processRequireContextCall(path, state);
         visited.add(path.node);
         return;
       }
-
-      // Match `require.resolveWeak`
       if (
         callee.type === "MemberExpression" &&
-        // `require`
         callee.object.type === "Identifier" &&
         callee.object.name === "require" &&
-        // `resolveWeak`
         callee.property.type === "Identifier" &&
         callee.property.name === "resolveWeak" &&
         !callee.computed &&
-        // Ensure `require` refers to the global and not something else.
         !path.scope.getBinding("require")
       ) {
         processResolveWeakCall(path, state);
@@ -126,7 +96,6 @@ function collectDependencies(ast, options) {
   };
   traverse(ast, visitor, null, state);
   const collectedDependencies = state.dependencyRegistry.getDependencies();
-  // Compute the list of dependencies.
   const dependencies = new Array(collectedDependencies.length);
   for (const { index, name, ...dependencyData } of collectedDependencies) {
     dependencies[index] = {
@@ -140,8 +109,6 @@ function collectDependencies(ast, options) {
     dependencyMapName: nullthrows(state.dependencyMapIdentifier).name,
   };
 }
-
-/** Extract args passed to the `require.context` method. */
 function getRequireContextArgs(path) {
   const args = path.get("arguments");
   let directory;
@@ -158,8 +125,6 @@ function getRequireContextArgs(path) {
       );
     }
   }
-
-  // Default to requiring through all directories.
   let recursive = true;
   if (args.length > 1) {
     const result = args[1].evaluate();
@@ -172,19 +137,14 @@ function getRequireContextArgs(path) {
       );
     }
   }
-
-  // Default to all files.
   let filter = {
     pattern: ".*",
     flags: "",
   };
   if (args.length > 2) {
-    // evaluate() to check for undefined (because it's technically a scope lookup)
-    // but check the AST for the regex literal, since evaluate() doesn't do regex.
     const result = args[2].evaluate();
     const argNode = args[2].node;
     if (argNode.type === "RegExpLiteral") {
-      // TODO: Handle `new RegExp(...)` -- `argNode.type === 'NewExpression'`
       filter = {
         pattern: argNode.pattern,
         flags: argNode.flags || "",
@@ -196,8 +156,6 @@ function getRequireContextArgs(path) {
       );
     }
   }
-
-  // Default to `sync`.
   let mode = "sync";
   if (args.length > 3) {
     const result = args[3].evaluate();
@@ -245,17 +203,13 @@ function processRequireContextCall(path, state) {
   const dep = registerDependency(
     state,
     {
-      // We basically want to "import" every file in a folder and then filter them out with the given `filter` RegExp.
       name: directory,
-      // Capture the matching context
       contextParams,
       asyncType: null,
       optional: isOptionalDependency(directory, path, state),
     },
     path
   );
-
-  // require() the generated module representing this context
   path.get("callee").replaceWith(types.identifier("require"));
   transformer.transformSyncRequire(path, dep, state);
 }
@@ -339,15 +293,11 @@ function getNearestLocFromPath(path) {
   while (
     current &&
     !current.node.loc &&
-    // $FlowIgnore[prop-missing] METRO_INLINE_REQUIRES_INIT_LOC is Metro-specific and not typed
     !current.node.METRO_INLINE_REQUIRES_INIT_LOC
   ) {
     current = current.parentPath;
   }
-  return (
-    // $FlowIgnore[prop-missing] METRO_INLINE_REQUIRES_INIT_LOC is Metro-specific and not typed
-    current?.node.METRO_INLINE_REQUIRES_INIT_LOC ?? current?.node.loc
-  );
+  return current?.node.METRO_INLINE_REQUIRES_INIT_LOC ?? current?.node.loc;
 }
 function registerDependency(state, qualifier, path) {
   const dependency = state.dependencyRegistry.registerDependency(qualifier);
@@ -359,8 +309,6 @@ function registerDependency(state, qualifier, path) {
 }
 function isOptionalDependency(name, path, state) {
   const { allowOptionalDependencies } = state;
-
-  // The async require module is a 'built-in'. Resolving should never fail -> treat it as non-optional.
   if (name === state.asyncRequireModulePathStringLiteral?.value) {
     return false;
   }
@@ -370,15 +318,11 @@ function isOptionalDependency(name, path, state) {
   if (!allowOptionalDependencies || isExcluded()) {
     return false;
   }
-
-  // Valid statement stack for single-level try-block: expressionStatement -> blockStatement -> tryStatement
   let sCount = 0;
   let p = path;
   while (p && sCount < 3) {
     if (p.isStatement()) {
       if (p.node.type === "BlockStatement") {
-        // A single-level should have the tryStatement immediately followed BlockStatement
-        // with the key 'block' to distinguish from the finally block, which has key = 'finalizer'
         return (
           p.parentPath != null &&
           p.parentPath.node.type === "TryStatement" &&
@@ -417,12 +361,6 @@ class InvalidRequireCallError extends Error {
   }
 }
 collectDependencies.InvalidRequireCallError = InvalidRequireCallError;
-
-/**
- * Produces a Babel template that will throw at runtime when the require call
- * is reached. This makes dynamic require errors catchable by libraries that
- * want to use them.
- */
 const dynamicRequireErrorTemplate = template.expression(`
   (function(line) {
     throw new Error(
@@ -430,11 +368,6 @@ const dynamicRequireErrorTemplate = template.expression(`
     );
   })(LINE)
 `);
-
-/**
- * Produces a Babel template that transforms an "import(...)" call into a
- * "require(...)" call to the asyncRequire specified.
- */
 const makeAsyncRequireTemplate = template.expression(`
   require(ASYNC_REQUIRE_MODULE_PATH)(MODULE_ID, DEPENDENCY_MAP.paths)
 `);
@@ -454,7 +387,6 @@ const DefaultDependencyTransformer = {
   transformSyncRequire(path, dependency, state) {
     const moduleIDExpression = createModuleIDExpression(dependency, state);
     path.node.arguments = [moduleIDExpression];
-    // Always add the debug name argument last
     if (state.keepRequireNames) {
       path.node.arguments.push(types.stringLiteral(dependency.name));
     }
@@ -513,24 +445,6 @@ function createModuleIDExpression(dependency, state) {
 function createModuleNameLiteral(dependency) {
   return types.stringLiteral(dependency.name);
 }
-
-/**
- * Given an import qualifier, return a key used to register the dependency.
- * Generally this return the `ImportQualifier.name` property, but more
- * attributes can be appended to distinguish various combinations that would
- * otherwise conflict.
- *
- * For example, the following case would have collision issues if they all utilized the `name` property:
- * ```
- * require('./foo');
- * require.context('./foo');
- * require.context('./foo', true, /something/);
- * require.context('./foo', false, /something/);
- * require.context('./foo', false, /something/, 'lazy');
- * ```
- *
- * This method should be utilized by `registerDependency`.
- */
 function getKeyForDependency(qualifier) {
   let key = qualifier.name;
   const { asyncType } = qualifier;
@@ -538,11 +452,7 @@ function getKeyForDependency(qualifier) {
     key += ["", asyncType].join("\0");
   }
   const { contextParams } = qualifier;
-  // Add extra qualifiers when using `require.context` to prevent collisions.
   if (contextParams) {
-    // NOTE(EvanBacon): Keep this synchronized with `RequireContextParams`, if any other properties are added
-    // then this key algorithm should be updated to account for those properties.
-    // Example: `./directory__true__/foobar/m__lazy`
     key += [
       "",
       "context",
@@ -550,7 +460,6 @@ function getKeyForDependency(qualifier) {
       String(contextParams.filter.pattern),
       String(contextParams.filter.flags),
       contextParams.mode,
-      // Join together and append to the name:
     ].join("\0");
   }
   return key;
@@ -577,8 +486,6 @@ class DependencyRegistry {
       dependency = newDependency;
     } else {
       if (dependency.isOptional && !qualifier.optional) {
-        // A previously optionally required dependency was required non-optionally.
-        // Mark it non optional for the whole module
         dependency = {
           ...dependency,
           isOptional: false,

package/src/ModuleGraph/worker/generateImportNames.js

@@ -1,22 +1,7 @@
-/**
- * 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
- *
- */
-
 "use strict";
 
 const traverse = require("@babel/traverse").default;
 const nullthrows = require("nullthrows");
-
-/**
- * Select unused names for "metroImportDefault" and "metroImportAll", by
- * calling "generateUid".
- */
 function generateImportNames(ast) {
   let importDefault;
   let importAll;

package/src/Server/MultipartResponse.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 accepts = require("accepts");
@@ -52,8 +41,6 @@ class MultipartResponse {
     }
   }
   writeHead(status, headers) {
-    // We can't actually change the response HTTP status code
-    // because the headers have already been sent
     this.setHeader("X-Http-Status", status);
     if (!headers) {
       return;

package/src/Server/symbolicate.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 { greatestLowerBound } = require("metro-source-map/src/Consumer/search");
@@ -24,9 +13,8 @@ function createFunctionNameGetter(module) {
       names: [],
       x_facebook_sources: [[module.functionMap]],
     },
-    (name) => name /* no normalization needed */
+    (name) => name
   );
-
   return ({ line1Based, column0Based }) =>
     consumer.functionNameFor({
       line: line1Based,
@@ -81,16 +69,11 @@ async function symbolicate(stack, maps, config, extraData) {
       return null;
     }
     const mapping = module.map[mappingIndex];
-    if (
-      mapping[0] !== generatedPosInModule.line1Based ||
-      mapping.length < 4 /* no source line/column info */
-    ) {
+    if (mapping[0] !== generatedPosInModule.line1Based || mapping.length < 4) {
       return null;
     }
     return {
-      // $FlowFixMe: Length checks do not refine tuple unions.
       line1Based: mapping[2],
-      // $FlowFixMe: Length checks do not refine tuple unions.
       column0Based: mapping[3],
     };
   }
@@ -133,15 +116,6 @@ async function symbolicate(stack, maps, config, extraData) {
       column: originalPos.column0Based,
     };
   }
-
-  /**
-   * `customizeFrame` allows for custom modifications of the symbolicated frame in a stack.
-   * It can be used to collapse stack frames that are not relevant to users, pointing them
-   * to more relevant product code instead.
-   *
-   * An example usecase is a library throwing an error while sanitizing inputs from product code.
-   * In some cases, it's more useful to point the developer looking at the error towards the product code directly.
-   */
   async function customizeFrame(frame) {
     const customizations =
       (await config.symbolicator.customizeFrame(frame)) || {};
@@ -150,14 +124,6 @@ async function symbolicate(stack, maps, config, extraData) {
       ...customizations,
     };
   }
-
-  /**
-   * `customizeStack` allows for custom modifications of a symbolicated stack.
-   * Where `customizeFrame` operates on individual frames, this hook can process the entire stack in context.
-   *
-   * Note: `customizeStack` has access to an `extraData` object which can be used to attach metadata
-   * to the error coming in, to be used by the customizeStack hook.
-   */
   async function customizeStack(symbolicatedStack) {
     return await config.symbolicator.customizeStack(
       symbolicatedStack,