metro 0.84.3 → 0.85.0

package/src/DeltaBundler/WorkerFarm.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<bbd52f1dc5e4a9253455034b585115ac>>
+ * @generated SignedSource<<d9d13bcad23924cbcf706b93e621e91c>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/WorkerFarm.js
@@ -16,29 +16,11 @@
  */
 
 import type {TransformResult} from '../DeltaBundler';
-import type {TransformerConfig, TransformOptions, Worker} from './Worker';
+import type {TransformerConfig, TransformOptions} from './Worker';
 import type {ConfigT} from 'metro-config';
-import type {Readable} from 'stream';
 
-type WorkerInterface = Readonly<
-  Omit<
-    Worker,
-    keyof {
-      end(): void | Promise<void>;
-      getStdout(): Readable;
-      getStderr(): Readable;
-    }
-  > & {
-    end(): void | Promise<void>;
-    getStdout(): Readable;
-    getStderr(): Readable;
-  }
->;
 type TransformerResult = Readonly<{result: TransformResult; sha1: string}>;
 declare class WorkerFarm {
-  _config: ConfigT;
-  _transformerConfig: TransformerConfig;
-  _worker: WorkerInterface | Worker;
   constructor(config: ConfigT, transformerConfig: TransformerConfig);
   kill(): Promise<void>;
   transform(
@@ -46,32 +28,5 @@ declare class WorkerFarm {
     options: TransformOptions,
     fileBuffer?: Buffer,
   ): Promise<TransformerResult>;
-  _makeFarm(
-    absoluteWorkerPath: string,
-    exposedMethods: ReadonlyArray<string>,
-    numWorkers: number,
-  ): WorkerInterface;
-  _computeWorkerKey(
-    method: string,
-    filename: string,
-  ): null | undefined | string;
-  _formatGenericError(
-    err: Readonly<{message: string; stack?: string}>,
-    filename: string,
-  ): TransformError;
-  _formatBabelError(
-    err: Readonly<{
-      message: string;
-      stack?: string;
-      type?: string;
-      codeFrame?: unknown;
-      loc: {line?: number; column?: number};
-    }>,
-    filename: string,
-  ): TransformError;
 }
 export default WorkerFarm;
-declare class TransformError extends SyntaxError {
-  type: string;
-  constructor(message: string);
-}

package/src/DeltaBundler/getTransformCacheKey.js.flow

@@ -26,9 +26,9 @@ type CacheKeyProvider = {
 };
 
 export default function getTransformCacheKey(opts: {
-  +cacheVersion: string,
-  +projectRoot: string,
-  +transformerConfig: TransformerConfig,
+  readonly cacheVersion: string,
+  readonly projectRoot: string,
+  readonly transformerConfig: TransformerConfig,
 }): string {
   const {transformerPath, transformerConfig} = opts.transformerConfig;
 

package/src/DeltaBundler/types.js.flow

@@ -18,8 +18,8 @@ import type {JsTransformOptions} from 'metro-transform-worker';
 import CountingSet from '../lib/CountingSet';
 
 export type MixedOutput = {
-  +data: unknown,
-  +type: string,
+  readonly data: unknown,
+  readonly type: string,
 };
 
 export type AsyncDependencyType = 'async' | 'maybeSync' | 'prefetch' | 'weak';
@@ -106,10 +106,10 @@ export type GraphInputOptions = Readonly<{
 }>;
 
 export interface ReadOnlyGraph<T = MixedOutput> {
-  +entryPoints: ReadonlySet<string>;
+  readonly entryPoints: ReadonlySet<string>;
   // Unused in core but useful for custom serializers / experimentalSerializerHook
-  +transformOptions: Readonly<TransformInputOptions>;
-  +dependencies: ReadOnlyDependencies<T>;
+  readonly transformOptions: Readonly<TransformInputOptions>;
+  readonly dependencies: ReadOnlyDependencies<T>;
 }
 
 export type {Graph};
@@ -136,7 +136,7 @@ export type ResolveFn = (
 ) => BundlerResolution;
 
 export type AllowOptionalDependenciesWithOptions = {
-  +exclude: Array<string>,
+  readonly exclude: Array<string>,
 };
 export type AllowOptionalDependencies =
   | boolean
@@ -160,10 +160,10 @@ export type Options<T = MixedOutput> = Readonly<{
 }>;
 
 export type DeltaResult<T = MixedOutput> = {
-  +added: Map<string, Module<T>>,
-  +modified: Map<string, Module<T>>,
-  +deleted: Set<string>,
-  +reset: boolean,
+  readonly added: Map<string, Module<T>>,
+  readonly modified: Map<string, Module<T>>,
+  readonly deleted: Set<string>,
+  readonly reset: boolean,
 };
 
 export type SerializerOptions = Readonly<{

package/src/DeltaBundler.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<db564db653a99b07f3ad7585b2bed707>>
+ * @generated SignedSource<<4392a52adb92ee60889197cf5c38516d>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler.js
@@ -24,8 +24,6 @@ import type {
 } from './DeltaBundler/types';
 import type EventEmitter from 'events';
 
-import DeltaCalculator from './DeltaBundler/DeltaCalculator';
-
 export type {
   DeltaResult,
   Graph,
@@ -45,8 +43,6 @@ export type {
  * `clientId` param (which maps a client to a specific delta transformer).
  */
 declare class DeltaBundler<T = MixedOutput> {
-  _changeEventSource: EventEmitter;
-  _deltaCalculators: Map<Graph<T>, DeltaCalculator<T>>;
   constructor(changeEventSource: EventEmitter);
   end(): void;
   getDependencies(

package/src/HmrServer.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<ab4c245134631e14db114a9d49da79d1>>
+ * @generated SignedSource<<48bfe42125bd22a8329f95a30fa90b64>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/HmrServer.js
@@ -18,25 +18,13 @@ import type {
   RevisionId,
   default as IncrementalBundler,
 } from './IncrementalBundler';
-import type {GraphOptions} from './shared/types';
-import type {ConfigT, RootPerfLogger} from 'metro-config';
-import type {
-  HmrErrorMessage,
-  HmrUpdateMessage,
-} from 'metro-runtime/src/modules/types';
+import type {ConfigT} from 'metro-config';
 
 export type Client = {
   optedIntoHMR: boolean;
   revisionIds: Array<RevisionId>;
   readonly sendFn: ($$PARAM_0$$: string) => void;
 };
-type ClientGroup = {
-  readonly clients: Set<Client>;
-  clientUrl: URL;
-  revisionId: RevisionId;
-  readonly unlisten: () => void;
-  readonly graphOptions: GraphOptions;
-};
 /**
  * The HmrServer (Hot Module Reloading) implements a lightweight interface
  * to communicate easily to the logic in the React Native repository (which
@@ -47,10 +35,6 @@ type ClientGroup = {
  * `onClientConnect`, `onClientDisconnect` and `onClientError` methods).
  */
 declare class HmrServer<TClient extends Client> {
-  _config: ConfigT;
-  _bundler: IncrementalBundler;
-  _createModuleId: (path: string) => number;
-  _clientGroups: Map<RevisionId, ClientGroup>;
   constructor(
     bundler: IncrementalBundler,
     createModuleId: (path: string) => number,
@@ -60,11 +44,6 @@ declare class HmrServer<TClient extends Client> {
     requestUrl: string,
     sendFn: (data: string) => void,
   ) => Promise<Client>;
-  _registerEntryPoint(
-    client: Client,
-    originalRequestUrl: string,
-    sendFn: (data: string) => void,
-  ): Promise<void>;
   onClientMessage: (
     client: TClient,
     message: string | Buffer | ArrayBuffer | Array<Buffer>,
@@ -72,27 +51,5 @@ declare class HmrServer<TClient extends Client> {
   ) => Promise<void>;
   onClientError: (client: TClient, e: Error) => void;
   onClientDisconnect: (client: TClient) => void;
-  _handleFileChange(
-    group: ClientGroup,
-    options: {isInitialUpdate: boolean},
-    changeEvent:
-      | null
-      | undefined
-      | {
-          readonly logger: null | undefined | RootPerfLogger;
-          readonly changeId?: string;
-        },
-  ): Promise<void>;
-  _prepareMessage(
-    group: ClientGroup,
-    options: {isInitialUpdate: boolean},
-    changeEvent:
-      | null
-      | undefined
-      | {
-          readonly logger: null | undefined | RootPerfLogger;
-          readonly changeId?: string;
-        },
-  ): Promise<HmrUpdateMessage | HmrErrorMessage>;
 }
 export default HmrServer;

package/src/HmrServer.js.flow

@@ -41,15 +41,15 @@ const {createActionStartEntry, createActionEndEntry, log} = Logger;
 export type Client = {
   optedIntoHMR: boolean,
   revisionIds: Array<RevisionId>,
-  +sendFn: string => void,
+  readonly sendFn: string => void,
 };
 
 type ClientGroup = {
-  +clients: Set<Client>,
+  readonly clients: Set<Client>,
   clientUrl: URL,
   revisionId: RevisionId,
-  +unlisten: () => void,
-  +graphOptions: GraphOptions,
+  readonly unlisten: () => void,
+  readonly graphOptions: GraphOptions,
 };
 
 function send(sendFns: Array<(string) => void>, message: HmrMessage): void {
@@ -181,8 +181,8 @@ export default class HmrServer<TClient extends Client> {
       this._clientGroups.set(id, clientGroup);
 
       let latestChangeEvent: ?{
-        +logger: ?RootPerfLogger,
-        +changeId: string,
+        readonly logger: ?RootPerfLogger,
+        readonly changeId: string,
       } = null;
 
       const debounceCallHandleFileChange = debounceAsyncQueue(async () => {
@@ -278,8 +278,8 @@ export default class HmrServer<TClient extends Client> {
     group: ClientGroup,
     options: {isInitialUpdate: boolean},
     changeEvent: ?{
-      +logger: ?RootPerfLogger,
-      +changeId?: string,
+      readonly logger: ?RootPerfLogger,
+      readonly changeId?: string,
     },
   ): Promise<void> {
     const logger = !options.isInitialUpdate ? changeEvent?.logger : null;
@@ -337,8 +337,8 @@ export default class HmrServer<TClient extends Client> {
     group: ClientGroup,
     options: {isInitialUpdate: boolean},
     changeEvent: ?{
-      +logger: ?RootPerfLogger,
-      +changeId?: string,
+      readonly logger: ?RootPerfLogger,
+      readonly changeId?: string,
     },
   ): Promise<HmrUpdateMessage | HmrErrorMessage> {
     const logger = !options.isInitialUpdate ? changeEvent?.logger : null;

package/src/IncrementalBundler.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<0ec72971869a882d97b381e3f1baa922>>
+ * @generated SignedSource<<7ce634e158aa8f2ac74e32940e9e97c1>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/IncrementalBundler.js
@@ -47,11 +47,6 @@ export type IncrementalBundlerOptions = Readonly<{
   watch?: boolean;
 }>;
 declare class IncrementalBundler {
-  _config: ConfigT;
-  _bundler: Bundler;
-  _deltaBundler: DeltaBundler;
-  _revisionsById: Map<RevisionId, Promise<GraphRevision>>;
-  _revisionsByGraphId: Map<GraphId, Promise<GraphRevision>>;
   static revisionIdFromString: (str: string) => RevisionId;
   constructor(config: ConfigT, options?: IncrementalBundlerOptions);
   end(): Promise<void>;
@@ -95,9 +90,6 @@ declare class IncrementalBundler {
     reset: boolean,
   ): Promise<{delta: DeltaResult; revision: GraphRevision}>;
   endGraph(graphId: GraphId): Promise<void>;
-  _getAbsoluteEntryFiles(
-    entryFiles: ReadonlyArray<string>,
-  ): Promise<ReadonlyArray<string>>;
   ready(): Promise<void>;
 }
 export default IncrementalBundler;

package/src/IncrementalBundler.js.flow

@@ -41,11 +41,11 @@ type OtherOptions = Readonly<{
 
 export type GraphRevision = {
   // Identifies the last computed revision.
-  +id: RevisionId,
-  +date: Date,
-  +graphId: GraphId,
-  +graph: OutputGraph,
-  +prepend: ReadonlyArray<Module<>>,
+  readonly id: RevisionId,
+  readonly date: Date,
+  readonly graphId: GraphId,
+  readonly graph: OutputGraph,
+  readonly prepend: ReadonlyArray<Module<>>,
 };
 
 export type IncrementalBundlerOptions = Readonly<{
@@ -199,7 +199,10 @@ export default class IncrementalBundler {
       shallow: false,
       lazy: false,
     },
-  ): Promise<{+graph: OutputGraph, +prepend: ReadonlyArray<Module<>>}> {
+  ): Promise<{
+    readonly graph: OutputGraph,
+    readonly prepend: ReadonlyArray<Module<>>,
+  }> {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,

package/src/ModuleGraph/worker/collectDependencies.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<ab2d1203f736c3032c6b9d15cc74680b>>
+ * @generated SignedSource<<f072a86187014259ece27c02d9abfd6a>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/ModuleGraph/worker/collectDependencies.js
@@ -132,7 +132,6 @@ export type ImportQualifier = Readonly<{
   contextParams?: RequireContextParams;
 }>;
 declare class DependencyRegistry {
-  _dependencies: Map<string, InternalDependency>;
   registerDependency(qualifier: ImportQualifier): InternalDependency;
   getDependencies(): Array<InternalDependency>;
 }

package/src/ModuleGraph/worker/collectDependencies.js

@@ -405,6 +405,9 @@ function isOptionalDependency(name, path, state) {
   if (!allowOptionalDependencies || isExcluded()) {
     return false;
   }
+  if (isInPromiseChainWithRejectionHandler(path)) {
+    return true;
+  }
   let sCount = 0;
   let p = path;
   while (p && sCount < 3) {
@@ -422,6 +425,55 @@ function isOptionalDependency(name, path, state) {
   }
   return false;
 }
+function isInPromiseChainWithRejectionHandler(path) {
+  let current = path;
+  while (current.parentPath != null) {
+    const member = current.parentPath;
+    if (
+      member.node.type !== "MemberExpression" ||
+      member.node.object !== current.node ||
+      member.node.computed ||
+      member.node.property.type !== "Identifier" ||
+      member.parentPath == null
+    ) {
+      return false;
+    }
+    const call = member.parentPath;
+    if (
+      call.node.type !== "CallExpression" ||
+      call.node.callee !== member.node
+    ) {
+      return false;
+    }
+    const propertyName = member.node.property.name;
+    const args = call.node.arguments;
+    if (
+      propertyName === "catch" &&
+      args.length >= 1 &&
+      isNonNullishCallbackArg(args[0])
+    ) {
+      return true;
+    }
+    if (
+      propertyName === "then" &&
+      args.length >= 2 &&
+      isNonNullishCallbackArg(args[1])
+    ) {
+      return true;
+    }
+    current = call;
+  }
+  return false;
+}
+function isNonNullishCallbackArg(arg) {
+  if (arg.type === "NullLiteral") {
+    return false;
+  }
+  if (arg.type === "Identifier" && arg.name === "undefined") {
+    return false;
+  }
+  return true;
+}
 function getModuleNameFromCallArgs(path) {
   const args = path.get("arguments");
   if (!Array.isArray(args) || args.length !== 1) {

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

@@ -630,6 +630,15 @@ function isOptionalDependency(
     return false;
   }
 
+  // Treat dynamic imports as optional when a rejection handler is attached
+  // close to the import call, e.g.
+  //   import('x').catch(handler)
+  //   import('x').then(handler, onReject)
+  //   import('x').then(...).catch(handler)
+  if (isInPromiseChainWithRejectionHandler(path)) {
+    return true;
+  }
+
   // Valid statement stack for single-level try-block: expressionStatement -> blockStatement -> tryStatement
   let sCount = 0;
   let p: ?(NodePath<> | NodePath<BabelNode>) = path;
@@ -652,6 +661,64 @@ function isOptionalDependency(
   return false;
 }
 
+// Walk up a chain of `.then(...)` / `.catch(...)` member calls starting from
+// `path` (typically an `import()` CallExpression) and return true if any
+// chained call provides a rejection handler — either `.catch(handler)` or
+// `.then(_, handler)`. The chain must be unbroken: as soon as the parent is
+// not a member call applied to the previous expression, we stop. This keeps
+// the heuristic local to the import, matching the behaviour of the
+// try/catch heuristic above.
+function isInPromiseChainWithRejectionHandler(path: NodePath<>): boolean {
+  let current: NodePath<> = path;
+  while (current.parentPath != null) {
+    const member = current.parentPath;
+    if (
+      member.node.type !== 'MemberExpression' ||
+      member.node.object !== current.node ||
+      member.node.computed ||
+      member.node.property.type !== 'Identifier' ||
+      member.parentPath == null
+    ) {
+      return false;
+    }
+    const call = member.parentPath;
+    if (
+      call.node.type !== 'CallExpression' ||
+      call.node.callee !== member.node
+    ) {
+      return false;
+    }
+    const propertyName = member.node.property.name;
+    const args = call.node.arguments;
+    if (
+      propertyName === 'catch' &&
+      args.length >= 1 &&
+      isNonNullishCallbackArg(args[0])
+    ) {
+      return true;
+    }
+    if (
+      propertyName === 'then' &&
+      args.length >= 2 &&
+      isNonNullishCallbackArg(args[1])
+    ) {
+      return true;
+    }
+    current = call;
+  }
+  return false;
+}
+
+function isNonNullishCallbackArg(arg: BabelNode): boolean {
+  if (arg.type === 'NullLiteral') {
+    return false;
+  }
+  if (arg.type === 'Identifier' && arg.name === 'undefined') {
+    return false;
+  }
+  return true;
+}
+
 function getModuleNameFromCallArgs(path: NodePath<CallExpression>): ?string {
   const args = path.get('arguments');
   if (!Array.isArray(args) || args.length !== 1) {

package/src/Server/symbolicate.js.flow

@@ -20,10 +20,10 @@ import {greatestLowerBound} from 'metro-source-map/private/Consumer/search';
 import {SourceMetadataMapConsumer} from 'metro-symbolicate/private/Symbolication';
 
 export type StackFrameInput = {
-  +file: ?string,
-  +lineNumber: ?number,
-  +column: ?number,
-  +methodName: ?string,
+  readonly file: ?string,
+  readonly lineNumber: ?number,
+  readonly column: ?number,
+  readonly methodName: ?string,
   ...
 };
 export type IntermediateStackFrame = {
@@ -33,7 +33,7 @@ export type IntermediateStackFrame = {
 };
 export type StackFrameOutput = Readonly<IntermediateStackFrame>;
 type ExplodedSourceMapModule = ExplodedSourceMap[number];
-type Position = {+line1Based: number, column0Based: number};
+type Position = {readonly line1Based: number, column0Based: number};
 
 function createFunctionNameGetter(
   module: ExplodedSourceMapModule,
@@ -68,10 +68,10 @@ export default async function symbolicate(
   }
   const functionNameGetters = new Map<
     {
-      +firstLine1Based: number,
-      +functionMap: ?FBSourceFunctionMap,
-      +map: Array<MetroSourceMapSegmentTuple>,
-      +path: string,
+      readonly firstLine1Based: number,
+      readonly functionMap: ?FBSourceFunctionMap,
+      readonly map: Array<MetroSourceMapSegmentTuple>,
+      readonly path: string,
     },
     (Position) => ?string,
   >();
@@ -138,10 +138,10 @@ export default async function symbolicate(
   function findFunctionName(
     originalPos: Position,
     module: {
-      +firstLine1Based: number,
-      +functionMap: ?FBSourceFunctionMap,
-      +map: Array<MetroSourceMapSegmentTuple>,
-      +path: string,
+      readonly firstLine1Based: number,
+      readonly functionMap: ?FBSourceFunctionMap,
+      readonly map: Array<MetroSourceMapSegmentTuple>,
+      readonly path: string,
     },
   ): ?string {
     if (module.functionMap) {