Merge branch 'main' into fix-middleware-wrapper

solidjs · Jul 23, 2024 · 0676725 · 0676725
2 parents e93153b + 65c8ac0
commit 0676725
Show file tree

Hide file tree

Showing 23 changed files with 123 additions and 111 deletions.
diff --git a/.changeset/quiet-mirrors-judge.md b/.changeset/quiet-mirrors-judge.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+Fixed fetchEvent flakyness by storing the event in h3 context.
diff --git a/examples/bare/package.json b/examples/bare/package.json
@@ -7,9 +7,9 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -10,9 +10,9 @@
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/experiments/package.json b/examples/experiments/package.json
@@ -9,9 +9,9 @@
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -8,9 +8,9 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/notes/package.json b/examples/notes/package.json
@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "date-fns": "^3.6.0",
     "solid-js": "^1.8.18",
     "marked": "^12.0.1",
     "unstorage": "1.10.2",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -8,10 +8,10 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
     "unstorage": "1.10.2",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
     "unstorage": "1.10.2",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-authjs/package.json b/examples/with-authjs/package.json
@@ -20,9 +20,9 @@
     "@solid-mediakit/auth": "^2.0.11",
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-drizzle/package.json b/examples/with-drizzle/package.json
@@ -17,7 +17,7 @@
     "better-sqlite3": "^11.0.0",
     "drizzle-orm": "^0.31.2",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=20"

diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -9,10 +9,10 @@
   "dependencies": {
     "@mdx-js/mdx": "^2.3.0",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "@vinxi/plugin-mdx": "^3.7.1",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0",
+    "vinxi": "^0.4.1",
     "solid-mdx": "^0.0.7"
   },
   "engines": {

diff --git a/examples/with-prisma/package.json b/examples/with-prisma/package.json
@@ -12,10 +12,10 @@
   "dependencies": {
     "@prisma/client": "^5.12.1",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "prisma": "^5.12.1",
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json
@@ -9,10 +9,10 @@
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "solid-js": "^1.8.18",
     "solid-styled": "^0.11.1",
-    "vinxi": "^0.4.0",
+    "vinxi": "^0.4.1",
     "vite-plugin-solid-styled": "^0.11.1"
   },
   "engines": {

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "solid-js": "^1.8.18",
     "tailwindcss": "^3.4.3",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-trpc/package.json b/examples/with-trpc/package.json
@@ -9,13 +9,13 @@
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "@trpc/client": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "@typeschema/valibot": "^0.13.4",
     "solid-js": "^1.8.18",
     "valibot": "^0.29.0",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-unocss/package.json b/examples/with-unocss/package.json
@@ -8,11 +8,11 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "@unocss/reset": "^0.59.2",
     "solid-js": "^1.8.18",
     "unocss": "^0.59.2",
-    "vinxi": "^0.4.0"
+    "vinxi": "^0.4.1"
   },
   "engines": {
     "node": ">=18"

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,15 +12,15 @@
   "devDependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.14.1",
-    "@solidjs/start": "^1.0.5",
+    "@solidjs/start": "^1.0.6",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/user-event": "^14.5.2",
     "@vitest/ui": "^1.5.0",
     "jsdom": "^24.0.0",
     "solid-js": "^1.8.18",
     "typescript": "^5.4.5",
-    "vinxi": "^0.4.0",
+    "vinxi": "^0.4.1",
     "vite": "^5.2.8",
     "vite-plugin-solid": "^2.10.2",
     "vitest": "^1.5.0"

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "turbo": "^1.10.7",
     "typescript": "5.3.3",
     "valibot": "~0.29.0",
-    "vinxi": "^0.4.0",
+    "vinxi": "^0.4.1",
     "vite": "^5.1.1"
   },
   "dependencies": {

diff --git a/packages/start/CHANGELOG.md b/packages/start/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @solidjs/start
 
+## 1.0.6
+
+### Patch Changes
+
+- d86ab61: drastically improve asset resolution performance
+
 ## 1.0.5
 
 ### Patch Changes

diff --git a/packages/start/package.json b/packages/start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.18",
-    "vinxi": "^0.4.0",
+    "vinxi": "^0.4.1",
     "typescript": "^5.4.2"
   },
   "dependencies": {

diff --git a/packages/start/src/server/StartServer.tsx b/packages/start/src/server/StartServer.tsx
@@ -50,10 +50,11 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
       while (matches.length && (!matches[0].info || !matches[0].info.filesystem)) matches.shift();
       const matched = matches.length && matchRoute(matches, context.routes);
       if (matched) {
+        const inputs = import.meta.env.MANIFEST[import.meta.env.START_ISLANDS ? "ssr" : "client"]!
+        .inputs
         for (let i = 0; i < matched.length; i++) {
           const segment = matched[i];
-          const part = import.meta.env.MANIFEST[import.meta.env.START_ISLANDS ? "ssr" : "client"]!
-            .inputs[segment["$component"].src]!;
+          const part = inputs[segment["$component"].src]!;
           assetPromises.push(part.assets() as any);
         }
       } else if (import.meta.env.DEV) console.warn("No route matched for preloading js assets");

diff --git a/packages/start/src/server/fetchEvent.ts b/packages/start/src/server/fetchEvent.ts
@@ -13,7 +13,7 @@ import {
 } from "vinxi/http";
 import type { FetchEvent, ResponseStub } from "./types";
 
-const fetchEventSymbol = Symbol("fetchEvent");
+const fetchEventContext = "solidFetchEvent";
 
 export function createFetchEvent(event: H3Event): FetchEvent {
 	return {
@@ -32,12 +32,12 @@ export function cloneEvent<T extends FetchEvent>(fetchEvent: T): T {
 }
 
 export function getFetchEvent(h3Event: H3Event): FetchEvent {
-	if (!(h3Event as any)[fetchEventSymbol]) {
+	if (!h3Event.context[fetchEventContext]) {
 		const fetchEvent = createFetchEvent(h3Event);
-		(h3Event as any)[fetchEventSymbol] = fetchEvent;
+		h3Event.context[fetchEventContext] = fetchEvent;
 	}
 
-	return (h3Event as any)[fetchEventSymbol];
+	return h3Event.context[fetchEventContext];
 }
 
 export function mergeResponseHeaders(h3Event: H3Event, headers: Headers) {