Merge branch 'main' into main

app.config.ts

@@ -7,6 +7,9 @@ export default defineConfig({
   // experimental: { islands: true },
   server: {
     preset: "cloudflare_module",
+    alias: {
+      "_mime": "mime/index.js"
+    },
     rollupConfig: {
       external: ["__STATIC_CONTENT_MANIFEST", "node:async_hooks"]
     }

examples/bare/package.json

@@ -7,9 +7,9 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/basic/package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/experiments/package.json

@@ -8,10 +8,10 @@
   },
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/hackernews/package.json

@@ -7,10 +7,10 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/notes/package.json

@@ -7,13 +7,13 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "date-fns": "^3.6.0",
     "solid-js": "^1.8.17",
     "marked": "^12.0.1",
     "unstorage": "1.10.2",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/todomvc/package.json

@@ -7,11 +7,11 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
     "unstorage": "1.10.2",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-auth/package.json

@@ -10,11 +10,11 @@
     "@types/node": "^20.12.7"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
     "unstorage": "1.10.2",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-authjs/package.json

@@ -19,10 +19,10 @@
     "@babel/core": "7.24.4",
     "@solid-mediakit/auth": "^2.0.11",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-drizzle/package.json

@@ -12,12 +12,12 @@
     "drizzle-kit": "^0.21.4"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
+    "@solidjs/router": "^0.13.6",
     "@solidjs/start": "^1.0.0",
     "better-sqlite3": "^10.0.0",
     "drizzle-orm": "^0.30.10",
     "solid-js": "^1.8.17",
-    "vinxi": "0.3.11"
+    "vinxi": "0.3.12"
   },
   "engines": {
     "node": ">=20"

examples/with-mdx/package.json

@@ -8,11 +8,11 @@
   },
   "dependencies": {
     "@mdx-js/mdx": "^2.3.0",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "@vinxi/plugin-mdx": "^3.7.1",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "solid-mdx": "^0.0.7"
   },
   "engines": {

examples/with-prisma/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@prisma/client": "^5.12.1",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "prisma": "^5.12.1",
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-solid-styled/package.json

@@ -8,11 +8,11 @@
   },
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "solid-js": "^1.8.17",
     "solid-styled": "^0.11.1",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "vite-plugin-solid-styled": "^0.11.1"
   },
   "engines": {

examples/with-tailwindcss/package.json

@@ -7,13 +7,13 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "solid-js": "^1.8.17",
     "tailwindcss": "^3.4.3",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-trpc/package.json

@@ -8,14 +8,14 @@
   },
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "@trpc/client": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "@typeschema/valibot": "^0.13.4",
     "solid-js": "^1.8.17",
     "valibot": "^0.29.0",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-unocss/package.json

@@ -7,12 +7,12 @@
     "start": "vinxi start"
   },
   "dependencies": {
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "@unocss/reset": "^0.59.2",
     "solid-js": "^1.8.17",
     "unocss": "^0.59.2",
-    "vinxi": "^0.3.11"
+    "vinxi": "^0.3.12"
   },
   "engines": {
     "node": ">=18"

examples/with-vitest/package.json

@@ -11,16 +11,16 @@
   "type": "module",
   "devDependencies": {
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.3",
-    "@solidjs/start": "^1.0.1",
+    "@solidjs/router": "^0.13.6",
+    "@solidjs/start": "^1.0.2",
     "@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.17",
     "typescript": "^5.4.5",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "vite": "^5.2.8",
     "vite-plugin-solid": "^2.10.2",
     "vitest": "^1.5.0"

package.json

@@ -31,7 +31,7 @@
     "@kobalte/core": "^0.13.1",
     "@kobalte/utils": "^0.9.0",
     "@solidjs/meta": "^0.29.0",
-    "@solidjs/router": "^0.13.3",
+    "@solidjs/router": "^0.13.6",
     "@solidjs/start": "workspace:*",
     "@tailwindcss/typography": "^0.5.9",
     "@vinxi/plugin-mdx": "^3.7.1",
@@ -56,7 +56,7 @@
     "turbo": "^1.10.7",
     "typescript": "5.3.3",
     "valibot": "~0.29.0",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "vite": "^5.1.1"
   },
   "dependencies": {

packages/start/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @solidjs/start
 
+## 1.0.2
+
+### Patch Changes
+
+- 9da8b18: fix #1547 add noscript tags to asset rendering
+- d932ebd: Omit some keys from Vite server config
+- b02151f: Add new response type in middleware function
+- ae6ca2e: fix #1514 error header sanitization
+- a52cea5: Pass event to getResponseStatus in set statusCode
+- b47ab2c: Set X-Error for thrown Responses
+- bfdd099: better fix for #1552 error propagation with nojs
+- 23ee2de: fix #1550, add "X-Content-Raw" header
+
 ## 1.0.1
 
 ### Patch Changes

packages/start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "typescript": "^5.4.2"
   },
   "dependencies": {

packages/start/src/runtime/server-handler.ts

@@ -2,16 +2,16 @@
 import { crossSerializeStream, fromJSON, getCrossReferenceHeader } from "seroval";
 // @ts-ignore
 import {
-	CustomEventPlugin,
-	DOMExceptionPlugin,
-	EventPlugin,
-	FormDataPlugin,
-	HeadersPlugin,
-	ReadableStreamPlugin,
-	RequestPlugin,
-	ResponsePlugin,
-	URLPlugin,
-	URLSearchParamsPlugin
+  CustomEventPlugin,
+  DOMExceptionPlugin,
+  EventPlugin,
+  FormDataPlugin,
+  HeadersPlugin,
+  ReadableStreamPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  URLPlugin,
+  URLSearchParamsPlugin
 } from "seroval-plugins/web";
 import { sharedConfig } from "solid-js";
 import { renderToString } from "solid-js/web";
@@ -202,7 +202,7 @@ async function handleServerFunction(h3Event: HTTPEvent) {
       setHeader(h3Event, "X-Error", "true");
     } else if (instance) {
       const error = x instanceof Error ? x.message : typeof x === "string" ? x : "true";
-      setHeader(h3Event, "X-Error", error);
+      setHeader(h3Event, "X-Error", error.replace(/[\r\n]+/g, ""));
     } else {
       x = handleNoJS(x, request, parsed, true);
     }