docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 1d438590#1693
Closed
docschina-bot wants to merge 7 commits intocnfrom
Closed
docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 1d438590#1693docschina-bot wants to merge 7 commits intocnfrom
docschina-bot wants to merge 7 commits intocnfrom
Conversation
* 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 <chenxsan@gmail.com> Co-authored-by: Sam Chen <chenxsan@gmail.com>
…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] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> 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] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lightningcss](https://github.com/parcel-bundler/lightningcss) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/parcel-bundler/lightningcss/releases) - [Commits](parcel-bundler/lightningcss@v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: lightningcss dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
此 PR 自动生成。
合并 webpack/webpack.js.org 的修改至本仓库（@ 1d43859）
以下文件存在冲突，可能需要重新翻译：
请解决所有冲突后提交到此 pull request，可直接在 Github 修改、切换到 sync-1d438590 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request！
使用该操作会导致上游仓库的内容丢失，并致使下一次合并产生冲突。