Skip to content

docs(en): merge rollup/master into rollup-docs-cn/master @ d6dd1e7c#181

Closed
docschina-bot wants to merge 7 commits into
masterfrom
sync-d6dd1e7c
Closed

docs(en): merge rollup/master into rollup-docs-cn/master @ d6dd1e7c#181
docschina-bot wants to merge 7 commits into
masterfrom
sync-d6dd1e7c

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

合并 rollup/rollup 的修改至本仓库(@ d6dd1e7

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-d6dd1e7c 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

renovate Bot and others added 7 commits July 4, 2025 04:40
* fix(deps): lock file maintenance minor/patch updates

* Pin hstr

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lukas Taegert-Atkinson <lukas.taegert-atkinson@tngtech.com>
* chore(deps): update dependency vite to v7

* Fix type conflicts

Also add vue-eslint-parser to make Vue work again

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lukas Taegert-Atkinson <lukas.taegert-atkinson@tngtech.com>
* Add location info for closing brace of block statement

* update snapshots
@vercel
Copy link
Copy Markdown

vercel Bot commented Jul 4, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
rollup-docs-cn ❌ Failed (Inspect) Jul 4, 2025 10:16pm

@netlify
Copy link
Copy Markdown

netlify Bot commented Jul 4, 2025

Deploy Preview for relaxed-alfajores-47dd1b failed.

Name Link
🔨 Latest commit 70b9beb
🔍 Latest deploy log https://app.netlify.com/projects/relaxed-alfajores-47dd1b/deploys/68685296436e00000819735e

@waynzh waynzh closed this Jul 7, 2025
@waynzh waynzh deleted the sync-d6dd1e7c branch July 7, 2025 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants