Skip to content

Commit c33e362

Browse files
jakstjakst
committed
Reimplement with new solid-start version
Had to throw out the auth library and make some other changes
1 parent 766ed3f commit c33e362

28 files changed

+4279
-4400
lines changed

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"packageManager": "pnpm@9.15.0",
55
"engines": {
6-
"node": "18.x"
6+
"node": "22.x"
77
},
88
"scripts": {
99
"app": "pnpm --filter app",
@@ -27,8 +27,10 @@
2727
"typescript": "^5.7.2"
2828
},
2929
"pnpm": {
30+
"overrides": {
31+
"vite": "6.0.4"
32+
},
3033
"patchedDependencies": {
31-
"solid-start@0.2.26": "patches/solid-start@0.2.26.patch",
3234
"@microlabs/otel-cf-workers@1.0.0-rc.14": "patches/@microlabs__otel-cf-workers@1.0.0-rc.14.patch"
3335
}
3436
}

‎packages/app/.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ dist
33
.output
44
.vercel
55
.netlify
6-
netlify
6+
.vinxi
7+
app.config.timestamp_*.js
8+
9+
# Environment
10+
.env
11+
.env*.local
712

813
# dependencies
914
/node_modules
@@ -21,5 +26,3 @@ gitignore
2126
# System Files
2227
.DS_Store
2328
Thumbs.db
24-
25-
.env

‎packages/app/app.config.ts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { defineConfig } from "@solidjs/start/config"
2+
import Icons from "unplugin-icons/vite"
3+
import { VitePWA } from "vite-plugin-pwa"
4+
5+
export default defineConfig({
6+
vite: {
7+
plugins: [
8+
Icons({ compiler: "solid", autoInstall: true }),
9+
VitePWA({
10+
registerType: "autoUpdate",
11+
workbox: {
12+
globPatterns: ["**/*.{js,css,woff2,png,svg}"],
13+
navigateFallback: null,
14+
runtimeCaching: [
15+
{
16+
urlPattern: ({ url }) => url.pathname === "/",
17+
handler: "StaleWhileRevalidate",
18+
},
19+
],
20+
},
21+
manifest: {
22+
name: "Shopping Bird",
23+
short_name: "Shopping Bird",
24+
description: "Your shopping list",
25+
start_url: "/",
26+
theme_color: "#0369a1",
27+
background_color: "#fff",
28+
icons: [
29+
{ src: "/icon-x192.png", sizes: "192x192", type: "image/png" },
30+
{ src: "/icon-x512.png", sizes: "512x512", type: "image/png" },
31+
{ src: "/maskable-icon-x192.png", sizes: "192x192", type: "image/png", purpose: "maskable" },
32+
{ src: "/maskable-icon-x512.png", sizes: "512x512", type: "image/png", purpose: "maskable" },
33+
],
34+
},
35+
}),
36+
],
37+
},
38+
})

‎packages/app/package.json

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,42 @@
22
"name": "app",
33
"version": "1.0.0",
44
"private": true,
5+
"type": "module",
56
"scripts": {
6-
"dev": "dotenv solid-start dev -- --port 3400",
7-
"build": "solid-start build",
8-
"start": "solid-start start --port 3400"
7+
"dev": "vinxi dev --port 3400",
8+
"build": "vinxi build",
9+
"start": "dotenvx run -- vinxi start --port 3400",
10+
"version": "vinxi version"
911
},
10-
"type": "module",
1112
"devDependencies": {
12-
"@iconify-json/bi": "^1.1.17",
13-
"@iconify-json/ci": "^1.1.9",
14-
"@iconify-json/radix-icons": "^1.1.10",
15-
"autoprefixer": "^10.4.14",
16-
"dotenv-cli": "^7.2.1",
17-
"postcss": "^8.4.25",
18-
"solid-devtools": "^0.27.3",
19-
"tailwindcss": "^3.3.2",
20-
"typescript": "^5.7.2",
21-
"unplugin-icons": "^0.16.5",
22-
"vite": "^4.4.3",
23-
"vite-plugin-pwa": "^0.16.4"
13+
"@dotenvx/dotenvx": "^1.31.0",
14+
"@iconify-json/bi": "1.2.2",
15+
"@iconify-json/ci": "1.2.2",
16+
"@iconify-json/radix-icons": "1.2.2",
17+
"@types/node": "22.10.2",
18+
"autoprefixer": "10.4.20",
19+
"postcss": "8.4.49",
20+
"tailwindcss": "3.4.17",
21+
"typescript": "5.7.2",
22+
"unplugin-icons": "0.22.0",
23+
"vite-plugin-pwa": "0.21.1"
2424
},
2525
"dependencies": {
26-
"@auth/core": "^0.9.0",
27-
"@auth/solid-start": "^0.1.1",
28-
"@radix-ui/colors": "^1.0.0",
29-
"@solid-primitives/connectivity": "^0.3.15",
30-
"@solid-primitives/page-visibility": "^2.0.12",
31-
"@solidjs/meta": "^0.28.5",
32-
"@solidjs/router": "^0.8.2",
33-
"@thisbeyond/solid-dnd": "^0.7.4",
34-
"@types/node": "^20.4.2",
35-
"dotenv": "^16.3.1",
36-
"lib": "workspace:^",
37-
"motion": "^10.16.2",
38-
"solid-js": "^1.9.3",
39-
"solid-motionone": "^1.0.2",
40-
"solid-start": "^0.2.26",
41-
"solid-start-node": "^0.2.26",
42-
"solid-start-vercel": "^0.2.26",
43-
"solid-transition-group": "^0.2.2",
44-
"undici": "^5.22.1",
45-
"workbox-window": "^7.0.0",
46-
"zod": "^3.21.4"
26+
"@radix-ui/colors": "3.0.0",
27+
"@solid-mediakit/auth": "3.1.2",
28+
"@solid-primitives/connectivity": "0.3.20",
29+
"@solid-primitives/page-visibility": "2.0.17",
30+
"@solidjs/meta": "0.29.4",
31+
"@solidjs/router": "0.15.2",
32+
"@solidjs/start": "1.0.10",
33+
"@thisbeyond/solid-dnd": "0.7.5",
34+
"lib": "workspace:*",
35+
"motion": "11.15.0",
36+
"solid-js": "1.9.3",
37+
"solid-motionone": "1.0.2",
38+
"solid-transition-group": "0.2.3",
39+
"vinxi": "0.5.1",
40+
"workbox-window": "7.3.0",
41+
"zod": "3.24.1"
4742
}
4843
}

‎packages/app/src/root.css renamed to ‎packages/app/src/app.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
}
88

99
html,
10-
body {
10+
body,
11+
#app {
1112
height: 100%;
1213
}
1314

‎packages/app/src/app.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { MetaProvider } from "@solidjs/meta"
2+
import { Router } from "@solidjs/router"
3+
import { FileRoutes } from "@solidjs/start/router"
4+
import { Suspense } from "solid-js"
5+
import "./app.css"
6+
7+
export default function App() {
8+
return (
9+
<Router
10+
root={(props) => (
11+
<MetaProvider>
12+
<Suspense>{props.children}</Suspense>
13+
</MetaProvider>
14+
)}
15+
>
16+
<FileRoutes />
17+
</Router>
18+
)
19+
}

‎packages/app/src/components/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type JSX } from "solid-js"
1+
import type { JSX } from "solid-js"
22

33
export function Button(props: { onClick?: () => void; disabled?: boolean; children: JSX.Element }) {
44
return (

0 commit comments

Comments
 (0)