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

fix(scan): improve script regular matching (fixes #2942) #2961

Merged
merged 4 commits into from Apr 27, 2021
Merged

fix(scan): improve script regular matching (fixes #2942) #2961

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d390a6a
fix(scan): improve script regular matching (fixes #2942)
anncwb Apr 12, 2021
826dcfc
test: add test case
anncwb Apr 12, 2021
2a80bcf
fix: fix html scrpit matching logic
anncwb Apr 12, 2021
7c889b8
fix: Ignore comments when matching
anncwb Apr 14, 2021
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
2 changes: 1 addition & 1 deletion packages/vite/src/node/optimizer/scan.ts
View file
Open in desktop
Expand Up @@ -134,7 +134,7 @@ function globEntries(pattern: string | string[], config: ResolvedConfig) {
}

const scriptModuleRE = /(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims
const scriptRE = /(<script\b[^>]*>)(.*?)<\/script>/gims
const scriptRE = /(<script\b\s[^>]*>)(.*?)<\/script>/gims
anncwb marked this conversation as resolved.
Show resolved Hide resolved
const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im

Expand Down