Skip to content

merge dev into main #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkasany merged 6 commits into from
Apr 23, 2025
Merged

merge dev into main #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ddd993
chore(deps): update actions/configure-pages action to v5 (#19900)
renovate[bot] Apr 21, 2025
2d60135
docs(rolldown): make clear changes should be applied in `package.json…
TheAlexLichter Apr 22, 2025
ddbe91e
docs(en): merging all conflicts
docschina-bot Apr 22, 2025
528323a
fix: resolved conflict
thinkasany Apr 23, 2025
2c540ae
fix: resolved conflict
thinkasany Apr 23, 2025
3efc584
Merge pull request #1220 from vitejs/sync-2d60135b-1
thinkasany Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions guide/rolldown.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,18 @@ Rolldown 专注于三个主要原则：

## 如何尝试 Rolldown {#how-to-try-rolldown}

基于 Rolldown 驱动的 Vite 目前以名为 `rolldown-vite` 的独立包提供。如果你的项目中直接依赖了 `vite`，你可以通过别名的方式将 `vite` 包指向 `rolldown-vite`，这样就可以实现无缝替换。
基于 Rolldown 驱动的 Vite 目前以名为 `rolldown-vite` 的独立包提供。如果你的项目中直接依赖了 `vite`，可以在项目的 `package.json`文件里将 `vite` 包设置别名指向 `rolldown-vite`，这样就能实现无缝替换。

```json
{
"dependencies": {
"vite": "npm:rolldown-vite@latest"
"vite": "^6.0.0" // [!code --]
"vite": "npm:rolldown-vite@latest" // [!code ++]
}
}
```

如果你使用了 Vitepress 或其他以 Vite 作为同等依赖（peer dependency）的元框架，你需要在你的包管理器中重写（override）`vite` 依赖：
如果你使用了 Vitepress 或其他以 Vite 作为同等依赖（peer dependency）的元框架，你需要在 `package.json` 文件中覆盖 `vite` 依赖，具体操作方式会因你使用的包管理器而略有不同。

:::code-group

Expand Down
2 changes: 1 addition & 1 deletion guide/static-deploy-github-pages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Build
run: npm run build
- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand Down