metro 0.65.2 → 0.67.0

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -8,40 +8,39 @@
  * @format
  */
 
-'use strict';
+import type {Moduleish} from '../../node-haste/DependencyGraph/ModuleResolution';
+import type {ResolveFn, TransformedCodeFile} from '../types.flow';
+import type {Extensions, Path} from './node-haste.flow';
+import type {CustomResolver} from 'metro-resolver';
 
+import {ModuleMap} from 'jest-haste-map';
+
+const {
+  ModuleResolver,
+} = require('../../node-haste/DependencyGraph/ModuleResolution');
+const parsePlatformFilePath = require('../../node-haste/lib/parsePlatformFilePath');
 const HasteFS = require('./HasteFS');
 const Module = require('./Module');
 const ModuleCache = require('./ModuleCache');
-
 const defaults = require('metro-config/src/defaults/defaults');
-const parsePlatformFilePath = require('../../node-haste/lib/parsePlatformFilePath');
 const path = require('path');
 
-const {
-  ModuleResolver,
-} = require('../../node-haste/DependencyGraph/ModuleResolution');
-const {ModuleMap} = require('jest-haste-map');
-
-import type {Moduleish} from '../../node-haste/DependencyGraph/ModuleResolution';
-import type {ResolveFn, TransformedCodeFile} from '../types.flow';
-import type {Extensions, Path} from './node-haste.flow';
-import type {CustomResolver} from 'metro-resolver';
-
 type ResolveOptions = {|
-  +platform: string,
-  +sourceExts: Extensions,
   assetExts: Extensions,
   assetResolutions: $ReadOnlyArray<string>,
+  +disableHierarchicalLookup: boolean,
+  +emptyModulePath: string,
   extraNodeModules: {[id: string]: string, ...},
   mainFields: $ReadOnlyArray<string>,
   nodeModulesPaths: $ReadOnlyArray<string>,
+  +platform: string,
+  platforms?: $ReadOnlyArray<string>,
   resolveRequest?: ?CustomResolver,
+  +sourceExts: Extensions,
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
 |};
 
-const platforms = new Set(defaults.platforms);
-
+const NATIVE_PLATFORM = 'native';
 const GENERIC_PLATFORM = 'g';
 const PACKAGE_JSON = path.sep + 'package.json';
 const NULL_MODULE: Moduleish = {
@@ -59,7 +58,11 @@ const NODE_MODULES = path.sep + 'node_modules' + path.sep;
 const isNodeModules = file => file.includes(NODE_MODULES);
 
 // This function maps the ModuleGraph data structure to jest-haste-map's ModuleMap
-const createModuleMap = ({files, moduleCache, sourceExts}) => {
+const createModuleMap = ({files, moduleCache, sourceExts, platforms}) => {
+  const platformSet = new Set(
+    (platforms ?? defaults.platforms).concat([NATIVE_PLATFORM]),
+  );
+
   const map = new Map();
 
   files.forEach((filePath: string) => {
@@ -83,7 +86,7 @@ const createModuleMap = ({files, moduleCache, sourceExts}) => {
     const mapModule = map.get(id) || Object.create(null);
 
     const platform =
-      parsePlatformFilePath(filePath, platforms).platform || GENERIC_PLATFORM;
+      parsePlatformFilePath(filePath, platformSet).platform || GENERIC_PLATFORM;
 
     const existingModule = mapModule[platform];
     // 0 = Module, 1 = Package in jest-haste-map
@@ -107,7 +110,7 @@ const createModuleMap = ({files, moduleCache, sourceExts}) => {
   return map;
 };
 
-exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
+exports.createResolveFn = function (options: ResolveOptions): ResolveFn {
   const {
     assetExts,
     assetResolutions,
@@ -115,6 +118,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     transformedFiles,
     sourceExts,
     platform,
+    platforms,
   } = options;
   const files = Object.keys(transformedFiles);
   function getTransformedFile(path: string): TransformedCodeFile {
@@ -136,7 +140,9 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
 
   const moduleResolver = new ModuleResolver({
     dirExists: (filePath: string): boolean => hasteFS.dirExists(filePath),
+    disableHierarchicalLookup: options.disableHierarchicalLookup,
     doesFileExist: (filePath: string): boolean => hasteFS.exists(filePath),
+    emptyModulePath: options.emptyModulePath,
     extraNodeModules,
     isAssetFile,
     mainFields: options.mainFields,
@@ -144,7 +150,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     moduleCache,
     moduleMap: new ModuleMap({
       duplicates: new Map(),
-      map: createModuleMap({files, moduleCache, sourceExts}),
+      map: createModuleMap({files, moduleCache, sourceExts, platforms}),
       mocks: new Map(),
       rootDir: '',
     }),

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,19 +9,19 @@
  */
 "use strict";
 
-const buildSourcemapWithMetadata = require("../../shared/output/RamBundle/buildSourcemapWithMetadata.js");
-
-const invariant = require("invariant");
-
 const { createRamBundleGroups } = require("../../Bundler/util");
 
 const {
   buildTableAndContents,
-  createModuleGroups
+  createModuleGroups,
 } = require("../../shared/output/RamBundle/as-indexed-file");
 
+const buildSourcemapWithMetadata = require("../../shared/output/RamBundle/buildSourcemapWithMetadata.js");
+
 const { getModuleCodeAndMap, partition, toModuleTransport } = require("./util");
 
+const invariant = require("invariant");
+
 function asIndexedRamBundle({
   dependencyMapReservedName,
   filename,
@@ -30,16 +30,16 @@ function asIndexedRamBundle({
   modules,
   preloadedModules,
   ramGroupHeads,
-  requireCalls
+  requireCalls,
 }) {
-  const idForPath = x => idsForPath(x).moduleId;
+  const idForPath = (x) => idsForPath(x).moduleId;
 
   const [startup, deferred] = partition(modules, preloadedModules);
   const startupModules = [...startup, ...requireCalls];
-  const deferredModules = deferred.map(m =>
+  const deferredModules = deferred.map((m) =>
     toModuleTransport(m, idsForPath, {
       dependencyMapReservedName,
-      globalPrefix
+      globalPrefix,
     })
   );
 
@@ -60,11 +60,11 @@ function asIndexedRamBundle({
   const tableAndContents = buildTableAndContents(
     startupModules
       .map(
-        m =>
+        (m) =>
           getModuleCodeAndMap(m, idForPath, {
             dependencyMapReservedName,
             enableIDInlining: true,
-            globalPrefix
+            globalPrefix,
           }).moduleCode
       )
       .join("\n"),
@@ -78,13 +78,13 @@ function asIndexedRamBundle({
       fixWrapperOffset: false,
       lazyModules: deferredModules,
       moduleGroups,
-      startupModules: startupModules.map(m =>
+      startupModules: startupModules.map((m) =>
         toModuleTransport(m, idsForPath, {
           dependencyMapReservedName,
-          globalPrefix
+          globalPrefix,
         })
-      )
-    })
+      ),
+    }),
   };
 }
 
@@ -102,7 +102,7 @@ function* subtree(moduleTransport, moduleTransportsByPath, seen = new Set()) {
 }
 
 function createBuilder(preloadedModules, ramGroupHeads) {
-  return x => asIndexedRamBundle({ ...x, preloadedModules, ramGroupHeads });
+  return (x) => asIndexedRamBundle({ ...x, preloadedModules, ramGroupHeads });
 }
 
 exports.createBuilder = createBuilder;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,19 +9,20 @@
  */
 
 'use strict';
+import type {IdsForPathFn, Dependency} from '../types.flow';
+import type {BasicSourceMap} from '../../../../metro-source-map/src/source-map';
 
-const buildSourcemapWithMetadata = require('../../shared/output/RamBundle/buildSourcemapWithMetadata.js');
-const invariant = require('invariant');
+import type {Module, OutputFn, OutputFnArg} from '../types.flow';
+import type {IndexMap} from 'metro-source-map';
 
 const {createRamBundleGroups} = require('../../Bundler/util');
 const {
   buildTableAndContents,
   createModuleGroups,
 } = require('../../shared/output/RamBundle/as-indexed-file');
+const buildSourcemapWithMetadata = require('../../shared/output/RamBundle/buildSourcemapWithMetadata.js');
 const {getModuleCodeAndMap, partition, toModuleTransport} = require('./util');
-
-import type {Module, OutputFn, OutputFnArg} from '../types.flow';
-import type {IndexMap} from 'metro-source-map';
+const invariant = require('invariant');
 
 function asIndexedRamBundle({
   dependencyMapReservedName,
@@ -32,7 +33,19 @@ function asIndexedRamBundle({
   preloadedModules,
   ramGroupHeads,
   requireCalls,
-}): {|
+}: $TEMPORARY$object<{
+  dependencyMapReservedName?: ?string,
+  enableIDInlining: boolean,
+  filename: string,
+  globalPrefix: string,
+  idsForPath: IdsForPathFn,
+  modules: Iterable<Module>,
+  preloadedModules: Set<string>,
+  ramGroupHeads: ?$ReadOnlyArray<string>,
+  requireCalls: Iterable<Module>,
+  segmentID: number,
+  sourceMapPath?: ?string,
+}>): {|
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: IndexMap,
@@ -90,8 +103,27 @@ function asIndexedRamBundle({
 }
 
 function* subtree(
-  moduleTransport,
-  moduleTransportsByPath,
+  moduleTransport: {
+    code: string,
+    dependencies: Array<Dependency>,
+    id: number,
+    map: ?BasicSourceMap,
+    name: string,
+    sourcePath: string,
+    ...
+  },
+  moduleTransportsByPath: Map<
+    string,
+    {
+      code: string,
+      dependencies: Array<Dependency>,
+      id: number,
+      map: ?BasicSourceMap,
+      name: string,
+      sourcePath: string,
+      ...
+    },
+  >,
   seen: Set<number> = new Set(),
 ): Generator<number, void, void> {
   seen.add(moduleTransport.id);

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,16 +9,16 @@
  */
 "use strict";
 
-const MAGIC_UNBUNDLE_NUMBER = require("../../shared/output/RamBundle/magic-number");
+const buildSourcemapWithMetadata = require("../../shared/output/RamBundle/buildSourcemapWithMetadata.js");
 
-const MAGIC_UNBUNDLE_FILENAME = "UNBUNDLE";
-const JS_MODULES = "js-modules";
+const MAGIC_UNBUNDLE_NUMBER = require("../../shared/output/RamBundle/magic-number");
 
-const buildSourcemapWithMetadata = require("../../shared/output/RamBundle/buildSourcemapWithMetadata.js");
+const { getModuleCodeAndMap, partition, toModuleTransport } = require("./util");
 
 const path = require("path");
 
-const { getModuleCodeAndMap, partition, toModuleTransport } = require("./util");
+const MAGIC_UNBUNDLE_FILENAME = "UNBUNDLE";
+const JS_MODULES = "js-modules";
 
 function asMultipleFilesRamBundle({
   dependencyMapReservedName,
@@ -27,33 +27,33 @@ function asMultipleFilesRamBundle({
   idsForPath,
   modules,
   requireCalls,
-  preloadedModules
+  preloadedModules,
 }) {
-  const idForPath = x => idsForPath(x).moduleId;
+  const idForPath = (x) => idsForPath(x).moduleId;
 
   const [startup, deferred] = partition(modules, preloadedModules);
   const startupModules = [...startup, ...requireCalls];
-  const deferredModules = deferred.map(m =>
+  const deferredModules = deferred.map((m) =>
     toModuleTransport(m, idsForPath, {
       dependencyMapReservedName,
-      globalPrefix
+      globalPrefix,
     })
   );
   const magicFileContents = Buffer.alloc(4); // Just concatenate all startup modules, one after the other.
 
   const code = startupModules
     .map(
-      m =>
+      (m) =>
         getModuleCodeAndMap(m, idForPath, {
           dependencyMapReservedName,
           enableIDInlining: true,
-          globalPrefix
+          globalPrefix,
         }).moduleCode
     )
     .join("\n"); // Write one file per module, wrapped with __d() call if it proceeds.
 
   const extraFiles = new Map();
-  deferredModules.forEach(deferredModule => {
+  deferredModules.forEach((deferredModule) => {
     extraFiles.set(
       path.join(JS_MODULES, deferredModule.id + ".js"),
       deferredModule.code
@@ -70,22 +70,22 @@ function asMultipleFilesRamBundle({
     fixWrapperOffset: false,
     lazyModules: deferredModules,
     moduleGroups: null,
-    startupModules: startupModules.map(m =>
+    startupModules: startupModules.map((m) =>
       toModuleTransport(m, idsForPath, {
         dependencyMapReservedName,
-        globalPrefix
+        globalPrefix,
       })
-    )
+    ),
   });
   return {
     code,
     extraFiles,
-    map
+    map,
   };
 }
 
 function createBuilder(preloadedModules, ramGroupHeads) {
-  return x =>
+  return (x) =>
     asMultipleFilesRamBundle({ ...x, preloadedModules, ramGroupHeads });
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,18 +9,18 @@
  */
 
 'use strict';
+import type {IdsForPathFn} from '../types.flow';
 
-const MAGIC_UNBUNDLE_NUMBER = require('../../shared/output/RamBundle/magic-number');
-const MAGIC_UNBUNDLE_FILENAME = 'UNBUNDLE';
-const JS_MODULES = 'js-modules';
+import type {Module, OutputFn, OutputFnArg, OutputResult} from '../types.flow';
+import type {IndexMap} from 'metro-source-map';
 
 const buildSourcemapWithMetadata = require('../../shared/output/RamBundle/buildSourcemapWithMetadata.js');
-const path = require('path');
-
+const MAGIC_UNBUNDLE_NUMBER = require('../../shared/output/RamBundle/magic-number');
 const {getModuleCodeAndMap, partition, toModuleTransport} = require('./util');
+const path = require('path');
 
-import type {IndexMap} from 'metro-source-map';
-import type {Module, OutputFn, OutputFnArg, OutputResult} from '../types.flow';
+const MAGIC_UNBUNDLE_FILENAME = 'UNBUNDLE';
+const JS_MODULES = 'js-modules';
 
 function asMultipleFilesRamBundle({
   dependencyMapReservedName,
@@ -30,7 +30,19 @@ function asMultipleFilesRamBundle({
   modules,
   requireCalls,
   preloadedModules,
-}): OutputResult<IndexMap> {
+}: $TEMPORARY$object<{
+  dependencyMapReservedName?: ?string,
+  enableIDInlining: boolean,
+  filename: string,
+  globalPrefix: string,
+  idsForPath: IdsForPathFn,
+  modules: Iterable<Module>,
+  preloadedModules: Set<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);
   const startupModules = [...startup, ...requireCalls];

package/src/ModuleGraph/output/plain-bundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,7 +11,7 @@
 
 const meta = require("../../shared/output/meta");
 
-const { getModuleCodeAndMap, concat } = require("./util");
+const { concat, getModuleCodeAndMap } = require("./util");
 
 const { BundleBuilder } = require("metro-source-map");
 
@@ -23,11 +23,11 @@ function asPlainBundle({
   modules,
   requireCalls,
   sourceMapPath,
-  enableIDInlining
+  enableIDInlining,
 }) {
   const builder = new BundleBuilder(filename);
 
-  const modIdForPath = x => idsForPath(x).moduleId;
+  const modIdForPath = (x) => idsForPath(x).moduleId;
 
   for (const module of concat(modules, requireCalls)) {
     const { moduleCode, moduleMap } = getModuleCodeAndMap(
@@ -36,7 +36,7 @@ function asPlainBundle({
       {
         dependencyMapReservedName,
         enableIDInlining,
-        globalPrefix
+        globalPrefix,
       }
     );
     builder.append(moduleCode + "\n", moduleMap);
@@ -51,7 +51,7 @@ function asPlainBundle({
   return {
     code,
     extraFiles: [[`${filename}.meta`, meta(code)]],
-    map
+    map,
   };
 }
 

package/src/ModuleGraph/output/plain-bundle.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,15 +9,15 @@
  */
 
 'use strict';
-
-const meta = require('../../shared/output/meta');
-
-const {getModuleCodeAndMap, concat} = require('./util');
-const {BundleBuilder} = require('metro-source-map');
+import type {OutputFnArg} from '../types.flow';
 
 import type {OutputFn} from '../types.flow';
 import type {MixedSourceMap} from 'metro-source-map';
 
+const meta = require('../../shared/output/meta');
+const {concat, getModuleCodeAndMap} = require('./util');
+const {BundleBuilder} = require('metro-source-map');
+
 function asPlainBundle({
   dependencyMapReservedName,
   filename,
@@ -27,7 +27,7 @@ function asPlainBundle({
   requireCalls,
   sourceMapPath,
   enableIDInlining,
-}): {|
+}: OutputFnArg): {|
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: MixedSourceMap,

package/src/ModuleGraph/output/reverse-dependency-map-references.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -60,8 +60,8 @@ function reverseDependencyMapReferences({ types: t }) {
             }
           });
         }
-      }
-    }
+      },
+    },
   };
 }
 

package/src/ModuleGraph/output/reverse-dependency-map-references.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -11,8 +11,9 @@
 'use strict';
 
 import type {NodePath} from '@babel/traverse';
-import typeof * as Types from '@babel/types';
 import type {CallExpression} from '@babel/types';
+import typeof * as Types from '@babel/types';
+
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
@@ -23,12 +24,7 @@ type State = {|
   |},
 |};
 
-function reverseDependencyMapReferences({
-  types: t,
-}: {
-  types: Types,
-  ...
-}): {|
+function reverseDependencyMapReferences({types: t}: {types: Types, ...}): {|
   visitor: {|
     CallExpression: (path: NodePath<CallExpression>, state: State) => void,
   |},