fix: Avoid importing in source that __vitePreload has declared (close #4016) (#4041)

xingxiuyi · patak-cat · web-flow · commit bd34203bc40d · 2021-07-01T08:25:37.000+08:00
Co-authored-by: patak &lt;matias.capeletto@gmail.com&gt;
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -161,7 +161,11 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
         }
       }
 
-      if (needPreloadHelper && !ssr) {
+      if (
+        needPreloadHelper &&
+        !ssr &&
+        !source.includes(`const ${preloadMethod} =`)
+      ) {
         str().prepend(`import { ${preloadMethod} } from "${preloadHelperId}";`)
       }
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,11 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`164`		`- if (needPreloadHelper && !ssr) {`
	`164`	`+ if (`
	`165`	`+ needPreloadHelper &&`
	`166`	`+ !ssr &&`
	`167`	+ !source.includes(`const ${preloadMethod} =`)
	`168`	`+ ) {`
`165`	`169`	str().prepend(`import { ${preloadMethod} } from "${preloadHelperId}";`)
`166`	`170`	`}`
`167`	`171`