From 0940a24b42b4c8df1a69ab9e684c9736a88a7e08 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 4 May 2023 15:41:31 +0200 Subject: [PATCH 1/3] fix(vite): ignore `nuxt_component` query in ssr style plugin --- packages/vite/src/plugins/ssr-styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/plugins/ssr-styles.ts b/packages/vite/src/plugins/ssr-styles.ts index cca1ab2a90c3..d54f4e3b3231 100644 --- a/packages/vite/src/plugins/ssr-styles.ts +++ b/packages/vite/src/plugins/ssr-styles.ts @@ -93,7 +93,7 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin { async transform (code, id) { const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href)) const query = parseQuery(search) - if (!pathname.match(/\.(vue|((c|m)?j|t)sx?)$/g) || query.macro) { return } + if (!pathname.match(/\.(vue|((c|m)?j|t)sx?)$/g) || query.macro || query.nuxt_component) { return } if (options.shouldInline && !options.shouldInline(id)) { return } const relativeId = relativeToSrcDir(id) From 762af4507f4d70c7ae48d9c8f6b09210316ad397 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 4 May 2023 17:09:10 +0200 Subject: [PATCH 2/3] chore: update --- packages/nuxt/src/core/utils/plugins.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/utils/plugins.ts b/packages/nuxt/src/core/utils/plugins.ts index 9002a133692d..5644b40d2cca 100644 --- a/packages/nuxt/src/core/utils/plugins.ts +++ b/packages/nuxt/src/core/utils/plugins.ts @@ -14,8 +14,8 @@ export function isVue (id: string, opts: { type?: Array<'template' | 'script' | const query = parseQuery(search) - // Macro - if (query.macro && (!opts.type || opts.type.includes('script'))) { + // Macro and component wrapper + if ((query.macro || query.nuxt_component) && (!opts.type || opts.type.includes('script'))) { return true } From d6339f9ffb3039d73fa0321defd32b990a42ba3e Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 4 May 2023 17:36:59 +0200 Subject: [PATCH 3/3] chore: update --- packages/nuxt/src/core/utils/plugins.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/utils/plugins.ts b/packages/nuxt/src/core/utils/plugins.ts index 5644b40d2cca..482a904657a0 100644 --- a/packages/nuxt/src/core/utils/plugins.ts +++ b/packages/nuxt/src/core/utils/plugins.ts @@ -14,8 +14,13 @@ export function isVue (id: string, opts: { type?: Array<'template' | 'script' | const query = parseQuery(search) - // Macro and component wrapper - if ((query.macro || query.nuxt_component) && (!opts.type || opts.type.includes('script'))) { + // Component async/lazy wrapper + if (query.nuxt_component) { + return false + } + + // Macro + if (query.macro && (!opts.type || opts.type.includes('script'))) { return true }