metro 0.82.2 → 0.82.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.82.2",
+  "version": "0.82.4",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -42,18 +42,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.82.2",
-    "metro-cache": "0.82.2",
-    "metro-cache-key": "0.82.2",
-    "metro-config": "0.82.2",
-    "metro-core": "0.82.2",
-    "metro-file-map": "0.82.2",
-    "metro-resolver": "0.82.2",
-    "metro-runtime": "0.82.2",
-    "metro-source-map": "0.82.2",
-    "metro-symbolicate": "0.82.2",
-    "metro-transform-plugins": "0.82.2",
-    "metro-transform-worker": "0.82.2",
+    "metro-babel-transformer": "0.82.4",
+    "metro-cache": "0.82.4",
+    "metro-cache-key": "0.82.4",
+    "metro-config": "0.82.4",
+    "metro-core": "0.82.4",
+    "metro-file-map": "0.82.4",
+    "metro-resolver": "0.82.4",
+    "metro-runtime": "0.82.4",
+    "metro-source-map": "0.82.4",
+    "metro-symbolicate": "0.82.4",
+    "metro-transform-plugins": "0.82.4",
+    "metro-transform-worker": "0.82.4",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -65,14 +65,15 @@
   "devDependencies": {
     "@babel/plugin-transform-flow-strip-types": "^7.25.2",
     "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+    "@babel/plugin-transform-runtime": "^7.24.7",
     "@react-native/babel-preset": "0.78.0",
     "@react-native/metro-babel-transformer": "0.78.0",
     "babel-jest": "^29.7.0",
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.82.2",
-    "metro-memory-fs": "0.82.2",
+    "metro-babel-register": "0.82.4",
+    "metro-memory-fs": "0.82.4",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Bundler.js.flow

@@ -14,7 +14,7 @@
 import type {TransformResultWithSource} from './DeltaBundler';
 import type {TransformOptions} from './DeltaBundler/Worker';
 import type EventEmitter from 'events';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 
 const Transformer = require('./DeltaBundler/Transformer');
 const DependencyGraph = require('./node-haste/DependencyGraph');

package/src/DeltaBundler/Serializers/getRamBundleInfo.js.flow

@@ -17,7 +17,7 @@ import type {
 } from '../../shared/types.flow';
 import type {Module, ReadOnlyGraph, SerializerOptions} from '../types.flow';
 import type {SourceMapGeneratorOptions} from './sourceMapGenerator';
-import type {GetTransformOptions} from 'metro-config/src/configTypes.flow.js';
+import type {GetTransformOptions} from 'metro-config';
 
 const {createRamBundleGroups} = require('../../Bundler/util');
 const getAppendScripts = require('../../lib/getAppendScripts');

package/src/DeltaBundler/Transformer.js

@@ -7,6 +7,7 @@ function _interopRequireDefault(e) {
 const getTransformCacheKey = require("./getTransformCacheKey");
 const WorkerFarm = require("./WorkerFarm");
 const assert = require("assert");
+const debug = require("debug")("Metro:Transformer");
 const fs = require("fs");
 const { Cache, stableHash } = require("metro-cache");
 const path = require("path");
@@ -35,7 +36,9 @@ class Transformer {
           projectRoot: this._config.projectRoot,
           transformerConfig: transformerOptions,
         });
-    this._baseHash = stableHash([globalCacheKey]).toString("binary");
+    const baseHashBuffer = stableHash([globalCacheKey]);
+    this._baseHash = baseHashBuffer.toString("binary");
+    debug("Base hash: %s", baseHashBuffer.toString("hex"));
   }
   async transformFile(filePath, transformerOptions, fileBuffer) {
     const cache = this._cache;

package/src/DeltaBundler/Transformer.js.flow

@@ -13,13 +13,14 @@
 
 import type {TransformResult, TransformResultWithSource} from '../DeltaBundler';
 import type {TransformerConfig, TransformOptions} from './Worker';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 
 import crypto from 'crypto';
 
 const getTransformCacheKey = require('./getTransformCacheKey');
 const WorkerFarm = require('./WorkerFarm');
 const assert = require('assert');
+const debug = require('debug')('Metro:Transformer');
 const fs = require('fs');
 const {Cache, stableHash} = require('metro-cache');
 const path = require('path');
@@ -69,7 +70,9 @@ class Transformer {
           transformerConfig: transformerOptions,
         });
 
-    this._baseHash = stableHash([globalCacheKey]).toString('binary');
+    const baseHashBuffer = stableHash([globalCacheKey]);
+    this._baseHash = baseHashBuffer.toString('binary');
+    debug('Base hash: %s', baseHashBuffer.toString('hex'));
   }
 
   async transformFile(

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -13,7 +13,7 @@
 
 import type {TransformResult} from '../DeltaBundler';
 import type {TransformerConfig, TransformOptions, Worker} from './Worker';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 import type {Readable} from 'stream';
 
 const {Worker: JestWorker} = require('jest-worker');
@@ -151,6 +151,7 @@ class WorkerFarm {
   _formatGenericError(err: any, filename: string): TransformError {
     const error = new TransformError(`${filename}: ${err.message}`);
 
+    // $FlowFixMe[unsafe-object-assign]
     return Object.assign(error, {
       stack: (err.stack || '').split('\n').slice(0, -1).join('\n'),
       lineNumber: 0,

package/src/HmrServer.js

@@ -35,7 +35,7 @@ class HmrServer {
   async _registerEntryPoint(client, requestUrl, sendFn) {
     requestUrl = this._config.server.rewriteRequestUrl(requestUrl);
     const clientUrl = nullthrows(url.parse(requestUrl, true));
-    const options = parseOptionsFromUrl(
+    const { bundleType: _bundleType, ...options } = parseOptionsFromUrl(
       requestUrl,
       new Set(this._config.resolver.platforms)
     );

package/src/HmrServer.js.flow

@@ -101,7 +101,7 @@ class HmrServer<TClient: Client> {
   ): Promise<void> {
     requestUrl = this._config.server.rewriteRequestUrl(requestUrl);
     const clientUrl = nullthrows(url.parse(requestUrl, true));
-    const options = parseOptionsFromUrl(
+    const {bundleType: _bundleType, ...options} = parseOptionsFromUrl(
       requestUrl,
       new Set(this._config.resolver.platforms),
     );

package/src/IncrementalBundler.js.flow

@@ -19,7 +19,7 @@ import type {
 } from './DeltaBundler/types.flow';
 import type {GraphId} from './lib/getGraphId';
 import type {ResolverInputOptions} from './shared/types.flow';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 
 const Bundler = require('./Bundler');
 const DeltaBundler = require('./DeltaBundler');

package/src/ModuleGraph/worker/collectDependencies.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _types = require("@babel/types");
 const generate = require("@babel/generator").default;
 const template = require("@babel/template").default;
 const traverse = require("@babel/traverse").default;
@@ -346,6 +347,9 @@ function getNearestLocFromPath(path) {
   ) {
     current = current.parentPath;
   }
+  if (current && (0, _types.isProgram)(current.node)) {
+    current = null;
+  }
   return current?.node.METRO_INLINE_REQUIRES_INIT_LOC ?? current?.node.loc;
 }
 function registerDependency(state, qualifier, path) {

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -17,6 +17,8 @@ import type {
   AsyncDependencyType,
 } from 'metro/src/DeltaBundler/types.flow.js';
 
+import {isProgram} from '@babel/types';
+
 const generate = require('@babel/generator').default;
 const template = require('@babel/template').default;
 const traverse = require('@babel/traverse').default;
@@ -575,6 +577,10 @@ function getNearestLocFromPath(path: NodePath<>): ?BabelSourceLocation {
   ) {
     current = current.parentPath;
   }
+  // Do not use the location of the `Program` node
+  if (current && isProgram(current.node)) {
+    current = null;
+  }
   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

package/src/ModuleGraph/worker/importLocationsPlugin.js

@@ -1,16 +1,14 @@
 "use strict";
 
-const invariant = require("invariant");
 function importLocationsPlugin({ types: t }) {
-  const importDeclarationLocs = new Set();
   return {
     visitor: {
-      ImportDeclaration(path) {
+      ImportDeclaration(path, { importDeclarationLocs }) {
         if (path.node.importKind !== "type" && path.node.loc != null) {
           importDeclarationLocs.add(locToKey(path.node.loc));
         }
       },
-      ExportDeclaration(path) {
+      ExportDeclaration(path, { importDeclarationLocs }) {
         if (
           path.node.source != null &&
           path.node.exportKind !== "type" &&
@@ -19,21 +17,18 @@ function importLocationsPlugin({ types: t }) {
           importDeclarationLocs.add(locToKey(path.node.loc));
         }
       },
-    },
-    pre: ({ path, metadata }) => {
-      invariant(
-        path && t.isProgram(path.node),
-        "path missing or not a program node"
-      );
-      const metroMetadata = metadata;
-      if (!metroMetadata.metro) {
-        metroMetadata.metro = {
-          unstable_importDeclarationLocs: importDeclarationLocs,
-        };
-      } else {
-        metroMetadata.metro.unstable_importDeclarationLocs =
-          importDeclarationLocs;
-      }
+      Program(path, state) {
+        state.importDeclarationLocs = new Set();
+        const metroMetadata = state.file.metadata;
+        if (!metroMetadata.metro) {
+          metroMetadata.metro = {
+            unstable_importDeclarationLocs: state.importDeclarationLocs,
+          };
+        } else {
+          metroMetadata.metro.unstable_importDeclarationLocs =
+            state.importDeclarationLocs;
+        }
+      },
     },
   };
 }

package/src/ModuleGraph/worker/importLocationsPlugin.js.flow

@@ -11,19 +11,27 @@
 
 'use strict';
 
-import type {PluginObj} from '@babel/core';
+import type {File, PluginObj} from '@babel/core';
 import typeof * as Types from '@babel/types';
 import type {MetroBabelFileMetadata} from 'metro-babel-transformer';
 
-const invariant = require('invariant');
-
 type ImportDeclarationLocs = Set<string>;
 
-function importLocationsPlugin({types: t}: {types: Types, ...}): PluginObj<> {
-  const importDeclarationLocs: ImportDeclarationLocs = new Set();
+type State = {
+  importDeclarationLocs: ImportDeclarationLocs,
+  file: File,
+  ...
+};
+
+function importLocationsPlugin({
+  types: t,
+}: {
+  types: Types,
+  ...
+}): PluginObj<State> {
   return {
     visitor: {
-      ImportDeclaration(path) {
+      ImportDeclaration(path, {importDeclarationLocs}) {
         if (
           // Ignore type imports
           path.node.importKind !== 'type' &&
@@ -35,7 +43,7 @@ function importLocationsPlugin({types: t}: {types: Types, ...}): PluginObj<> {
           importDeclarationLocs.add(locToKey(path.node.loc));
         }
       },
-      ExportDeclaration(path) {
+      ExportDeclaration(path, {importDeclarationLocs}) {
         if (
           // If `source` is set, this is a re-export, so it declares an ESM
           // dependency.
@@ -48,25 +56,23 @@ function importLocationsPlugin({types: t}: {types: Types, ...}): PluginObj<> {
           importDeclarationLocs.add(locToKey(path.node.loc));
         }
       },
-    },
-    pre: ({path, metadata}) => {
-      invariant(
-        path && t.isProgram(path.node),
-        'path missing or not a program node',
-      );
+      Program(path, state) {
+        // Initialise state
+        state.importDeclarationLocs = new Set();
 
-      // $FlowFixMe[prop-missing] Babel `File` is not generically typed
-      const metroMetadata: MetroBabelFileMetadata = metadata;
+        // $FlowFixMe[prop-missing] Babel `File` is not generically typed
+        const metroMetadata: MetroBabelFileMetadata = state.file.metadata;
 
-      // Set the result on a metadata property
-      if (!metroMetadata.metro) {
-        metroMetadata.metro = {
-          unstable_importDeclarationLocs: importDeclarationLocs,
-        };
-      } else {
-        metroMetadata.metro.unstable_importDeclarationLocs =
-          importDeclarationLocs;
-      }
+        // Set the result on a metadata property
+        if (!metroMetadata.metro) {
+          metroMetadata.metro = {
+            unstable_importDeclarationLocs: state.importDeclarationLocs,
+          };
+        } else {
+          metroMetadata.metro.unstable_importDeclarationLocs =
+            state.importDeclarationLocs;
+        }
+      },
     },
   };
 }

package/src/Server/symbolicate.js.flow

@@ -15,7 +15,7 @@ import type {
   MetroSourceMapSegmentTuple,
 } from '../../../metro-source-map/src/source-map';
 import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 
 const {greatestLowerBound} = require('metro-source-map/src/Consumer/search');
 const {

package/src/Server.js

@@ -269,7 +269,6 @@ class Server {
       splitBundleOptions({
         ...Server.DEFAULT_BUNDLE_OPTIONS,
         ...options,
-        bundleType: "bundle",
       });
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
@@ -358,7 +357,11 @@ class Server {
     this._processRequest(req, res, next).catch(next);
   };
   _parseOptions(url) {
-    return parseOptionsFromUrl(url, new Set(this._config.resolver.platforms));
+    const { bundleType: _bundleType, ...bundleOptions } = parseOptionsFromUrl(
+      url,
+      new Set(this._config.resolver.platforms)
+    );
+    return bundleOptions;
   }
   _rewriteAndNormalizeUrl(requestUrl) {
     return jscSafeUrl.toNormalUrl(
@@ -472,6 +475,7 @@ class Server {
     });
   }
   _createRequestProcessor({
+    bundleType,
     createStartEntry,
     createEndEntry,
     build,
@@ -571,7 +575,7 @@ class Server {
       this._reporter.update({
         buildID: getBuildID(buildNumber),
         bundleDetails: {
-          bundleType: bundleOptions.bundleType,
+          bundleType,
           customResolverOptions: bundleOptions.customResolverOptions,
           customTransformOptions: bundleOptions.customTransformOptions,
           dev: transformOptions.dev,
@@ -649,6 +653,7 @@ class Server {
     };
   }
   _processBundleRequest = this._createRequestProcessor({
+    bundleType: "bundle",
     createStartEntry(context) {
       return {
         action_name: "Requesting bundle",
@@ -827,6 +832,7 @@ class Server {
     );
   }
   _processSourceMapRequest = this._createRequestProcessor({
+    bundleType: "map",
     createStartEntry(context) {
       return {
         action_name: "Requesting sourcemap",
@@ -890,6 +896,7 @@ class Server {
     },
   });
   _processAssetsRequest = this._createRequestProcessor({
+    bundleType: "assets",
     createStartEntry(context) {
       return {
         action_name: "Requesting assets",

package/src/Server.js.flow

@@ -34,7 +34,7 @@ import type {
 import type {IncomingMessage} from 'connect';
 import type {ServerResponse} from 'http';
 import type {CacheStore} from 'metro-cache';
-import type {ConfigT, RootPerfLogger} from 'metro-config/src/configTypes.flow';
+import type {ConfigT, RootPerfLogger} from 'metro-config';
 import type {
   ActionLogEntryData,
   ActionStartLogEntry,
@@ -404,7 +404,6 @@ class Server {
     } = splitBundleOptions({
       ...Server.DEFAULT_BUNDLE_OPTIONS,
       ...options,
-      bundleType: 'bundle',
     });
 
     const {prepend, graph} = await this._bundler.buildGraph(
@@ -469,6 +468,7 @@ class Server {
         urlObj.query.unstable_path.match(/^([^?]*)\??(.*)$/),
       );
       if (secondaryQuery) {
+        // $FlowFixMe[unsafe-object-assign]
         Object.assign(urlObj.query, querystring.parse(secondaryQuery));
       }
       assetPath = actualPath;
@@ -524,7 +524,11 @@ class Server {
   };
 
   _parseOptions(url: string): BundleOptions {
-    return parseOptionsFromUrl(url, new Set(this._config.resolver.platforms));
+    const {bundleType: _bundleType, ...bundleOptions} = parseOptionsFromUrl(
+      url,
+      new Set(this._config.resolver.platforms),
+    );
+    return bundleOptions;
   }
 
   _rewriteAndNormalizeUrl(requestUrl: string): string {
@@ -652,12 +656,14 @@ class Server {
   }
 
   _createRequestProcessor<T>({
+    bundleType,
     createStartEntry,
     createEndEntry,
     build,
     delete: deleteFn,
     finish,
   }: {
+    +bundleType: 'assets' | 'bundle' | 'map',
     +createStartEntry: (context: ProcessStartContext) => ActionLogEntryData,
     +createEndEntry: (
       context: ProcessEndContext<T>,
@@ -796,7 +802,7 @@ class Server {
       this._reporter.update({
         buildID: getBuildID(buildNumber),
         bundleDetails: {
-          bundleType: bundleOptions.bundleType,
+          bundleType,
           customResolverOptions: bundleOptions.customResolverOptions,
           customTransformOptions: bundleOptions.customTransformOptions,
           dev: transformOptions.dev,
@@ -895,6 +901,7 @@ class Server {
       bundlePerfLogger: RootPerfLogger,
     }>,
   ) => Promise<void> = this._createRequestProcessor({
+    bundleType: 'bundle',
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting bundle',
@@ -1104,6 +1111,7 @@ class Server {
       bundlePerfLogger: RootPerfLogger,
     }>,
   ) => Promise<void> = this._createRequestProcessor({
+    bundleType: 'map',
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting sourcemap',
@@ -1175,6 +1183,7 @@ class Server {
       bundlePerfLogger: RootPerfLogger,
     }>,
   ) => Promise<void> = this._createRequestProcessor({
+    bundleType: 'assets',
     createStartEntry(context: ProcessStartContext) {
       return {
         action_name: 'Requesting assets',

package/src/index.flow.js

@@ -21,6 +21,7 @@ const {
 } = require("metro-config");
 const { Terminal } = require("metro-core");
 const net = require("net");
+const nullthrows = require("nullthrows");
 const { parse } = require("url");
 exports.Terminal = Terminal;
 exports.TerminalReporter = TerminalReporter;
@@ -216,6 +217,7 @@ exports.runServer = async (
 exports.runBuild = async (
   config,
   {
+    assets = false,
     customResolverOptions,
     customTransformOptions,
     dev = false,
@@ -226,9 +228,12 @@ exports.runBuild = async (
     minify = true,
     output = outputBundle,
     out,
+    bundleOut,
+    sourceMapOut,
     platform = "web",
     sourceMap = false,
     sourceMapUrl,
+    unstable_transformProfile,
   }
 ) => {
   const metroServer = await runMetro(config, {
@@ -246,18 +251,31 @@ exports.runBuild = async (
       onProgress,
       customResolverOptions,
       customTransformOptions,
+      unstable_transformProfile,
     };
     if (onBegin) {
       onBegin();
     }
     const metroBundle = await output.build(metroServer, requestOptions);
+    const result = {
+      ...metroBundle,
+    };
+    if (assets) {
+      result.assets = await metroServer.getAssets({
+        ...MetroServer.DEFAULT_BUNDLE_OPTIONS,
+        ...requestOptions,
+      });
+    }
     if (onComplete) {
       onComplete();
     }
-    if (out) {
-      const bundleOutput = out.replace(/(\.js)?$/, ".js");
+    if (out || bundleOut) {
+      const bundleOutput =
+        bundleOut ?? nullthrows(out).replace(/(\.js)?$/, ".js");
       const sourcemapOutput =
-        sourceMap === false ? undefined : out.replace(/(\.js)?$/, ".map");
+        sourceMap === false
+          ? undefined
+          : sourceMapOut ?? out?.replace(/(\.js)?$/, ".map");
       const outputOptions = {
         bundleOutput,
         sourcemapOutput,
@@ -271,7 +289,7 @@ exports.runBuild = async (
         })
       );
     }
-    return metroBundle;
+    return result;
   } finally {
     await metroServer.end();
   }

package/src/index.flow.js.flow

@@ -11,18 +11,20 @@
 
 'use strict';
 
+import type {AssetData} from './Assets';
 import type {ReadOnlyGraph} from './DeltaBundler';
 import type {ServerOptions} from './Server';
 import type {OutputOptions, RequestOptions} from './shared/types.flow.js';
 import type {HandleFunction} from 'connect';
 import type {Server as HttpServer} from 'http';
 import type {Server as HttpsServer} from 'https';
+import type {TransformProfile} from 'metro-babel-transformer';
 import type {
   ConfigT,
   InputConfigT,
   MetroConfig,
   Middleware,
-} from 'metro-config/src/configTypes.flow';
+} from 'metro-config';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 import typeof Yargs from 'yargs';
@@ -48,6 +50,7 @@ const {
 } = require('metro-config');
 const {Terminal} = require('metro-core');
 const net = require('net');
+const nullthrows = require('nullthrows');
 const {parse} = require('url');
 
 type MetroMiddleWare = {
@@ -92,8 +95,11 @@ type BuildGraphOptions = {
 
 export type RunBuildOptions = {
   entry: string,
+  assets?: boolean,
   dev?: boolean,
   out?: string,
+  bundleOut?: string,
+  sourceMapOut?: string,
   onBegin?: () => void,
   onComplete?: () => void,
   onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
@@ -123,6 +129,14 @@ export type RunBuildOptions = {
   sourceMapUrl?: string,
   customResolverOptions?: CustomResolverOptions,
   customTransformOptions?: CustomTransformOptions,
+  unstable_transformProfile?: TransformProfile,
+};
+
+export type RunBuildResult = {
+  code: string,
+  map: string,
+  assets?: $ReadOnlyArray<AssetData>,
+  ...
 };
 
 type BuildCommandOptions = {} | null;
@@ -131,6 +145,9 @@ type ServeCommandOptions = {} | null;
 exports.Terminal = Terminal;
 exports.TerminalReporter = TerminalReporter;
 
+export type {AssetData} from './Assets';
+export type {Reporter, ReportableEvent} from './lib/reporting';
+export type {TerminalReportableEvent} from './lib/TerminalReporter';
 export type {MetroConfig};
 
 async function getConfig(config: InputConfigT): Promise<ConfigT> {
@@ -369,6 +386,7 @@ exports.runServer = async (
 exports.runBuild = async (
   config: ConfigT,
   {
+    assets = false,
     customResolverOptions,
     customTransformOptions,
     dev = false,
@@ -379,15 +397,14 @@ exports.runBuild = async (
     minify = true,
     output = outputBundle,
     out,
+    bundleOut,
+    sourceMapOut,
     platform = 'web',
     sourceMap = false,
     sourceMapUrl,
+    unstable_transformProfile,
   }: RunBuildOptions,
-): Promise<{
-  code: string,
-  map: string,
-  ...
-}> => {
+): Promise<RunBuildResult> => {
   const metroServer = await runMetro(config, {
     watch: false,
   });
@@ -404,6 +421,7 @@ exports.runBuild = async (
       onProgress,
       customResolverOptions,
       customTransformOptions,
+      unstable_transformProfile,
     };
 
     if (onBegin) {
@@ -411,15 +429,27 @@ exports.runBuild = async (
     }
 
     const metroBundle = await output.build(metroServer, requestOptions);
+    const result: RunBuildResult = {...metroBundle};
+
+    if (assets) {
+      result.assets = await metroServer.getAssets({
+        ...MetroServer.DEFAULT_BUNDLE_OPTIONS,
+        ...requestOptions,
+      });
+    }
 
     if (onComplete) {
       onComplete();
     }
 
-    if (out) {
-      const bundleOutput = out.replace(/(\.js)?$/, '.js');
+    if (out || bundleOut) {
+      const bundleOutput =
+        bundleOut ?? nullthrows(out).replace(/(\.js)?$/, '.js');
+
       const sourcemapOutput =
-        sourceMap === false ? undefined : out.replace(/(\.js)?$/, '.map');
+        sourceMap === false
+          ? undefined
+          : sourceMapOut ?? out?.replace(/(\.js)?$/, '.map');
 
       const outputOptions: OutputOptions = {
         bundleOutput,
@@ -436,7 +466,7 @@ exports.runBuild = async (
       );
     }
 
-    return metroBundle;
+    return result;
   } finally {
     await metroServer.end();
   }

package/src/lib/JsonReporter.js.flow

@@ -46,6 +46,7 @@ class JsonReporter<TEvent: {[string]: any, ...}> {
   update(event: TEvent): void {
     if (event.error instanceof Error) {
       const {message, stack} = event.error;
+      // $FlowFixMe[unsafe-object-assign]
       event = Object.assign(event, {
         error: serializeError(event.error),
         // TODO: Preexisting issue - this writes message, stack, etc. as

package/src/lib/TerminalReporter.js.flow

@@ -384,6 +384,7 @@ class TerminalReporter {
       0.999, // make sure not to go above 99.9% to not get rounded to 100%,
     );
 
+    // $FlowFixMe[unsafe-object-assign]
     Object.assign(currentProgress, {
       ratio,
       transformedFileCount,

package/src/lib/parseOptionsFromUrl.js.flow

@@ -44,7 +44,11 @@ const getTransformProfile = (transformProfile: string): TransformProfile =>
 module.exports = function parseOptionsFromUrl(
   normalizedRequestUrl: string,
   platforms: Set<string>,
-): BundleOptions {
+): {
+  ...BundleOptions,
+  // Retained for backwards compatibility, unused in Metro, to be removed.
+  bundleType: string,
+} {
   const parsedURL = nullthrows(url.parse(normalizedRequestUrl, true)); // `true` to parse the query param as an object.
   const query = nullthrows(parsedURL.query);
   const pathname =

package/src/lib/transformHelpers.js.flow

@@ -21,7 +21,7 @@ import type {
 import type {TransformOptions} from '../DeltaBundler/Worker';
 import type {ResolverInputOptions} from '../shared/types.flow';
 import type {RequireContext} from './contextModule';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 import type {Type} from 'metro-transform-worker';
 
 import {getContextModuleTemplate} from './contextModuleTemplates';

package/src/node-haste/DependencyGraph/createFileMap.js.flow

@@ -9,7 +9,7 @@
  * @oncall react_native
  */
 
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 
 import MetroFileMap, {DiskCacheManager} from 'metro-file-map';
 

package/src/node-haste/DependencyGraph.js.flow

@@ -15,7 +15,7 @@ import type {
 } from '../DeltaBundler/types.flow';
 import type {ResolverInputOptions} from '../shared/types.flow';
 import type Package from './Package';
-import type {ConfigT} from 'metro-config/src/configTypes.flow';
+import type {ConfigT} from 'metro-config';
 import type MetroFileMap, {
   ChangeEvent,
   FileSystem,
@@ -171,12 +171,12 @@ class DependencyGraph extends EventEmitter {
       const result = this._fileSystem.lookup(path);
       if (result.exists) {
         return {
-          exists: true,
+          exists: true as const,
           realPath: result.realPath,
           type: result.type,
         };
       }
-      return {exists: false};
+      return {exists: false as const};
     };
 
     this._moduleResolver = new ModuleResolver({

package/src/shared/output/RamBundle.js

@@ -7,7 +7,6 @@ async function build(packagerClient, requestOptions) {
   const options = {
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "ram",
   };
   return await packagerClient.getRamBundleInfo(options);
 }

package/src/shared/output/RamBundle.js.flow

@@ -25,7 +25,6 @@ async function build(
   const options = {
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: 'ram',
   };
   return await packagerClient.getRamBundleInfo(options);
 }

package/src/shared/output/bundle.flow.js

@@ -7,7 +7,6 @@ function buildBundle(packagerClient, requestOptions) {
   return packagerClient.build({
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "bundle",
   });
 }
 function relativateSerializedMap(map, sourceMapSourcesRoot) {

package/src/shared/output/bundle.flow.js.flow

@@ -29,7 +29,6 @@ function buildBundle(
   return packagerClient.build({
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: 'bundle',
   });
 }
 

package/src/shared/types.d.ts

@@ -23,21 +23,9 @@ import type {
   MinifierOptions,
 } from 'metro-transform-worker';
 
-export type BundleType =
-  | 'bundle'
-  | 'delta'
-  | 'meta'
-  | 'map'
-  | 'ram'
-  | 'cli'
-  | 'hmr'
-  | 'todo'
-  | 'graph';
-
 type MetroSourceMapOrMappings = MixedSourceMap | MetroSourceMapSegmentTuple[];
 
 export interface BundleOptions {
-  bundleType: BundleType;
   readonly customResolverOptions: CustomResolverOptions;
   customTransformOptions: CustomTransformOptions;
   dev: boolean;

package/src/shared/types.flow.js.flow

@@ -26,17 +26,6 @@ import type {
   MinifierOptions,
 } from 'metro-transform-worker';
 
-type BundleType =
-  | 'bundle'
-  | 'delta'
-  | 'meta'
-  | 'map'
-  | 'ram'
-  | 'cli'
-  | 'hmr'
-  | 'todo'
-  | 'graph';
-
 type MetroSourceMapOrMappings =
   | MixedSourceMap
   | Array<MetroSourceMapSegmentTuple>;
@@ -49,7 +38,6 @@ export enum SourcePathsMode {
 }
 
 export type BundleOptions = {
-  bundleType: BundleType,
   +customResolverOptions: CustomResolverOptions,
   customTransformOptions: CustomTransformOptions,
   dev: boolean,
@@ -151,6 +139,7 @@ export type RequestOptions = {
   onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
   +customResolverOptions?: CustomResolverOptions,
   +customTransformOptions?: CustomTransformOptions,
+  +unstable_transformProfile?: TransformProfile,
 };
 
 export type {MinifierOptions};