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 webpack.js.org/master into webpack.js.org/cn @ 98a6bd0a #1620

Merged
merged 4 commits into from
Jul 17, 2022

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

合并 webpack/webpack.js.org 的修改至本仓库(@ 98a6bd0

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

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

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

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

dependabot bot and others added 3 commits July 15, 2022 09:07
Bumps [@parcel/css](https://github.com/parcel-bundler/parcel-css) from 1.11.2 to 1.12.0.
- [Release notes](https://github.com/parcel-bundler/parcel-css/releases)
- [Commits](https://github.com/parcel-bundler/parcel-css/commits/v1.12.0)

---
updated-dependencies:
- dependency-name: "@parcel/css"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* docs(configuration): add `resolve.extensionAlias`

* chore: sort
@docschina-bot docschina-bot requested review from jacob-lcs and QC-L July 16, 2022 23:06
@jacob-lcs jacob-lcs merged commit 7ed6613 into cn Jul 17, 2022
@jacob-lcs jacob-lcs deleted the sync-98a6bd0a branch September 18, 2022 13:02
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.

3 participants