fix(import-analysis): escape quotes (#9729)

vitejs · Aug 18, 2022 · 21515f1 · 21515f1
1 parent d04784b
commit 21515f1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -527,7 +527,9 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
               rewriteDone = true
             }
             if (!rewriteDone) {
-              str().overwrite(start, end, isDynamicImport ? `'${url}'` : url, {
+              let rewrittenUrl = JSON.stringify(url)
+              if (!isDynamicImport) rewrittenUrl = rewrittenUrl.slice(1, -1)
+              str().overwrite(start, end, rewrittenUrl, {
                 contentOnly: true
               })
             }

diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -291,14 +291,11 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
                 rewriteDone = true
               }
               if (!rewriteDone) {
-                str().overwrite(
-                  start,
-                  end,
-                  isDynamicImport ? `'${file}'` : file,
-                  {
-                    contentOnly: true
-                  }
-                )
+                let rewrittenUrl = JSON.stringify(file)
+                if (!isDynamicImport) rewrittenUrl = rewrittenUrl.slice(1, -1)
+                str().overwrite(start, end, rewrittenUrl, {
+                  contentOnly: true
+                })
               }
             }
           }

diff --git a/playground/glob-import/__tests__/glob-import.spec.ts b/playground/glob-import/__tests__/glob-import.spec.ts
@@ -16,6 +16,9 @@ const filteredResult = {
   },
   './foo.js': {
     msg: 'foo'
+  },
+  "./quote'.js": {
+    msg: 'single-quote'
   }
 }
 
@@ -62,6 +65,9 @@ const allResult = {
       '../baz.json': json
     },
     msg: 'bar'
+  },
+  "/dir/quote'.js": {
+    msg: 'single-quote'
   }
 }
 

diff --git a/playground/glob-import/dir/quote'.js b/playground/glob-import/dir/quote'.js
@@ -0,0 +1 @@
+export const msg = 'single-quote'