metro 0.84.2 → 0.84.4

package/src/lib/TerminalReporter.js.flow

@@ -12,15 +12,22 @@
 import type {BundleDetails, ReportableEvent} from './reporting';
 import type {Terminal} from 'metro-core';
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
+import type {BackgroundColors, ForegroundColors, Modifiers} from 'util';
 
 import {calculateBundleProgressRatio} from './bundleProgressUtils';
 import logToConsole from './logToConsole';
 import * as reporting from './reporting';
-import chalk from 'chalk';
 // $FlowFixMe[untyped-import] lodash.throttle
 import throttle from 'lodash.throttle';
 import {AmbiguousModuleResolutionError} from 'metro-core';
 import path from 'path';
+import util from 'util';
+
+type StyleFormat = ReadonlyArray<
+  ForegroundColors | BackgroundColors | Modifiers,
+>;
+const style = (format: StyleFormat, text: string): string =>
+  util.styleText(format, text);
 
 type BundleProgress = {
   bundleDetails: BundleDetails,
@@ -121,28 +128,26 @@ export default class TerminalReporter {
   ): string {
     const localPath = path.relative('.', entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
-    const bundleTypeColor =
-      phase === 'done'
-        ? chalk.green
-        : phase === 'failed'
-          ? chalk.red
-          : chalk.yellow;
+    const bundleTypeColor: StyleFormat =
+      phase === 'done' ? ['green'] : phase === 'failed' ? ['red'] : ['yellow'];
     const progress =
       phase === 'in_progress'
-        ? chalk.green.bgGreen(DARK_BLOCK_CHAR.repeat(filledBar)) +
-          chalk.bgWhite.white(
+        ? style(['green', 'bgGreen'], DARK_BLOCK_CHAR.repeat(filledBar)) +
+          style(
+            ['bgWhite', 'white'],
             LIGHT_BLOCK_CHAR.repeat(MAX_PROGRESS_BAR_CHAR_WIDTH - filledBar),
           ) +
-          chalk.bold(` ${Math.floor(100 * ratio)}% `) +
-          chalk.dim(`(${transformedFileCount}/${totalFileCount})`)
+          style(['bold'], ` ${Math.floor(100 * ratio)}% `) +
+          style(['dim'], `(${transformedFileCount}/${totalFileCount})`)
         : '';
 
     return (
-      bundleTypeColor.inverse.bold(
+      style(
+        [...bundleTypeColor, 'inverse', 'bold'],
         ` ${isPrefetch === true ? 'PREBUNDLE' : bundleType.toUpperCase()} `,
       ) +
-      chalk.reset.dim(` ${path.dirname(localPath)}/`) +
-      chalk.bold(path.basename(localPath)) +
+      style(['reset', 'dim'], ` ${path.dirname(localPath)}/`) +
+      style(['bold'], path.basename(localPath)) +
       ' ' +
       progress
     );
@@ -191,31 +196,37 @@ export default class TerminalReporter {
       '',
     ];
 
-    const color = hasReducedPerformance ? chalk.red : chalk.blue;
-    this.terminal.log(color(logo.join('\n')));
+    const color: StyleFormat = hasReducedPerformance ? ['red'] : ['blue'];
+    this.terminal.log(style(color, logo.join('\n')));
   }
 
   _logInitializingFailed(port: number, error: SnippetError): void {
     if (error.code === 'EADDRINUSE') {
       this.terminal.log(
-        chalk.bgRed.bold(' ERROR '),
-        chalk.red("Metro can't listen on port", chalk.bold(String(port))),
+        style(['bgRed', 'bold'], ' ERROR '),
+        style(
+          ['red'],
+          `Metro can't listen on port ${style(['bold'], String(port))}`,
+        ),
       );
       this.terminal.log(
         'Most likely another process is already using this port',
       );
       this.terminal.log('Run the following command to find out which process:');
-      this.terminal.log('\n  ', chalk.bold('lsof -i :' + port), '\n');
+      this.terminal.log('\n  ', style(['bold'], 'lsof -i :' + port), '\n');
       this.terminal.log('Then, you can either shut down the other process:');
-      this.terminal.log('\n  ', chalk.bold('kill -9 <PID>'), '\n');
+      this.terminal.log('\n  ', style(['bold'], 'kill -9 <PID>'), '\n');
       this.terminal.log('or run Metro on different port.');
     } else {
-      this.terminal.log(chalk.bgRed.bold(' ERROR '), chalk.red(error.message));
+      this.terminal.log(
+        style(['bgRed', 'bold'], ' ERROR '),
+        style(['red'], error.message),
+      );
       const errorAttributes = JSON.stringify(error);
       if (errorAttributes !== '{}') {
-        this.terminal.log(chalk.red(errorAttributes));
+        this.terminal.log(style(['red'], errorAttributes));
       }
-      this.terminal.log(chalk.red(error.stack));
+      this.terminal.log(style(['red'], String(error.stack)));
     }
   }
 
@@ -271,20 +282,26 @@ export default class TerminalReporter {
         logFn(this.terminal, String(format), ...args);
         break;
       case 'dep_graph_loading':
-        const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
+        const color: StyleFormat = event.hasReducedPerformance
+          ? ['red']
+          : ['blue'];
         // eslint-disable-next-line import/no-commonjs
         // $FlowFixMe[untyped-import] package.json
         const version = 'v' + require('../../package.json').version;
         this.terminal.log(
-          color.bold(
-            ' '.repeat(19 - version.length / 2),
-            'Welcome to Metro ' + chalk.white(version) + '\n',
-          ) + chalk.dim('              Fast - Scalable - Integrated\n\n'),
+          style(
+            [...color, 'bold'],
+            ' '.repeat(19 - version.length / 2) +
+              ' Welcome to Metro ' +
+              style(['white'], version) +
+              '\n',
+          ) + style(['dim'], '              Fast - Scalable - Integrated\n\n'),
         );
 
         if (event.hasReducedPerformance) {
           this.terminal.log(
-            chalk.red(
+            style(
+              ['red'],
               'Metro is operating with reduced performance.\n' +
                 'Please fix the problem above and restart Metro.\n\n',
             ),
@@ -459,7 +476,7 @@ export default class TerminalReporter {
           // Only report success after a prior failure.
           if (this._prevHealthCheckResult) {
             this.terminal.log(
-              chalk.green(`Watcher ${watcherName} is now healthy.`),
+              style(['green'], `Watcher ${watcherName} is now healthy.`),
             );
           }
           break;
@@ -499,7 +516,8 @@ export default class TerminalReporter {
         break;
       case 'watchman_slow_command':
         this.terminal.log(
-          chalk.dim(
+          style(
+            ['dim'],
             `Waiting for Watchman \`${status.command}\` (${Math.round(
               status.timeElapsed / 1000,
             )}s)...`,
@@ -508,7 +526,8 @@ export default class TerminalReporter {
         break;
       case 'watchman_slow_command_complete':
         this.terminal.log(
-          chalk.green(
+          style(
+            ['green'],
             `Watchman \`${status.command}\` finished after ${(
               status.timeElapsed / 1000
             ).toFixed(1)}s.`,

package/src/lib/getAppendScripts.js.flow

@@ -18,7 +18,7 @@ import CountingSet from './CountingSet';
 import countLines from './countLines';
 import nullthrows from 'nullthrows';
 
-type Options<T: number | string> = Readonly<{
+type Options<T extends number | string> = Readonly<{
   asyncRequireModulePath: string,
   createModuleId: string => T,
   getRunModuleStatement: (moduleId: T, globalPrefix: string) => string,
@@ -33,7 +33,7 @@ type Options<T: number | string> = Readonly<{
   ...
 }>;
 
-export default function getAppendScripts<T: number | string>(
+export default function getAppendScripts<T extends number | string>(
   entryPoint: string,
   modules: ReadonlyArray<Module<>>,
   options: Options<T>,

package/src/lib/logToConsole.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = void 0;
-var _chalk = _interopRequireDefault(require("chalk"));
 var _util = _interopRequireDefault(require("util"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
@@ -15,10 +14,10 @@ var _default = (terminal, level, ...data) => {
   const logFunction = console[level] && level !== "trace" ? level : "log";
   const color =
     level === "error"
-      ? _chalk.default.inverse.red
+      ? ["inverse", "red"]
       : level === "warn"
-        ? _chalk.default.inverse.yellow
-        : _chalk.default.inverse.white;
+        ? ["inverse", "yellow"]
+        : ["inverse", "white"];
   if (level === "group") {
     groupStack.push(level);
   } else if (level === "groupCollapsed") {
@@ -27,7 +26,7 @@ var _default = (terminal, level, ...data) => {
     collapsedGuardTimer = setTimeout(() => {
       if (groupStack.includes("groupCollapsed")) {
         terminal.log(
-          _chalk.default.inverse.yellow.bold(" WARN "),
+          _util.default.styleText(["inverse", "yellow", "bold"], " WARN "),
           "Expected `console.groupEnd` to be called after `console.groupCollapsed`.",
         );
         groupStack.length = 0;
@@ -47,8 +46,10 @@ var _default = (terminal, level, ...data) => {
       data[data.length - 1] = lastItem.trimEnd();
     }
     terminal.log(
-      color.bold(` ${logFunction.toUpperCase()} `) +
-        "".padEnd(groupStack.length * 2, " "),
+      _util.default.styleText(
+        [...color, "bold"],
+        ` ${logFunction.toUpperCase()} `,
+      ) + "".padEnd(groupStack.length * 2, " "),
       _util.default.format(...data),
     );
   }

package/src/lib/logToConsole.js.flow

@@ -11,8 +11,8 @@
 /* eslint-disable no-console */
 
 import type {Terminal} from 'metro-core';
+import type {BackgroundColors, ForegroundColors, Modifiers} from 'util';
 
-import chalk from 'chalk';
 import util from 'util';
 
 const groupStack = [];
@@ -21,12 +21,12 @@ let collapsedGuardTimer;
 export default (terminal: Terminal, level: string, ...data: Array<unknown>) => {
   // $FlowFixMe[invalid-computed-prop]
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
-  const color =
+  const color: ReadonlyArray<ForegroundColors | BackgroundColors | Modifiers> =
     level === 'error'
-      ? chalk.inverse.red
+      ? ['inverse', 'red']
       : level === 'warn'
-        ? chalk.inverse.yellow
-        : chalk.inverse.white;
+        ? ['inverse', 'yellow']
+        : ['inverse', 'white'];
 
   if (level === 'group') {
     groupStack.push(level);
@@ -37,7 +37,7 @@ export default (terminal: Terminal, level: string, ...data: Array<unknown>) => {
     collapsedGuardTimer = setTimeout(() => {
       if (groupStack.includes('groupCollapsed')) {
         terminal.log(
-          chalk.inverse.yellow.bold(' WARN '),
+          util.styleText(['inverse', 'yellow', 'bold'], ' WARN '),
           'Expected `console.groupEnd` to be called after `console.groupCollapsed`.',
         );
         groupStack.length = 0;
@@ -60,7 +60,7 @@ export default (terminal: Terminal, level: string, ...data: Array<unknown>) => {
     }
 
     terminal.log(
-      color.bold(` ${logFunction.toUpperCase()} `) +
+      util.styleText([...color, 'bold'], ` ${logFunction.toUpperCase()} `) +
         ''.padEnd(groupStack.length * 2, ' '),
       // `util.format` actually accepts any arguments.
       // If the first argument is a string, it tries to format it.

package/src/lib/reporting.js

@@ -7,30 +7,39 @@ exports.logError = logError;
 exports.logInfo = logInfo;
 exports.logWarning = logWarning;
 exports.nullReporter = void 0;
-var _chalk = _interopRequireDefault(require("chalk"));
+var _tty = _interopRequireDefault(require("tty"));
 var _util = _interopRequireDefault(require("util"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
+const supportsColor = () =>
+  process.stdout instanceof _tty.default.WriteStream &&
+  process.stdout.hasColors();
 function logWarning(terminal, format, ...args) {
   const str = _util.default.format(format, ...args);
-  terminal.log("%s %s", _chalk.default.yellow.inverse.bold(" WARN "), str);
+  terminal.log(
+    "%s %s",
+    _util.default.styleText(["yellow", "inverse", "bold"], " WARN "),
+    str,
+  );
 }
 function logError(terminal, format, ...args) {
   terminal.log(
     "%s %s",
-    _chalk.default.red.inverse.bold(" ERROR "),
+    _util.default.styleText(["red", "inverse", "bold"], " ERROR "),
     _util.default.format(
-      _chalk.default.supportsColor
-        ? format
-        : _util.default.stripVTControlCharacters(format),
+      supportsColor() ? format : _util.default.stripVTControlCharacters(format),
       ...args,
     ),
   );
 }
 function logInfo(terminal, format, ...args) {
   const str = _util.default.format(format, ...args);
-  terminal.log("%s %s", _chalk.default.cyan.inverse.bold(" INFO "), str);
+  terminal.log(
+    "%s %s",
+    _util.default.styleText(["cyan", "inverse", "bold"], " INFO "),
+    str,
+  );
 }
 const nullReporter = (exports.nullReporter = {
   update() {},

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<<d5224d8913b7e0c52ac84b215b356422>>
+ * @generated SignedSource<<0024fd05b95efe19a24f9acc84ff474b>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/node-haste/DependencyGraph/ModuleResolution.js
@@ -32,19 +32,7 @@ import type {
 import type {PackageForModule, PackageJson} from 'metro-resolver/private/types';
 
 export type DirExistsFn = (filePath: string) => boolean;
-export type Packageish = {path: string; read(): PackageJson};
-export type Moduleish = {readonly path: string};
-export type PackageishCache<TPackage> = {
-  getPackage(
-    name: string,
-    platform?: string,
-    supportsNativePlatform?: boolean,
-  ): TPackage;
-  getPackageOf(
-    absolutePath: string,
-  ): null | undefined | {pkg: TPackage; packageRelativePath: string};
-};
-type Options<TPackage> = Readonly<{
+type Options = Readonly<{
   assetExts: ReadonlySet<string>;
   dirExists: DirExistsFn;
   disableHierarchicalLookup: boolean;
@@ -61,7 +49,10 @@ type Options<TPackage> = Readonly<{
     platform: null | undefined | string,
   ) => null | undefined | string;
   mainFields: ReadonlyArray<string>;
-  packageCache: PackageishCache<TPackage>;
+  getPackage: (packageJsonPath: string) => null | undefined | PackageJson;
+  getPackageForModule: (
+    absolutePath: string,
+  ) => null | undefined | PackageForModule;
   nodeModulesPaths: ReadonlyArray<string>;
   preferNativePlatform: boolean;
   projectRoot: string;
@@ -76,11 +67,11 @@ type Options<TPackage> = Readonly<{
   unstable_enablePackageExports: boolean;
   unstable_incrementalResolution: boolean;
 }>;
-export declare class ModuleResolver<TPackage extends Packageish> {
-  _options: Options<TPackage>;
+export declare class ModuleResolver {
+  _options: Options;
   _projectRootFakeModulePath: string;
   _cachedEmptyModule: null | undefined | BundlerResolution;
-  constructor(options: Options<TPackage>);
+  constructor(options: Options);
   _getEmptyModule(): BundlerResolution;
   resolveDependency(
     originModulePath: string,
@@ -89,10 +80,6 @@ export declare class ModuleResolver<TPackage extends Packageish> {
     platform: string | null,
     resolverOptions: ResolverInputOptions,
   ): BundlerResolution;
-  _getPackage: (packageJsonPath: string) => null | undefined | PackageJson;
-  _getPackageForModule: (
-    absolutePath: string,
-  ) => null | undefined | PackageForModule;
   /**
    * TODO: Return Resolution instead of coercing to BundlerResolution here
    */

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

@@ -86,6 +86,8 @@ class ModuleResolver {
       doesFileExist,
       extraNodeModules,
       fileSystemLookup,
+      getPackage,
+      getPackageForModule,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -109,9 +111,8 @@ class ModuleResolver {
             doesFileExist,
             extraNodeModules,
             fileSystemLookup,
-            getPackage: this._getPackage,
-            getPackageForModule: (absoluteModulePath) =>
-              this._getPackageForModule(absoluteModulePath),
+            getPackage,
+            getPackageForModule,
             isESMImport: dependency.data.isESMImport,
             mainFields,
             nodeModulesPaths,
@@ -191,25 +192,6 @@ class ModuleResolver {
       throw error;
     }
   }
-  _getPackage = (packageJsonPath) => {
-    try {
-      return this._options.packageCache.getPackage(packageJsonPath).read();
-    } catch (e) {}
-    return null;
-  };
-  _getPackageForModule = (absolutePath) => {
-    let result;
-    try {
-      result = this._options.packageCache.getPackageOf(absolutePath);
-    } catch (e) {}
-    return result != null
-      ? {
-          packageJson: result.pkg.read(),
-          packageRelativePath: result.packageRelativePath,
-          rootPath: _path.default.dirname(result.pkg.path),
-        }
-      : null;
-  };
   _getFileResolvedModule(resolution) {
     switch (resolution.type) {
       case "sourceFile":

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

@@ -35,28 +35,7 @@ import util from 'util';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
-export type Packageish = interface {
-  path: string,
-  read(): PackageJson,
-};
-
-export type Moduleish = interface {
-  +path: string,
-};
-
-export type PackageishCache<TPackage> = interface {
-  getPackage(
-    name: string,
-    platform?: string,
-    supportsNativePlatform?: boolean,
-  ): TPackage,
-  getPackageOf(absolutePath: string): ?{
-    pkg: TPackage,
-    packageRelativePath: string,
-  },
-};
-
-type Options<TPackage> = Readonly<{
+type Options = Readonly<{
   assetExts: ReadonlySet<string>,
   dirExists: DirExistsFn,
   disableHierarchicalLookup: boolean,
@@ -67,7 +46,8 @@ type Options<TPackage> = Readonly<{
   getHasteModulePath: (name: string, platform: ?string) => ?string,
   getHastePackagePath: (name: string, platform: ?string) => ?string,
   mainFields: ReadonlyArray<string>,
-  packageCache: PackageishCache<TPackage>,
+  getPackage: (packageJsonPath: string) => ?PackageJson,
+  getPackageForModule: (absolutePath: string) => ?PackageForModule,
   nodeModulesPaths: ReadonlyArray<string>,
   preferNativePlatform: boolean,
   projectRoot: string,
@@ -83,14 +63,14 @@ type Options<TPackage> = Readonly<{
   unstable_incrementalResolution: boolean,
 }>;
 
-export class ModuleResolver<TPackage: Packageish> {
-  _options: Options<TPackage>;
+export class ModuleResolver {
+  _options: Options;
   // A module representing the project root, used as the origin when resolving `emptyModulePath`.
   _projectRootFakeModulePath: string;
   // An empty module, the result of resolving `emptyModulePath` from the project root.
   _cachedEmptyModule: ?BundlerResolution;
 
-  constructor(options: Options<TPackage>) {
+  constructor(options: Options) {
     this._options = options;
     const {projectRoot} = this._options;
     this._projectRootFakeModulePath = path.join(projectRoot, '_');
@@ -132,6 +112,8 @@ export class ModuleResolver<TPackage: Packageish> {
       doesFileExist,
       extraNodeModules,
       fileSystemLookup,
+      getPackage,
+      getPackageForModule,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -156,9 +138,8 @@ export class ModuleResolver<TPackage: Packageish> {
             doesFileExist,
             extraNodeModules,
             fileSystemLookup,
-            getPackage: this._getPackage,
-            getPackageForModule: (absoluteModulePath: string) =>
-              this._getPackageForModule(absoluteModulePath),
+            getPackage,
+            getPackageForModule,
             isESMImport: dependency.data.isESMImport,
             mainFields,
             nodeModulesPaths,
@@ -240,36 +221,6 @@ export class ModuleResolver<TPackage: Packageish> {
     }
   }
 
-  _getPackage = (packageJsonPath: string): ?PackageJson => {
-    try {
-      return this._options.packageCache.getPackage(packageJsonPath).read();
-    } catch (e) {
-      // Do nothing. The standard module cache does not trigger any error, but
-      // the ModuleGraph one does, if the module does not exist.
-    }
-
-    return null;
-  };
-
-  _getPackageForModule = (absolutePath: string): ?PackageForModule => {
-    let result;
-
-    try {
-      result = this._options.packageCache.getPackageOf(absolutePath);
-    } catch (e) {
-      // Do nothing. The standard module cache does not trigger any error, but
-      // the ModuleGraph one does, if the module does not exist.
-    }
-
-    return result != null
-      ? {
-          packageJson: result.pkg.read(),
-          packageRelativePath: result.packageRelativePath,
-          rootPath: path.dirname(result.pkg.path),
-        }
-      : null;
-  };
-
   /**
    * TODO: Return Resolution instead of coercing to BundlerResolution here
    */

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

@@ -71,7 +71,7 @@ function createFileMap(config, options) {
   const { enabled: autoSaveEnabled, ...autoSaveOpts } =
     config.watcher.unstable_autoSaveCache ?? {};
   const autoSave = watch && autoSaveEnabled ? autoSaveOpts : false;
-  const plugins = [];
+  const plugins = [...(config.unstable_fileMapPlugins ?? [])];
   let dependencyPlugin = null;
   if (
     config.resolver.dependencyExtractor != null &&
@@ -80,7 +80,6 @@ function createFileMap(config, options) {
     dependencyPlugin = new _metroFileMap.DependencyPlugin({
       dependencyExtractor: config.resolver.dependencyExtractor,
       computeDependencies: true,
-      rootDir: config.projectRoot,
     });
     plugins.push(dependencyPlugin);
   }

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

@@ -10,7 +10,7 @@
  */
 
 import type {ConfigT} from 'metro-config';
-import type {HasteMap} from 'metro-file-map';
+import type {HasteMap, InputFileMapPlugin} from 'metro-file-map';
 
 import ci from 'ci-info';
 import MetroFileMap, {
@@ -75,7 +75,9 @@ export default function createFileMap(
     config.watcher.unstable_autoSaveCache ?? {};
   const autoSave = watch && autoSaveEnabled ? autoSaveOpts : false;
 
-  const plugins: Array<DependencyPlugin | HastePlugin> = [];
+  const plugins: Array<InputFileMapPlugin> = [
+    ...(config.unstable_fileMapPlugins ?? []),
+  ];
 
   let dependencyPlugin = null;
   // Add DependencyPlugin if dependencies should be extracted
@@ -86,7 +88,6 @@ export default function createFileMap(
     dependencyPlugin = new DependencyPlugin({
       dependencyExtractor: config.resolver.dependencyExtractor,
       computeDependencies: true,
-      rootDir: config.projectRoot,
     });
     plugins.push(dependencyPlugin);
   }