@void/solid 0.7.5 → 0.7.6

package/dist/plugin.mjs

@@ -2,7 +2,7 @@ import solid from "vite-plugin-solid";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { normalizePath } from "vite";
 import { generateComponentManifest, resolveEffectiveLayoutChain, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
-import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, configureIslandCssServer, extractCssImports, fileHasCssImports, needsIslandClientBundle, rebuildIslandCssMap, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
 //#region ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -157,13 +157,7 @@ function islandsPlugin(pagesDir) {
 	const wrapperMeta = /* @__PURE__ */ new Map();
 	let wrapperId = 0;
 	let viteRoot = "";
-	const islandCssMap = /* @__PURE__ */ new Map();
 	let resolvedConfig = null;
-	/** Rebuild islandCssMap from current file contents (re-runs fileHasCssImports). */
-	function rebuildIslandCssMap$1() {
-		if (!pageScan) return;
-		rebuildIslandCssMap(pageScan, pagesDir, islandCssMap, fileHasCssImports);
-	}
 	function computePagesNeedingClientJS$1() {
 		if (!pageScan) return /* @__PURE__ */ new Set();
 		return computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig);
@@ -177,10 +171,8 @@ function islandsPlugin(pagesDir) {
 			isDev = config.command === "serve";
 		},
 		configureServer(server) {
-			configureIslandCssServer(server, islandCssFiles, viteRoot, rebuildIslandCssMap$1);
 			watchPagesForRescan(server, pagesDir, root, (scan) => {
 				pageScan = scan;
-				rebuildIslandCssMap$1();
 			});
 		},
 		async buildStart() {
@@ -228,7 +220,6 @@ function islandsPlugin(pagesDir) {
 					const layoutChain = resolveEffectiveLayoutChain(page, pageScan.layouts, pageScan.namedLayouts);
 					for (const layout of layoutChain) islandCssFiles.add(normalizePath(resolve(pagesDir, layout.filePath)));
 				}
-				rebuildIslandCssMap$1();
 			}
 		},
 		resolveId: {
@@ -254,7 +245,7 @@ function islandsPlugin(pagesDir) {
 					const mdPlugin = resolvedConfig?.plugins?.find((p) => p.name === "void-md");
 					const mdScriptIds = new Set(mdPlugin?.api?.getClientScripts?.()?.keys() ?? []);
 					const needsJS = computePagesNeedingClientJS$1();
-					return generateIslandRenderer(pageScan, pagesDir, isDev, islandCssMap, viteRoot, mdScriptIds, needsJS);
+					return generateIslandRenderer(pageScan, pagesDir, mdScriptIds, needsJS);
 				}
 				if (id === "\0" + ISLANDS_CLIENT_ENTRY_ID) {
 					if (!pageScan) return "";
@@ -329,13 +320,7 @@ export default function _IslandWrap(props) {
 }
 `;
 }
-function generateIslandRenderer(scan, pagesDir, isDev, islandCssMap, viteRoot, mdScriptIds, pagesNeedingClientJS) {
-	let cssMapCode = "";
-	if (isDev && islandCssMap.size > 0) {
-		const cssMapObj = {};
-		for (const [compId, paths] of islandCssMap) cssMapObj[compId] = paths.map((p) => "/" + normalizePath(relative(viteRoot, p)) + ".css");
-		cssMapCode = `const __cssPaths = ${JSON.stringify(cssMapObj)};`;
-	}
+function generateIslandRenderer(scan, pagesDir, mdScriptIds, pagesNeedingClientJS) {
 	const mdScriptIdsCode = `const __mdClientScriptIds = new Set(${JSON.stringify([...mdScriptIds])});`;
 	const needsJSCode = `const __pagesNeedingClientJS = new Set(${JSON.stringify([...pagesNeedingClientJS])});`;
 	return `
@@ -345,7 +330,6 @@ import { SharedContext, ErrorsContext, ParamsContext } from "@void/solid";
 import { renderHeadToString, renderHtmlAttrs, renderBodyAttrs } from "void/pages-head";
 
 ${generateComponentManifest(scan, pagesDir)}
-${cssMapCode}
 ${mdScriptIdsCode}
 ${needsJSCode}
 
@@ -396,7 +380,7 @@ export async function renderIslandPage(pageObj, assetTags) {
 
   return \`<!doctype html>
 <html\${htmlAttrs}>
-<head>\${headHtml}\${typeof __cssPaths !== "undefined" ? (__cssPaths[pageObj.component] || []).map(url => '<link rel="stylesheet" href="' + url + '">').join("\\n") : ""}\${assetTags.css}\${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.preloads : ""}\${__pagesNeedingClientJS.has(pageObj.component) ? generateHydrationScript() : ""}</head>
+<head>\${headHtml}\${assetTags.css}\${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.preloads : ""}\${__pagesNeedingClientJS.has(pageObj.component) ? generateHydrationScript() : ""}</head>
 <body\${bodyAttrs}>
   <div id="app"\${__mdScriptAttr}>\${html}</div>
   \${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.body : ""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/solid",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -43,12 +43,12 @@
     "solid-js": "^1.9.12",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.20",
     "vite-plus": "^0.1.20",
-    "void": "0.7.5"
+    "void": "0.7.6"
   },
   "peerDependencies": {
     "solid-js": "^1.9.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.20",
-    "void": "0.7.5"
+    "void": "0.7.6"
   },
   "scripts": {
     "build": "vp pack",