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: handle files with multiple comments #7202

Merged
merged 2 commits into from Mar 7, 2022
Merged

fix: handle files with multiple comments #7202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b26918
fix: handle files with multiple comments
benmccann Mar 7, 2022
20e664c
test: update test
benmccann Mar 7, 2022
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/__tests__/scan.spec.ts
View file
Open in desktop
Expand Up @@ -30,7 +30,8 @@ describe('optimizer-scan:script-test', () => {
scriptRE.lastIndex = 0
const ret = scriptRE.exec(
`<template>
<!-- <script >var test = null</script> -->
<!-- <script >var test1 = null</script> -->
<!-- <script >var test2 = null</script> -->
</template>`.replace(commentRE, '')
)
expect(ret).toEqual(null)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/optimizer/scan.ts
View file
Open in desktop
Expand Up @@ -143,7 +143,7 @@ function globEntries(pattern: string | string[], config: ResolvedConfig) {
const scriptModuleRE =
/(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims
export const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims
export const commentRE = /<!--(.|[\r\n])*?-->/
export const commentRE = /<!--.*?-->/gs
const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
Expand Down