metro 0.84.4 → 0.86.0

package/src/lib/JsonReporter.js.flow

@@ -19,7 +19,7 @@ export type SerializedError = {
   ...
 };
 
-export type SerializedEvent<TEvent extends {+[string]: unknown, ...}> =
+export type SerializedEvent<TEvent extends {readonly [string]: unknown, ...}> =
   TEvent extends {
     error: Error,
     ...
@@ -31,7 +31,9 @@ export type SerializedEvent<TEvent extends {+[string]: unknown, ...}> =
       }
     : TEvent;
 
-export default class JsonReporter<TEvent extends {+[string]: unknown, ...}> {
+export default class JsonReporter<
+  TEvent extends {readonly [string]: unknown, ...},
+> {
   _stream: Writable;
 
   constructor(stream: Writable) {

package/src/lib/RamBundleParser.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<ebddbde1dcdecbbee129fd96caaf3bb0>>
+ * @generated SignedSource<<7be940ed3f4c6dffc465780640e301ec>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/lib/RamBundleParser.js
@@ -24,12 +24,7 @@
  * getModule(): returns the code for the specified module.
  */
 declare class RamBundleParser {
-  _buffer: Buffer;
-  _numModules: number;
-  _startupCodeLength: number;
-  _startOffset: number;
   constructor(buffer: Buffer);
-  _readPosition(pos: number): number;
   getStartupCode(): string;
   getModule(id: number): string;
 }

package/src/lib/TerminalReporter.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<8218e45d6b5186264c4bf9e54086708a>>
+ * @generated SignedSource<<14645ae49e4ed5ce74bdd181db9098d4>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/lib/TerminalReporter.js
@@ -15,17 +15,9 @@
  *   yarn run build-ts-defs (OSS) 
  */
 
-import type {BundleDetails, ReportableEvent} from './reporting';
+import type {ReportableEvent} from './reporting';
 import type {Terminal} from 'metro-core';
-import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
-type BundleProgress = {
-  bundleDetails: BundleDetails;
-  transformedFileCount: number;
-  totalFileCount: number;
-  ratio: number;
-  isPrefetch?: boolean;
-};
 export type TerminalReportableEvent =
   | ReportableEvent
   | {
@@ -41,81 +33,13 @@ export type TerminalReportableEvent =
     }
   | {type: 'unstable_server_menu_updated'; message: string}
   | {type: 'unstable_server_menu_cleared'};
-type BuildPhase = 'in_progress' | 'done' | 'failed';
-interface SnippetError extends Error {
-  code?: string;
-  filename?: string;
-  snippet?: string;
-}
 /**
  * We try to print useful information to the terminal for interactive builds.
  * This implements the `Reporter` interface from the './reporting' module.
  */
 declare class TerminalReporter {
-  /**
-   * The bundle builds for which we are actively maintaining the status on the
-   * terminal, ie. showing a progress bar. There can be several bundles being
-   * built at the same time.
-   */
-  _activeBundles: Map<string, BundleProgress>;
-  _interactionStatus: null | undefined | string;
-  _scheduleUpdateBundleProgress: {
-    (data: {
-      buildID: string;
-      transformedFileCount: number;
-      totalFileCount: number;
-    }): void;
-    cancel(): void;
-  };
-  _prevHealthCheckResult: null | undefined | HealthCheckResult;
   readonly terminal: Terminal;
   constructor(terminal: Terminal);
-  /**
-   * Construct a message that represents the progress of a
-   * single bundle build, for example:
-   *
-   *     BUNDLE path/to/bundle.js ▓▓▓▓▓░░░░░░░░░░░ 36.6% (4790/7922)
-   */
-  _getBundleStatusMessage(
-    $$PARAM_0$$: BundleProgress,
-    phase: BuildPhase,
-  ): string;
-  _logBundleBuildDone(buildID: string): void;
-  _logBundleBuildFailed(buildID: string): void;
-  _logInitializing(port: number, hasReducedPerformance: boolean): void;
-  _logInitializingFailed(port: number, error: SnippetError): void;
-  /**
-   * This function is only concerned with logging and should not do state
-   * or terminal status updates.
-   */
-  _log(event: TerminalReportableEvent): void;
-  /**
-   * We do not want to log the whole stacktrace for bundling error, because
-   * these are operational errors, not programming errors, and the stacktrace
-   * is not actionable to end users.
-   */
-  _logBundlingError(error: SnippetError): void;
-  _logWorkerChunk(origin: 'stdout' | 'stderr', chunk: string): void;
-  _updateBundleProgress($$PARAM_0$$: {
-    buildID: string;
-    transformedFileCount: number;
-    totalFileCount: number;
-  }): void;
-  /**
-   * This function is exclusively concerned with updating the internal state.
-   * No logging or status updates should be done at this point.
-   */
-  _updateState(event: TerminalReportableEvent): void;
-  /**
-   * Return a status message that is always consistent with the current state
-   * of the application. Having this single function ensures we don't have
-   * different callsites overriding each other status messages.
-   */
-  _getStatusMessage(): string;
-  _logHmrClientError(e: Error): void;
-  _logWarning(message: string): void;
-  _logWatcherHealthCheckResult(result: HealthCheckResult): void;
-  _logWatcherStatus(status: WatcherStatus): void;
   /**
    * Single entry point for reporting events. That allows us to implement the
    * corresponding JSON reporter easily and have a consistent reporting.

package/src/lib/TerminalReporter.js.flow

@@ -100,7 +100,7 @@ export default class TerminalReporter {
   };
   _prevHealthCheckResult: ?HealthCheckResult;
 
-  +terminal: Terminal;
+  readonly terminal: Terminal;
 
   constructor(terminal: Terminal) {
     this._activeBundles = new Map();

package/src/lib/bundleToString.js.flow

@@ -15,8 +15,8 @@ import type {Bundle, BundleMetadata} from 'metro-runtime/src/modules/types';
  * Serializes a bundle into a plain JS bundle.
  */
 export default function bundleToString(bundle: Bundle): {
-  +code: string,
-  +metadata: BundleMetadata,
+  readonly code: string,
+  readonly metadata: BundleMetadata,
 } {
   let code = bundle.pre.length > 0 ? bundle.pre + '\n' : '';
   const modules = [];

package/src/lib/createWebsocketServer.js.flow

@@ -13,13 +13,13 @@ import {clearInterval, setInterval} from 'timers';
 import ws from 'ws';
 
 type WebsocketServiceInterface<T> = interface {
-  +onClientConnect: (
+  readonly onClientConnect: (
     url: string,
     sendFn: (data: string) => void,
   ) => Promise<?T>,
-  +onClientDisconnect?: (client: T) => unknown,
-  +onClientError?: (client: T, e: Error) => unknown,
-  +onClientMessage?: (
+  readonly onClientDisconnect?: (client: T) => unknown,
+  readonly onClientError?: (client: T, e: Error) => unknown,
+  readonly onClientMessage?: (
     client: T,
     message: string | Buffer | ArrayBuffer | Array<Buffer>,
     sendFn: (data: string) => void,

package/src/lib/formatBundlingError.js.flow

@@ -22,7 +22,7 @@ import serializeError from 'serialize-error';
 
 export type CustomError = Error &
   interface {
-    +type?: string,
+    readonly type?: string,
     filename?: string,
     lineNumber?: number,
     errors?: Array<{

package/src/lib/getPreludeCode.js.flow

@@ -16,11 +16,11 @@ export default function getPreludeCode({
   requireCycleIgnorePatterns,
   unstable_forceFullRefreshPatterns,
 }: {
-  +extraVars?: {[string]: unknown, ...},
-  +isDev: boolean,
-  +globalPrefix: string,
-  +requireCycleIgnorePatterns: ReadonlyArray<RegExp>,
-  +unstable_forceFullRefreshPatterns: ReadonlyArray<RegExp>,
+  readonly extraVars?: {[string]: unknown, ...},
+  readonly isDev: boolean,
+  readonly globalPrefix: string,
+  readonly requireCycleIgnorePatterns: ReadonlyArray<RegExp>,
+  readonly unstable_forceFullRefreshPatterns: ReadonlyArray<RegExp>,
 }): string {
   const vars = [
     // Ensure these variable names match the ones referenced in metro-runtime

package/src/node-haste/DependencyGraph/ModuleResolution.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<0024fd05b95efe19a24f9acc84ff474b>>
+ * @generated SignedSource<<2948a6737474a8f5bd55952246f500d3>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/node-haste/DependencyGraph/ModuleResolution.js
@@ -24,9 +24,7 @@ import type {ResolverInputOptions} from '../../shared/types';
 import type {
   CustomResolver,
   DoesFileExist,
-  FileCandidates,
   FileSystemLookup,
-  Resolution,
   ResolveAsset,
 } from 'metro-resolver';
 import type {PackageForModule, PackageJson} from 'metro-resolver/private/types';
@@ -68,11 +66,7 @@ type Options = Readonly<{
   unstable_incrementalResolution: boolean;
 }>;
 export declare class ModuleResolver {
-  _options: Options;
-  _projectRootFakeModulePath: string;
-  _cachedEmptyModule: null | undefined | BundlerResolution;
   constructor(options: Options);
-  _getEmptyModule(): BundlerResolution;
   resolveDependency(
     originModulePath: string,
     dependency: TransformResultDependency,
@@ -80,12 +74,6 @@ export declare class ModuleResolver {
     platform: string | null,
     resolverOptions: ResolverInputOptions,
   ): BundlerResolution;
-  /**
-   * TODO: Return Resolution instead of coercing to BundlerResolution here
-   */
-  _getFileResolvedModule(resolution: Resolution): BundlerResolution;
-  _logWarning: (message: string) => void;
-  _removeRoot(candidates: FileCandidates): FileCandidates;
 }
 export declare class UnableToResolveError extends Error {
   /**

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

@@ -291,7 +291,7 @@ export class UnableToResolveError extends Error {
   /**
    * Fixed type field in common with other Metro build errors.
    */
-  +type: 'UnableToResolveError' = 'UnableToResolveError';
+  readonly type: 'UnableToResolveError' = 'UnableToResolveError';
 
   constructor(
     originModulePath: string,

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

@@ -36,36 +36,29 @@ function _interopRequireWildcard(e, t) {
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-function getIgnorePattern(config) {
-  const { blockList, blacklistRE } = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-  if (!ignorePattern) {
-    return / ^/;
+const flattenBlockList = (regexes) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-  const combine = (regexes) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              "Cannot combine blockList patterns, because they have different flags:\n" +
-                " - Pattern 0: " +
-                regexes[0].toString() +
-                "\n" +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return "(" + regex.source + ")";
-        })
-        .join("|"),
-      regexes[0]?.flags ?? "",
-    );
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
-  }
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            "Cannot combine blockList patterns, because they have different flags:\n" +
+              " - Pattern 0: " +
+              regexes[0].toString() +
+              "\n" +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return "(" + regex.source + ")";
+      })
+      .join("|"),
+    regexes[0]?.flags ?? "",
+  );
+};
 function createFileMap(config, options) {
   const watch = options?.watch == null ? !_ciInfo.default.isCI : options.watch;
   const { enabled: autoSaveEnabled, ...autoSaveOpts } =
@@ -114,9 +107,8 @@ function createFileMap(config, options) {
         ...config.watcher.additionalExts,
       ]),
     ),
-    forceNodeFilesystemAPI: !config.resolver.useWatchman,
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,

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

@@ -19,43 +19,29 @@ import MetroFileMap, {
   HastePlugin,
 } from 'metro-file-map';
 
-function getIgnorePattern(config: ConfigT): RegExp {
-  // For now we support both options
-  const {blockList, blacklistRE} = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-
-  // If neither option has been set, use default pattern
-  if (!ignorePattern) {
-    return / ^/;
-  }
-
-  const combine = (regexes: Array<RegExp>) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              'Cannot combine blockList patterns, because they have different flags:\n' +
-                ' - Pattern 0: ' +
-                regexes[0].toString() +
-                '\n' +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return '(' + regex.source + ')';
-        })
-        .join('|'),
-      regexes[0]?.flags ?? '',
-    );
-
-  // If ignorePattern is an array, merge it into one
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
+const flattenBlockList = (regexes: ConfigT['resolver']['blockList']) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            'Cannot combine blockList patterns, because they have different flags:\n' +
+              ' - Pattern 0: ' +
+              regexes[0].toString() +
+              '\n' +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return '(' + regex.source + ')';
+      })
+      .join('|'),
+    regexes[0]?.flags ?? '',
+  );
+};
 
 export default function createFileMap(
   config: ConfigT,
@@ -125,9 +111,8 @@ export default function createFileMap(
         ...config.watcher.additionalExts,
       ]),
     ),
-    forceNodeFilesystemAPI: !config.resolver.useWatchman,
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,

package/src/node-haste/DependencyGraph.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<13f1483d2a732241f8d9eae463399b0e>>
+ * @generated SignedSource<<1cc985f3869f7db49aca7daeca848b82>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/node-haste/DependencyGraph.js
@@ -21,32 +21,10 @@ import type {
 } from '../DeltaBundler/types';
 import type {ResolverInputOptions} from '../shared/types';
 import type {ConfigT} from 'metro-config';
-import type {
-  ChangeEvent,
-  FileSystem,
-  HasteMap,
-  HealthCheckResult,
-  WatcherStatus,
-  default as MetroFileMap,
-} from 'metro-file-map';
 
-import {ModuleResolver} from './DependencyGraph/ModuleResolution';
 import EventEmitter from 'events';
 
 declare class DependencyGraph extends EventEmitter {
-  _config: ConfigT;
-  _haste: MetroFileMap;
-  _fileSystem: FileSystem;
-  _hasteMap: HasteMap;
-  _moduleResolver: ModuleResolver;
-  _resolutionCache: Map<
-    string | symbol,
-    Map<
-      string | symbol,
-      Map<string | symbol, Map<string | symbol, BundlerResolution>>
-    >
-  >;
-  _initializedPromise: Promise<void>;
   constructor(
     config: ConfigT,
     options?: {
@@ -54,14 +32,7 @@ declare class DependencyGraph extends EventEmitter {
       readonly watch?: boolean;
     },
   );
-  _onWatcherHealthCheck(result: HealthCheckResult): void;
-  _onWatcherStatus(status: WatcherStatus): void;
   ready(): Promise<void>;
-  _onHasteChange($$PARAM_0$$: ChangeEvent): void;
-  _createModuleResolver(): void;
-  _getClosestPackage(
-    absoluteModulePath: string,
-  ): null | undefined | {packageJsonPath: string; packageRelativePath: string};
   getAllFiles(): Array<string>;
   /**
    * Used when watcher.unstable_lazySha1 is true

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

@@ -88,8 +88,8 @@ export default class DependencyGraph extends EventEmitter {
   constructor(
     config: ConfigT,
     options?: {
-      +hasReducedPerformance?: boolean,
-      +watch?: boolean,
+      readonly hasReducedPerformance?: boolean,
+      readonly watch?: boolean,
     },
   ) {
     super();

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

@@ -135,8 +135,10 @@ function combineMaps(
   return sections;
 }
 
-const joinModules = (modules: ReadonlyArray<{+code: string, ...}>): string =>
-  modules.map((m: {+code: string, ...}) => m.code).join('\n');
+const joinModules = (
+  modules: ReadonlyArray<{readonly code: string, ...}>,
+): string =>
+  modules.map((m: {readonly code: string, ...}) => m.code).join('\n');
 
 export {
   combineSourceMaps,

package/src/shared/types.js.flow

@@ -47,24 +47,24 @@ export type ReadonlySourceLocation = Readonly<{
 }>;
 
 export type BundleOptions = {
-  +customResolverOptions: CustomResolverOptions,
+  readonly customResolverOptions: CustomResolverOptions,
   customTransformOptions: CustomTransformOptions,
   dev: boolean,
   entryFile: string,
-  +excludeSource: boolean,
-  +inlineSourceMap: boolean,
-  +lazy: boolean,
+  readonly excludeSource: boolean,
+  readonly inlineSourceMap: boolean,
+  readonly lazy: boolean,
   minify: boolean,
-  +modulesOnly: boolean,
+  readonly modulesOnly: boolean,
   onProgress: ?(doneCont: number, totalCount: number) => unknown,
-  +platform: ?string,
-  +runModule: boolean,
-  +shallow: boolean,
+  readonly platform: ?string,
+  readonly runModule: boolean,
+  readonly shallow: boolean,
   sourceMapUrl: ?string,
   sourceUrl: ?string,
   createModuleIdFactory?: () => (path: string) => number,
-  +unstable_transformProfile: TransformProfile,
-  +sourcePaths: SourcePathsMode,
+  readonly unstable_transformProfile: TransformProfile,
+  readonly sourcePaths: SourcePathsMode,
 };
 
 export type BuildOptions = Readonly<{
@@ -77,18 +77,18 @@ export type ResolverInputOptions = Readonly<{
 }>;
 
 export type SerializerOptions = {
-  +sourceMapUrl: ?string,
-  +sourceUrl: ?string,
-  +runModule: boolean,
-  +excludeSource: boolean,
-  +inlineSourceMap: boolean,
-  +modulesOnly: boolean,
-  +sourcePaths: SourcePathsMode,
+  readonly sourceMapUrl: ?string,
+  readonly sourceUrl: ?string,
+  readonly runModule: boolean,
+  readonly excludeSource: boolean,
+  readonly inlineSourceMap: boolean,
+  readonly modulesOnly: boolean,
+  readonly sourcePaths: SourcePathsMode,
 };
 
 export type GraphOptions = {
-  +lazy: boolean,
-  +shallow: boolean,
+  readonly lazy: boolean,
+  readonly shallow: boolean,
 };
 
 // Stricter representation of BundleOptions.
@@ -108,24 +108,24 @@ export type ModuleGroups = {
 };
 
 export type ModuleTransportLike = {
-  +code: string,
-  +id: number,
-  +map: ?MetroSourceMapOrMappings,
-  +name?: string,
-  +sourcePath: string,
+  readonly code: string,
+  readonly id: number,
+  readonly map: ?MetroSourceMapOrMappings,
+  readonly name?: string,
+  readonly sourcePath: string,
   ...
 };
 export type ModuleTransportLikeStrict = {
-  +code: string,
-  +id: number,
-  +map: ?MetroSourceMapOrMappings,
-  +name?: string,
-  +sourcePath: string,
+  readonly code: string,
+  readonly id: number,
+  readonly map: ?MetroSourceMapOrMappings,
+  readonly name?: string,
+  readonly sourcePath: string,
 };
 export type RamModuleTransport = {
   ...ModuleTransportLikeStrict,
-  +source: string,
-  +type: string,
+  readonly source: string,
+  readonly type: string,
 };
 
 export type OutputOptions = {