From 391edf0add9db25e35f5aa54e71ea9f06f9752e8 Mon Sep 17 00:00:00 2001 From: Bjarki Hall Date: Mon, 20 Jul 2020 20:33:09 +0000 Subject: [PATCH 1/3] feature/use-defineComponent-function-name-in-__DEV__ --- packages/runtime-core/src/apiDefineComponent.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts index 1a22c50ff10..5fb7ce00875 100644 --- a/packages/runtime-core/src/apiDefineComponent.ts +++ b/packages/runtime-core/src/apiDefineComponent.ts @@ -205,5 +205,10 @@ export function defineComponent< // implementation, close to no-op export function defineComponent(options: unknown) { + if(__DEV__) { + return isFunction(options) + ? ((options.name != null) ? { setup: options, name: options.name } : { setup: options }) + : options + } return isFunction(options) ? { setup: options } : options } From 848266c565649dfc30ee6280ab13b1a88ec31e13 Mon Sep 17 00:00:00 2001 From: Bjarki Hall Date: Tue, 21 Jul 2020 14:40:34 +0000 Subject: [PATCH 2/3] Making defineComponent change affect both dev&prod --- packages/runtime-core/src/apiDefineComponent.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts index 5fb7ce00875..8114c543ca5 100644 --- a/packages/runtime-core/src/apiDefineComponent.ts +++ b/packages/runtime-core/src/apiDefineComponent.ts @@ -205,10 +205,7 @@ export function defineComponent< // implementation, close to no-op export function defineComponent(options: unknown) { - if(__DEV__) { - return isFunction(options) - ? ((options.name != null) ? { setup: options, name: options.name } : { setup: options }) - : options - } - return isFunction(options) ? { setup: options } : options + return isFunction(options) + ? ((options.name != null) ? { setup: options, name: options.name } : { setup: options }) + : options } From 03b18ab4c5dad6ce7e23df6d38db941a086c5f12 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 21 Jul 2020 13:14:56 -0400 Subject: [PATCH 3/3] Update apiDefineComponent.ts It's ok for `options.name` to be nullish --- packages/runtime-core/src/apiDefineComponent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts index 8114c543ca5..b85e3b3b732 100644 --- a/packages/runtime-core/src/apiDefineComponent.ts +++ b/packages/runtime-core/src/apiDefineComponent.ts @@ -206,6 +206,6 @@ export function defineComponent< // implementation, close to no-op export function defineComponent(options: unknown) { return isFunction(options) - ? ((options.name != null) ? { setup: options, name: options.name } : { setup: options }) + ? { setup: options, name: options.name } : options }