metro 0.72.1 → 0.72.3

package/src/Server.js

@@ -47,12 +47,12 @@ const transformHelpers = require("./lib/transformHelpers");
 
 const parsePlatformFilePath = require("./node-haste/lib/parsePlatformFilePath");
 
-const MultipartResponse = require("./Server/MultipartResponse");
-
 const symbolicate = require("./Server/symbolicate");
 
 const { codeFrameColumns } = require("@babel/code-frame");
 
+const MultipartResponse = require("./Server/MultipartResponse");
+
 const debug = require("debug")("Metro:Server");
 
 const fs = require("graceful-fs");
@@ -62,8 +62,6 @@ const {
   Logger: { createActionStartEntry, createActionEndEntry, log },
 } = require("metro-core");
 
-const { VERSION: BYTECODE_VERSION } = require("metro-hermes-compiler");
-
 const mime = require("mime-types");
 
 const nullthrows = require("nullthrows");
@@ -77,6 +75,10 @@ const url = require("url");
 const DELTA_ID_HEADER = "X-Metro-Delta-ID";
 const FILES_CHANGED_COUNT_HEADER = "X-Metro-Files-Changed-Count";
 
+function getBytecodeVersion() {
+  return require("metro-hermes-compiler").VERSION;
+}
+
 class Server {
   constructor(config, options) {
     this._config = config;
@@ -129,12 +131,14 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: graphOptions.shallow,
@@ -147,8 +151,9 @@ class Server {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
         {
-          transformOptions,
           relativeTo: "project",
+          resolverOptions,
+          transformOptions,
         }
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
@@ -217,12 +222,14 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: graphOptions.shallow,
@@ -235,8 +242,9 @@ class Server {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
         {
-          transformOptions,
           relativeTo: "project",
+          resolverOptions,
+          transformOptions,
         }
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
@@ -265,11 +273,12 @@ class Server {
   }
 
   async getAssets(options) {
-    const { entryFile, transformOptions, onProgress } =
+    const { entryFile, onProgress, resolverOptions, transformOptions } =
       splitBundleOptions(options);
     const dependencies = await this._bundler.getDependencies(
       [entryFile],
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: false,
@@ -285,10 +294,15 @@ class Server {
   }
 
   async getOrderedDependencyPaths(options) {
-    /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.122.0 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    const { entryFile, transformOptions, onProgress } = splitBundleOptions({
+    const {
+      entryFile,
+      onProgress,
+      resolverOptions,
+      transformOptions,
+      /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
+       * error found when Flow v0.122.0 was deployed. To see the error, delete
+       * this comment and run Flow. */
+    } = splitBundleOptions({
       ...Server.DEFAULT_BUNDLE_OPTIONS,
       ...options,
       bundleType: "bundle",
@@ -296,6 +310,7 @@ class Server {
     const { prepend, graph } = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: false,
@@ -395,7 +410,7 @@ class Server {
     return parseOptionsFromUrl(
       url,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION
+      getBytecodeVersion()
     );
   }
 
@@ -453,26 +468,31 @@ class Server {
     delete: deleteFn,
     finish,
   }) {
-    /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
-     * Flow's LTI update could not be added via codemod */
     return async function requestProcessor(req, res, bundleOptions) {
-      const { entryFile, graphOptions, transformOptions, serializerOptions } =
-        splitBundleOptions(bundleOptions);
+      const {
+        entryFile,
+        graphOptions,
+        resolverOptions,
+        serializerOptions,
+        transformOptions,
+      } = splitBundleOptions(bundleOptions);
       /**
        * `entryFile` is relative to projectRoot, we need to use resolution function
        * to find the appropriate file with supported extensions.
        */
 
       const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-        transformOptions,
         relativeTo: "server",
+        resolverOptions,
+        transformOptions,
       });
       const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
-        shallow: graphOptions.shallow,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
         unstable_allowRequireContext:
           this._config.transformer.unstable_allowRequireContext,
+        resolverOptions,
+        shallow: graphOptions.shallow,
       }); // For resources that support deletion, handle the DELETE method.
 
       if (deleteFn && req.method === "DELETE") {
@@ -496,7 +516,7 @@ class Server {
         return;
       }
 
-      const mres = MultipartResponse.wrap(req, res);
+      const mres = MultipartResponse.wrapIfSupported(req, res);
       const buildID = this.getNewBuildID();
       let onProgress = null;
       let lastProgress = -1;
@@ -512,15 +532,17 @@ class Server {
           // actually different and that have increased from the last one we sent.
 
           if (currentProgress > lastProgress || totalFileCount < 10) {
-            mres.writeChunk(
-              {
-                "Content-Type": "application/json",
-              },
-              JSON.stringify({
-                done: transformedFileCount,
-                total: totalFileCount,
-              })
-            ); // The `uncork` called internally in Node via `promise.nextTick()` may not fire
+            if (mres instanceof MultipartResponse) {
+              mres.writeChunk(
+                {
+                  "Content-Type": "application/json",
+                },
+                JSON.stringify({
+                  done: transformedFileCount,
+                  total: totalFileCount,
+                })
+              );
+            } // The `uncork` called internally in Node via `promise.nextTick()` may not fire
             // until all of the Promises are resolved because the microtask queue we're
             // in could be starving the event loop. This can cause a bug where the progress
             // is not actually sent in the response until after bundling is complete. This
@@ -566,6 +588,7 @@ class Server {
         mres,
         onProgress,
         req,
+        resolverOptions,
         serializerOptions,
         transformOptions,
       };
@@ -648,6 +671,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -657,15 +681,18 @@ class Server {
 
       const { delta, revision } = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
-        : this._bundler.initializeGraph(entryFile, transformOptions, {
-            onProgress,
-            shallow: graphOptions.shallow,
-          }));
+        : this._bundler.initializeGraph(
+            entryFile,
+            transformOptions,
+            resolverOptions,
+            {
+              onProgress,
+              shallow: graphOptions.shallow,
+            }
+          ));
 
       const serializer =
         this._config.serializer.customSerializer ||
-        /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
-         * Flow's LTI update could not be added via codemod */
         ((...args) => bundleToString(baseJSBundle(...args)).code);
 
       const bundle = await serializer(
@@ -676,8 +703,9 @@ class Server {
           asyncRequireModulePath: await this._resolveRelativePath(
             this._config.transformer.asyncRequireModulePath,
             {
-              transformOptions,
               relativeTo: "project",
+              resolverOptions,
+              transformOptions,
             }
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
@@ -770,6 +798,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -779,17 +808,23 @@ class Server {
 
       const { delta, revision } = await (revPromise != null
         ? this._bundler.updateGraph(await revPromise, false)
-        : this._bundler.initializeGraph(entryFile, transformOptions, {
-            onProgress,
-            shallow: graphOptions.shallow,
-          }));
+        : this._bundler.initializeGraph(
+            entryFile,
+            transformOptions,
+            resolverOptions,
+            {
+              onProgress,
+              shallow: graphOptions.shallow,
+            }
+          ));
       const bundle = bundleToBytecode(
         baseBytecodeBundle(entryFile, revision.prepend, revision.graph, {
           asyncRequireModulePath: await this._resolveRelativePath(
             this._config.transformer.asyncRequireModulePath,
             {
-              transformOptions,
               relativeTo: "project",
+              resolverOptions,
+              transformOptions,
             }
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
@@ -886,6 +921,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -897,6 +933,7 @@ class Server {
         ({ revision } = await this._bundler.initializeGraph(
           entryFile,
           transformOptions,
+          resolverOptions,
           {
             onProgress,
             shallow: graphOptions.shallow,
@@ -942,10 +979,16 @@ class Server {
       };
     },
 
-    build: async ({ entryFile, transformOptions, onProgress }) => {
+    build: async ({
+      entryFile,
+      onProgress,
+      resolverOptions,
+      transformOptions,
+    }) => {
       const dependencies = await this._bundler.getDependencies(
         [entryFile],
         transformOptions,
+        resolverOptions,
         {
           onProgress,
           shallow: false,
@@ -1077,14 +1120,15 @@ class Server {
     const options = parseOptionsFromUrl(
       reqUrl,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION
+      getBytecodeVersion()
     );
     const {
       entryFile,
-      transformOptions,
-      serializerOptions,
       graphOptions,
       onProgress,
+      resolverOptions,
+      serializerOptions,
+      transformOptions,
     } = splitBundleOptions(options);
     /**
      * `entryFile` is relative to projectRoot, we need to use resolution function
@@ -1092,15 +1136,17 @@ class Server {
      */
 
     const resolvedEntryFilePath = await this._resolveRelativePath(entryFile, {
-      transformOptions,
       relativeTo: "server",
+      resolverOptions,
+      transformOptions,
     });
     const graphId = getGraphId(resolvedEntryFilePath, transformOptions, {
-      shallow: graphOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
       unstable_allowRequireContext:
         this._config.transformer.unstable_allowRequireContext,
+      resolverOptions,
+      shallow: graphOptions.shallow,
     });
     let revision;
 
@@ -1110,6 +1156,7 @@ class Server {
       ({ revision } = await this._bundler.initializeGraph(
         resolvedEntryFilePath,
         transformOptions,
+        resolverOptions,
         {
           onProgress,
           shallow: graphOptions.shallow,
@@ -1133,10 +1180,14 @@ class Server {
     );
   }
 
-  async _resolveRelativePath(filePath, { transformOptions, relativeTo }) {
+  async _resolveRelativePath(
+    filePath,
+    { relativeTo, resolverOptions, transformOptions }
+  ) {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
-      transformOptions.platform
+      transformOptions.platform,
+      resolverOptions
     );
     const rootDir =
       relativeTo === "server"
@@ -1158,6 +1209,7 @@ class Server {
   }
 
   static DEFAULT_GRAPH_OPTIONS = {
+    customResolverOptions: Object.create(null),
     customTransformOptions: Object.create(null),
     dev: true,
     hot: false,