metro 0.80.9 → 0.80.10

package/src/lib/getAppendScripts.js

@@ -5,7 +5,9 @@ function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
-const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
+const {
+  sourceMapString,
+} = require("../DeltaBundler/Serializers/sourceMapString");
 const countLines = require("./countLines");
 const nullthrows = require("nullthrows");
 function getAppendScripts(entryPoint, modules, options) {
@@ -43,6 +45,7 @@ function getAppendScripts(entryPoint, modules, options) {
             processModuleFilter: () => true,
             excludeSource: false,
             shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+            getSourceUrl: options.getSourceUrl,
           })
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/getAppendScripts.js.flow

@@ -16,7 +16,9 @@ import type {Dependency} from '../DeltaBundler/types.flow';
 import CountingSet from './CountingSet';
 
 const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
-const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
+const {
+  sourceMapString,
+} = require('../DeltaBundler/Serializers/sourceMapString');
 const countLines = require('./countLines');
 const nullthrows = require('nullthrows');
 
@@ -30,6 +32,7 @@ type Options<T: number | string> = $ReadOnly<{
   shouldAddToIgnoreList: (Module<>) => boolean,
   sourceMapUrl: ?string,
   sourceUrl: ?string,
+  getSourceUrl: ?(Module<>) => string,
   ...
 }>;
 
@@ -75,6 +78,7 @@ function getAppendScripts<T: number | string>(
             processModuleFilter: (): boolean => true,
             excludeSource: false,
             shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+            getSourceUrl: options.getSourceUrl,
           }),
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/parseOptionsFromUrl.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _types = require("../shared/types.flow");
 const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
 const parseCustomResolverOptions = require("./parseCustomResolverOptions");
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
@@ -50,6 +51,9 @@ module.exports = function parseOptionsFromUrl(normalizedRequestUrl, platforms) {
           : "",
       pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
+    sourcePaths:
+      _types.SourcePathsMode.cast(query.sourcePaths) ??
+      _types.SourcePathsMode.Absolute,
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile

package/src/lib/parseOptionsFromUrl.js.flow

@@ -14,6 +14,8 @@
 import type {BundleOptions} from '../shared/types.flow';
 import type {TransformProfile} from 'metro-babel-transformer';
 
+import {SourcePathsMode} from '../shared/types.flow';
+
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
 const parseCustomResolverOptions = require('./parseCustomResolverOptions');
 const parseCustomTransformOptions = require('./parseCustomTransformOptions');
@@ -81,6 +83,8 @@ module.exports = function parseOptionsFromUrl(
           : '',
       pathname: pathname.replace(/\.(bundle|delta)$/, '.map'),
     }),
+    sourcePaths:
+      SourcePathsMode.cast(query.sourcePaths) ?? SourcePathsMode.Absolute,
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile,

package/src/lib/reporting.d.ts

@@ -96,6 +96,12 @@ export type ReportableEvent =
         | 'debug';
       data: unknown[];
     }
+  | {
+      type: 'server_listening';
+      port: number;
+      address: string;
+      family: string;
+    }
   | {
       type: 'transformer_load_started';
     }

package/src/lib/reporting.js.flow

@@ -132,6 +132,12 @@ export type ReportableEvent =
       type: 'resolver_warning',
       message: string,
     }
+  | {
+      type: 'server_listening',
+      port: number,
+      address: string,
+      family: string,
+    }
   | {
       type: 'transformer_load_started',
     }

package/src/lib/splitBundleOptions.js

@@ -23,6 +23,7 @@ function splitBundleOptions(options) {
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      sourcePaths: options.sourcePaths,
     },
     graphOptions: {
       shallow: options.shallow,

package/src/lib/splitBundleOptions.js.flow

@@ -39,6 +39,7 @@ function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      sourcePaths: options.sourcePaths,
     },
     graphOptions: {
       shallow: options.shallow,

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

@@ -14,7 +14,7 @@ class ModuleResolver {
     this._projectRootFakeModule = {
       path: path.join(projectRoot, "_"),
       getPackage: () =>
-        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+        moduleCache.getPackageOf(this._projectRootFakeModule.path)?.pkg,
       isHaste() {
         throw new Error("not implemented");
       },
@@ -97,8 +97,8 @@ class ModuleResolver {
             resolveHastePackage: (name) =>
               this._options.getHastePackagePath(name, platform),
             getPackage: this._getPackage,
-            getPackageForModule: (modulePath) =>
-              this._getPackageForModule(fromModule, modulePath),
+            getPackageForModule: (absoluteModulePath) =>
+              this._getPackageForModule(absoluteModulePath),
           },
           dependency
         ),
@@ -159,15 +159,16 @@ class ModuleResolver {
     } catch (e) {}
     return null;
   };
-  _getPackageForModule = (fromModule, modulePath) => {
-    let pkg;
+  _getPackageForModule = (absolutePath) => {
+    let result;
     try {
-      pkg = this._options.moduleCache.getPackageOf(modulePath);
+      result = this._options.moduleCache.getPackageOf(absolutePath);
     } catch (e) {}
-    return pkg != null
+    return result != null
       ? {
-          rootPath: path.dirname(pkg.path),
-          packageJson: pkg.read(),
+          rootPath: path.dirname(result.pkg.path),
+          packageJson: result.pkg.read(),
+          packageRelativePath: result.packageRelativePath,
         }
       : null;
   };

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

@@ -25,7 +25,7 @@ import type {
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
-import type {PackageInfo, PackageJson} from 'metro-resolver/src/types';
+import type {PackageForModule, PackageJson} from 'metro-resolver/src/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
 const fs = require('fs');
@@ -53,7 +53,10 @@ export type ModuleishCache<TPackage> = interface {
     platform?: string,
     supportsNativePlatform?: boolean,
   ): TPackage,
-  getPackageOf(modulePath: string): ?TPackage,
+  getPackageOf(absolutePath: string): ?{
+    pkg: TPackage,
+    packageRelativePath: string,
+  },
 };
 
 type Options<TPackage> = $ReadOnly<{
@@ -95,7 +98,7 @@ class ModuleResolver<TPackage: Packageish> {
     this._projectRootFakeModule = {
       path: path.join(projectRoot, '_'),
       getPackage: () =>
-        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+        moduleCache.getPackageOf(this._projectRootFakeModule.path)?.pkg,
       isHaste() {
         throw new Error('not implemented');
       },
@@ -179,8 +182,8 @@ class ModuleResolver<TPackage: Packageish> {
             resolveHastePackage: (name: string) =>
               this._options.getHastePackagePath(name, platform),
             getPackage: this._getPackage,
-            getPackageForModule: (modulePath: string) =>
-              this._getPackageForModule(fromModule, modulePath),
+            getPackageForModule: (absoluteModulePath: string) =>
+              this._getPackageForModule(absoluteModulePath),
           },
           dependency,
         ),
@@ -249,23 +252,21 @@ class ModuleResolver<TPackage: Packageish> {
     return null;
   };
 
-  _getPackageForModule = (
-    fromModule: Moduleish,
-    modulePath: string,
-  ): ?PackageInfo => {
-    let pkg;
+  _getPackageForModule = (absolutePath: string): ?PackageForModule => {
+    let result;
 
     try {
-      pkg = this._options.moduleCache.getPackageOf(modulePath);
+      result = this._options.moduleCache.getPackageOf(absolutePath);
     } catch (e) {
       // Do nothing. The standard module cache does not trigger any error, but
       // the ModuleGraph one does, if the module does not exist.
     }
 
-    return pkg != null
+    return result != null
       ? {
-          rootPath: path.dirname(pkg.path),
-          packageJson: pkg.read(),
+          rootPath: path.dirname(result.pkg.path),
+          packageJson: result.pkg.read(),
+          packageRelativePath: result.packageRelativePath,
         }
       : null;
   };
@@ -322,6 +323,7 @@ function getArrayLowestItem(a: $ReadOnlyArray<string>): string | void {
   return lowest;
 }
 
+// $FlowFixMe[incompatible-extend]
 class UnableToResolveError extends Error {
   /**
    * File path of the module that tried to require a module, ex. `/js/foo.js`.

package/src/node-haste/DependencyGraph.js

@@ -80,8 +80,8 @@ class DependencyGraph extends EventEmitter {
     await self.ready();
     return self;
   }
-  _getClosestPackage(filePath) {
-    const parsedPath = path.parse(filePath);
+  _getClosestPackage(absoluteModulePath) {
+    const parsedPath = path.parse(absoluteModulePath);
     const root = parsedPath.root;
     let dir = path.join(parsedPath.dir, parsedPath.base);
     do {
@@ -90,7 +90,10 @@ class DependencyGraph extends EventEmitter {
       }
       const candidate = path.join(dir, "package.json");
       if (this._fileSystem.exists(candidate)) {
-        return candidate;
+        return {
+          packageJsonPath: candidate,
+          packageRelativePath: path.relative(dir, absoluteModulePath),
+        };
       }
       dir = path.dirname(dir);
     } while (dir !== "." && dir !== root);
@@ -163,7 +166,8 @@ class DependencyGraph extends EventEmitter {
   }
   _createModuleCache() {
     return new ModuleCache({
-      getClosestPackage: (filePath) => this._getClosestPackage(filePath),
+      getClosestPackage: (absoluteModulePath) =>
+        this._getClosestPackage(absoluteModulePath),
     });
   }
   getAllFiles() {

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

@@ -152,8 +152,10 @@ class DependencyGraph extends EventEmitter {
     return self;
   }
 
-  _getClosestPackage(filePath: string): ?string {
-    const parsedPath = path.parse(filePath);
+  _getClosestPackage(
+    absoluteModulePath: string,
+  ): ?{packageJsonPath: string, packageRelativePath: string} {
+    const parsedPath = path.parse(absoluteModulePath);
     const root = parsedPath.root;
     let dir = path.join(parsedPath.dir, parsedPath.base);
 
@@ -165,7 +167,12 @@ class DependencyGraph extends EventEmitter {
       }
       const candidate = path.join(dir, 'package.json');
       if (this._fileSystem.exists(candidate)) {
-        return candidate;
+        return {
+          packageJsonPath: candidate,
+          // Note that by construction, dir is a prefix of absoluteModulePath,
+          // so this relative path has no indirections.
+          packageRelativePath: path.relative(dir, absoluteModulePath),
+        };
       }
       dir = path.dirname(dir);
     } while (dir !== '.' && dir !== root);
@@ -242,7 +249,8 @@ class DependencyGraph extends EventEmitter {
 
   _createModuleCache(): ModuleCache {
     return new ModuleCache({
-      getClosestPackage: filePath => this._getClosestPackage(filePath),
+      getClosestPackage: absoluteModulePath =>
+        this._getClosestPackage(absoluteModulePath),
     });
   }
 

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/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 = {