@ubean/cli 0.4.2 → 0.4.4

package/dist/cli.js

@@ -19,7 +19,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";
@@ -501,6 +500,52 @@ 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.
+*
+* In dev, CSS imported from JS (virtual uno.css entry, global.css, font css)
+* is only applied once the client entry module graph has fully loaded and
+* executed — SSR HTML paints unstyled for that gap (FOUC). Injecting the same
+* CSS modules as blocking `<link>` tags lets the browser fetch them in
+* parallel with the JS graph, so the first paint is styled.
+*
+* `?direct` tells Vite's transform middleware to return raw CSS
+* (`Content-Type: text/css`) instead of the JS style-injection wrapper.
+* Modules whose URL already carries a query (SFC `<style>` blocks such as
+* `*.vue?vue&type=style&...`) cannot be served this way and are skipped.
+*/
+function collectDevCssLinks(moduleGraph) {
+	const links = /* @__PURE__ */ new Set();
+	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(`${toDevCssHref(url)}?direct`);
+	}
+	return [...links];
+}
+/** Inject blocking stylesheet links right before `</head>`. */
+function injectStylesheetLinks(html, hrefs) {
+	if (!hrefs.length || !html.includes("</head>")) return html;
+	const tags = hrefs.map((href) => `<link rel="stylesheet" href="${href}">`).join("");
+	return html.replace("</head>", `${tags}</head>`);
+}
 async function createViteDevServer(options) {
 	const { cwd, config, app: initialApp, layouts: initialLayouts = [] } = options;
 	const host = options.host || "localhost";
@@ -573,8 +618,8 @@ async function createViteDevServer(options) {
 			const contentType = webRes.headers.get("content-type") || "";
 			const skipTransform = (req.url || "").startsWith("/_devtools");
 			if (contentType.includes("text/html") && webRes.body && !skipTransform) {
-				const html = await webRes.text();
-				const transformedHtml = await viteServer.transformIndexHtml(req.url || "/", html);
+				const htmlWithCss = injectStylesheetLinks(await webRes.text(), collectDevCssLinks(viteServer.moduleGraph));
+				const transformedHtml = await viteServer.transformIndexHtml(req.url || "/", htmlWithCss);
 				res.statusCode = webRes.status;
 				res.statusMessage = webRes.statusText;
 				webRes.headers.forEach((value, key) => {
@@ -629,6 +674,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);
@@ -663,6 +709,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 }
@@ -686,10 +733,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.2",
+  "version": "0.4.4",
   "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,29 +24,29 @@
     }
   },
   "dependencies": {
-    "@ubean/app": "0.4.2",
-    "@ubean/build": "0.4.2",
-    "@ubean/client": "0.4.2",
-    "@ubean/config": "0.4.2",
-    "@ubean/i18n": "0.4.2",
-    "@ubean/islands": "0.4.2",
-    "@ubean/preset": "0.4.2",
-    "@ubean/scan": "0.4.2",
-    "@ubean/shared": "0.4.2",
+    "@ubean/app": "0.4.4",
+    "@ubean/build": "0.4.4",
+    "@ubean/client": "0.4.4",
+    "@ubean/config": "0.4.4",
+    "@ubean/i18n": "0.4.4",
+    "@ubean/islands": "0.4.4",
+    "@ubean/preset": "0.4.4",
+    "@ubean/scan": "0.4.4",
+    "@ubean/shared": "0.4.4",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@types/node": "^26.4.1",
+    "@types/node": "^26.5.0",
     "@vitejs/plugin-vue": "^6.0.8",
     "typescript": "7.0.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0",
     "vite-plus": "0.3.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.4.2",
-    "@ubean/devtools": "0.4.2",
+    "@ubean/content": "0.4.4",
+    "@ubean/devtools": "0.4.4",
     "@vitejs/plugin-vue": "^6.0.8",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0"
   },