Skip to content

Commit 6a5d4dd

Browse files
sapphi-redsapphi-red
committed
chore: merge main
2 parents 72a4624 + 4e763c5 commit 6a5d4dd

File tree

41 files changed

+555
-707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+555
-707
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Get changed files
6060
id: changed-files
61-
uses: tj-actions/changed-files@db153baf731265ad02cd490b07f470e2d55e3345 # v39.2.1
61+
uses: tj-actions/changed-files@408093d9ff9c134c33b974e0722ce06b9d6e8263 # v39.2.2
6262
with:
6363
files: |
6464
docs/**

‎docs/guide/ssr.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ If you have questions, the community is usually helpful at [Vite Discord's #ssr
1616

1717
## Example Projects
1818

19-
Vite provides built-in support for server-side rendering (SSR). The Vite playground contains example SSR setups for Vue 3 and React, which can be used as references for this guide:
19+
Vite provides built-in support for server-side rendering (SSR). [`create-vite-extra`](https://github.com/bluwy/create-vite-extra) contains example SSR setups you can use as references for this guide:
2020

21-
- [Vue 3](https://github.com/vitejs/vite-plugin-vue/tree/main/playground/ssr-vue)
22-
- [React](https://github.com/vitejs/vite-plugin-react/tree/main/playground/ssr-react)
21+
- [Vanilla](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-vanilla)
22+
- [Vue](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-vue)
23+
- [React](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-react)
24+
- [Preact](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-preact)
25+
- [Svelte](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-svelte)
26+
- [Solid](https://github.com/bluwy/create-vite-extra/tree/master/template-ssr-solid)
27+
28+
You can also scaffold these projects locally by [running `create-vite`](./index.md#scaffolding-your-first-vite-project) and choose `Others > create-vite-extra` under the framework option.
2329

2430
## Source Structure
2531

@@ -177,7 +183,7 @@ Then, in `server.js` we need to add some production specific logic by checking `
177183
178184
- Move the creation and all usage of the `vite` dev server behind dev-only conditional branches, then add static file serving middlewares to serve files from `dist/client`.
179185
180-
Refer to the [Vue](https://github.com/vitejs/vite-plugin-vue/tree/main/playground/ssr-vue) and [React](https://github.com/vitejs/vite-plugin-react/tree/main/playground/ssr-react) demos for a working setup.
186+
Refer to the [example projects](#example-projects) for a working setup.
181187
182188
## Generating Preload Directives
183189

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,26 @@
5454
"@types/json-stable-stringify": "^1.0.34",
5555
"@types/less": "^3.0.4",
5656
"@types/micromatch": "^4.0.3",
57-
"@types/node": "^18.18.4",
57+
"@types/node": "^18.18.5",
5858
"@types/picomatch": "^2.3.1",
5959
"@types/sass": "~1.43.1",
6060
"@types/stylus": "^0.48.40",
61-
"@types/ws": "^8.5.6",
62-
"@typescript-eslint/eslint-plugin": "^6.7.4",
63-
"@typescript-eslint/parser": "^6.7.4",
61+
"@types/ws": "^8.5.7",
62+
"@typescript-eslint/eslint-plugin": "^6.7.5",
63+
"@typescript-eslint/parser": "^6.7.5",
6464
"@vitejs/release-scripts": "^1.3.1",
6565
"conventional-changelog-cli": "^3.0.0",
6666
"eslint": "^8.51.0",
6767
"eslint-define-config": "^1.24.1",
6868
"eslint-plugin-import": "^2.28.1",
69-
"eslint-plugin-n": "^16.1.0",
69+
"eslint-plugin-n": "^16.2.0",
7070
"eslint-plugin-regexp": "^1.15.0",
7171
"execa": "^8.0.1",
7272
"fs-extra": "^11.1.1",
73-
"lint-staged": "^14.0.1",
73+
"lint-staged": "^15.0.1",
7474
"npm-run-all2": "^6.1.1",
7575
"picocolors": "^1.0.0",
76-
"playwright-chromium": "^1.38.1",
76+
"playwright-chromium": "^1.39.0",
7777
"prettier": "3.0.3",
7878
"rimraf": "^5.0.5",
7979
"rollup": "^4.1.4",
@@ -83,7 +83,7 @@
8383
"typescript": "^5.2.2",
8484
"unbuild": "^2.0.0",
8585
"vite": "workspace:*",
86-
"vitepress": "1.0.0-rc.21",
86+
"vitepress": "1.0.0-rc.22",
8787
"vitest": "^0.34.6",
8888
"vue": "^3.3.4"
8989
},
@@ -104,7 +104,7 @@
104104
"eslint --cache --fix"
105105
]
106106
},
107-
"packageManager": "pnpm@8.8.0",
107+
"packageManager": "pnpm@8.9.2",
108108
"pnpm": {
109109
"overrides": {
110110
"vite": "workspace:*"

‎packages/create-vite/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ Currently supported template presets include:
6565
- `svelte-ts`
6666
- `solid`
6767
- `solid-ts`
68+
- `qwik`
69+
- `qwik-ts`
6870

6971
You can use `.` for the project name to scaffold in the current directory.
7072

‎packages/create-vite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"funding": "https://github.com/vitejs/vite?sponsor=1",
3535
"devDependencies": {
3636
"@types/minimist": "^1.2.3",
37-
"@types/prompts": "^2.4.5",
37+
"@types/prompts": "^2.4.6",
3838
"cross-spawn": "^7.0.3",
3939
"kolorist": "^1.8.0",
4040
"minimist": "^1.2.8",

‎packages/create-vite/template-lit-ts/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"lit": "^2.8.0"
12+
"lit": "^3.0.0"
1313
},
1414
"devDependencies": {
1515
"typescript": "^5.2.2",
16-
"vite": "^5.0.0-beta.4"
16+
"vite": "^5.0.0-beta.7"
1717
}
1818
}

‎packages/create-vite/template-lit/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"lit": "^2.8.0"
12+
"lit": "^3.0.0"
1313
},
1414
"devDependencies": {
15-
"vite": "^5.0.0-beta.4"
15+
"vite": "^5.0.0-beta.7"
1616
}
1717
}

‎packages/create-vite/template-preact-ts/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"preact": "^10.18.1"
1313
},
1414
"devDependencies": {
15-
"@preact/preset-vite": "^2.5.0",
15+
"@preact/preset-vite": "^2.6.0",
1616
"typescript": "^5.2.2",
17-
"vite": "^5.0.0-beta.4"
17+
"vite": "^5.0.0-beta.7"
1818
}
1919
}

‎packages/create-vite/template-preact/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"preact": "^10.18.1"
1313
},
1414
"devDependencies": {
15-
"@preact/preset-vite": "^2.5.0",
16-
"vite": "^5.0.0-beta.4"
15+
"@preact/preset-vite": "^2.6.0",
16+
"vite": "^5.0.0-beta.7"
1717
}
1818
}

‎packages/create-vite/template-qwik-ts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"typescript": "^5.2.2",
13-
"vite": "^5.0.0-beta.4"
13+
"vite": "^5.0.0-beta.7"
1414
},
1515
"dependencies": {
1616
"@builder.io/qwik": "^1.2.13"

0 commit comments

Comments
 (0)
⚡