metro 0.72.1 → 0.72.3

package/src/lib/TerminalReporter.js.flow

@@ -182,28 +182,21 @@ class TerminalReporter {
 
   _logInitializing(port: number, hasReducedPerformance: boolean): void {
     const logo = [
-      '                                                      ',
-      '                        #######                       ',
-      '                   ################                   ',
-      '                #########     #########               ',
-      '            #########             ##########          ',
-      '        #########        ######        #########      ',
-      '       ##########################################     ',
-      '      #####      #####################       #####    ',
-      '      #####          ##############          #####    ',
-      '      #####    ###       ######       ###    #####    ',
-      '      #####    #######            #######    #####    ',
-      '      #####    ###########    ###########    #####    ',
-      '      #####    ##########################    #####    ',
-      '      #####    ##########################    #####    ',
-      '      #####      ######################     ######    ',
-      '       ######        #############        #######     ',
-      '         #########        ####       #########        ',
-      '              #########          #########            ',
-      '                  ######### #########                 ',
-      '                       #########                      ',
-      '                                                      ',
-      '                                                      ',
+      '',
+      '                        ▒▒▓▓▓▓▒▒',
+      '                     ▒▓▓▓▒▒░░▒▒▓▓▓▒',
+      '                  ▒▓▓▓▓░░░▒▒▒▒░░░▓▓▓▓▒',
+      '                 ▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓',
+      '                 ▓▓░░░░░▒▓▓▓▓▓▓▒░░░░░▓▓',
+      '                 ▓▓░░▓▓▒░░░▒▒░░░▒▓▒░░▓▓',
+      '                 ▓▓░░▓▓▓▓▓▒▒▒▒▓▓▓▓▒░░▓▓',
+      '                 ▓▓░░▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░▓▓',
+      '                 ▓▓▒░░▒▒▓▓▓▓▓▓▓▓▒░░░▒▓▓',
+      '                  ▒▓▓▓▒░░░▒▓▓▒░░░▒▓▓▓▒',
+      '                     ▒▓▓▓▒░░░░▒▓▓▓▒',
+      '                        ▒▒▓▓▓▓▒▒',
+      '',
+      '',
     ];
 
     const color = hasReducedPerformance ? chalk.red : chalk.blue;
@@ -275,9 +268,12 @@ class TerminalReporter {
         break;
       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) {

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,

package/src/lib/parseCustomResolverOptions.js

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+metro_bundler
+ * @format
+ *
+ */
+"use strict";
+
+const nullthrows = require("nullthrows");
+
+const PREFIX = "resolver.";
+
+module.exports = function parseCustomResolverOptions(urlObj) {
+  const customResolverOptions = Object.create(null);
+  const query = nullthrows(urlObj.query);
+  Object.keys(query).forEach((key) => {
+    if (key.startsWith(PREFIX)) {
+      customResolverOptions[key.substr(PREFIX.length)] = query[key];
+    }
+  });
+  return customResolverOptions;
+};

package/src/lib/parseCustomResolverOptions.js.flow

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+metro_bundler
+ * @format
+ * @flow strict-local
+ */
+
+'use strict';
+
+import type {CustomResolverOptions} from '../../../metro-resolver/src/types';
+
+const nullthrows = require('nullthrows');
+
+const PREFIX = 'resolver.';
+
+module.exports = function parseCustomResolverOptions(urlObj: {
+  +query?: {[string]: string, ...},
+  ...
+}): CustomResolverOptions {
+  const customResolverOptions: {
+    __proto__: null,
+    [string]: mixed,
+    ...
+  } = Object.create(null);
+  const query = nullthrows(urlObj.query);
+
+  Object.keys(query).forEach((key: string) => {
+    if (key.startsWith(PREFIX)) {
+      customResolverOptions[key.substr(PREFIX.length)] = query[key];
+    }
+  });
+
+  return customResolverOptions;
+};

package/src/lib/parseOptionsFromUrl.js

@@ -11,6 +11,8 @@
 
 const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
 
+const parseCustomResolverOptions = require("./parseCustomResolverOptions");
+
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
 
 const nullthrows = require("nullthrows");
@@ -60,6 +62,7 @@ module.exports = function parseOptionsFromUrl(
     bundleType,
     runtimeBytecodeVersion:
       bytecodeVersion === runtimeBytecodeVersion ? bytecodeVersion : null,
+    customResolverOptions: parseCustomResolverOptions(parsedURL),
     customTransformOptions: parseCustomTransformOptions(parsedURL),
     dev: getBoolean(query, "dev", true),
     entryFile: pathname.replace(/^(?:\.?\/)?/, "./").replace(/\.[^/.]+$/, ""),

package/src/lib/parseOptionsFromUrl.js.flow

@@ -14,6 +14,7 @@ import type {BundleOptions} from '../shared/types.flow';
 import type {TransformProfile} from 'metro-babel-transformer';
 
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
+const parseCustomResolverOptions = require('./parseCustomResolverOptions');
 const parseCustomTransformOptions = require('./parseCustomTransformOptions');
 const nullthrows = require('nullthrows');
 const path = require('path');
@@ -68,6 +69,7 @@ module.exports = function parseOptionsFromUrl(
     bundleType,
     runtimeBytecodeVersion:
       bytecodeVersion === runtimeBytecodeVersion ? bytecodeVersion : null,
+    customResolverOptions: parseCustomResolverOptions(parsedURL),
     customTransformOptions: parseCustomTransformOptions(parsedURL),
     dev: getBoolean(query, 'dev', true),
     entryFile: pathname.replace(/^(?:\.?\/)?/, './').replace(/\.[^/.]+$/, ''),

package/src/lib/splitBundleOptions.js

@@ -15,6 +15,9 @@
 function splitBundleOptions(options) {
   return {
     entryFile: options.entryFile,
+    resolverOptions: {
+      customResolverOptions: options.customResolverOptions,
+    },
     transformOptions: {
       customTransformOptions: options.customTransformOptions,
       dev: options.dev,

package/src/lib/splitBundleOptions.js.flow

@@ -18,6 +18,9 @@ import type {BundleOptions, SplitBundleOptions} from '../shared/types.flow';
 function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
   return {
     entryFile: options.entryFile,
+    resolverOptions: {
+      customResolverOptions: options.customResolverOptions,
+    },
     transformOptions: {
       customTransformOptions: options.customTransformOptions,
       dev: options.dev,

package/src/lib/transformHelpers.js

@@ -20,7 +20,8 @@ async function calcTransformerOptions(
   bundler,
   deltaBundler,
   config,
-  options
+  options,
+  resolverOptions
 ) {
   const baseOptions = {
     customTransformOptions: options.customTransformOptions,
@@ -42,11 +43,19 @@ async function calcTransformerOptions(
 
   const getDependencies = async (path) => {
     const dependencies = await deltaBundler.getDependencies([path], {
-      resolve: await getResolveDependencyFn(bundler, options.platform),
-      transform: await getTransformFn([path], bundler, deltaBundler, config, {
-        ...options,
-        minify: false,
-      }),
+      resolve: await getResolveDependencyFn(
+        bundler,
+        options.platform,
+        resolverOptions
+      ),
+      transform: await getTransformFn(
+        [path],
+        bundler,
+        deltaBundler,
+        config,
+        { ...options, minify: false },
+        resolverOptions
+      ),
       transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
@@ -92,14 +101,16 @@ async function getTransformFn(
   bundler,
   deltaBundler,
   config,
-  options
+  options,
+  resolverOptions
 ) {
   const { inlineRequires, ...transformOptions } = await calcTransformerOptions(
     entryFiles,
     bundler,
     deltaBundler,
     config,
-    options
+    options,
+    resolverOptions
   );
   return async (modulePath, requireContext) => {
     let templateBuffer;
@@ -153,12 +164,15 @@ function getType(type, filePath, assetExts) {
   return "module";
 }
 
-async function getResolveDependencyFn(bundler, platform) {
+async function getResolveDependencyFn(bundler, platform, resolverOptions) {
   const dependencyGraph = await await bundler.getDependencyGraph();
-  return (
-    from,
-    to // $FlowFixMe[incompatible-call]
-  ) => dependencyGraph.resolveDependency(from, to, platform);
+  return (from, to) =>
+    dependencyGraph.resolveDependency(
+      from,
+      to,
+      platform !== null && platform !== void 0 ? platform : null,
+      resolverOptions
+    );
 }
 
 module.exports = {

package/src/lib/transformHelpers.js.flow

@@ -21,6 +21,7 @@ import type {RequireContext} from './contextModule';
 import {getContextModuleTemplate} from './contextModuleTemplates';
 
 const path = require('path');
+import type {ResolverInputOptions} from '../shared/types.flow';
 
 type InlineRequiresRaw = {+blockList: {[string]: true, ...}, ...} | boolean;
 
@@ -37,6 +38,7 @@ async function calcTransformerOptions(
   deltaBundler: DeltaBundler<>,
   config: ConfigT,
   options: TransformInputOptions,
+  resolverOptions: ResolverInputOptions,
 ): Promise<TransformOptionsWithRawInlines> {
   const baseOptions = {
     customTransformOptions: options.customTransformOptions,
@@ -62,11 +64,22 @@ async function calcTransformerOptions(
 
   const getDependencies = async (path: string) => {
     const dependencies = await deltaBundler.getDependencies([path], {
-      resolve: await getResolveDependencyFn(bundler, options.platform),
-      transform: await getTransformFn([path], bundler, deltaBundler, config, {
-        ...options,
-        minify: false,
-      }),
+      resolve: await getResolveDependencyFn(
+        bundler,
+        options.platform,
+        resolverOptions,
+      ),
+      transform: await getTransformFn(
+        [path],
+        bundler,
+        deltaBundler,
+        config,
+        {
+          ...options,
+          minify: false,
+        },
+        resolverOptions,
+      ),
       transformOptions: options,
       onProgress: null,
       experimentalImportBundleSupport:
@@ -114,6 +127,7 @@ async function getTransformFn(
   deltaBundler: DeltaBundler<>,
   config: ConfigT,
   options: TransformInputOptions,
+  resolverOptions: ResolverInputOptions,
 ): Promise<TransformFn<>> {
   const {inlineRequires, ...transformOptions} = await calcTransformerOptions(
     entryFiles,
@@ -121,6 +135,7 @@ async function getTransformFn(
     deltaBundler,
     config,
     options,
+    resolverOptions,
   );
 
   return async (modulePath: string, requireContext: ?RequireContext) => {
@@ -186,12 +201,17 @@ function getType(
 async function getResolveDependencyFn(
   bundler: Bundler,
   platform: ?string,
+  resolverOptions: ResolverInputOptions,
 ): Promise<(from: string, to: string) => string> {
   const dependencyGraph = await await bundler.getDependencyGraph();
 
   return (from: string, to: string) =>
-    // $FlowFixMe[incompatible-call]
-    dependencyGraph.resolveDependency(from, to, platform);
+    dependencyGraph.resolveDependency(
+      from,
+      to,
+      platform ?? null,
+      resolverOptions,
+    );
 }
 
 module.exports = {

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

@@ -24,6 +24,7 @@ const util = require("util");
 class ModuleResolver {
   // A module representing the project root, used as the origin when resolving `emptyModulePath`.
   // An empty module, the result of resolving `emptyModulePath` from the project root.
+  // $FlowFixMe[missing-local-annot]
   constructor(options) {
     this._options = options;
     const { projectRoot, moduleCache } = this._options;
@@ -50,7 +51,9 @@ class ModuleResolver {
         this._projectRootFakeModule,
         this._options.emptyModulePath,
         false,
-        null
+        null,
+        /* resolverOptions */
+        {}
       );
       this._cachedEmptyModule = emptyModule;
     }
@@ -110,11 +113,24 @@ class ModuleResolver {
     return modulePath;
   }
 
-  resolveDependency(fromModule, moduleName, allowHaste, platform) {
+  resolveDependency(
+    fromModule,
+    moduleName,
+    allowHaste,
+    platform,
+    resolverOptions
+  ) {
     try {
+      var _resolverOptions$cust;
+
       const result = Resolver.resolve(
         {
           ...this._options,
+          customResolverOptions:
+            (_resolverOptions$cust = resolverOptions.customResolverOptions) !==
+              null && _resolverOptions$cust !== void 0
+              ? _resolverOptions$cust
+              : {},
           originModulePath: fromModule.path,
           redirectModulePath: (modulePath) =>
             this._redirectRequire(fromModule, modulePath),

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

@@ -26,6 +26,7 @@ const invariant = require('invariant');
 const Resolver = require('metro-resolver');
 const path = require('path');
 const util = require('util');
+import type {ResolverInputOptions} from '../../shared/types.flow';
 
 export type DirExistsFn = (filePath: string) => boolean;
 
@@ -78,6 +79,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
   // An empty module, the result of resolving `emptyModulePath` from the project root.
   _cachedEmptyModule: ?TModule;
 
+  // $FlowFixMe[missing-local-annot]
   constructor(options: Options<TModule, TPackage>) {
     this._options = options;
     const {projectRoot, moduleCache} = this._options;
@@ -102,6 +104,7 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
         this._options.emptyModulePath,
         false,
         null,
+        /* resolverOptions */ {},
       );
       this._cachedEmptyModule = emptyModule;
     }
@@ -166,11 +169,13 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
     moduleName: string,
     allowHaste: boolean,
     platform: string | null,
+    resolverOptions: ResolverInputOptions,
   ): TModule {
     try {
       const result = Resolver.resolve(
         {
           ...this._options,
+          customResolverOptions: resolverOptions.customResolverOptions ?? {},
           originModulePath: fromModule.path,
           redirectModulePath: (modulePath: string) =>
             this._redirectRequire(fromModule, modulePath),