Skip to content

sync dev into main #1264

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
Jun 7, 2025
Merged

sync dev into main #1264

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
ec387ea
fix(hmr): use monotonicDateNow for timestamp (#20158)
sapphi-red Jun 5, 2025
005ce02
fix(deps): update all non-major dependencies (#20141)
renovate[bot] Jun 6, 2025
f0fe7a3
fix: applyToEnvironment after configResolved (#20170)
patak-cat Jun 6, 2025
25c2e4c
docs(en): merging all conflicts
docschina-bot Jun 6, 2025
961688d
fix: resolved conflict
thinkasany Jun 7, 2025
d7a02c6
Merge pull request #1263 from vitejs/sync-f0fe7a35-1
thinkasany Jun 7, 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
2 changes: 1 addition & 1 deletion guide/api-environment-instances.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class EnvironmentModuleGraph {
invalidateModule(
mod: EnvironmentModuleNode,
seen: Set<EnvironmentModuleNode> = new Set(),
timestamp: number = Date.now(),
timestamp: number = monotonicDateNow(),
isHmr: boolean = false,
): void

Expand Down
2 changes: 2 additions & 0 deletions guide/api-environment-plugins.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ export default defineConfig({
})
```

`applyToEnvironment` 钩子在配置时调用，目前在 `configResolved` 之后调用，因为生态系统中的项目正在修改其中的插件。未来，环境插件解析可能会移至 `configResolved` 之前。

## 构建钩子中的环境 {#environment-in-build-hooks}

与开发期间一样，插件钩子在构建期间也接收环境实例，取代了 `ssr` 布尔值。
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"devDependencies": {
"@shikijs/vitepress-twoslash": "^2.5.0",
"@types/express": "^5.0.2",
"feed": "^5.0.1",
"feed": "^5.1.0",
"vitepress": "^1.6.3",
"vitepress-plugin-group-icons": "^1.5.5",
"vue": "^3.5.14",
"vitepress-plugin-group-icons": "^1.6.0",
"vue": "^3.5.16",
"@types/node": "^20.9.2",
"@type-challenges/utils": "^0.1.1",
"chalk": "^4.1.2",
Expand Down
Loading