Merge branch 'main' into vinxi-0.1.6

solidjs · Jan 28, 2024 · 9d4e9b8 · 9d4e9b8
2 parents 97e4f77 + 54501ea
commit 9d4e9b8
Show file tree

Hide file tree

Showing 24 changed files with 98 additions and 78 deletions.
diff --git a/.changeset/hip-hounds-tell.md b/.changeset/hip-hounds-tell.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+fix #1278 wrong types for onBeforeResponse middleware
diff --git a/.changeset/neat-apricots-try.md b/.changeset/neat-apricots-try.md
diff --git a/.changeset/popular-mirrors-train.md b/.changeset/popular-mirrors-train.md
diff --git a/.changeset/young-icons-peel.md b/.changeset/young-icons-peel.md
diff --git a/examples/bare/package.json b/examples/bare/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "engines": {

diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -10,7 +10,7 @@
     "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "engines": {

diff --git a/examples/experiments/package.json b/examples/experiments/package.json
@@ -10,7 +10,7 @@
     "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "engines": {

diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "engines": {

diff --git a/examples/todomvc/.data/todos/counter b/examples/todomvc/.data/todos/counter
diff --git a/examples/todomvc/.data/todos/data b/examples/todomvc/.data/todos/data
diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "unstorage": "1.10.1",
     "vinxi": "^0.1.9"
   },

diff --git a/examples/todomvc/src/lib/api.ts b/examples/todomvc/src/lib/api.ts
@@ -11,49 +11,71 @@ const storage = createStorage({
     base: "./.data"
   })
 });
-// storage.setItem("todos:data", []);
-// storage.setItem("todos:counter", 0);
 
 export async function getTodosFn() {
-  return await storage.getItem("todos:data") as Todo[];
+  return ((await storage.getItem("todos:data")) as Todo[]) || [];
 }
 export async function addTodoFn(formData: FormData) {
   const title = formData.get("title") as string;
-  const [{value: todos}, {value: index}] = await storage.getItems(["todos:data", "todos:counter"]);
+  let [{ value: todos }, { value: index }] = await storage.getItems([
+    "todos:data",
+    "todos:counter"
+  ]);
+  // default value for first write
+  todos = todos || [];
+  index = index || 0;
 
   await Promise.all([
-    storage.setItem("todos:data", [...todos as Todo[], { id: index as number, title, completed: false }]),
-    storage.setItem("todos:counter", index as number + 1)
+    storage.setItem("todos:data", [
+      ...(todos as Todo[]),
+      { id: index as number, title, completed: false }
+    ]),
+    storage.setItem("todos:counter", (index as number) + 1)
   ]);
 }
 export async function removeTodoFn(id: number) {
-  const todos = await storage.getItem("todos:data") as Todo[];
-  await storage.setItem("todos:data", todos.filter(todo => todo.id !== id));
+  const todos = (await storage.getItem("todos:data")) as Todo[];
+  await storage.setItem(
+    "todos:data",
+    todos.filter(todo => todo.id !== id)
+  );
 }
 export async function toggleTodoFn(id: number) {
-  const todos = await storage.getItem("todos:data") as Todo[];
-  await storage.setItem("todos:data", todos.map(todo => {
-    if (todo.id === id) {
-      todo.completed = !todo.completed;
-    }
-    return todo;
-  }));
+  const todos = (await storage.getItem("todos:data")) as Todo[];
+  await storage.setItem(
+    "todos:data",
+    todos.map(todo => {
+      if (todo.id === id) {
+        todo.completed = !todo.completed;
+      }
+      return todo;
+    })
+  );
 }
 export async function editTodoFn(id: number, formData: FormData) {
   const title = String(formData.get("title"));
-  const todos = await storage.getItem("todos:data") as Todo[];
-  await storage.setItem("todos:data", todos.map(todo => {
-    if (todo.id === id) {
-      todo.title = title;
-    }
-    return todo;
-  }));
+  const todos = (await storage.getItem("todos:data")) as Todo[];
+  await storage.setItem(
+    "todos:data",
+    todos.map(todo => {
+      if (todo.id === id) {
+        todo.title = title;
+      }
+      return todo;
+    })
+  );
 }
 export async function clearCompletedFn() {
-  const todos = await storage.getItem("todos:data") as Todo[];
-  await storage.setItem("todos:data", todos.filter(todo => !todo.completed));
+  const todos = (await storage.getItem("todos:data")) as Todo[];
+  await storage.setItem(
+    "todos:data",
+    todos.filter(todo => !todo.completed)
+  );
 }
 export async function toggleAllFn(completed: boolean) {
-  const todos = await storage.getItem("todos:data") as Todo[];
-  await storage.setItem("todos:data", todos.map(todo => ({ ...todo, completed })));
+  const todos = (await storage.getItem("todos:data")) as Todo[];
+  await storage.setItem(
+    "todos:data",
+    todos.map(todo => ({ ...todo, completed }))
+  );
 }
diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "unstorage": "1.10.1",
     "vinxi": "^0.1.9"
   },

diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,8 +11,8 @@
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
     "@vinxi/plugin-mdx": "^3.6.7",
-    "solid-js": "^1.8.11",
-    "vinxi": "^0.1.9",
+    "solid-js": "^1.8.12",
+    "vinxi": "^0.1.9"
     "solid-mdx": "^0.0.7"
   },
   "engines": {

diff --git a/examples/with-prisma/package.json b/examples/with-prisma/package.json
@@ -14,7 +14,7 @@
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
     "prisma": "^5.7.0",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "engines": {

diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json
@@ -10,7 +10,7 @@
     "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "solid-styled": "^0.8.2",
     "vinxi": "^0.1.9",
     "vite-plugin-solid-styled": "^0.8.3"

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -11,7 +11,7 @@
     "@solidjs/start": "^0.4.10",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.26",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "tailwindcss": "^3.3.3",
     "vinxi": "^0.1.9"
   },

diff --git a/examples/with-trpc/package.json b/examples/with-trpc/package.json
@@ -13,7 +13,7 @@
     "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.10.10",
     "@solidjs/start": "^0.4.10",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "valibot": "^0.23.0",
     "vinxi": "^0.1.9"
   },

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -19,7 +19,7 @@
     "@testing-library/user-event": "^14.5.1",
     "@vitest/ui": "^1.1.0",
     "jsdom": "^24.0.0",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "typescript": "^5.3.3",
     "vinxi": "^0.1.9",
     "vite": "^4.4.9",

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "rimraf": "^3.0.2",
     "rollup": "^3.28.1",
     "semver": "^7.5.4",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "solid-mdx": "^0.0.7",
     "solid-start-mdx": "workspace:*",
     "tailwindcss": "^3.3.3",

diff --git a/packages/start/CHANGELOG.md b/packages/start/CHANGELOG.md
@@ -0,0 +1,10 @@
+# @solidjs/start
+
+## 0.4.11
+
+### Patch Changes
+
+- 187acc55: update vinxi, fix #1247, fix #1261
+- 92e8f8f8: fix formData and action issue for cloud runtimes
+- 27d60cd2: better GET signature
+- 24a4eb2e: GET server functions, response returns, cache to use GET
diff --git a/packages/start/package.json b/packages/start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -46,7 +46,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.8.12",
     "vinxi": "^0.1.9"
   },
   "dependencies": {

diff --git a/packages/start/server/middleware.ts b/packages/start/server/middleware.ts
@@ -53,7 +53,7 @@ type RequestMiddleware = (event: FetchEvent) => Response | Promise<Response> | v
 
 type ResponseMiddleware = (
   event: FetchEvent,
-  response: Response
+  response: { body: any }
 ) => Response | Promise<Response> | void | Promise<void>;
 
 function wrapRequestMiddleware(onRequest: RequestMiddleware) {