From 331d499cca8cc2b33783b352f7b71c507dadae35 Mon Sep 17 00:00:00 2001 From: Jaemin Choi <1dotolee@gmail.com> Date: Sat, 11 Jun 2022 00:33:09 +0000 Subject: [PATCH 1/2] fix(nuxt): don't add macro query to the end of id --- packages/nuxt/src/pages/macros.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts index 93b337c08be..617cfaf4a11 100644 --- a/packages/nuxt/src/pages/macros.ts +++ b/packages/nuxt/src/pages/macros.ts @@ -46,7 +46,8 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi // with workaround for vue-loader bug: https://github.com/vuejs/vue-loader/pull/1911 const scriptImport = findStaticImports(code).find(i => parseQuery(i.specifier.replace('?macro=true', '')).type === 'script') if (scriptImport) { - const specifier = withQuery(scriptImport.specifier.replace('?macro=true', ''), { macro: 'true' }) + const parsed = parseURL(scriptImport.specifier.replace('?macro=true', '')) + const specifier = withQuery(parsed.pathname, { macro: 'true', ...parseQuery(parsed.search) }) s.overwrite(0, code.length, `export { meta } from "${specifier}"`) return result() } From 4f4addc8d6518579063518789b3b68c3dae4f746 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Sun, 12 Jun 2022 23:45:57 +0200 Subject: [PATCH 2/2] Update packages/nuxt/src/pages/macros.ts --- packages/nuxt/src/pages/macros.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/nuxt/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts index 617cfaf4a11..965a54b00b3 100644 --- a/packages/nuxt/src/pages/macros.ts +++ b/packages/nuxt/src/pages/macros.ts @@ -46,6 +46,8 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi // with workaround for vue-loader bug: https://github.com/vuejs/vue-loader/pull/1911 const scriptImport = findStaticImports(code).find(i => parseQuery(i.specifier.replace('?macro=true', '')).type === 'script') if (scriptImport) { + // https://github.com/vuejs/vue-loader/pull/1911 + // https://github.com/vitejs/vite/issues/8473 const parsed = parseURL(scriptImport.specifier.replace('?macro=true', '')) const specifier = withQuery(parsed.pathname, { macro: 'true', ...parseQuery(parsed.search) }) s.overwrite(0, code.length, `export { meta } from "${specifier}"`)