metro 0.83.0 → 0.83.2

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

@@ -12,8 +12,8 @@
 import type {
   BundlerResolution,
   TransformResultDependency,
-} from '../DeltaBundler/types.flow';
-import type {ResolverInputOptions} from '../shared/types.flow';
+} from '../DeltaBundler/types';
+import type {ResolverInputOptions} from '../shared/types';
 import type Package from './Package';
 import type {ConfigT} from 'metro-config';
 import type MetroFileMap, {
@@ -25,22 +25,23 @@ import type MetroFileMap, {
 } from 'metro-file-map';
 import type {FileSystemLookup} from 'metro-resolver';
 
-import {DuplicateHasteCandidatesError} from 'metro-file-map';
-
-const createFileMap = require('./DependencyGraph/createFileMap');
-const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
-const ModuleCache = require('./ModuleCache');
-const {EventEmitter} = require('events');
-const fs = require('fs');
-const {
+import createFileMap from './DependencyGraph/createFileMap';
+import {ModuleResolver} from './DependencyGraph/ModuleResolution';
+import {PackageCache} from './PackageCache';
+import EventEmitter from 'events';
+import fs from 'fs';
+import {
   AmbiguousModuleResolutionError,
-  Logger: {createActionStartEntry, createActionEndEntry, log},
+  Logger,
   PackageResolutionError,
-} = require('metro-core');
-const canonicalize = require('metro-core/private/canonicalize');
-const {InvalidPackageError} = require('metro-resolver');
-const nullthrows = require('nullthrows');
-const path = require('path');
+} from 'metro-core';
+import canonicalize from 'metro-core/private/canonicalize';
+import {DuplicateHasteCandidatesError} from 'metro-file-map';
+import {InvalidPackageError} from 'metro-resolver';
+import nullthrows from 'nullthrows';
+import path from 'path';
+
+const {createActionStartEntry, createActionEndEntry, log} = Logger;
 
 const NULL_PLATFORM = Symbol();
 
@@ -56,11 +57,11 @@ function getOrCreateMap<T>(
   return subMap;
 }
 
-class DependencyGraph extends EventEmitter {
+export default class DependencyGraph extends EventEmitter {
   _config: ConfigT;
   _haste: MetroFileMap;
   _fileSystem: FileSystem;
-  _moduleCache: ModuleCache;
+  #packageCache: PackageCache;
   _hasteMap: HasteMap;
   _moduleResolver: ModuleResolver<Package>;
   _resolutionCache: Map<
@@ -130,7 +131,7 @@ class DependencyGraph extends EventEmitter {
           this._onWatcherHealthCheck(result),
         );
         this._resolutionCache = new Map();
-        this._moduleCache = this._createModuleCache();
+        this.#packageCache = this._createPackageCache();
         this._createModuleResolver();
       });
   }
@@ -162,7 +163,9 @@ class DependencyGraph extends EventEmitter {
 
   _onHasteChange({eventsQueue}: ChangeEvent) {
     this._resolutionCache = new Map();
-    eventsQueue.forEach(({filePath}) => this._moduleCache.invalidate(filePath));
+    eventsQueue.forEach(({filePath}) =>
+      this.#packageCache.invalidate(filePath),
+    );
     this._createModuleResolver();
     this.emit('change');
   }
@@ -199,8 +202,8 @@ class DependencyGraph extends EventEmitter {
       getHastePackagePath: (name, platform) =>
         this._hasteMap.getPackage(name, platform, true),
       mainFields: this._config.resolver.resolverMainFields,
-      moduleCache: this._moduleCache,
       nodeModulesPaths: this._config.resolver.nodeModulesPaths,
+      packageCache: this.#packageCache,
       preferNativePlatform: true,
       projectRoot: this._config.projectRoot,
       reporter: this._config.reporter,
@@ -247,8 +250,8 @@ class DependencyGraph extends EventEmitter {
       : null;
   }
 
-  _createModuleCache(): ModuleCache {
-    return new ModuleCache({
+  _createPackageCache(): PackageCache {
+    return new PackageCache({
       getClosestPackage: absolutePath => this._getClosestPackage(absolutePath),
     });
   }
@@ -304,7 +307,7 @@ class DependencyGraph extends EventEmitter {
   }
 
   resolveDependency(
-    from: string,
+    originModulePath: string,
     dependency: TransformResultDependency,
     platform: string | null,
     resolverOptions: ResolverInputOptions,
@@ -323,12 +326,14 @@ class DependencyGraph extends EventEmitter {
       to === '.' ||
       to === '..' ||
       // Preserve standard assumptions under node_modules
-      from.includes(path.sep + 'node_modules' + path.sep);
+      originModulePath.includes(path.sep + 'node_modules' + path.sep);
 
     // Compound key for the resolver cache
     const resolverOptionsKey =
       JSON.stringify(resolverOptions ?? {}, canonicalize) ?? '';
-    const originKey = isSensitiveToOriginFolder ? path.dirname(from) : '';
+    const originKey = isSensitiveToOriginFolder
+      ? path.dirname(originModulePath)
+      : '';
     const targetKey =
       to + (dependency.data.isESMImport === true ? '\0esm' : '\0cjs');
     const platformKey = platform ?? NULL_PLATFORM;
@@ -346,7 +351,7 @@ class DependencyGraph extends EventEmitter {
     if (!resolution) {
       try {
         resolution = this._moduleResolver.resolveDependency(
-          this._moduleCache.getModule(from),
+          originModulePath,
           dependency,
           true,
           platform,
@@ -354,12 +359,12 @@ class DependencyGraph extends EventEmitter {
         );
       } catch (error) {
         if (error instanceof DuplicateHasteCandidatesError) {
-          throw new AmbiguousModuleResolutionError(from, error);
+          throw new AmbiguousModuleResolutionError(originModulePath, error);
         }
         if (error instanceof InvalidPackageError) {
           throw new PackageResolutionError({
             packageError: error,
-            originModulePath: from,
+            originModulePath,
             targetModuleName: to,
           });
         }
@@ -389,5 +394,3 @@ class DependencyGraph extends EventEmitter {
     return nullthrows(this._fileSystem.getDependencies(filePath));
   }
 }
-
-module.exports = DependencyGraph;

package/src/node-haste/Package.js

@@ -1,11 +1,18 @@
 "use strict";
 
-const fs = require("fs");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 class Package {
   constructor({ file }) {
-    this.path = path.resolve(file);
-    this._root = path.dirname(this.path);
+    this.path = _path.default.resolve(file);
+    this._root = _path.default.dirname(this.path);
     this._content = null;
   }
   invalidate() {
@@ -13,9 +20,9 @@ class Package {
   }
   read() {
     if (this._content == null) {
-      this._content = JSON.parse(fs.readFileSync(this.path, "utf8"));
+      this._content = JSON.parse(_fs.default.readFileSync(this.path, "utf8"));
     }
     return this._content;
   }
 }
-module.exports = Package;
+exports.default = Package;

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

@@ -9,14 +9,12 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {PackageJson} from 'metro-resolver/private/types';
 
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
 
-class Package {
+export default class Package {
   path: string;
 
   _root: string;
@@ -39,5 +37,3 @@ class Package {
     return this._content;
   }
 }
-
-module.exports = Package;

package/src/node-haste/{ModuleCache.js → PackageCache.js}

@@ -1,32 +1,28 @@
 "use strict";
 
-const Module = require("./Module");
-const Package = require("./Package");
-class ModuleCache {
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.PackageCache = void 0;
+var _Package = _interopRequireDefault(require("./Package"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
+class PackageCache {
   constructor(options) {
     this._getClosestPackage = options.getClosestPackage;
-    this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
     this._packagePathAndSubpathByModulePath = Object.create(null);
     this._modulePathsByPackagePath = Object.create(null);
   }
-  getModule(filePath) {
-    if (!this._moduleCache[filePath]) {
-      this._moduleCache[filePath] = new Module(filePath, this);
-    }
-    return this._moduleCache[filePath];
-  }
   getPackage(filePath) {
     if (!this._packageCache[filePath]) {
-      this._packageCache[filePath] = new Package({
+      this._packageCache[filePath] = new _Package.default({
         file: filePath,
       });
     }
     return this._packageCache[filePath];
   }
-  getPackageForModule(module) {
-    return this.getPackageOf(module.path);
-  }
   getPackageOf(absoluteModulePath) {
     let packagePathAndSubpath =
       this._packagePathAndSubpathByModulePath[absoluteModulePath];
@@ -56,10 +52,6 @@ class ModuleCache {
     };
   }
   invalidate(filePath) {
-    if (this._moduleCache[filePath]) {
-      this._moduleCache[filePath].invalidate();
-      delete this._moduleCache[filePath];
-    }
     if (this._packageCache[filePath]) {
       this._packageCache[filePath].invalidate();
       delete this._packageCache[filePath];
@@ -87,4 +79,4 @@ class ModuleCache {
     }
   }
 }
-module.exports = ModuleCache;
+exports.PackageCache = PackageCache;

package/src/node-haste/{ModuleCache.js.flow → PackageCache.js.flow}

@@ -9,23 +9,15 @@
  * @oncall react_native
  */
 
-'use strict';
-
-const Module = require('./Module');
-const Package = require('./Package');
+import Package from './Package';
 
 type GetClosestPackageFn = (absoluteFilePath: string) => ?{
   packageJsonPath: string,
   packageRelativePath: string,
 };
 
-class ModuleCache {
+export class PackageCache {
   _getClosestPackage: GetClosestPackageFn;
-  _moduleCache: {
-    [filePath: string]: Module,
-    __proto__: null,
-    ...
-  };
   _packageCache: {
     [filePath: string]: Package,
     __proto__: null,
@@ -49,19 +41,11 @@ class ModuleCache {
 
   constructor(options: {getClosestPackage: GetClosestPackageFn, ...}) {
     this._getClosestPackage = options.getClosestPackage;
-    this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
     this._packagePathAndSubpathByModulePath = Object.create(null);
     this._modulePathsByPackagePath = Object.create(null);
   }
 
-  getModule(filePath: string): Module {
-    if (!this._moduleCache[filePath]) {
-      this._moduleCache[filePath] = new Module(filePath, this);
-    }
-    return this._moduleCache[filePath];
-  }
-
   getPackage(filePath: string): Package {
     if (!this._packageCache[filePath]) {
       this._packageCache[filePath] = new Package({
@@ -71,12 +55,6 @@ class ModuleCache {
     return this._packageCache[filePath];
   }
 
-  getPackageForModule(
-    module: Module,
-  ): ?{pkg: Package, packageRelativePath: string} {
-    return this.getPackageOf(module.path);
-  }
-
   getPackageOf(
     absoluteModulePath: string,
   ): ?{pkg: Package, packageRelativePath: string} {
@@ -113,10 +91,6 @@ class ModuleCache {
   }
 
   invalidate(filePath: string) {
-    if (this._moduleCache[filePath]) {
-      this._moduleCache[filePath].invalidate();
-      delete this._moduleCache[filePath];
-    }
     if (this._packageCache[filePath]) {
       this._packageCache[filePath].invalidate();
       delete this._packageCache[filePath];
@@ -149,5 +123,3 @@ class ModuleCache {
     }
   }
 }
-
-module.exports = ModuleCache;

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

@@ -1,7 +1,17 @@
 "use strict";
 
-const parsePlatformFilePath = require("./parsePlatformFilePath");
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.parse = parse;
+exports.tryParse = tryParse;
+var _parsePlatformFilePath = _interopRequireDefault(
+  require("./parsePlatformFilePath"),
+);
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const ASSET_BASE_NAME_RE = /(.+?)(@([\d.]+)x)?$/;
 function parseBaseName(baseName) {
   const match = baseName.match(ASSET_BASE_NAME_RE);
@@ -24,14 +34,14 @@ function parseBaseName(baseName) {
   };
 }
 function tryParse(filePath, platforms) {
-  const result = parsePlatformFilePath(filePath, platforms);
+  const result = (0, _parsePlatformFilePath.default)(filePath, platforms);
   const { dirPath, baseName, platform, extension } = result;
   if (extension == null) {
     return null;
   }
   const { rootName, resolution } = parseBaseName(baseName);
   return {
-    assetName: path.join(dirPath, `${rootName}.${extension}`),
+    assetName: _path.default.join(dirPath, `${rootName}.${extension}`),
     name: rootName,
     platform,
     resolution,
@@ -45,7 +55,3 @@ function parse(filePath, platforms) {
   }
   return result;
 }
-module.exports = {
-  parse,
-  tryParse,
-};

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

@@ -9,10 +9,8 @@
  * @oncall react_native
  */
 
-'use strict';
-
-const parsePlatformFilePath = require('./parsePlatformFilePath');
-const path = require('path');
+import parsePlatformFilePath from './parsePlatformFilePath';
+import path from 'path';
 
 export type AssetPath = {
   assetName: string,
@@ -47,7 +45,7 @@ function parseBaseName(baseName: string): {
  * Return `null` if the `filePath` doesn't have a valid extension, required
  * to describe the type of an asset.
  */
-function tryParse(
+export function tryParse(
   filePath: string,
   platforms: $ReadOnlySet<string>,
 ): ?AssetPath {
@@ -66,12 +64,13 @@ function tryParse(
   };
 }
 
-function parse(filePath: string, platforms: $ReadOnlySet<string>): AssetPath {
+export function parse(
+  filePath: string,
+  platforms: $ReadOnlySet<string>,
+): AssetPath {
   const result = tryParse(filePath, platforms);
   if (result == null) {
     throw new Error(`invalid asset file path: ${filePath}`);
   }
   return result;
 }
-
-module.exports = {parse, tryParse};

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

@@ -1,10 +1,17 @@
 "use strict";
 
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = parsePlatformFilePath;
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const PATH_RE = /^(.+?)(\.([^.]+))?\.([^.]+)$/;
 function parsePlatformFilePath(filePath, platforms) {
-  const dirPath = path.dirname(filePath);
-  const fileName = path.basename(filePath);
+  const dirPath = _path.default.dirname(filePath);
+  const fileName = _path.default.basename(filePath);
   const match = fileName.match(PATH_RE);
   if (!match) {
     return {
@@ -32,4 +39,3 @@ function parsePlatformFilePath(filePath, platforms) {
     extension,
   };
 }
-module.exports = parsePlatformFilePath;

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

@@ -9,9 +9,7 @@
  * @oncall react_native
  */
 
-'use strict';
-
-const path = require('path');
+import path from 'path';
 
 type PlatformFilePathParts = {
   dirPath: string,
@@ -26,7 +24,7 @@ const PATH_RE = /^(.+?)(\.([^.]+))?\.([^.]+)$/;
  * Extract the components of a file path that can have a platform specifier: Ex.
  * `index.ios.js` is specific to the `ios` platform and has the extension `js`.
  */
-function parsePlatformFilePath(
+export default function parsePlatformFilePath(
   filePath: string,
   platforms: $ReadOnlySet<string>,
 ): PlatformFilePathParts {
@@ -44,5 +42,3 @@ function parsePlatformFilePath(
   const baseName = `${match[1]}.${platform}`;
   return {dirPath, baseName, platform: null, extension};
 }
-
-module.exports = parsePlatformFilePath;

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

@@ -1,13 +1,24 @@
 "use strict";
 
-const relativizeSourceMapInline = require("../../../lib/relativizeSourceMap");
-const writeFile = require("../writeFile");
-const buildSourcemapWithMetadata = require("./buildSourcemapWithMetadata");
-const MAGIC_RAM_BUNDLE_NUMBER = require("./magic-number");
-const { joinModules } = require("./util");
-const writeSourceMap = require("./write-sourcemap");
-const fsPromises = require("fs").promises;
-const path = require("path");
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = saveAsAssets;
+var _relativizeSourceMap = _interopRequireDefault(
+  require("../../../lib/relativizeSourceMap"),
+);
+var _writeFile = _interopRequireDefault(require("../writeFile"));
+var _buildSourcemapWithMetadata = _interopRequireDefault(
+  require("./buildSourcemapWithMetadata"),
+);
+var _magicNumber = _interopRequireDefault(require("./magic-number"));
+var _util = require("./util");
+var _writeSourcemap = _interopRequireDefault(require("./write-sourcemap"));
+var _fs = require("fs");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
 const MAGIC_RAM_BUNDLE_FILENAME = "UNBUNDLE";
 const MODULES_DIR = "js-modules";
 function saveAsAssets(bundle, options, log) {
@@ -20,31 +31,34 @@ function saveAsAssets(bundle, options, log) {
   log("start");
   const { startupModules, lazyModules } = bundle;
   log("finish");
-  const startupCode = joinModules(startupModules);
+  const startupCode = (0, _util.joinModules)(startupModules);
   log("Writing bundle output to:", bundleOutput);
-  const modulesDir = path.join(path.dirname(bundleOutput), MODULES_DIR);
+  const modulesDir = _path.default.join(
+    _path.default.dirname(bundleOutput),
+    MODULES_DIR,
+  );
   const writeUnbundle = createDir(modulesDir).then(() =>
     Promise.all([
       writeModules(lazyModules, modulesDir, encoding),
-      writeFile(bundleOutput, startupCode, encoding),
+      (0, _writeFile.default)(bundleOutput, startupCode, encoding),
       writeMagicFlagFile(modulesDir),
-    ])
+    ]),
   );
   writeUnbundle.then(() => log("Done writing unbundle output"));
   if (sourcemapOutput) {
-    const sourceMap = buildSourcemapWithMetadata({
+    const sourceMap = (0, _buildSourcemapWithMetadata.default)({
       fixWrapperOffset: true,
       lazyModules: lazyModules.concat(),
       moduleGroups: null,
       startupModules: startupModules.concat(),
     });
     if (sourcemapSourcesRoot != null) {
-      relativizeSourceMapInline(sourceMap, sourcemapSourcesRoot);
+      (0, _relativizeSourceMap.default)(sourceMap, sourcemapSourcesRoot);
     }
-    const wroteSourceMap = writeSourceMap(
+    const wroteSourceMap = (0, _writeSourcemap.default)(
       sourcemapOutput,
       JSON.stringify(sourceMap),
-      log
+      log,
     );
     return Promise.all([writeUnbundle, wroteSourceMap]);
   } else {
@@ -52,23 +66,29 @@ function saveAsAssets(bundle, options, log) {
   }
 }
 function createDir(dirName) {
-  return fsPromises.mkdir(dirName, {
+  return _fs.promises.mkdir(dirName, {
     recursive: true,
   });
 }
 function writeModuleFile(module, modulesDir, encoding) {
   const { code, id } = module;
-  return writeFile(path.join(modulesDir, id + ".js"), code, encoding);
+  return (0, _writeFile.default)(
+    _path.default.join(modulesDir, id + ".js"),
+    code,
+    encoding,
+  );
 }
 function writeModules(modules, modulesDir, encoding) {
   const writeFiles = modules.map((module) =>
-    writeModuleFile(module, modulesDir, encoding)
+    writeModuleFile(module, modulesDir, encoding),
   );
   return Promise.all(writeFiles);
 }
 function writeMagicFlagFile(outputDir) {
   const buffer = Buffer.alloc(4);
-  buffer.writeUInt32LE(MAGIC_RAM_BUNDLE_NUMBER, 0);
-  return writeFile(path.join(outputDir, MAGIC_RAM_BUNDLE_FILENAME), buffer);
+  buffer.writeUInt32LE(_magicNumber.default, 0);
+  return (0, _writeFile.default)(
+    _path.default.join(outputDir, MAGIC_RAM_BUNDLE_FILENAME),
+    buffer,
+  );
 }
-module.exports = saveAsAssets;

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

@@ -9,20 +9,19 @@
  * @oncall react_native
  */
 
-'use strict';
-
 import type {RamBundleInfo} from '../../../DeltaBundler/Serializers/getRamBundleInfo';
-import type {ModuleTransportLike} from '../../../shared/types.flow';
-import type {OutputOptions} from '../../types.flow';
+import type {ModuleTransportLike} from '../../../shared/types';
+import type {OutputOptions} from '../../types';
+
+import relativizeSourceMapInline from '../../../lib/relativizeSourceMap';
+import writeFile from '../writeFile';
+import buildSourcemapWithMetadata from './buildSourcemapWithMetadata';
+import MAGIC_RAM_BUNDLE_NUMBER from './magic-number';
+import {joinModules} from './util';
+import writeSourceMap from './write-sourcemap';
+import {promises as fsPromises} from 'fs';
+import path from 'path';
 
-const relativizeSourceMapInline = require('../../../lib/relativizeSourceMap');
-const writeFile = require('../writeFile');
-const buildSourcemapWithMetadata = require('./buildSourcemapWithMetadata');
-const MAGIC_RAM_BUNDLE_NUMBER = require('./magic-number');
-const {joinModules} = require('./util');
-const writeSourceMap = require('./write-sourcemap');
-const fsPromises = require('fs').promises;
-const path = require('path');
 // must not start with a dot, as that won't go into the apk
 const MAGIC_RAM_BUNDLE_FILENAME = 'UNBUNDLE';
 const MODULES_DIR = 'js-modules';
@@ -34,7 +33,7 @@ const MODULES_DIR = 'js-modules';
  * All other modules go into a 'js-modules' folder that in the same parent
  * directory as the startup file.
  */
-function saveAsAssets(
+export default function saveAsAssets(
   bundle: RamBundleInfo,
   options: OutputOptions,
   log: (...args: Array<string>) => void,
@@ -123,5 +122,3 @@ function writeMagicFlagFile(outputDir: string): Promise<mixed> {
   buffer.writeUInt32LE(MAGIC_RAM_BUNDLE_NUMBER, 0);
   return writeFile(path.join(outputDir, MAGIC_RAM_BUNDLE_FILENAME), buffer);
 }
-
-module.exports = saveAsAssets;