Skip to content

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 92a15643 #1625

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 7 commits into from
Closed

docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 92a15643 #1625

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77af75a
build(deps-dev): bump markdownlint from 0.26.0 to 0.26.1 (#6294)
dependabot[bot] Jul 26, 2022
261eb5a
build(deps-dev): bump markdownlint-cli from 0.32.0 to 0.32.1 (#6298)
dependabot[bot] Jul 26, 2022
6d08f78
build(deps-dev): bump webpack from 5.73.0 to 5.74.0 (#6299)
dependabot[bot] Jul 26, 2022
ff684da
build(deps): bump react-spring from 9.5.1 to 9.5.2 (#6295)
dependabot[bot] Jul 26, 2022
2cb2f38
build(deps-dev): bump sass from 1.53.0 to 1.54.0 (#6296)
dependabot[bot] Jul 26, 2022
92a1564
chore: run `yarn-deduplicate --strategy fewer` for fewer acorn versio…
JounQin Jul 26, 2022
933f2b8
docs(en): merging all conflicts
docschina-bot Jul 26, 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 sass from 1.53.0 to 1.54.0 (webpack#6296) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.53.0 to 1.54.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.53.0...1.54.0)

---
updated-dependencies:
- dependency-name: sass
  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>
  • Loading branch information
@dependabot
dependabot[bot] authored Jul 26, 2022
commit 2cb2f38bb8ded5f85ab6a13be073e6587edd2500
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 @@ -128,7 +128,7 @@
"remark-html": "^15.0.1",
"remark-refractor": "montogeek/remark-refractor",
"rimraf": "^3.0.2",
"sass": "^1.53.0",
"sass": "^1.54.0",
"sass-loader": "^13.0.2",
"sirv-cli": "^2.0.2",
"sitemap-static": "^0.4.2",
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 @@ -10730,10 +10730,10 @@ sass-loader@^13.0.2:
klona "^2.0.4"
neo-async "^2.6.2"

sass@^1.53.0:
version "1.53.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
sass@^1.54.0:
version "1.54.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.0.tgz#24873673265e2a4fe3d3a997f714971db2fba1f4"
integrity sha512-C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down