theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler-sfc): removeSpecifier issue when removing initial imports (script-setup) (#2729)

Browse Source
This commit is contained in:
Matias Capeletto
2021-02-13 10:06:34 +01:00
committed by GitHub
parent 22b382a714
commit 6d762a84ca
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/compiler-sfc/src/compileScript.ts
View File

@@ -597,19 +597,23 @@ export function compileScript(
// dedupe imports
let removed = 0
let prev: Node | undefined, next: Node | undefined
const removeSpecifier = (node: Node) => {
const removeSpecifier = (i: number) => {
const removeLeft = i > removed
removed++
const current = node.specifiers[i]
const next = node.specifiers[i + 1]
s.remove(
prev ? prev.end! + startOffset : node.start! + startOffset,
next && !prev ? next.start! + startOffset : node.end! + startOffset
removeLeft
? node.specifiers[i - 1].end! + startOffset
: current.start! + startOffset,
next && !removeLeft
? next.start! + startOffset
: current.end! + startOffset
)
}
for (let i = 0; i < node.specifiers.length; i++) {
const specifier = node.specifiers[i]
prev = node.specifiers[i - 1]
next = node.specifiers[i + 1]
const local = specifier.local.name
const imported =
specifier.type === 'ImportSpecifier' &&
@@ -621,11 +625,11 @@ export function compileScript(
source === 'vue' &&
(imported === DEFINE_PROPS || imported === DEFINE_EMIT)
) {
removeSpecifier(specifier)
removeSpecifier(i)
} else if (existing) {
if (existing.source === source && existing.imported === imported) {
// already imported in <script setup>, dedupe
removeSpecifier(specifier)
removeSpecifier(i)
} else {
error(`different imports aliased to same local name.`, specifier)
}