fix #4070: file namespace for sourceMappingURL

Author: evanw

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+* Fix incorrect paths in inline source maps ([#4070](https://github.com/evanw/esbuild/issues/4070), [#4105](https://github.com/evanw/esbuild/issues/4105))
+
+    This fixes a regression from version 0.25.0 where esbuild didn't correctly resolve relative paths contained within source maps in inline `sourceMappingURL` data URLs. The paths were incorrectly being passed through as-is instead of being resolved relative to the source file containing the `sourceMappingURL` comment, which was due to the data URL not being a file URL. This regression has been fixed, and this case now has test coverage.
+
 * Fix invalid generated source maps ([#4080](https://github.com/evanw/esbuild/issues/4080), [#4082](https://github.com/evanw/esbuild/issues/4082), [#4107](https://github.com/evanw/esbuild/issues/4107))
 
     This release fixes a regression from version 0.24.1 that could cause esbuild to generate invalid source maps. Specifically under certain conditions, esbuild could generate a mapping with an out-of-bounds source index. It was introduced by code that attempted to improve esbuild's handling of "null" entries in source maps (i.e. mappings with a generated position but no original position). This regression has been fixed.

internal/bundler/bundler.go

@@ -816,7 +816,9 @@ func extractSourceMapFromComment(
 				fmt.Sprintf("Unsupported source map comment: %s", err.Error()))
 			return logger.Path{}, nil
 		}
-		return logger.Path{Text: source.PrettyPath, IgnoredSuffix: "#sourceMappingURL"}, &contents
+		path := source.KeyPath
+		path.IgnoredSuffix = "#sourceMappingURL"
+		return path, &contents
 	}
 
 	// Support file URLs of two forms:

internal/js_parser/sourcemap_parser.go

@@ -13,7 +13,8 @@ import (
 	"github.com/evanw/esbuild/internal/sourcemap"
 )
 
-// Specification: https://sourcemaps.info/spec.html
+// New specification: https://tc39.es/ecma426/
+// Old specification: https://sourcemaps.info/spec.html
 func ParseSourceMap(log logger.Log, source logger.Source) *sourcemap.SourceMap {
 	expr, ok := ParseJSON(log, source, JSONOptions{ErrorSuffix: " in source map"})
 	if !ok {

scripts/verify-source-map.js

@@ -552,6 +552,27 @@ const toSearchNullMappingIssue4080 = {
   'lib!': 'src/lib.js',
 }
 
+const testCaseNestedFoldersIssue4070 = {
+  'src/main.js': `import { appConfig } from "./app/app.config";
+appConfig("foo");
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKIC` +
+    `Aic291cmNlcyI6IFsibWFpbi5qcyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiaW1wb3J0I` +
+    `HsgYXBwQ29uZmlnIH0gZnJvbSBcIi4vYXBwL2FwcC5jb25maWdcIjtcbmFwcENvbmZpZyhc` +
+    `ImZvb1wiKTsiXSwKICAibWFwcGluZ3MiOiAiQUFBQSxTQUFTLGlCQUFpQjtBQUMxQixVQUF` +
+    `VLEtBQUs7IiwKICAibmFtZXMiOiBbXQp9Cg==`,
+  'src/app/app.config.js': `export const appConfig = (x) => console.log(x, "bar");
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKIC` +
+    `Aic291cmNlcyI6IFsiYXBwLmNvbmZpZy5qcyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiZ` +
+    `Xhwb3J0IGNvbnN0IGFwcENvbmZpZyA9IHggPT4gY29uc29sZS5sb2coeCwgXCJiYXJcIik7` +
+    `Il0sCiAgIm1hcHBpbmdzIjogIkFBQU8sYUFBTSxZQUFZLE9BQUssUUFBUSxJQUFJLEdBQUc` +
+    `sS0FBSzsiLAogICJuYW1lcyI6IFtdCn0K`,
+}
+
+const toSearchNestedFoldersIssue4070 = {
+  'foo': 'src/main.js',
+  'bar': 'src/app/app.config.js',
+}
+
 async function check(kind, testCase, toSearch, { outfile, flags, entryPoints, crlf, followUpFlags = [], checkFirstChunk }) {
   let failed = 0
 
@@ -1015,6 +1036,12 @@ async function main() {
           entryPoints: ['entry.js'],
           crlf,
         }),
+        check('issue-4048' + suffix, testCaseNestedFoldersIssue4070, toSearchNestedFoldersIssue4070, {
+          outfile: 'out.js',
+          flags: flags.concat('--bundle'),
+          entryPoints: ['src/main.js'],
+          crlf,
+        }),
         check('issue-4048' + suffix, testCaseNullMappingIssue4080, toSearchNullMappingIssue4080, {
           outfile: 'out.js',
           flags: flags.concat('--bundle', '--format=esm'),