Skip to content

Commit 6306546

Browse files
authored
Merge branch 'main' into nitro-v2-deprecation-note
2 parents 5a6501d + f79a2cd commit 6306546

38 files changed

Lines changed: 268 additions & 835 deletions

‎.changeset/pre.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"nasty-ladybugs-trade",
2626
"plenty-geese-enter",
2727
"purple-taxes-join",
28+
"quick-taxis-smile",
2829
"rare-canyons-travel",
2930
"sanitize-location-header",
3031
"sharp-llamas-grab",
@@ -36,6 +37,7 @@
3637
"tricky-eels-march",
3738
"tricky-hounds-relate",
3839
"vite-8-compat",
39-
"wicked-laws-bake"
40+
"wicked-laws-bake",
41+
"windows-preview-file-url"
4042
]
4143
}

‎.changeset/quick-taxis-smile.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Update srvx to maintain response compatibility with Nitro v3.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Fix `ERR_UNSUPPORTED_ESM_URL_SCHEME` when running `vite preview` on Windows

‎apps/fixtures/bare/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "fixture-bare",
3-
"type": "module",
43
"private": true,
4+
"type": "module",
55
"scripts": {
66
"dev": "vite dev",
77
"build": "vite build"
88
},
99
"dependencies": {
1010
"@solidjs/start": "workspace:*",
11+
"nitro": "^3.0.260610-beta",
1112
"solid-js": "^1.9.11",
1213
"vite": "^8.0.0"
1314
},

‎apps/fixtures/bare/vite.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { nitro } from "nitro/vite";
12
import { defineConfig } from "vite";
23
import { solidStart } from "../../../packages/start/src/config";
3-
import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src";
44

55
export default defineConfig({
6-
plugins: [solidStart(), nitroV2Plugin()],
6+
plugins: [solidStart(), nitro()],
77
});

‎apps/fixtures/basic/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fixture-basic",
3-
"type": "module",
43
"private": true,
4+
"type": "module",
55
"scripts": {
66
"dev": "vite dev",
77
"build": "vite build"
@@ -10,6 +10,7 @@
1010
"@solidjs/meta": "^0.29.4",
1111
"@solidjs/router": "^0.15.4",
1212
"@solidjs/start": "workspace:*",
13+
"nitro": "^3.0.260610-beta",
1314
"solid-js": "^1.9.11",
1415
"vite": "^8.0.0"
1516
},

‎apps/fixtures/basic/vite.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { nitro } from "nitro/vite";
12
import { defineConfig } from "vite";
23
import { solidStart } from "../../../packages/start/src/config";
3-
import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src";
44

55
export default defineConfig({
6-
plugins: [solidStart(), nitroV2Plugin()],
6+
plugins: [solidStart(), nitro()],
77
});

‎apps/fixtures/css/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fixture-css",
3-
"type": "module",
43
"private": true,
4+
"type": "module",
55
"scripts": {
66
"dev": "vite dev",
77
"build": "vite build",
@@ -11,14 +11,15 @@
1111
"@solidjs/meta": "^0.29.4",
1212
"@solidjs/router": "^0.15.4",
1313
"@solidjs/start": "workspace:*",
14+
"nitro": "^3.0.260610-beta",
1415
"solid-js": "^1.9.11",
1516
"vite": "^8.0.0"
1617
},
17-
"engines": {
18-
"node": ">=24"
19-
},
2018
"devDependencies": {
2119
"@tailwindcss/vite": "^4.3.2",
2220
"tailwindcss": "^4.3.2"
21+
},
22+
"engines": {
23+
"node": ">=24"
2324
}
2425
}

‎apps/fixtures/css/vite.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import tailwindcss from "@tailwindcss/vite";
2+
import { nitro } from "nitro/vite";
23
import { defineConfig } from "vite";
3-
import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src";
44
import { solidStart } from "../../../packages/start/src/config";
55
import virtualCSS from "./src/virtualCssPlugin";
66

77
export default defineConfig({
8-
plugins: [virtualCSS(), solidStart(), nitroV2Plugin(), tailwindcss()],
8+
plugins: [virtualCSS(), solidStart(), nitro(), tailwindcss()],
99
build: {
1010
rollupOptions: {
1111
output: {

‎apps/fixtures/experiments/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fixture-experiments",
3-
"type": "module",
43
"private": true,
4+
"type": "module",
55
"scripts": {
66
"dev": "vite dev",
77
"build": "vite build"
@@ -10,6 +10,7 @@
1010
"@solidjs/meta": "^0.29.4",
1111
"@solidjs/router": "^0.15.4",
1212
"@solidjs/start": "workspace:*",
13+
"nitro": "^3.0.260610-beta",
1314
"solid-js": "^1.9.11",
1415
"vite": "^8.0.0"
1516
},

0 commit comments

Comments
 (0)