@@ -37,7 +37,7 @@ export const preloadMarker = `__VITE_PRELOAD__`
37
37
export const preloadBaseMarker = `__VITE_PRELOAD_BASE__`
38
38
39
39
export const preloadHelperId = '\0vite/preload-helper.js'
40
- const preloadMarkerWithQuote = new RegExp ( `['"] ${ preloadMarker } ['"]` , 'g' )
40
+ const preloadMarkerRE = new RegExp ( preloadMarker , 'g' )
41
41
42
42
const dynamicImportPrefixRE = / i m p o r t \s * \( /
43
43
@@ -268,7 +268,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
268
268
str ( ) . prependLeft ( expStart , `${ preloadMethod } (() => ` )
269
269
str ( ) . appendRight (
270
270
expEnd ,
271
- `,${ isModernFlag } ?" ${ preloadMarker } " :void 0${
271
+ `,${ isModernFlag } ?${ preloadMarker } :void 0${
272
272
optimizeModulePreloadRelativePaths || customModulePreloadPaths
273
273
? ',import.meta.url'
274
274
: ''
@@ -427,15 +427,12 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
427
427
428
428
let markerStartPos = indexOfMatchInSlice (
429
429
code ,
430
- preloadMarkerWithQuote ,
430
+ preloadMarkerRE ,
431
431
end ,
432
432
)
433
433
// fix issue #3051
434
434
if ( markerStartPos === - 1 && imports . length === 1 ) {
435
- markerStartPos = indexOfMatchInSlice (
436
- code ,
437
- preloadMarkerWithQuote ,
438
- )
435
+ markerStartPos = indexOfMatchInSlice ( code , preloadMarkerRE )
439
436
}
440
437
441
438
if ( markerStartPos > 0 ) {
@@ -505,7 +502,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
505
502
506
503
s . update (
507
504
markerStartPos ,
508
- markerStartPos + preloadMarker . length + 2 ,
505
+ markerStartPos + preloadMarker . length ,
509
506
renderedDeps . length > 0
510
507
? `__vite__mapDeps([${ renderedDeps . join ( ',' ) } ])`
511
508
: `[]` ,
@@ -534,19 +531,19 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
534
531
535
532
// there may still be markers due to inlined dynamic imports, remove
536
533
// all the markers regardless
537
- let markerStartPos = indexOfMatchInSlice ( code , preloadMarkerWithQuote )
534
+ let markerStartPos = indexOfMatchInSlice ( code , preloadMarkerRE )
538
535
while ( markerStartPos >= 0 ) {
539
536
if ( ! rewroteMarkerStartPos . has ( markerStartPos ) ) {
540
537
s . update (
541
538
markerStartPos ,
542
- markerStartPos + preloadMarker . length + 2 ,
539
+ markerStartPos + preloadMarker . length ,
543
540
'void 0' ,
544
541
)
545
542
}
546
543
markerStartPos = indexOfMatchInSlice (
547
544
code ,
548
- preloadMarkerWithQuote ,
549
- markerStartPos + preloadMarker . length + 2 ,
545
+ preloadMarkerRE ,
546
+ markerStartPos + preloadMarker . length ,
550
547
)
551
548
}
552
549
0 commit comments