Skip to content
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.

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

docs(en): merge rollup/master into rollup-docs-cn/master @ f5c349e5 #163

Merged
merged 5 commits into from
Jan 6, 2025

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

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

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

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

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

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

TrickyPi and others added 4 commits January 5, 2025 06:35
keep import attributes for cjs format
* feat: use picocolors instead of colorette

* fixup! feat: use picocolors instead of colorette
Copy link

vercel bot commented Jan 5, 2025

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

Name Status Preview Comments Updated (UTC)
rollup-docs-cn ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 6, 2025 4:26am

Copy link

netlify bot commented Jan 5, 2025

Deploy Preview for relaxed-alfajores-47dd1b failed.

Name Link
🔨 Latest commit 96bb29b
🔍 Latest deploy log https://app.netlify.com/sites/relaxed-alfajores-47dd1b/deploys/677b5b13b8559f00080870cb

@waynzh waynzh merged commit d313775 into master Jan 6, 2025
27 of 31 checks passed
@waynzh waynzh deleted the sync-f5c349e5 branch January 6, 2025 04:26
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.

5 participants