Skip to content

Commit 62c52e2

Browse files
committed
fix: resolve options for parser
ref: vuejs/core#9760
1 parent 505c5a8 commit 62c52e2

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

packages/compiler-core/src/compile.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ export function baseCompile(
8282
onError(createCompilerError(ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED))
8383
}
8484

85-
const ast = isString(source) ? baseParse(source, options) : source
85+
const resolvedOptions = extend({}, options, {
86+
prefixIdentifiers
87+
})
88+
const ast = isString(source) ? baseParse(source, resolvedOptions) : source
8689
const [nodeTransforms, directiveTransforms] =
8790
getBaseTransformPreset(prefixIdentifiers)
8891

@@ -96,7 +99,6 @@ export function baseCompile(
9699
transform(
97100
ast,
98101
extend({}, options, {
99-
prefixIdentifiers,
100102
nodeTransforms: [
101103
...nodeTransforms,
102104
...(options.nodeTransforms || []) // user transforms
@@ -109,10 +111,5 @@ export function baseCompile(
109111
})
110112
)
111113

112-
return generate(
113-
ast,
114-
extend({}, options, {
115-
prefixIdentifiers
116-
})
117-
)
114+
return generate(ast, resolvedOptions)
118115
}

packages/compiler-vapor/src/compile.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ export function compile(
4949
// onError(createCompilerError(ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED))
5050
// }
5151

52-
const ast = isString(source) ? parse(source, options) : source
52+
const resolvedOptions = extend({}, options, {
53+
prefixIdentifiers,
54+
})
55+
const ast = isString(source) ? parse(source, resolvedOptions) : source
5356
const [nodeTransforms, directiveTransforms] =
5457
getBaseTransformPreset(prefixIdentifiers)
5558

@@ -63,7 +66,6 @@ export function compile(
6366
const ir = transform(
6467
ast,
6568
extend({}, options, {
66-
prefixIdentifiers,
6769
nodeTransforms: [
6870
...nodeTransforms,
6971
...(options.nodeTransforms || []), // user transforms
@@ -76,12 +78,7 @@ export function compile(
7678
}),
7779
)
7880

79-
return generate(
80-
ir,
81-
extend({}, options, {
82-
prefixIdentifiers,
83-
}),
84-
)
81+
return generate(ir, resolvedOptions)
8582
}
8683

8784
export type TransformPreset = [

0 commit comments

Comments
 (0)