From 3dbe36fb7d5a6045fe9131e100f590bada182c92 Mon Sep 17 00:00:00 2001 From: pengbo43 Date: Wed, 1 May 2024 10:09:34 +0800 Subject: [PATCH] chore: preloadMarkerWithQuote => preloadMarkerRE --- .../vite/src/node/plugins/importAnalysisBuild.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 08918633c2e36a..eaaa08483ee358 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -37,7 +37,7 @@ export const preloadMarker = `__VITE_PRELOAD__` export const preloadBaseMarker = `__VITE_PRELOAD_BASE__` export const preloadHelperId = '\0vite/preload-helper.js' -const preloadMarkerWithQuote = new RegExp(preloadMarker, 'g') +const preloadMarkerRE = new RegExp(preloadMarker, 'g') const dynamicImportPrefixRE = /import\s*\(/ @@ -419,15 +419,12 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { let markerStartPos = indexOfMatchInSlice( code, - preloadMarkerWithQuote, + preloadMarkerRE, end, ) // fix issue #3051 if (markerStartPos === -1 && imports.length === 1) { - markerStartPos = indexOfMatchInSlice( - code, - preloadMarkerWithQuote, - ) + markerStartPos = indexOfMatchInSlice(code, preloadMarkerRE) } if (markerStartPos > 0) { @@ -526,7 +523,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { // there may still be markers due to inlined dynamic imports, remove // all the markers regardless - let markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote) + let markerStartPos = indexOfMatchInSlice(code, preloadMarkerRE) while (markerStartPos >= 0) { if (!rewroteMarkerStartPos.has(markerStartPos)) { s.update( @@ -537,7 +534,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { } markerStartPos = indexOfMatchInSlice( code, - preloadMarkerWithQuote, + preloadMarkerRE, markerStartPos + preloadMarker.length, ) }