From a2d283157c37e10312d666429d1954a60ab1f88a Mon Sep 17 00:00:00 2001 From: Jack Zeitoun Date: Sun, 8 Jan 2023 14:07:52 -0800 Subject: [PATCH 1/2] fix: make setup script compilation respect __VUE_PROD_DEVTOOLS__ --- packages/plugin-vue/src/main.ts | 3 ++- packages/plugin-vue/src/script.ts | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 2f1288bf..c5b39286 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -79,7 +79,8 @@ export async function transformMain( // template const hasTemplateImport = - descriptor.template && !isUseInlineTemplate(descriptor, !devServer) + descriptor.template && + !isUseInlineTemplate(descriptor, !devServer && !devToolsEnabled) let templateCode = '' let templateMap: RawSourceMap | undefined = undefined diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts index 5c3ffd3e..71141abc 100644 --- a/packages/plugin-vue/src/script.ts +++ b/packages/plugin-vue/src/script.ts @@ -65,7 +65,10 @@ export function resolveScript( ...options.script, id: descriptor.id, isProd: options.isProduction, - inlineTemplate: isUseInlineTemplate(descriptor, !options.devServer), + inlineTemplate: isUseInlineTemplate( + descriptor, + !options.devServer && !options.devToolsEnabled, + ), templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr), sourceMap: options.sourceMap, genDefaultAs: canInlineMain(descriptor, options) From cc8302f333143d034b3cba5378a2f04b9221d114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Fri, 31 May 2024 02:17:46 +0800 Subject: [PATCH 2/2] refactor --- packages/plugin-vue/src/main.ts | 3 +-- packages/plugin-vue/src/script.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index c5b39286..e9577605 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -79,8 +79,7 @@ export async function transformMain( // template const hasTemplateImport = - descriptor.template && - !isUseInlineTemplate(descriptor, !devServer && !devToolsEnabled) + descriptor.template && !isUseInlineTemplate(descriptor, options) let templateCode = '' let templateMap: RawSourceMap | undefined = undefined diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts index 71141abc..1583c03a 100644 --- a/packages/plugin-vue/src/script.ts +++ b/packages/plugin-vue/src/script.ts @@ -37,9 +37,14 @@ export function setResolvedScript( // inlined template cannot be individually hot updated. export function isUseInlineTemplate( descriptor: SFCDescriptor, - isProd: boolean, + options: ResolvedOptions, ): boolean { - return isProd && !!descriptor.scriptSetup && !descriptor.template?.src + return ( + !options.devServer && + !options.devToolsEnabled && + !!descriptor.scriptSetup && + !descriptor.template?.src + ) } export const scriptIdentifier = `_sfc_main` @@ -65,10 +70,7 @@ export function resolveScript( ...options.script, id: descriptor.id, isProd: options.isProduction, - inlineTemplate: isUseInlineTemplate( - descriptor, - !options.devServer && !options.devToolsEnabled, - ), + inlineTemplate: isUseInlineTemplate(descriptor, options), templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr), sourceMap: options.sourceMap, genDefaultAs: canInlineMain(descriptor, options)