From b854dc238ea52e634d574bda4f36ca2a80568b82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 19:47:16 +0800 Subject: [PATCH 1/9] build(deps-dev): bump prettier from 2.6.1 to 2.6.2 (#6078) Bumps [prettier](https://github.com/prettier/prettier) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.6.1...2.6.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 81a864371cd4..7cd7a234447a 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "npm-run-all": "^4.1.1", "postcss": "^8.4.12", "postcss-loader": "^6.2.1", - "prettier": "^2.6.1", + "prettier": "^2.6.2", "react-refresh": "^0.12.0", "redirect-webpack-plugin": "^1.0.0", "remark": "^14.0.2", diff --git a/yarn.lock b/yarn.lock index 71ebb5e7ae34..0a54243c04c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9836,10 +9836,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.1.tgz#d472797e0d7461605c1609808e27b80c0f9cfe17" - integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A== +prettier@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== pretty-bytes@^5.1.0, pretty-bytes@^5.2.0, pretty-bytes@^5.3.0, pretty-bytes@^5.4.1, pretty-bytes@^5.6.0: version "5.6.0" From 26129200743984948f4b0e929f2e07bf0209df95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:32:35 +0800 Subject: [PATCH 2/9] build(deps-dev): bump sass from 1.49.10 to 1.49.11 (#6079) Bumps [sass](https://github.com/sass/dart-sass) from 1.49.10 to 1.49.11. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.49.10...1.49.11) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7cd7a234447a..aad332765a8a 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "remark-html": "^15.0.1", "remark-refractor": "montogeek/remark-refractor", "rimraf": "^3.0.2", - "sass": "^1.49.10", + "sass": "^1.49.11", "sass-loader": "^12.6.0", "sirv-cli": "^2.0.2", "sitemap-static": "^0.4.2", diff --git a/yarn.lock b/yarn.lock index 0a54243c04c2..92c4bd2fd8f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10702,10 +10702,10 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.49.10: - version "1.49.10" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.10.tgz#7b83cee0f03bbba443111b3f94944fde2b0c7a6b" - integrity sha512-w37zfWJwKu4I78U4z63u1mmgoncq+v3iOB4yzQMPyAPVHHawaQSnu9C9ysGQnZEhW609jkcLioJcMCqm75JMdg== +sass@^1.49.11: + version "1.49.11" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7" + integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 4c87dfee3fecc0c184a7b7dba57836d471221a4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:41:41 +0800 Subject: [PATCH 3/9] build(deps-dev): bump @pmmmwh/react-refresh-webpack-plugin (#6080) Bumps [@pmmmwh/react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin) from 0.5.4 to 0.5.5. - [Release notes](https://github.com/pmmmwh/react-refresh-webpack-plugin/releases) - [Changelog](https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/pmmmwh/react-refresh-webpack-plugin/compare/v0.5.4...v0.5.5) --- updated-dependencies: - dependency-name: "@pmmmwh/react-refresh-webpack-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 92c4bd2fd8f3..dc9c6d75daa4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2111,9 +2111,9 @@ "@parcel/css-win32-x64-msvc" "1.7.4" "@pmmmwh/react-refresh-webpack-plugin@next": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99" - integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw== + version "0.5.5" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz#e77aac783bd079f548daa0a7f080ab5b5a9741ca" + integrity sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" From 7dce83b0fbbf4c9c0983a7c251459de1a30c20c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:56:26 +0530 Subject: [PATCH 4/9] build(deps-dev): bump @parcel/css from 1.7.4 to 1.8.0 (#6085) Bumps [@parcel/css](https://github.com/parcel-bundler/parcel-css) from 1.7.4 to 1.8.0. - [Release notes](https://github.com/parcel-bundler/parcel-css/releases) - [Commits](https://github.com/parcel-bundler/parcel-css/compare/v1.7.4...v1.8.0) --- updated-dependencies: - dependency-name: "@parcel/css" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 88 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index aad332765a8a..84a09a2a814f 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@mdx-js/loader": "^2.0.0-next.9", "@octokit/auth-action": "^1.3.3", "@octokit/rest": "^18.12.0", - "@parcel/css": "^1.7.4", + "@parcel/css": "^1.8.0", "@pmmmwh/react-refresh-webpack-plugin": "next", "@svgr/webpack": "^6.2.1", "autoprefixer": "^10.4.4", diff --git a/yarn.lock b/yarn.lock index dc9c6d75daa4..897415713926 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2054,61 +2054,61 @@ dependencies: "@octokit/openapi-types" "^11.1.0" -"@parcel/css-darwin-arm64@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.7.4.tgz#9d173f8d9a3f6dec34e49999654ba091121f1f22" - integrity sha512-fA+aBZAAgXSV7jUQFRYuKpJr5EEqNq++mFu4o/pU/lBFMJhL6Z11aqzrBecC1JziWT3t/BgryWdznf1QkNtM4w== +"@parcel/css-darwin-arm64@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.8.0.tgz#88e08835351a55015c68be6e45a2d94d3a32946b" + integrity sha512-A9taXLx12UTgyH/UGD9KMDNTXmLuH51h5g+AV4ZVo8vUZHSofP/Sb+zphOikdHn+K5gzVai1a06N92F2G8xJGw== -"@parcel/css-darwin-x64@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.7.4.tgz#e36f8a4c941c9059d6fc96e1f52c8022f04c32ef" - integrity sha512-qx/+vEXSmed7eeBgVvV/1lrEjk8KnKUiAN+CCes8d6ddJJzK5evTKQsWkywe1jNdHC33d2mlLlhLFmC2+2IPOw== +"@parcel/css-darwin-x64@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-darwin-x64/-/css-darwin-x64-1.8.0.tgz#85dc8d81f011c1d8d6f0152804664d0212d24e45" + integrity sha512-SWmB7fnD0USm9AHZBHx9EJBo1c2dwLFuA/HBD3in4yDPGS5kSqfIJTfux3NO/aySsy7NAC3FOgK/L2A2PdtpGQ== -"@parcel/css-linux-arm-gnueabihf@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.7.4.tgz#783407f8179164e6555c9498436bc0e8d1c6c4e3" - integrity sha512-+Qf+j8dqJ+t7V/w9LnyWBzNcMG/GnlzjlWNQhiUkt1aYFYPr5i/eRWuWLYxVlz8EGQOUbYlinDGLXTUJDt31gA== +"@parcel/css-linux-arm-gnueabihf@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.8.0.tgz#7b066a8f908d5d9ead76f1aeb252a989674f15d5" + integrity sha512-66ACZD3bnotyLAgJ/D93R28ipFomvxlsMszxv+U45GiSLBwmjKZ7VkTnMHC2/kmQ0NVdlUKh4WqjL/PB4PLkzg== -"@parcel/css-linux-arm64-gnu@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.7.4.tgz#34ed91540fe31001a835f7f5dfc86c90419fb2db" - integrity sha512-ITP0HZT/Ay6JCgH3W7JpoRUYfciW+jBVBTjglZjYgyYPLLWk2J1kXB+qC3jHp5XCeH4feh7eFB1pyQcE7kqCjA== +"@parcel/css-linux-arm64-gnu@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.8.0.tgz#aa2546d026158c59a888394efc4a1578470a789c" + integrity sha512-oH00san3byQnx2dWp6gsIvbZNonSQ1S+nNsTLjA/Riy2sVYTxYDsLOiNS+ryJwBKchOYSZ5PiMDgJaw7KmgIgg== -"@parcel/css-linux-arm64-musl@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.7.4.tgz#3937fdadb0581e96b9f76a37713241b35a3250fa" - integrity sha512-or61QRhhpsDlHfrc73KP4bPwnnVZWni1jkuRv1mCi+0SzYzoaO190JEaj7VWh/boUvjGiIl//FsLoZleQIWKNA== +"@parcel/css-linux-arm64-musl@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.8.0.tgz#233f985948433126efca3ddb974296f1f7520701" + integrity sha512-0p0AJ3QypEC0NwFWbzy5JbI8ZDLUED3BGXvqdD7jfOx14qCW2apq7OKBSwSCS8ZvBo8G2tkss7nbyOG5NbIjUQ== -"@parcel/css-linux-x64-gnu@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.7.4.tgz#ee883af8a97b99519c581cb2971c414e962a6ae1" - integrity sha512-GHGsM06F26FAkvPcnsGw7NHxPVD7TQvg7OC7cVAYmETccO8mqs9DyRzBTevk+1kl7EQXNnHDojn7VpVN6q+phg== +"@parcel/css-linux-x64-gnu@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.8.0.tgz#2b3262950e2ce2721facee150a99b2a620bef536" + integrity sha512-nXWRN7LSXZPic0B8F77AQe7CIqYi4+nD5QVpABX0j7s/UO2BAcfN0vpI0CNAuErX4QOSs3AIWo1XF0qL/mH9DQ== -"@parcel/css-linux-x64-musl@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.7.4.tgz#fd14e88683026665543bc48dee138edc553fcf75" - integrity sha512-H/9wvQ7LNqng9yIwulpfUUhs6zm9+vLCzri2qnC4vm8geyTjA0W0H5fphV8IlzNJ/DfHmoesJ+TXw5NG+QC9hg== +"@parcel/css-linux-x64-musl@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.8.0.tgz#f8839f56eac201a3a58f15308e5a334700a49d52" + integrity sha512-5Q5SQREh1tSOjvIu55acqEzWDdZJZiwlgdoC8nTYmIRsyFn4SVibVMDau5qWmb3Xtswr/hm41xesG3nIBXCX+Q== -"@parcel/css-win32-x64-msvc@1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.7.4.tgz#ed6dfb63600610ba555124262d84fa537ee7e6a4" - integrity sha512-xmg18iISCn1f9IyYUif6yR8FuEmi93qzH55oUiri5vZWuCY8xfraHsRA6i8yLWnxgDmVeHyiN0IICl7rgZo10A== +"@parcel/css-win32-x64-msvc@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.8.0.tgz#928fe074c48cf72d3349d9042f604b268041eb8a" + integrity sha512-IHFRdgsLHUuXIREtnRE/yNjNyRofySyLvG4lx8sfbBYQFIdelplw6V74kQ/u2iNt4MIOP69CkJxUuF+uX//ooQ== -"@parcel/css@^1.7.4": - version "1.7.4" - resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.7.4.tgz#87b522681a5527ad38baec4193a26a94fde37a5e" - integrity sha512-K1N9mxEkWQQmSINMNuGvlyPq7yCY+AtHskGxWav97lhu2i8GMMXRV9kc8/x/jkZh5KDBWO5vHhdQiujRBrgR8g== +"@parcel/css@^1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@parcel/css/-/css-1.8.0.tgz#bd5773e2e695d970cab1cfceb9926bb461d8db64" + integrity sha512-l6+gGOIk+JEZ+RuqsGzl4yDFKfSC8Uq+FaHzJgwIuIcdHip8ENMr8HMHiOPeO3VSo1JRn3yt5+MIntm2GIzAIA== dependencies: detect-libc "^1.0.3" optionalDependencies: - "@parcel/css-darwin-arm64" "1.7.4" - "@parcel/css-darwin-x64" "1.7.4" - "@parcel/css-linux-arm-gnueabihf" "1.7.4" - "@parcel/css-linux-arm64-gnu" "1.7.4" - "@parcel/css-linux-arm64-musl" "1.7.4" - "@parcel/css-linux-x64-gnu" "1.7.4" - "@parcel/css-linux-x64-musl" "1.7.4" - "@parcel/css-win32-x64-msvc" "1.7.4" + "@parcel/css-darwin-arm64" "1.8.0" + "@parcel/css-darwin-x64" "1.8.0" + "@parcel/css-linux-arm-gnueabihf" "1.8.0" + "@parcel/css-linux-arm64-gnu" "1.8.0" + "@parcel/css-linux-arm64-musl" "1.8.0" + "@parcel/css-linux-x64-gnu" "1.8.0" + "@parcel/css-linux-x64-musl" "1.8.0" + "@parcel/css-win32-x64-msvc" "1.8.0" "@pmmmwh/react-refresh-webpack-plugin@next": version "0.5.5" From b34bca8bb6c7690bb651b67ca6da847897016928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Apr 2022 21:00:04 +0530 Subject: [PATCH 5/9] build(deps-dev): bump sass from 1.49.11 to 1.50.0 (#6086) Bumps [sass](https://github.com/sass/dart-sass) from 1.49.11 to 1.50.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.49.11...1.50.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 84a09a2a814f..019aac072ad1 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "remark-html": "^15.0.1", "remark-refractor": "montogeek/remark-refractor", "rimraf": "^3.0.2", - "sass": "^1.49.11", + "sass": "^1.50.0", "sass-loader": "^12.6.0", "sirv-cli": "^2.0.2", "sitemap-static": "^0.4.2", diff --git a/yarn.lock b/yarn.lock index 897415713926..19f2a48b1ad2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10702,10 +10702,10 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.49.11: - version "1.49.11" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7" - integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ== +sass@^1.50.0: + version "1.50.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.50.0.tgz#3e407e2ebc53b12f1e35ce45efb226ea6063c7c8" + integrity sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 201738436baffe62d68775a488f8e40a3a40d13d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 16:08:17 +0530 Subject: [PATCH 6/9] build(deps-dev): bump webpack from 5.71.0 to 5.72.0 (#6084) Bumps [webpack](https://github.com/webpack/webpack) from 5.71.0 to 5.72.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.71.0...v5.72.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 019aac072ad1..1f22e8dafcbc 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "tailwindcss": "^3.0.23", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", - "webpack": "^5.71.0", + "webpack": "^5.72.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^4.9.2", "webpack-dev-server": "^4.7.4", diff --git a/yarn.lock b/yarn.lock index 19f2a48b1ad2..f5f1e2adeeda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12649,10 +12649,10 @@ webpack-sources@^3.2.3: react-textarea-autosize "^5.2.1" uuid "^3.1.0" -webpack@^5.71.0: - version "5.71.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.71.0.tgz#b01fcf379570b8c5ee06ca06c829ca168c951884" - integrity sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A== +webpack@^5.72.0: + version "5.72.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" + integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" From f61d17e8b8c5013d651e6c5e7e4d008fd374ec26 Mon Sep 17 00:00:00 2001 From: Ivan Kopeykin Date: Mon, 11 Apr 2022 13:39:42 +0300 Subject: [PATCH 7/9] add cache in CI/CD description (#6089) --- src/content/configuration/cache.mdx | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/content/configuration/cache.mdx b/src/content/configuration/cache.mdx index 1445b35c16ca..53abe403143d 100644 --- a/src/content/configuration/cache.mdx +++ b/src/content/configuration/cache.mdx @@ -438,3 +438,43 @@ module.exports = { ``` W> Don't share the cache between calls with different options. + +## Setup cache in CI/CD system + +Filesystem cache allows to share cache between builds in CI. To setup cache: + +- CI should have an option to share cache between builds. +- CI should run job in the same absolute path. This is important since webpack cache files store absolute paths. + +### GitLab CI/CD + +Common config could looks like + +```yaml +variables: + # fallback to use "main" branch cache, requires GitLab Runner 13.4 + CACHE_FALLBACK_KEY: main + +# this is webpack build job +build-job: + cache: + key: '$CI_COMMIT_REF_SLUG' # branch/tag name + paths: + # cache directory + # make sure that you don't run "npm ci" in this job or change default cache directory + # otherwise "npm ci" will prune cache files + - node_modules/.cache/webpack/ +``` + +### Github actions + +```yaml +- uses: actions/cache@v3 + with: + # cache directory + path: node_modules/.cache/webpack/ + key: ${{ GITHUB_REF_NAME }}-webpack-build + # fallback to use "main" branch cache + restore-keys: | + main-webpack-build +``` From 50b81b63c3df69efdf7a8ca96dab587595754db3 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Tue, 12 Apr 2022 10:11:50 +0800 Subject: [PATCH 8/9] docs(en): fix conflicts --- src/content/configuration/cache.mdx | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/content/configuration/cache.mdx b/src/content/configuration/cache.mdx index c29409ff0044..f0c5bb432f5b 100644 --- a/src/content/configuration/cache.mdx +++ b/src/content/configuration/cache.mdx @@ -441,35 +441,33 @@ module.exports = { }; ``` -<<<<<<< HEAD W> 在具有不同选项的调用之间不要共享缓存。 -======= -W> Don't share the cache between calls with different options. -## Setup cache in CI/CD system +## 在 CI/CD 系统中设置缓存 $#setup-cache-in-cicd-system$ +文件系统缓存允许在 CI 的构建之间共享缓存。为了设置设置缓存： Filesystem cache allows to share cache between builds in CI. To setup cache: -- CI should have an option to share cache between builds. -- CI should run job in the same absolute path. This is important since webpack cache files store absolute paths. +- CI 应该有一个在构建之间共享缓存的配置项。 +- CI 应该在相同的绝对路径中运行任务。这非常重要，因为 webpack 缓存文件存储绝对路径。 ### GitLab CI/CD -Common config could looks like +以下是一些通用配置 ```yaml variables: - # fallback to use "main" branch cache, requires GitLab Runner 13.4 + # 兜底使用 "main" 分支缓存，要求 GitLab Runner 版本为 13.4 CACHE_FALLBACK_KEY: main -# this is webpack build job +# 这是 webpack 构建任务 build-job: cache: - key: '$CI_COMMIT_REF_SLUG' # branch/tag name + key: '$CI_COMMIT_REF_SLUG' # 分支/tag 名称 paths: - # cache directory - # make sure that you don't run "npm ci" in this job or change default cache directory - # otherwise "npm ci" will prune cache files + # 缓存文件夹 + # 确保在这个任务中没有运行 "npm ci" 或者更改默认缓存文件夹 + # 否则 "npm ci" 将会删除缓存文件 - node_modules/.cache/webpack/ ``` @@ -478,11 +476,10 @@ build-job: ```yaml - uses: actions/cache@v3 with: - # cache directory + # 缓存文件夹 path: node_modules/.cache/webpack/ key: ${{ GITHUB_REF_NAME }}-webpack-build - # fallback to use "main" branch cache + # 兜底使用 "main" 分支缓存 restore-keys: | main-webpack-build ``` ->>>>>>> f61d17e8b8c5013d651e6c5e7e4d008fd374ec26 From 80c8cd302d47e01f92fabf9bd877da02bf7b3293 Mon Sep 17 00:00:00 2001 From: Jacob Date: Tue, 12 Apr 2022 10:13:32 +0800 Subject: [PATCH 9/9] Update src/content/configuration/cache.mdx --- src/content/configuration/cache.mdx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/content/configuration/cache.mdx b/src/content/configuration/cache.mdx index f0c5bb432f5b..f345b5a25836 100644 --- a/src/content/configuration/cache.mdx +++ b/src/content/configuration/cache.mdx @@ -446,7 +446,6 @@ W> 在具有不同选项的调用之间不要共享缓存。 ## 在 CI/CD 系统中设置缓存 $#setup-cache-in-cicd-system$ 文件系统缓存允许在 CI 的构建之间共享缓存。为了设置设置缓存： -Filesystem cache allows to share cache between builds in CI. To setup cache: - CI 应该有一个在构建之间共享缓存的配置项。 - CI 应该在相同的绝对路径中运行任务。这非常重要，因为 webpack 缓存文件存储绝对路径。