metro 0.75.1 → 0.76.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.75.1",
+  "version": "0.76.1",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -20,7 +20,6 @@
     "@babel/template": "^7.0.0",
     "@babel/traverse": "^7.20.0",
     "@babel/types": "^7.20.0",
-    "absolute-path": "^0.0.0",
     "accepts": "^1.3.7",
     "async": "^3.2.2",
     "chalk": "^4.0.0",
@@ -35,23 +34,22 @@
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.75.1",
-    "metro-cache": "0.75.1",
-    "metro-cache-key": "0.75.1",
-    "metro-config": "0.75.1",
-    "metro-core": "0.75.1",
-    "metro-file-map": "0.75.1",
-    "metro-hermes-compiler": "0.75.1",
-    "metro-inspector-proxy": "0.75.1",
-    "metro-minify-terser": "0.75.1",
-    "metro-minify-uglify": "0.75.1",
-    "metro-react-native-babel-preset": "0.75.1",
-    "metro-resolver": "0.75.1",
-    "metro-runtime": "0.75.1",
-    "metro-source-map": "0.75.1",
-    "metro-symbolicate": "0.75.1",
-    "metro-transform-plugins": "0.75.1",
-    "metro-transform-worker": "0.75.1",
+    "metro-babel-transformer": "0.76.1",
+    "metro-cache": "0.76.1",
+    "metro-cache-key": "0.76.1",
+    "metro-config": "0.76.1",
+    "metro-core": "0.76.1",
+    "metro-file-map": "0.76.1",
+    "metro-inspector-proxy": "0.76.1",
+    "metro-minify-terser": "0.76.1",
+    "metro-minify-uglify": "0.76.1",
+    "metro-react-native-babel-preset": "0.76.1",
+    "metro-resolver": "0.76.1",
+    "metro-runtime": "0.76.1",
+    "metro-source-map": "0.76.1",
+    "metro-symbolicate": "0.76.1",
+    "metro-transform-plugins": "0.76.1",
+    "metro-transform-worker": "0.76.1",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -59,27 +57,28 @@
     "serialize-error": "^2.1.0",
     "source-map": "^0.5.6",
     "strip-ansi": "^6.0.0",
-    "temp": "0.8.3",
     "throat": "^5.0.0",
     "ws": "^7.5.1",
-    "yargs": "^17.5.1"
+    "yargs": "^17.6.2"
   },
   "devDependencies": {
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+    "@types/babel__code-frame": "^7.0.3",
+    "@types/ws": "^8.5.4",
     "babel-jest": "^29.2.1",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.75.1",
-    "metro-memory-fs": "0.75.1",
-    "metro-react-native-babel-preset": "0.75.1",
-    "metro-react-native-babel-transformer": "0.75.1",
+    "metro-babel-register": "0.76.1",
+    "metro-memory-fs": "0.76.1",
+    "metro-react-native-babel-preset": "0.76.1",
+    "metro-react-native-babel-transformer": "0.76.1",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16"
   }
 }

package/src/Asset.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 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
+ */
+
+export interface AssetDataWithoutFiles {
+  readonly __packager_asset: boolean;
+  readonly fileSystemLocation: string;
+  readonly hash: string;
+  readonly height?: number;
+  readonly httpServerLocation: string;
+  readonly name: string;
+  readonly scales: number[];
+  readonly type: string;
+  readonly width?: number;
+}
+
+export interface AssetData extends AssetDataWithoutFiles {
+  readonly files: string[];
+}

package/src/Assets.js

@@ -93,7 +93,7 @@ async function getAbsoluteAssetRecord(assetPath, platform = null) {
   if (!record) {
     throw new Error(
       `Asset not found: ${assetPath} for platform: ${
-        platform !== null && platform !== void 0 ? platform : "(unspecified)"
+        platform ?? "(unspecified)"
       }`
     );
   }
@@ -134,7 +134,7 @@ async function getAssetData(
 
   // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === "\\") {
-    assetUrlPath = assetUrlPath.replace(/\\/g, "/");
+    assetUrlPath = assetUrlPath.replaceAll("\\", "/");
   }
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));
   const assetInfo = await getAbsoluteAssetInfo(assetPath, platform);

package/src/Assets.js.flow

@@ -200,7 +200,7 @@ async function getAssetData(
 
   // On Windows, change backslashes to slashes to get proper URL path from file path.
   if (path.sep === '\\') {
-    assetUrlPath = assetUrlPath.replace(/\\/g, '/');
+    assetUrlPath = assetUrlPath.replaceAll('\\', '/');
   }
 
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));

package/src/Bundler.d.ts

@@ -0,0 +1,39 @@
+/**
+ * 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
+ */
+
+import type {TransformResultWithSource} from './DeltaBundler';
+import type {TransformOptions} from './DeltaBundler/Worker';
+import type DependencyGraph from './node-haste/DependencyGraph';
+import type {ConfigT} from 'metro-config';
+import type {EventEmitter} from 'events';
+
+export interface BundlerOptions {
+  readonly hasReducedPerformance?: boolean;
+  readonly watch?: boolean;
+}
+
+export default class Bundler {
+  constructor(config: ConfigT, options?: BundlerOptions);
+
+  getWatcher(): EventEmitter;
+
+  end(): Promise<void>;
+
+  getDependencyGraph(): Promise<DependencyGraph>;
+
+  transformFile(
+    filePath: string,
+    transformOptions: TransformOptions,
+    /** Optionally provide the file contents, this can be used to provide virtual contents for a file. */
+    fileBuffer?: Buffer,
+  ): Promise<TransformResultWithSource<void>>;
+
+  ready(): Promise<void>;
+}

package/src/DeltaBundler/Graph.d.ts

@@ -0,0 +1,40 @@
+/**
+ * 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
+ */
+
+import type {
+  Dependencies,
+  GraphInputOptions,
+  MixedOutput,
+  Module,
+  Options,
+  TransformInputOptions,
+} from './types';
+
+export interface Result<T> {
+  added: Map<string, Module<T>>;
+  modified: Map<string, Module<T>>;
+  deleted: Set<string>;
+}
+
+export class Graph<T = MixedOutput> {
+  entryPoints: ReadonlySet<string>;
+  transformOptions: TransformInputOptions;
+  dependencies: Dependencies<T>;
+  constructor(options: GraphInputOptions);
+  traverseDependencies(
+    paths: ReadonlyArray<string>,
+    options: Options<T>,
+  ): Promise<Result<T>>;
+  initialTraverseDependencies(options: Options<T>): Promise<Result<T>>;
+  markModifiedContextModules(
+    filePath: string,
+    modifiedPaths: Set<string>,
+  ): void;
+}

package/src/DeltaBundler/Graph.js

@@ -284,6 +284,8 @@ class Graph {
     let module = this.dependencies.get(path);
     if (options.shallow) {
       // Don't add a node for the module if the graph is shallow (single-module).
+    } else if (dependency.data.data.asyncType === "weak") {
+      // Exclude weak dependencies from the bundle.
     } else if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -332,6 +334,10 @@ class Graph {
   _removeDependency(parentModule, key, dependency, delta, options) {
     parentModule.dependencies.delete(key);
     const { absolutePath } = dependency;
+    if (dependency.data.data.asyncType === "weak") {
+      // Weak dependencies are excluded from the bundle.
+      return;
+    }
     if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -376,26 +382,8 @@ class Graph {
    * traverseDependencies. Note that the list may contain duplicates.
    */
   *getModifiedModulesForDeletedPath(filePath) {
-    var _this$dependencies$ge,
-      _this$dependencies$ge2,
-      _this$importBundleNod,
-      _this$importBundleNod2;
-    yield* (_this$dependencies$ge =
-      (_this$dependencies$ge2 = this.dependencies.get(filePath)) === null ||
-      _this$dependencies$ge2 === void 0
-        ? void 0
-        : _this$dependencies$ge2.inverseDependencies) !== null &&
-    _this$dependencies$ge !== void 0
-      ? _this$dependencies$ge
-      : [];
-    yield* (_this$importBundleNod =
-      (_this$importBundleNod2 = this.#importBundleNodes.get(filePath)) ===
-        null || _this$importBundleNod2 === void 0
-        ? void 0
-        : _this$importBundleNod2.inverseDependencies) !== null &&
-    _this$importBundleNod !== void 0
-      ? _this$importBundleNod
-      : [];
+    yield* this.dependencies.get(filePath)?.inverseDependencies ?? [];
+    yield* this.#importBundleNodes.get(filePath)?.inverseDependencies ?? [];
   }
   _resolveDependencies(parentPath, dependencies, options) {
     const maybeResolvedDeps = new Map();
@@ -511,15 +499,10 @@ class Graph {
 
   // Add an entry to importBundleNodes (or record an inverse dependency of an existing one)
   _incrementImportBundleReference(dependency, parentModule) {
-    var _this$importBundleNod3;
     const { absolutePath } = dependency;
-    const importBundleNode =
-      (_this$importBundleNod3 = this.#importBundleNodes.get(absolutePath)) !==
-        null && _this$importBundleNod3 !== void 0
-        ? _this$importBundleNod3
-        : {
-            inverseDependencies: new _CountingSet.default(),
-          };
+    const importBundleNode = this.#importBundleNodes.get(absolutePath) ?? {
+      inverseDependencies: new _CountingSet.default(),
+    };
     importBundleNode.inverseDependencies.add(parentModule.path);
     this.#importBundleNodes.set(absolutePath, importBundleNode);
   }

package/src/DeltaBundler/Graph.js.flow

@@ -355,6 +355,8 @@ export class Graph<T = MixedOutput> {
 
     if (options.shallow) {
       // Don't add a node for the module if the graph is shallow (single-module).
+    } else if (dependency.data.data.asyncType === 'weak') {
+      // Exclude weak dependencies from the bundle.
     } else if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null
@@ -414,6 +416,11 @@ export class Graph<T = MixedOutput> {
 
     const {absolutePath} = dependency;
 
+    if (dependency.data.data.asyncType === 'weak') {
+      // Weak dependencies are excluded from the bundle.
+      return;
+    }
+
     if (
       options.experimentalImportBundleSupport &&
       dependency.data.data.asyncType != null

package/src/DeltaBundler/Serializers/getRamBundleInfo.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 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
+ */
+
+import {ModuleTransportLike} from '../../shared/types';
+
+export interface RamBundleInfo {
+  getDependencies: (filePath: string) => Set<string>;
+  startupModules: Readonly<ModuleTransportLike>;
+  lazyModules: Readonly<ModuleTransportLike>;
+  groups: Map<number, Set<number>>;
+}

package/src/DeltaBundler/Serializers/helpers/js.js

@@ -63,23 +63,18 @@ function getModuleParams(module, options) {
   return params;
 }
 function getJsOutput(module) {
-  var _module$path, _module$path2;
   const jsModules = module.output.filter(({ type }) => type.startsWith("js/"));
   invariant(
     jsModules.length === 1,
     `Modules must have exactly one JS output, but ${
-      (_module$path = module.path) !== null && _module$path !== void 0
-        ? _module$path
-        : "unknown module"
+      module.path ?? "unknown module"
     } has ${jsModules.length} JS outputs.`
   );
   const jsOutput = jsModules[0];
   invariant(
     Number.isFinite(jsOutput.data.lineCount),
     `JS output must populate lineCount, but ${
-      (_module$path2 = module.path) !== null && _module$path2 !== void 0
-        ? _module$path2
-        : "unknown module"
+      module.path ?? "unknown module"
     } has ${jsOutput.type} output with lineCount '${jsOutput.data.lineCount}'`
   );
   return jsOutput;

package/src/DeltaBundler/Transformer.js

@@ -63,7 +63,6 @@ class Transformer {
       minify,
       nonInlinedRequires,
       platform,
-      runtimeBytecodeVersion,
       type,
       unstable_disableES6Transforms,
       unstable_transformProfile,
@@ -92,7 +91,6 @@ class Transformer {
       minify,
       nonInlinedRequires,
       platform,
-      runtimeBytecodeVersion,
       type,
       unstable_disableES6Transforms,
       unstable_transformProfile,
@@ -141,6 +139,7 @@ class Transformer {
     };
   }
   end() {
+    // $FlowFixMe[unused-promise]
     this._workerFarm.kill();
   }
 }

package/src/DeltaBundler/Transformer.js.flow

@@ -82,7 +82,6 @@ class Transformer {
       minify,
       nonInlinedRequires,
       platform,
-      runtimeBytecodeVersion,
       type,
       unstable_disableES6Transforms,
       unstable_transformProfile,
@@ -116,7 +115,6 @@ class Transformer {
       minify,
       nonInlinedRequires,
       platform,
-      runtimeBytecodeVersion,
       type,
       unstable_disableES6Transforms,
       unstable_transformProfile,
@@ -167,6 +165,7 @@ class Transformer {
   }
 
   end(): void {
+    // $FlowFixMe[unused-promise]
     this._workerFarm.kill();
   }
 }

package/src/DeltaBundler/Worker.d.ts

@@ -0,0 +1,47 @@
+/**
+ * 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
+ */
+
+import type {
+  JsTransformerConfig,
+  JsTransformOptions,
+} from 'metro-transform-worker';
+import type {TransformResult} from './types';
+
+type LogEntry = unknown;
+
+export type TransformOptions = JsTransformOptions;
+
+declare function transform(
+  filename: string,
+  transformOptions: JsTransformOptions,
+  projectRoot: string,
+  transformerConfig: TransformerConfig,
+  fileBuffer?: Buffer,
+): Promise<Data>;
+
+export interface Worker {
+  readonly transform: typeof transform;
+}
+
+export interface TransformerConfig {
+  transformerPath: string;
+  transformerConfig: JsTransformerConfig;
+}
+
+interface Data {
+  readonly result: TransformResult<void>;
+  readonly sha1: string;
+  readonly transformFileStartLogEntry: LogEntry;
+  readonly transformFileEndLogEntry: LogEntry;
+}
+
+declare const worker: Worker;
+
+export default worker;

package/src/DeltaBundler/types.d.ts

@@ -0,0 +1,167 @@
+/**
+ * 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
+ */
+
+import type {SourceLocation} from '@babel/code-frame';
+import type {JsTransformOptions} from 'metro-transform-worker';
+import type {RequireContextParams} from '../ModuleGraph/worker/collectDependencies';
+import type {RequireContext} from '../lib/contextModule';
+import type CountingSet from '../lib/CountingSet';
+import type {Graph} from './Graph';
+
+export interface MixedOutput {
+  readonly data: {code: string};
+  readonly type: string;
+}
+
+export type AsyncDependencyType = 'async' | 'prefetch';
+
+export interface TransformResultDependency {
+  /**
+   * The literal name provided to a require or import call. For example 'foo' in
+   * case of `require('foo')`.
+   */
+  readonly name: string;
+
+  /**
+   * Extra data returned by the dependency extractor.
+   */
+  readonly data: {
+    /**
+     * A locally unique key for this dependency within the current module.
+     */
+    readonly key: string;
+
+    /**
+     * If not null, this dependency is due to a dynamic `import()` or `__prefetchImport()` call.
+     */
+    readonly asyncType: AsyncDependencyType | null;
+
+    /**
+     * The condition for splitting on this dependency edge.
+     */
+    readonly splitCondition?: {
+      readonly mobileConfigName: string;
+    };
+
+    /**
+     * The dependency is enclosed in a try/catch block.
+     */
+    readonly isOptional?: boolean;
+
+    readonly locs: ReadonlyArray<SourceLocation>;
+
+    /** Context for requiring a collection of modules. */
+    readonly contextParams?: RequireContextParams;
+  };
+}
+
+export interface Dependency {
+  readonly absolutePath: string;
+  readonly data: TransformResultDependency;
+  [key: string]: unknown;
+}
+
+export interface Module<T = MixedOutput> {
+  readonly dependencies: Map<string, Dependency>;
+  readonly inverseDependencies: CountingSet<string>;
+  readonly output: ReadonlyArray<T>;
+  readonly path: string;
+  readonly getSource: () => Buffer;
+}
+
+export type Dependencies<T = MixedOutput> = Map<string, Module<T>>;
+export type ReadOnlyDependencies<T = MixedOutput> = ReadonlyMap<
+  string,
+  Module<T>
+>;
+
+export type TransformInputOptions = Omit<
+  JsTransformOptions,
+  'inlinePlatform' | 'inlineRequires'
+>;
+
+export type GraphInputOptions = Readonly<{
+  entryPoints: ReadonlySet<string>;
+  // Unused in core but useful for custom serializers / experimentalSerializerHook
+  transformOptions: TransformInputOptions;
+}>;
+
+export interface ReadOnlyGraph<T = MixedOutput> {
+  readonly entryPoints: ReadonlySet<string>;
+  // Unused in core but useful for custom serializers / experimentalSerializerHook
+  readonly transformOptions: Readonly<TransformInputOptions>;
+  readonly dependencies: ReadOnlyDependencies<T>;
+}
+
+export type {Graph};
+
+export interface TransformResult<T = MixedOutput> {
+  dependencies: ReadonlyArray<TransformResultDependency>;
+  output: ReadonlyArray<T>;
+}
+
+export interface TransformResultWithSource<T = MixedOutput>
+  extends TransformResult<T> {
+  getSource: () => Buffer;
+}
+
+export type TransformFn<T = MixedOutput> = (
+  modulePath: string,
+  requireContext: RequireContext | null,
+) => Promise<TransformResultWithSource<T>>;
+
+export interface AllowOptionalDependenciesWithOptions {
+  readonly exclude: string[];
+}
+
+export type AllowOptionalDependencies =
+  | boolean
+  | AllowOptionalDependenciesWithOptions;
+
+export interface BundlerResolution {
+  readonly type: 'sourceFile';
+  readonly filePath: string;
+}
+
+export interface Options<T = MixedOutput> {
+  readonly resolve: (from: string, to: string) => string;
+  readonly transform: TransformFn<T>;
+  readonly transformOptions: TransformInputOptions;
+  readonly onProgress:
+    | ((numProcessed: number, total: number) => unknown)
+    | null;
+  readonly experimentalImportBundleSupport: boolean;
+  readonly unstable_allowRequireContext: boolean;
+  readonly shallow: boolean;
+}
+
+export interface DeltaResult<T = MixedOutput> {
+  readonly added: Map<string, Module<T>>;
+  readonly modified: Map<string, Module<T>>;
+  readonly deleted: Set<string>;
+  readonly reset: boolean;
+}
+
+export interface SerializerOptions<T = MixedOutput> {
+  readonly asyncRequireModulePath: string;
+  readonly createModuleId: (filePath: string) => number;
+  readonly dev: boolean;
+  readonly getRunModuleStatement: (moduleId: string | number) => string;
+  readonly includeAsyncPaths: boolean;
+  readonly inlineSourceMap?: boolean;
+  readonly modulesOnly: boolean;
+  readonly processModuleFilter: (module: Module<T>) => boolean;
+  readonly projectRoot: string;
+  readonly runBeforeMainModule: ReadonlyArray<string>;
+  readonly runModule: boolean;
+  readonly serverRoot: string;
+  readonly sourceMapUrl?: string;
+  readonly sourceUrl?: string;
+}

package/src/DeltaBundler/types.flow.js.flow

@@ -23,7 +23,7 @@ export type MixedOutput = {
   +type: string,
 };
 
-export type AsyncDependencyType = 'async' | 'prefetch';
+export type AsyncDependencyType = 'async' | 'prefetch' | 'weak';
 
 export type TransformResultDependency = {
   /**
@@ -44,12 +44,6 @@ export type TransformResultDependency = {
      * If not null, this dependency is due to a dynamic `import()` or `__prefetchImport()` call.
      */
     +asyncType: AsyncDependencyType | null,
-    /**
-     * The condition for splitting on this dependency edge.
-     */
-    +splitCondition?: {
-      +mobileConfigName: string,
-    },
     /**
      * The dependency is enclosed in a try/catch block.
      */