@solidjs/start 0.4.1 → 0.4.2

package/config/index.d.ts

@@ -8,7 +8,7 @@ type SolidStartInlineConfig = Omit<InlineConfig, "router"> & {
         server?: AppOptions['server'],
         appRoot?: string,
         middleware?: string,
-        //islands?: boolean TODO: Get PROD bugs working probably missing release
+        islands?: boolean
     }
 }
 

package/config/index.js

@@ -38,18 +38,20 @@ function solidStartServerFsRouter(config) {
 }
 
 export function defineConfig(baseConfig = {}) {
-  let { plugins = [], start = {}, ...userConfig } = baseConfig;
+  let { plugins = [], start = {}, base, ...userConfig } = baseConfig;
   const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
   start = defu(start, {
     appRoot: "./src",
     ssr: true,
     islands: false,
+    server: { base },
     solid: {}
   });
   let server = start.server;
   if (!start.ssr) {
     server = { ...server, prerender: { routes: ["/"] } };
   }
+  console.log("start", start)
   let entryExtension = ".tsx"
   if (existsSync(join(process.cwd(), start.appRoot, "app.jsx"))) {
     entryExtension = ".jsx"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -39,12 +39,12 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "dependencies": {
-    "@vinxi/plugin-directives": "0.0.44",
-    "@vinxi/server-components": "0.0.44",
-    "@vinxi/server-functions": "0.0.45",
+    "@vinxi/plugin-directives": "0.0.50",
+    "@vinxi/server-components": "0.0.50",
+    "@vinxi/server-functions": "0.0.51",
     "defu": "^6.1.2",
     "seroval": "^1.0.0",
     "seroval-plugins": "^1.0.1",

package/server/StartServer.tsx

@@ -26,7 +26,8 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
         const match = context.routerMatches[0][i];
         if (match.metadata && match.metadata.filesystem) {
           const segment = current.find(r => r.path === match.path);
-          const part = import.meta.env.MANIFEST["client"].inputs[segment["$component"].src];
+          const part = import.meta.env.MANIFEST[import.meta.env.START_ISLANDS ? "ssr" : "client"]
+            .inputs[segment["$component"].src];
           const asset = await part.assets();
           assets.push.apply(assets, asset);
           current = segment.children;
@@ -34,26 +35,32 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
       }
     }
     // dedupe assets
-    assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(
-      asset =>
-        asset.attrs.rel === "modulepreload" &&
-        !context.assets.find(a => a.attrs.key === asset.attrs.key)
+    assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(asset =>
+      import.meta.env.START_ISLANDS
+        ? false
+        : asset.attrs.rel === "modulepreload" &&
+          !context.assets.find(a => a.attrs.key === asset.attrs.key)
     );
   });
 
-  useAssets(() => assets.length ? assets.map(m => renderAsset(m)) : undefined);
+  useAssets(() => (assets.length ? assets.map(m => renderAsset(m)) : undefined));
 
   return (
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
-        scripts={
+        assets={
           <>
             <HydrationScript />
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
+        scripts={
+          <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
             <script
               type="module"
+              async
               src={
                 import.meta.env.MANIFEST["client"].inputs[
                   import.meta.env.MANIFEST["client"].handler

package/server/page-event.tsx

@@ -35,7 +35,9 @@ export async function createPageEvent(ctx: FetchEvent) {
     assets: [
       ...(await clientManifest.inputs[clientManifest.handler].assets()),
       ...(import.meta.env.START_ISLANDS
-        ? await serverManifest.inputs[serverManifest.handler].assets()
+        ? (await serverManifest.inputs[serverManifest.handler].assets()).filter(
+            s => (s as any).attrs.rel !== "modulepreload"
+          )
         : [])
     ],
     initialSubmission: initFromFlash(ctx),

package/server/spa/StartServer.tsx

@@ -10,11 +10,15 @@ export function StartServer(props) {
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
+        assets={
+          <>
+            <script>$R = [];</script>
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
         scripts={
           <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
-            <script>$R = [];</script>
             <script
               type="module"
               src={