fix(import-analysis): escape quotes correctly (#12688)

vitejs · Apr 1, 2023 · 1638ebd · 1638ebd
1 parent a3150ee
commit 1638ebd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -589,9 +589,10 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
               rewriteDone = true
             }
             if (!rewriteDone) {
-              let rewrittenUrl = JSON.stringify(url)
-              if (!isDynamicImport) rewrittenUrl = rewrittenUrl.slice(1, -1)
-              str().overwrite(start, end, rewrittenUrl, {
+              const rewrittenUrl = JSON.stringify(url)
+              const s = isDynamicImport ? start : start - 1
+              const e = isDynamicImport ? end : end + 1
+              str().overwrite(s, e, rewrittenUrl, {
                 contentOnly: true,
               })
             }

diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -342,9 +342,10 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
                 rewriteDone = true
               }
               if (!rewriteDone) {
-                let rewrittenUrl = JSON.stringify(file)
-                if (!isDynamicImport) rewrittenUrl = rewrittenUrl.slice(1, -1)
-                str().update(start, end, rewrittenUrl)
+                const rewrittenUrl = JSON.stringify(file)
+                const s = isDynamicImport ? start : start - 1
+                const e = isDynamicImport ? end : end + 1
+                str().update(s, e, rewrittenUrl)
               }
             }
           }