metro 0.70.3 → 0.71.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.70.3",
+  "version": "0.71.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -34,24 +34,24 @@
     "hermes-parser": "0.6.0",
     "image-size": "^0.6.0",
     "invariant": "^2.2.4",
-    "jest-haste-map": "^27.3.1",
     "jest-worker": "^27.2.0",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.70.3",
-    "metro-cache": "0.70.3",
-    "metro-cache-key": "0.70.3",
-    "metro-config": "0.70.3",
-    "metro-core": "0.70.3",
-    "metro-hermes-compiler": "0.70.3",
-    "metro-inspector-proxy": "0.70.3",
-    "metro-minify-uglify": "0.70.3",
-    "metro-react-native-babel-preset": "0.70.3",
-    "metro-resolver": "0.70.3",
-    "metro-runtime": "0.70.3",
-    "metro-source-map": "0.70.3",
-    "metro-symbolicate": "0.70.3",
-    "metro-transform-plugins": "0.70.3",
-    "metro-transform-worker": "0.70.3",
+    "metro-babel-transformer": "0.71.0",
+    "metro-cache": "0.71.0",
+    "metro-cache-key": "0.71.0",
+    "metro-config": "0.71.0",
+    "metro-core": "0.71.0",
+    "metro-file-map": "0.71.0",
+    "metro-hermes-compiler": "0.71.0",
+    "metro-inspector-proxy": "0.71.0",
+    "metro-minify-uglify": "0.71.0",
+    "metro-react-native-babel-preset": "0.71.0",
+    "metro-resolver": "0.71.0",
+    "metro-runtime": "0.71.0",
+    "metro-source-map": "0.71.0",
+    "metro-symbolicate": "0.71.0",
+    "metro-transform-plugins": "0.71.0",
+    "metro-transform-worker": "0.71.0",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -70,9 +70,9 @@
     "babel-jest": "^26.6.3",
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
-    "metro-memory-fs": "0.70.3",
-    "metro-react-native-babel-preset": "0.70.3",
-    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-memory-fs": "0.71.0",
+    "metro-react-native-babel-preset": "0.71.0",
+    "metro-react-native-babel-transformer": "0.71.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT"

package/src/Assets.js.flow

@@ -23,13 +23,13 @@ const path = require('path');
 const readDir = denodeify(fs.readdir);
 const readFile = denodeify(fs.readFile);
 
-export type AssetInfo = {|
+export type AssetInfo = {
   +files: Array<string>,
   +hash: string,
   +name: string,
   +scales: Array<number>,
   +type: string,
-|};
+};
 
 export type AssetDataWithoutFiles = {
   +__packager_asset: boolean,
@@ -84,7 +84,7 @@ function buildAssetMap(
   dir: string,
   files: $ReadOnlyArray<string>,
   platform: ?string,
-): Map<string, {|files: Array<string>, scales: Array<number>|}> {
+): Map<string, {files: Array<string>, scales: Array<number>}> {
   const platforms = new Set(platform != null ? [platform] : []);
   const assets = files.map((file: string) =>
     AssetPaths.tryParse(file, platforms),
@@ -131,7 +131,7 @@ function getAssetKey(assetName: string, platform: ?string): string {
 async function getAbsoluteAssetRecord(
   assetPath: string,
   platform: ?string = null,
-): Promise<{|files: Array<string>, scales: Array<number>|}> {
+): Promise<{files: Array<string>, scales: Array<number>}> {
   const filename = path.basename(assetPath);
   const dir = path.dirname(assetPath);
   const files = await readDir(dir);

package/src/Bundler/util.js

@@ -108,7 +108,7 @@ function isAssetTypeAnImage(type) {
 }
 
 function filterObject(object, blockList) {
-  const copied = Object.assign({}, object);
+  const copied = { ...object };
 
   for (const key of blockList) {
     delete copied[key];

package/src/Bundler/util.js.flow

@@ -95,7 +95,7 @@ function generateRemoteAssetCodeFileAst(
 
   const file = remoteFileMap[assetDescriptor.fileSystemLocation];
   const descriptor = file && file[assetDescriptor.name];
-  const data = {};
+  const data: {[number]: string} = {};
 
   if (!descriptor) {
     return null;
@@ -155,7 +155,7 @@ function filterObject(
   object: AssetDataWithoutFiles,
   blockList: Set<string>,
 ): AssetDataFiltered {
-  const copied = Object.assign({}, object);
+  const copied = {...object};
   for (const key of blockList) {
     delete copied[key];
   }

package/src/Bundler.js

@@ -13,17 +13,19 @@ const Transformer = require("./DeltaBundler/Transformer");
 
 const DependencyGraph = require("./node-haste/DependencyGraph");
 
+const { EventEmitter } = require("events");
+
 class Bundler {
   constructor(config, options) {
-    this._depGraphPromise = DependencyGraph.load(config, options);
-    this._readyPromise = this._depGraphPromise
-      .then((dependencyGraph) => {
+    this._depGraph = new DependencyGraph(config, options);
+    this._readyPromise = this._depGraph
+      .ready()
+      .then(() => {
         config.reporter.update({
           type: "transformer_load_started",
         });
-        this._transformer = new Transformer(
-          config, // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-          dependencyGraph.getSha1.bind(dependencyGraph)
+        this._transformer = new Transformer(config, (...args) =>
+          this._depGraph.getSha1(...args)
         );
         config.reporter.update({
           type: "transformer_load_done",
@@ -38,22 +40,27 @@ class Bundler {
       });
   }
 
+  getWatcher() {
+    return this._depGraph.getWatcher();
+  }
+
   async end() {
-    const dependencyGraph = await this._depGraphPromise;
+    await this._depGraph.ready();
 
     this._transformer.end();
 
-    dependencyGraph.end();
+    this._depGraph.end();
   }
 
   async getDependencyGraph() {
-    return await this._depGraphPromise;
+    await this._depGraph.ready();
+    return this._depGraph;
   }
 
   async transformFile(filePath, transformOptions) {
     // We need to be sure that the DependencyGraph has been initialized.
     // TODO: Remove this ugly hack!
-    await this._depGraphPromise;
+    await this._depGraph.ready();
     return this._transformer.transformFile(filePath, transformOptions);
   } // Waits for the bundler to become ready.
 

package/src/Bundler.js.flow

@@ -16,27 +16,27 @@ import type {ConfigT} from 'metro-config/src/configTypes.flow';
 
 const Transformer = require('./DeltaBundler/Transformer');
 const DependencyGraph = require('./node-haste/DependencyGraph');
+const {EventEmitter} = require('events');
 
-export type BundlerOptions = $ReadOnly<{|
+export type BundlerOptions = $ReadOnly<{
   hasReducedPerformance?: boolean,
   watch?: boolean,
-|}>;
+}>;
 
 class Bundler {
-  _depGraphPromise: Promise<DependencyGraph>;
+  _depGraph: DependencyGraph;
   _readyPromise: Promise<void>;
   _transformer: Transformer;
 
   constructor(config: ConfigT, options?: BundlerOptions) {
-    this._depGraphPromise = DependencyGraph.load(config, options);
+    this._depGraph = new DependencyGraph(config, options);
 
-    this._readyPromise = this._depGraphPromise
-      .then((dependencyGraph: DependencyGraph) => {
+    this._readyPromise = this._depGraph
+      .ready()
+      .then(() => {
         config.reporter.update({type: 'transformer_load_started'});
-        this._transformer = new Transformer(
-          config,
-          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-          dependencyGraph.getSha1.bind(dependencyGraph),
+        this._transformer = new Transformer(config, (...args) =>
+          this._depGraph.getSha1(...args),
         );
         config.reporter.update({type: 'transformer_load_done'});
       })
@@ -49,15 +49,20 @@ class Bundler {
       });
   }
 
+  getWatcher(): EventEmitter {
+    return this._depGraph.getWatcher();
+  }
+
   async end(): Promise<void> {
-    const dependencyGraph = await this._depGraphPromise;
+    await this._depGraph.ready();
 
     this._transformer.end();
-    dependencyGraph.end();
+    this._depGraph.end();
   }
 
   async getDependencyGraph(): Promise<DependencyGraph> {
-    return await this._depGraphPromise;
+    await this._depGraph.ready();
+    return this._depGraph;
   }
 
   async transformFile(
@@ -66,7 +71,7 @@ class Bundler {
   ): Promise<TransformResultWithSource<>> {
     // We need to be sure that the DependencyGraph has been initialized.
     // TODO: Remove this ugly hack!
-    await this._depGraphPromise;
+    await this._depGraph.ready();
 
     return this._transformer.transformFile(filePath, transformOptions);
   }

package/src/DeltaBundler/DeltaCalculator.js

@@ -10,10 +10,11 @@
 "use strict";
 
 const {
+  createGraph,
   initialTraverseDependencies,
   reorderGraph,
   traverseDependencies,
-} = require("./traverseDependencies");
+} = require("./graphOperations");
 
 const { EventEmitter } = require("events");
 /**
@@ -27,38 +28,33 @@ class DeltaCalculator extends EventEmitter {
   _deletedFiles = new Set();
   _modifiedFiles = new Set();
 
-  constructor(entryPoints, dependencyGraph, options) {
+  constructor(entryPoints, changeEventSource, options) {
     super();
     this._options = options;
-    this._dependencyGraph = dependencyGraph;
-    this._graph = {
-      dependencies: new Map(),
+    this._changeEventSource = changeEventSource;
+    this._graph = createGraph({
       entryPoints,
-      importBundleNames: new Set(),
       transformOptions: this._options.transformOptions,
-    };
+    });
 
-    this._dependencyGraph
-      .getWatcher()
-      .on("change", this._handleMultipleFileChanges);
+    this._changeEventSource.on("change", this._handleMultipleFileChanges);
   }
   /**
    * Stops listening for file changes and clears all the caches.
    */
 
   end() {
-    this._dependencyGraph
-      .getWatcher()
-      .removeListener("change", this._handleMultipleFileChanges);
+    this._changeEventSource.removeListener(
+      "change",
+      this._handleMultipleFileChanges
+    );
 
     this.removeAllListeners(); // Clean up all the cache data structures to deallocate memory.
 
-    this._graph = {
-      dependencies: new Map(),
+    this._graph = createGraph({
       entryPoints: this._graph.entryPoints,
-      importBundleNames: new Set(),
       transformOptions: this._options.transformOptions,
-    };
+    });
     this._modifiedFiles = new Set();
     this._deletedFiles = new Set();
   }

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -10,14 +10,14 @@
 
 'use strict';
 
-import type DependencyGraph from '../node-haste/DependencyGraph';
 import type {DeltaResult, Graph, Options} from './types.flow';
 
 const {
+  createGraph,
   initialTraverseDependencies,
   reorderGraph,
   traverseDependencies,
-} = require('./traverseDependencies');
+} = require('./graphOperations');
 const {EventEmitter} = require('events');
 
 /**
@@ -27,7 +27,7 @@ const {EventEmitter} = require('events');
  * traverse the whole dependency tree for trivial small changes.
  */
 class DeltaCalculator<T> extends EventEmitter {
-  _dependencyGraph: DependencyGraph;
+  _changeEventSource: EventEmitter;
   _options: Options<T>;
 
   _currentBuildPromise: ?Promise<DeltaResult<T>>;
@@ -37,44 +37,39 @@ class DeltaCalculator<T> extends EventEmitter {
   _graph: Graph<T>;
 
   constructor(
-    entryPoints: $ReadOnlyArray<string>,
-    dependencyGraph: DependencyGraph,
+    entryPoints: $ReadOnlySet<string>,
+    changeEventSource: EventEmitter,
     options: Options<T>,
   ) {
     super();
 
     this._options = options;
-    this._dependencyGraph = dependencyGraph;
+    this._changeEventSource = changeEventSource;
 
-    this._graph = {
-      dependencies: new Map(),
+    this._graph = createGraph({
       entryPoints,
-      importBundleNames: new Set(),
       transformOptions: this._options.transformOptions,
-    };
+    });
 
-    this._dependencyGraph
-      .getWatcher()
-      .on('change', this._handleMultipleFileChanges);
+    this._changeEventSource.on('change', this._handleMultipleFileChanges);
   }
 
   /**
    * Stops listening for file changes and clears all the caches.
    */
   end(): void {
-    this._dependencyGraph
-      .getWatcher()
-      .removeListener('change', this._handleMultipleFileChanges);
+    this._changeEventSource.removeListener(
+      'change',
+      this._handleMultipleFileChanges,
+    );
 
     this.removeAllListeners();
 
     // Clean up all the cache data structures to deallocate memory.
-    this._graph = {
-      dependencies: new Map(),
+    this._graph = createGraph({
       entryPoints: this._graph.entryPoints,
-      importBundleNames: new Set(),
       transformOptions: this._options.transformOptions,
-    };
+    });
     this._modifiedFiles = new Set();
     this._deletedFiles = new Set();
   }

package/src/DeltaBundler/Serializers/getAllFiles.js.flow

@@ -15,10 +15,10 @@ import type {Graph, Module} from '../types.flow';
 const {getAssetFiles} = require('../../Assets');
 const {getJsOutput, isJsModule} = require('./helpers/js');
 
-type Options = {|
+type Options = {
   platform: ?string,
   +processModuleFilter: (module: Module<>) => boolean,
-|};
+};
 
 async function getAllFiles(
   pre: $ReadOnlyArray<Module<>>,

package/src/DeltaBundler/Serializers/getAssets.js.flow

@@ -17,13 +17,13 @@ const {getAssetData} = require('../../Assets');
 const {getJsOutput, isJsModule} = require('./helpers/js');
 const path = require('path');
 
-type Options = {|
+type Options = {
   +processModuleFilter: (module: Module<>) => boolean,
   assetPlugins: $ReadOnlyArray<string>,
   platform: ?string,
   projectRoot: string,
   publicPath: string,
-|};
+};
 
 async function getAssets(
   dependencies: Dependencies<>,

package/src/DeltaBundler/Serializers/getExplodedSourceMap.js.flow

@@ -18,18 +18,18 @@ import type {
 
 const {getJsOutput, isJsModule} = require('./helpers/js');
 
-export type ExplodedSourceMap = $ReadOnlyArray<{|
+export type ExplodedSourceMap = $ReadOnlyArray<{
   +map: Array<MetroSourceMapSegmentTuple>,
   +firstLine1Based: number,
   +functionMap: ?FBSourceFunctionMap,
   +path: string,
-|}>;
+}>;
 
 function getExplodedSourceMap(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): ExplodedSourceMap {
   const modulesToProcess = modules
     .filter(isJsModule)

package/src/DeltaBundler/Serializers/getRamBundleInfo.js.flow

@@ -25,19 +25,19 @@ const {sourceMapObject} = require('./sourceMapObject');
 const nullthrows = require('nullthrows');
 const path = require('path');
 
-type Options = {|
+type Options = {
   ...SerializerOptions,
   +excludeSource: boolean,
   +getTransformOptions: ?GetTransformOptions,
   +platform: ?string,
-|};
+};
 
-export type RamBundleInfo = {|
+export type RamBundleInfo = {
   getDependencies: string => Set<string>,
   startupModules: $ReadOnlyArray<ModuleTransportLike>,
   lazyModules: $ReadOnlyArray<ModuleTransportLike>,
   groups: Map<number, Set<number>>,
-|};
+};
 
 async function getRamBundleInfo(
   entryPoint: string,
@@ -144,10 +144,10 @@ async function _getRamOptions(
   },
   getDependencies: string => Iterable<string>,
   getTransformOptions: ?GetTransformOptions,
-): Promise<{|
+): Promise<{
   +preloadedModules: {[string]: true, ...},
   +ramGroups: Array<string>,
-|}> {
+}> {
   if (getTransformOptions == null) {
     return {
       preloadedModules: {},

package/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js.flow

@@ -20,17 +20,17 @@ const {getJsOutput} = require('./js');
 
 function getSourceMapInfo(
   module: Module<>,
-  options: {|
+  options: {
     +excludeSource: boolean,
-  |},
-): {|
+  },
+): {
   +map: Array<MetroSourceMapSegmentTuple>,
   +functionMap: ?FBSourceFunctionMap,
   +code: string,
   +path: string,
   +source: string,
   +lineCount: number,
-|} {
+} {
   return {
     ...getJsOutput(module).data,
     path: module.path,

package/src/DeltaBundler/Serializers/helpers/processBytecodeModules.js.flow

@@ -21,12 +21,12 @@ function processBytecodeModules(
     createModuleId,
     dev,
     projectRoot,
-  }: {|
+  }: {
     +filter?: (module: Module<>) => boolean,
     +createModuleId: string => number,
     +dev: boolean,
     +projectRoot: string,
-  |},
+  },
 ): $ReadOnlyArray<[Module<>, Array<Buffer>]> {
   return [...modules]
     .filter(isBytecodeModule)

package/src/DeltaBundler/Serializers/helpers/processModules.js.flow

@@ -21,12 +21,12 @@ function processModules(
     createModuleId,
     dev,
     projectRoot,
-  }: {|
+  }: {
     +filter?: (module: Module<>) => boolean,
     +createModuleId: string => number,
     +dev: boolean,
     +projectRoot: string,
-  |},
+  },
 ): $ReadOnlyArray<[Module<>, string]> {
   return [...modules]
     .filter(isJsModule)

package/src/DeltaBundler/Serializers/hmrJSBundle.js.flow

@@ -124,11 +124,11 @@ function hmrJSBundle(
   delta: DeltaResult<>,
   graph: Graph<>,
   options: Options,
-): {|
+): {
   +added: $ReadOnlyArray<HmrModule>,
   +deleted: $ReadOnlyArray<number>,
   +modified: $ReadOnlyArray<HmrModule>,
-|} {
+} {
   return {
     added: generateModules(delta.added.values(), graph, options),
     modified: generateModules(delta.modified.values(), graph, options),

package/src/DeltaBundler/Serializers/sourceMapGenerator.js.flow

@@ -25,10 +25,10 @@ function getSourceMapInfosImpl(
   isBlocking: boolean,
   onDone: ($ReadOnlyArray<ReturnType<typeof getSourceMapInfo>>) => void,
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): void {
   const sourceMapInfos = [];
   const modulesToProcess = modules
@@ -76,10 +76,10 @@ function getSourceMapInfosImpl(
 
 function sourceMapGenerator(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): ReturnType<typeof fromRawMappings> {
   let sourceMapInfos;
   getSourceMapInfosImpl(
@@ -100,10 +100,10 @@ function sourceMapGenerator(
 
 async function sourceMapGeneratorNonBlocking(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): ReturnType<typeof fromRawMappingsNonBlocking> {
   const sourceMapInfos = await new Promise(resolve => {
     getSourceMapInfosImpl(false, resolve, modules, options);

package/src/DeltaBundler/Serializers/sourceMapObject.js.flow

@@ -20,10 +20,10 @@ const {
 
 function sourceMapObject(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): MixedSourceMap {
   const generator = sourceMapGenerator(modules, options);
   return generator.toMap(undefined, {
@@ -33,10 +33,10 @@ function sourceMapObject(
 
 async function sourceMapObjectNonBlocking(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): Promise<MixedSourceMap> {
   const generator = await sourceMapGeneratorNonBlocking(modules, options);
   return generator.toMap(undefined, {

package/src/DeltaBundler/Serializers/sourceMapString.js.flow

@@ -16,10 +16,10 @@ const {sourceMapGenerator} = require('./sourceMapGenerator');
 
 function sourceMapString(
   modules: $ReadOnlyArray<Module<>>,
-  options: {|
+  options: {
     +excludeSource: boolean,
     +processModuleFilter: (module: Module<>) => boolean,
-  |},
+  },
 ): string {
   return sourceMapGenerator(modules, options).toString(undefined, {
     excludeSource: options.excludeSource,

package/src/DeltaBundler/Worker.js.flow

@@ -24,9 +24,9 @@ const path = require('path');
 
 export type {JsTransformOptions as TransformOptions} from 'metro-transform-worker';
 
-export type Worker = {|
+export type Worker = {
   +transform: typeof transform,
-|};
+};
 
 type TransformerInterface = {
   transform(
@@ -44,12 +44,12 @@ export type TransformerConfig = {
   ...
 };
 
-type Data = $ReadOnly<{|
+type Data = $ReadOnly<{
   result: TransformResult<>,
   sha1: string,
   transformFileStartLogEntry: LogEntry,
   transformFileEndLogEntry: LogEntry,
-|}>;
+}>;
 
 async function transform(
   filename: string,