From 85f68604db51de82b5ca4fa70c6f034ea0fb1b87 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 8 Jul 2022 14:49:14 +0100 Subject: [PATCH] wip: try normalizing specifier --- packages/nuxt/src/pages/macros.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts index 965a54b00b3f..411e4d9ac4e8 100644 --- a/packages/nuxt/src/pages/macros.ts +++ b/packages/nuxt/src/pages/macros.ts @@ -3,6 +3,7 @@ import { createUnplugin } from 'unplugin' import { parseQuery, parseURL, withQuery } from 'ufo' import { findStaticImports, findExports } from 'mlly' import MagicString from 'magic-string' +import { normalize } from 'pathe' export interface TransformMacroPluginOptions { macros: Record @@ -25,6 +26,8 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi function result () { if (s.hasChanged()) { + // Testing CI + console.log({ id, code: s.toString() }) return { code: s.toString(), map: options.sourcemap && s.generateMap({ source: id, includeContent: true }) } } } @@ -48,7 +51,7 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi 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 parsed = parseURL(normalize(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()