metro 0.76.1 → 0.76.3

package/src/lib/getGraphId.js

@@ -15,12 +15,7 @@ const canonicalize = require("metro-core/src/canonicalize");
 function getGraphId(
   entryFile,
   options,
-  {
-    shallow,
-    experimentalImportBundleSupport,
-    unstable_allowRequireContext,
-    resolverOptions,
-  }
+  { shallow, lazy, unstable_allowRequireContext, resolverOptions }
 ) {
   return JSON.stringify(
     {
@@ -35,7 +30,7 @@ function getGraphId(
         unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
-        experimentalImportBundleSupport,
+        lazy,
         unstable_allowRequireContext,
         shallow,
         unstable_transformProfile:

package/src/lib/getGraphId.js.flow

@@ -23,12 +23,12 @@ function getGraphId(
   options: TransformInputOptions,
   {
     shallow,
-    experimentalImportBundleSupport,
+    lazy,
     unstable_allowRequireContext,
     resolverOptions,
   }: $ReadOnly<{
     shallow: boolean,
-    experimentalImportBundleSupport: boolean,
+    lazy: boolean,
     unstable_allowRequireContext: boolean,
     resolverOptions: ResolverInputOptions,
   }>,
@@ -46,7 +46,7 @@ function getGraphId(
         unstable_disableES6Transforms: options.unstable_disableES6Transforms,
         platform: options.platform != null ? options.platform : null,
         type: options.type,
-        experimentalImportBundleSupport,
+        lazy,
         unstable_allowRequireContext,
         shallow,
         unstable_transformProfile:

package/src/lib/getPrependedScripts.js

@@ -57,8 +57,7 @@ async function getPrependedScripts(
         config.transformer.unstable_allowRequireContext,
       transformOptions,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
       shallow: false,

package/src/lib/getPrependedScripts.js.flow

@@ -67,8 +67,7 @@ async function getPrependedScripts(
         config.transformer.unstable_allowRequireContext,
       transformOptions,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_enablePackageExports:
         config.resolver.unstable_enablePackageExports,
       shallow: false,

package/src/lib/parseOptionsFromUrl.js

@@ -45,6 +45,7 @@ module.exports = function parseOptionsFromUrl(requestUrl, platforms) {
     excludeSource: getBoolean(query, "excludeSource", false),
     hot: true,
     inlineSourceMap: getBoolean(query, "inlineSourceMap", false),
+    lazy: getBoolean(query, "lazy", false),
     minify: getBoolean(query, "minify", false),
     modulesOnly: getBoolean(query, "modulesOnly", false),
     onProgress: null,

package/src/lib/parseOptionsFromUrl.js.flow

@@ -60,6 +60,7 @@ module.exports = function parseOptionsFromUrl(
     excludeSource: getBoolean(query, 'excludeSource', false),
     hot: true,
     inlineSourceMap: getBoolean(query, 'inlineSourceMap', false),
+    lazy: getBoolean(query, 'lazy', false),
     minify: getBoolean(query, 'minify', false),
     modulesOnly: getBoolean(query, 'modulesOnly', false),
     onProgress: null,

package/src/lib/splitBundleOptions.js

@@ -39,6 +39,7 @@ function splitBundleOptions(options) {
     },
     graphOptions: {
       shallow: options.shallow,
+      lazy: options.lazy,
     },
     onProgress: options.onProgress,
   };

package/src/lib/splitBundleOptions.js.flow

@@ -41,6 +41,7 @@ function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
     },
     graphOptions: {
       shallow: options.shallow,
+      lazy: options.lazy,
     },
     onProgress: options.onProgress,
   };

package/src/lib/transformHelpers.js

@@ -67,8 +67,7 @@ async function calcTransformerOptions(
       ),
       transformOptions: options,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:

package/src/lib/transformHelpers.js.flow

@@ -85,8 +85,7 @@ async function calcTransformerOptions(
       ),
       transformOptions: options,
       onProgress: null,
-      experimentalImportBundleSupport:
-        config.server.experimentalImportBundleSupport,
+      lazy: false,
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:

package/src/node-haste/DependencyGraph.js

@@ -105,8 +105,13 @@ class DependencyGraph extends EventEmitter {
   _getClosestPackage(filePath) {
     const parsedPath = path.parse(filePath);
     const root = parsedPath.root;
-    let dir = parsedPath.dir;
+    let dir = path.join(parsedPath.dir, parsedPath.base);
     do {
+      // If we've hit a node_modules directory, the closest package was not
+      // found (`filePath` was likely nonexistent).
+      if (path.basename(dir) === "node_modules") {
+        return null;
+      }
       const candidate = path.join(dir, "package.json");
       if (this._fileSystem.exists(candidate)) {
         return candidate;

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

@@ -152,8 +152,14 @@ class DependencyGraph extends EventEmitter {
   _getClosestPackage(filePath: string): ?string {
     const parsedPath = path.parse(filePath);
     const root = parsedPath.root;
-    let dir = parsedPath.dir;
+    let dir = path.join(parsedPath.dir, parsedPath.base);
+
     do {
+      // If we've hit a node_modules directory, the closest package was not
+      // found (`filePath` was likely nonexistent).
+      if (path.basename(dir) === 'node_modules') {
+        return null;
+      }
       const candidate = path.join(dir, 'package.json');
       if (this._fileSystem.exists(candidate)) {
         return candidate;

package/src/shared/types.d.ts

@@ -46,6 +46,7 @@ export interface BundleOptions {
   readonly excludeSource: boolean;
   readonly hot: boolean;
   readonly inlineSourceMap: boolean;
+  readonly lazy: boolean;
   minify: boolean;
   readonly modulesOnly: boolean;
   onProgress?: (doneCont: number, totalCount: number) => unknown;
@@ -73,6 +74,7 @@ export interface SerializerOptions {
 }
 
 export interface GraphOptions {
+  readonly lazy: boolean;
   readonly shallow: boolean;
 }
 

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

@@ -50,6 +50,7 @@ export type BundleOptions = {
   +excludeSource: boolean,
   +hot: boolean,
   +inlineSourceMap: boolean,
+  +lazy: boolean,
   minify: boolean,
   +modulesOnly: boolean,
   onProgress: ?(doneCont: number, totalCount: number) => mixed,
@@ -60,7 +61,6 @@ export type BundleOptions = {
   sourceUrl: ?string,
   createModuleIdFactory?: () => (path: string) => number,
   +unstable_transformProfile: TransformProfile,
-  ...
 };
 
 export type ResolverInputOptions = $ReadOnly<{
@@ -77,6 +77,7 @@ export type SerializerOptions = {
 };
 
 export type GraphOptions = {
+  +lazy: boolean,
   +shallow: boolean,
 };
 

package/types/Asset.d.ts

@@ -1,25 +0,0 @@
-/**
- * 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/types/Bundler.d.ts

@@ -1,39 +0,0 @@
-/**
- * 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/types/DeltaBundler/Graph.d.ts

@@ -1,40 +0,0 @@
-/**
- * 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/types/DeltaBundler/Serializers/getRamBundleInfo.d.ts

@@ -1,18 +0,0 @@
-/**
- * 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/types/DeltaBundler/Worker.d.ts

@@ -1,47 +0,0 @@
-/**
- * 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/types/DeltaBundler/types.d.ts

@@ -1,167 +0,0 @@
-/**
- * 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/types/DeltaBundler.d.ts

@@ -1,58 +0,0 @@
-/**
- * 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 {
-  DeltaResult,
-  Graph,
-  MixedOutput,
-  Options,
-  ReadOnlyGraph,
-} from './DeltaBundler/types';
-import type {EventEmitter} from 'events';
-
-export type {
-  DeltaResult,
-  Graph,
-  Dependencies,
-  MixedOutput,
-  Module,
-  ReadOnlyGraph,
-  TransformFn,
-  TransformResult,
-  TransformResultDependency,
-  TransformResultWithSource,
-} from './DeltaBundler/types';
-
-export default class DeltaBundler<T = MixedOutput> {
-  constructor(changeEventSource: EventEmitter);
-  end(): void;
-  getDependencies(
-    entryPoints: ReadonlyArray<string>,
-    options: Options<T>,
-  ): Promise<ReadOnlyGraph<T>['dependencies']>;
-  buildGraph(
-    entryPoints: ReadonlyArray<string>,
-    options: Options<T>,
-  ): Promise<Graph<T>>;
-
-  getDelta(
-    graph: Graph<T>,
-    {
-      reset,
-      shallow,
-    }: {
-      reset: boolean;
-      shallow: boolean;
-    },
-  ): Promise<DeltaResult<T>>;
-
-  listen(graph: Graph<T>, callback: () => Promise<void>): () => void;
-  endGraph(graph: Graph<T>): void;
-}