@void/solid 0.7.12 → 0.7.13

package/dist/plugin.d.mts

@@ -11,6 +11,6 @@ type VoidSolidOptions = Readonly<{
   viewTransitions?: boolean;
   prefetch?: PrefetchConfig;
 }>;
-declare function voidSolid(options?: VoidSolidOptions): ReadonlyArray<Plugin>;
+declare function voidSolid(options?: VoidSolidOptions): Array<Plugin>;
 //#endregion
 export { VoidSolidOptions, voidSolid };

package/dist/plugin.mjs

@@ -141,6 +141,22 @@ 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 `vite-plugin-solid` skips `\0`-prefixed modules in its transform
@@ -178,7 +194,6 @@ function islandsPlugin(pagesDir) {
 		async buildStart() {
 			if (existsSync(pagesDir)) {
 				pageScan = await scanPages(root);
-				const importAttrRe = /import\s+\w+\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
 				const filesToScan = [
 					...pageScan.pages.map((page) => ({
 						filePath: page.componentPath,
@@ -198,11 +213,9 @@ function islandsPlugin(pagesDir) {
 					const filePath = resolve(pagesDir, entry.filePath);
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
-					importAttrRe.lastIndex = 0;
-					let importMatch;
-					while ((importMatch = importAttrRe.exec(code)) !== null) {
-						const spec = importMatch[1].slice(1, -1);
-						const strategy = importMatch[2].slice(1, -1);
+					for (const islandImport of findIslandImports(code)) {
+						const spec = islandImport.specifier;
+						const strategy = islandImport.hydrate;
 						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
 						if (absPath) {
 							const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
@@ -265,16 +278,12 @@ function islandsPlugin(pagesDir) {
 			filter: { id: /\.island\.(tsx|jsx)$/ },
 			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 importAttrRe = /import\s+(\w+)\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
 				const importerDir = dirname(id);
 				let transformed = code;
-				let match;
-				while ((match = importAttrRe.exec(code)) !== null) {
-					const name = match[1];
-					const specRaw = match[2];
-					const strategyRaw = match[3];
-					const spec = specRaw.slice(1, -1);
-					const strategy = strategyRaw.slice(1, -1);
+				for (const islandImport of findIslandImports(code)) {
+					const name = islandImport.importName;
+					const spec = islandImport.specifier;
+					const strategy = islandImport.hydrate;
 					const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
 					if (absPath) {
 						const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
@@ -292,7 +301,7 @@ function islandsPlugin(pagesDir) {
 						hydrate: strategy
 					});
 					const replacement = `import ${name} from ${JSON.stringify(wrapperUrl)}`;
-					transformed = transformed.replace(match[0], replacement);
+					transformed = transformed.replace(islandImport.statement, replacement);
 				}
 				if (transformed !== code) return {
 					code: transformed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/solid",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "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.12"
+    "void": "0.7.13"
   },
   "peerDependencies": {
     "solid-js": "^1.9.0",
     "vite": "^8.0.0",
-    "void": "0.7.12"
+    "void": "0.7.13"
   },
   "scripts": {
     "build": "vp pack",