metro 0.83.3 → 0.84.0

package/src/node-haste/DependencyGraph.js

@@ -34,6 +34,7 @@ function getOrCreateMap(map, field) {
 }
 class DependencyGraph extends _events.default {
   #packageCache;
+  #dependencyPlugin;
   constructor(config, options) {
     super();
     this._config = config;
@@ -45,32 +46,34 @@ class DependencyGraph extends _events.default {
       type: "dep_graph_loading",
       hasReducedPerformance: !!hasReducedPerformance,
     });
-    const fileMap = (0, _createFileMap.default)(config, {
-      throwOnModuleCollision: false,
-      watch,
-    });
+    const { fileMap, hasteMap, dependencyPlugin } = (0, _createFileMap.default)(
+      config,
+      {
+        throwOnModuleCollision: false,
+        watch,
+      },
+    );
     fileMap.setMaxListeners(1000);
     this._haste = fileMap;
     this._haste.on("status", (status) => this._onWatcherStatus(status));
-    this._initializedPromise = fileMap
-      .build()
-      .then(({ fileSystem, hasteMap }) => {
-        log(createActionEndEntry(initializingMetroLogEntry));
-        config.reporter.update({
-          type: "dep_graph_loaded",
-        });
-        this._fileSystem = fileSystem;
-        this._hasteMap = hasteMap;
-        this._haste.on("change", (changeEvent) =>
-          this._onHasteChange(changeEvent),
-        );
-        this._haste.on("healthCheck", (result) =>
-          this._onWatcherHealthCheck(result),
-        );
-        this._resolutionCache = new Map();
-        this.#packageCache = this._createPackageCache();
-        this._createModuleResolver();
+    this._initializedPromise = fileMap.build().then(({ fileSystem }) => {
+      log(createActionEndEntry(initializingMetroLogEntry));
+      config.reporter.update({
+        type: "dep_graph_loaded",
       });
+      this._fileSystem = fileSystem;
+      this._hasteMap = hasteMap;
+      this.#dependencyPlugin = dependencyPlugin;
+      this._haste.on("change", (changeEvent) =>
+        this._onHasteChange(changeEvent),
+      );
+      this._haste.on("healthCheck", (result) =>
+        this._onWatcherHealthCheck(result),
+      );
+      this._resolutionCache = new Map();
+      this.#packageCache = this._createPackageCache();
+      this._createModuleResolver();
+    });
   }
   _onWatcherHealthCheck(result) {
     this._config.reporter.update({
@@ -87,11 +90,6 @@ class DependencyGraph extends _events.default {
   async ready() {
     await this._initializedPromise;
   }
-  static async load(config, options) {
-    const self = new DependencyGraph(config, options);
-    await self.ready();
-    return self;
-  }
   _onHasteChange({ eventsQueue }) {
     this._resolutionCache = new Map();
     eventsQueue.forEach(({ filePath }) =>
@@ -124,7 +122,7 @@ class DependencyGraph extends _events.default {
       },
       disableHierarchicalLookup:
         this._config.resolver.disableHierarchicalLookup,
-      doesFileExist: this._doesFileExist,
+      doesFileExist: this.doesFileExist,
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
       fileSystemLookup,
@@ -157,6 +155,8 @@ class DependencyGraph extends _events.default {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        this._config.resolver.unstable_incrementalResolution,
     });
   }
   _getClosestPackage(absoluteModulePath) {
@@ -276,18 +276,27 @@ class DependencyGraph extends _events.default {
     mapByPlatform.set(platformKey, resolution);
     return resolution;
   }
-  _doesFileExist = (filePath) => {
+  doesFileExist = (filePath) => {
     return this._fileSystem.exists(filePath);
   };
   getHasteName(filePath) {
-    const hasteName = this._fileSystem.getModuleName(filePath);
+    const hasteName = this._hasteMap.getModuleNameByPath(filePath);
     if (hasteName) {
       return hasteName;
     }
     return _path.default.relative(this._config.projectRoot, filePath);
   }
   getDependencies(filePath) {
-    return (0, _nullthrows.default)(this._fileSystem.getDependencies(filePath));
+    if (!this.#dependencyPlugin) {
+      throw new Error(
+        "getDependencies called but extractDependencies is false",
+      );
+    }
+    return Array.from(
+      (0, _nullthrows.default)(
+        this.#dependencyPlugin.getDependencies(filePath),
+      ),
+    );
   }
 }
 exports.default = DependencyGraph;

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

@@ -16,12 +16,14 @@ import type {
 import type {ResolverInputOptions} from '../shared/types';
 import type Package from './Package';
 import type {ConfigT} from 'metro-config';
-import type MetroFileMap, {
+import type {
   ChangeEvent,
+  DependencyPlugin,
   FileSystem,
   HasteMap,
   HealthCheckResult,
   WatcherStatus,
+  default as MetroFileMap,
 } from 'metro-file-map';
 import type {FileSystemLookup} from 'metro-resolver';
 
@@ -63,6 +65,7 @@ export default class DependencyGraph extends EventEmitter {
   _fileSystem: FileSystem;
   #packageCache: PackageCache;
   _hasteMap: HasteMap;
+  #dependencyPlugin: ?DependencyPlugin;
   _moduleResolver: ModuleResolver<Package>;
   _resolutionCache: Map<
     // Custom resolver options
@@ -103,7 +106,7 @@ export default class DependencyGraph extends EventEmitter {
       type: 'dep_graph_loading',
       hasReducedPerformance: !!hasReducedPerformance,
     });
-    const fileMap = createFileMap(config, {
+    const {fileMap, hasteMap, dependencyPlugin} = createFileMap(config, {
       throwOnModuleCollision: false,
       watch,
     });
@@ -115,25 +118,22 @@ export default class DependencyGraph extends EventEmitter {
     this._haste = fileMap;
     this._haste.on('status', status => this._onWatcherStatus(status));
 
-    this._initializedPromise = fileMap
-      .build()
-      .then(({fileSystem, hasteMap}) => {
-        log(createActionEndEntry(initializingMetroLogEntry));
-        config.reporter.update({type: 'dep_graph_loaded'});
-
-        this._fileSystem = fileSystem;
-        this._hasteMap = hasteMap;
-
-        this._haste.on('change', changeEvent =>
-          this._onHasteChange(changeEvent),
-        );
-        this._haste.on('healthCheck', result =>
-          this._onWatcherHealthCheck(result),
-        );
-        this._resolutionCache = new Map();
-        this.#packageCache = this._createPackageCache();
-        this._createModuleResolver();
-      });
+    this._initializedPromise = fileMap.build().then(({fileSystem}) => {
+      log(createActionEndEntry(initializingMetroLogEntry));
+      config.reporter.update({type: 'dep_graph_loaded'});
+
+      this._fileSystem = fileSystem;
+      this._hasteMap = hasteMap;
+      this.#dependencyPlugin = dependencyPlugin;
+
+      this._haste.on('change', changeEvent => this._onHasteChange(changeEvent));
+      this._haste.on('healthCheck', result =>
+        this._onWatcherHealthCheck(result),
+      );
+      this._resolutionCache = new Map();
+      this.#packageCache = this._createPackageCache();
+      this._createModuleResolver();
+    });
   }
 
   _onWatcherHealthCheck(result: HealthCheckResult) {
@@ -150,17 +150,6 @@ export default class DependencyGraph extends EventEmitter {
     await this._initializedPromise;
   }
 
-  // Creates the dependency graph and waits for it to become ready.
-  // @deprecated Use the constructor + ready() directly.
-  static async load(
-    config: ConfigT,
-    options?: {+hasReducedPerformance?: boolean, +watch?: boolean},
-  ): Promise<DependencyGraph> {
-    const self = new DependencyGraph(config, options);
-    await self.ready();
-    return self;
-  }
-
   _onHasteChange({eventsQueue}: ChangeEvent) {
     this._resolutionCache = new Map();
     eventsQueue.forEach(({filePath}) =>
@@ -193,7 +182,7 @@ export default class DependencyGraph extends EventEmitter {
       },
       disableHierarchicalLookup:
         this._config.resolver.disableHierarchicalLookup,
-      doesFileExist: this._doesFileExist,
+      doesFileExist: this.doesFileExist,
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
       fileSystemLookup,
@@ -227,6 +216,8 @@ export default class DependencyGraph extends EventEmitter {
         this._config.resolver.unstable_conditionsByPlatform,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        this._config.resolver.unstable_incrementalResolution,
     });
   }
 
@@ -290,7 +281,7 @@ export default class DependencyGraph extends EventEmitter {
   /** Given a search context, return a list of file paths matching the query. */
   matchFilesWithContext(
     from: string,
-    context: $ReadOnly<{
+    context: Readonly<{
       /* Should search for files recursively. */
       recursive: boolean,
       /* Filter relative paths against a pattern. */
@@ -376,12 +367,12 @@ export default class DependencyGraph extends EventEmitter {
     return resolution;
   }
 
-  _doesFileExist = (filePath: string): boolean => {
+  doesFileExist = (filePath: string): boolean => {
     return this._fileSystem.exists(filePath);
   };
 
   getHasteName(filePath: string): string {
-    const hasteName = this._fileSystem.getModuleName(filePath);
+    const hasteName = this._hasteMap.getModuleNameByPath(filePath);
 
     if (hasteName) {
       return hasteName;
@@ -391,6 +382,13 @@ export default class DependencyGraph extends EventEmitter {
   }
 
   getDependencies(filePath: string): Array<string> {
-    return nullthrows(this._fileSystem.getDependencies(filePath));
+    if (!this.#dependencyPlugin) {
+      throw new Error(
+        'getDependencies called but extractDependencies is false',
+      );
+    }
+    return Array.from(
+      nullthrows(this.#dependencyPlugin.getDependencies(filePath)),
+    );
   }
 }

package/src/node-haste/lib/AssetPaths.js

@@ -23,14 +23,14 @@ function parseBaseName(baseName) {
     const resolution = parseFloat(match[3]);
     if (!Number.isNaN(resolution)) {
       return {
-        rootName,
         resolution,
+        rootName,
       };
     }
   }
   return {
-    rootName,
     resolution: 1,
+    rootName,
   };
 }
 function tryParse(filePath, platforms) {

package/src/node-haste/lib/AssetPaths.js.flow

@@ -35,10 +35,10 @@ function parseBaseName(baseName: string): {
   if (match[3] != null) {
     const resolution = parseFloat(match[3]);
     if (!Number.isNaN(resolution)) {
-      return {rootName, resolution};
+      return {resolution, rootName};
     }
   }
-  return {rootName, resolution: 1};
+  return {resolution: 1, rootName};
 }
 
 /**
@@ -47,7 +47,7 @@ function parseBaseName(baseName: string): {
  */
 export function tryParse(
   filePath: string,
-  platforms: $ReadOnlySet<string>,
+  platforms: ReadonlySet<string>,
 ): ?AssetPath {
   const result = parsePlatformFilePath(filePath, platforms);
   const {dirPath, baseName, platform, extension} = result;
@@ -66,7 +66,7 @@ export function tryParse(
 
 export function parse(
   filePath: string,
-  platforms: $ReadOnlySet<string>,
+  platforms: ReadonlySet<string>,
 ): AssetPath {
   const result = tryParse(filePath, platforms);
   if (result == null) {

package/src/node-haste/lib/parsePlatformFilePath.js

@@ -15,27 +15,27 @@ function parsePlatformFilePath(filePath, platforms) {
   const match = fileName.match(PATH_RE);
   if (!match) {
     return {
-      dirPath,
       baseName: fileName,
-      platform: null,
+      dirPath,
       extension: null,
+      platform: null,
     };
   }
   const extension = match[4] || null;
   const platform = match[3] || null;
   if (platform == null || platforms.has(platform)) {
     return {
-      dirPath,
       baseName: match[1],
-      platform,
+      dirPath,
       extension,
+      platform,
     };
   }
   const baseName = `${match[1]}.${platform}`;
   return {
-    dirPath,
     baseName,
-    platform: null,
+    dirPath,
     extension,
+    platform: null,
   };
 }

package/src/node-haste/lib/parsePlatformFilePath.js.flow

@@ -26,19 +26,19 @@ const PATH_RE = /^(.+?)(\.([^.]+))?\.([^.]+)$/;
  */
 export default function parsePlatformFilePath(
   filePath: string,
-  platforms: $ReadOnlySet<string>,
+  platforms: ReadonlySet<string>,
 ): PlatformFilePathParts {
   const dirPath = path.dirname(filePath);
   const fileName = path.basename(filePath);
   const match = fileName.match(PATH_RE);
   if (!match) {
-    return {dirPath, baseName: fileName, platform: null, extension: null};
+    return {baseName: fileName, dirPath, extension: null, platform: null};
   }
   const extension = match[4] || null;
   const platform = match[3] || null;
   if (platform == null || platforms.has(platform)) {
-    return {dirPath, baseName: match[1], platform, extension};
+    return {baseName: match[1], dirPath, extension, platform};
   }
   const baseName = `${match[1]}.${platform}`;
-  return {dirPath, baseName, platform: null, extension};
+  return {baseName, dirPath, extension, platform: null};
 }

package/src/shared/output/RamBundle/as-assets.js.flow

@@ -37,7 +37,7 @@ export default function saveAsAssets(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (...args: Array<string>) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -100,24 +100,24 @@ function writeModuleFile(
   module: ModuleTransportLike,
   modulesDir: string,
   encoding: void | 'ascii' | 'utf16le' | 'utf8',
-): Promise<mixed> {
+): Promise<unknown> {
   const {code, id} = module;
   return writeFile(path.join(modulesDir, id + '.js'), code, encoding);
 }
 
 function writeModules(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   modulesDir: string,
   encoding: void | 'ascii' | 'utf16le' | 'utf8',
-): Promise<Array<mixed>> {
+): Promise<Array<unknown>> {
   const writeFiles = modules.map(
-    (module: ModuleTransportLike): Promise<mixed> =>
+    (module: ModuleTransportLike): Promise<unknown> =>
       writeModuleFile(module, modulesDir, encoding),
   );
   return Promise.all(writeFiles);
 }
 
-function writeMagicFlagFile(outputDir: string): Promise<mixed> {
+function writeMagicFlagFile(outputDir: string): Promise<unknown> {
   const buffer = Buffer.alloc(4);
   buffer.writeUInt32LE(MAGIC_RAM_BUNDLE_NUMBER, 0);
   return writeFile(path.join(outputDir, MAGIC_RAM_BUNDLE_FILENAME), buffer);

package/src/shared/output/RamBundle/as-indexed-file.js.flow

@@ -37,7 +37,7 @@ export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (...args: Array<string>) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -96,7 +96,7 @@ function writeBuffers(
   buffers: Array<Buffer>,
 ): Promise<void> {
   buffers.forEach((buffer: Buffer) => stream.write(buffer));
-  return new Promise((resolve: () => void, reject: mixed => mixed) => {
+  return new Promise((resolve: () => void, reject: unknown => unknown) => {
     stream.on('error', reject);
     stream.on('finish', () => resolve());
     stream.end();
@@ -196,7 +196,7 @@ function groupCode(
 }
 
 function buildModuleBuffers(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ModuleGroups,
   encoding: void | 'ascii' | 'utf16le' | 'utf8',
 ): Array<{
@@ -217,7 +217,7 @@ function buildModuleBuffers(
 
 export function buildTableAndContents(
   startupCode: string,
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ModuleGroups,
   encoding?: 'utf8' | 'utf16le' | 'ascii',
 ): Array<Buffer> {
@@ -242,7 +242,7 @@ export function buildTableAndContents(
 
 export function createModuleGroups(
   groups: Map<number, Set<number>>,
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
 ): ModuleGroups {
   return {
     groups,

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.js.flow

@@ -20,17 +20,17 @@ import {
 
 type Params = {
   fixWrapperOffset: boolean,
-  lazyModules: $ReadOnlyArray<ModuleTransportLike>,
+  lazyModules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups: ?ModuleGroups,
-  startupModules: $ReadOnlyArray<ModuleTransportLike>,
+  startupModules: ReadonlyArray<ModuleTransportLike>,
 };
 
-export default (({
+export default ({
   fixWrapperOffset,
   lazyModules,
   moduleGroups,
   startupModules,
-}: Params) => {
+}: Params): IndexMap => {
   const options = fixWrapperOffset ? {fixWrapperOffset: true} : undefined;
   const startupModule: ModuleTransportLike = {
     code: joinModules(startupModules),
@@ -59,4 +59,4 @@ export default (({
   }
 
   return map;
-}: Params => IndexMap);
+};

package/src/shared/output/RamBundle/util.js.flow

@@ -50,7 +50,7 @@ const Section = (line: number, column: number, map: MixedSourceMap) => ({
 type CombineOptions = {fixWrapperOffset: boolean, ...};
 
 function combineSourceMaps(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   moduleGroups?: ModuleGroups,
   options?: ?CombineOptions,
 ): IndexMap {
@@ -59,7 +59,7 @@ function combineSourceMaps(
 }
 
 function combineSourceMapsAddingOffsets(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   x_metro_module_paths: Array<string>,
   moduleGroups?: ?ModuleGroups,
   options?: ?CombineOptions,
@@ -75,7 +75,7 @@ function combineSourceMapsAddingOffsets(
 }
 
 function combineMaps(
-  modules: $ReadOnlyArray<ModuleTransportLike>,
+  modules: ReadonlyArray<ModuleTransportLike>,
   offsets: ?Array<number>,
   moduleGroups: ?ModuleGroups,
   options: ?CombineOptions,
@@ -99,7 +99,7 @@ function combineMaps(
       group = moduleGroups && moduleGroups.groups.get(id);
       if (group && moduleGroups) {
         const {modulesById} = moduleGroups;
-        const otherModules: $ReadOnlyArray<ModuleTransportLike> = Array.from(
+        const otherModules: ReadonlyArray<ModuleTransportLike> = Array.from(
           group || [],
         )
           .map((moduleId: number) => modulesById.get(moduleId))
@@ -135,7 +135,7 @@ function combineMaps(
   return sections;
 }
 
-const joinModules = (modules: $ReadOnlyArray<{+code: string, ...}>): string =>
+const joinModules = (modules: ReadonlyArray<{+code: string, ...}>): string =>
   modules.map((m: {+code: string, ...}) => m.code).join('\n');
 
 export {

package/src/shared/output/RamBundle/write-sourcemap.js.flow

@@ -15,7 +15,7 @@ export default function writeSourcemap(
   fileName: string,
   contents: string,
   log: (...args: Array<string>) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   if (!fileName) {
     return Promise.resolve();
   }

package/src/shared/output/RamBundle.js.flow

@@ -33,7 +33,7 @@ export function save(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (x: string) => void,
-): Promise<mixed> {
+): Promise<unknown> {
   // We fork here depending on the platform: while Android is pretty good at
   // loading individual assets, iOS has a large overhead when reading hundreds
   // of assets from disk.

package/src/shared/output/bundle.flow.js.flow

@@ -26,7 +26,7 @@ export function build(
 ): Promise<{
   code: string,
   map: string,
-  assets?: $ReadOnlyArray<AssetData>,
+  assets?: ReadonlyArray<AssetData>,
   ...
 }> {
   return packagerClient.build(
@@ -69,7 +69,7 @@ export async function save(
   },
   options: OutputOptions,
   log: string => void,
-): Promise<mixed> {
+): Promise<unknown> {
   const {
     bundleOutput,
     bundleEncoding: encoding,
@@ -101,7 +101,7 @@ export async function save(
   }
 
   // Wait until everything is written to disk.
-  await Promise.all(writeFns.map((cb: void => mixed) => cb()));
+  await Promise.all(writeFns.map((cb: void => unknown) => cb()));
 }
 
 export const formatName = 'bundle';

package/src/shared/output/meta.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.default = _default;
+exports.default = meta;
 var _crypto = _interopRequireDefault(require("crypto"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
@@ -17,7 +17,7 @@ const constantFor = (encoding) =>
       : /^(?:utf-?16(?:le)?|ucs-?2)$/.test(encoding)
         ? 3
         : 0;
-function _default(code, encoding = "utf8") {
+function meta(code, encoding = "utf8") {
   const buffer = asBuffer(code, encoding);
   const hash = _crypto.default.createHash("sha1");
   hash.update(buffer);

package/src/shared/output/meta.js.flow

@@ -23,7 +23,7 @@ const constantFor = (encoding: 'ascii' | 'utf16le' | 'utf8') =>
         ? 3
         : 0;
 
-export default function (
+export default function meta(
   code: Buffer | string,
   encoding: 'ascii' | 'utf16le' | 'utf8' = 'utf8',
 ): Buffer {

package/src/shared/output/writeFile.js

@@ -3,11 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true,
 });
-exports.default = void 0;
+exports.default = writeFile;
 var _fs = _interopRequireDefault(require("fs"));
 var _throat = _interopRequireDefault(require("throat"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-const writeFile = (0, _throat.default)(128, _fs.default.promises.writeFile);
-var _default = (exports.default = writeFile);
+const writeFileWithThroat = (0, _throat.default)(
+  128,
+  _fs.default.promises.writeFile,
+);
+function writeFile(filePath, data, encoding) {
+  return writeFileWithThroat(filePath, data, encoding);
+}

package/src/shared/output/writeFile.js.flow

@@ -12,9 +12,15 @@
 import fs from 'fs';
 import throat from 'throat';
 
-const writeFile: typeof fs.promises.writeFile = throat(
+const writeFileWithThroat: typeof fs.promises.writeFile = throat(
   128,
   fs.promises.writeFile,
 );
 
-export default writeFile;
+export default function writeFile(
+  filePath: string,
+  data: string | Buffer | Uint8Array,
+  encoding?: string,
+): Promise<void> {
+  return writeFileWithThroat(filePath, data, encoding);
+}