metro 0.76.0 → 0.76.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.76.0",
+  "version": "0.76.2",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -34,23 +34,22 @@
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.76.0",
-    "metro-cache": "0.76.0",
-    "metro-cache-key": "0.76.0",
-    "metro-config": "0.76.0",
-    "metro-core": "0.76.0",
-    "metro-file-map": "0.76.0",
-    "metro-hermes-compiler": "0.76.0",
-    "metro-inspector-proxy": "0.76.0",
-    "metro-minify-terser": "0.76.0",
-    "metro-minify-uglify": "0.76.0",
-    "metro-react-native-babel-preset": "0.76.0",
-    "metro-resolver": "0.76.0",
-    "metro-runtime": "0.76.0",
-    "metro-source-map": "0.76.0",
-    "metro-symbolicate": "0.76.0",
-    "metro-transform-plugins": "0.76.0",
-    "metro-transform-worker": "0.76.0",
+    "metro-babel-transformer": "0.76.2",
+    "metro-cache": "0.76.2",
+    "metro-cache-key": "0.76.2",
+    "metro-config": "0.76.2",
+    "metro-core": "0.76.2",
+    "metro-file-map": "0.76.2",
+    "metro-inspector-proxy": "0.76.2",
+    "metro-minify-terser": "0.76.2",
+    "metro-minify-uglify": "0.76.2",
+    "metro-react-native-babel-preset": "0.76.2",
+    "metro-resolver": "0.76.2",
+    "metro-runtime": "0.76.2",
+    "metro-source-map": "0.76.2",
+    "metro-symbolicate": "0.76.2",
+    "metro-transform-plugins": "0.76.2",
+    "metro-transform-worker": "0.76.2",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -58,10 +57,9 @@
     "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",
@@ -69,10 +67,10 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.76.0",
-    "metro-memory-fs": "0.76.0",
-    "metro-react-native-babel-preset": "0.76.0",
-    "metro-react-native-babel-transformer": "0.76.0",
+    "metro-babel-register": "0.76.2",
+    "metro-memory-fs": "0.76.2",
+    "metro-react-native-babel-preset": "0.76.2",
+    "metro-react-native-babel-transformer": "0.76.2",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

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/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/Serializers/baseJSBundle.js

@@ -24,6 +24,7 @@ function baseJSBundle(entryPoint, preModules, graph, options) {
     includeAsyncPaths: options.includeAsyncPaths,
     projectRoot: options.projectRoot,
     serverRoot: options.serverRoot,
+    sourceUrl: options.sourceUrl,
   };
 
   // Do not prepend polyfills or the require runtime when only modules are requested

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

@@ -39,6 +39,7 @@ function baseJSBundle(
     includeAsyncPaths: options.includeAsyncPaths,
     projectRoot: options.projectRoot,
     serverRoot: options.serverRoot,
+    sourceUrl: options.sourceUrl,
   };
 
   // Do not prepend polyfills or the require runtime when only modules are requested

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

@@ -31,16 +31,32 @@ function getModuleParams(module, options) {
       const id = options.createModuleId(dependency.absolutePath);
       if (options.includeAsyncPaths && dependency.data.data.asyncType != null) {
         hasPaths = true;
+        invariant(
+          options.sourceUrl != null,
+          "sourceUrl is required when includeAsyncPaths is true"
+        );
+
+        // TODO: Only include path if the target is not in the bundle
+
+        // Construct a server-relative URL for the split bundle, propagating
+        // most parameters from the main bundle's URL.
+
+        const { searchParams } = new URL(options.sourceUrl);
+        searchParams.set("modulesOnly", "true");
+        searchParams.set("runModule", "false");
         const bundlePath = path.relative(
           options.serverRoot,
           dependency.absolutePath
         );
-        // TODO: Eventually this slicing should be asyncRequire's responsibility
-        // Strip the file extension
-        paths[id] = path.join(
-          path.dirname(bundlePath),
-          path.basename(bundlePath, path.extname(bundlePath))
-        );
+        paths[id] =
+          "/" +
+          path.join(
+            path.dirname(bundlePath),
+            // Strip the file extension
+            path.basename(bundlePath, path.extname(bundlePath))
+          ) +
+          ".bundle?" +
+          searchParams.toString();
       }
       return id;
     }

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

@@ -24,6 +24,7 @@ export type Options = $ReadOnly<{
   includeAsyncPaths: boolean,
   projectRoot: string,
   serverRoot: string,
+  sourceUrl: ?string,
   ...
 }>;
 
@@ -48,16 +49,33 @@ function getModuleParams(module: Module<>, options: Options): Array<mixed> {
       const id = options.createModuleId(dependency.absolutePath);
       if (options.includeAsyncPaths && dependency.data.data.asyncType != null) {
         hasPaths = true;
+        invariant(
+          options.sourceUrl != null,
+          'sourceUrl is required when includeAsyncPaths is true',
+        );
+
+        // TODO: Only include path if the target is not in the bundle
+
+        // Construct a server-relative URL for the split bundle, propagating
+        // most parameters from the main bundle's URL.
+
+        const {searchParams} = new URL(options.sourceUrl);
+        searchParams.set('modulesOnly', 'true');
+        searchParams.set('runModule', 'false');
+
         const bundlePath = path.relative(
           options.serverRoot,
           dependency.absolutePath,
         );
-        // TODO: Eventually this slicing should be asyncRequire's responsibility
-        // Strip the file extension
-        paths[id] = path.join(
-          path.dirname(bundlePath),
-          path.basename(bundlePath, path.extname(bundlePath)),
-        );
+        paths[id] =
+          '/' +
+          path.join(
+            path.dirname(bundlePath),
+            // Strip the file extension
+            path.basename(bundlePath, path.extname(bundlePath)),
+          ) +
+          '.bundle?' +
+          searchParams.toString();
       }
       return id;
     },

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

@@ -21,6 +21,7 @@ function processModules(
     includeAsyncPaths,
     projectRoot,
     serverRoot,
+    sourceUrl,
   }
 ) {
   return [...modules]
@@ -34,6 +35,7 @@ function processModules(
         includeAsyncPaths,
         projectRoot,
         serverRoot,
+        sourceUrl,
       }),
     ]);
 }

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

@@ -24,6 +24,7 @@ function processModules(
     includeAsyncPaths,
     projectRoot,
     serverRoot,
+    sourceUrl,
   }: $ReadOnly<{
     filter?: (module: Module<>) => boolean,
     createModuleId: string => number,
@@ -31,6 +32,7 @@ function processModules(
     includeAsyncPaths: boolean,
     projectRoot: string,
     serverRoot: string,
+    sourceUrl: ?string,
   }>,
 ): $ReadOnlyArray<[Module<>, string]> {
   return [...modules]
@@ -44,6 +46,7 @@ function processModules(
         includeAsyncPaths,
         projectRoot,
         serverRoot,
+        sourceUrl,
       }),
     ]);
 }

package/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -50,6 +50,7 @@ function generateModules(sourceModules, graph, options) {
 function prepareModule(module, graph, options) {
   const code = wrapModule(module, {
     ...options,
+    sourceUrl: url.format(options.clientUrl),
     dev: true,
   });
   const inverseDependencies = getInverseDependencies(module.path, graph);

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

@@ -77,6 +77,7 @@ function prepareModule(
 ): string {
   const code = wrapModule(module, {
     ...options,
+    sourceUrl: url.format(options.clientUrl),
     dev: true,
   });
 

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,169 @@
+/**
+ * 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 {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<{
+      readonly start: {readonly line: number; readonly column: number};
+      readonly end: {readonly line: number; readonly column: number};
+    }>;
+
+    /** 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;
+}