metro 0.81.0-alpha.1 → 0.81.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.81.0-alpha.1",
+  "version": "0.81.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -29,24 +29,24 @@
     "error-stack-parser": "^2.0.6",
     "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.23.1",
+    "hermes-parser": "0.24.0",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.6.3",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.81.0-alpha.1",
-    "metro-cache": "0.81.0-alpha.1",
-    "metro-cache-key": "0.81.0-alpha.1",
-    "metro-config": "0.81.0-alpha.1",
-    "metro-core": "0.81.0-alpha.1",
-    "metro-file-map": "0.81.0-alpha.1",
-    "metro-resolver": "0.81.0-alpha.1",
-    "metro-runtime": "0.81.0-alpha.1",
-    "metro-source-map": "0.81.0-alpha.1",
-    "metro-symbolicate": "0.81.0-alpha.1",
-    "metro-transform-plugins": "0.81.0-alpha.1",
-    "metro-transform-worker": "0.81.0-alpha.1",
+    "metro-babel-transformer": "0.81.0",
+    "metro-cache": "0.81.0",
+    "metro-cache-key": "0.81.0",
+    "metro-config": "0.81.0",
+    "metro-core": "0.81.0",
+    "metro-file-map": "0.81.0",
+    "metro-resolver": "0.81.0",
+    "metro-runtime": "0.81.0",
+    "metro-source-map": "0.81.0",
+    "metro-symbolicate": "0.81.0",
+    "metro-transform-plugins": "0.81.0",
+    "metro-transform-worker": "0.81.0",
     "mime-types": "^2.1.27",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -65,8 +65,8 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.6.3",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.81.0-alpha.1",
-    "metro-memory-fs": "0.81.0-alpha.1",
+    "metro-babel-register": "0.81.0",
+    "metro-memory-fs": "0.81.0",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"

package/src/Bundler.js

@@ -5,7 +5,7 @@ const DependencyGraph = require("./node-haste/DependencyGraph");
 class Bundler {
   constructor(config, options) {
     this._depGraph = new DependencyGraph(config, options);
-    this._readyPromise = this._depGraph
+    this._initializedPromise = this._depGraph
       .ready()
       .then(() => {
         config.reporter.update({
@@ -30,16 +30,16 @@ class Bundler {
     return this._depGraph.getWatcher();
   }
   async end() {
-    await this._depGraph.ready();
-    this._transformer.end();
-    this._depGraph.end();
+    await this.ready();
+    await this._transformer.end();
+    await this._depGraph.end();
   }
   async getDependencyGraph() {
-    await this._depGraph.ready();
+    await this.ready();
     return this._depGraph;
   }
   async transformFile(filePath, transformOptions, fileBuffer) {
-    await this._depGraph.ready();
+    await this.ready();
     return this._transformer.transformFile(
       filePath,
       transformOptions,
@@ -47,7 +47,7 @@ class Bundler {
     );
   }
   async ready() {
-    await this._readyPromise;
+    await this._initializedPromise;
   }
 }
 module.exports = Bundler;

package/src/Bundler.js.flow

@@ -26,13 +26,13 @@ export type BundlerOptions = $ReadOnly<{
 
 class Bundler {
   _depGraph: DependencyGraph;
-  _readyPromise: Promise<void>;
+  _initializedPromise: Promise<void>;
   _transformer: Transformer;
 
   constructor(config: ConfigT, options?: BundlerOptions) {
     this._depGraph = new DependencyGraph(config, options);
 
-    this._readyPromise = this._depGraph
+    this._initializedPromise = this._depGraph
       .ready()
       .then(() => {
         config.reporter.update({type: 'transformer_load_started'});
@@ -55,14 +55,15 @@ class Bundler {
   }
 
   async end(): Promise<void> {
-    await this._depGraph.ready();
+    await this.ready();
 
-    this._transformer.end();
-    this._depGraph.end();
+    await this._transformer.end();
+    await this._depGraph.end();
   }
 
   async getDependencyGraph(): Promise<DependencyGraph> {
-    await this._depGraph.ready();
+    await this.ready();
+
     return this._depGraph;
   }
 
@@ -74,7 +75,7 @@ class Bundler {
   ): Promise<TransformResultWithSource<>> {
     // We need to be sure that the DependencyGraph has been initialized.
     // TODO: Remove this ugly hack!
-    await this._depGraph.ready();
+    await this.ready();
 
     return this._transformer.transformFile(
       filePath,
@@ -85,7 +86,7 @@ class Bundler {
 
   // Waits for the bundler to become ready.
   async ready(): Promise<void> {
-    await this._readyPromise;
+    await this._initializedPromise;
   }
 }
 

package/src/DeltaBundler/Transformer.js

@@ -132,8 +132,8 @@ class Transformer {
       },
     };
   }
-  end() {
-    this._workerFarm.kill();
+  async end() {
+    await this._workerFarm.kill();
   }
 }
 function verifyRootExists(root) {

package/src/DeltaBundler/Transformer.js.flow

@@ -188,9 +188,8 @@ class Transformer {
     };
   }
 
-  end(): void {
-    // $FlowFixMe[unused-promise]
-    this._workerFarm.kill();
+  async end(): Promise<void> {
+    await this._workerFarm.kill();
   }
 }
 

package/src/IncrementalBundler.js

@@ -24,9 +24,9 @@ class IncrementalBundler {
     this._bundler = new Bundler(config, options);
     this._deltaBundler = new DeltaBundler(this._bundler.getWatcher());
   }
-  end() {
+  async end() {
     this._deltaBundler.end();
-    this._bundler.end();
+    await this._bundler.end();
   }
   getBundler() {
     return this._bundler;

package/src/IncrementalBundler.js.flow

@@ -79,10 +79,9 @@ class IncrementalBundler {
     this._deltaBundler = new DeltaBundler(this._bundler.getWatcher());
   }
 
-  end(): void {
+  async end(): Promise<void> {
     this._deltaBundler.end();
-    // $FlowFixMe[unused-promise]
-    this._bundler.end();
+    await this._bundler.end();
   }
 
   getBundler(): Bundler {

package/src/Server.js

@@ -87,9 +87,9 @@ class Server {
     });
     this._nextBundleBuildNumber = 1;
   }
-  end() {
+  async end() {
     if (!this._isEnded) {
-      this._bundler.end();
+      await this._bundler.end();
       this._isEnded = true;
     }
   }

package/src/Server.js.flow

@@ -196,9 +196,9 @@ class Server {
     this._nextBundleBuildNumber = 1;
   }
 
-  end() {
+  async end() {
     if (!this._isEnded) {
-      this._bundler.end();
+      await this._bundler.end();
       this._isEnded = true;
     }
   }

package/src/commands/dependencies.js

@@ -37,7 +37,7 @@ async function dependencies(args, config) {
       outStream.write(modulePath + "\n");
     }
   });
-  server.end();
+  await server.end();
   return args.output != null
     ? promisify(outStream.end).bind(outStream)()
     : Promise.resolve();

package/src/commands/dependencies.js.flow

@@ -74,7 +74,7 @@ async function dependencies(args: Args, config: ConfigT) {
     }
   });
 
-  server.end();
+  await server.end();
   return args.output != null
     ? // $FlowFixMe[method-unbinding]
       promisify(outStream.end).bind(outStream)()

package/src/index.flow.js

@@ -98,8 +98,8 @@ const createConnectMiddleware = async function (config, options) {
     },
     metroServer,
     middleware: enhancedMiddleware,
-    end() {
-      metroServer.end();
+    async end() {
+      await metroServer.end();
     },
   };
 };
@@ -111,6 +111,7 @@ exports.runServer = async (
     host,
     onError,
     onReady,
+    onClose,
     secureServerOptions,
     secure,
     secureCert,
@@ -132,14 +133,15 @@ exports.runServer = async (
   }
   const connect = require("connect");
   const serverApp = connect();
-  const { middleware, end, metroServer } = await createConnectMiddleware(
-    config,
-    {
-      hasReducedPerformance,
-      waitForBundler,
-      watch,
-    }
-  );
+  const {
+    middleware,
+    end: endMiddleware,
+    metroServer,
+  } = await createConnectMiddleware(config, {
+    hasReducedPerformance,
+    waitForBundler,
+    watch,
+  });
   for (const handler of unstable_extraMiddleware ?? []) {
     serverApp.use(handler);
   }
@@ -160,11 +162,10 @@ exports.runServer = async (
   }
   return new Promise((resolve, reject) => {
     httpServer.on("error", (error) => {
-      if (onError) {
-        onError(error);
-      }
-      reject(error);
-      end();
+      endMiddleware().finally(() => {
+        onError?.(error);
+        reject(error);
+      });
     });
     httpServer.listen(config.server.port, host, () => {
       const { address, port, family } = httpServer.address();
@@ -174,9 +175,6 @@ exports.runServer = async (
         port,
         family,
       });
-      if (onReady) {
-        onReady(httpServer);
-      }
       websocketEndpoints = {
         ...websocketEndpoints,
         "/hot": createWebsocketServer({
@@ -202,11 +200,16 @@ exports.runServer = async (
           socket.destroy();
         }
       });
+      if (onReady) {
+        onReady(httpServer);
+      }
       resolve(httpServer);
     });
     httpServer.timeout = 0;
     httpServer.on("close", () => {
-      end();
+      endMiddleware()?.finally(() => {
+        onClose?.();
+      });
     });
   });
 };
@@ -301,7 +304,7 @@ exports.buildGraph = async function (
       }
     );
   } finally {
-    bundler.end();
+    await bundler.end();
   }
 };
 exports.attachMetroCli = function (yargs, options = {}) {

package/src/index.flow.js.flow

@@ -52,7 +52,7 @@ const {parse} = require('url');
 
 type MetroMiddleWare = {
   attachHmrServer: (httpServer: HttpServer | HttpsServer) => void,
-  end: () => void,
+  end: () => Promise<void>,
   metroServer: MetroServer,
   middleware: Middleware,
 };
@@ -67,6 +67,7 @@ export type RunServerOptions = $ReadOnly<{
   host?: string,
   onError?: (Error & {code?: string}) => void,
   onReady?: (server: HttpServer | HttpsServer) => void,
+  onClose?: () => void,
   secureServerOptions?: Object,
   secure?: boolean, // deprecated
   secureCert?: string, // deprecated
@@ -223,8 +224,8 @@ const createConnectMiddleware = async function (
     },
     metroServer,
     middleware: enhancedMiddleware,
-    end(): void {
-      metroServer.end();
+    async end(): Promise<void> {
+      await metroServer.end();
     },
   };
 };
@@ -237,6 +238,7 @@ exports.runServer = async (
     host,
     onError,
     onReady,
+    onClose,
     secureServerOptions,
     secure, //deprecated
     secureCert, // deprecated
@@ -263,7 +265,11 @@ exports.runServer = async (
 
   const serverApp = connect();
 
-  const {middleware, end, metroServer} = await createConnectMiddleware(config, {
+  const {
+    middleware,
+    end: endMiddleware,
+    metroServer,
+  } = await createConnectMiddleware(config, {
     hasReducedPerformance,
     waitForBundler,
     watch,
@@ -297,11 +303,10 @@ exports.runServer = async (
       reject: mixed => mixed,
     ) => {
       httpServer.on('error', error => {
-        if (onError) {
-          onError(error);
-        }
-        reject(error);
-        end();
+        endMiddleware().finally(() => {
+          onError?.(error);
+          reject(error);
+        });
       });
 
       httpServer.listen(config.server.port, host, () => {
@@ -313,10 +318,6 @@ exports.runServer = async (
           family,
         });
 
-        if (onReady) {
-          onReady(httpServer);
-        }
-
         websocketEndpoints = {
           ...websocketEndpoints,
           '/hot': createWebsocketServer({
@@ -344,6 +345,10 @@ exports.runServer = async (
           }
         });
 
+        if (onReady) {
+          onReady(httpServer);
+        }
+
         resolve(httpServer);
       });
 
@@ -353,7 +358,9 @@ exports.runServer = async (
       httpServer.timeout = 0;
 
       httpServer.on('close', () => {
-        end();
+        endMiddleware()?.finally(() => {
+          onClose?.();
+        });
       });
     },
   );
@@ -463,7 +470,7 @@ exports.buildGraph = async function (
       {customResolverOptions, dev},
     );
   } finally {
-    bundler.end();
+    await bundler.end();
   }
 };
 

package/src/lib/BatchProcessor.js

@@ -8,7 +8,6 @@ class BatchProcessor {
     this._queue = [];
     this._timeoutHandle = null;
     this._currentProcessCount = 0;
-    this._processQueue = this._processQueue.bind(this);
   }
   _onBatchFinished() {
     this._currentProcessCount--;
@@ -34,20 +33,20 @@ class BatchProcessor {
       this._currentProcessCount++;
       const jobs = this._queue.splice(0, this._options.maximumItems);
       this._processBatch(jobs.map((job) => job.item)).then(
-        this._onBatchResults.bind(this, jobs),
-        this._onBatchError.bind(this, jobs)
+        (results) => this._onBatchResults(jobs, results),
+        (error) => this._onBatchError(jobs, error)
       );
     }
   }
   _processQueueOnceReady() {
     if (this._queue.length >= this._options.maximumItems) {
       clearTimeout(this._timeoutHandle);
-      process.nextTick(this._processQueue);
+      process.nextTick(() => this._processQueue());
       return;
     }
     if (this._timeoutHandle == null) {
       this._timeoutHandle = setTimeout(
-        this._processQueue,
+        () => this._processQueue(),
         this._options.maximumDelayMs
       );
     }

package/src/lib/BatchProcessor.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  * @format
  * @oncall react_native
  */
@@ -54,8 +54,6 @@ class BatchProcessor<TItem, TResult> {
     this._queue = [];
     this._timeoutHandle = null;
     this._currentProcessCount = 0;
-    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-    (this: any)._processQueue = this._processQueue.bind(this);
   }
 
   _onBatchFinished(): void {
@@ -90,10 +88,8 @@ class BatchProcessor<TItem, TResult> {
       this._processBatch(
         jobs.map((job: QueueItem<TItem, TResult>) => job.item),
       ).then(
-        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-        this._onBatchResults.bind(this, jobs),
-        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-        this._onBatchError.bind(this, jobs),
+        results => this._onBatchResults(jobs, results),
+        error => this._onBatchError(jobs, error),
       );
     }
   }
@@ -101,14 +97,12 @@ class BatchProcessor<TItem, TResult> {
   _processQueueOnceReady(): void {
     if (this._queue.length >= this._options.maximumItems) {
       clearTimeout(this._timeoutHandle);
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      process.nextTick(this._processQueue);
+      process.nextTick(() => this._processQueue());
       return;
     }
     if (this._timeoutHandle == null) {
       this._timeoutHandle = setTimeout(
-        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-        this._processQueue,
+        () => this._processQueue(),
         this._options.maximumDelayMs,
       );
     }

package/src/lib/TerminalReporter.js

@@ -160,6 +160,15 @@ class TerminalReporter {
       case "client_log":
         logToConsole(this.terminal, event.level, event.mode, ...event.data);
         break;
+      case "unstable_server_log":
+        const logFn = {
+          info: reporting.logInfo,
+          warn: reporting.logWarning,
+          error: reporting.logError,
+        }[event.level];
+        const [format, ...args] = [].concat(event.data);
+        logFn(this.terminal, String(format), ...args);
+        break;
       case "dep_graph_loading":
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
         const version = "v" + require("../../package.json").version;
@@ -257,8 +266,11 @@ class TerminalReporter {
       case "bundle_transform_progressed_throttled":
         this._updateBundleProgress(event);
         break;
-      case "unstable_set_interaction_status":
-        this._interactionStatus = event.status;
+      case "unstable_server_menu_updated":
+        this._interactionStatus = event.message;
+        break;
+      case "unstable_server_menu_cleared":
+        this._interactionStatus = null;
         break;
     }
   }

package/src/lib/TerminalReporter.js.flow

@@ -41,8 +41,18 @@ export type TerminalReportableEvent =
       ...
     }
   | {
-      type: 'unstable_set_interaction_status',
-      status: ?string,
+      type: 'unstable_server_log',
+      level: 'info' | 'warn' | 'error',
+      data: string | Array<mixed>,
+      ...
+    }
+  | {
+      type: 'unstable_server_menu_updated',
+      message: string,
+      ...
+    }
+  | {
+      type: 'unstable_server_menu_cleared',
       ...
     };
 
@@ -251,6 +261,15 @@ class TerminalReporter {
       case 'client_log':
         logToConsole(this.terminal, event.level, event.mode, ...event.data);
         break;
+      case 'unstable_server_log':
+        const logFn = {
+          info: reporting.logInfo,
+          warn: reporting.logWarning,
+          error: reporting.logError,
+        }[event.level];
+        const [format, ...args] = [].concat(event.data);
+        logFn(this.terminal, String(format), ...args);
+        break;
       case 'dep_graph_loading':
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
         const version = 'v' + require('../../package.json').version;
@@ -385,8 +404,11 @@ class TerminalReporter {
       case 'bundle_transform_progressed_throttled':
         this._updateBundleProgress(event);
         break;
-      case 'unstable_set_interaction_status':
-        this._interactionStatus = event.status;
+      case 'unstable_server_menu_updated':
+        this._interactionStatus = event.message;
+        break;
+      case 'unstable_server_menu_cleared':
+        this._interactionStatus = null;
         break;
     }
   }

package/src/lib/reporting.js

@@ -5,20 +5,25 @@ const stripAnsi = require("strip-ansi");
 const util = require("util");
 function logWarning(terminal, format, ...args) {
   const str = util.format(format, ...args);
-  terminal.log("%s: %s", chalk.yellow("warning"), str);
+  terminal.log("%s %s", chalk.yellow.inverse.bold(" WARN "), str);
 }
 function logError(terminal, format, ...args) {
   terminal.log(
-    "%s: %s",
-    chalk.red("error"),
+    "%s %s",
+    chalk.red.inverse.bold(" ERROR "),
     util.format(chalk.supportsColor ? format : stripAnsi(format), ...args)
   );
 }
+function logInfo(terminal, format, ...args) {
+  const str = util.format(format, ...args);
+  terminal.log("%s %s", chalk.cyan.inverse.bold(" INFO "), str);
+}
 const nullReporter = {
   update() {},
 };
 module.exports = {
   logWarning,
   logError,
+  logInfo,
   nullReporter,
 };

package/src/lib/reporting.js.flow

@@ -189,7 +189,7 @@ function logWarning(
   ...args: Array<mixed>
 ): void {
   const str = util.format(format, ...args);
-  terminal.log('%s: %s', chalk.yellow('warning'), str);
+  terminal.log('%s %s', chalk.yellow.inverse.bold(' WARN '), str);
 }
 
 /**
@@ -201,8 +201,8 @@ function logError(
   ...args: Array<mixed>
 ): void {
   terminal.log(
-    '%s: %s',
-    chalk.red('error'),
+    '%s %s',
+    chalk.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
@@ -211,6 +211,18 @@ function logError(
   );
 }
 
+/**
+ * Similar to `logWarning`, but for informational messages.
+ */
+function logInfo(
+  terminal: Terminal,
+  format: string,
+  ...args: Array<mixed>
+): void {
+  const str = util.format(format, ...args);
+  terminal.log('%s %s', chalk.cyan.inverse.bold(' INFO '), str);
+}
+
 /**
  * A reporter that does nothing. Errors and warnings will be swallowed, that
  * is generally not what you want.
@@ -220,5 +232,6 @@ const nullReporter = {update(): void {}};
 module.exports = {
   logWarning,
   logError,
+  logInfo,
   nullReporter,
 };

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

@@ -58,6 +58,7 @@ class ModuleResolver {
       disableHierarchicalLookup,
       doesFileExist,
       extraNodeModules,
+      fileSystemLookup,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -67,7 +68,6 @@ class ModuleResolver {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
-      unstable_fileSystemLookup,
     } = this._options;
     try {
       const result = Resolver.resolve(
@@ -79,6 +79,7 @@ class ModuleResolver {
             disableHierarchicalLookup,
             doesFileExist,
             extraNodeModules,
+            fileSystemLookup,
             mainFields,
             nodeModulesPaths,
             preferNativePlatform,
@@ -88,7 +89,6 @@ class ModuleResolver {
             unstable_conditionNames,
             unstable_conditionsByPlatform,
             unstable_enablePackageExports,
-            unstable_fileSystemLookup,
             unstable_logWarning: this._logWarning,
             customResolverOptions: resolverOptions.customResolverOptions ?? {},
             originModulePath: fromModule.path,
@@ -127,8 +127,17 @@ class ModuleResolver {
             dependency,
           }
         );
-      }
-      if (error instanceof Resolver.FailedToResolveNameError) {
+      } else if (error instanceof Resolver.FailedToResolveUnsupportedError) {
+        throw new UnableToResolveError(
+          fromModule.path,
+          dependency.name,
+          error.message,
+          {
+            cause: error,
+            dependency,
+          }
+        );
+      } else if (error instanceof Resolver.FailedToResolveNameError) {
         const dirPaths = error.dirPaths;
         const extraPaths = error.extraPaths;
         const displayDirPaths = dirPaths

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

@@ -66,6 +66,7 @@ type Options<TPackage> = $ReadOnly<{
   doesFileExist: DoesFileExist,
   emptyModulePath: string,
   extraNodeModules: ?Object,
+  fileSystemLookup: FileSystemLookup,
   getHasteModulePath: (name: string, platform: ?string) => ?string,
   getHastePackagePath: (name: string, platform: ?string) => ?string,
   mainFields: $ReadOnlyArray<string>,
@@ -82,7 +83,6 @@ type Options<TPackage> = $ReadOnly<{
     [platform: string]: $ReadOnlyArray<string>,
   }>,
   unstable_enablePackageExports: boolean,
-  unstable_fileSystemLookup: ?FileSystemLookup,
 }>;
 
 class ModuleResolver<TPackage: Packageish> {
@@ -142,6 +142,7 @@ class ModuleResolver<TPackage: Packageish> {
       disableHierarchicalLookup,
       doesFileExist,
       extraNodeModules,
+      fileSystemLookup,
       mainFields,
       nodeModulesPaths,
       preferNativePlatform,
@@ -151,7 +152,6 @@ class ModuleResolver<TPackage: Packageish> {
       unstable_conditionNames,
       unstable_conditionsByPlatform,
       unstable_enablePackageExports,
-      unstable_fileSystemLookup,
     } = this._options;
 
     try {
@@ -164,6 +164,7 @@ class ModuleResolver<TPackage: Packageish> {
             disableHierarchicalLookup,
             doesFileExist,
             extraNodeModules,
+            fileSystemLookup,
             mainFields,
             nodeModulesPaths,
             preferNativePlatform,
@@ -173,7 +174,6 @@ class ModuleResolver<TPackage: Packageish> {
             unstable_conditionNames,
             unstable_conditionsByPlatform,
             unstable_enablePackageExports,
-            unstable_fileSystemLookup,
             unstable_logWarning: this._logWarning,
             customResolverOptions: resolverOptions.customResolverOptions ?? {},
             originModulePath: fromModule.path,
@@ -210,8 +210,14 @@ class ModuleResolver<TPackage: Packageish> {
             dependency,
           },
         );
-      }
-      if (error instanceof Resolver.FailedToResolveNameError) {
+      } else if (error instanceof Resolver.FailedToResolveUnsupportedError) {
+        throw new UnableToResolveError(
+          fromModule.path,
+          dependency.name,
+          error.message,
+          {cause: error, dependency},
+        );
+      } else if (error instanceof Resolver.FailedToResolveNameError) {
         const dirPaths = error.dirPaths;
         const extraPaths = error.extraPaths;
         const displayDirPaths = dirPaths

package/src/node-haste/DependencyGraph.js

@@ -42,23 +42,25 @@ class DependencyGraph extends EventEmitter {
     fileMap.setMaxListeners(1000);
     this._haste = fileMap;
     this._haste.on("status", (status) => this._onWatcherStatus(status));
-    this._readyPromise = fileMap.build().then(({ fileSystem, hasteMap }) => {
-      log(createActionEndEntry(initializingMetroLogEntry));
-      config.reporter.update({
-        type: "dep_graph_loaded",
+    this._initializedPromise = fileMap
+      .build()
+      .then(({ fileSystem, hasteMap }) => {
+        log(createActionEndEntry(initializingMetroLogEntry));
+        config.reporter.update({
+          type: "dep_graph_loaded",
+        });
+        this._fileSystem = fileSystem;
+        this._hasteMap = hasteMap;
+        this._haste.on("change", (changeEvent) =>
+          this._onHasteChange(changeEvent)
+        );
+        this._haste.on("healthCheck", (result) =>
+          this._onWatcherHealthCheck(result)
+        );
+        this._resolutionCache = new Map();
+        this._moduleCache = this._createModuleCache();
+        this._createModuleResolver();
       });
-      this._fileSystem = fileSystem;
-      this._hasteMap = hasteMap;
-      this._haste.on("change", (changeEvent) =>
-        this._onHasteChange(changeEvent)
-      );
-      this._haste.on("healthCheck", (result) =>
-        this._onWatcherHealthCheck(result)
-      );
-      this._resolutionCache = new Map();
-      this._moduleCache = this._createModuleCache();
-      this._createModuleResolver();
-    });
   }
   _onWatcherHealthCheck(result) {
     this._config.reporter.update({
@@ -73,7 +75,7 @@ class DependencyGraph extends EventEmitter {
     });
   }
   async ready() {
-    await this._readyPromise;
+    await this._initializedPromise;
   }
   static async load(config, options) {
     const self = new DependencyGraph(config, options);
@@ -115,6 +117,7 @@ class DependencyGraph extends EventEmitter {
       doesFileExist: this._doesFileExist,
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
+      fileSystemLookup,
       getHasteModulePath: (name, platform) =>
         this._hasteMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
@@ -144,7 +147,6 @@ class DependencyGraph extends EventEmitter {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
-      unstable_fileSystemLookup: fileSystemLookup,
     });
   }
   _getClosestPackage(absoluteModulePath) {
@@ -186,8 +188,9 @@ class DependencyGraph extends EventEmitter {
   getWatcher() {
     return this._haste;
   }
-  end() {
-    this._haste.end();
+  async end() {
+    await this.ready();
+    await this._haste.end();
   }
   matchFilesWithContext(from, context) {
     return this._fileSystem.matchFiles({

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

@@ -79,7 +79,7 @@ class DependencyGraph extends EventEmitter {
       >,
     >,
   >;
-  _readyPromise: Promise<void>;
+  _initializedPromise: Promise<void>;
 
   constructor(
     config: ConfigT,
@@ -110,21 +110,25 @@ class DependencyGraph extends EventEmitter {
     this._haste = fileMap;
     this._haste.on('status', status => this._onWatcherStatus(status));
 
-    this._readyPromise = fileMap.build().then(({fileSystem, hasteMap}) => {
-      log(createActionEndEntry(initializingMetroLogEntry));
-      config.reporter.update({type: 'dep_graph_loaded'});
+    this._initializedPromise = fileMap
+      .build()
+      .then(({fileSystem, hasteMap}) => {
+        log(createActionEndEntry(initializingMetroLogEntry));
+        config.reporter.update({type: 'dep_graph_loaded'});
 
-      this._fileSystem = fileSystem;
-      this._hasteMap = hasteMap;
+        this._fileSystem = fileSystem;
+        this._hasteMap = hasteMap;
 
-      this._haste.on('change', changeEvent => this._onHasteChange(changeEvent));
-      this._haste.on('healthCheck', result =>
-        this._onWatcherHealthCheck(result),
-      );
-      this._resolutionCache = new Map();
-      this._moduleCache = this._createModuleCache();
-      this._createModuleResolver();
-    });
+        this._haste.on('change', changeEvent =>
+          this._onHasteChange(changeEvent),
+        );
+        this._haste.on('healthCheck', result =>
+          this._onWatcherHealthCheck(result),
+        );
+        this._resolutionCache = new Map();
+        this._moduleCache = this._createModuleCache();
+        this._createModuleResolver();
+      });
   }
 
   _onWatcherHealthCheck(result: HealthCheckResult) {
@@ -138,7 +142,7 @@ class DependencyGraph extends EventEmitter {
   // Waits for the dependency graph to become ready after initialisation.
   // Don't read anything from the graph until this resolves.
   async ready(): Promise<void> {
-    await this._readyPromise;
+    await this._initializedPromise;
   }
 
   // Creates the dependency graph and waits for it to become ready.
@@ -185,6 +189,7 @@ class DependencyGraph extends EventEmitter {
       doesFileExist: this._doesFileExist,
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
+      fileSystemLookup,
       getHasteModulePath: (name, platform) =>
         this._hasteMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
@@ -215,7 +220,6 @@ class DependencyGraph extends EventEmitter {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
-      unstable_fileSystemLookup: fileSystemLookup,
     });
   }
 
@@ -268,9 +272,9 @@ class DependencyGraph extends EventEmitter {
     return this._haste;
   }
 
-  end() {
-    // $FlowFixMe[unused-promise]
-    this._haste.end();
+  async end() {
+    await this.ready();
+    await this._haste.end();
   }
 
   /** Given a search context, return a list of file paths matching the query. */