metro 0.72.1 → 0.72.2

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');
@@ -66,7 +69,7 @@ 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');
@@ -115,6 +118,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 +185,7 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
@@ -185,6 +193,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {
         onProgress,
         shallow: graphOptions.shallow,
@@ -196,7 +205,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 +268,7 @@ class Server {
       entryFile,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     } = splitBundleOptions(options);
@@ -262,6 +276,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {onProgress, shallow: graphOptions.shallow},
     );
 
@@ -270,7 +285,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 +314,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 +340,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 +357,7 @@ class Server {
     const {prepend, graph} = await this._bundler.buildGraph(
       entryFile,
       transformOptions,
+      resolverOptions,
       {onProgress, shallow: false},
     );
 
@@ -445,7 +471,7 @@ class Server {
     return parseOptionsFromUrl(
       url,
       new Set(this._config.resolver.platforms),
-      BYTECODE_VERSION,
+      getBytecodeVersion(),
     );
   }
 
@@ -522,30 +548,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.
@@ -639,6 +671,7 @@ class Server {
         mres,
         onProgress,
         req,
+        resolverOptions,
         serializerOptions,
         transformOptions,
       };
@@ -736,6 +769,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -743,10 +777,15 @@ 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 ||
@@ -761,7 +800,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 +902,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -866,16 +910,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 +1024,7 @@ class Server {
       graphId,
       graphOptions,
       onProgress,
+      resolverOptions,
       serializerOptions,
       transformOptions,
     }) => {
@@ -980,6 +1034,7 @@ class Server {
         ({revision} = await this._bundler.initializeGraph(
           entryFile,
           transformOptions,
+          resolverOptions,
           {onProgress, shallow: graphOptions.shallow},
         ));
       } else {
@@ -1020,10 +1075,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 +1205,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 +1222,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 +1241,7 @@ class Server {
       ({revision} = await this._bundler.initializeGraph(
         resolvedEntryFilePath,
         transformOptions,
+        resolverOptions,
         {onProgress, shallow: graphOptions.shallow},
       ));
     } else {
@@ -1199,16 +1264,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 +1297,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/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/bundleToBytecode.js

@@ -9,14 +9,13 @@
  */
 "use strict";
 
-const { getFileLength } = require("metro-hermes-compiler"); // The magic number is used as a header for bytecode.
+// The magic number is used as a header for bytecode.
 // It represents a Metro tunnel in binary.
 //
 // 11111111
 // 11100111
 // 11000011
 // 11000011
-
 const MAGIC_NUMBER = 0xffe7c3c3;
 
 function getFileHeader(moduleCount) {
@@ -27,6 +26,8 @@ function getFileHeader(moduleCount) {
 }
 
 function addModuleHeader(buffer) {
+  const { getFileLength } = require("metro-hermes-compiler");
+
   const fileLength = getFileLength(buffer, 0);
   const header = Buffer.alloc(4);
   header.writeUInt32LE(fileLength, 0);

package/src/lib/bundleToBytecode.js.flow

@@ -15,8 +15,6 @@ import type {
   BytecodeBundle,
 } from 'metro-runtime/src/modules/types.flow';
 
-const {getFileLength} = require('metro-hermes-compiler');
-
 // The magic number is used as a header for bytecode.
 // It represents a Metro tunnel in binary.
 //
@@ -34,6 +32,8 @@ function getFileHeader(moduleCount: number): Buffer {
 }
 
 function addModuleHeader(buffer: Buffer): [Buffer, Buffer] {
+  const {getFileLength} = require('metro-hermes-compiler');
+
   const fileLength = getFileLength(buffer, 0);
   const header = Buffer.alloc(4);
   header.writeUInt32LE(fileLength, 0);

package/src/lib/getGraphId.js

@@ -14,15 +14,28 @@ const canonicalize = require("metro-core/src/canonicalize");
 function getGraphId(
   entryFile,
   options,
-  { shallow, experimentalImportBundleSupport, unstable_allowRequireContext }
+  {
+    shallow,
+    experimentalImportBundleSupport,
+    unstable_allowRequireContext,
+    resolverOptions,
+  }
 ) {
+  var _resolverOptions$cust, _options$customTransf;
+
   return JSON.stringify(
     {
       entryFile,
       options: {
+        customResolverOptions:
+          (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
+            null && _resolverOptions$cust !== void 0
+            ? _resolverOptions$cust
+            : {},
         customTransformOptions:
-          options.customTransformOptions != null
-            ? options.customTransformOptions
+          (_options$customTransf = options.customTransformOptions) !== null &&
+          _options$customTransf !== void 0
+            ? _options$customTransf
             : null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,

package/src/lib/getGraphId.js.flow

@@ -11,6 +11,7 @@
 'use strict';
 
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {ResolverInputOptions} from '../shared/types.flow';
 
 const canonicalize = require('metro-core/src/canonicalize');
 
@@ -23,21 +24,20 @@ function getGraphId(
     shallow,
     experimentalImportBundleSupport,
     unstable_allowRequireContext,
-  }: {
-    +shallow: boolean,
-    +experimentalImportBundleSupport: boolean,
-    +unstable_allowRequireContext: boolean,
-    ...
-  },
+    resolverOptions,
+  }: $ReadOnly<{
+    shallow: boolean,
+    experimentalImportBundleSupport: boolean,
+    unstable_allowRequireContext: boolean,
+    resolverOptions: ResolverInputOptions,
+  }>,
 ): GraphId {
   return JSON.stringify(
     {
       entryFile,
       options: {
-        customTransformOptions:
-          options.customTransformOptions != null
-            ? options.customTransformOptions
-            : null,
+        customResolverOptions: resolverOptions.customResolverOptions ?? {},
+        customTransformOptions: options.customTransformOptions ?? null,
         dev: options.dev,
         experimentalImportSupport: options.experimentalImportSupport || false,
         hot: options.hot,

package/src/lib/getPrependedScripts.js

@@ -23,9 +23,13 @@ const transformHelpers = require("./transformHelpers");
 
 const defaults = require("metro-config/src/defaults/defaults");
 
-const { compile } = require("metro-hermes-compiler");
-
-async function getPrependedScripts(config, options, bundler, deltaBundler) {
+async function getPrependedScripts(
+  config,
+  options,
+  resolverOptions,
+  bundler,
+  deltaBundler
+) {
   // Get all the polyfills from the relevant option params (the
   // `getPolyfills()` method and the `polyfillModuleNames` variable).
   const polyfillModuleNames = config.serializer
@@ -39,14 +43,16 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
     {
       resolve: await transformHelpers.getResolveDependencyFn(
         bundler,
-        options.platform
+        options.platform,
+        resolverOptions
       ),
       transform: await transformHelpers.getTransformFn(
         [defaults.moduleSystem, ...polyfillModuleNames],
         bundler,
         deltaBundler,
         config,
-        transformOptions
+        transformOptions,
+        resolverOptions
       ),
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
@@ -68,6 +74,8 @@ async function getPrependedScripts(config, options, bundler, deltaBundler) {
 }
 
 function _getPrelude({ dev, globalPrefix, requireCycleIgnorePatterns }) {
+  const { compile } = require("metro-hermes-compiler");
+
   const code = getPreludeCode({
     isDev: dev,
     globalPrefix,

package/src/lib/getPrependedScripts.js.flow

@@ -13,6 +13,7 @@
 import type Bundler from '../Bundler';
 import type DeltaBundler, {Module} from '../DeltaBundler';
 import type {TransformInputOptions} from '../DeltaBundler/types.flow';
+import type {ResolverInputOptions} from '../shared/types.flow';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 import CountingSet from './CountingSet';
@@ -21,7 +22,6 @@ const countLines = require('./countLines');
 const getPreludeCode = require('./getPreludeCode');
 const transformHelpers = require('./transformHelpers');
 const defaults = require('metro-config/src/defaults/defaults');
-const {compile} = require('metro-hermes-compiler');
 
 async function getPrependedScripts(
   config: ConfigT,
@@ -29,6 +29,7 @@ async function getPrependedScripts(
     TransformInputOptions,
     {type: $PropertyType<TransformInputOptions, 'type'>, ...},
   >,
+  resolverOptions: ResolverInputOptions,
   bundler: Bundler,
   deltaBundler: DeltaBundler<>,
 ): Promise<$ReadOnlyArray<Module<>>> {
@@ -51,6 +52,7 @@ async function getPrependedScripts(
       resolve: await transformHelpers.getResolveDependencyFn(
         bundler,
         options.platform,
+        resolverOptions,
       ),
       transform: await transformHelpers.getTransformFn(
         [defaults.moduleSystem, ...polyfillModuleNames],
@@ -58,6 +60,7 @@ async function getPrependedScripts(
         deltaBundler,
         config,
         transformOptions,
+        resolverOptions,
       ),
       unstable_allowRequireContext:
         config.transformer.unstable_allowRequireContext,
@@ -89,6 +92,8 @@ function _getPrelude({
   requireCycleIgnorePatterns: $ReadOnlyArray<RegExp>,
   ...
 }): Module<> {
+  const {compile} = require('metro-hermes-compiler');
+
   const code = getPreludeCode({
     isDev: dev,
     globalPrefix,