@@ -37,7 +37,7 @@ export const preloadMarker = `__VITE_PRELOAD__`
3737export const preloadBaseMarker = `__VITE_PRELOAD_BASE__`
3838
3939export const preloadHelperId = '\0vite/preload-helper.js'
40- const preloadMarkerWithQuote = new RegExp ( `['"] ${ preloadMarker } ['"]` , 'g' )
40+ const preloadMarkerRE = new RegExp ( preloadMarker , 'g' )
4141
4242const dynamicImportPrefixRE = / i m p o r t \s * \( /
4343
@@ -268,7 +268,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
268268str ( ) . prependLeft ( expStart , `${ preloadMethod } (() => ` )
269269str ( ) . appendRight (
270270expEnd ,
271- `,${ isModernFlag } ?" ${ preloadMarker } " :void 0${
271+ `,${ isModernFlag } ?${ preloadMarker } :void 0${
272272optimizeModulePreloadRelativePaths || customModulePreloadPaths
273273 ? ',import.meta.url'
274274 : ''
@@ -427,15 +427,12 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
427427
428428let markerStartPos = indexOfMatchInSlice (
429429code ,
430- preloadMarkerWithQuote ,
430+ preloadMarkerRE ,
431431end ,
432432)
433433// fix issue #3051
434434if ( markerStartPos === - 1 && imports . length === 1 ) {
435- markerStartPos = indexOfMatchInSlice (
436- code ,
437- preloadMarkerWithQuote ,
438- )
435+ markerStartPos = indexOfMatchInSlice ( code , preloadMarkerRE )
439436}
440437
441438if ( markerStartPos > 0 ) {
@@ -505,7 +502,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
505502
506503s . update (
507504markerStartPos ,
508- markerStartPos + preloadMarker . length + 2 ,
505+ markerStartPos + preloadMarker . length ,
509506renderedDeps . length > 0
510507 ? `__vite__mapDeps([${ renderedDeps . join ( ',' ) } ])`
511508 : `[]` ,
@@ -534,19 +531,19 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
534531
535532// there may still be markers due to inlined dynamic imports, remove
536533// all the markers regardless
537- let markerStartPos = indexOfMatchInSlice ( code , preloadMarkerWithQuote )
534+ let markerStartPos = indexOfMatchInSlice ( code , preloadMarkerRE )
538535while ( markerStartPos >= 0 ) {
539536if ( ! rewroteMarkerStartPos . has ( markerStartPos ) ) {
540537s . update (
541538markerStartPos ,
542- markerStartPos + preloadMarker . length + 2 ,
539+ markerStartPos + preloadMarker . length ,
543540'void 0' ,
544541)
545542}
546543markerStartPos = indexOfMatchInSlice (
547544code ,
548- preloadMarkerWithQuote ,
549- markerStartPos + preloadMarker . length + 2 ,
545+ preloadMarkerRE ,
546+ markerStartPos + preloadMarker . length ,
550547)
551548}
552549
0 commit comments