Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-18 01:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt3): ignore comments for testing cjs context (#2764)

Browse Source
This commit is contained in:
Daniel Roe 2022-01-17 20:50:17 +00:00 committed by GitHub
parent bce07e6d6e
commit e9d73f572f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/nuxt3/src/auto-imports/transform.ts
View File

@ -13,16 +13,16 @@ const excludeRE = [
] ]
const importAsRE = /^.*\sas\s+/ const importAsRE = /^.*\sas\s+/
const seperatorRE = /[,[\]{}\n]/g const separatorRE = /[,[\]{}\n]/g
const multilineCommentsRE = /\/\*\s(.|[\r\n])*?\*\//gm const multilineCommentsRE = /\/\*\s(.|[\r\n])*?\*\//gm
const singlelineCommentsRE = /\/\/\s.*/g const singlelineCommentsRE = /\/\/\s.*$/gm
const templateLiteralRE = /\$\{(.*)\}/g const templateLiteralRE = /\$\{(.*)\}/g
const quotesRE = [ const quotesRE = [
/(["'])((?:\\\1|(?!\1)|.|\r)*?)\1/gm, /(["'])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
/([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
] ]
function stripeCommentsAndStrings (code: string) { function stripCommentsAndStrings (code: string) {
return code return code
.replace(multilineCommentsRE, '') .replace(multilineCommentsRE, '')
.replace(singlelineCommentsRE, '') .replace(singlelineCommentsRE, '')
@ -59,17 +59,17 @@ export const TransformPlugin = createUnplugin((ctx: AutoImportContext) => {
}, },
transform (code) { transform (code) {
// strip comments so we don't match on them // strip comments so we don't match on them
const striped = stripeCommentsAndStrings(code) const stripped = stripCommentsAndStrings(code)
// find all possible injection // find all possible injection
const matched = new Set(Array.from(striped.matchAll(ctx.matchRE)).map(i => i[1])) const matched = new Set(Array.from(stripped.matchAll(ctx.matchRE)).map(i => i[1]))
// remove those already defined // remove those already defined
for (const regex of excludeRE) { for (const regex of excludeRE) {
Array.from(striped.matchAll(regex)) Array.from(stripped.matchAll(regex))
.flatMap(i => [ .flatMap(i => [
...(i[1]?.split(seperatorRE) || []), ...(i[1]?.split(separatorRE) || []),
...(i[2]?.split(seperatorRE) || []) ...(i[2]?.split(separatorRE) || [])
]) ])
.map(i => i.replace(importAsRE, '').trim()) .map(i => i.replace(importAsRE, '').trim())
.forEach(i => matched.delete(i)) .forEach(i => matched.delete(i))
@ -80,7 +80,7 @@ export const TransformPlugin = createUnplugin((ctx: AutoImportContext) => {
} }
// For webpack4/bridge support // For webpack4/bridge support
const isCJSContext = code.includes('require(') const isCJSContext = stripped.includes('require(')
const matchedImports = Array.from(matched).map(name => ctx.map.get(name)).filter(Boolean) const matchedImports = Array.from(matched).map(name => ctx.map.get(name)).filter(Boolean)
const imports = toImports(matchedImports, isCJSContext) const imports = toImports(matchedImports, isCJSContext)