@vizejs/nuxt 0.163.0 → 0.165.0

package/dist/index.mjs

@@ -10,6 +10,7 @@ const COMPONENT_CALL_RE = /_?resolveComponent\s*\(\s*["'`]([^"'`]+)["'`]\s*(?:,\
 const COMPONENTS_IMPORT_RE = /import\s+(?!type\b)\{([^}]*)\}\s+from\s+(["'])#components\2\s*;?/g;
 const COMPONENT_EXT_RE = /\.(?:[cm]?js|ts|vue)$/;
 const DTS_COMPONENT_RE = /^export const (\w+): (?:LazyComponent<)?typeof import\((["'])(.+?)\2\)(?:\.([A-Za-z_$][\w$]*)|\[['"]([A-Za-z_$][\w$]*)['"]\])>?/;
+const DTS_GLOBAL_COMPONENT_RE = /^(?:"([^"]+)"|'([^']+)'|([A-Za-z_$][\w$]*))\??:\s*(?:LazyComponent<)?typeof import\((["'])(.+?)\4\)(?:\.([A-Za-z_$][\w$]*)|\[['"]([A-Za-z_$][\w$]*)['"]\])>?;?$/;
 const DTS_EXT_RE = /\.d\.ts$/;
 const FILE_EXTS = [
 	".js",
@@ -19,6 +20,7 @@ const FILE_EXTS = [
 ];
 const CLIENT_COMPONENT_RE = /\.client\.(?:[cm]?js|ts|vue)$/;
 const SERVER_COMPONENT_RE = /\.server\.(?:[cm]?js|ts|vue)$/;
+const NUXT_ROUTE_ANNOUNCER_RE = /(?:^|[/\\])nuxt-route-announcer\.(?:[cm]?js|ts|vue)$/;
 const RUNTIME_COMPONENT_DIRS = [
 	"dist/runtime/components",
 	"dist/runtime/components/nuxt4",
@@ -61,6 +63,10 @@ function detectComponentMode(filePath) {
 function normalizeComponentMode(mode) {
 	return mode === "client" || mode === "server" ? mode : void 0;
 }
+function needsClientOnlyWrapper(resolved) {
+	if (resolved.mode !== "client") return false;
+	return !NUXT_ROUTE_ANNOUNCER_RE.test(resolved.filePath);
+}
 function parseComponentImportSpecifier(raw) {
 	const trimmed = raw.trim();
 	if (!trimmed) return null;
@@ -89,10 +95,11 @@ function createComponentImport(filePath, exportName, lazy, mode) {
 function addResolvedComponentBinding(componentImports, resolved, variableName, rawVariableName) {
 	let needsCreateClientOnly = false;
 	let needsDefineAsyncComponent = false;
+	const wrapClientOnly = needsClientOnlyWrapper(resolved);
 	if (resolved.lazy) {
 		needsDefineAsyncComponent = true;
 		const exportAccessor = resolved.exportName === "default" ? "module.default" : `module[${JSON.stringify(resolved.exportName)}]`;
-		if (resolved.mode === "client") {
+		if (wrapClientOnly) {
 			needsCreateClientOnly = true;
 			componentImports.push(`const ${variableName} = __nuxt_define_async_component(() => import(${JSON.stringify(resolved.filePath)}).then((module) => __nuxt_create_client_only(${exportAccessor})));`);
 		} else componentImports.push(`const ${variableName} = __nuxt_define_async_component(() => import(${JSON.stringify(resolved.filePath)}).then((module) => ${exportAccessor}));`);
@@ -102,7 +109,7 @@ function addResolvedComponentBinding(componentImports, resolved, variableName, r
 		};
 	}
 	if (resolved.exportName === "default") {
-		if (resolved.mode === "client") {
+		if (wrapClientOnly) {
 			needsCreateClientOnly = true;
 			componentImports.push(`import ${rawVariableName} from ${JSON.stringify(resolved.filePath)};`);
 			componentImports.push(`const ${variableName} = __nuxt_create_client_only(${rawVariableName});`);
@@ -112,7 +119,7 @@ function addResolvedComponentBinding(componentImports, resolved, variableName, r
 			needsDefineAsyncComponent
 		};
 	}
-	if (resolved.mode === "client") {
+	if (wrapClientOnly) {
 		needsCreateClientOnly = true;
 		componentImports.push(`import { ${resolved.exportName} as ${rawVariableName} } from ${JSON.stringify(resolved.filePath)};`);
 		componentImports.push(`const ${variableName} = __nuxt_create_client_only(${rawVariableName});`);
@@ -144,18 +151,58 @@ function forEachLine(content, visit) {
 }
 function loadDtsComponents(rootDir, buildDir) {
 	const resolved = /* @__PURE__ */ new Map();
-	for (const filePath of getNuxtComponentDtsFiles(rootDir, buildDir)) forEachLine(fs.readFileSync(filePath, "utf-8"), (line) => {
-		const match = line.match(DTS_COMPONENT_RE);
-		if (!match) return;
-		const [, name, , importPath, exportNameDot, exportNameBracket] = match;
-		const exportName = exportNameDot || exportNameBracket;
-		if (!exportName) return;
-		const componentImport = createComponentImport(resolveImportPath(path.resolve(path.dirname(filePath), importPath)), exportName, name.startsWith("Lazy"));
-		addComponentAlias(resolved, name, componentImport);
-		addLazyComponentAlias(resolved, name, componentImport);
-	});
+	for (const filePath of getNuxtComponentDtsFiles(rootDir, buildDir)) {
+		let inGlobalComponents = false;
+		let braceDepth = 0;
+		forEachLine(fs.readFileSync(filePath, "utf-8"), (line) => {
+			const trimmed = line.trim();
+			if (!inGlobalComponents && trimmed.includes("interface GlobalComponents")) {
+				inGlobalComponents = true;
+				braceDepth = countBraceDelta(trimmed);
+				return;
+			}
+			if (inGlobalComponents) {
+				braceDepth += countBraceDelta(trimmed);
+				if (braceDepth <= 0) {
+					inGlobalComponents = false;
+					return;
+				}
+				const globalMatch = trimmed.match(DTS_GLOBAL_COMPONENT_RE);
+				if (globalMatch) {
+					const doubleQuotedName = globalMatch[1];
+					const singleQuotedName = globalMatch[2];
+					const bareName = globalMatch[3];
+					const importPath = globalMatch[5];
+					const exportNameDot = globalMatch[6];
+					const exportNameBracket = globalMatch[7];
+					const name = doubleQuotedName || singleQuotedName || bareName;
+					const exportName = exportNameDot || exportNameBracket;
+					if (name && exportName) {
+						const componentImport = createComponentImport(resolveImportPath(path.resolve(path.dirname(filePath), importPath)), exportName, name.startsWith("Lazy"));
+						addComponentAlias(resolved, name, componentImport);
+						addLazyComponentAlias(resolved, name, componentImport);
+					}
+				}
+				return;
+			}
+			const match = trimmed.match(DTS_COMPONENT_RE);
+			if (!match) return;
+			const [, name, , importPath, exportNameDot, exportNameBracket] = match;
+			const exportName = exportNameDot || exportNameBracket;
+			if (!exportName) return;
+			const componentImport = createComponentImport(resolveImportPath(path.resolve(path.dirname(filePath), importPath)), exportName, name.startsWith("Lazy"));
+			addComponentAlias(resolved, name, componentImport);
+			addLazyComponentAlias(resolved, name, componentImport);
+		});
+	}
 	return resolved;
 }
+function countBraceDelta(line) {
+	let delta = 0;
+	for (const ch of line) if (ch === "{") delta++;
+	else if (ch === "}") delta--;
+	return delta;
+}
 function getProjectPackageNames(moduleNames) {
 	const packageNames = new Set(["nuxt"]);
 	for (const name of moduleNames || []) packageNames.add(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/nuxt",
-  "version": "0.163.0",
+  "version": "0.165.0",
   "description": "Nuxt module for Vize - compiler, musea gallery, linter, and type checker",
   "keywords": [
     "compiler",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@nuxt/kit": "4.4.6",
-    "@vizejs/musea-nuxt": "0.163.0",
-    "@vizejs/vite-plugin": "0.163.0",
-    "@vizejs/vite-plugin-musea": "0.163.0",
-    "vize": "0.163.0"
+    "@vizejs/musea-nuxt": "0.165.0",
+    "@vizejs/vite-plugin": "0.165.0",
+    "@vizejs/vite-plugin-musea": "0.165.0",
+    "vize": "0.165.0"
   },
   "devDependencies": {
     "typescript": "6.0.3",
@@ -54,7 +54,8 @@
     "vue-router": "4.5.1"
   },
   "peerDependencies": {
-    "nuxt": "^2.16.0 || ^3.0.0 || ^4.0.0"
+    "nuxt": "^2.16.0 || ^3.0.0 || ^4.0.0",
+    "vite": "^8.0.0"
   },
   "engines": {
     "node": ">=22"