@solidjs/start 2.0.0-alpha.0 → 2.0.0-alpha.2

package/dist/shared/dev-overlay/icons.jsx

@@ -52,99 +52,99 @@ export function SolidStartIcon(props) {
     return (<svg viewBox="0 0 701 701" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
       <title>{props.title}</title>
       <g filter="url(#filter0_d_1_2)">
-      <rect width="693" height="693" transform="translate(4)" fill="white"/>
-      <mask id="mask0_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="323" y="556" width="174" height="72">
-      <path d="M323.508 627.978L435.81 619.384C435.81 619.384 474.315 613.168 496.842 576.082L417.413 556.809L323.508 627.978Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask0_1_2)">
-      <path d="M510.734 559.645L490 661.769L309.658 625.183L330.349 523.018L510.734 559.645Z" fill="url(#paint0_linear_1_2)"/>
-      </g>
-      <mask id="mask1_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="73" y="364" width="424" height="220">
-      <path d="M168.488 364.785C135.031 366.371 73.2477 372.295 73.2477 372.295L342.489 567.989L403.813 583.341L496.884 576.124L225.974 380.096C225.974 380.096 204.072 364.66 172.91 364.66C171.491 364.66 169.989 364.702 168.488 364.785Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask1_1_2)">
-      <path d="M192.016 773.57L-24.954 425.942L378.115 174.389L595.085 522.017L192.016 773.57Z" fill="url(#paint1_linear_1_2)"/>
-      </g>
-      <mask id="mask2_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="515" y="255" width="179" height="71">
-      <path d="M515.573 325.822L631.254 318.688C631.254 318.688 670.885 312.931 693.621 275.928L611.438 255.487L515.573 325.822Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask2_1_2)">
-      <path d="M557.832 401.58L485.62 272.174L651.32 179.729L723.532 309.135L557.832 401.58Z" fill="url(#paint2_linear_1_2)"/>
-      </g>
-      <mask id="mask3_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="254" y="59" width="440" height="223">
-      <path d="M352.251 59.0417C317.751 60.1681 254.132 65.2993 254.132 65.2993L534.345 265.666L597.755 281.936L693.621 275.928L411.697 75.2279C411.697 75.2279 388.294 59 355.505 59C354.42 59 353.335 59 352.251 59.0417Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask3_1_2)">
-      <path d="M623.161 -102.236L775.386 246.226L324.592 443.172L172.325 94.7097L623.161 -102.236Z" fill="url(#paint3_linear_1_2)"/>
-      </g>
-      <mask id="mask4_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="6" y="371" width="396" height="257">
-      <path d="M6.62575 415.555C6.41717 415.889 6.20858 416.264 6 416.64L79.6305 469.912L153.261 523.185L275.909 611.917C317.125 641.744 373.318 628.895 401.393 583.215L326.762 529.234L252.13 475.252L130.483 387.229C115.632 376.508 98.8203 371.377 82.1335 371.377C53.0567 371.335 24.272 386.895 6.62575 415.555Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask4_1_2)">
-      <path d="M529.756 464.03L265.855 829.387L-122.321 549.008L141.538 183.65L529.756 464.03Z" fill="url(#paint4_linear_1_2)"/>
-      </g>
-      <mask id="mask5_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="187" y="64" width="411" height="263">
-      <path d="M188.47 108.101C188.261 108.476 188.053 108.81 187.844 109.186L264.478 163.751L341.112 218.317L468.725 309.177C511.61 339.714 569.388 327.532 597.755 281.977L520.078 226.661L442.401 171.386L315.832 81.2352C300.063 70.0133 282.25 64.6318 264.645 64.6318C235.026 64.6318 206.074 79.9002 188.47 108.101Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask5_1_2)">
-      <path d="M685.945 96.6704L550.031 471.164L99.6544 307.675L235.527 -66.8184L685.945 96.6704Z" fill="url(#paint5_linear_1_2)"/>
-      </g>
-      <mask id="mask6_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="134" y="164" width="419" height="344">
-      <path d="M134.363 170.051L233.149 278.64C237.571 284.856 242.744 290.571 248.626 295.66L441.567 507.791L537.432 501.784C565.8 456.229 554.036 394.53 511.151 363.993L383.539 273.133L306.863 218.567L230.229 164.002L134.363 170.051Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask6_1_2)">
-      <path d="M291.886 715.5L-31.1699 289.528L408.235 -43.7072L731.291 382.265L291.886 715.5Z" fill="url(#paint6_linear_1_2)"/>
-      </g>
-      <mask id="mask7_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="118" y="170" width="340" height="338">
-      <path d="M133.696 171.094C105.703 216.065 117.301 276.971 159.644 307.091L286.255 397.241L363.932 452.516L441.609 507.791C469.976 462.236 458.212 400.537 415.327 370L287.631 279.141L210.997 224.575L134.363 170.051C134.154 170.384 133.904 170.718 133.696 171.094Z" fill="white"/>
-      </mask>
-      <g mask="url(#mask7_1_2)">
-      <path d="M606.057 239.009L395.553 654.635L-30.4607 438.833L180.043 23.2069L606.057 239.009Z" fill="url(#paint7_linear_1_2)"/>
-      </g>
+        <rect width="693" height="693" transform="translate(4)" fill="white"/>
+        <mask id="mask0_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="323" y="556" width="174" height="72">
+          <path d="M323.508 627.978L435.81 619.384C435.81 619.384 474.315 613.168 496.842 576.082L417.413 556.809L323.508 627.978Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask0_1_2)">
+          <path d="M510.734 559.645L490 661.769L309.658 625.183L330.349 523.018L510.734 559.645Z" fill="url(#paint0_linear_1_2)"/>
+        </g>
+        <mask id="mask1_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="73" y="364" width="424" height="220">
+          <path d="M168.488 364.785C135.031 366.371 73.2477 372.295 73.2477 372.295L342.489 567.989L403.813 583.341L496.884 576.124L225.974 380.096C225.974 380.096 204.072 364.66 172.91 364.66C171.491 364.66 169.989 364.702 168.488 364.785Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask1_1_2)">
+          <path d="M192.016 773.57L-24.954 425.942L378.115 174.389L595.085 522.017L192.016 773.57Z" fill="url(#paint1_linear_1_2)"/>
+        </g>
+        <mask id="mask2_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="515" y="255" width="179" height="71">
+          <path d="M515.573 325.822L631.254 318.688C631.254 318.688 670.885 312.931 693.621 275.928L611.438 255.487L515.573 325.822Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask2_1_2)">
+          <path d="M557.832 401.58L485.62 272.174L651.32 179.729L723.532 309.135L557.832 401.58Z" fill="url(#paint2_linear_1_2)"/>
+        </g>
+        <mask id="mask3_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="254" y="59" width="440" height="223">
+          <path d="M352.251 59.0417C317.751 60.1681 254.132 65.2993 254.132 65.2993L534.345 265.666L597.755 281.936L693.621 275.928L411.697 75.2279C411.697 75.2279 388.294 59 355.505 59C354.42 59 353.335 59 352.251 59.0417Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask3_1_2)">
+          <path d="M623.161 -102.236L775.386 246.226L324.592 443.172L172.325 94.7097L623.161 -102.236Z" fill="url(#paint3_linear_1_2)"/>
+        </g>
+        <mask id="mask4_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="6" y="371" width="396" height="257">
+          <path d="M6.62575 415.555C6.41717 415.889 6.20858 416.264 6 416.64L79.6305 469.912L153.261 523.185L275.909 611.917C317.125 641.744 373.318 628.895 401.393 583.215L326.762 529.234L252.13 475.252L130.483 387.229C115.632 376.508 98.8203 371.377 82.1335 371.377C53.0567 371.335 24.272 386.895 6.62575 415.555Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask4_1_2)">
+          <path d="M529.756 464.03L265.855 829.387L-122.321 549.008L141.538 183.65L529.756 464.03Z" fill="url(#paint4_linear_1_2)"/>
+        </g>
+        <mask id="mask5_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="187" y="64" width="411" height="263">
+          <path d="M188.47 108.101C188.261 108.476 188.053 108.81 187.844 109.186L264.478 163.751L341.112 218.317L468.725 309.177C511.61 339.714 569.388 327.532 597.755 281.977L520.078 226.661L442.401 171.386L315.832 81.2352C300.063 70.0133 282.25 64.6318 264.645 64.6318C235.026 64.6318 206.074 79.9002 188.47 108.101Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask5_1_2)">
+          <path d="M685.945 96.6704L550.031 471.164L99.6544 307.675L235.527 -66.8184L685.945 96.6704Z" fill="url(#paint5_linear_1_2)"/>
+        </g>
+        <mask id="mask6_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="134" y="164" width="419" height="344">
+          <path d="M134.363 170.051L233.149 278.64C237.571 284.856 242.744 290.571 248.626 295.66L441.567 507.791L537.432 501.784C565.8 456.229 554.036 394.53 511.151 363.993L383.539 273.133L306.863 218.567L230.229 164.002L134.363 170.051Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask6_1_2)">
+          <path d="M291.886 715.5L-31.1699 289.528L408.235 -43.7072L731.291 382.265L291.886 715.5Z" fill="url(#paint6_linear_1_2)"/>
+        </g>
+        <mask id="mask7_1_2" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="118" y="170" width="340" height="338">
+          <path d="M133.696 171.094C105.703 216.065 117.301 276.971 159.644 307.091L286.255 397.241L363.932 452.516L441.609 507.791C469.976 462.236 458.212 400.537 415.327 370L287.631 279.141L210.997 224.575L134.363 170.051C134.154 170.384 133.904 170.718 133.696 171.094Z" fill="white"/>
+        </mask>
+        <g mask="url(#mask7_1_2)">
+          <path d="M606.057 239.009L395.553 654.635L-30.4607 438.833L180.043 23.2069L606.057 239.009Z" fill="url(#paint7_linear_1_2)"/>
+        </g>
       </g>
       <defs>
-      <filter id="filter0_d_1_2" x="0" y="0" width="701" height="701" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
-      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-      <feOffset dy="4"/>
-      <feGaussianBlur stdDeviation="2"/>
-      <feComposite in2="hardAlpha" operator="out"/>
-      <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-      <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1_2"/>
-      <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1_2" result="shape"/>
-      </filter>
-      <linearGradient id="paint0_linear_1_2" x1="522.269" y1="40.5341" x2="374.272" y2="769.949" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#1593F5"/>
-      <stop offset="1" stop-color="#0084CE"/>
-      </linearGradient>
-      <linearGradient id="paint1_linear_1_2" x1="507.729" y1="830.625" x2="-112.45" y2="-163.072" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#1593F5"/>
-      <stop offset="1" stop-color="#0084CE"/>
-      </linearGradient>
-      <linearGradient id="paint2_linear_1_2" x1="915.255" y1="847.35" x2="541.738" y2="177.838" gradientUnits="userSpaceOnUse">
-      <stop stop-color="white"/>
-      <stop offset="1" stop-color="#15ABFF"/>
-      </linearGradient>
-      <linearGradient id="paint3_linear_1_2" x1="254.189" y1="-332.587" x2="571.326" y2="393.304" gradientUnits="userSpaceOnUse">
-      <stop stop-color="white"/>
-      <stop offset="1" stop-color="#79CFFF"/>
-      </linearGradient>
-      <linearGradient id="paint4_linear_1_2" x1="610.213" y1="-56.2573" x2="106.317" y2="641.444" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#0057E5"/>
-      <stop offset="1" stop-color="#0084CE"/>
-      </linearGradient>
-      <linearGradient id="paint5_linear_1_2" x1="496.212" y1="-82.6564" x2="337.643" y2="354.288" gradientUnits="userSpaceOnUse">
-      <stop stop-color="white"/>
-      <stop offset="1" stop-color="#15ABFF"/>
-      </linearGradient>
-      <linearGradient id="paint6_linear_1_2" x1="693.692" y1="789.133" x2="-102.675" y2="-260.944" gradientUnits="userSpaceOnUse">
-      <stop stop-color="white"/>
-      <stop offset="1" stop-color="#79CFFF"/>
-      </linearGradient>
-      <linearGradient id="paint7_linear_1_2" x1="555.118" y1="-188.777" x2="146.363" y2="618.161" gradientUnits="userSpaceOnUse">
-      <stop stop-color="white"/>
-      <stop offset="1" stop-color="#79CFFF"/>
-      </linearGradient>
+        <filter id="filter0_d_1_2" x="0" y="0" width="701" height="701" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+          <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+          <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+          <feOffset dy="4"/>
+          <feGaussianBlur stdDeviation="2"/>
+          <feComposite in2="hardAlpha" operator="out"/>
+          <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+          <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1_2"/>
+          <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1_2" result="shape"/>
+        </filter>
+        <linearGradient id="paint0_linear_1_2" x1="522.269" y1="40.5341" x2="374.272" y2="769.949" gradientUnits="userSpaceOnUse">
+          <stop stop-color="#1593F5"/>
+          <stop offset="1" stop-color="#0084CE"/>
+        </linearGradient>
+        <linearGradient id="paint1_linear_1_2" x1="507.729" y1="830.625" x2="-112.45" y2="-163.072" gradientUnits="userSpaceOnUse">
+          <stop stop-color="#1593F5"/>
+          <stop offset="1" stop-color="#0084CE"/>
+        </linearGradient>
+        <linearGradient id="paint2_linear_1_2" x1="915.255" y1="847.35" x2="541.738" y2="177.838" gradientUnits="userSpaceOnUse">
+          <stop stop-color="white"/>
+          <stop offset="1" stop-color="#15ABFF"/>
+        </linearGradient>
+        <linearGradient id="paint3_linear_1_2" x1="254.189" y1="-332.587" x2="571.326" y2="393.304" gradientUnits="userSpaceOnUse">
+          <stop stop-color="white"/>
+          <stop offset="1" stop-color="#79CFFF"/>
+        </linearGradient>
+        <linearGradient id="paint4_linear_1_2" x1="610.213" y1="-56.2573" x2="106.317" y2="641.444" gradientUnits="userSpaceOnUse">
+          <stop stop-color="#0057E5"/>
+          <stop offset="1" stop-color="#0084CE"/>
+        </linearGradient>
+        <linearGradient id="paint5_linear_1_2" x1="496.212" y1="-82.6564" x2="337.643" y2="354.288" gradientUnits="userSpaceOnUse">
+          <stop stop-color="white"/>
+          <stop offset="1" stop-color="#15ABFF"/>
+        </linearGradient>
+        <linearGradient id="paint6_linear_1_2" x1="693.692" y1="789.133" x2="-102.675" y2="-260.944" gradientUnits="userSpaceOnUse">
+          <stop stop-color="white"/>
+          <stop offset="1" stop-color="#79CFFF"/>
+        </linearGradient>
+        <linearGradient id="paint7_linear_1_2" x1="555.118" y1="-188.777" x2="146.363" y2="618.161" gradientUnits="userSpaceOnUse">
+          <stop stop-color="white"/>
+          <stop offset="1" stop-color="#79CFFF"/>
+        </linearGradient>
       </defs>
     </svg>);
 }

package/dist/shared/dev-overlay/index.jsx

@@ -1,5 +1,5 @@
 // @refresh skip
-import { ErrorBoundary, Show, createEffect, createSignal, onCleanup, resetErrorBoundaries } from "solid-js";
+import { ErrorBoundary, Show, createEffect, createSignal, onCleanup, resetErrorBoundaries, } from "solid-js";
 import { HttpStatusCode } from "../HttpStatusCode.js";
 import clientOnly from "../clientOnly.js";
 const DevOverlayDialog = import.meta.env.PROD

package/dist/shared/lazy.js

@@ -31,10 +31,12 @@ const withAssets = function (fn) {
                 const { nonce } = getRequestEvent();
                 useAssets(assets, nonce);
                 return mod.default(props);
-            }
+            },
         };
     };
     return wrapper;
 };
-const lazy = !isServer ? solidLazy : (fn) => solidLazy(withAssets(fn));
+const lazy = !isServer
+    ? solidLazy
+    : (fn) => solidLazy(withAssets(fn));
 export default lazy;

package/env.d.ts

@@ -0,0 +1,9 @@
+// This file contains global type definitions that are exported as @solidjs/start/env
+
+/// <reference types="vite/client" />
+
+declare namespace App {
+  export interface RequestEventLocals {
+    [key: string | symbol]: any;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.2",
   "type": "module",
   "exports": {
     ".": "./dist/index.jsx",
@@ -11,7 +11,8 @@
     "./server/spa": "./dist/server/spa/index.jsx",
     "./client/spa": "./dist/client/spa/index.jsx",
     "./middleware": "./dist/middleware/index.js",
-    "./http": "./dist/http/index.js"
+    "./http": "./dist/http/index.js",
+    "./env": "./env.d.ts"
   },
   "publishConfig": {
     "access": "public"
@@ -36,8 +37,8 @@
     "path-to-regexp": "^8.2.0",
     "pathe": "^2.0.3",
     "radix3": "^1.1.2",
-    "seroval": "^1.3.2",
-    "seroval-plugins": "^1.2.1",
+    "seroval": "^1.4.1",
+    "seroval-plugins": "^1.4.0",
     "shiki": "^1.26.1",
     "solid-js": "^1.9.9",
     "source-map-js": "^1.2.1",

package/scripts/build.js

@@ -9,7 +9,7 @@ await Promise.all(
     fs.cp(
       path.join(import.meta.dirname, "../src", file),
       path.join(import.meta.dirname, "../dist", file),
-      { recursive: true }
-    )
-  )
+      { recursive: true },
+    ),
+  ),
 );

package/scripts/validate-imports.js

@@ -115,7 +115,7 @@ function extractImportExportStatements(content, filePath) {
     // Export from: export { ... } from '...'
     /export\s+(?:\{[^}]*\}|\*)\s+from\s+['"`]([^'"`]+)['"`]/g,
     // Export default from: export { default } from '...'
-    /export\s+\{\s*default\s*\}\s+from\s+['"`]([^'"`]+)['"`]/g
+    /export\s+\{\s*default\s*\}\s+from\s+['"`]([^'"`]+)['"`]/g,
     // Note: Dynamic imports are excluded as they're handled by bundlers
   ];
 
@@ -147,7 +147,7 @@ function extractImportExportStatements(content, filePath) {
             path: importPath,
             line: lineNumber + 1,
             fullLine: line.trim(),
-            filePath
+            filePath,
           });
         }
       }
@@ -175,7 +175,7 @@ function validateFile(filePath) {
             line: statement.line,
             importPath: statement.path,
             fullLine: statement.fullLine,
-            type: "invalid-extension"
+            type: "invalid-extension",
           });
         } else if (!hasValidExtension(statement.path)) {
           errors.push({
@@ -183,7 +183,7 @@ function validateFile(filePath) {
             line: statement.line,
             importPath: statement.path,
             fullLine: statement.fullLine,
-            type: "missing-extension"
+            type: "missing-extension",
           });
         }
       }
@@ -243,7 +243,7 @@ function validateImports() {
 
     if (missingExtensionErrors.length > 0) {
       console.log(
-        `❌ Found ${missingExtensionErrors.length} relative import(s) without extensions:\n`
+        `❌ Found ${missingExtensionErrors.length} relative import(s) without extensions:\n`,
       );
 
       const missingByFile = new Map();
@@ -262,7 +262,7 @@ function validateImports() {
           console.log(`  Line ${error.line}: ${error.importPath}`);
           console.log(`    ${error.fullLine}`);
           console.log(
-            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`
+            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`,
           );
         });
         console.log("");
@@ -271,7 +271,7 @@ function validateImports() {
 
     if (invalidExtensionErrors.length > 0) {
       console.log(
-        `❌ Found ${invalidExtensionErrors.length} relative import(s) with invalid extensions:\n`
+        `❌ Found ${invalidExtensionErrors.length} relative import(s) with invalid extensions:\n`,
       );
 
       const invalidByFile = new Map();
@@ -290,7 +290,7 @@ function validateImports() {
           console.log(`  Line ${error.line}: ${error.importPath}`);
           console.log(`    ${error.fullLine}`);
           console.log(
-            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`
+            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`,
           );
         });
         console.log("");

package/src/client/mount.ts

@@ -1,114 +1 @@
-import type { JSX } from "solid-js";
-import { createStore } from "solid-js/store";
-import {
-  createComponent,
-  getHydrationKey,
-  getOwner,
-  hydrate,
-  type MountableElement
-} from "solid-js/web";
-
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/mount
- */
-export function mount(fn: () => JSX.Element, el: MountableElement) {
-  if (import.meta.env.START_ISLANDS) {
-    const map = new WeakMap();
-    async function mountIsland(el: HTMLElement) {
-      if (el.dataset.css) {
-        let css = JSON.parse(el.dataset.css);
-        for (let href of css) {
-          if (!document.querySelector(`link[href="${href}"]`)) {
-            let link = document.createElement("link");
-            link.rel = "stylesheet";
-            link.href = href;
-            document.head.appendChild(link);
-          }
-        }
-      }
-
-      let mod = await import(
-        /* @vite-ignore */
-        import.meta.env.MANIFEST["client"]!.chunks[el.dataset.id!.split("#")[0] as string]!.output
-          .path
-      );
-      if (!mod || !el.dataset.hk) return;
-
-      let Component = mod[el.dataset.id!.split("#")[1] as string];
-      let hk = el.dataset.hk;
-      // _$DEBUG("hydrating island", el.dataset.island, hk.slice(0, hk.length - 1) + `1-`, el);
-
-      let props = createStore({
-        ...JSON.parse(el.dataset.props!),
-        get children() {
-          const p = el.getElementsByTagName("solid-children");
-          getHydrationKey();
-          [...p].forEach(a => {
-            (a as any).__$owner = getOwner();
-          });
-          return;
-        }
-      });
-
-      map.set(el, props);
-
-      hydrate(() => createComponent(Component, props[0]), el, {
-        renderId: hk.slice(0, hk.length - 1) + `${1 + Number(el.dataset.offset)}-`,
-        owner: lookupOwner(el)
-      });
-
-      delete el.dataset.hk;
-      el.dataset.hkk = hk;
-    }
-
-    let queue: HTMLElement[] = [];
-    let queued = false;
-    function runTaskQueue(info: any) {
-      while (info.timeRemaining() > 0 && queue.length) {
-        mountIsland(queue.shift()!);
-      }
-      if (queue.length) {
-        requestIdleCallback(runTaskQueue);
-      } else queued = false;
-    }
-
-    const hydrateIslands = () => {
-      const islands: NodeListOf<HTMLElement> = document.querySelectorAll("solid-island[data-hk]");
-      const assets = new Set<string>();
-      islands.forEach((el: HTMLElement) => el.dataset.id && assets.add(el.dataset.id));
-      Promise.all(
-        [...assets].map(
-          asset =>
-            import(
-              /* @vite-ignore */ import.meta.env.MANIFEST["client"]!.chunks[
-                asset.split("#")[0] as string
-              ]!.output.path
-            )
-        )
-      )
-        .then(() => {
-          islands.forEach((el: HTMLElement) => {
-            if (el.dataset.when === "idle" && "requestIdleCallback" in window) {
-              if (!queued) {
-                queued = true;
-                requestIdleCallback(runTaskQueue);
-              }
-              queue.push(el);
-            } else mountIsland(el as HTMLElement);
-          });
-        })
-        .catch(e => console.error(e));
-    };
-
-    function lookupOwner(el: HTMLElement) {
-      const parent = el.closest("solid-children");
-      return parent && (parent as any).__$owner;
-    }
-
-    hydrateIslands();
-
-    return;
-  }
-  return hydrate(fn, el);
-}
+export { hydrate as mount } from "solid-js/web"

package/src/config/constants.ts

@@ -10,10 +10,10 @@ export const VIRTUAL_MODULES = {
   serverFnManifest: "solidstart:server-fn-manifest",
   clientEntry: "solid-start:client-entry",
   serverEntry: "solid-start:server-entry",
-  app: "solid-start:app"
+  app: "solid-start:app",
 } as const;
 
 export const VITE_ENVIRONMENTS = {
   client: "client",
-  server: "ssr"
-}
+  server: "ssr",
+};