metro 0.72.1 → 0.72.3

package/src/Server.js.flow

@@ -26,6 +26,7 @@ import type {Reporter} from './lib/reporting';
 import type {
   BundleOptions,
   GraphOptions,
+  ResolverInputOptions,
   SplitBundleOptions,
 } from './shared/types.flow';
 import type {IncomingMessage, ServerResponse} from 'http';
@@ -36,6 +37,8 @@ import type {
   ActionStartLogEntry,
   LogEntry,
 } from 'metro-core/src/Logger';
+import type {CustomResolverOptions} from 'metro-resolver/src/types';
+import type {CustomTransformOptions} from 'metro-transform-worker';
 
 const {getAsset} = require('./Assets');
 const baseBytecodeBundle = require('./DeltaBundler/Serializers/baseBytecodeBundle');
@@ -57,16 +60,16 @@ const parseOptionsFromUrl = require('./lib/parseOptionsFromUrl');
 const splitBundleOptions = require('./lib/splitBundleOptions');
 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');
 const {
   Logger,
   Logger: {createActionStartEntry, createActionEndEntry, log},
 } = require('metro-core');
-const {VERSION: BYTECODE_VERSION} = require('metro-hermes-compiler');
+
 const mime = require('mime-types');
 const nullthrows = require('nullthrows');
 const path = require('path');
@@ -88,8 +91,7 @@ type ProcessStartContext = {
   +bundleOptions: BundleOptions,
   +graphId: GraphId,
   +graphOptions: GraphOptions,
-  // $FlowFixMe[value-as-type]
-  +mres: MultipartResponse,
+  +mres: MultipartResponse | ServerResponse,
   +req: IncomingMessage,
   +revisionId?: ?RevisionId,
   ...SplitBundleOptions,
@@ -115,6 +117,10 @@ export type ServerOptions = $ReadOnly<{
 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 {
   _bundler: IncrementalBundler;
   _config: ConfigT;
@@ -178,6 +184,7 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
@@ -185,6 +192,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: graphOptions.shallow,
@@ -196,7 +204,11 @@ class Server {
     const bundleOptions = {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
-        {transformOptions, relativeTo: 'project'},
+        {
+          relativeTo: 'project',
+          resolverOptions,
+          transformOptions,
+        },
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
       createModuleId: this._createModuleId,
@@ -255,6 +267,7 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
@@ -262,6 +275,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {onProgress, shallow: graphOptions.shallow},
     );
 
@@ -270,7 +284,11 @@ class Server {
     return await getRamBundleInfo(entryPoint, prepend, graph, {
       asyncRequireModulePath: await this._resolveRelativePath(
         this._config.transformer.asyncRequireModulePath,
-        {transformOptions, relativeTo: 'project'},
+        {
+          relativeTo: 'project',
+          resolverOptions,
+          transformOptions,
+        },
       ),
       processModuleFilter: this._config.serializer.processModuleFilter,
       createModuleId: this._createModuleId,
@@ -295,12 +313,13 @@ class Server {
   }
 
   async getAssets(options: BundleOptions): Promise<$ReadOnlyArray<AssetData>> {
-    const {entryFile, transformOptions, onProgress} =
+    const {entryFile, onProgress, resolverOptions, transformOptions} =
       splitBundleOptions(options);
 
     const dependencies = await this._bundler.getDependencies(
       [entryFile],
       transformOptions,
+      resolverOptions,
       {onProgress, shallow: false},
     );
 
@@ -320,10 +339,15 @@ class Server {
     +platform: string,
     ...
   }): Promise<Array<string>> {
-    /* $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',
@@ -332,6 +356,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {onProgress, shallow: false},
     );
 
@@ -445,7 +470,7 @@ class Server {
     return parseOptionsFromUrl(
       url,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION,
+      getBytecodeVersion(),
     );
   }
 
@@ -522,30 +547,36 @@ class Server {
     res: ServerResponse,
     bundleOptions: BundleOptions,
   ) => Promise<void> {
-    /* $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(
+      this: Server,
       req: IncomingMessage,
       res: ServerResponse,
       bundleOptions: BundleOptions,
     ): Promise<void> {
-      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.
@@ -569,7 +600,7 @@ class Server {
         return;
       }
 
-      const mres = MultipartResponse.wrap(req, res);
+      const mres = MultipartResponse.wrapIfSupported(req, res);
       const buildID = this.getNewBuildID();
 
       let onProgress = null;
@@ -586,13 +617,15 @@ class Server {
           // that, we check the percentage, and only send percentages that are
           // 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,
-              }),
-            );
+            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
@@ -639,6 +672,7 @@ class Server {
         mres,
         onProgress,
         req,
+        resolverOptions,
         serializerOptions,
         transformOptions,
       };
@@ -736,6 +770,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -743,15 +778,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(
@@ -761,7 +799,11 @@ class Server {
         {
           asyncRequireModulePath: await this._resolveRelativePath(
             this._config.transformer.asyncRequireModulePath,
-            {transformOptions, relativeTo: 'project'},
+            {
+              relativeTo: 'project',
+              resolverOptions,
+              transformOptions,
+            },
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
           createModuleId: this._createModuleId,
@@ -859,6 +901,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -866,16 +909,25 @@ 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'},
+            {
+              relativeTo: 'project',
+              resolverOptions,
+              transformOptions,
+            },
           ),
           processModuleFilter: this._config.serializer.processModuleFilter,
           createModuleId: this._createModuleId,
@@ -971,6 +1023,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -980,6 +1033,7 @@ class Server {
         ({revision} = await this._bundler.initializeGraph(
           entryFile,
           transformOptions,
+          resolverOptions,
           {onProgress, shallow: graphOptions.shallow},
         ));
       } else {
@@ -1020,10 +1074,16 @@ class Server {
         bundler: 'delta',
       };
     },
-    build: async ({entryFile, transformOptions, onProgress}) => {
+    build: async ({
+      entryFile,
+      onProgress,
+      resolverOptions,
+      transformOptions,
+    }) => {
       const dependencies = await this._bundler.getDependencies(
         [entryFile],
         transformOptions,
+        resolverOptions,
         {onProgress, shallow: false},
       );
 
@@ -1144,15 +1204,16 @@ 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);
 
     /**
@@ -1160,16 +1221,18 @@ class Server {
      * 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,
     });
     let revision;
     const revPromise = this._bundler.getRevisionByGraphId(graphId);
@@ -1177,6 +1240,7 @@ class Server {
       ({revision} = await this._bundler.initializeGraph(
         resolvedEntryFilePath,
         transformOptions,
+        resolverOptions,
         {onProgress, shallow: graphOptions.shallow},
       ));
     } else {
@@ -1199,16 +1263,19 @@ class Server {
   async _resolveRelativePath(
     filePath: string,
     {
-      transformOptions,
       relativeTo,
+      resolverOptions,
+      transformOptions,
     }: $ReadOnly<{
-      transformOptions: TransformInputOptions,
       relativeTo: 'project' | 'server',
+      resolverOptions: ResolverInputOptions,
+      transformOptions: TransformInputOptions,
     }>,
   ): Promise<string> {
     const resolutionFn = await transformHelpers.getResolveDependencyFn(
       this._bundler.getBundler(),
       transformOptions.platform,
+      resolverOptions,
     );
     const rootDir =
       relativeTo === 'server'
@@ -1229,14 +1296,16 @@ class Server {
     return this._config.watchFolders;
   }
 
-  static DEFAULT_GRAPH_OPTIONS: {
-    customTransformOptions: any,
+  static DEFAULT_GRAPH_OPTIONS: $ReadOnly<{
+    customResolverOptions: CustomResolverOptions,
+    customTransformOptions: CustomTransformOptions,
     dev: boolean,
     hot: boolean,
     minify: boolean,
     runtimeBytecodeVersion: ?number,
     unstable_transformProfile: 'default',
-  } = {
+  }> = {
+    customResolverOptions: Object.create(null),
     customTransformOptions: Object.create(null),
     dev: true,
     hot: false,

package/src/index.flow.js

@@ -340,14 +340,22 @@ exports.buildGraph = async function (
   const bundler = new IncrementalBundler(mergedConfig);
 
   try {
-    return await bundler.buildGraphForEntries(entries, {
-      ...MetroServer.DEFAULT_GRAPH_OPTIONS,
-      customTransformOptions,
-      dev,
-      minify,
-      platform,
-      type,
-    });
+    const { customResolverOptions, ...defaultTransformInputOptions } =
+      MetroServer.DEFAULT_GRAPH_OPTIONS;
+    return await bundler.buildGraphForEntries(
+      entries,
+      {
+        ...defaultTransformInputOptions,
+        customTransformOptions,
+        dev,
+        minify,
+        platform,
+        type,
+      },
+      {
+        customResolverOptions,
+      }
+    );
   } finally {
     bundler.end();
   }

package/src/index.flow.js.flow

@@ -424,14 +424,20 @@ exports.buildGraph = async function (
   const bundler = new IncrementalBundler(mergedConfig);
 
   try {
-    return await bundler.buildGraphForEntries(entries, {
-      ...MetroServer.DEFAULT_GRAPH_OPTIONS,
-      customTransformOptions,
-      dev,
-      minify,
-      platform,
-      type,
-    });
+    const {customResolverOptions, ...defaultTransformInputOptions} =
+      MetroServer.DEFAULT_GRAPH_OPTIONS;
+    return await bundler.buildGraphForEntries(
+      entries,
+      {
+        ...defaultTransformInputOptions,
+        customTransformOptions,
+        dev,
+        minify,
+        platform,
+        type,
+      },
+      {customResolverOptions},
+    );
   } finally {
     bundler.end();
   }

package/src/index.js

@@ -13,7 +13,6 @@ export type * from './index.flow';
 */
 
 try {
-  // $FlowFixMe[untyped-import]
   require("metro-babel-register").unstable_registerForMetroMonorepo();
 } catch {}
 

package/src/index.js.flow

@@ -15,7 +15,6 @@ export type * from './index.flow';
 */
 
 try {
-  // $FlowFixMe[untyped-import]
   require('metro-babel-register').unstable_registerForMetroMonorepo();
 } catch {}
 

package/src/lib/CountingSet.js

@@ -68,7 +68,6 @@ class CountingSet {
     }
   } // Iterate over unique entries
   // $FlowIssue[unsupported-syntax]
-  // $FlowFixMe[missing-local-annot]
 
   [Symbol.iterator]() {
     return this.values();

package/src/lib/CountingSet.js.flow

@@ -81,7 +81,6 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
 
   // Iterate over unique entries
   // $FlowIssue[unsupported-syntax]
-  // $FlowFixMe[missing-local-annot]
   [Symbol.iterator](): Iterator<T> {
     return this.values();
   }

package/src/lib/RamBundleParser.js

@@ -24,6 +24,7 @@ const HEADER_SIZE = 3;
  */
 
 class RamBundleParser {
+  // $FlowFixMe[missing-local-annot]
   constructor(buffer) {
     this._buffer = buffer;
 

package/src/lib/RamBundleParser.js.flow

@@ -29,6 +29,7 @@ class RamBundleParser {
   _startupCodeLength: number;
   _startOffset: number;
 
+  // $FlowFixMe[missing-local-annot]
   constructor(buffer: Buffer) {
     this._buffer = buffer;
 

package/src/lib/TerminalReporter.js

@@ -144,28 +144,21 @@ class TerminalReporter {
 
   _logInitializing(port, hasReducedPerformance) {
     const logo = [
-      "                                                      ",
-      "                        #######                       ",
-      "                   ################                   ",
-      "                #########     #########               ",
-      "            #########             ##########          ",
-      "        #########        ######        #########      ",
-      "       ##########################################     ",
-      "      #####      #####################       #####    ",
-      "      #####          ##############          #####    ",
-      "      #####    ###       ######       ###    #####    ",
-      "      #####    #######            #######    #####    ",
-      "      #####    ###########    ###########    #####    ",
-      "      #####    ##########################    #####    ",
-      "      #####    ##########################    #####    ",
-      "      #####      ######################     ######    ",
-      "       ######        #############        #######     ",
-      "         #########        ####       #########        ",
-      "              #########          #########            ",
-      "                  ######### #########                 ",
-      "                       #########                      ",
-      "                                                      ",
-      "                                                      ",
+      "",
+      "                        ▒▒▓▓▓▓▒▒",
+      "                     ▒▓▓▓▒▒░░▒▒▓▓▓▒",
+      "                  ▒▓▓▓▓░░░▒▒▒▒░░░▓▓▓▓▒",
+      "                 ▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓",
+      "                 ▓▓░░░░░▒▓▓▓▓▓▓▒░░░░░▓▓",
+      "                 ▓▓░░▓▓▒░░░▒▒░░░▒▓▒░░▓▓",
+      "                 ▓▓░░▓▓▓▓▓▒▒▒▒▓▓▓▓▒░░▓▓",
+      "                 ▓▓░░▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░▓▓",
+      "                 ▓▓▒░░▒▒▓▓▓▓▓▓▓▓▒░░░▒▓▓",
+      "                  ▒▓▓▓▒░░░▒▓▓▒░░░▒▓▓▓▒",
+      "                     ▒▓▓▓▒░░░░▒▓▓▓▒",
+      "                        ▒▒▓▓▓▓▒▒",
+      "",
+      "",
     ];
     const color = hasReducedPerformance ? chalk.red : chalk.blue;
     this.terminal.log(color(logo.join("\n")));
@@ -258,9 +251,14 @@ class TerminalReporter {
 
       case "dep_graph_loading":
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
+
+        const version = "v" + require("../../package.json").version;
+
         this.terminal.log(
-          color.bold("                    Welcome to Metro!\n") +
-            chalk.dim("              Fast - Scalable - Integrated\n\n")
+          color.bold(
+            " ".repeat(19 - version.length / 2),
+            "Welcome to Metro " + chalk.white(version) + "\n"
+          ) + chalk.dim("              Fast - Scalable - Integrated\n\n")
         );
 
         if (event.hasReducedPerformance) {