Skip to content

Commit 7ac7c0c

Browse files
committed
Merge remote-tracking branch 'origin/bwsy/feat/compilerSearchElm' into bwsy/feat/compilerSearchElm
# Conflicts: # packages/runtime-core/src/helpers/resolveAssets.ts
2 parents 1618c0a + 97194ff commit 7ac7c0c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

packages/compiler-core/src/runtimeHelpers.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ export const CREATE_COMMENT = Symbol(__DEV__ ? `createCommentVNode` : ``)
1212
export const CREATE_TEXT = Symbol(__DEV__ ? `createTextVNode` : ``)
1313
export const CREATE_STATIC = Symbol(__DEV__ ? `createStaticVNode` : ``)
1414
export const RESOLVE_COMPONENT = Symbol(__DEV__ ? `resolveComponent` : ``)
15-
export const RESOLVE_SETUP_RETURNED = Symbol(__DEV__ ? `resolveSetupReturned` : ``)
15+
export const RESOLVE_SETUP_RETURNED = Symbol(
16+
__DEV__ ? `resolveSetupReturned` : ``
17+
)
1618
export const RESOLVE_DYNAMIC_COMPONENT = Symbol(
1719
__DEV__ ? `resolveDynamicComponent` : ``
1820
)
@@ -58,7 +60,7 @@ export const helperNameMap: Record<symbol, string> = {
5860
[CREATE_TEXT]: `createTextVNode`,
5961
[CREATE_STATIC]: `createStaticVNode`,
6062
[RESOLVE_COMPONENT]: `resolveComponent`,
61-
[RESOLVE_SETUP_RETURNED]:`resolveSetupReturned`,
63+
[RESOLVE_SETUP_RETURNED]: `resolveSetupReturned`,
6264
[RESOLVE_DYNAMIC_COMPONENT]: `resolveDynamicComponent`,
6365
[RESOLVE_DIRECTIVE]: `resolveDirective`,
6466
[RESOLVE_FILTER]: `resolveFilter`,

packages/compiler-core/src/transforms/transformElement.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,9 @@ function resolveSetupReference(name: string, context: TransformContext) {
374374
return context.inline
375375
? // in inline mode, const setup bindings (e.g. imports) can be used as-is
376376
fromConst
377-
: `${helper(getSetupReturnedHelper())}(${JSON.stringify(fromConst)}, $setup)`
377+
: `${helper(getSetupReturnedHelper())}(${JSON.stringify(
378+
fromConst
379+
)}, $setup)`
378380
}
379381

380382
const fromMaybeRef =

0 commit comments

Comments
 (0)