metro 0.84.3 → 0.85.0

package/src/lib/reporting.js.flow

@@ -14,9 +14,12 @@ import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
 
-import chalk from 'chalk';
+import tty from 'tty';
 import util from 'util';
 
+const supportsColor = (): boolean =>
+  process.stdout instanceof tty.WriteStream && process.stdout.hasColors();
+
 export type BundleDetails = {
   bundleType: string,
   customResolverOptions: CustomResolverOptions,
@@ -190,7 +193,11 @@ export function logWarning(
   ...args: Array<unknown>
 ): void {
   const str = util.format(format, ...args);
-  terminal.log('%s %s', chalk.yellow.inverse.bold(' WARN '), str);
+  terminal.log(
+    '%s %s',
+    util.styleText(['yellow', 'inverse', 'bold'], ' WARN '),
+    str,
+  );
 }
 
 /**
@@ -203,13 +210,13 @@ export function logError(
 ): void {
   terminal.log(
     '%s %s',
-    chalk.red.inverse.bold(' ERROR '),
+    util.styleText(['red', 'inverse', 'bold'], ' ERROR '),
     // Syntax errors may have colors applied for displaying code frames
     // in various places outside of where Metro is currently running.
     // If the current terminal does not support color, we'll strip the colors
     // here.
     util.format(
-      chalk.supportsColor ? format : util.stripVTControlCharacters(format),
+      supportsColor() ? format : util.stripVTControlCharacters(format),
       ...args,
     ),
   );
@@ -224,7 +231,11 @@ export function logInfo(
   ...args: Array<unknown>
 ): void {
   const str = util.format(format, ...args);
-  terminal.log('%s %s', chalk.cyan.inverse.bold(' INFO '), str);
+  terminal.log(
+    '%s %s',
+    util.styleText(['cyan', 'inverse', 'bold'], ' INFO '),
+    str,
+  );
 }
 
 /**

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

@@ -80,7 +80,6 @@ function createFileMap(config, options) {
     dependencyPlugin = new _metroFileMap.DependencyPlugin({
       dependencyExtractor: config.resolver.dependencyExtractor,
       computeDependencies: true,
-      rootDir: config.projectRoot,
     });
     plugins.push(dependencyPlugin);
   }
@@ -115,7 +114,6 @@ function createFileMap(config, options) {
         ...config.watcher.additionalExts,
       ]),
     ),
-    forceNodeFilesystemAPI: !config.resolver.useWatchman,
     healthCheck: config.watcher.healthCheck,
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,

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

@@ -88,7 +88,6 @@ export default function createFileMap(
     dependencyPlugin = new DependencyPlugin({
       dependencyExtractor: config.resolver.dependencyExtractor,
       computeDependencies: true,
-      rootDir: config.projectRoot,
     });
     plugins.push(dependencyPlugin);
   }
@@ -126,7 +125,6 @@ export default function createFileMap(
         ...config.watcher.additionalExts,
       ]),
     ),
-    forceNodeFilesystemAPI: !config.resolver.useWatchman,
     healthCheck: config.watcher.healthCheck,
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,

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 = {