Skip to content

Commit f89b22a

Browse files
authored
Merge branch 'main' into fix/base-path-threading
2 parents 4bb7d84 + ec1b82b commit f89b22a

5 files changed

Lines changed: 25 additions & 6 deletions

File tree

‎.changeset/tricky-eels-march.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@solidjs/vite-plugin-nitro-2": patch
3+
"@solidjs/start": patch
4+
---
5+
6+
Included Vite 8 in the peer dependency range.

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,18 @@ on:
88

99
concurrency: ${{ github.workflow }}-${{ github.ref }}
1010

11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
id-token: write # Required for npm trusted publishing (OIDC)
15+
1116
jobs:
1217
release:
1318
name: Release
1419
runs-on: ubuntu-latest
1520
steps:
1621
- name: Checkout Repo
17-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
1823

1924
- uses: pnpm/action-setup@v3
2025

@@ -37,5 +42,3 @@ jobs:
3742
commit: "chore: release"
3843
env:
3944
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40-
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
41-
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.19.0
1+
24.15.0

‎packages/start-nitro-v2-vite-plugin/package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"description": "Nitro v2 plugin for development with SolidStart 2.0",
44
"version": "0.3.0",
55
"type": "module",
6+
"repository": {
7+
"type": "git",
8+
"url": "git+https://github.com/solidjs/solid-start.git",
9+
"directory": "packages/start-nitro-v2-vite-plugin"
10+
},
611
"scripts": {
712
"build": "tsc",
813
"typecheck": "tsc --noEmit",
@@ -29,6 +34,6 @@
2934
"vite": "^7.3.1"
3035
},
3136
"peerDependencies": {
32-
"vite": "^7"
37+
"vite": "^7 || ^8"
3338
}
3439
}

‎packages/start/package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
"name": "@solidjs/start",
33
"version": "2.0.0-alpha.3",
44
"type": "module",
5+
"repository": {
6+
"type": "git",
7+
"url": "git+https://github.com/solidjs/solid-start.git",
8+
"directory": "packages/start"
9+
},
510
"scripts": {
611
"build": "pnpm validate-imports && tsc && node scripts/build.js",
712
"dev": "tsc --watch",
@@ -78,6 +83,6 @@
7883
"vitest": "^4.1.0"
7984
},
8085
"peerDependencies": {
81-
"vite": "^7"
86+
"vite": "^7 || ^8"
8287
}
8388
}

0 commit comments

Comments
 (0)