Skip to content
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

refactor: extract common query removal logic #19477

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: extract common query removal logic #19477

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
16 changes: 10 additions & 6 deletions packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ export const isJSRequest = (url: string): boolean => {

const importQueryRE = /(\?|&)import=?(?:&|$)/
const directRequestRE = /(\?|&)direct=?(?:&|$)/
export const urlRE = /(\?|&)url(?:&|$)/
export const rawRE = /(\?|&)raw(?:&|$)/
const internalPrefixes = [
FS_PREFIX,
VALID_ID_PREFIX,
Expand All @@ -343,20 +345,22 @@ export const isImportRequest = (url: string): boolean => importQueryRE.test(url)
export const isInternalRequest = (url: string): boolean =>
InternalPrefixRE.test(url)

const removeQuery = (url: string, queryRE: RegExp) => {
return url.replace(queryRE, '$1').replace(trailingSeparatorRE, '')
}

export function removeImportQuery(url: string): string {
return url.replace(importQueryRE, '$1').replace(trailingSeparatorRE, '')
return removeQuery(url, importQueryRE)
}
export function removeDirectQuery(url: string): string {
return url.replace(directRequestRE, '$1').replace(trailingSeparatorRE, '')
return removeQuery(url, directRequestRE)
}

export const urlRE = /(\?|&)url(?:&|$)/
export const rawRE = /(\?|&)raw(?:&|$)/
export function removeUrlQuery(url: string): string {
return url.replace(urlRE, '$1').replace(trailingSeparatorRE, '')
return removeQuery(url, urlRE)
}
export function removeRawQuery(url: string): string {
return url.replace(rawRE, '$1').replace(trailingSeparatorRE, '')
return removeQuery(url, rawRE)
}

export function injectQuery(url: string, queryToInject: string): string {
Expand Down