Skip to content

Commit

Permalink
bump vinxi to 0.1.6 and add link between ssr router and client router
Browse files Browse the repository at this point in the history
  • Loading branch information
nksaraf committed Jan 26, 2024
1 parent 27ca39e commit 0b37f36
Show file tree
Hide file tree
Showing 16 changed files with 136 additions and 95 deletions.
2 changes: 1 addition & 1 deletion examples/bare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@solidjs/router": "^0.10.10",
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/experiments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@solidjs/router": "^0.10.10",
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@solidjs/router": "^0.10.10",
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/todomvc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"unstorage": "1.10.1",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"unstorage": "1.10.1",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@solidjs/start": "^0.4.10",
"@vinxi/plugin-mdx": "^3.6.7",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4",
"vinxi": "^0.1.6",
"solid-mdx": "^0.0.7"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion examples/with-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@solidjs/start": "^0.4.10",
"prisma": "^5.7.0",
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-solid-styled/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"solid-styled": "^0.8.2",
"vinxi": "^0.1.4",
"vinxi": "^0.1.6",
"vite-plugin-solid-styled": "^0.8.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"postcss": "^8.4.26",
"solid-js": "^1.8.11",
"tailwindcss": "^3.3.3",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-trpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@solidjs/start": "^0.4.10",
"solid-js": "^1.8.11",
"valibot": "^0.23.0",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"jsdom": "^24.0.0",
"solid-js": "^1.8.11",
"typescript": "^5.3.3",
"vinxi": "^0.1.4",
"vinxi": "^0.1.6",
"vite": "^4.4.9",
"vite-plugin-solid": "^2.9.1",
"vitest": "^1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"turbo": "^1.10.7",
"typescript": "4.7.4",
"valibot": "0.24.1",
"vinxi": "^0.1.4",
"vinxi": "^0.1.6",
"vite": "^4.4.6"
},
"dependencies": {
Expand Down
27 changes: 15 additions & 12 deletions packages/start/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ export function defineConfig(baseConfig = {}) {
{
name: "ssr",
mode: "handler",
link: {
client: "client"
},
handler: `${start.appRoot}/entry-server${entryExtension}`,
middleware: start.middleware,
routes: solidStartServerFsRouter({ dir: `${start.appRoot}/routes`, extensions }),
Expand All @@ -85,10 +88,10 @@ export function defineConfig(baseConfig = {}) {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
"@solidjs/start > source-map-js",
"@solidjs/start > error-stack-parser"
]
}
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),

Expand Down Expand Up @@ -138,10 +141,10 @@ export function defineConfig(baseConfig = {}) {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
"@solidjs/start > source-map-js",
"@solidjs/start > error-stack-parser"
]
}
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),
serverFunctions.client({
Expand Down Expand Up @@ -189,10 +192,10 @@ export function defineConfig(baseConfig = {}) {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
"@solidjs/start > source-map-js",
"@solidjs/start > error-stack-parser"
]
}
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),

Expand Down
8 changes: 4 additions & 4 deletions packages/start/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
},
"devDependencies": {
"solid-js": "^1.8.11",
"vinxi": "^0.1.4"
"vinxi": "^0.1.6"
},
"dependencies": {
"@vinxi/plugin-directives": "^0.1.2",
"@vinxi/server-components": "^0.1.2",
"@vinxi/server-functions": "^0.1.2",
"@vinxi/plugin-directives": "^0.1.3",
"@vinxi/server-components": "^0.1.3",
"@vinxi/server-functions": "^0.1.3",
"defu": "^6.1.2",
"error-stack-parser": "^2.1.4",
"html-to-image": "^1.11.11",
Expand Down
Loading

0 comments on commit 0b37f36

Please sign in to comment.