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: clean string regexp #7871

Merged
merged 9 commits into from Apr 24, 2022
Merged

fix: clean string regexp #7871

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5bd0e69
fix: feat regexp match clean
poyoho Apr 23, 2022
fca59f4
feat: test
poyoho Apr 23, 2022
33db886
fix: test
poyoho Apr 23, 2022
2ec1ff1
fix: comments that are on the same line as a regexp:
poyoho Apr 23, 2022
5f4ab17
fix: escaped
poyoho Apr 23, 2022
d85e6e9
fix: regexp
poyoho Apr 23, 2022
b1d2aea
refactor: make regexp affect in one line
poyoho Apr 23, 2022
97bfb31
chore: clean
poyoho Apr 24, 2022
3768e03
chore: spacing
patak-dev Apr 24, 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
17 changes: 17 additions & 0 deletions packages/vite/src/node/__tests__/cleanString.spec.ts
View file
Open in desktop
@@ -1,3 +1,4 @@
import { assetAttrsConfig } from './../plugins/html'
import { emptyString } from '../../node/cleanString'

test('comments', () => {
Expand Down Expand Up @@ -51,6 +52,22 @@ test('escape character', () => {
expect(clean).not.toMatch('1')
})

test('regexp', () => {
const clean = emptyString(`
/'1\\'1'/
'1\\'1'
/"''''1''''"/
"''''1''''"
/'1'/ // '1'
/'1'/ /* '1' */
/'1'/ // '1'
/'1'/ /* '1' */
/'\\/1'/ // '1'
/'\\/1'/ /* '1' */
`)
expect(clean).not.toMatch('1')
})

test('strings comment nested', () => {
expect(
emptyString(`
Expand Down
6 changes: 4 additions & 2 deletions packages/vite/src/node/cleanString.ts
View file
Open in desktop
Expand Up @@ -2,8 +2,10 @@ import type { RollupError } from 'rollup'
// bank on the non-overlapping nature of regex matches and combine all filters into one giant regex
// /`([^`\$\{\}]|\$\{(`|\g<1>)*\})*`/g can match nested string template
// but js not support match expression(\g<0>). so clean string template(`...`) in other ways.
const cleanerRE =
/"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|\/\*(.|[\r\n])*?\*\/|\/\/.*/g
const stringsRE = /"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'/
const commentsRE = /\/\*(.|[\r\n])*?\*\/|\/\/.*/
const regexpRE = /\/([^\/\r\n]|(?<=\\)\/)*\//
const cleanerRE = new RegExp(`${stringsRE}|${commentsRE}|${regexpRE}`, 'g')

const blankReplacer = (s: string) => ' '.repeat(s.length)
const stringBlankReplacer = (s: string) =>
Expand Down