metro 0.80.4 → 0.80.6

package/src/Server.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 { getAsset } = require("./Assets");
@@ -72,11 +61,6 @@ class Server {
     this._logger = Logger;
     this._platforms = new Set(this._config.resolver.platforms);
     this._isEnded = false;
-
-    // TODO(T34760917): These two properties should eventually be instantiated
-    // elsewhere and passed as parameters, since they are also needed by
-    // the HmrServer.
-    // The whole bundling/serializing logic should follow as well.
     this._createModuleId = config.serializer.createModuleIdFactory();
     this._bundler = new IncrementalBundler(config, {
       hasReducedPerformance: options && options.hasReducedPerformance,
@@ -255,19 +239,12 @@ class Server {
     });
   }
   async getOrderedDependencyPaths(options) {
-    const {
-      entryFile,
-      onProgress,
-      resolverOptions,
-      transformOptions,
-      /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.122.0 was deployed. To see the error, delete
-       * this comment and run Flow. */
-    } = splitBundleOptions({
-      ...Server.DEFAULT_BUNDLE_OPTIONS,
-      ...options,
-      bundleType: "bundle",
-    });
+    const { entryFile, onProgress, resolverOptions, transformOptions } =
+      splitBundleOptions({
+        ...Server.DEFAULT_BUNDLE_OPTIONS,
+        ...options,
+        bundleType: "bundle",
+      });
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
@@ -281,8 +258,6 @@ class Server {
     const platform =
       transformOptions.platform ||
       parsePlatformFilePath(entryFile, this._platforms).platform;
-
-    // $FlowFixMe[incompatible-return]
     return await getAllFiles(prepend, graph, {
       platform,
       processModuleFilter: this._config.serializer.processModuleFilter,
@@ -339,8 +314,6 @@ class Server {
         urlObj.query.platform,
         this._config.resolver.assetExts
       );
-      // Tell clients to cache this for 1 year.
-      // This is safe as the asset url contains a hash of the asset.
       if (process.env.REACT_NATIVE_ENABLE_ASSET_CACHING === true) {
         res.setHeader("Cache-Control", "max-age=31536000");
       }
@@ -395,7 +368,6 @@ class Server {
         this._serverOptions.onBundleBuilt(pathname);
       }
     } else if (pathname.endsWith(".map")) {
-      // Chrome dev tools may need to access the source maps.
       res.setHeader("Access-Control-Allow-Origin", "devtools://devtools");
       await this._processSourceMapRequest(
         req,
@@ -446,11 +418,6 @@ class Server {
         serializerOptions,
         transformOptions,
       } = splitBundleOptions(bundleOptions);
-
-      /**
-       * `entryFile` is relative to projectRoot, we need to use resolution function
-       * to find the appropriate file with supported extensions.
-       */
       let resolvedEntryFilePath;
       try {
         resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
@@ -474,8 +441,6 @@ class Server {
         shallow: graphOptions.shallow,
         lazy: graphOptions.lazy,
       });
-
-      // For resources that support deletion, handle the DELETE method.
       if (deleteFn && req.method === "DELETE") {
         const deleteContext = {
           graphId,
@@ -503,11 +468,6 @@ class Server {
             (transformedFileCount / totalFileCount) * 100,
             10
           );
-
-          // We want to throttle the updates so that we only show meaningful
-          // UI updates slow enough for the client to actually handle them. For
-          // that, we check the percentage, and only send percentages that are
-          // actually different and that have increased from the last one we sent.
           if (currentProgress > lastProgress || totalFileCount < 10) {
             if (mres instanceof MultipartResponse) {
               mres.writeChunk(
@@ -520,14 +480,6 @@ class Server {
                 })
               );
             }
-
-            // The `uncork` called internally in Node via `promise.nextTick()` may not fire
-            // until all of the Promises are resolved because the microtask queue we're
-            // in could be starving the event loop. This can cause a bug where the progress
-            // is not actually sent in the response until after bundling is complete. This
-            // would defeat the purpose of sending progress, so we `uncork` the stream now
-            // which will force the response to flush to the client immediately.
-            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             if (res.socket != null && res.socket.uncork != null) {
               res.socket.uncork();
             }
@@ -614,9 +566,6 @@ class Server {
         type: "bundle_build_done",
       });
       log(
-        /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses
-         * an error found when Flow v0.122.0 was deployed. To see the error,
-         * delete this comment and run Flow. */
         createActionEndEntry({
           ...logEntry,
           ...createEndEntry(endContext),
@@ -751,9 +700,6 @@ class Server {
         bundlePerfLogger.end("SUCCESS");
       });
       if (
-        // We avoid parsing the dates since the client should never send a more
-        // recent date than the one returned by the Delta Bundler (if that's the
-        // case it's fine to return the whole bundle).
         req.headers["if-modified-since"] ===
         result.lastModifiedDate.toUTCString()
       ) {
@@ -794,16 +740,11 @@ class Server {
       res.end();
     },
   });
-
-  // This function ensures that modules in source maps are sorted in the same
-  // order as in a plain JS bundle.
   _getSortedModules(graph) {
     const modules = [...graph.dependencies.values()];
-    // Assign IDs to modules in a consistent order
     for (const module of modules) {
       this._createModuleId(module.path);
     }
-    // Sort by IDs
     return modules.sort(
       (a, b) => this._createModuleId(a.path) - this._createModuleId(b.path)
     );
@@ -926,8 +867,6 @@ class Server {
             content: codeFrameColumns(
               fs.readFileSync(fileAbsolute, "utf8"),
               {
-                // Metro returns 0 based columns but codeFrameColumns expects 1-based columns
-                // $FlowFixMe[unsafe-addition]
                 start: {
                   column: column + 1,
                   line: lineNumber,
@@ -954,7 +893,6 @@ class Server {
         createActionStartEntry("Symbolicating")
       );
       debug("Start symbolication");
-      /* $FlowFixMe: where is `rawBody` defined? Is it added by the `connect` framework? */
       const body = await req.rawBody;
       const parsedBody = JSON.parse(body);
       const rewriteAndNormalizeStackFrame = (frame, lineNumber) => {
@@ -974,12 +912,9 @@ class Server {
         return frame;
       };
       const stack = parsedBody.stack.map(rewriteAndNormalizeStackFrame);
-      // In case of multiple bundles / HMR, some stack frames can have different URLs from others
       const urls = new Set();
       stack.forEach((frame) => {
-        // These urls have been rewritten and normalized above.
         const sourceUrl = frame.file;
-        // Skip `/debuggerWorker.js` which does not need symbolication.
         if (
           sourceUrl != null &&
           !urls.has(sourceUrl) &&
@@ -1033,11 +968,6 @@ class Server {
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(bundleOptions);
-
-    /**
-     * `entryFile` is relative to projectRoot, we need to use resolution function
-     * to find the appropriate file with supported extensions.
-     */
     const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
       relativeTo: "server",
       resolverOptions,
@@ -1134,25 +1064,18 @@ class Server {
   _getEntryPointAbsolutePath(entryFile) {
     return path.resolve(this._getServerRootDir(), entryFile);
   }
-
-  // Wait for the server to finish initializing.
   async ready() {
     await this._bundler.ready();
   }
   _shouldAddModuleToIgnoreList(module) {
-    // TODO: Add flag to Module signifying whether it represents generated code
-    // and clean up these heuristics.
     return (
-      // Prelude code, see getPrependedScripts.js
       module.path === "__prelude__" ||
-      // Generated require.context() module, see contextModule.js
       module.path.includes("?ctx=") ||
       this._config.serializer.isThirdPartyModule(module)
     );
   }
 }
 function* zip(xs, ys) {
-  //$FlowIssue #9324959
   const ysIter = ys[Symbol.iterator]();
   for (const x of xs) {
     const y = ysIter.next();

package/src/cli/parseKeyValueParamArray.js

@@ -8,17 +8,6 @@ var _querystring = _interopRequireDefault(require("querystring"));
 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
- * @oncall react_native
- */
-
 function coerceKeyValueArray(keyValueArray) {
   const result = Object.create(null);
   for (const item of keyValueArray) {

package/src/cli-utils.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 fs = require("fs");

package/src/cli.js

@@ -1,22 +1,9 @@
 #!/usr/bin/env node
-/**
- * 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";
 
 try {
-  // $FlowFixMe[untyped-import]
   require("metro-babel-register").unstable_registerForMetroMonorepo();
 } catch {}
 const { attachMetroCli } = require("./index");
 const yargs = require("yargs");
-
-// $FlowFixMe[unused-promise]
 attachMetroCli(yargs.demandCommand(1)).argv;

package/src/commands/build.js

@@ -6,17 +6,6 @@ var _parseKeyValueParamArray = _interopRequireDefault(
 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
- * @oncall react_native
- */
-
 const { makeAsyncCommand } = require("../cli-utils");
 const TerminalReporter = require("../lib/TerminalReporter");
 const { loadConfig } = require("metro-config");
@@ -85,8 +74,6 @@ module.exports = () => ({
       describe:
         "Custom resolver options of the form key=value. URL-encoded. May be specified multiple times.",
     });
-
-    // Deprecated
     yargs.option("reset-cache", {
       type: "boolean",
     });
@@ -104,8 +91,6 @@ module.exports = () => ({
       customResolverOptions: argv.resolverOption,
       customTransformOptions: argv.transformOption,
     };
-
-    // Inline require() to avoid circular dependency with ../index
     const MetroApi = require("../index");
     await MetroApi.runBuild(config, {
       ...options,

package/src/commands/dependencies.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 { makeAsyncCommand } = require("../cli-utils");
@@ -24,8 +13,6 @@ async function dependencies(args, config) {
       new Error(`File ${rootModuleAbsolutePath} does not exist`)
     );
   }
-
-  // $FlowFixMe[cannot-write]
   config.cacheStores = [];
   const relativePath = path.relative(
     config.server.unstable_serverRoot ?? config.projectRoot,
@@ -43,10 +30,6 @@ async function dependencies(args, config) {
   const server = new Server(config);
   const deps = await server.getOrderedDependencyPaths(options);
   deps.forEach((modulePath) => {
-    // Temporary hack to disable listing dependencies not under this directory.
-    // Long term, we need either
-    // (a) JS code to not depend on anything outside this directory, or
-    // (b) Come up with a way to declare this dependency in Buck.
     const isInsideProjectRoots =
       config.watchFolders.filter((root) => modulePath.startsWith(root)).length >
       0;
@@ -56,8 +39,7 @@ async function dependencies(args, config) {
   });
   server.end();
   return args.output != null
-    ? // $FlowFixMe[method-unbinding]
-      promisify(outStream.end).bind(outStream)()
+    ? promisify(outStream.end).bind(outStream)()
     : Promise.resolve();
 }
 module.exports = () => ({

package/src/commands/serve.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 { makeAsyncCommand, watchFile } = require("../cli-utils");
@@ -63,13 +52,9 @@ module.exports = () => ({
       alias: "c",
       type: "string",
     });
-
-    // Deprecated
     yargs.option("reset-cache", {
       type: "boolean",
     });
-
-    // Examples
     yargs.example(
       "secure-server-options",
       '-s.cert="$(cat path/to/cert)" -s.key="$(cat path/to/key")'
@@ -85,14 +70,10 @@ module.exports = () => ({
         restarting = true;
       }
       if (server) {
-        // eslint-disable-next-line no-console
         console.log("Configuration changed. Restarting the server...");
-        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         await promisify(server.close).call(server);
       }
       const config = await loadConfig(argv);
-
-      // Inline require() to avoid circular dependency with ../index
       const MetroApi = require("../index");
       const {
         config: _config,

package/src/index.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";
 
 const makeBuildCommand = require("./commands/build");
@@ -37,8 +26,6 @@ exports.Terminal = Terminal;
 exports.TerminalReporter = TerminalReporter;
 async function getConfig(config) {
   const defaultConfig = await getDefaultConfig(config.projectRoot);
-  // $FlowFixMe[incompatible-variance]
-  // $FlowFixMe[incompatible-call]
   return mergeConfig(defaultConfig, config);
 }
 async function runMetro(config, options) {
@@ -81,12 +68,8 @@ exports.loadConfig = loadConfig;
 exports.mergeConfig = mergeConfig;
 exports.resolveConfig = resolveConfig;
 const createConnectMiddleware = async function (config, options) {
-  // $FlowFixMe[incompatible-variance]
-  // $FlowFixMe[incompatible-call]
   const metroServer = await runMetro(config, options);
   let enhancedMiddleware = metroServer.processRequest;
-
-  // Enhance the resulting middleware using the config options
   if (config.server.enhanceMiddleware) {
     enhancedMiddleware = config.server.enhanceMiddleware(
       enhancedMiddleware,
@@ -130,11 +113,8 @@ exports.runServer = async (
     onReady,
     secureServerOptions,
     secure,
-    //deprecated
     secureCert,
-    // deprecated
     secureKey,
-    // deprecated
     unstable_extraMiddleware,
     waitForBundler = false,
     websocketEndpoints = {},
@@ -143,7 +123,6 @@ exports.runServer = async (
 ) => {
   await earlyPortCheck(host, config.server.port);
   if (secure != null || secureCert != null || secureKey != null) {
-    // eslint-disable-next-line no-console
     console.warn(
       chalk.inverse.yellow.bold(" DEPRECATED "),
       "The `secure`, `secureCert`, and `secureKey` options are now deprecated. " +
@@ -151,7 +130,6 @@ exports.runServer = async (
         "Metro's https development server."
     );
   }
-  // Lazy require
   const connect = require("connect");
   const serverApp = connect();
   const { middleware, end, metroServer } = await createConnectMiddleware(
@@ -176,7 +154,6 @@ exports.runServer = async (
         ...secureServerOptions,
       };
     }
-    // $FlowFixMe[incompatible-call] 'http' and 'https' Flow types do not match
     httpServer = https.createServer(options, serverApp);
   } else {
     httpServer = http.createServer(serverApp);
@@ -220,10 +197,6 @@ exports.runServer = async (
       });
       resolve(httpServer);
     });
-
-    // Disable any kind of automatic timeout behavior for incoming
-    // requests in case it takes the packager more than the default
-    // timeout of 120 seconds to respond to a request.
     httpServer.timeout = 0;
     httpServer.on("close", () => {
       end();
@@ -248,8 +221,6 @@ exports.runBuild = async (
     sourceMapUrl,
   }
 ) => {
-  // $FlowFixMe[incompatible-variance]
-  // $FlowFixMe[incompatible-call]
   const metroServer = await runMetro(config, {
     watch: false,
   });
@@ -283,8 +254,6 @@ exports.runBuild = async (
         dev,
         platform,
       };
-
-      // eslint-disable-next-line no-console
       await output.save(metroBundle, outputOptions, console.log);
     }
     return metroBundle;

package/src/index.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 './index.flow';
-*/
 try {
   require("metro-babel-register").unstable_registerForMetroMonorepo();
 } catch {}

package/src/integration_tests/basic_bundle/AssetRegistry.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";
 
 module.exports = {

package/src/integration_tests/basic_bundle/Bar.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 Foo = require("./Foo");

package/src/integration_tests/basic_bundle/ErrorBundle.js

@@ -1,19 +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";
 
-// Add a random require to fill the bundle with some sourcecode.
 require("./AssetRegistry");
 const calcSum = (value) => {
-  // some random function
   const error = new Error("SOURCEMAP: value: " + value);
   return error;
 };

package/src/integration_tests/basic_bundle/Foo.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 asset = require("./test.png");

package/src/integration_tests/basic_bundle/TestBigInt.js

@@ -1,17 +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
- *
- */
-
 "use strict";
 
-// $FlowFixMe[signature-verification-failure]
 var a = 2n;
-// $FlowFixMe[signature-verification-failure]
 var b = 3n;
 module.exports = a ** b;

package/src/integration_tests/basic_bundle/TestBundle.js

@@ -1,18 +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 Bar = require("./Bar");
 const Foo = require("./Foo");
-// $FlowFixMe: Flow doesn't understand TypeScript
 const TypeScript = require("./TypeScript");
 Object.keys({
   ...Bar,

package/src/integration_tests/basic_bundle/TestPolyfill.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";
 
 module.exports = global.POLYFILL_IS_INJECTED;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js

@@ -4,18 +4,4 @@ var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 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
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-
-// $FlowExpectedError[cannot-resolve-module]
-
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js

@@ -1,18 +1,4 @@
 "use strict";
 
 var _doesNotExist = require("./does-not'\"-exist");
-/**
- * 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
- */
-
-/* eslint-disable no-unused-vars */
-
-// $FlowExpectedError[cannot-resolve-module]
-
 global.x = _doesNotExist.aaaaaaaaaa;