fix #4169: keep invalid source map URLs unmodified

Author: evanw

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+* Pass through invalid URLs in source maps unmodified ([#4169](https://github.com/evanw/esbuild/issues/4169))
+
+    This fixes a regression in version 0.25.0 where `sources` in source maps that form invalid URLs were not being passed through to the output. Version 0.25.0 changed the interpretation of `sources` from file paths to URLs, which means that URL parsing can now fail. Previously URLs that couldn't be parsed were replaced with the empty string. With this release, invalid URLs in `sources` should now be passed through unmodified.
+
 ## 0.25.3
 
 * Fix lowered `async` arrow functions before `super()` ([#4141](https://github.com/evanw/esbuild/issues/4141), [#4142](https://github.com/evanw/esbuild/pull/4142))

internal/bundler/bundler.go

@@ -1616,6 +1616,7 @@ func (s *scanner) preprocessInjectedFiles() {
 			KeyPath:        visitedKey,
 			PrettyPath:     resolver.PrettyPath(s.fs, visitedKey),
 			IdentifierName: js_ast.EnsureValidIdentifier(visitedKey.Text),
+			Contents:       define.Source.Contents,
 		}
 
 		// The first "len(InjectedDefine)" injected files intentionally line up

internal/js_parser/sourcemap_parser.go

@@ -342,14 +342,9 @@ func ParseSourceMap(log logger.Log, source logger.Source) *sourcemap.SourceMap {
 				sourcePath := sourceURLPrefix + helpers.UTF16ToString(element.Value)
 				sourceURL, err := url.Parse(sourcePath)
 
-				// Report URL parse errors (such as "%XY" being an invalid escape)
+				// Ignore URL parse errors (such as "%XY" being an invalid escape)
 				if err != nil {
-					if urlErr, ok := err.(*url.Error); ok {
-						err = urlErr.Err // Use the underlying error to reduce noise
-					}
-					log.AddID(logger.MsgID_SourceMap_InvalidSourceURL, logger.Warning, &tracker, source.RangeOfString(item.Loc),
-						fmt.Sprintf("Invalid source URL: %s", err.Error()))
-					sources = append(sources, "")
+					sources = append(sources, sourcePath)
 					continue
 				}
 

internal/logger/msg_ids.go

@@ -69,7 +69,6 @@ const (
 
 	// Source maps
 	MsgID_SourceMap_InvalidSourceMappings
-	MsgID_SourceMap_InvalidSourceURL
 	MsgID_SourceMap_MissingSourceMap
 	MsgID_SourceMap_UnsupportedSourceMapComment
 
@@ -207,8 +206,6 @@ func StringToMsgIDs(str string, logLevel LogLevel, overrides map[MsgID]LogLevel)
 	// Source maps
 	case "invalid-source-mappings":
 		overrides[MsgID_SourceMap_InvalidSourceMappings] = logLevel
-	case "invalid-source-url":
-		overrides[MsgID_SourceMap_InvalidSourceURL] = logLevel
 	case "missing-source-map":
 		overrides[MsgID_SourceMap_MissingSourceMap] = logLevel
 	case "unsupported-source-map-comment":
@@ -341,8 +338,6 @@ func MsgIDToString(id MsgID) string {
 	// Source maps
 	case MsgID_SourceMap_InvalidSourceMappings:
 		return "invalid-source-mappings"
-	case MsgID_SourceMap_InvalidSourceURL:
-		return "invalid-source-url"
 	case MsgID_SourceMap_MissingSourceMap:
 		return "missing-source-map"
 	case MsgID_SourceMap_UnsupportedSourceMapComment:

scripts/verify-source-map.js

@@ -749,6 +749,15 @@ const toSearchMissingSourcesIssue4104 = {
   'app-root': 'app.component.ts',
 }
 
+const testCaseDefineWithObjectIssue4169 = {
+  'entry.js': `console.log(OBJECT, ARRAY);`,
+}
+
+const toSearchDefineWithObjectIssue4169 = {
+  'test object': '<define:OBJECT>',
+  'test array': '<define:ARRAY>',
+}
+
 async function check(kind, testCase, toSearch, { outfile, flags, entryPoints, crlf, followUpFlags = [], checkFirstChunk }) {
   let failed = 0
 
@@ -1243,6 +1252,12 @@ async function main() {
           crlf,
           followUpFlags: ['--packages=external'],
         }),
+        check('issue-4169' + suffix, testCaseDefineWithObjectIssue4169, toSearchDefineWithObjectIssue4169, {
+          outfile: 'out.js',
+          flags: flags.concat('--format=esm', '--sourcemap', '--bundle', '--define:OBJECT={"test object":1}', '--define:ARRAY=["test array"]'),
+          entryPoints: ['entry.js'],
+          crlf,
+        }),
 
         // Checks for the "names" field
         checkNames('names' + suffix, testCaseNames, {