Skip to content

refactor(build): rename indexOfMatchInSlice to findPreloadMarker #21054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

refactor(build): rename indexOfMatchInSlice to findPreloadMarker #21054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions packages/vite/src/node/plugins/importAnalysisBuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@ function toRelativePath(filename: string, importer: string) {
return relPath[0] === '.' ? relPath : `./${relPath}`
}

function indexOfMatchInSlice(
str: string,
reg: RegExp,
pos: number = 0,
): number {
reg.lastIndex = pos
const result = reg.exec(str)
function findPreloadMarker(str: string, pos: number = 0): number {
preloadMarkerRE.lastIndex = pos
const result = preloadMarkerRE.exec(str)
return result?.index ?? -1
}

Expand Down Expand Up @@ -586,14 +582,10 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
addDeps(normalizedFile)
}

let markerStartPos = indexOfMatchInSlice(
code,
preloadMarkerRE,
end,
)
let markerStartPos = findPreloadMarker(code, end)
// fix issue #3051
if (markerStartPos === -1 && imports.length === 1) {
markerStartPos = indexOfMatchInSlice(code, preloadMarkerRE)
markerStartPos = findPreloadMarker(code)
}

if (markerStartPos > 0) {
Expand Down Expand Up @@ -688,7 +680,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, preloadMarkerRE)
let markerStartPos = findPreloadMarker(code)
while (markerStartPos >= 0) {
if (!rewroteMarkerStartPos.has(markerStartPos)) {
s.update(
Expand All @@ -697,9 +689,8 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
'void 0',
)
}
markerStartPos = indexOfMatchInSlice(
markerStartPos = findPreloadMarker(
code,
preloadMarkerRE,
markerStartPos + preloadMarker.length,
)
}
Expand Down