Skip to content

Commit 98d0ca2

Browse files
authored
Merge branch 'main' into vite-8-compat
2 parents 5ca35c4 + 5e17472 commit 98d0ca2

File tree

7 files changed

+315
-398
lines changed

7 files changed

+315
-398
lines changed

apps/fixtures/hackernews/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"dependencies": {
1010
"@solidjs/router": "^0.15.0",
1111
"@solidjs/start": "workspace:*",
12-
"nitro": "3.0.1-alpha.0",
1312
"solid-js": "^1.9.9",
1413
"vite": "7.1.10"
1514
},

apps/fixtures/hackernews/vite.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { defineConfig } from "vite";
22

33
import { solidStart } from "../../../packages/start/src/config";
4-
import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src";
54

65
export default defineConfig({
76
plugins: [solidStart()],

apps/fixtures/nitro-3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@solidjs/router": "^0.15.0",
1313
"@solidjs/start": "workspace:*",
1414
"solid-js": "^1.9.9",
15-
"nitro": "^3.0.1-alpha.1",
15+
"nitro": "^3.0.1-alpha.2",
1616
"vite": "7.1.10"
1717
},
1818
"engines": {

apps/fixtures/todomvc/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"dependencies": {
1111
"@solidjs/router": "^0.15.0",
1212
"@solidjs/start": "workspace:*",
13-
"nitro": "3.0.1-alpha.0",
1413
"solid-js": "^1.9.9",
1514
"unstorage": "1.10.2",
1615
"vite": "7.1.10"

apps/tests/playwright.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ export default defineConfig({
55
testMatch: "**/*.test.ts",
66

77
webServer: {
8-
command: "pnpm run dev",
9-
url: "http://localhost:3000",
8+
command: "pnpm run dev --host 127.0.0.1 --port 3000 --strictPort",
9+
url: "http://127.0.0.1:3000",
1010
reuseExistingServer: true,
1111
stdout: "pipe",
1212
stderr: "pipe",
1313
},
1414

1515
use: {
16-
baseURL: "http://localhost:3000",
16+
baseURL: "http://127.0.0.1:3000",
1717
trace: "on-first-retry",
1818
},
1919

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
"clean:test": "pnpx rimraf .tmp",
2727
"release": "pnpm build && changeset publish",
2828
"format": "pnpm oxfmt",
29-
"rewrite-exports": "pnpm --filter='./packages/*' -c exec \"echo \\$(cat package.json | jq '.exports = .publishConfig.exports') > package.json\""
29+
"rewrite-exports": "pnpm --filter='./packages/*' -c exec \"echo \\$(cat package.json | jq '.exports = .publishConfig.exports') > package.json\"",
30+
"vite-ecosystem-ci:build": "pnpm run build:all && pnpm --filter fixture-nitro-3 build",
31+
"vite-ecosystem-ci:before-test": "pnpm --filter tests exec playwright install chromium",
32+
"vite-ecosystem-ci:test": "pnpm --filter tests run test:all"
3033
},
3134
"devDependencies": {
3235
"@changesets/cli": "^2.29.8",

pnpm-lock.yaml

Lines changed: 307 additions & 390 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)