metro 0.76.0 → 0.76.1

package/src/Server.js.flow

@@ -43,7 +43,6 @@ import type {CustomResolverOptions} from 'metro-resolver/src/types';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
 const {getAsset} = require('./Assets');
-const baseBytecodeBundle = require('./DeltaBundler/Serializers/baseBytecodeBundle');
 const baseJSBundle = require('./DeltaBundler/Serializers/baseJSBundle');
 const getAllFiles = require('./DeltaBundler/Serializers/getAllFiles');
 const getAssets = require('./DeltaBundler/Serializers/getAssets');
@@ -54,7 +53,6 @@ const getRamBundleInfo = require('./DeltaBundler/Serializers/getRamBundleInfo');
 const sourceMapString = require('./DeltaBundler/Serializers/sourceMapString');
 const IncrementalBundler = require('./IncrementalBundler');
 const ResourceNotFoundError = require('./IncrementalBundler/ResourceNotFoundError');
-const bundleToBytecode = require('./lib/bundleToBytecode');
 const bundleToString = require('./lib/bundleToString');
 const formatBundlingError = require('./lib/formatBundlingError');
 const getGraphId = require('./lib/getGraphId');
@@ -128,10 +126,6 @@ export type ServerOptions = $ReadOnly<{
 const DELTA_ID_HEADER = 'X-Metro-Delta-ID';
 const FILES_CHANGED_COUNT_HEADER = 'X-Metro-Files-Changed-Count';
 
-function getBytecodeVersion() {
-  return require('metro-hermes-compiler').VERSION;
-}
-
 class Server {
   _bundler: IncrementalBundler;
   _config: ConfigT;
@@ -349,7 +343,7 @@ class Server {
     +dev: boolean,
     +entryFile: string,
     +minify: boolean,
-    +platform: string,
+    +platform: ?string,
     ...
   }): Promise<Array<string>> {
     const {
@@ -402,12 +396,13 @@ class Server {
         'Accept-Ranges': 'bytes',
         'Content-Length': chunksize.toString(),
         'Content-Range': `bytes ${dataStart}-${dataEnd}/${data.length}`,
-        'Content-Type': mime.lookup(path.basename(assetPath)),
       });
 
       return data.slice(dataStart, dataEnd + 1);
     }
 
+    res.setHeader('Content-Length', String(Buffer.byteLength(data)));
+
     return data;
   }
 
@@ -456,6 +451,7 @@ class Server {
       if (process.env.REACT_NATIVE_ENABLE_ASSET_CACHING === true) {
         res.setHeader('Cache-Control', 'max-age=31536000');
       }
+      res.setHeader('Content-Type', mime.lookup(path.basename(assetPath)));
       res.end(this._rangeRequestMiddleware(req, res, data, assetPath));
       process.nextTick(() => {
         log(createActionEndEntry(processingAssetRequestLogEntry));
@@ -480,11 +476,7 @@ class Server {
   };
 
   _parseOptions(url: string): BundleOptions {
-    return parseOptionsFromUrl(
-      url,
-      new Set(this._config.resolver.platforms),
-      getBytecodeVersion(),
-    );
+    return parseOptionsFromUrl(url, new Set(this._config.resolver.platforms));
   }
 
   async _processRequest(
@@ -510,20 +502,13 @@ class Server {
     const buildNumber = this.getNewBuildNumber();
     if (pathname.endsWith('.bundle')) {
       const options = this._parseOptions(formattedUrl);
-      if (options.runtimeBytecodeVersion) {
-        await this._processBytecodeBundleRequest(req, res, options, {
-          buildNumber,
-          bundlePerfLogger: noopLogger,
-        });
-      } else {
-        await this._processBundleRequest(req, res, options, {
-          buildNumber,
-          bundlePerfLogger:
-            this._config.unstable_perfLoggerFactory?.('BUNDLING_REQUEST', {
-              key: buildNumber,
-            }) ?? noopLogger,
-        });
-      }
+      await this._processBundleRequest(req, res, options, {
+        buildNumber,
+        bundlePerfLogger:
+          this._config.unstable_perfLoggerFactory?.('BUNDLING_REQUEST', {
+            key: buildNumber,
+          }) ?? noopLogger,
+      });
 
       if (this._serverOptions && this._serverOptions.onBundleBuilt) {
         this._serverOptions.onBundleBuilt(pathname);
@@ -697,7 +682,6 @@ class Server {
           entryFile: resolvedEntryFilePath,
           minify: transformOptions.minify,
           platform: transformOptions.platform,
-          runtimeBytecodeVersion: transformOptions.runtimeBytecodeVersion,
         },
         isPrefetch: req.method === 'HEAD',
         type: 'bundle_build_started',
@@ -937,129 +921,6 @@ class Server {
     },
   });
 
-  _processBytecodeBundleRequest: (
-    req: IncomingMessage,
-    res: ServerResponse,
-    bundleOptions: BundleOptions,
-    buildContext: $ReadOnly<{
-      buildNumber: number,
-      bundlePerfLogger: RootPerfLogger,
-    }>,
-  ) => Promise<void> = this._createRequestProcessor({
-    createStartEntry(context: ProcessStartContext) {
-      return {
-        action_name: 'Requesting bundle',
-        bundle_url: context.req.url,
-        entry_point: context.entryFile,
-        bundler: 'delta',
-        build_id: getBuildID(context.buildNumber),
-        bundle_options: context.bundleOptions,
-        bundle_hash: context.graphId,
-      };
-    },
-    createEndEntry(
-      context: ProcessEndContext<{
-        bytecode: Buffer,
-        lastModifiedDate: Date,
-        nextRevId: RevisionId,
-        numModifiedFiles: number,
-      }>,
-    ) {
-      return {
-        outdated_modules: context.result.numModifiedFiles,
-      };
-    },
-    build: async ({
-      entryFile,
-      graphId,
-      graphOptions,
-      onProgress,
-      resolverOptions,
-      serializerOptions,
-      transformOptions,
-    }) => {
-      const revPromise = this._bundler.getRevisionByGraphId(graphId);
-
-      const {delta, revision} = await (revPromise != null
-        ? this._bundler.updateGraph(await revPromise, false)
-        : this._bundler.initializeGraph(
-            entryFile,
-            transformOptions,
-            resolverOptions,
-            {
-              onProgress,
-              shallow: graphOptions.shallow,
-            },
-          ));
-
-      const bundle = bundleToBytecode(
-        baseBytecodeBundle(entryFile, revision.prepend, revision.graph, {
-          asyncRequireModulePath: await this._resolveRelativePath(
-            this._config.transformer.asyncRequireModulePath,
-            {
-              relativeTo: 'project',
-              resolverOptions,
-              transformOptions,
-            },
-          ),
-          processModuleFilter: this._config.serializer.processModuleFilter,
-          createModuleId: this._createModuleId,
-          getRunModuleStatement: this._config.serializer.getRunModuleStatement,
-          includeAsyncPaths:
-            this._config.server.experimentalImportBundleSupport,
-          dev: transformOptions.dev,
-          projectRoot: this._config.projectRoot,
-          modulesOnly: serializerOptions.modulesOnly,
-          runBeforeMainModule:
-            this._config.serializer.getModulesRunBeforeMainModule(
-              path.relative(this._config.projectRoot, entryFile),
-            ),
-          runModule: serializerOptions.runModule,
-          sourceMapUrl: serializerOptions.sourceMapUrl,
-          sourceUrl: serializerOptions.sourceUrl,
-          inlineSourceMap: serializerOptions.inlineSourceMap,
-          serverRoot:
-            this._config.server.unstable_serverRoot ?? this._config.projectRoot,
-        }),
-      );
-
-      return {
-        numModifiedFiles: delta.reset
-          ? delta.added.size + revision.prepend.length
-          : delta.added.size + delta.modified.size + delta.deleted.size,
-        lastModifiedDate: revision.date,
-        nextRevId: revision.id,
-        bytecode: bundle.bytecode,
-      };
-    },
-    finish({req, mres, result}) {
-      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()
-      ) {
-        debug('Responding with 304');
-        mres.writeHead(304);
-        mres.end();
-      } else {
-        mres.setHeader(
-          FILES_CHANGED_COUNT_HEADER,
-          String(result.numModifiedFiles),
-        );
-        mres.setHeader(DELTA_ID_HEADER, String(result.nextRevId));
-        mres.setHeader('Content-Type', 'application/x-metro-bytecode-bundle');
-        mres.setHeader('Last-Modified', result.lastModifiedDate.toUTCString());
-        mres.setHeader(
-          'Content-Length',
-          String(Buffer.byteLength(result.bytecode)),
-        );
-        mres.end(result.bytecode);
-      }
-    },
-  });
-
   // This function ensures that modules in source maps are sorted in the same
   // order as in a plain JS bundle.
   _getSortedModules(graph: ReadOnlyGraph<>): $ReadOnlyArray<Module<>> {
@@ -1292,7 +1153,6 @@ class Server {
     const options = parseOptionsFromUrl(
       reqUrl,
       new Set(this._config.resolver.platforms),
-      getBytecodeVersion(),
     );
 
     const {
@@ -1390,7 +1250,6 @@ class Server {
     dev: boolean,
     hot: boolean,
     minify: boolean,
-    runtimeBytecodeVersion: ?number,
     unstable_transformProfile: 'default',
   }> = {
     customResolverOptions: Object.create(null),
@@ -1398,7 +1257,6 @@ class Server {
     dev: true,
     hot: false,
     minify: false,
-    runtimeBytecodeVersion: null,
     unstable_transformProfile: 'default',
   };
 

package/src/cli/parseKeyValueParamArray.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = coerceKeyValueArray;
+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) {
+    if (item.indexOf("=") === -1) {
+      throw new Error('Expected parameter to include "=" but found: ' + item);
+    }
+    if (item.indexOf("&") !== -1) {
+      throw new Error('Parameter cannot include "&" but found: ' + item);
+    }
+    Object.assign(result, _querystring.default.parse(item));
+  }
+  return result;
+}

package/src/cli/parseKeyValueParamArray.js.flow

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+import querystring from 'querystring';
+
+export default function coerceKeyValueArray(
+  keyValueArray: $ReadOnlyArray<string>,
+): {
+  [key: string]: string,
+  __proto__: null,
+} {
+  const result: {[key: string]: string, __proto__: null} = Object.create(null);
+  for (const item of keyValueArray) {
+    if (item.indexOf('=') === -1) {
+      throw new Error('Expected parameter to include "=" but found: ' + item);
+    }
+    if (item.indexOf('&') !== -1) {
+      throw new Error('Parameter cannot include "&" but found: ' + item);
+    }
+    Object.assign(result, querystring.parse(item));
+  }
+  return result;
+}

package/src/cli-utils.js.flow

@@ -11,8 +11,6 @@
 
 'use strict';
 
-import type {YargArguments} from 'metro-config/src/configTypes.flow';
-
 const fs = require('fs');
 
 exports.watchFile = async function (
@@ -27,10 +25,8 @@ exports.watchFile = async function (
 };
 
 exports.makeAsyncCommand =
-  (
-    command: (argv: YargArguments) => Promise<void>,
-  ): ((argv: YargArguments) => void) =>
-  (argv: YargArguments) => {
+  <T>(command: (argv: T) => Promise<void>): ((argv: T) => void) =>
+  (argv: T) => {
     Promise.resolve(command(argv)).catch(error => {
       console.error(error.stack);
       process.exitCode = 1;

package/src/cli.js

@@ -17,4 +17,6 @@ try {
 } catch {}
 const { attachMetroCli } = require("./index");
 const yargs = require("yargs");
+
+// $FlowFixMe[unused-promise]
 attachMetroCli(yargs.demandCommand(1)).argv;

package/src/cli.js.flow

@@ -20,4 +20,5 @@ try {
 const {attachMetroCli} = require('./index');
 const yargs = require('yargs');
 
+// $FlowFixMe[unused-promise]
 attachMetroCli(yargs.demandCommand(1)).argv;

package/src/commands/build.js

@@ -1,3 +1,11 @@
+"use strict";
+
+var _parseKeyValueParamArray = _interopRequireDefault(
+  require("../cli/parseKeyValueParamArray")
+);
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -9,8 +17,6 @@
  * @oncall react_native
  */
 
-"use strict";
-
 const { makeAsyncCommand } = require("../cli-utils");
 const TerminalReporter = require("../lib/TerminalReporter");
 const { loadConfig } = require("metro-config");
@@ -64,6 +70,21 @@ module.exports = () => ({
       alias: "c",
       type: "string",
     });
+    yargs.option("transform-option", {
+      type: "string",
+      array: true,
+      alias: "transformer-option",
+      coerce: _parseKeyValueParamArray.default,
+      describe:
+        "Custom transform options of the form key=value. URL-encoded. May be specified multiple times.",
+    });
+    yargs.option("resolver-option", {
+      type: "string",
+      array: true,
+      coerce: _parseKeyValueParamArray.default,
+      describe:
+        "Custom resolver options of the form key=value. URL-encoded. May be specified multiple times.",
+    });
 
     // Deprecated
     yargs.option("reset-cache", {
@@ -72,8 +93,17 @@ module.exports = () => ({
   },
   handler: makeAsyncCommand(async (argv) => {
     const config = await loadConfig(argv);
-    // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
-    const options = argv;
+    const options = {
+      entry: argv.entry,
+      dev: argv.dev,
+      out: argv.out,
+      minify: argv.minify,
+      platform: argv.platform,
+      sourceMap: argv.sourceMap,
+      sourceMapUrl: argv.sourceMapUrl,
+      customResolverOptions: argv.resolverOption,
+      customTransformOptions: argv.transformOption,
+    };
 
     // Inline require() to avoid circular dependency with ../index
     const MetroApi = require("../index");
@@ -89,9 +119,6 @@ module.exports = () => ({
             entryFile: options.entry,
             minify: !!options.minify,
             platform: options.platform,
-            // Bytecode bundles in Metro are not meant for production use. Instead,
-            // the Hermes Bytecode Compiler should be invoked on the resulting JS bundle from Metro.
-            runtimeBytecodeVersion: null,
           },
         });
       },

package/src/commands/build.js.flow

@@ -9,10 +9,11 @@
  * @oncall react_native
  */
 
-'use strict';
+import parseKeyValueParamArray from '../cli/parseKeyValueParamArray';
 
+import type {CustomTransformOptions} from 'metro-babel-transformer';
+import type {CustomResolverOptions} from 'metro-resolver';
 import type {RunBuildOptions} from '../index';
-import type {YargArguments} from 'metro-config/src/configTypes.flow';
 import typeof Yargs from 'yargs';
 import type {ModuleObject} from 'yargs';
 
@@ -24,6 +25,24 @@ const {Terminal} = require('metro-core');
 const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
+type Args = $ReadOnly<{
+  config?: string,
+  dev?: boolean,
+  entry: string,
+  legacyBundler?: boolean,
+  maxWorkers?: number,
+  minify?: boolean,
+  out: string,
+  outputType?: string,
+  platform?: string,
+  projectRoots?: $ReadOnlyArray<string>,
+  resetCache?: boolean,
+  sourceMap?: boolean,
+  sourceMapUrl?: string,
+  transformOption: CustomTransformOptions,
+  resolverOption: CustomResolverOptions,
+}>;
+
 module.exports = (): {
   ...ModuleObject,
   handler: Function,
@@ -54,14 +73,40 @@ module.exports = (): {
 
     yargs.option('config', {alias: 'c', type: 'string'});
 
+    yargs.option('transform-option', {
+      type: 'string',
+      array: true,
+      alias: 'transformer-option',
+      coerce: (parseKeyValueParamArray: $FlowFixMe),
+      describe:
+        'Custom transform options of the form key=value. URL-encoded. May be specified multiple times.',
+    });
+
+    yargs.option('resolver-option', {
+      type: 'string',
+      array: true,
+      coerce: (parseKeyValueParamArray: $FlowFixMe),
+      describe:
+        'Custom resolver options of the form key=value. URL-encoded. May be specified multiple times.',
+    });
+
     // Deprecated
     yargs.option('reset-cache', {type: 'boolean'});
   },
 
-  handler: makeAsyncCommand(async (argv: YargArguments) => {
+  handler: makeAsyncCommand(async (argv: Args) => {
     const config = await loadConfig(argv);
-    // $FlowExpectedError YargArguments and RunBuildOptions are used interchangeable but their types are not yet compatible
-    const options = (argv: RunBuildOptions);
+    const options: RunBuildOptions = {
+      entry: argv.entry,
+      dev: argv.dev,
+      out: argv.out,
+      minify: argv.minify,
+      platform: argv.platform,
+      sourceMap: argv.sourceMap,
+      sourceMapUrl: argv.sourceMapUrl,
+      customResolverOptions: argv.resolverOption,
+      customTransformOptions: argv.transformOption,
+    };
 
     // Inline require() to avoid circular dependency with ../index
     const MetroApi = require('../index');
@@ -78,9 +123,6 @@ module.exports = (): {
             entryFile: options.entry,
             minify: !!options.minify,
             platform: options.platform,
-            // Bytecode bundles in Metro are not meant for production use. Instead,
-            // the Hermes Bytecode Compiler should be invoked on the resulting JS bundle from Metro.
-            runtimeBytecodeVersion: null,
           },
         });
       },

package/src/commands/dependencies.js

@@ -4,6 +4,7 @@
  * 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
  */
@@ -12,10 +13,10 @@
 
 const { makeAsyncCommand } = require("../cli-utils");
 const Server = require("../Server");
-const denodeify = require("denodeify");
 const fs = require("fs");
 const { loadConfig } = require("metro-config");
 const path = require("path");
+const { promisify } = require("util");
 async function dependencies(args, config) {
   const rootModuleAbsolutePath = args.entryFile;
   if (!fs.existsSync(rootModuleAbsolutePath)) {
@@ -23,6 +24,8 @@ 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,
@@ -35,10 +38,8 @@ async function dependencies(args, config) {
     minify: false,
     generateSourceMaps: !args.dev,
   };
-  const writeToFile = args.output;
-  const outStream = writeToFile
-    ? fs.createWriteStream(args.output)
-    : process.stdout;
+  const outStream =
+    args.output != null ? fs.createWriteStream(args.output) : process.stdout;
   const server = new Server(config);
   const deps = await server.getOrderedDependencyPaths(options);
   deps.forEach((modulePath) => {
@@ -54,13 +55,14 @@ async function dependencies(args, config) {
     }
   });
   server.end();
-  return writeToFile
-    ? denodeify(outStream.end).bind(outStream)()
+  return args.output != null
+    ? // $FlowFixMe[method-unbinding]
+      promisify(outStream.end).bind(outStream)()
     : Promise.resolve();
 }
 module.exports = () => ({
-  command: "get-dependencies",
-  desc: "List dependencies",
+  command: "get-dependencies [entryFile]",
+  desc: "List all dependencies that will be bundled for a given entry point",
   builder: (yargs) => {
     yargs.option("entry-file", {
       type: "string",