@void/svelte 0.21.2 → 0.21.4

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, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, extractCssImports, 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";
@@ -49,22 +49,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],
-			specifier: specifierRaw.slice(1, -1),
-			hydrate: match[3].slice(1, -1)
-		});
-	}
-	return imports;
-}
 /**
 * Prefix for virtual island wrapper modules. Must NOT use the `\0` prefix
 * because `@sveltejs/vite-plugin-svelte` skips `\0`-prefixed modules in
@@ -118,7 +102,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);
@@ -181,8 +165,8 @@ 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;
-				for (const islandImport of findIslandImports(code)) {
+				const edits = [];
+				for (const islandImport of findIslandImports(code, id)) {
 					const name = islandImport.importName;
 					const spec = islandImport.specifier;
 					const strategy = islandImport.hydrate;
@@ -198,12 +182,13 @@ function islandsPlugin(pagesDir, options) {
 					const islandId = absPath ? normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "") : spec;
 					const wrapperUrl = WRAPPER_PREFIX + encodeURIComponent(islandId) + ".svelte?src=" + encodeURIComponent(absPath || spec) + "&island=" + encodeURIComponent(islandId) + "&hydrate=" + encodeURIComponent(strategy);
 					const replacement = `import ${name} from ${JSON.stringify(wrapperUrl)}`;
-					transformed = transformed.replace(islandImport.statement, replacement);
+					edits.push({
+						start: islandImport.start,
+						end: islandImport.end,
+						text: replacement
+					});
 				}
-				if (transformed !== code) return {
-					code: transformed,
-					map: null
-				};
+				if (edits.length > 0) return editIslandSource(code, edits);
 			}
 		},
 		config(_, env) {
@@ -329,15 +314,7 @@ function generateIslandClientEntry(manifest, cssFiles, isDev) {
 			lines.push(`import ${JSON.stringify(file + "?island-style&index=" + styleIndex + "&lang." + lang)};`);
 			styleIndex++;
 		}
-		const scriptRe = /<script\b[^>]*>([\s\S]*?)<\/script>/g;
-		const cssImportRe = /^\s*import\b[^"']*["']([^"']+\.(?:css|scss|sass|less|styl|stylus|pcss|postcss))["']/gm;
-		let scriptMatch;
-		while ((scriptMatch = scriptRe.exec(content)) !== null) {
-			const scriptContent = scriptMatch[1];
-			let cssMatch;
-			cssImportRe.lastIndex = 0;
-			while ((cssMatch = cssImportRe.exec(scriptContent)) !== null) lines.push(rewriteCssImportForVirtualModule(cssMatch[0], cssMatch[1], file));
-		}
+		for (const item of findStaticCssImports(content, file)) lines.push(rewriteCssImportForVirtualModule(item.statement, item.specifier, file));
 	}
 	lines.push("const islands = {");
 	for (const [id, path] of uniqueIslands) lines.push(`  ${JSON.stringify(id)}: () => import(${JSON.stringify(path)}),`);
@@ -542,7 +519,7 @@ const { router, initialPageData, initialComponent, initialLayouts, start } =
       isLoading: (ref) => ref.loading,
       applyUpdate(pageData, comp, layouts) {
         propsStore.set(pageData.props);
-        sharedStore.update((s) => ({ ...s, ...(pageData.shared || {}) }));
+        sharedStore.set(pageData.shared || {});
         errorsStore.set(pageData.errors || {});
         routeParams = pageData.params || {};
         paramsStore.set(routeParams);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/svelte",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -37,12 +37,12 @@
     "svelte": "^5.57.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
     "vite-plus": "0.3.1",
-    "void": "0.21.2"
+    "void": "0.21.4"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "0.21.2"
+    "void": "0.21.4"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/App.svelte

@@ -31,6 +31,14 @@
   let navigation = $state(init.navigation || idleNavigationState());
   const router = createRouterFacade(init.router, () => routeUrl, () => params);
 
+  // Layouts can keep the object returned by useShared() across navigations.
+  function replaceShared(next) {
+    for (const key of Object.keys(shared)) {
+      delete shared[key];
+    }
+    Object.assign(shared, next || {});
+  }
+
   // Capitalized alias for dynamic component rendering
   let Page = $derived(currentPage);
 
@@ -57,7 +65,7 @@
       init.stores.page.subscribe((v) => { currentPage = v; }),
       init.stores.props.subscribe((v) => { currentPageProps = v; }),
       init.stores.layouts.subscribe((v) => { currentLayouts = v; }),
-      init.stores.shared.subscribe((v) => { shared = v; }),
+      init.stores.shared.subscribe(replaceShared),
       init.stores.errors.subscribe((v) => { errors = v; }),
       init.stores.params.subscribe((v) => { params = v; }),
       init.stores.route.subscribe((v) => { routeUrl = v; }),