metro 0.80.4 → 0.80.6

package/src/DeltaBundler/Serializers/helpers/js.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 invariant = require("invariant");
@@ -36,12 +25,6 @@ function getModuleParams(module, options) {
           options.sourceUrl != null,
           "sourceUrl is required when includeAsyncPaths is true"
         );
-
-        // TODO: Only include path if the target is not in the bundle
-
-        // Construct a server-relative URL for the split bundle, propagating
-        // most parameters from the main bundle's URL.
-
         const { searchParams } = new URL(
           jscSafeUrl.toNormalUrl(options.sourceUrl)
         );
@@ -55,7 +38,6 @@ function getModuleParams(module, options) {
           "/" +
           path.join(
             path.dirname(bundlePath),
-            // Strip the file extension
             path.basename(bundlePath, path.extname(bundlePath))
           ) +
           ".bundle?" +
@@ -68,15 +50,12 @@ function getModuleParams(module, options) {
     moduleId,
     hasPaths
       ? {
-          // $FlowIgnore[not-an-object] Intentionally spreading an array into an object
           ...dependencyMapArray,
           paths,
         }
       : dependencyMapArray,
   ];
   if (options.dev) {
-    // Add the relative path of the module to make debugging easier.
-    // This is mapped to `module.verboseName` in `require.js`.
     params.push(path.relative(options.projectRoot, module.path));
   }
   return params;

package/src/DeltaBundler/Serializers/helpers/processModules.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 { isJsModule, wrapModule } = require("./js");

package/src/DeltaBundler/Serializers/hmrJSBundle.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 { isJsModule, wrapModule } = require("./helpers/js");
@@ -20,7 +9,6 @@ function generateModules(sourceModules, graph, options) {
   const modules = [];
   for (const module of sourceModules) {
     if (isJsModule(module)) {
-      // Construct a bundle URL for this specific module only
       const getURL = (extension) => {
         options.clientUrl.pathname = path.relative(
           options.serverRoot ?? options.projectRoot,
@@ -55,26 +43,15 @@ function prepareModule(module, graph, options) {
     dev: true,
   });
   const inverseDependencies = getInverseDependencies(module.path, graph);
-  // Transform the inverse dependency paths to ids.
   const inverseDependenciesById = Object.create(null);
   Object.keys(inverseDependencies).forEach((path) => {
-    // $FlowFixMe[prop-missing]
-    // $FlowFixMe[invalid-computed-prop]
     inverseDependenciesById[options.createModuleId(path)] = inverseDependencies[
       path
     ].map(options.createModuleId);
   });
   return addParamsToDefineCall(code, inverseDependenciesById);
 }
-
-/**
- * Instead of adding the whole inverseDependncies object into each changed
- * module (which can be really huge if the dependency graph is big), we only
- * add the needed inverseDependencies for each changed module (we do this by
- * traversing upwards the dependency graph).
- */
 function getInverseDependencies(path, graph, inverseDependencies = {}) {
-  // Dependency alredy traversed.
   if (path in inverseDependencies) {
     return inverseDependencies;
   }

package/src/DeltaBundler/Serializers/sourceMapGenerator.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 getSourceMapInfo = require("./helpers/getSourceMapInfo");
@@ -43,14 +32,9 @@ function getSourceMapInfosImpl(isBlocking, onDone, modules, options) {
         break;
       }
       if (!isBlocking) {
-        // Keep the loop running but try to avoid blocking
-        // for too long because this is not in a worker yet.
         const diff = process.hrtime(time);
         const NS_IN_MS = 1000000;
         if (diff[1] > 50 * NS_IN_MS) {
-          // We've blocked for more than 50ms.
-          // This code currently runs on the main thread,
-          // so let's give Metro an opportunity to handle requests.
           setImmediate(workLoop);
           break;
         }

package/src/DeltaBundler/Serializers/sourceMapObject.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 {

package/src/DeltaBundler/Serializers/sourceMapString.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 { sourceMapGenerator } = require("./sourceMapGenerator");

package/src/DeltaBundler/Transformer.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 _crypto = _interopRequireDefault(require("crypto"));
@@ -27,10 +16,6 @@ class Transformer {
     this._config.watchFolders.forEach(verifyRootExists);
     this._cache = new Cache(config.cacheStores);
     this._getSha1 = getSha1Fn;
-
-    // Remove the transformer config params that we don't want to pass to the
-    // transformer. We should change the config object and move them away so we
-    // can treat the transformer config params as opaque.
     const {
       getTransformOptions: _getTransformOptions,
       transformVariants: _transformVariants,
@@ -70,7 +55,6 @@ class Transformer {
       ...extra
     } = transformerOptions;
     for (const key in extra) {
-      // $FlowFixMe[cannot-resolve-name]
       if (hasOwnProperty.call(extra, key)) {
         throw new Error(
           "Extra keys detected: " + Object.keys(extra).join(", ")
@@ -79,9 +63,7 @@ class Transformer {
     }
     const localPath = path.relative(this._config.projectRoot, filePath);
     const partialKey = stableHash([
-      // This is the hash related to the global Bundler config.
       this._baseHash,
-      // Path.
       localPath,
       customTransformOptions,
       dev,
@@ -98,7 +80,6 @@ class Transformer {
     ]);
     let sha1;
     if (fileBuffer) {
-      // Shortcut for virtual modules which provide the contents with the filename.
       sha1 = _crypto.default
         .createHash("sha1")
         .update(fileBuffer)
@@ -108,9 +89,6 @@ class Transformer {
     }
     let fullKey = Buffer.concat([partialKey, Buffer.from(sha1, "hex")]);
     const result = await cache.get(fullKey);
-
-    // A valid result from the cache is used directly; otherwise we call into
-    // the transformer to computed the corresponding result.
     const data = result
       ? {
           result,
@@ -121,15 +99,9 @@ class Transformer {
           transformerOptions,
           fileBuffer
         );
-
-    // Only re-compute the full key if the SHA-1 changed. This is because
-    // references are used by the cache implementation in a weak map to keep
-    // track of the cache that returned the result.
     if (sha1 !== data.sha1) {
       fullKey = Buffer.concat([partialKey, Buffer.from(data.sha1, "hex")]);
     }
-
-    // Fire-and-forget cache set promise.
     void cache.set(fullKey, data.result);
     return {
       ...data.result,
@@ -143,12 +115,10 @@ class Transformer {
     };
   }
   end() {
-    // $FlowFixMe[unused-promise]
     this._workerFarm.kill();
   }
 }
 function verifyRootExists(root) {
-  // Verify that the root exists.
   assert(fs.statSync(root).isDirectory(), "Root has to be a valid directory");
 }
 module.exports = Transformer;

package/src/DeltaBundler/Worker.flow.js

@@ -1,27 +1,9 @@
-/**
- * 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 traverse = require("@babel/traverse").default;
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
-/**
- * When the `Buffer` is sent over the worker thread it gets serialized into a JSON object.
- * This helper method will deserialize it if needed.
- *
- * @returns `Buffer` representation of the JSON object.
- * @returns `null` if the given object is nullish or not a serialized `Buffer` object.
- */
 function asDeserializedBuffer(value) {
   if (Buffer.isBuffer(value)) {
     return value;
@@ -60,7 +42,6 @@ async function transformFile(
   projectRoot,
   transformerConfig
 ) {
-  // eslint-disable-next-line no-useless-call
   const Transformer = require.call(null, transformerConfig.transformerPath);
   const transformFileStartLogEntry = {
     action_name: "Transforming file",
@@ -77,13 +58,6 @@ async function transformFile(
     data,
     transformOptions
   );
-
-  // The babel cache caches scopes and pathes for already traversed AST nodes.
-  // Clearing the cache here since the nodes of the transformed file are no longer referenced.
-  // This isn't stritcly necessary since the cache uses a WeakMap. However, WeakMap only permit
-  // that unreferenced keys are collected but the values still hold references to the Scope and NodePaths.
-  // Manually clearing the cache allows the GC to collect the Scope and NodePaths without checking if there
-  // exist any other references to the keys.
   traverse.cache.clear();
   const transformFileEndLogEntry = getEndLogEntry(
     transformFileStartLogEntry,

package/src/DeltaBundler/Worker.flow.js.flow

@@ -101,10 +101,10 @@ async function transformFile(
   transformerConfig: TransformerConfig,
 ): Promise<Data> {
   // eslint-disable-next-line no-useless-call
-  const Transformer = (require.call(
+  const Transformer: TransformerInterface = require.call(
     null,
     transformerConfig.transformerPath,
-  ): TransformerInterface);
+  );
 
   const transformFileStartLogEntry = {
     action_name: 'Transforming file',

package/src/DeltaBundler/Worker.js

@@ -1,19 +1,5 @@
-/**
- * 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";
 
-/*::
-export type * from './Worker.flow';
-*/
 try {
   require("metro-babel-register").unstable_registerForMetroMonorepo();
 } catch {}

package/src/DeltaBundler/WorkerFarm.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 { Worker: JestWorker } = require("jest-worker");
@@ -38,7 +27,6 @@ class WorkerFarm {
       });
       this._worker = worker;
     } else {
-      // eslint-disable-next-line no-useless-call
       this._worker = require.call(null, this._config.transformer.workerPath);
     }
   }
@@ -73,14 +61,11 @@ class WorkerFarm {
   _makeFarm(absoluteWorkerPath, exposedMethods, numWorkers) {
     const env = {
       ...process.env,
-      // Force color to print syntax highlighted code frames.
       FORCE_COLOR: 1,
     };
     return new JestWorker(absoluteWorkerPath, {
       computeWorkerKey: this._config.stickyWorkers
-        ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-          // $FlowFixMe[incompatible-call]
-          this._computeWorkerKey
+        ? this._computeWorkerKey
         : undefined,
       exposedMethods,
       enableWorkerThreads: this._config.transformer.unstable_workerThreads,
@@ -91,9 +76,6 @@ class WorkerFarm {
     });
   }
   _computeWorkerKey(method, filename) {
-    // Only when transforming a file we want to stick to the same worker; and
-    // we'll shard by file path. If not; we return null, which tells the worker
-    // to pick the first available one.
     if (method === "transform") {
       return filename;
     }
@@ -112,8 +94,6 @@ class WorkerFarm {
         err.message.includes(filename) ? "" : " in " + filename
       }: ${err.message}`
     );
-
-    // $FlowExpectedError: TODO(t67543470): Change this to properly extend the error.
     return Object.assign(error, {
       stack: err.stack,
       snippet: err.codeFrame,

package/src/DeltaBundler/__fixtures__/hasteImpl.js

@@ -1,20 +1,6 @@
-/**
- * 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 fs = require("fs");
-
-/**
- * Simple hasteImpl that parses @providesModule annotation from JS modules.
- */
 module.exports = {
   getHasteName(filename) {
     const matches = fs

package/src/DeltaBundler/buildSubgraph.js

@@ -9,28 +9,14 @@ var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
-/**
- * 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 resolveDependencies(parentPath, dependencies, resolve) {
   const maybeResolvedDeps = new Map();
   const resolvedContexts = new Map();
   for (const dep of dependencies) {
     let resolvedDep;
     const key = dep.data.key;
-
-    // `require.context`
     const { contextParams } = dep.data;
     if (contextParams) {
-      // Ensure the filepath has uniqueness applied to ensure multiple `require.context`
-      // statements can be used to target the same file with different properties.
       const from = _path.default.join(parentPath, "..", dep.name);
       const absolutePath = (0, _contextModule.deriveAbsolutePathFromContext)(
         from,
@@ -57,8 +43,6 @@ function resolveDependencies(parentPath, dependencies, resolve) {
           data: dep,
         };
       } catch (error) {
-        // Ignore unavailable optional dependencies. They are guarded
-        // with a try-catch block and will be handled during runtime.
         if (dep.data.isOptional !== true) {
           throw error;
         }
@@ -72,11 +56,6 @@ function resolveDependencies(parentPath, dependencies, resolve) {
     maybeResolvedDeps.set(key, resolvedDep);
   }
   const resolvedDeps = new Map();
-  // Return just the dependencies we successfully resolved.
-  // FIXME: This has a bad bug affecting all dependencies *after* an unresolved
-  // optional dependency. We'll need to propagate the nulls all the way to the
-  // serializer and the require() runtime to keep the dependency map from being
-  // desynced from the contents of the module.
   for (const [key, resolvedDep] of maybeResolvedDeps) {
     if (resolvedDep) {
       resolvedDeps.set(key, resolvedDep);
@@ -101,9 +80,6 @@ async function buildSubgraph(
     }
     visitedPaths.add(absolutePath);
     const transformResult = await transform(absolutePath, requireContext);
-
-    // Get the absolute path of all sub-dependencies (some of them could have been
-    // moved but maintain the same relative path).
     const resolutionResult = resolveDependencies(
       absolutePath,
       transformResult.dependencies,

package/src/DeltaBundler/getTransformCacheKey.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 VERSION = require("../../package.json").version;
@@ -16,8 +5,6 @@ const crypto = require("crypto");
 const getCacheKey = require("metro-cache-key");
 function getTransformCacheKey(opts) {
   const { transformerPath, transformerConfig } = opts.transformerConfig;
-
-  // eslint-disable-next-line no-useless-call
   const Transformer = require.call(null, transformerPath);
   const transformerKey = Transformer.getCacheKey
     ? Transformer.getCacheKey(transformerConfig)

package/src/DeltaBundler/getTransformCacheKey.js.flow

@@ -30,7 +30,7 @@ function getTransformCacheKey(opts: {
   const {transformerPath, transformerConfig} = opts.transformerConfig;
 
   // eslint-disable-next-line no-useless-call
-  const Transformer = (require.call(null, transformerPath): CacheKeyProvider);
+  const Transformer: CacheKeyProvider = require.call(null, transformerPath);
   const transformerKey = Transformer.getCacheKey
     ? Transformer.getCacheKey(transformerConfig)
     : '';

package/src/DeltaBundler/mergeDeltas.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";
 
 function mergeDeltas(delta1, delta2) {

package/src/DeltaBundler/types.flow.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 _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));

package/src/DeltaBundler.js

@@ -1,23 +1,6 @@
-/**
- * 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 DeltaCalculator = require("./DeltaBundler/DeltaCalculator");
-/**
- * `DeltaBundler` uses the `DeltaTransformer` to build bundle deltas. This
- * module handles all the transformer instances so it can support multiple
- * concurrent clients requesting their own deltas. This is done through the
- * `clientId` param (which maps a client to a specific delta transformer).
- */
 class DeltaBundler {
   _deltaCalculators = new Map();
   constructor(changeEventSource) {
@@ -41,10 +24,6 @@ class DeltaBundler {
     deltaCalculator.end();
     return graph.dependencies;
   }
-
-  // Note: the graph returned by this function needs to be ended when finished
-  // so that we don't leak graphs that are not reachable.
-  // To get just the dependencies, use getDependencies which will not leak graphs.
   async buildGraph(entryPoints, options) {
     const deltaCalculator = new DeltaCalculator(
       new Set(entryPoints),

package/src/HmrServer.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 hmrJSBundle = require("./DeltaBundler/Serializers/hmrJSBundle");
@@ -28,16 +18,6 @@ function send(sendFns, message) {
   const strMessage = JSON.stringify(message);
   sendFns.forEach((sendFn) => sendFn(strMessage));
 }
-
-/**
- * The HmrServer (Hot Module Reloading) implements a lightweight interface
- * to communicate easily to the logic in the React Native repository (which
- * is the one that handles the Web Socket connections).
- *
- * This interface allows the HmrServer to hook its own logic to WS clients
- * getting connected, disconnected or having errors (through the
- * `onClientConnect`, `onClientDisconnect` and `onClientError` methods).
- */
 class HmrServer {
   constructor(bundler, createModuleId, config) {
     this._config = config;
@@ -61,11 +41,6 @@ class HmrServer {
     );
     const { entryFile, resolverOptions, transformOptions, graphOptions } =
       splitBundleOptions(options);
-
-    /**
-     * `entryFile` is relative to projectRoot, we need to use resolution function
-     * to find the appropriate file with supported extensions.
-     */
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
@@ -104,7 +79,6 @@ class HmrServer {
     if (clientGroup != null) {
       clientGroup.clients.add(client);
     } else {
-      // Prepare the clientUrl to be used as sourceUrl in HMR updates.
       clientUrl.protocol = "http";
       const {
         dev,
@@ -142,7 +116,6 @@ class HmrServer {
       }, 50);
       const unlisten = this._bundler
         .getDeltaBundler()
-        // $FlowFixMe[missing-local-annot]
         .listen(graph, async (...args) => {
           latestEventArgs = args;
           await debounceCallHandleFileChange();
@@ -175,12 +148,14 @@ class HmrServer {
             )
           );
         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;
@@ -222,12 +197,6 @@ class HmrServer {
     );
     const processingHmrChange = log(
       createActionStartEntry({
-        // Even when HMR is disabled on the client, this function still
-        // runs so we can stash updates while it's off and apply them later.
-        // However, this would mess up our internal analytics because we track
-        // HMR as being used even for people who have it disabled.
-        // As a workaround, we use a different event name for clients
-        // that didn't explicitly opt into HMR.
         action_name: optedIntoHMR
           ? "Processing HMR change"
           : "Processing HMR change (no client opt-in)",