metro 0.80.8 → 0.80.10

package/src/node-haste/Module.js

@@ -13,7 +13,7 @@ class Module {
     this._moduleCache = moduleCache;
   }
   getPackage() {
-    return this._moduleCache.getPackageForModule(this);
+    return this._moduleCache.getPackageForModule(this)?.pkg;
   }
   invalidate() {}
 }

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

@@ -32,7 +32,7 @@ class Module {
   }
 
   getPackage(): ?Package {
-    return this._moduleCache.getPackageForModule(this);
+    return this._moduleCache.getPackageForModule(this)?.pkg;
   }
 
   invalidate() {}

package/src/node-haste/ModuleCache.js

@@ -7,7 +7,7 @@ class ModuleCache {
     this._getClosestPackage = options.getClosestPackage;
     this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
-    this._packagePathByModulePath = Object.create(null);
+    this._packagePathAndSubpathByModulePath = Object.create(null);
     this._modulePathsByPackagePath = Object.create(null);
   }
   getModule(filePath) {
@@ -27,21 +27,33 @@ class ModuleCache {
   getPackageForModule(module) {
     return this.getPackageOf(module.path);
   }
-  getPackageOf(modulePath) {
-    let packagePath = this._packagePathByModulePath[modulePath];
-    if (packagePath && this._packageCache[packagePath]) {
-      return this._packageCache[packagePath];
+  getPackageOf(absoluteModulePath) {
+    let packagePathAndSubpath =
+      this._packagePathAndSubpathByModulePath[absoluteModulePath];
+    if (
+      packagePathAndSubpath &&
+      this._packageCache[packagePathAndSubpath.packageJsonPath]
+    ) {
+      return {
+        pkg: this._packageCache[packagePathAndSubpath.packageJsonPath],
+        packageRelativePath: packagePathAndSubpath.packageRelativePath,
+      };
     }
-    packagePath = this._getClosestPackage(modulePath);
-    if (!packagePath) {
+    packagePathAndSubpath = this._getClosestPackage(absoluteModulePath);
+    if (!packagePathAndSubpath) {
       return null;
     }
-    this._packagePathByModulePath[modulePath] = packagePath;
+    const packagePath = packagePathAndSubpath.packageJsonPath;
+    this._packagePathAndSubpathByModulePath[absoluteModulePath] =
+      packagePathAndSubpath;
     const modulePaths =
       this._modulePathsByPackagePath[packagePath] ?? new Set();
-    modulePaths.add(modulePath);
+    modulePaths.add(absoluteModulePath);
     this._modulePathsByPackagePath[packagePath] = modulePaths;
-    return this.getPackage(packagePath);
+    return {
+      pkg: this.getPackage(packagePath),
+      packageRelativePath: packagePathAndSubpath.packageRelativePath,
+    };
   }
   invalidate(filePath) {
     if (this._moduleCache[filePath]) {
@@ -52,9 +64,11 @@ class ModuleCache {
       this._packageCache[filePath].invalidate();
       delete this._packageCache[filePath];
     }
-    if (this._packagePathByModulePath[filePath]) {
-      const packagePath = this._packagePathByModulePath[filePath];
-      delete this._packagePathByModulePath[filePath];
+    const packagePathAndSubpath =
+      this._packagePathAndSubpathByModulePath[filePath];
+    if (packagePathAndSubpath) {
+      const packagePath = packagePathAndSubpath.packageJsonPath;
+      delete this._packagePathAndSubpathByModulePath[filePath];
       const modulePaths = this._modulePathsByPackagePath[packagePath];
       if (modulePaths) {
         modulePaths.delete(filePath);
@@ -66,7 +80,7 @@ class ModuleCache {
     if (this._modulePathsByPackagePath[filePath]) {
       const modulePaths = this._modulePathsByPackagePath[filePath];
       for (const modulePath of modulePaths) {
-        delete this._packagePathByModulePath[modulePath];
+        delete this._packagePathAndSubpathByModulePath[modulePath];
       }
       modulePaths.clear();
       delete this._modulePathsByPackagePath[filePath];

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

@@ -14,7 +14,10 @@
 const Module = require('./Module');
 const Package = require('./Package');
 
-type GetClosestPackageFn = (filePath: string) => ?string;
+type GetClosestPackageFn = (absoluteFilePath: string) => ?{
+  packageJsonPath: string,
+  packageRelativePath: string,
+};
 
 class ModuleCache {
   _getClosestPackage: GetClosestPackageFn;
@@ -29,8 +32,11 @@ class ModuleCache {
     ...
   };
   // Cache for "closest package.json" queries by module path.
-  _packagePathByModulePath: {
-    [filePath: string]: string,
+  _packagePathAndSubpathByModulePath: {
+    [filePath: string]: ?{
+      packageJsonPath: string,
+      packageRelativePath: string,
+    },
     __proto__: null,
     ...
   };
@@ -45,7 +51,7 @@ class ModuleCache {
     this._getClosestPackage = options.getClosestPackage;
     this._moduleCache = Object.create(null);
     this._packageCache = Object.create(null);
-    this._packagePathByModulePath = Object.create(null);
+    this._packagePathAndSubpathByModulePath = Object.create(null);
     this._modulePathsByPackagePath = Object.create(null);
   }
 
@@ -65,28 +71,45 @@ class ModuleCache {
     return this._packageCache[filePath];
   }
 
-  getPackageForModule(module: Module): ?Package {
+  getPackageForModule(
+    module: Module,
+  ): ?{pkg: Package, packageRelativePath: string} {
     return this.getPackageOf(module.path);
   }
 
-  getPackageOf(modulePath: string): ?Package {
-    let packagePath: ?string = this._packagePathByModulePath[modulePath];
-    if (packagePath && this._packageCache[packagePath]) {
-      return this._packageCache[packagePath];
+  getPackageOf(
+    absoluteModulePath: string,
+  ): ?{pkg: Package, packageRelativePath: string} {
+    let packagePathAndSubpath =
+      this._packagePathAndSubpathByModulePath[absoluteModulePath];
+    if (
+      packagePathAndSubpath &&
+      this._packageCache[packagePathAndSubpath.packageJsonPath]
+    ) {
+      return {
+        pkg: this._packageCache[packagePathAndSubpath.packageJsonPath],
+        packageRelativePath: packagePathAndSubpath.packageRelativePath,
+      };
     }
 
-    packagePath = this._getClosestPackage(modulePath);
-    if (!packagePath) {
+    packagePathAndSubpath = this._getClosestPackage(absoluteModulePath);
+    if (!packagePathAndSubpath) {
       return null;
     }
 
-    this._packagePathByModulePath[modulePath] = packagePath;
+    const packagePath = packagePathAndSubpath.packageJsonPath;
+
+    this._packagePathAndSubpathByModulePath[absoluteModulePath] =
+      packagePathAndSubpath;
     const modulePaths =
       this._modulePathsByPackagePath[packagePath] ?? new Set();
-    modulePaths.add(modulePath);
+    modulePaths.add(absoluteModulePath);
     this._modulePathsByPackagePath[packagePath] = modulePaths;
 
-    return this.getPackage(packagePath);
+    return {
+      pkg: this.getPackage(packagePath),
+      packageRelativePath: packagePathAndSubpath.packageRelativePath,
+    };
   }
 
   invalidate(filePath: string) {
@@ -98,10 +121,12 @@ class ModuleCache {
       this._packageCache[filePath].invalidate();
       delete this._packageCache[filePath];
     }
-    if (this._packagePathByModulePath[filePath]) {
+    const packagePathAndSubpath =
+      this._packagePathAndSubpathByModulePath[filePath];
+    if (packagePathAndSubpath) {
       // filePath is a module inside a package.
-      const packagePath = this._packagePathByModulePath[filePath];
-      delete this._packagePathByModulePath[filePath];
+      const packagePath = packagePathAndSubpath.packageJsonPath;
+      delete this._packagePathAndSubpathByModulePath[filePath];
       // This change doesn't invalidate any cached "closest package.json"
       // queries for the package's other modules. Clean up only this module.
       const modulePaths = this._modulePathsByPackagePath[packagePath];
@@ -117,7 +142,7 @@ class ModuleCache {
       // package.json" queries for modules inside this package.
       const modulePaths = this._modulePathsByPackagePath[filePath];
       for (const modulePath of modulePaths) {
-        delete this._packagePathByModulePath[modulePath];
+        delete this._packagePathAndSubpathByModulePath[modulePath];
       }
       modulePaths.clear();
       delete this._modulePathsByPackagePath[filePath];

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

@@ -41,7 +41,7 @@ function tryParse(filePath, platforms) {
 function parse(filePath, platforms) {
   const result = tryParse(filePath, platforms);
   if (result == null) {
-    throw new Error("invalid asset file path: `${filePath}");
+    throw new Error(`invalid asset file path: ${filePath}`);
   }
   return result;
 }

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

@@ -69,7 +69,7 @@ function tryParse(
 function parse(filePath: string, platforms: $ReadOnlySet<string>): AssetPath {
   const result = tryParse(filePath, platforms);
   if (result == null) {
-    throw new Error('invalid asset file path: `${filePath}');
+    throw new Error(`invalid asset file path: ${filePath}`);
   }
   return result;
 }

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

@@ -24,7 +24,7 @@ async function saveBundleAndMap(bundle, options, log) {
   } = options;
   const writeFns = [];
   writeFns.push(async () => {
-    log("Writing bundle output to:", bundleOutput);
+    log(`Writing bundle output to: ${bundleOutput}`);
     await writeFile(bundleOutput, bundle.code, encoding);
     log("Done writing bundle output");
   });
@@ -36,7 +36,7 @@ async function saveBundleAndMap(bundle, options, log) {
       log("finished relativating");
     }
     writeFns.push(async () => {
-      log("Writing sourcemap output to:", sourcemapOutput);
+      log(`Writing sourcemap output to: ${sourcemapOutput}`);
       await writeFile(sourcemapOutput, map, null);
       log("Done writing sourcemap output");
     });

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

@@ -61,7 +61,7 @@ async function saveBundleAndMap(
   const writeFns = [];
 
   writeFns.push(async () => {
-    log('Writing bundle output to:', bundleOutput);
+    log(`Writing bundle output to: ${bundleOutput}`);
     await writeFile(bundleOutput, bundle.code, encoding);
     log('Done writing bundle output');
   });
@@ -75,7 +75,7 @@ async function saveBundleAndMap(
     }
 
     writeFns.push(async () => {
-      log('Writing sourcemap output to:', sourcemapOutput);
+      log(`Writing sourcemap output to: ${sourcemapOutput}`);
       await writeFile(sourcemapOutput, map, null);
       log('Done writing sourcemap output');
     });

package/src/shared/types.flow.js

@@ -1 +1,11 @@
 "use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.SourcePathsMode = void 0;
+const SourcePathsMode = require("flow-enums-runtime")({
+  Absolute: "absolute",
+  ServerUrl: "url-server",
+});
+exports.SourcePathsMode = SourcePathsMode;

package/src/shared/types.flow.js.flow

@@ -41,6 +41,13 @@ type MetroSourceMapOrMappings =
   | MixedSourceMap
   | Array<MetroSourceMapSegmentTuple>;
 
+export enum SourcePathsMode {
+  /* Use absolute paths for source files in source maps (default). */
+  Absolute = 'absolute',
+  /* Use server-relative URL paths for source files in source maps. */
+  ServerUrl = 'url-server',
+}
+
 export type BundleOptions = {
   bundleType: BundleType,
   +customResolverOptions: CustomResolverOptions,
@@ -61,6 +68,7 @@ export type BundleOptions = {
   sourceUrl: ?string,
   createModuleIdFactory?: () => (path: string) => number,
   +unstable_transformProfile: TransformProfile,
+  +sourcePaths: SourcePathsMode,
 };
 
 export type ResolverInputOptions = $ReadOnly<{
@@ -75,6 +83,7 @@ export type SerializerOptions = {
   +excludeSource: boolean,
   +inlineSourceMap: boolean,
   +modulesOnly: boolean,
+  +sourcePaths: SourcePathsMode,
 };
 
 export type GraphOptions = {