metro 0.84.3 → 0.85.0

package/src/Server.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<161e77301d04ce6cc254f1dbf15ef06b>>
+ * @generated SignedSource<<a4fd26fa84b68e8bc2b3c32bcf36e7bc>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/Server.js
@@ -16,38 +16,16 @@
  */
 
 import type {AssetData} from './Assets';
-import type {ExplodedSourceMap} from './DeltaBundler/Serializers/getExplodedSourceMap';
 import type {RamBundleInfo} from './DeltaBundler/Serializers/getRamBundleInfo';
-import type {
-  Module,
-  ReadOnlyDependencies,
-  ReadOnlyGraph,
-  TransformInputOptions,
-} from './DeltaBundler/types';
-import type {RevisionId} from './IncrementalBundler';
-import type {GraphId} from './lib/getGraphId';
-import type {Reporter} from './lib/reporting';
-import type {
-  BuildOptions,
-  BundleOptions,
-  GraphOptions,
-  ResolverInputOptions,
-  SplitBundleOptions,
-} from './shared/types';
+import type {BuildOptions, BundleOptions} from './shared/types';
 import type {IncomingMessage} from 'connect';
 import type {ServerResponse} from 'http';
-import type {ConfigT, RootPerfLogger} from 'metro-config';
-import type {
-  ActionLogEntryData,
-  ActionStartLogEntry,
-} from 'metro-core/private/Logger';
+import type {ConfigT} from 'metro-config';
 import type {CustomResolverOptions} from 'metro-resolver/private/types';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
 import IncrementalBundler from './IncrementalBundler';
-import MultipartResponse from './Server/MultipartResponse';
 import {SourcePathsMode} from './shared/types';
-import {Logger} from 'metro-core';
 
 export type SegmentLoadData = {
   [$$Key$$: number]: [Array<number>, null | undefined | number];
@@ -59,180 +37,33 @@ export type BundleMetadata = {
   segmentHashes: Array<string>;
   segmentLoadData: SegmentLoadData;
 };
-type ProcessStartContext = Omit<
-  SplitBundleOptions,
-  keyof {
-    readonly buildNumber: number;
-    readonly bundleOptions: BundleOptions;
-    readonly graphId: GraphId;
-    readonly graphOptions: GraphOptions;
-    readonly mres: MultipartResponse | ServerResponse;
-    readonly req: IncomingMessage;
-    readonly revisionId?: null | undefined | RevisionId;
-    readonly bundlePerfLogger: RootPerfLogger;
-    readonly requestStartTimestamp: number;
-  }
-> & {
-  readonly buildNumber: number;
-  readonly bundleOptions: BundleOptions;
-  readonly graphId: GraphId;
-  readonly graphOptions: GraphOptions;
-  readonly mres: MultipartResponse | ServerResponse;
-  readonly req: IncomingMessage;
-  readonly revisionId?: null | undefined | RevisionId;
-  readonly bundlePerfLogger: RootPerfLogger;
-  readonly requestStartTimestamp: number;
-};
-type ProcessDeleteContext = {
-  readonly graphId: GraphId;
-  readonly req: IncomingMessage;
-  readonly res: ServerResponse;
-};
-type ProcessEndContext<T> = Omit<
-  ProcessStartContext,
-  keyof {readonly result: T}
-> & {readonly result: T};
 export type ServerOptions = Readonly<{
   hasReducedPerformance?: boolean;
   onBundleBuilt?: (bundlePath: string) => void;
   watch?: boolean;
 }>;
-type FetchTiming = {
-  graphId: GraphId;
-  startTime: number;
-  endTime: number | null;
-  isPrefetch: boolean;
-};
 declare class Server {
-  _bundler: IncrementalBundler;
-  _config: ConfigT;
-  _createModuleId: (path: string) => number;
-  _isEnded: boolean;
-  _logger: typeof Logger;
-  _nextBundleBuildNumber: number;
-  _platforms: Set<string>;
-  _reporter: Reporter;
-  _serverOptions: ServerOptions | void;
-  _allowedSuffixesForSourceRequests: ReadonlyArray<string>;
-  _sourceRequestRoutingMap: ReadonlyArray<
-    [pathnamePrefix: string, normalizedRootDir: string]
-  >;
-  _fetchTimings: Array<FetchTiming>;
-  _activeFetchCount: number;
   constructor(config: ConfigT, options?: ServerOptions);
   end(): void;
   getBundler(): IncrementalBundler;
   getCreateModuleId(): (path: string) => number;
-  _serializeGraph(
-    $$PARAM_0$$: Readonly<{
-      splitOptions: SplitBundleOptions;
-      prepend: ReadonlyArray<Module>;
-      graph: ReadOnlyGraph;
-    }>,
-  ): Promise<{code: string; map: string}>;
   build(
     bundleOptions: BundleOptions,
     $$PARAM_1$$?: BuildOptions,
   ): Promise<{code: string; map: string; assets?: ReadonlyArray<AssetData>}>;
   getRamBundleInfo(options: BundleOptions): Promise<RamBundleInfo>;
   getAssets(options: BundleOptions): Promise<ReadonlyArray<AssetData>>;
-  _getAssetsFromDependencies(
-    dependencies: ReadOnlyDependencies,
-    platform: null | undefined | string,
-  ): Promise<ReadonlyArray<AssetData>>;
   getOrderedDependencyPaths(options: {
     readonly dev: boolean;
     readonly entryFile: string;
     readonly minify: boolean;
     readonly platform: null | undefined | string;
   }): Promise<Array<string>>;
-  _rangeRequestMiddleware(
-    req: IncomingMessage,
-    res: ServerResponse,
-    data: string | Buffer,
-    assetPath: string,
-  ): Buffer | string;
-  _processSingleAssetRequest(
-    req: IncomingMessage,
-    res: ServerResponse,
-  ): Promise<void>;
   processRequest: (
     $$PARAM_0$$: IncomingMessage,
     $$PARAM_1$$: ServerResponse,
     $$PARAM_2$$: (e: null | undefined | Error) => void,
   ) => void;
-  _parseOptions(url: string): BundleOptions;
-  _rewriteAndNormalizeUrl(requestUrl: string): string;
-  _processRequest(
-    req: IncomingMessage,
-    res: ServerResponse,
-    next: ($$PARAM_0$$: null | undefined | Error) => void,
-  ): Promise<void>;
-  _processSourceRequest(
-    relativeFilePathname: string,
-    rootDir: string,
-    res: ServerResponse,
-  ): Promise<void>;
-  _createRequestProcessor<T>($$PARAM_0$$: {
-    readonly bundleType: 'assets' | 'bundle' | 'map';
-    readonly createStartEntry: (
-      context: ProcessStartContext,
-    ) => ActionLogEntryData;
-    readonly createEndEntry: (
-      context: ProcessEndContext<T>,
-    ) => Partial<ActionStartLogEntry>;
-    readonly build: (context: ProcessStartContext) => Promise<T>;
-    readonly delete?: (context: ProcessDeleteContext) => Promise<void>;
-    readonly finish: (context: ProcessEndContext<T>) => void;
-  }): (
-    req: IncomingMessage,
-    res: ServerResponse,
-    bundleOptions: BundleOptions,
-    buildContext: Readonly<{
-      buildNumber: number;
-      bundlePerfLogger: RootPerfLogger;
-    }>,
-  ) => Promise<void>;
-  _processBundleRequest: (
-    req: IncomingMessage,
-    res: ServerResponse,
-    bundleOptions: BundleOptions,
-    buildContext: Readonly<{
-      buildNumber: number;
-      bundlePerfLogger: RootPerfLogger;
-    }>,
-  ) => Promise<void>;
-  _getSortedModules(graph: ReadOnlyGraph): ReadonlyArray<Module>;
-  _processSourceMapRequest: (
-    req: IncomingMessage,
-    res: ServerResponse,
-    bundleOptions: BundleOptions,
-    buildContext: Readonly<{
-      buildNumber: number;
-      bundlePerfLogger: RootPerfLogger;
-    }>,
-  ) => Promise<void>;
-  _processAssetsRequest: (
-    req: IncomingMessage,
-    res: ServerResponse,
-    bundleOptions: BundleOptions,
-    buildContext: Readonly<{
-      buildNumber: number;
-      bundlePerfLogger: RootPerfLogger;
-    }>,
-  ) => Promise<void>;
-  _symbolicate(req: IncomingMessage, res: ServerResponse): Promise<void>;
-  _explodedSourceMapForBundleOptions(
-    bundleOptions: BundleOptions,
-  ): Promise<ExplodedSourceMap>;
-  _resolveRelativePath(
-    filePath: string,
-    $$PARAM_1$$: Readonly<{
-      relativeTo: 'project' | 'server';
-      resolverOptions: ResolverInputOptions;
-      transformOptions: TransformInputOptions;
-    }>,
-  ): Promise<string>;
   getNewBuildNumber(): number;
   getPlatforms(): ReadonlyArray<string>;
   getWatchFolders(): ReadonlyArray<string>;
@@ -269,10 +100,6 @@ declare class Server {
     sourceUrl: null;
     sourcePaths: SourcePathsMode;
   };
-  _getServerRootDir(): string;
-  _getEntryPointAbsolutePath(entryFile: string): string;
   ready(): Promise<void>;
-  _shouldAddModuleToIgnoreList(module: Module): boolean;
-  _getModuleSourceUrl(module: Module, mode: SourcePathsMode): string;
 }
 export default Server;

package/src/Server.js

@@ -1347,6 +1347,35 @@ class Server {
       },
     );
   }
+  _resolveWatchFolderPrefix(filePath) {
+    const watchFolderMatch = filePath.match(
+      /^\.\/\[metro-watchFolders\]\/(\d+)\/(.*)/,
+    );
+    if (watchFolderMatch != null) {
+      const index = parseInt(watchFolderMatch[1], 10);
+      const watchFolder = this._config.watchFolders[index];
+      if (watchFolder != null) {
+        return {
+          rootDir: _path.default.resolve(watchFolder),
+          filePath:
+            "." +
+            _path.default.sep +
+            watchFolderMatch[2].split("/").join(_path.default.sep),
+        };
+      }
+    }
+    const projectMatch = filePath.match(/^\.\/\[metro-project\]\/(.*)/);
+    if (projectMatch != null) {
+      return {
+        rootDir: _path.default.resolve(this._config.projectRoot),
+        filePath:
+          "." +
+          _path.default.sep +
+          projectMatch[1].split("/").join(_path.default.sep),
+      };
+    }
+    return null;
+  }
   async _resolveRelativePath(
     filePath,
     { relativeTo, resolverOptions, transformOptions },
@@ -1356,14 +1385,18 @@ class Server {
       transformOptions.platform,
       resolverOptions,
     );
+    const resolved = this._resolveWatchFolderPrefix(filePath);
     const rootDir =
-      relativeTo === "server"
-        ? this._getServerRootDir()
-        : this._config.projectRoot;
+      resolved != null
+        ? resolved.rootDir
+        : relativeTo === "server"
+          ? this._getServerRootDir()
+          : this._config.projectRoot;
+    const resolvedFilePath = resolved != null ? resolved.filePath : filePath;
     return resolutionFn(`${rootDir}/.`, {
-      name: filePath,
+      name: resolvedFilePath,
       data: {
-        key: filePath,
+        key: resolvedFilePath,
         locs: [],
         asyncType: null,
         isESMImport: false,
@@ -1403,6 +1436,10 @@ class Server {
     return this._config.server.unstable_serverRoot ?? this._config.projectRoot;
   }
   _getEntryPointAbsolutePath(entryFile) {
+    const resolved = this._resolveWatchFolderPrefix(entryFile);
+    if (resolved != null) {
+      return _path.default.resolve(resolved.rootDir, resolved.filePath);
+    }
     return _path.default.resolve(this._getServerRootDir(), entryFile);
   }
   async ready() {

package/src/Server.js.flow

@@ -100,26 +100,26 @@ export type BundleMetadata = {
 
 type ProcessStartContext = {
   ...SplitBundleOptions,
-  +buildNumber: number,
-  +bundleOptions: BundleOptions,
-  +graphId: GraphId,
-  +graphOptions: GraphOptions,
-  +mres: MultipartResponse | ServerResponse,
-  +req: IncomingMessage,
-  +revisionId?: ?RevisionId,
-  +bundlePerfLogger: RootPerfLogger,
-  +requestStartTimestamp: number,
+  readonly buildNumber: number,
+  readonly bundleOptions: BundleOptions,
+  readonly graphId: GraphId,
+  readonly graphOptions: GraphOptions,
+  readonly mres: MultipartResponse | ServerResponse,
+  readonly req: IncomingMessage,
+  readonly revisionId?: ?RevisionId,
+  readonly bundlePerfLogger: RootPerfLogger,
+  readonly requestStartTimestamp: number,
 };
 
 type ProcessDeleteContext = {
-  +graphId: GraphId,
-  +req: IncomingMessage,
-  +res: ServerResponse,
+  readonly graphId: GraphId,
+  readonly req: IncomingMessage,
+  readonly res: ServerResponse,
 };
 
 type ProcessEndContext<T> = {
   ...ProcessStartContext,
-  +result: T,
+  readonly result: T,
 };
 
 export type ServerOptions = Readonly<{
@@ -446,10 +446,10 @@ export default class Server {
   }
 
   async getOrderedDependencyPaths(options: {
-    +dev: boolean,
-    +entryFile: string,
-    +minify: boolean,
-    +platform: ?string,
+    readonly dev: boolean,
+    readonly entryFile: string,
+    readonly minify: boolean,
+    readonly platform: ?string,
     ...
   }): Promise<Array<string>> {
     const {
@@ -768,14 +768,16 @@ export default class Server {
     delete: deleteFn,
     finish,
   }: {
-    +bundleType: 'assets' | 'bundle' | 'map',
-    +createStartEntry: (context: ProcessStartContext) => ActionLogEntryData,
-    +createEndEntry: (
+    readonly bundleType: 'assets' | 'bundle' | 'map',
+    readonly createStartEntry: (
+      context: ProcessStartContext,
+    ) => ActionLogEntryData,
+    readonly createEndEntry: (
       context: ProcessEndContext<T>,
     ) => Partial<ActionStartLogEntry>,
-    +build: (context: ProcessStartContext) => Promise<T>,
-    +delete?: (context: ProcessDeleteContext) => Promise<void>,
-    +finish: (context: ProcessEndContext<T>) => void,
+    readonly build: (context: ProcessStartContext) => Promise<T>,
+    readonly delete?: (context: ProcessDeleteContext) => Promise<void>,
+    readonly finish: (context: ProcessEndContext<T>) => void,
   }): (
     req: IncomingMessage,
     res: ServerResponse,
@@ -1622,6 +1624,33 @@ export default class Server {
     );
   }
 
+  _resolveWatchFolderPrefix(
+    filePath: string,
+  ): {rootDir: string, filePath: string} | null {
+    const watchFolderMatch = filePath.match(
+      /^\.\/\[metro-watchFolders\]\/(\d+)\/(.*)/,
+    );
+    if (watchFolderMatch != null) {
+      const index = parseInt(watchFolderMatch[1], 10);
+      const watchFolder = this._config.watchFolders[index];
+      if (watchFolder != null) {
+        return {
+          rootDir: path.resolve(watchFolder),
+          filePath:
+            '.' + path.sep + watchFolderMatch[2].split('/').join(path.sep),
+        };
+      }
+    }
+    const projectMatch = filePath.match(/^\.\/\[metro-project\]\/(.*)/);
+    if (projectMatch != null) {
+      return {
+        rootDir: path.resolve(this._config.projectRoot),
+        filePath: '.' + path.sep + projectMatch[1].split('/').join(path.sep),
+      };
+    }
+    return null;
+  }
+
   async _resolveRelativePath(
     filePath: string,
     {
@@ -1639,13 +1668,22 @@ export default class Server {
       transformOptions.platform,
       resolverOptions,
     );
+    const resolved = this._resolveWatchFolderPrefix(filePath);
     const rootDir =
-      relativeTo === 'server'
-        ? this._getServerRootDir()
-        : this._config.projectRoot;
+      resolved != null
+        ? resolved.rootDir
+        : relativeTo === 'server'
+          ? this._getServerRootDir()
+          : this._config.projectRoot;
+    const resolvedFilePath = resolved != null ? resolved.filePath : filePath;
     return resolutionFn(`${rootDir}/.`, {
-      name: filePath,
-      data: {key: filePath, locs: [], asyncType: null, isESMImport: false},
+      name: resolvedFilePath,
+      data: {
+        key: resolvedFilePath,
+        locs: [],
+        asyncType: null,
+        isESMImport: false,
+      },
     }).filePath;
   }
 
@@ -1706,6 +1744,10 @@ export default class Server {
   }
 
   _getEntryPointAbsolutePath(entryFile: string): string {
+    const resolved = this._resolveWatchFolderPrefix(entryFile);
+    if (resolved != null) {
+      return path.resolve(resolved.rootDir, resolved.filePath);
+    }
     return path.resolve(this._getServerRootDir(), entryFile);
   }
 

package/src/index.flow.js

@@ -63,7 +63,6 @@ var _TerminalReporter = _interopRequireDefault(
 );
 var _Server = _interopRequireDefault(require("./Server"));
 var outputBundle = _interopRequireWildcard(require("./shared/output/bundle"));
-var _chalk = _interopRequireDefault(require("chalk"));
 var _fs = _interopRequireDefault(require("fs"));
 var _http = _interopRequireDefault(require("http"));
 var _https = _interopRequireDefault(require("https"));
@@ -71,6 +70,7 @@ var _metroConfig = require("metro-config");
 var _metroCore = require("metro-core");
 var _net = _interopRequireDefault(require("net"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
+var _util = _interopRequireDefault(require("util"));
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
     var r = new WeakMap(),
@@ -201,7 +201,7 @@ const runServer = async (
   await earlyPortCheck(host, config.server.port);
   if (secure != null || secureCert != null || secureKey != null) {
     console.warn(
-      _chalk.default.inverse.yellow.bold(" DEPRECATED "),
+      _util.default.styleText(["inverse", "yellow", "bold"], " DEPRECATED "),
       "The `secure`, `secureCert`, and `secureKey` options are now deprecated. " +
         "Please use the `secureServerOptions` object instead to pass options to " +
         "Metro's https development server, or `config.server.tls` in Metro's configuration",

package/src/index.flow.js.flow

@@ -41,7 +41,6 @@ import JsonReporter from './lib/JsonReporter';
 import TerminalReporter from './lib/TerminalReporter';
 import MetroServer from './Server';
 import * as outputBundle from './shared/output/bundle';
-import chalk from 'chalk';
 import fs from 'fs';
 import http from 'http';
 import https from 'https';
@@ -54,6 +53,7 @@ import {
 import {Terminal} from 'metro-core';
 import net from 'net';
 import nullthrows from 'nullthrows';
+import util from 'util';
 
 const DEFAULTS = MetroServer.DEFAULT_BUNDLE_OPTIONS;
 
@@ -296,7 +296,7 @@ export const runServer = async (
   if (secure != null || secureCert != null || secureKey != null) {
     // eslint-disable-next-line no-console
     console.warn(
-      chalk.inverse.yellow.bold(' DEPRECATED '),
+      util.styleText(['inverse', 'yellow', 'bold'], ' DEPRECATED '),
       'The `secure`, `secureCert`, and `secureKey` options are now deprecated. ' +
         'Please use the `secureServerOptions` object instead to pass options to ' +
         "Metro's https development server, or `config.server.tls` in Metro's configuration",

package/src/lib/BatchProcessor.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<5872ab26db1c8f4499c971170c5012c4>>
+ * @generated SignedSource<<44408f85f4340c918786727e30822c20>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/lib/BatchProcessor.js
@@ -15,8 +15,6 @@
  *   yarn run build-ts-defs (OSS) 
  */
 
-import {setTimeout} from 'timers';
-
 type ProcessBatch<TItem, TResult> = (
   batch: Array<TItem>,
 ) => Promise<Array<TResult>>;
@@ -25,11 +23,6 @@ type BatchProcessorOptions = {
   maximumItems: number;
   concurrency: number;
 };
-type QueueItem<TItem, TResult> = {
-  item: TItem;
-  reject: (error: unknown) => unknown;
-  resolve: (result: TResult) => unknown;
-};
 /**
  * We batch items together trying to minimize their processing, for example as
  * network queries. For that we wait a small moment before processing a batch.
@@ -38,23 +31,10 @@ type QueueItem<TItem, TResult> = {
  * processing right away.
  */
 declare class BatchProcessor<TItem, TResult> {
-  _currentProcessCount: number;
-  _options: BatchProcessorOptions;
-  _processBatch: ProcessBatch<TItem, TResult>;
-  _queue: Array<QueueItem<TItem, TResult>>;
-  _timeoutHandle: null | undefined | ReturnType<typeof setTimeout>;
   constructor(
     options: BatchProcessorOptions,
     processBatch: ProcessBatch<TItem, TResult>,
   );
-  _onBatchFinished(): void;
-  _onBatchResults(
-    jobs: Array<QueueItem<TItem, TResult>>,
-    results: Array<TResult>,
-  ): void;
-  _onBatchError(jobs: Array<QueueItem<TItem, TResult>>, error: unknown): void;
-  _processQueue(): void;
-  _processQueueOnceReady(): void;
   queue(item: TItem): Promise<TResult>;
   getQueueLength(): number;
 }

package/src/lib/CountingSet.js.flow

@@ -11,7 +11,7 @@
 
 export interface ReadOnlyCountingSet<T> extends Iterable<T> {
   has(item: T): boolean;
-  +size: number;
+  readonly size: number;
   count(item: T): number;
   forEach<ThisT>(
     callbackFn: (

package/src/lib/JsonReporter.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<e7173f8dc5e076fd37b9a1cecd581f58>>
+ * @generated SignedSource<<bfc4caf223ec55afbed87fbd905607ea>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/lib/JsonReporter.js
@@ -33,7 +33,6 @@ export type SerializedEvent<
 declare class JsonReporter<
   TEvent extends {readonly [$$Key$$: string]: unknown},
 > {
-  _stream: Writable;
   constructor(stream: Writable);
   /**
    * There is a special case for errors because they have non-enumerable fields.

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;
 }