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

Jump to bottom

perf: remove regex in ImportMetaURL plugins #12502

Merged
merged 4 commits into from Mar 22, 2023
Merged

perf: remove regex in ImportMetaURL plugins #12502

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8db1141
perf: extract regex in assetImportMetaURL plugin
patak-dev Mar 20, 2023
70be30e
chore: update
patak-dev Mar 21, 2023
4918d7d
chore: update
patak-dev Mar 21, 2023
7e476cb
chore: whitespace
patak-dev Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/vite/src/node/plugins/assetImportMetaUrl.ts
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
const cleanString = stripLiteral(code)

let match: RegExpExecArray | null

patak-dev marked this conversation as resolved.
Show resolved Hide resolved
while ((match = assetImportMetaUrlRE.exec(cleanString))) {
const { 0: exp, 1: emptyUrl, index } = match

Expand All @@ -52,7 +53,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
if (!s) s = new MagicString(code)

// potential dynamic template string
if (rawUrl[0] === '`' && /\$\{/.test(rawUrl)) {
if (rawUrl[0] === '`' && rawUrl.includes('${')) {
const ast = this.parse(rawUrl)
const templateLiteral = (ast as any).body[0].expression
if (templateLiteral.expressions.length) {
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/plugins/workerImportMetaUrl.ts
View file
Open in desktop
Expand Up @@ -126,7 +126,7 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
const rawUrl = code.slice(urlStart, urlEnd)

// potential dynamic template string
if (rawUrl[0] === '`' && /\$\{/.test(rawUrl)) {
if (rawUrl[0] === '`' && rawUrl.includes('${')) {
this.error(
`\`new URL(url, import.meta.url)\` is not supported in dynamic template string.`,
urlIndex,
Expand Down