metro 0.70.3 → 0.71.0

package/src/IncrementalBundler.js

@@ -43,7 +43,7 @@ class IncrementalBundler {
   constructor(config, options) {
     this._config = config;
     this._bundler = new Bundler(config, options);
-    this._deltaBundler = new DeltaBundler(this._bundler);
+    this._deltaBundler = new DeltaBundler(this._bundler.getWatcher());
   }
 
   end() {

package/src/IncrementalBundler.js.flow

@@ -33,24 +33,24 @@ export opaque type RevisionId: string = string;
 
 export type OutputGraph = Graph<>;
 
-type OtherOptions = {|
+type OtherOptions = {
   +onProgress: $PropertyType<DeltaBundlerOptions<>, 'onProgress'>,
   +shallow: boolean,
-|};
+};
 
-export type GraphRevision = {|
+export type GraphRevision = {
   // Identifies the last computed revision.
   +id: RevisionId,
   +date: Date,
   +graphId: GraphId,
   +graph: OutputGraph,
   +prepend: $ReadOnlyArray<Module<>>,
-|};
+};
 
-export type IncrementalBundlerOptions = $ReadOnly<{|
+export type IncrementalBundlerOptions = $ReadOnly<{
   hasReducedPerformance?: boolean,
   watch?: boolean,
-|}>;
+}>;
 
 function createRevisionId(): RevisionId {
   return crypto.randomBytes(8).toString('hex');
@@ -73,7 +73,7 @@ class IncrementalBundler {
   constructor(config: ConfigT, options?: IncrementalBundlerOptions) {
     this._config = config;
     this._bundler = new Bundler(config, options);
-    this._deltaBundler = new DeltaBundler(this._bundler);
+    this._deltaBundler = new DeltaBundler(this._bundler.getWatcher());
   }
 
   end(): void {
@@ -178,7 +178,7 @@ class IncrementalBundler {
       onProgress: null,
       shallow: false,
     },
-  ): Promise<{|+graph: OutputGraph, +prepend: $ReadOnlyArray<Module<>>|}> {
+  ): Promise<{+graph: OutputGraph, +prepend: $ReadOnlyArray<Module<>>}> {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,

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

@@ -24,7 +24,7 @@ module.exports = class ModuleCache {
   getModule(path) {
     // This is hacky as hell... `ModuleGraph` handles relative paths but which
     // start with a slash (so we can have `/js/foo.js` or even `/../foo.js`).
-    // This does not play well with `jest-haste-map`, which tries to convert
+    // This does not play well with `metro-file-map`, which tries to convert
     // paths to absolute (https://fburl.com/vbwmjsxa) causing an additional
     // slashed to be prepended in the file path.
     // TODO: Refactor the way metro-buck handles paths to make them either

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

@@ -36,7 +36,7 @@ module.exports = class ModuleCache {
   getModule(path: string): Module {
     // This is hacky as hell... `ModuleGraph` handles relative paths but which
     // start with a slash (so we can have `/js/foo.js` or even `/../foo.js`).
-    // This does not play well with `jest-haste-map`, which tries to convert
+    // This does not play well with `metro-file-map`, which tries to convert
     // paths to absolute (https://fburl.com/vbwmjsxa) causing an additional
     // slashed to be prepended in the file path.
     // TODO: Refactor the way metro-buck handles paths to make them either

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

@@ -55,13 +55,13 @@ export type FastFS = {
   ...
 };
 
-type HasteMapOptions = {|
+type HasteMapOptions = {
   extensions: Extensions,
   files: Array<string>,
   moduleCache: ModuleCache,
   platforms: Platforms,
   preferNativePlatform: true,
-|};
+};
 
 declare class HasteMap {
   // node-haste/DependencyGraph/HasteMap.js

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _jestHasteMap = require("jest-haste-map");
+var _metroFileMap = require("metro-file-map");
 
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -45,7 +45,7 @@ const NULL_MODULE = {
 };
 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 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 platformSet = new Set(
@@ -78,7 +78,7 @@ const createModuleMap = ({ files, moduleCache, sourceExts, platforms }) => {
     const mapModule = map.get(id) || Object.create(null);
     const platform =
       parsePlatformFilePath(filePath, platformSet).platform || GENERIC_PLATFORM;
-    const existingModule = mapModule[platform]; // 0 = Module, 1 = Package in jest-haste-map
+    const existingModule = mapModule[platform]; // 0 = Module, 1 = Package in metro-file-map
 
     mapModule[platform] = [filePath, module.type === "Package" ? 1 : 0];
 
@@ -141,7 +141,7 @@ exports.createResolveFn = function (options) {
     mainFields: options.mainFields,
     // $FlowFixMe -- error revealed by types-first codemod
     moduleCache,
-    moduleMap: new _jestHasteMap.ModuleMap({
+    moduleMap: new _metroFileMap.ModuleMap({
       duplicates: new Map(),
       map: createModuleMap({
         files,

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

@@ -11,9 +11,10 @@
 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 {ModuleMapData, ModuleMapItem} from 'metro-file-map';
 import type {CustomResolver} from 'metro-resolver';
 
-import {ModuleMap} from 'jest-haste-map';
+import {ModuleMap} from 'metro-file-map';
 
 const {
   ModuleResolver,
@@ -25,7 +26,7 @@ const ModuleCache = require('./ModuleCache');
 const defaults = require('metro-config/src/defaults/defaults');
 const path = require('path');
 
-type ResolveOptions = {|
+type ResolveOptions = {
   assetExts: Extensions,
   assetResolutions: $ReadOnlyArray<string>,
   +disableHierarchicalLookup: boolean,
@@ -38,7 +39,7 @@ type ResolveOptions = {|
   resolveRequest?: ?CustomResolver,
   +sourceExts: Extensions,
   transformedFiles: {[path: Path]: TransformedCodeFile, ...},
-|};
+};
 
 const NATIVE_PLATFORM = 'native';
 const GENERIC_PLATFORM = 'g';
@@ -57,8 +58,13 @@ const NULL_MODULE: Moduleish = {
 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, platforms}) => {
+// This function maps the ModuleGraph data structure to metro-file-map's ModuleMap
+const createModuleMap = ({
+  files,
+  moduleCache,
+  sourceExts,
+  platforms,
+}): ModuleMapData => {
   const platformSet = new Set(
     (platforms ?? defaults.platforms).concat([NATIVE_PLATFORM]),
   );
@@ -83,13 +89,13 @@ const createModuleMap = ({files, moduleCache, sourceExts, platforms}) => {
       return;
     }
 
-    const mapModule = map.get(id) || Object.create(null);
+    const mapModule: ModuleMapItem = map.get(id) || Object.create(null);
 
     const platform =
       parsePlatformFilePath(filePath, platformSet).platform || GENERIC_PLATFORM;
 
     const existingModule = mapModule[platform];
-    // 0 = Module, 1 = Package in jest-haste-map
+    // 0 = Module, 1 = Package in metro-file-map
     mapModule[platform] = [filePath, module.type === 'Package' ? 1 : 0];
 
     if (existingModule && existingModule[0] !== filePath) {

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

@@ -45,11 +45,11 @@ function asIndexedRamBundle({
   requireCalls: Iterable<Module>,
   segmentID: number,
   sourceMapPath?: ?string,
-}>): {|
+}>): {
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: 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.flow

@@ -27,11 +27,11 @@ function asPlainBundle({
   requireCalls,
   sourceMapPath,
   enableIDInlining,
-}: OutputFnArg): {|
+}: OutputFnArg): {
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: MixedSourceMap,
-|} {
+} {
   const builder = new BundleBuilder(filename);
   const modIdForPath = (x: {path: string, ...}) => idsForPath(x).moduleId;
 

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

@@ -17,18 +17,18 @@ import typeof * as Types from '@babel/types';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
-type State = {|
-  opts: {|
+type State = {
+  opts: {
     +dependencyIds: $ReadOnlyArray<number>,
     +globalPrefix: string,
-  |},
-|};
+  },
+};
 
-function reverseDependencyMapReferences({types: t}: {types: Types, ...}): {|
-  visitor: {|
+function reverseDependencyMapReferences({types: t}: {types: Types, ...}): {
+  visitor: {
     CallExpression: (path: NodePath<CallExpression>, state: State) => void,
-  |},
-|} {
+  },
+} {
   return {
     visitor: {
       CallExpression(path: NodePath<CallExpression>, state: State) {

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

@@ -238,10 +238,10 @@ function getModuleCodeAndMap(
     dependencyMapReservedName: ?string,
     globalPrefix: string,
   }>,
-): {|
+): {
   moduleCode: string,
   moduleMap: ?BasicSourceMap,
-|} {
+} {
   const {file} = module;
   let moduleCode, moduleMap;
 

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

@@ -22,19 +22,19 @@ export type BuildResult = GraphResult;
 export type Callback<A = void, B = void> = (Error => void) &
   ((null | void, A, B) => void);
 
-export type Dependency = {|
+export type Dependency = {
   // The module name or path used to require the dependency
   id: string,
   +isAsync: boolean,
   +isPrefetchOnly: boolean,
-  +splitCondition: ?{|
+  +splitCondition: ?{
     +mobileConfigName: string,
-  |},
+  },
   path: string,
   +locs: $ReadOnlyArray<BabelSourceLocation>,
-|};
+};
 
-export type File = {|
+export type File = {
   code: string,
   map: ?BasicSourceMap,
   functionMap: ?FBSourceFunctionMap,
@@ -42,7 +42,7 @@ export type File = {|
   type: CodeFileTypes,
   libraryIdx: ?number,
   soundResources?: ?Array<string>,
-|};
+};
 
 type CodeFileTypes = 'module' | 'script';
 
@@ -51,11 +51,11 @@ export type GraphFn = (
   // platform: string,
 ) => GraphResult;
 
-export type GraphResult = {|
+export type GraphResult = {
   modules: Array<Module>,
-|};
+};
 
-export type ModuleIds = {|
+export type ModuleIds = {
   /**
    * The module ID is global across all segments and identifies the module
    * uniquely. This is useful to cache modules that has been loaded already at
@@ -71,7 +71,7 @@ export type ModuleIds = {|
    * case this property does not apply and will be omitted.
    */
   +localId?: number,
-|};
+};
 
 /**
  * Indempotent function that gets us the IDs corresponding to a particular
@@ -87,17 +87,17 @@ export type LoadResult = {
 
 export type LoadFn = (file: string) => LoadResult;
 
-export type Module = {|
+export type Module = {
   dependencies: Array<Dependency>,
   file: File,
-|};
+};
 
 export type PostProcessModules = (
   modules: $ReadOnlyArray<Module>,
   entryPoints: Array<string>,
 ) => $ReadOnlyArray<Module>;
 
-export type OutputFnArg = {|
+export type OutputFnArg = {
   dependencyMapReservedName?: ?string,
   filename: string,
   globalPrefix: string,
@@ -107,22 +107,22 @@ export type OutputFnArg = {|
   sourceMapPath?: ?string,
   enableIDInlining: boolean,
   segmentID: number,
-|};
+};
 export type OutputFn<M: MixedSourceMap = MixedSourceMap> =
   OutputFnArg => OutputResult<M>;
 
-export type OutputResult<M: MixedSourceMap> = {|
+export type OutputResult<M: MixedSourceMap> = {
   code: string | Buffer,
   extraFiles?: Iterable<[string, string | Buffer]>,
   map: M,
-|};
+};
 
-export type PackageData = {|
+export type PackageData = {
   browser?: Object | string,
   main?: string,
   name?: string,
   'react-native'?: Object | string,
-|};
+};
 
 export type ResolveFn = (id: string, source: ?string) => string;
 
@@ -159,16 +159,16 @@ export type TransformResults = {
 
 export type TransformVariants = {+[name: string]: {...}};
 
-export type TransformedCodeFile = {|
+export type TransformedCodeFile = {
   +file: string,
   +functionMap: ?FBSourceFunctionMap,
   +hasteID: ?string,
   +package?: PackageData,
   +transformed: TransformResults,
   +type: CodeFileTypes,
-|};
+};
 
-export type ImageSize = {|+width: number, +height: number|};
+export type ImageSize = {+width: number, +height: number};
 
 export type AssetFileVariant = $ReadOnly<{
   /**
@@ -228,24 +228,24 @@ export type AssetFile = $ReadOnly<{
 }>;
 
 export type TransformedSourceFile =
-  | {|
+  | {
       +type: 'code',
       +details: TransformedCodeFile,
-    |}
-  | {|
+    }
+  | {
       +type: 'asset',
       +details: AssetFile,
-    |}
-  | {|
+    }
+  | {
       +type: 'unknown',
-    |};
+    };
 
-export type LibraryOptions = {|
+export type LibraryOptions = {
   dependencies?: Array<string>,
   optimize: boolean,
   platform?: string,
   rebasePath: string => string,
-|};
+};
 
 export type Base64Content = string;
 export type AssetContents = {
@@ -258,7 +258,7 @@ export type AssetContentsByPath = {
   ...
 };
 
-export type ResolvedCodeFile = {|
+export type ResolvedCodeFile = {
   +codeFile: TransformedCodeFile,
   /**
    * Imagine we have a source file that contains a `require('foo')`. The library
@@ -267,35 +267,35 @@ export type ResolvedCodeFile = {|
    * `{'foo': 'bar/foo.js', 'bar': 'node_modules/bar/index.js'}`.
    */
   +filePathsByDependencyName: {[dependencyName: string]: string, ...},
-|};
+};
 
-export type LibraryBoundCodeFile = {|
+export type LibraryBoundCodeFile = {
   ...ResolvedCodeFile,
   /**
    * Index of the library that this code file has been exported from.
    */
   +libraryIdx: number,
-|};
+};
 
 /**
  * Describe a set of JavaScript files and the associated assets. It could be
  * depending on modules from other libraries. To be able to resolve these
  * dependencies, these libraries need to be provided by callsites (ex. Buck).
  */
-export type Library = {|
+export type Library = {
   +files: Array<TransformedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
-|};
+};
 
 /**
  * Just like a `Library`, but it also contains module resolutions. For example
  * if there is a `require('foo')` in some JavaScript file, we keep track of the
  * path it resolves to, ex. `beep/glo/foo.js`.
  */
-export type ResolvedLibrary = {|
+export type ResolvedLibrary = {
   +files: $ReadOnlyArray<ResolvedCodeFile>,
   /* cannot be a Map because it's JSONified later on */
   +assets: AssetContentsByPath,
   +isPartiallyResolved?: boolean,
-|};
+};

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -332,7 +332,7 @@ function processRequireCall<TSplitCondition>(
 }
 
 function getNearestLocFromPath(path: NodePath<>): ?BabelSourceLocation {
-  let current = path;
+  let current: ?(NodePath<> | NodePath<BabelNode>) = path;
   while (current && !current.node.loc) {
     current = current.parentPath;
   }
@@ -383,7 +383,7 @@ function isOptionalDependency<TSplitCondition>(
 
   // Valid statement stack for single-level try-block: expressionStatement -> blockStatement -> tryStatement
   let sCount = 0;
-  let p = path;
+  let p: ?(NodePath<> | NodePath<BabelNode>) = path;
   while (p && sCount < 3) {
     if (p.isStatement()) {
       if (p.node.type === 'BlockStatement') {

package/src/Server/symbolicate.js.flow

@@ -35,7 +35,7 @@ export type StackFrameOutput = $ReadOnly<{
   ...
 }>;
 type ExplodedSourceMapModule = $ElementType<ExplodedSourceMap, number>;
-type Position = {|+line1Based: number, column0Based: number|};
+type Position = {+line1Based: number, column0Based: number};
 
 function createFunctionNameGetter(
   module: ExplodedSourceMapModule,

package/src/Server.js.flow

@@ -81,7 +81,7 @@ export type BundleMetadata = {
   ...
 };
 
-type ProcessStartContext = {|
+type ProcessStartContext = {
   +buildID: string,
   +bundleOptions: BundleOptions,
   +graphId: GraphId,
@@ -91,24 +91,24 @@ type ProcessStartContext = {|
   +req: IncomingMessage,
   +revisionId?: ?RevisionId,
   ...SplitBundleOptions,
-|};
+};
 
-type ProcessDeleteContext = {|
+type ProcessDeleteContext = {
   +graphId: GraphId,
   +req: IncomingMessage,
   +res: ServerResponse,
-|};
+};
 
-type ProcessEndContext<T> = {|
+type ProcessEndContext<T> = {
   ...ProcessStartContext,
   +result: T,
-|};
+};
 
-export type ServerOptions = $ReadOnly<{|
+export type ServerOptions = $ReadOnly<{
   hasReducedPerformance?: boolean,
   onBundleBuilt?: (bundlePath: string) => void,
   watch?: boolean,
-|}>;
+}>;
 
 const DELTA_ID_HEADER = 'X-Metro-Delta-ID';
 const FILES_CHANGED_COUNT_HEADER = 'X-Metro-Files-Changed-Count';
@@ -504,7 +504,7 @@ class Server {
     build,
     delete: deleteFn,
     finish,
-  }: {|
+  }: {
     +createStartEntry: (context: ProcessStartContext) => ActionLogEntryData,
     +createEndEntry: (
       context: ProcessEndContext<T>,
@@ -512,7 +512,7 @@ class Server {
     +build: (context: ProcessStartContext) => Promise<T>,
     +delete?: (context: ProcessDeleteContext) => Promise<void>,
     +finish: (context: ProcessEndContext<T>) => void,
-  |}) {
+  }) {
     return async function requestProcessor(
       req: IncomingMessage,
       res: ServerResponse,
@@ -703,12 +703,12 @@ class Server {
       };
     },
     createEndEntry(
-      context: ProcessEndContext<{|
+      context: ProcessEndContext<{
         bundle: string,
         lastModifiedDate: Date,
         nextRevId: RevisionId,
         numModifiedFiles: number,
-      |}>,
+      }>,
     ) {
       return {
         outdated_modules: context.result.numModifiedFiles,
@@ -820,12 +820,12 @@ class Server {
       };
     },
     createEndEntry(
-      context: ProcessEndContext<{|
+      context: ProcessEndContext<{
         bytecode: Buffer,
         lastModifiedDate: Date,
         nextRevId: RevisionId,
         numModifiedFiles: number,
-      |}>,
+      }>,
     ) {
       return {
         outdated_modules: context.result.numModifiedFiles,
@@ -1193,14 +1193,14 @@ class Server {
     return this._config.watchFolders;
   }
 
-  static DEFAULT_GRAPH_OPTIONS: {|
+  static DEFAULT_GRAPH_OPTIONS: {
     customTransformOptions: any,
     dev: boolean,
     hot: boolean,
     minify: boolean,
     runtimeBytecodeVersion: ?number,
     unstable_transformProfile: 'default',
-  |} = {
+  } = {
     customTransformOptions: Object.create(null),
     dev: true,
     hot: false,
@@ -1209,7 +1209,7 @@ class Server {
     unstable_transformProfile: 'default',
   };
 
-  static DEFAULT_BUNDLE_OPTIONS: {|
+  static DEFAULT_BUNDLE_OPTIONS: {
     ...typeof Server.DEFAULT_GRAPH_OPTIONS,
     excludeSource: false,
     inlineSourceMap: false,
@@ -1219,7 +1219,7 @@ class Server {
     shallow: false,
     sourceMapUrl: null,
     sourceUrl: null,
-  |} = {
+  } = {
     ...Server.DEFAULT_GRAPH_OPTIONS,
     excludeSource: false,
     inlineSourceMap: false,

package/src/commands/build.js.flow

@@ -23,12 +23,12 @@ const {Terminal} = require('metro-core');
 const term = new Terminal(process.stdout);
 const updateReporter = new TerminalReporter(term);
 
-module.exports = (): ({|
+module.exports = (): ({
   builder: (yargs: Yargs) => void,
   command: string,
   description: string,
   handler: (argv: YargArguments) => void,
-|}) => ({
+}) => ({
   command: 'build <entry>',
 
   description:

package/src/commands/serve.js.flow

@@ -19,12 +19,12 @@ const MetroApi = require('../index');
 const {loadConfig, resolveConfig} = require('metro-config');
 const {promisify} = require('util');
 
-module.exports = (): ({|
+module.exports = (): ({
   builder: (yargs: Yargs) => void,
   command: $TEMPORARY$string<'serve'>,
   description: string,
   handler: (argv: YargArguments) => void,
-|}) => ({
+}) => ({
   command: 'serve',
 
   description: 'Starts Metro on the given port, building bundles on the fly',