@void/vue 0.21.1 → 0.21.3

package/dist/plugin.mjs

@@ -3,7 +3,7 @@ import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
 import { normalizePath } from "vite";
-import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, findIslandImports, findStaticCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
 //#region ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
@@ -51,23 +51,6 @@ const COMPONENT_EXTENSIONS = [
 	".ts",
 	".js"
 ];
-const ISLAND_IMPORT_RE = /import\s+([$_A-Za-z][$_\w]*)\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*,?\s*\}/g;
-function findIslandImports(code) {
-	const imports = [];
-	let match;
-	ISLAND_IMPORT_RE.lastIndex = 0;
-	while ((match = ISLAND_IMPORT_RE.exec(code)) !== null) {
-		const specifierRaw = match[2];
-		imports.push({
-			statement: match[0],
-			importName: match[1],
-			specifierRaw,
-			specifier: specifierRaw.slice(1, -1),
-			hydrate: match[3].slice(1, -1)
-		});
-	}
-	return imports;
-}
 function extractCss(filePath) {
 	const code = readFileSync(filePath, "utf-8");
 	const parts = [];
@@ -130,7 +113,7 @@ function islandsPlugin(pagesDir, options) {
 					const filePath = resolve(pagesDir, entry.filePath);
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
-					for (const islandImport of findIslandImports(code)) {
+					for (const islandImport of findIslandImports(code, filePath)) {
 						const spec = islandImport.specifier;
 						const strategy = islandImport.hydrate;
 						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
@@ -191,10 +174,10 @@ function islandsPlugin(pagesDir, options) {
 			handler(code, id) {
 				if (/import\s+\{[^}]*\buseForm\b/.test(code)) this.warn(`islands: useForm cannot be imported in island page '${id}'. Use useIslandForm instead.`);
 				const importerDir = dirname(id);
-				let transformed = code;
+				const edits = [];
 				const wrappers = [];
 				let idx = 0;
-				for (const islandImport of findIslandImports(code)) {
+				for (const islandImport of findIslandImports(code, id)) {
 					const name = islandImport.importName;
 					const specRaw = islandImport.specifierRaw;
 					const strategy = islandImport.hydrate;
@@ -211,20 +194,26 @@ function islandsPlugin(pagesDir, options) {
 					}
 					const islandId = absPath ? normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "") : spec;
 					const replacement = `import ${rawName} from ${specRaw}`;
-					transformed = transformed.replace(islandImport.statement, replacement);
+					edits.push({
+						start: islandImport.start,
+						end: islandImport.end,
+						text: replacement
+					});
 					wrappers.push(`const ${name} = { inheritAttrs: false, render() { const props = this.$attrs; return _h_island("div", { "data-island": ${JSON.stringify(islandId)}, "data-props": JSON.stringify(props), "data-hydrate": ${JSON.stringify(strategy)} }, _h_island(${rawName}, props)); } };`);
 				}
 				if (wrappers.length > 0) {
-					const setupMatch = transformed.match(/<script\b[^>]*\bsetup\b[^>]*>/);
-					if (setupMatch) {
-						const openEnd = setupMatch.index + setupMatch[0].length;
-						const closeIdx = transformed.indexOf("<\/script>", openEnd);
-						if (closeIdx !== -1) transformed = transformed.slice(0, openEnd) + "\nimport { h as _h_island } from \"vue\";" + transformed.slice(openEnd, closeIdx) + "\n" + wrappers.join("\n") + "\n" + transformed.slice(closeIdx);
-					}
-					return {
-						code: transformed,
-						map: null
-					};
+					const setupMatch = code.match(/<script\b[^>]*\bsetup\b[^>]*>/);
+					if (!setupMatch) throw new Error(`islands: Expected a <script setup> block in '${id}'.`);
+					const openEnd = setupMatch.index + setupMatch[0].length;
+					const closeIdx = code.indexOf("<\/script>", openEnd);
+					if (closeIdx === -1) throw new Error(`islands: Expected a closing <\/script> tag in '${id}'.`);
+					return editIslandSource(code, edits, { insert: [{
+						offset: openEnd,
+						text: "\nimport { h as _h_island } from \"vue\";"
+					}, {
+						offset: closeIdx,
+						text: "\n" + wrappers.join("\n") + "\n"
+					}] });
 				}
 			}
 		},
@@ -306,7 +295,6 @@ function generateIslandClientEntry(manifest, cssFiles, isDev) {
 	lines.push("import { initIslands } from \"void/pages-client\";");
 	if (!isDev) {
 		const styleRe = /<style\b([^>]*)>/g;
-		const cssImportRe = /^\s*import\b[^"']*["']([^"']+\.(?:css|scss|sass|less|styl|stylus|pcss|postcss))["']/gm;
 		for (const file of cssFiles) {
 			const content = readFileSync(file, "utf-8");
 			styleRe.lastIndex = 0;
@@ -322,8 +310,7 @@ function generateIslandClientEntry(manifest, cssFiles, isDev) {
 				lines.push(`import ${JSON.stringify(file + query)};`);
 				index++;
 			}
-			cssImportRe.lastIndex = 0;
-			while ((match = cssImportRe.exec(content)) !== null) lines.push(rewriteCssImportForVirtualModule(match[0], match[1], file));
+			for (const item of findStaticCssImports(content, file)) lines.push(rewriteCssImportForVirtualModule(item.statement, item.specifier, file));
 		}
 	}
 	lines.push("const islands = {");
@@ -593,7 +580,7 @@ const { router, initialPageData, initialComponent, initialLayouts, start } =
       isLoading: (ref) => ref.loading,
       applyUpdate(pageData, comp, layouts, options) {
         if (!options?.preserveState) currentPageKey.value++;
-        Object.assign(shared, pageData.shared || {});
+        replaceRecord(shared, pageData.shared || {});
         replaceRecord(errors, pageData.errors || {});
         replaceRecord(params, pageData.params || {});
         currentProps.value = pageData.props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/vue",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -35,12 +35,12 @@
     "pathslash": "^0.1.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
     "vite-plus": "0.3.1",
-    "void": "0.21.1",
+    "void": "0.21.3",
     "vue": "^3.5.42"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "0.21.1",
+    "void": "0.21.3",
     "vue": "^3.5.0"
   },
   "scripts": {