From ec0efe8a06d0271ef0154f38fb9beabcd4b1bd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Mon, 30 Sep 2024 17:57:36 +0900
Subject: [PATCH] fix(data-uri): only match ids starting with `data:` (#18241)

---
 packages/vite/src/node/plugins/dataUri.ts |  2 +-
 playground/data-uri/index.html            |  4 ++++
 playground/data-uri/vite.config.js        | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 playground/data-uri/vite.config.js

diff --git a/packages/vite/src/node/plugins/dataUri.ts b/packages/vite/src/node/plugins/dataUri.ts
index c2a71a88ca14d1..9560700a5fd80e 100644
--- a/packages/vite/src/node/plugins/dataUri.ts
+++ b/packages/vite/src/node/plugins/dataUri.ts
@@ -22,7 +22,7 @@ export function dataURIPlugin(): Plugin {
     },
 
     resolveId(id) {
-      if (!dataUriRE.test(id)) {
+      if (!id.trimStart().startsWith('data:')) {
         return
       }
 
diff --git a/playground/data-uri/index.html b/playground/data-uri/index.html
index 597c3a204f36c9..3794f74db4ea3e 100644
--- a/playground/data-uri/index.html
+++ b/playground/data-uri/index.html
@@ -1,5 +1,6 @@
 <div class="plain"></div>
 <div class="base64"></div>
+<div class="comma"></div>
 
 <script type="module">
   import msg from "data:text/javascript, export default 'hi'"
@@ -8,6 +9,9 @@
   import base64Msg from 'data:text/javascript;base64, ZXhwb3J0IGRlZmF1bHQgJ2hpJw=='
   text('.base64', base64Msg)
 
+  import { comma } from 'comma/foo?number=1,2,3'
+  text('.comma', comma)
+
   function text(el, text) {
     document.querySelector(el).textContent = text
   }
diff --git a/playground/data-uri/vite.config.js b/playground/data-uri/vite.config.js
new file mode 100644
index 00000000000000..67d43b61015b13
--- /dev/null
+++ b/playground/data-uri/vite.config.js
@@ -0,0 +1,20 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [
+    {
+      name: 'post-plugin',
+      enforce: 'post',
+      resolveId(id) {
+        if (id.replace(/\?.*$/, '') === 'comma/foo') {
+          return id
+        }
+      },
+      load(id) {
+        if (id.replace(/\?.*$/, '') === 'comma/foo') {
+          return `export const comma = 'hi'`
+        }
+      },
+    },
+  ],
+})