Merge branch 'main' into devinxi

Author: Brendonovich

.changeset/soft-beans-take.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": minor
+---
+
+adds the option to change the public directory to something other than the default "public"

.github/workflows/compliance.yml

@@ -9,7 +9,7 @@
   "dependencies": {
     "@solidjs/start": "^1.1.0",
     "solid-js": "^1.9.5",
-    "vinxi": "^0.5.3"
+    "vinxi": "^0.5.7"
   },
   "engines": {
     "node": ">=22"

examples/bare/package.json

@@ -12,7 +12,7 @@
     "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.1.0",
     "solid-js": "^1.9.5",
-    "vinxi": "^0.5.3"
+    "vinxi": "^0.5.7"
   },
   "engines": {
     "node": ">=22"

examples/basic/package.json

@@ -11,7 +11,7 @@
     "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.1.0",
     "solid-js": "^1.9.5",
-    "vinxi": "^0.5.3"
+    "vinxi": "^0.5.7"
   },
   "engines": {
     "node": ">=22"

examples/experiments/package.json

@@ -13,7 +13,7 @@
     "solid-js": "^1.9.5",
     "marked": "^12.0.1",
     "unstorage": "1.10.2",
-    "vinxi": "^0.5.3"
+    "vinxi": "^0.5.7"
   },
   "engines": {
     "node": ">=22"

examples/notes/package.json

@@ -0,0 +1,3 @@
+SESSION_SECRET = myverylonguniquesecretthatkeepsthingssafe
+DISCORD_ID = 
+DISCORD_SECRET = 

examples/with-auth/.env.example

@@ -23,6 +23,31 @@ npm run dev
 npm run dev -- --open
 ```
 
+## Env Vars
+
+Rename the example file and add your Discord OAuth credentials:
+
+```bash
+# rename example environment file
+cp .env.example .env
+```
+
+Edit `.env` with your values:
+
+```dotenv
+DISCORD_ID=your-discord-client-id
+DISCORD_SECRET=your-discord-client-secret
+```
+
+1. Create an application at [https://discord.com/developers/applications](https://discord.com/developers/applications) to obtain your client ID and secret.
+2. In the app's **OAuth2 → Redirects** settings, add:
+
+   ```text
+   http://localhost:3000/api/oauth/discord
+   ```
+
+For more details on the [start-oauth](https://github.com/thomasbuilds/start-oauth) integration, see the repository.
+
 ## Building
 
 Solid apps are built with _presets_, which optimise your project for deployment to different environments.

examples/with-auth/README.md

@@ -1,3 +1,6 @@
 import { defineConfig } from "@solidjs/start/config";
+import tailwindcss from "@tailwindcss/vite";
 
-export default defineConfig({});
+export default defineConfig({
+  vite: { plugins: [tailwindcss()] }
+});

examples/with-auth/app.config.ts

@@ -6,15 +6,17 @@
     "build": "vinxi build",
     "start": "vinxi start"
   },
-  "devDependencies": {
-    "@types/node": "^20.12.7"
-  },
   "dependencies": {
-    "@solidjs/router": "^0.15.0",
-    "@solidjs/start": "^1.1.0",
-    "solid-js": "^1.9.5",
-    "unstorage": "1.10.2",
-    "vinxi": "^0.5.3"
+    "@solidjs/router": "^0.15.3",
+    "@solidjs/start": "^1.1.7",
+    "solid-js": "^1.9.7",
+    "start-oauth": "^1.2.4",
+    "unstorage": "1.16.1",
+    "vinxi": "^0.5.8"
+  },
+  "devDependencies": {
+    "@tailwindcss/vite": "^4.1.11",
+    "tailwindcss": "^4.1.11"
   },
   "engines": {
     "node": ">=22"