metro 0.71.3 → 0.72.2

package/src/IncrementalBundler.js.flow

@@ -17,6 +17,7 @@ import type {
   TransformInputOptions,
 } from './DeltaBundler/types.flow';
 import type {GraphId} from './lib/getGraphId';
+import type {ResolverInputOptions} from './shared/types.flow';
 import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 const Bundler = require('./Bundler');
@@ -33,10 +34,10 @@ export opaque type RevisionId: string = string;
 
 export type OutputGraph = Graph<>;
 
-type OtherOptions = {
-  +onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
-  +shallow: boolean,
-};
+type OtherOptions = $ReadOnly<{
+  onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
+  shallow: boolean,
+}>;
 
 export type GraphRevision = {
   // Identifies the last computed revision.
@@ -100,6 +101,7 @@ class IncrementalBundler {
   async buildGraphForEntries(
     entryFiles: $ReadOnlyArray<string>,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -111,6 +113,7 @@ class IncrementalBundler {
       resolve: await transformHelpers.getResolveDependencyFn(
         this._bundler,
         transformOptions.platform,
+        resolverOptions,
       ),
       transform: await transformHelpers.getTransformFn(
         absoluteEntryFiles,
@@ -118,11 +121,14 @@ class IncrementalBundler {
         this._deltaBundler,
         this._config,
         transformOptions,
+        resolverOptions,
       ),
       transformOptions,
       onProgress: otherOptions.onProgress,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
       shallow: otherOptions.shallow,
     });
 
@@ -139,6 +145,7 @@ class IncrementalBundler {
   async getDependencies(
     entryFiles: $ReadOnlyArray<string>,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -152,6 +159,7 @@ class IncrementalBundler {
         resolve: await transformHelpers.getResolveDependencyFn(
           this._bundler,
           transformOptions.platform,
+          resolverOptions,
         ),
         transform: await transformHelpers.getTransformFn(
           absoluteEntryFiles,
@@ -159,11 +167,14 @@ class IncrementalBundler {
           this._deltaBundler,
           this._config,
           transformOptions,
+          resolverOptions,
         ),
         transformOptions,
         onProgress: otherOptions.onProgress,
         experimentalImportBundleSupport:
           this._config.transformer.experimentalImportBundleSupport,
+        unstable_allowRequireContext:
+          this._config.transformer.unstable_allowRequireContext,
         shallow: otherOptions.shallow,
       },
     );
@@ -174,6 +185,7 @@ class IncrementalBundler {
   async buildGraph(
     entryFile: string,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -182,6 +194,7 @@ class IncrementalBundler {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,
+      resolverOptions,
       otherOptions,
     );
 
@@ -190,6 +203,7 @@ class IncrementalBundler {
     const prepend = await getPrependedScripts(
       this._config,
       transformOptionsWithoutType,
+      resolverOptions,
       this._bundler,
       this._deltaBundler,
     );
@@ -205,6 +219,7 @@ class IncrementalBundler {
   async initializeGraph(
     entryFile: string,
     transformOptions: TransformInputOptions,
+    resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
       onProgress: null,
       shallow: false,
@@ -215,15 +230,19 @@ class IncrementalBundler {
     ...
   }> {
     const graphId = getGraphId(entryFile, transformOptions, {
+      resolverOptions,
       shallow: otherOptions.shallow,
       experimentalImportBundleSupport:
         this._config.transformer.experimentalImportBundleSupport,
+      unstable_allowRequireContext:
+        this._config.transformer.unstable_allowRequireContext,
     });
     const revisionId = createRevisionId();
     const revisionPromise = (async () => {
       const {graph, prepend} = await this.buildGraph(
         entryFile,
         transformOptions,
+        resolverOptions,
         otherOptions,
       );
       return {

package/src/ModuleGraph/node-haste/HasteFS.js.flow

@@ -58,7 +58,7 @@ module.exports = class HasteFS {
     return Array.from<string>(this.files.keys());
   }
 
-  matchFiles() {
+  matchFiles(): $FlowFixMeEmpty {
     throw new Error('HasteFS.matchFiles is not implemented yet.');
   }
 

package/src/ModuleGraph/node-haste/Package.js.flow

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {PackageData} from '../types.flow';
+import type {PackageData, Replacements} from '../types.flow';
 
 const nullthrows = require('nullthrows');
 const path = require('path');
@@ -57,7 +57,7 @@ module.exports = class Package {
     return !!this.data.name;
   }
 
-  redirectRequire(name: string): any | boolean | string {
+  redirectRequire(name: string): string | false {
     // Copied from node-haste/Package.js
     const replacements = getReplacements(this.data);
 
@@ -104,7 +104,7 @@ function getMain(pkg: PackageData): string {
 }
 
 // Copied from node-haste/Package.js
-function getReplacements(pkg: PackageData) {
+function getReplacements(pkg: PackageData): ?(string | Replacements) {
   let rn = pkg['react-native'];
   let browser = pkg.browser;
   if (rn == null) {
@@ -117,11 +117,11 @@ function getReplacements(pkg: PackageData) {
 
   const main = getMain(pkg);
   if (typeof rn !== 'object') {
-    rn = {[main]: rn};
+    rn = ({[main]: rn}: Replacements);
   }
 
   if (typeof browser !== 'object') {
-    browser = {[main]: browser};
+    browser = ({[main]: browser}: Replacements);
   }
 
   // merge with "browser" as default,

package/src/ModuleGraph/node-haste/node-haste.js

@@ -47,7 +47,13 @@ const NODE_MODULES = path.sep + "node_modules" + path.sep;
 
 const isNodeModules = (file) => file.includes(NODE_MODULES); // This function maps the ModuleGraph data structure to metro-file-map's ModuleMap
 
-const createModuleMap = ({ files, moduleCache, sourceExts, platforms }) => {
+const createModuleMap = ({
+  files,
+  moduleCache,
+  sourceExts,
+  additionalExts,
+  platforms,
+}) => {
   const platformSet = new Set(
     (platforms !== null && platforms !== void 0
       ? platforms
@@ -62,11 +68,12 @@ const createModuleMap = ({ files, moduleCache, sourceExts, platforms }) => {
 
     let id;
     let module;
+    const fileExt = path.extname(filePath).substr(1);
 
     if (filePath.endsWith(PACKAGE_JSON)) {
       module = moduleCache.getPackage(filePath);
       id = module.data.name;
-    } else if (sourceExts.indexOf(path.extname(filePath).substr(1)) !== -1) {
+    } else if (sourceExts.has(fileExt) || additionalExts.has(fileExt)) {
       module = moduleCache.getModule(filePath);
       id = module.name;
     }
@@ -107,6 +114,7 @@ exports.createResolveFn = function (options) {
     extraNodeModules,
     transformedFiles,
     sourceExts,
+    additionalExts,
     platform,
     platforms,
   } = options;
@@ -139,14 +147,14 @@ exports.createResolveFn = function (options) {
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
-    // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
     moduleMap: new _metroFileMap.ModuleMap({
       duplicates: new Map(),
       map: createModuleMap({
         files,
         moduleCache,
-        sourceExts,
+        sourceExts: new Set(sourceExts),
+        additionalExts: new Set(additionalExts),
         platforms,
       }),
       mocks: new Map(),
@@ -173,9 +181,12 @@ exports.createResolveFn = function (options) {
       sourcePath != null
         ? new Module(sourcePath, moduleCache, getTransformedFile(sourcePath))
         : NULL_MODULE;
-    const allowHaste = !isNodeModules(from.path); // $FlowFixMe -- error revealed by types-first codemod
-
-    return moduleResolver.resolveDependency(from, id, allowHaste, platform)
-      .path;
+    return moduleResolver.resolveDependency(
+      from,
+      id,
+      true,
+      platform,
+      options.resolverOptions
+    ).path;
   };
 };

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

@@ -9,8 +9,9 @@
  */
 
 import type {Moduleish} from '../../node-haste/DependencyGraph/ModuleResolution';
+import type {ResolverInputOptions} from '../../shared/types.flow';
 import type {ResolveFn, TransformedCodeFile} from '../types.flow';
-import type {Extensions, Path} from './node-haste.flow';
+import type {Path} from './node-haste.flow';
 import type {ModuleMapData, ModuleMapItem} from 'metro-file-map';
 import type {CustomResolver} from 'metro-resolver';
 
@@ -26,20 +27,33 @@ const ModuleCache = require('./ModuleCache');
 const defaults = require('metro-config/src/defaults/defaults');
 const path = require('path');
 
-type ResolveOptions = {
-  assetExts: Extensions,
+type ResolveOptions = $ReadOnly<{
+  /**
+   * The additional extensions to include in the file map as source files that
+   * can be explicitly imported.
+   */
+  additionalExts: $ReadOnlyArray<string>,
+
+  assetExts: $ReadOnlyArray<string>,
   assetResolutions: $ReadOnlyArray<string>,
-  +disableHierarchicalLookup: boolean,
-  +emptyModulePath: string,
+  disableHierarchicalLookup: boolean,
+  emptyModulePath: string,
   extraNodeModules: {[id: string]: string, ...},
   mainFields: $ReadOnlyArray<string>,
   nodeModulesPaths: $ReadOnlyArray<string>,
-  +platform: string,
+  platform: string,
   platforms?: $ReadOnlyArray<string>,
   resolveRequest?: ?CustomResolver,
-  +sourceExts: Extensions,
+  resolverOptions: ResolverInputOptions,
+
+  /**
+   * (Used by the resolver) The extensions tried (in order) to implicitly
+   * locate a source file.
+   */
+  sourceExts: $ReadOnlyArray<string>,
+
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
-};
+}>;
 
 const NATIVE_PLATFORM = 'native';
 const GENERIC_PLATFORM = 'g';
@@ -63,12 +77,14 @@ const createModuleMap = ({
   files,
   moduleCache,
   sourceExts,
+  additionalExts,
   platforms,
 }: {
   files: Array<string>,
   moduleCache: ModuleCache,
+  sourceExts: $ReadOnlySet<string>,
+  additionalExts: $ReadOnlySet<string>,
   platforms: void | $ReadOnlyArray<string>,
-  sourceExts: Extensions,
 }): ModuleMapData => {
   const platformSet = new Set(
     (platforms ?? defaults.platforms).concat([NATIVE_PLATFORM]),
@@ -82,10 +98,12 @@ const createModuleMap = ({
     }
     let id;
     let module;
+    const fileExt = path.extname(filePath).substr(1);
+
     if (filePath.endsWith(PACKAGE_JSON)) {
       module = moduleCache.getPackage(filePath);
       id = module.data.name;
-    } else if (sourceExts.indexOf(path.extname(filePath).substr(1)) !== -1) {
+    } else if (sourceExts.has(fileExt) || additionalExts.has(fileExt)) {
       module = moduleCache.getModule(filePath);
       id = module.name;
     }
@@ -128,6 +146,7 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
     extraNodeModules,
     transformedFiles,
     sourceExts,
+    additionalExts,
     platform,
     platforms,
   } = options;
@@ -157,11 +176,16 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
-    // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
     moduleMap: new ModuleMap({
       duplicates: new Map(),
-      map: createModuleMap({files, moduleCache, sourceExts, platforms}),
+      map: createModuleMap({
+        files,
+        moduleCache,
+        sourceExts: new Set(sourceExts),
+        additionalExts: new Set(additionalExts),
+        platforms,
+      }),
       mocks: new Map(),
       rootDir: '',
     }),
@@ -191,9 +215,12 @@ exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
       sourcePath != null
         ? new Module(sourcePath, moduleCache, getTransformedFile(sourcePath))
         : NULL_MODULE;
-    const allowHaste = !isNodeModules(from.path);
-    // $FlowFixMe -- error revealed by types-first codemod
-    return moduleResolver.resolveDependency(from, id, allowHaste, platform)
-      .path;
+    return moduleResolver.resolveDependency(
+      from,
+      id,
+      true,
+      platform,
+      options.resolverOptions,
+    ).path;
   };
 };

package/src/ModuleGraph/output/indexed-ram-bundle.js.flow

@@ -9,7 +9,7 @@
  */
 
 'use strict';
-import type {IdsForPathFn, Dependency} from '../types.flow';
+import type {Dependency} from '../types.flow';
 import type {BasicSourceMap} from '../../../../metro-source-map/src/source-map';
 
 import type {Module, OutputFn, OutputFnArg} from '../types.flow';
@@ -33,18 +33,10 @@ function asIndexedRamBundle({
   preloadedModules,
   ramGroupHeads,
   requireCalls,
-}: $TEMPORARY$object<{
-  dependencyMapReservedName?: ?string,
-  enableIDInlining: boolean,
-  filename: string,
-  globalPrefix: string,
-  idsForPath: IdsForPathFn,
-  modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+}: $ReadOnly<{
+  ...OutputFnArg,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
-  requireCalls: Iterable<Module>,
-  segmentID: number,
-  sourceMapPath?: ?string,
 }>): {
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
@@ -137,7 +129,7 @@ function* subtree(
 }
 
 function createBuilder(
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
 ): OutputFn<IndexMap> {
   return (x: OutputFnArg) =>

package/src/ModuleGraph/output/multiple-files-ram-bundle.js.flow

@@ -9,8 +9,6 @@
  */
 
 'use strict';
-import type {IdsForPathFn} from '../types.flow';
-
 import type {Module, OutputFn, OutputFnArg, OutputResult} from '../types.flow';
 import type {IndexMap} from 'metro-source-map';
 
@@ -30,18 +28,10 @@ function asMultipleFilesRamBundle({
   modules,
   requireCalls,
   preloadedModules,
-}: $TEMPORARY$object<{
-  dependencyMapReservedName?: ?string,
-  enableIDInlining: boolean,
-  filename: string,
-  globalPrefix: string,
-  idsForPath: IdsForPathFn,
-  modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+}: $ReadOnly<{
+  ...OutputFnArg,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
-  requireCalls: Iterable<Module>,
-  segmentID: number,
-  sourceMapPath?: ?string,
 }>): OutputResult<IndexMap> {
   const idForPath = (x: {path: string, ...}) => idsForPath(x).moduleId;
   const [startup, deferred] = partition(modules, preloadedModules);
@@ -96,7 +86,7 @@ function asMultipleFilesRamBundle({
 }
 
 function createBuilder(
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
   ramGroupHeads: ?$ReadOnlyArray<string>,
 ): OutputFn<IndexMap> {
   return (x: OutputFnArg) =>

package/src/ModuleGraph/output/util.js

@@ -17,9 +17,7 @@ const mergeSourceMaps = require("../worker/mergeSourceMaps");
 
 const reverseDependencyMapReferences = require("./reverse-dependency-map-references");
 
-const { parseSync, transformFromAstSync } = require("@babel/core");
-
-const HermesParser = require("hermes-parser"); // flowlint-next-line untyped-import:off
+const { parseSync, transformFromAstSync } = require("@babel/core"); // flowlint-next-line untyped-import:off
 
 const { passthroughSyntaxPlugins } = require("metro-react-native-babel-preset");
 
@@ -179,8 +177,9 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require("hermes-parser").parse(code, {
           babel: true,
+          // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,
         });
   const ast = nullthrows(

package/src/ModuleGraph/output/util.js.flow

@@ -18,7 +18,6 @@ const generate = require('../worker/generate');
 const mergeSourceMaps = require('../worker/mergeSourceMaps');
 const reverseDependencyMapReferences = require('./reverse-dependency-map-references');
 const {parseSync, transformFromAstSync} = require('@babel/core');
-const HermesParser = require('hermes-parser');
 // flowlint-next-line untyped-import:off
 const {passthroughSyntaxPlugins} = require('metro-react-native-babel-preset');
 const {addParamsToDefineCall} = require('metro-transform-plugins');
@@ -179,8 +178,9 @@ function inlineModuleIds(
   const sourceAst =
     isTypeScriptSource(path) || isTSXSource(path) || !hermesParser
       ? parseSync(code, babelConfig)
-      : HermesParser.parse(code, {
+      : require('hermes-parser').parse(code, {
           babel: true,
+          // $FlowFixMe[prop-missing]
           sourceType: babelConfig.sourceType,
         });
 
@@ -317,7 +317,7 @@ exports.requireCallsTo = function* (
 // the ones loaded deferredly (lazy loaded).
 exports.partition = (
   modules: Iterable<Module>,
-  preloadedModules: Set<string>,
+  preloadedModules: $ReadOnlySet<string>,
 ): Array<Array<Module>> => {
   const startup = [];
   const deferred = [];

package/src/ModuleGraph/types.flow.js.flow

@@ -117,11 +117,15 @@ export type OutputResult<M: MixedSourceMap> = {
   map: M,
 };
 
+export type Replacements = $ReadOnly<{
+  [filename: string]: string | false,
+}>;
+
 export type PackageData = {
-  browser?: Object | string,
+  browser?: Replacements | string,
   main?: string,
   name?: string,
-  'react-native'?: Object | string,
+  'react-native'?: Replacements | string,
 };
 
 export type ResolveFn = (id: string, source: ?string) => string;
@@ -259,14 +263,27 @@ export type AssetContentsByPath = {
 };
 
 export type ResolvedCodeFile = {
-  +codeFile: TransformedCodeFile,
+  codeFile: TransformedCodeFile,
   /**
    * Imagine we have a source file that contains a `require('foo')`. The library
    * will resolve the path of the module `foo` and store it in this field along
    * all the other dependencies. For example, it could be
    * `{'foo': 'bar/foo.js', 'bar': 'node_modules/bar/index.js'}`.
    */
-  +filePathsByDependencyName: {[dependencyName: string]: string, ...},
+  filePathsByDependencyName: {
+    [dependencyName: string]:
+      | string
+
+      // requireCond
+      | {
+          type: string,
+          condition: string,
+          modules: {
+            [string]: string | null,
+          },
+        },
+    ...
+  },
 };
 
 export type LibraryBoundCodeFile = {
@@ -294,8 +311,14 @@ export type Library = {
  * path it resolves to, ex. `beep/glo/foo.js`.
  */
 export type ResolvedLibrary = {
-  +files: $ReadOnlyArray<ResolvedCodeFile>,
+  +files: $ReadOnlyArray<$DeepReadOnly<ResolvedCodeFile>>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
   +isPartiallyResolved?: boolean,
 };
+
+type DeepReadOnlyFn = (<T>(Array<T>) => $ReadOnlyArray<$DeepReadOnly<T>>) &
+  (<T: {}>(T) => $ReadOnly<$ObjMap<T, DeepReadOnlyFn>>) &
+  (<T>(T) => T);
+
+type $DeepReadOnly<T> = $Call<DeepReadOnlyFn, T>;

package/src/ModuleGraph/worker/collectDependencies.js

@@ -9,6 +9,8 @@
  */
 "use strict";
 
+const crypto = require("crypto");
+
 const generate = require("@babel/generator").default;
 
 const template = require("@babel/template").default;
@@ -586,8 +588,9 @@ function createModuleNameLiteral(dependency) {
 }
 /**
  * Given an import qualifier, return a key used to register the dependency.
- * Generally this return the `ImportQualifier.name` property, but in the case
- * of `require.context` more attributes can be appended to distinguish various combinations that would otherwise conflict.
+ * Generally this return the `ImportQualifier.name` property, but more
+ * attributes can be appended to distinguish various combinations that would
+ * otherwise conflict.
  *
  * For example, the following case would have collision issues if they all utilized the `name` property:
  * ```
@@ -603,6 +606,12 @@ function createModuleNameLiteral(dependency) {
 
 function getKeyForDependency(qualifier) {
   let key = qualifier.name;
+  const { asyncType } = qualifier;
+
+  if (asyncType) {
+    key += ["", asyncType].join("\0");
+  }
+
   const { contextParams } = qualifier; // Add extra qualifiers when using `require.context` to prevent collisions.
 
   if (contextParams) {
@@ -616,7 +625,7 @@ function getKeyForDependency(qualifier) {
       String(contextParams.filter.pattern),
       String(contextParams.filter.flags),
       contextParams.mode, // Join together and append to the name:
-    ].join("__");
+    ].join("\0");
   }
 
   return key;
@@ -636,6 +645,7 @@ class DefaultModuleDependencyRegistry {
         asyncType: qualifier.asyncType,
         locs: [],
         index: this._dependencies.size,
+        key: crypto.createHash("sha1").update(key).digest("base64"),
       };
 
       if (qualifier.optional) {
@@ -647,17 +657,16 @@ class DefaultModuleDependencyRegistry {
       }
 
       dependency = newDependency;
-
-      this._dependencies.set(key, dependency);
     } else {
-      const original = dependency;
-      dependency = collapseDependencies(original, qualifier);
-
-      if (original !== dependency) {
-        this._dependencies.set(key, dependency);
+      if (dependency.isOptional && !qualifier.optional) {
+        // A previously optionally required dependency was required non-optionally.
+        // Mark it non optional for the whole module
+        dependency = { ...dependency, isOptional: false };
       }
     }
 
+    this._dependencies.set(key, dependency);
+
     return dependency;
   }
 
@@ -666,24 +675,4 @@ class DefaultModuleDependencyRegistry {
   }
 }
 
-function collapseDependencies(dependency, qualifier) {
-  let collapsed = dependency; // A previously optionally required dependency was required non-optionaly.
-  // Mark it non optional for the whole module
-
-  if (collapsed.isOptional && !qualifier.optional) {
-    collapsed = { ...dependency, isOptional: false };
-  } // A previously asynchronously (or prefetch) required module was required synchronously.
-  // Make the dependency sync.
-
-  if (collapsed.asyncType != null && qualifier.asyncType == null) {
-    collapsed = { ...dependency, asyncType: null };
-  } // A prefetched dependency was required async in the module. Mark it as async.
-
-  if (collapsed.asyncType === "prefetch" && qualifier.asyncType === "async") {
-    collapsed = { ...dependency, asyncType: "async" };
-  }
-
-  return collapsed;
-}
-
 module.exports = collectDependencies;