@ubean/cli 0.4.3 → 0.4.5

package/dist/cli.js

@@ -10,6 +10,7 @@ import { pathToFileURL } from "node:url";
 import { generateOpenApiTypesFromServer, generateTypes } from "@ubean/build/codegen";
 import { prerender } from "@ubean/build/prerender";
 import { buildProduction } from "@ubean/build/production";
+import { createStaticSsgRenderer } from "@ubean/build/static-render";
 import { NODE_REQUIREMENTS, createCapabilitySet, diagnoseCapabilities, registerBuiltinPresets, resolvePresetByName } from "@ubean/preset";
 import { scanProject } from "@ubean/scan";
 import { applyServerConfig, createUbeanApp } from "@ubean/app";
@@ -19,7 +20,6 @@ import { createServer as createServer$1 } from "vite";
 import vue from "@vitejs/plugin-vue";
 import { ubeanPlugin } from "@ubean/build/vite";
 import { VUE_PLUGIN_INCLUDE, ubeanVite } from "@ubean/build/vue";
-import { createVueRenderer } from "@ubean/client/ssr";
 import { getVueLocaleParam, toVueRouterLocalePath } from "@ubean/i18n";
 import { ubeanIslandsPlugin } from "@ubean/islands/vite";
 import { findAvailablePort, findUserViteConfig, waitForPort } from "@ubean/shared/node";
@@ -403,7 +403,22 @@ const buildCommand = {
 			const hasPrerenderRules = Object.values(config.routeRules || {}).some((r) => r?.prerender === true);
 			if (config.prerender.enabled || hasPrerenderRules) {
 				logger$9.info("Prerendering static pages...");
-				const fetcher = await createSsrFetcher(cwd, manifest);
+				let fetcher;
+				let notFoundRoute = false;
+				let expandRoutes;
+				if (config.mode === "ssg") {
+					const staticRenderer = await createStaticSsgRenderer(cwd, manifest, {
+						pages: result.pages,
+						notFoundPage: result.notFoundPage ?? null,
+						i18n: config.i18n
+					});
+					if (staticRenderer) {
+						fetcher = staticRenderer.fetcher;
+						expandRoutes = staticRenderer.expandRoutes;
+						notFoundRoute = Boolean(result.notFoundPage);
+						logger$9.info("Using static SSG renderer (direct render, no HTTP pipeline)");
+					}
+				} else fetcher = await createSsrFetcher(cwd, manifest);
 				await prerender({
 					cwd,
 					outputDir: config.build.outputDir,
@@ -411,7 +426,9 @@ const buildCommand = {
 					prerender: config.prerender,
 					routeRules: config.routeRules,
 					contentRoutes,
-					fetcher
+					fetcher,
+					notFoundRoute,
+					expandRoutes
 				});
 			}
 			if (config.mode === "ssg" && !process.env.UBEAN_KEEP_SSR) {
@@ -501,6 +518,23 @@ function loadScaffoldOps() {
 		recoverScaffold
 	};
 }
+/** Vite's browser-facing prefix for virtual module ids (see `wrapId`). */
+const VALID_ID_PREFIX = "/@id/";
+/** Vite's URL-safe encoding of the `\0` virtual-module marker. */
+const NULL_BYTE_PLACEHOLDER = "__x00__";
+/**
+* Encode a module-graph URL into a browser-servable path.
+*
+* Virtual module ids carry a raw `\0` marker in the module graph (e.g.
+* UnoCSS's `\0/__uno.css`). A literal NUL is invalid inside HTML — parse5
+* rejects it with `unexpected-null-character`, which surfaces as a warning
+* in `transformIndexHtml`. Mirror Vite's own import-analysis rewriting
+* (`wrapId`: `/@id/` prefix + `\0` → `__x00__`) so the href stays valid
+* and resolvable by the dev server.
+*/
+function toDevCssHref(url) {
+	return url.includes("\0") ? `${VALID_ID_PREFIX}${url.replace(/\0/g, NULL_BYTE_PLACEHOLDER)}` : url;
+}
 /**
 * Collect render-blocking CSS URLs from the Vite dev module graph.
 *
@@ -520,7 +554,7 @@ function collectDevCssLinks(moduleGraph) {
 	for (const mod of moduleGraph.idToModuleMap.values()) {
 		const { url, id } = mod;
 		if (!url || url.includes("?")) continue;
-		if (id?.endsWith(".css") || url.endsWith(".css")) links.add(`${url}?direct`);
+		if (id?.endsWith(".css") || url.endsWith(".css")) links.add(`${toDevCssHref(url)}?direct`);
 	}
 	return [...links];
 }
@@ -658,6 +692,7 @@ async function createViteDevServer(options) {
 	let viteDevtoolsPlugins = [];
 	if (devtoolsEnabled) try {
 		const { DevTools } = await import("@vitejs/devtools");
+		// @vitejs/devtools 也解析到含 @vitejs+devtools peer 上下文的 vite-plus-core
 		viteDevtoolsPlugins = await DevTools({ builtinDevTools: false });
 	} catch {}
 	const userViteConfig = findUserViteConfig(cwd);
@@ -692,6 +727,7 @@ async function createViteDevServer(options) {
 	viteServer = await createServer$1({
 		root: cwd,
 		configFile: userViteConfig ?? false,
+		resolve: { dedupe: ["vue", "vue-router"] },
 		server: {
 			middlewareMode: { server: httpServer },
 			hmr: { port: actualPort + 1e3 }
@@ -715,10 +751,11 @@ async function createViteDevServer(options) {
 			"#ubean-client-entry"
 		] },
 		ssr: {
-			noExternal: ["ubean"],
+			noExternal: ["ubean", /^@ubean\//],
 			external: ["@ubean/i18n"]
 		}
 	});
+	const { createVueRenderer } = await viteServer.ssrLoadModule("@ubean/client/ssr");
 	function enhanceAppWithVite(app, layouts = []) {
 		app.options.layouts = layouts;
 		const routeLoaders = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "CLI for ubean (ubean-next binary: dev, build, prepare, init, preview, page, env, config, devtools, api/layout/middleware/cron/plugin scaffolds) plus the Vite dev server runner",
   "bin": {
     "ubean-next": "./bin/ubean-next.mjs"
@@ -24,15 +24,15 @@
     }
   },
   "dependencies": {
-    "@ubean/app": "0.4.3",
-    "@ubean/build": "0.4.3",
-    "@ubean/client": "0.4.3",
-    "@ubean/config": "0.4.3",
-    "@ubean/i18n": "0.4.3",
-    "@ubean/islands": "0.4.3",
-    "@ubean/preset": "0.4.3",
-    "@ubean/scan": "0.4.3",
-    "@ubean/shared": "0.4.3",
+    "@ubean/app": "0.4.5",
+    "@ubean/build": "0.4.5",
+    "@ubean/client": "0.4.5",
+    "@ubean/config": "0.4.5",
+    "@ubean/i18n": "0.4.5",
+    "@ubean/islands": "0.4.5",
+    "@ubean/preset": "0.4.5",
+    "@ubean/scan": "0.4.5",
+    "@ubean/shared": "0.4.5",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
@@ -45,8 +45,8 @@
     "vite-plus": "0.3.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.4.3",
-    "@ubean/devtools": "0.4.3",
+    "@ubean/content": "0.4.5",
+    "@ubean/devtools": "0.4.5",
     "@vitejs/plugin-vue": "^6.0.8",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0"
   },