fix "+" characters in data URLs

evanw · Mar 7, 2021 · 384d679 · 384d679
1 parent eb414db
commit 384d679
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/internal/bundler/bundler_loader_test.go b/internal/bundler/bundler_loader_test.go
@@ -523,6 +523,22 @@ func TestLoaderDataURLTextJavaScriptCannotImport(t *testing.T) {
 	})
 }
 
+// The "+" character must not be interpreted as a " " character
+func TestLoaderDataURLTextJavaScriptPlusCharacter(t *testing.T) {
+	default_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/entry.js": `
+				import "data:text/javascript,console.log(1+2)";
+			`,
+		},
+		entryPaths: []string{"/entry.js"},
+		options: config.Options{
+			Mode:         config.ModeBundle,
+			AbsOutputDir: "/out",
+		},
+	})
+}
+
 func TestLoaderDataURLApplicationJSON(t *testing.T) {
 	default_suite.expectBundled(t, bundled{
 		files: map[string]string{

diff --git a/internal/bundler/snapshots/snapshots_default.txt b/internal/bundler/snapshots/snapshots_default.txt
@@ -1294,6 +1294,12 @@ console.log(123);
 // <data:text/javascript;charset=UTF-8;base64,Y29uc29sZS5sb2coMjM0KQ...>
 console.log(234);
 
+================================================================================
+TestLoaderDataURLTextJavaScriptPlusCharacter
+---------- /out/entry.js ----------
+// <data:text/javascript,console.log(1+2)>
+console.log(1 + 2);
+
 ================================================================================
 TestLoaderDataURLUnknownMIME
 ---------- /out/entry.js ----------

diff --git a/internal/resolver/dataurl.go b/internal/resolver/dataurl.go
@@ -68,7 +68,7 @@ func (parsed DataURL) DecodeData() (string, error) {
 	}
 
 	// Try to read percent-escaped data
-	content, err := url.QueryUnescape(parsed.data)
+	content, err := url.PathUnescape(parsed.data)
 	if err != nil {
 		return "", fmt.Errorf("Could not decode percent-escaped data: %s", err.Error())
 	}