Skip to content

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ a65a9beb #1579

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

Closed
wants to merge 20 commits into from
Closed

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ a65a9beb #1579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4a54cd1
docs: fix typo (#6191)
oscar-b Jun 2, 2022
0a76aac
build(deps-dev): bump webpack-dev-server from 4.9.0 to 4.9.1 (#6185)
dependabot[bot] Jun 3, 2022
7c94ad0
build(deps-dev): bump lint-staged from 12.4.3 to 13.0.0 (#6188)
dependabot[bot] Jun 3, 2022
7255bd5
build(deps-dev): bump http-server from 14.1.0 to 14.1.1 (#6190)
dependabot[bot] Jun 3, 2022
e14551a
build(deps-dev): bump node-fetch from 3.2.4 to 3.2.5 (#6193)
dependabot[bot] Jun 3, 2022
3506584
build(deps-dev): bump webpack from 5.72.1 to 5.73.0 (#6192)
dependabot[bot] Jun 3, 2022
bee26a6
docs(configuration): add parser options for dynamic import (#6145)
snitin315 Jun 3, 2022
c622345
Feature/downgrade react (#6197)
chenxsan Jun 3, 2022
0ccafd7
build(deps-dev): bump sass from 1.52.1 to 1.52.2 (#6199)
dependabot[bot] Jun 4, 2022
bd4c9a3
upgrade cypress to v10 (#6195)
chenxsan Jun 4, 2022
c9d41a9
build(deps-dev): bump @babel/preset-env from 7.18.0 to 7.18.2 (#6180)
dependabot[bot] Jun 4, 2022
eeaea93
build(deps-dev): bump webpack-dev-server from 4.9.1 to 4.9.2 (#6200)
dependabot[bot] Jun 7, 2022
0ce82a5
build(deps-dev): bump eslint from 8.16.0 to 8.17.0 (#6201)
dependabot[bot] Jun 7, 2022
657e6db
build(deps-dev): bump cypress from 10.0.2 to 10.0.3 (#6202)
dependabot[bot] Jun 8, 2022
8af62c6
build(deps-dev): bump jest from 28.1.0 to 28.1.1 (#6203)
dependabot[bot] Jun 8, 2022
26c50c4
build(deps-dev): bump lint-staged from 13.0.0 to 13.0.1 (#6204)
dependabot[bot] Jun 9, 2022
7d18de7
build(deps-dev): bump sass from 1.52.2 to 1.52.3 (#6208)
dependabot[bot] Jun 10, 2022
f9022fc
build(deps-dev): bump tailwindcss from 3.0.24 to 3.1.0 (#6207)
dependabot[bot] Jun 10, 2022
a65a9be
docs(api): add note about `env` usage (#6209)
snitin315 Jun 10, 2022
56f91a9
docs(en): merging all conflicts
docschina-bot Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build(deps-dev): bump cypress from 10.0.2 to 10.0.3 (webpack#6202) 
Bumps [cypress](https://github.com/cypress-io/cypress) from 10.0.2 to 10.0.3.
- [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.0.2...v10.0.3)

---
updated-dependencies:
- dependency-name: cypress
  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>
  • Loading branch information
@dependabot
dependabot[bot] authored Jun 8, 2022
commit 657e6db7bee4a8b059c3db54c45aef6a7cb0eed6
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^4.0.0",
"cypress": "^10.0.0",
"cypress": "^10.0.3",
"directory-tree": "^3.3.0",
"directory-tree-webpack-plugin": "^1.0.3",
"duplexer": "^0.1.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4450,10 +4450,10 @@ csstype@^3.0.6:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==

cypress@^10.0.0:
version "10.0.2"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.0.2.tgz#6aeac1923d534f9850d57dad9496f9ea74034a23"
integrity sha512-7+C4KHYBcfZrawss+Gt5PlS35rfc6ySc59JcHDVsIMm1E/J35dqE41UEXpdtwIq3549umCerNWnFADzqib4kcA==
cypress@^10.0.3:
version "10.0.3"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.0.3.tgz#889b4bef863b7d1ef1b608b85b964394ad350c5f"
integrity sha512-8C82XTybsEmJC9POYSNITGUhMLCRwB9LadP0x33H+52QVoBjhsWvIzrI+ybCe0+TyxaF0D5/9IL2kSTgjqCB9A==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand Down