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.

Sign up for GitHub

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

Jump to bottom

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 48a23c51 #1616

Merged
merged 30 commits into from
Jul 14, 2022
Merged

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 48a23c51 #1616

merged 30 commits into from
Jul 14, 2022

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

合并 webpack/webpack.js.org 的修改至本仓库（@ 48a23c5）

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

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

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

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

chenxsan and others added 28 commits June 26, 2022 10:30
@chenxsan
fix: improve highlighting for current subnav (webpack#6240)
3e4dcec
@vankop
docs(api): improve require docs (webpack#6235)
089cfa2 
- describe critical dependency warning
@dimaaan21
docs(concepts): fix typo in module-federation.mdx (webpack#6242)
417412c 
Fix typo: `boostrap` => `bootstrap`
@dependabot
build(deps-dev): bump sass-loader from 13.0.0 to 13.0.2 (webpack#6243)
4dc2268 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 13.0.0 to 13.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/sass-loader@v13.0.0...v13.0.2)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump eslint-plugin-react from 7.30.0 to 7.30.1 (webp…
c70afd9 
…ack#6244)

Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.30.0 to 7.30.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](jsx-eslint/eslint-plugin-react@v7.30.0...v7.30.1)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump lint-staged from 13.0.2 to 13.0.3 (webpack#6245)
61d01d9 
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 13.0.2 to 13.0.3.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](lint-staged/lint-staged@v13.0.2...v13.0.3)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump cypress from 10.2.0 to 10.3.0 (webpack#6246)
532418a 
Bumps [cypress](https://github.com/cypress-io/cypress) from 10.2.0 to 10.3.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js)
- [Commits](cypress-io/cypress@v10.2.0...v10.3.0)

---
updated-dependencies:
- dependency-name: cypress
  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>
@dependabot
build(deps-dev): bump @babel/preset-react from 7.17.12 to 7.18.6 (web…
a131225 
…pack#6250)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.17.12 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  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>
@dependabot
build(deps-dev): bump @babel/core from 7.18.5 to 7.18.6 (webpack#6247)
4b9b604 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.18.5 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump @babel/preset-env from 7.18.2 to 7.18.6 (webpac…
32d1566 
…k#6248)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.18.2 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump jest from 28.1.1 to 28.1.2 (webpack#6251)
a82e284 
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 28.1.1 to 28.1.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v28.1.2/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump eslint-plugin-mdx from 2.0.0 to 2.0.1 (webpack#…
e13d86d 
…6252)

Bumps [eslint-plugin-mdx](https://github.com/mdx-js/eslint-mdx) from 2.0.0 to 2.0.1.
- [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.0...v2.0.1)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump webpack-dev-server from 4.9.2 to 4.9.3 (webpack…
e8c2f87 
…#6253)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.9.2 to 4.9.3.
- [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.9.2...v4.9.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chenxsan
docs(configuration): add new type (webpack#6225)
466badd 
* docs(configuration): add new type

* add note
@chenxsan
drop node 12 (webpack#6256)
f49efb6
@jkowalleck
docs: add CycloneDX Webpack Plugin (webpack#6241)
112ee14 
Signed-off-by: Jan Kowalleck <[email protected]>
@dependabot
build(deps-dev): bump eslint from 8.18.0 to 8.19.0 (webpack#6258)
f82e706 
Bumps [eslint](https://github.com/eslint/eslint) from 8.18.0 to 8.19.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.18.0...v8.19.0)

---
updated-dependencies:
- dependency-name: eslint
  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>
@chenxsan
docs(api): document canMangle (webpack#6257)
58f3eb7
@dependabot
build(deps-dev): bump tailwindcss from 3.1.4 to 3.1.5 (webpack#6259)
513b8fd 
Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](tailwindlabs/tailwindcss@v3.1.4...v3.1.5)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump @octokit/rest from 18.12.0 to 19.0.1 (webpack#6260
e3a2560 
)

Bumps [@octokit/rest](https://github.com/octokit/rest.js) from 18.12.0 to 19.0.1.
- [Release notes](https://github.com/octokit/rest.js/releases)
- [Commits](octokit/rest.js@v18.12.0...v19.0.1)

---
updated-dependencies:
- dependency-name: "@octokit/rest"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump @octokit/auth-action from 1.3.3 to 2.0.0 (webpa…
ec9bca6 
…ck#6261)

Bumps [@octokit/auth-action](https://github.com/octokit/auth-action.js) from 1.3.3 to 2.0.0.
- [Release notes](https://github.com/octokit/auth-action.js/releases)
- [Commits](octokit/auth-action.js@v1.3.3...v2.0.0)

---
updated-dependencies:
- dependency-name: "@octokit/auth-action"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump @parcel/css from 1.10.1 to 1.11.2 (webpack#6263)
6e0e561 
Bumps [@parcel/css](https://github.com/parcel-bundler/parcel-css) from 1.10.1 to 1.11.2.
- [Release notes](https://github.com/parcel-bundler/parcel-css/releases)
- [Commits](https://github.com/parcel-bundler/parcel-css/commits)

---
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>
@alexownejazayeri
fix(concepts): small grammatical edit (webpack#6266)
8547dec 
- Edit usage of parentheses for clarity
@dependabot
build(deps-dev): bump postcss-loader from 7.0.0 to 7.0.1 (webpack#6264)
9cf1539 
Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/postcss-loader@v7.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump @octokit/rest from 19.0.1 to 19.0.3 (webpack#6265)
af1c1ed 
Bumps [@octokit/rest](https://github.com/octokit/rest.js) from 19.0.1 to 19.0.3.
- [Release notes](https://github.com/octokit/rest.js/releases)
- [Commits](octokit/rest.js@v19.0.1...v19.0.3)

---
updated-dependencies:
- dependency-name: "@octokit/rest"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump node-fetch from 3.2.6 to 3.2.8 (webpack#6267)
f517f76 
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 3.2.6 to 3.2.8.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](node-fetch/node-fetch@v3.2.6...v3.2.8)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump tailwindcss from 3.1.5 to 3.1.6 (webpack#6268)
48a23c5 
Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](tailwindlabs/tailwindcss@v3.1.5...v3.1.6)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@docschina-bot
docs(en): merging all conflicts
60ae9f3
@jacob-lcs jacob-lcs merged commit 952c96a into cn Jul 14, 2022
@jacob-lcs jacob-lcs deleted the sync-48a23c51 branch July 14, 2022 05:34
This was referenced Jul 14, 2022
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacob-lcs jacob-lcs jacob-lcs approved these changes

@QC-L QC-L Awaiting requested review from QC-L

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@docschina-bot @jacob-lcs @chenxsan @vankop @dimaaan21 @jkowalleck @alexownejazayeri