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 @ 3b68bd69 #1691

Closed
wants to merge 4 commits into from

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

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

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

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

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

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

Coly010 and others added 4 commits September 20, 2022 08:26
* docs(configuration): move `name` option to correct place

The `name` option was listed under the `output` object which is incorrect.

Move it to top-level configuration object.

* docs(configuration): place `name` option at the top of config object

* docs(configuration): fix spacing

* docs(configuration): fix whitespace

Co-authored-by: Sam Chen <[email protected]>

Co-authored-by: Sam Chen <[email protected]>
…ck#6409)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](webpack/webpack-dev-server@v4.11.0...v4.11.1)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6410)

Bumps [eslint-plugin-mdx](https://github.com/mdx-js/eslint-mdx) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/mdx-js/eslint-mdx/releases)
- [Changelog](https://github.com/mdx-js/eslint-mdx/blob/master/CHANGELOG.md)
- [Commits](mdx-js/eslint-mdx@v2.0.4...v2.0.5)

---
updated-dependencies:
- dependency-name: eslint-plugin-mdx
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jacob-lcs jacob-lcs closed this Nov 26, 2022
@jacob-lcs jacob-lcs deleted the sync-3b68bd69 branch November 26, 2022 09:55
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