Merge pull request #1163 from solidjs/nksaraf/islands-prodA

fixed islands build in prod, vinxi 0.0.54
solidjs · Dec 21, 2023 · a83f1eb · a83f1eb
2 parents b22503d + aa5cfb4
commit a83f1eb
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 106 deletions.
diff --git a/docs/app.tsx b/docs/app.tsx
@@ -169,7 +169,7 @@ function Nav() {
 
   return (
     <nav class="fixed left-0 top-[52px] z-20 col-start-1 row-start-2 h-full min-w-[300px] -translate-x-full space-y-4 overflow-auto bg-slate-100 px-8 pb-20 pt-8 duration-300 ease-in-out peer-checked:translate-x-0 md:relative md:left-auto md:top-auto md:translate-x-0 md:pb-8">
-      <div id="docsearch" />
+      <div id="docsearch" style="height: 30px" />
       <For each={data()}>
         {r => (
           <ul class="first:pt-10-">

diff --git a/docs/components/A.tsx b/docs/components/A.tsx
diff --git a/docs/components/components.tsx b/docs/components/components.tsx
@@ -1,7 +1,7 @@
 import { Title as MetaTitle } from "@solidjs/meta";
+import { A } from "@solidjs/router";
 import { createUniqueId, mergeProps, Show } from "solid-js";
 import "tippy.js/dist/tippy.css";
-import A from "./A";
 import Tooltip from "./tooltip";
 
 export const components = {

diff --git a/examples/bare/package.json b/examples/bare/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -11,7 +11,7 @@
     "@solidjs/router": "^0.10.5",
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/experiments/package.json b/examples/experiments/package.json
@@ -11,7 +11,7 @@
     "@solidjs/router": "^0.10.5",
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -10,7 +10,7 @@
     "@solidjs/router": "^0.10.5",
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -11,7 +11,7 @@
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
     "unstorage": "1.10.1",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json
@@ -14,7 +14,7 @@
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
     "unstorage": "1.10.1",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -10,9 +10,9 @@
     "@mdx-js/mdx": "^2.3.0",
     "@solidjs/router": "^0.10.5",
     "@solidjs/start": "^0.4.1",
-    "@vinxi/plugin-mdx": "^3.6.5",
+    "@vinxi/plugin-mdx": "^3.6.7",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52",
+    "vinxi": "0.0.54",
     "solid-mdx": "^0.0.7"
   },
   "engines": {

diff --git a/examples/with-prisma/package.json b/examples/with-prisma/package.json
@@ -15,7 +15,7 @@
     "@solidjs/start": "^0.4.1",
     "prisma": "^5.7.0",
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json
@@ -12,7 +12,7 @@
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
     "solid-styled": "^0.8.2",
-    "vinxi": "0.0.52",
+    "vinxi": "0.0.54",
     "vite-plugin-solid-styled": "^0.8.3"
   },
   "engines": {

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -13,7 +13,7 @@
     "postcss": "^8.4.26",
     "solid-js": "^1.8.7",
     "tailwindcss": "^3.3.3",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-trpc/package.json b/examples/with-trpc/package.json
@@ -15,7 +15,7 @@
     "@solidjs/start": "^0.4.1",
     "solid-js": "^1.8.7",
     "valibot": "^0.23.0",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "engines": {
     "node": ">=18"

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@tailwindcss/typography": "^0.5.9",
     "@trpc/client": "^9.27.4",
     "@trpc/server": "^9.27.4",
-    "@vinxi/plugin-mdx": "^3.6.5",
+    "@vinxi/plugin-mdx": "^3.6.7",
     "coveralls": "^3.1.1",
     "debug": "^4.3.4",
     "fast-glob": "^3.3.0",
@@ -52,7 +52,7 @@
     "tippy.js": "^6.3.7",
     "turbo": "^1.10.7",
     "typescript": "4.7.4",
-    "vinxi": "0.0.52",
+    "vinxi": "0.0.54",
     "vite": "^4.4.6",
     "valibot": "0.24.1"
   },

diff --git a/packages/start/config/index.d.ts b/packages/start/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
     }
 }
 

diff --git a/packages/start/package.json b/packages/start/package.json
@@ -42,12 +42,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",

diff --git a/packages/start/server/StartServer.tsx b/packages/start/server/StartServer.tsx
@@ -26,22 +26,24 @@ 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;
         }
       }
     }
     // 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>

diff --git a/packages/start/server/page-event.tsx b/packages/start/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),