From bb06b286d112f3948f708d49e3a24c905c936707 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Feb 2022 05:29:57 +0530 Subject: [PATCH 01/29] build(deps-dev): bump jest from 27.5.0 to 27.5.1 (#5951) Bumps [jest](https://github.com/facebook/jest) from 27.5.0 to 27.5.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v27.5.0...v27.5.1) --- updated-dependencies: - dependency-name: jest 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 | 748 ++++++++++++++++++++++++++------------------------- 2 files changed, 381 insertions(+), 369 deletions(-) diff --git a/package.json b/package.json index f5db143c7c15..7e7e430bfb79 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "http-server": "^14.1.0", "husky": "^7.0.4", "hyperlink": "^5.0.4", - "jest": "^27.5.0", + "jest": "^27.5.1", "lint-staged": "^12.3.3", "lodash": "^4.17.21", "markdownlint": "^0.25.1", diff --git a/yarn.lock b/yarn.lock index 453a58289f36..ecc8ee150dda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1358,93 +1358,93 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.0.tgz#82289a589ad5803555b50b64178128b7a8e45282" - integrity sha512-WUzX5neFb0IOQOy/7A2VhiGdxJKk85Xns2Oq29JaHmtnSel+BsjwyQZxzAs2Xxfd2i452fwdDG9ox/IWi81bdQ== +"@jest/console@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" + integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.5.0" - jest-util "^27.5.0" + jest-message-util "^27.5.1" + jest-util "^27.5.1" slash "^3.0.0" -"@jest/core@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.0.tgz#27b383f497ff1671cc30fd5e22eba9d9b10c3031" - integrity sha512-DcUTkZyon+dRozTEjy38Bgt3PIU51GdUJuz3uHKg5maGtmCaYqPUGiM3Xddqi7eIMC7E3fTGIlHqH9i0pTOy6Q== +"@jest/core@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" + integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== dependencies: - "@jest/console" "^27.5.0" - "@jest/reporters" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/console" "^27.5.1" + "@jest/reporters" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^27.5.0" - jest-config "^27.5.0" - jest-haste-map "^27.5.0" - jest-message-util "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-resolve-dependencies "^27.5.0" - jest-runner "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" - jest-watcher "^27.5.0" + jest-changed-files "^27.5.1" + jest-config "^27.5.1" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-resolve-dependencies "^27.5.1" + jest-runner "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" + jest-watcher "^27.5.1" micromatch "^4.0.4" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.0.tgz#a473bc76261aad7dfa3a1d8e35155953a5ba3436" - integrity sha512-lg0JFsMaLKgpwzs0knOg21Z4OQwaJoBLutnmYzip4tyLTXP21VYWtYGpLXgx42fw/Mw05m1WDXWKgwR6WnsiTw== +"@jest/environment@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" + integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== dependencies: - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.5.0" + jest-mock "^27.5.1" -"@jest/fake-timers@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.0.tgz#f9e07b4c723a535f7c532cfb403394fa40d88c8a" - integrity sha512-e3WrlpqSHq3HAQ03JFjTn8YCrsyg640/sr1rjkM2rNv8z1ufjudpv4xq6DvvTJYB6FuUrfg0g+7bSKPet5QfCQ== +"@jest/fake-timers@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" + integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@sinonjs/fake-timers" "^8.0.1" "@types/node" "*" - jest-message-util "^27.5.0" - jest-mock "^27.5.0" - jest-util "^27.5.0" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-util "^27.5.1" -"@jest/globals@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.0.tgz#16271323f79e3b0fe0842e9588241d202a6c2aff" - integrity sha512-wWpMnTiR65Q4JD7fr2BqN+ZDbi99mmILnEM6u7AaX4geASEIVvQsiB4RCvwZrIX5YZCsAjviJQVq9CYddLABkg== +"@jest/globals@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" + integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== dependencies: - "@jest/environment" "^27.5.0" - "@jest/types" "^27.5.0" - expect "^27.5.0" + "@jest/environment" "^27.5.1" + "@jest/types" "^27.5.1" + expect "^27.5.1" -"@jest/reporters@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.0.tgz#e7602e12656b5051bf4e784cbdd82d4ec1299e33" - integrity sha512-DG+BmVSx2uaJSTKz5z1eScgHTQ6/cZ5CCKSpmpr4sXQPwV2V5aUMOBDwXX1MnqNRhH7/Rq9K97ynnocvho5aMA== +"@jest/reporters@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" + integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/console" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" @@ -1456,70 +1456,70 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-haste-map "^27.5.0" - jest-resolve "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" + jest-haste-map "^27.5.1" + jest-resolve "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" v8-to-istanbul "^8.1.0" -"@jest/source-map@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.0.tgz#f22a7e759b8807491f84719c01acf433b917c7a0" - integrity sha512-0xr7VZ+JNCRrlCyRMYhquUm8eU3kNdGDaIW4s3L625bNjk273v9ZhAm3YczIuzJzYH0pnjT+QSCiZQegWKjeow== +"@jest/source-map@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" + integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== dependencies: callsites "^3.0.0" graceful-fs "^4.2.9" source-map "^0.6.0" -"@jest/test-result@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.0.tgz#29e0ace33570c9dcbd47c67e954f77a7d7fff98e" - integrity sha512-Lxecvx5mN6WIeynIyW0dWDQm8UPGMHvTwxUPK+OsZaqBDMGaNDSZtw53VoVk7HyT6AcRblMR/pfa0XucmH4hGw== +"@jest/test-result@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" + integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== dependencies: - "@jest/console" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/console" "^27.5.1" + "@jest/types" "^27.5.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.0.tgz#68beceb3de818dcb34fb3ea59be3c22c890bb6e5" - integrity sha512-WzjcDflqbpWe+SnJPCvB2gB6haGfrkzAgzY6Pb1aq+EPoVAj2mwBaKN0ROWI4H87aSslCjq2M+BUQFNJ8VpnDA== +"@jest/test-sequencer@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" + integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== dependencies: - "@jest/test-result" "^27.5.0" + "@jest/test-result" "^27.5.1" graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-runtime "^27.5.0" + jest-haste-map "^27.5.1" + jest-runtime "^27.5.1" -"@jest/transform@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.0.tgz#a4941e69ac51e8aa9a255ff4855b564c228c400b" - integrity sha512-yXUy/iO3TH1itxJ9BF7LLjuXt8TtgtjAl0PBQbUaCvRa+L0yYBob6uayW9dFRX/CDQweouLhvmXh44zRiaB+yA== +"@jest/transform@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" + integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-regex-util "^27.5.0" - jest-util "^27.5.0" + jest-haste-map "^27.5.1" + jest-regex-util "^27.5.1" + jest-util "^27.5.1" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.0.tgz#6ad04a5c5355fd9f46e5cf761850e0edb3c209dd" - integrity sha512-oDHEp7gwSgA82RZ6pzUL3ugM2njP/lVB1MsxRZNOBk+CoNvh9SpH1lQixPFc/kDlV50v59csiW4HLixWmhmgPQ== +"@jest/types@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" + integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -3261,16 +3261,16 @@ babel-extract-comments@^1.0.0: dependencies: babylon "^6.18.0" -babel-jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.0.tgz#c653985241af3c76f59d70d65a570860c2594a50" - integrity sha512-puhCyvBTNLevhbd1oyw6t3gWBicWoUARQYKCBB/B1moif17NbyhxbsfadqZIw8zfJJD+W7Vw0Nb20pEjLxkXqQ== +babel-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" + integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== dependencies: - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.0" + babel-preset-jest "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" @@ -3303,10 +3303,10 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.0.tgz#8fdf07835f2165a068de3ce95fd7749a89801b51" - integrity sha512-ztwNkHl+g1GaoQcb8f2BER4C3LMvSXuF7KVqtUioXQgScSEnkl6lLgCILUYIR+CPTwL8H3F/PNLze64HPWF9JA== +babel-plugin-jest-hoist@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" + integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -3368,12 +3368,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.0.tgz#4e308711c3d2ff1f45cf5d9a23646e37b621fc9f" - integrity sha512-7bfu1cJBlgK/nKfTvMlElzA3jpi6GzDWX3fntnyP2cQSzoi/KUz6ewGlcb3PSRYZGyv+uPnVHY0Im3JbsViqgA== +babel-preset-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" + integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== dependencies: - babel-plugin-jest-hoist "^27.5.0" + babel-plugin-jest-hoist "^27.5.1" babel-preset-current-node-syntax "^1.0.0" babel-runtime@^6.26.0: @@ -4614,10 +4614,10 @@ didyoumean@^1.2.2: resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== -diff-sequences@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.0.tgz#a8ac0cb742b17d6f30a6c43e233893a2402c0729" - integrity sha512-ZsOBWnhXiH+Zn0DcBNX/tiQsqrREHs/6oQsEVy2VJJjrTblykPima11pyHMSA/7PGmD+fwclTnKVKL/qtNREDQ== +diff-sequences@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" + integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== dir-glob@^3.0.1: version "3.0.1" @@ -5386,15 +5386,15 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.0.tgz#ea2fbebb483c274043098c34a53923a0aee493f0" - integrity sha512-z73GZ132cBqrapO0X6BeRjyBXqOt9YeRtnDteHJIQqp5s2pZ41Hz23VUbsVFMfkrsFLU9GwoIRS0ZzLuFK8M5w== +expect@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" + integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== dependencies: - "@jest/types" "^27.5.0" - jest-get-type "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" + "@jest/types" "^27.5.1" + jest-get-type "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" express@^4.17.1: version "4.17.1" @@ -6981,226 +6981,228 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.0.tgz#61e8d0a7394c1ee1cec4c2893e206e62b1566066" - integrity sha512-BGWKI7E6ORqbF5usF1oA4ftbkhVZVrXr8jB0/BrU6TAn3kfOVwX2Zx6pKIXYutJ+qNEjT8Da/gGak0ajya/StA== +jest-changed-files@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" + integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.0.tgz#fcff8829ceb2c8ef4b4532ace7734d156c6664b9" - integrity sha512-+NPd1OxpAHYKjbW8dgL0huFgmtZRKSUKee/UtRgZJEfAxCeA12d7sp0coh5EGDBpW4fCk1Pcia/2dG+j6BQvdw== +jest-circus@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" + integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== dependencies: - "@jest/environment" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.5.0" + expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.0.tgz#06557ad22818740fb28481089a574ba107a8b369" - integrity sha512-9ANs79Goz1ULKtG7HDm/F//4E69v8EFOLXRIHmeC/eK1xTUeQGlU6XP0Zwst386sKaKB4O60qhWY/UaTBS2MLA== +jest-cli@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" + integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== dependencies: - "@jest/core" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/core" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" + jest-config "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" prompts "^2.0.1" yargs "^16.2.0" -jest-config@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.0.tgz#d96ccf8e26d3f2f3ae6543686c48449c201bb621" - integrity sha512-eOIpvpXFz5WHuIYZN1QmvBLEjsSk3w+IAC/2jBpZClbprF53Bj9meBMgAbE15DSkaaJBDFmhXXd1L2eCLaWxQw== +jest-config@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" + integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== dependencies: "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.0" - "@jest/types" "^27.5.0" - babel-jest "^27.5.0" + "@jest/test-sequencer" "^27.5.1" + "@jest/types" "^27.5.1" + babel-jest "^27.5.1" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.9" - jest-circus "^27.5.0" - jest-environment-jsdom "^27.5.0" - jest-environment-node "^27.5.0" - jest-get-type "^27.5.0" - jest-jasmine2 "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-runner "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" + jest-circus "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-get-type "^27.5.1" + jest-jasmine2 "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runner "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" micromatch "^4.0.4" - pretty-format "^27.5.0" + parse-json "^5.2.0" + pretty-format "^27.5.1" slash "^3.0.0" + strip-json-comments "^3.1.1" -jest-diff@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.0.tgz#34dc608a3b9159df178dd480b6d835b5e6b92082" - integrity sha512-zztvHDCq/QcAVv+o6rts0reupSOxyrX+KLQEOMWCW2trZgcBFgp/oTK7hJCGpXvEIqKrQzyQlaPKn9W04+IMQg== +jest-diff@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" + integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== dependencies: chalk "^4.0.0" - diff-sequences "^27.5.0" - jest-get-type "^27.5.0" - pretty-format "^27.5.0" + diff-sequences "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-docblock@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.0.tgz#096fa3a8b55d019a954ef7cc205c791bf94b2352" - integrity sha512-U4MtJgdZn2x+jpPzd7NAYvDmgJAA5h9QxVAwsyuH7IymGzY8VGHhAkHcIGOmtmdC61ORLxCbEhj6fCJsaCWzXA== +jest-docblock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" + integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== dependencies: detect-newline "^3.0.0" -jest-each@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.0.tgz#7bd00a767df0fbec0caba3df0d2c0b3268a2ce84" - integrity sha512-2vpajSdDMZmAxjSP1f4BG9KKduwHtuaI0w66oqLUkfaGUU7Ix/W+d8BW0h3/QEJiew7hR0GSblqdFwTEEbhBdw== +jest-each@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" + integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" chalk "^4.0.0" - jest-get-type "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" - -jest-environment-jsdom@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.0.tgz#6d22d9b76890e9b82c7e1062a15730efb3fb7361" - integrity sha512-sX49N8rjp6HSHeGpNgLk6mtHRd1IPAnE/u7wLQkb6Tz/1E08Q++Y8Zk/IbpVdcFywbzH1icFqEuDuHJ6o+uXXg== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" + jest-get-type "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" + +jest-environment-jsdom@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" + integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.5.0" - jest-util "^27.5.0" + jest-mock "^27.5.1" + jest-util "^27.5.1" jsdom "^16.6.0" -jest-environment-node@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.0.tgz#1ab357b4715bff88d48c8b62b8379002ff955dd1" - integrity sha512-7UzisMMfGyrURhS/eUa7p7mgaqN3ajHylsjOgfcn0caNeYRZq4LHKZLfAxrPM34DWLnBZcRupEJlpQsizdSUsw== +jest-environment-node@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" + integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.5.0" - jest-util "^27.5.0" + jest-mock "^27.5.1" + jest-util "^27.5.1" -jest-get-type@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.0.tgz#861c24aa1b176be83c902292cb9618d580cac8a7" - integrity sha512-Vp6O8a52M/dahXRG/E0EJuWQROps2mDQ0sJYPgO8HskhdLwj9ajgngy2OAqZgV6e/RcU67WUHq6TgfvJb8flbA== +jest-get-type@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" + integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== -jest-haste-map@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.0.tgz#7cc3a920caf304c89fbfceb5d5717b929873f175" - integrity sha512-0KfckSBEKV+D6e0toXmIj4zzp72EiBnvkC0L+xYxenkLhAdkp2/8tye4AgMzz7Fqb1r8SWtz7+s1UQLrxMBang== +jest-haste-map@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" + integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^27.5.0" - jest-serializer "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" + jest-regex-util "^27.5.1" + jest-serializer "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.0.tgz#589d6574d1318d3fb41b3fc368344117ec417dcc" - integrity sha512-X7sT3HLNjjrBEepilxzPyNhNdyunaFBepo1L3T/fvYb9tb8Wb8qY576gwIa+SZcqYUqAA7/bT3EpZI4lAp0Qew== +jest-jasmine2@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" + integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== dependencies: - "@jest/environment" "^27.5.0" - "@jest/source-map" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/environment" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.5.0" + expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" throat "^6.0.1" -jest-leak-detector@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.0.tgz#c98c02e64eab4da9a8b91f058d2b7473272272ee" - integrity sha512-Ak3k+DD3ao5d4/zzJrxAQ5UV5wiCrp47jH94ZD4/vXSzQgE6WBVDfg83VtculLILO7Y6/Q/7yzKSrtN9Na8luA== +jest-leak-detector@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" + integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== dependencies: - jest-get-type "^27.5.0" - pretty-format "^27.5.0" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-matcher-utils@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.0.tgz#d2fc737224fb3bfa38eaa2393ac5bc953d5c5697" - integrity sha512-5ruyzWMGb1ilCWD6ECwNdOhQBeIXAjHmHd5c3uO6quR7RIMHPRP2ucOaejz2j+0R0Ko4GanWM6SqXAeF8nYN5g== +jest-matcher-utils@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" + integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== dependencies: chalk "^4.0.0" - jest-diff "^27.5.0" - jest-get-type "^27.5.0" - pretty-format "^27.5.0" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-message-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.0.tgz#654a781b38a305b1fd8120053c784c67bca00a52" - integrity sha512-lfbWRhTtmZMEHPAtl0SrvNzK1F4UnVNMHOliRQT2BJ4sBFzIb0gBCHA4ebWD4o6l1fUyvDPxM01K9OIMQTAdQw== +jest-message-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" + integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^27.5.0" + pretty-format "^27.5.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.0.tgz#1018656fe6bcd0f58fd1edca7f420169f6707c6e" - integrity sha512-PHluG6MJGng82/sxh8OiB9fnxzNn3cazceSHCAmAKs4g5rMhc3EZCrJXv+4w61rA2WGagMUj7QLLrA1SRlFpzQ== +jest-mock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" + integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -7208,162 +7210,162 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.0.tgz#26c26cf15a73edba13cb8930e261443d25ed8608" - integrity sha512-e9LqSd6HsDsqd7KS3rNyYwmQAaG9jq4U3LbnwVxN/y3nNlDzm2OFs596uo9zrUY+AV1opXq6ome78tRDUCRWfA== +jest-regex-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" + integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== -jest-resolve-dependencies@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.0.tgz#8e3b15589848995ddc9a39f49462dad5b7bc14a2" - integrity sha512-xQsy7CmrT4CJxdNUEdzZU2M/v6YmtQ/pkJM+sx7TA1siG1zfsZuo78PZvzglwRMQFr88f3Su4Om8OEBAic+SMw== +jest-resolve-dependencies@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" + integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== dependencies: - "@jest/types" "^27.5.0" - jest-regex-util "^27.5.0" - jest-snapshot "^27.5.0" + "@jest/types" "^27.5.1" + jest-regex-util "^27.5.1" + jest-snapshot "^27.5.1" -jest-resolve@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.0.tgz#a8e95a68dfb4a59faa508d7b6d2c6a02dcabb712" - integrity sha512-PkDpYEGV/nFqThnIrlPtj8oTxyAV3iuuS6or7dZYyUWaHr/tyyVb5qfBmZS6FEr7ozBHgjrF1bgcgIefnlicbw== +jest-resolve@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" + integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" + jest-haste-map "^27.5.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.5.0" - jest-validate "^27.5.0" + jest-util "^27.5.1" + jest-validate "^27.5.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.0.tgz#b5747a4444b4d3faae019bd201943948882d26c3" - integrity sha512-RMzXhkJLLOKKgUPY2trpyVBijaFmswMtgoCCBk2PQVRHC6yo1vLd1/jmFP39s5OXXnt7rntuzKSYvxl+QUibqQ== +jest-runner@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" + integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== dependencies: - "@jest/console" "^27.5.0" - "@jest/environment" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/console" "^27.5.1" + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" graceful-fs "^4.2.9" - jest-docblock "^27.5.0" - jest-environment-jsdom "^27.5.0" - jest-environment-node "^27.5.0" - jest-haste-map "^27.5.0" - jest-leak-detector "^27.5.0" - jest-message-util "^27.5.0" - jest-resolve "^27.5.0" - jest-runtime "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" + jest-docblock "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-haste-map "^27.5.1" + jest-leak-detector "^27.5.1" + jest-message-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runtime "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.0.tgz#2497116742b9e7cc1e5381a9ded36602b8b0c78c" - integrity sha512-T7APxCPjN3p3ePcLuypbWtD0UZHyAdvIADZ9ABI/sFZ9t/Rf2xIUd6D7RzZIX+unewJRooVGWrgDIgeUuj0OUA== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/globals" "^27.5.0" - "@jest/source-map" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" +jest-runtime@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" + integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/globals" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-message-util "^27.5.0" - jest-mock "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" slash "^3.0.0" strip-bom "^4.0.0" -jest-serializer@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.0.tgz#439a110df27f97a40c114a429b708c2ada15a81f" - integrity sha512-aSDFqQlVXtBH+Zb5dl9mCvTSFkabixk/9P9cpngL4yJKpmEi9USxfDhONFMzJrtftPvZw3PcltUVmtFZTB93rg== +jest-serializer@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" + integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== dependencies: "@types/node" "*" graceful-fs "^4.2.9" -jest-snapshot@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.0.tgz#c5c4c084f5e10036f31e7647de1a6f28c07681fc" - integrity sha512-cAJj15uqWGkro0bfcv/EgusBnqNgCpRruFQZghsMYTq4Fm2lk/VhAf8DgRr8wvhR6Ue1hkeL8tn70Cw4t8x/5A== +jest-snapshot@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" + integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.5.0" + expect "^27.5.1" graceful-fs "^4.2.9" - jest-diff "^27.5.0" - jest-get-type "^27.5.0" - jest-haste-map "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-util "^27.5.0" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + jest-haste-map "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-util "^27.5.1" natural-compare "^1.4.0" - pretty-format "^27.5.0" + pretty-format "^27.5.1" semver "^7.3.2" -jest-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.0.tgz#0b9540d91b0de65d288f235fa9899e6eeeab8d35" - integrity sha512-FUUqOx0gAzJy3ytatT1Ss372M1kmhczn8x7aE0++11oPGW1FyD/5NjYBI8w1KOXFm6IVjtaZm2szfJJL+CHs0g== +jest-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" + integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.0.tgz#b3df32372d2c832fa5a5e31ee2c37f94f79f7f1f" - integrity sha512-2XZzQWNrY9Ypo11mm4ZeVjvr++CQG/45XnmA2aWwx155lTwy1JGFI8LpQ2dBCSAeO21ooqg/FCIvv9WwfnPClA== +jest-validate@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" + integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== dependencies: - "@jest/types" "^27.5.0" + "@jest/types" "^27.5.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.5.0" + jest-get-type "^27.5.1" leven "^3.1.0" - pretty-format "^27.5.0" + pretty-format "^27.5.1" -jest-watcher@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.0.tgz#ca11c3b9115c92a8fd2fd9e2def296d45206f1ca" - integrity sha512-MhIeIvEd6dnnspE0OfYrqHOAfZZdyFqx/k8U2nvVFSkLYf22qAFfyNWPVQYcwqKVNobcOhJoT0kV/nRHGbqK8A== +jest-watcher@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" + integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== dependencies: - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.5.0" + jest-util "^27.5.1" string-length "^4.0.1" jest-worker@^26.2.1: @@ -7384,23 +7386,23 @@ jest-worker@^27.0.2: merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.0.tgz#99ee77e4d06168107c27328bd7f54e74c3a48d59" - integrity sha512-8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg== +jest-worker@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.0.tgz#2c04ff88754e42e9fc5240840b91f9a9a8990875" - integrity sha512-sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A== +jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" + integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== dependencies: - "@jest/core" "^27.5.0" + "@jest/core" "^27.5.1" import-local "^3.0.2" - jest-cli "^27.5.0" + jest-cli "^27.5.1" jimp@0.16.1: version "0.16.1" @@ -9263,6 +9265,16 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -9782,10 +9794,10 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -pretty-format@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.0.tgz#71e1af7a4b587d259fa4668dcd3e94af077767cb" - integrity sha512-xEi6BRPZ+J1AIS4BAtFC/+rh5jXlXObGZjx5+OSpM95vR/PGla78bFVHMy5GdZjP9wk3AHAMHROXq/r69zXltw== +pretty-format@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== dependencies: ansi-regex "^5.0.1" ansi-styles "^5.0.0" From 409f7d00c05d3cf2df3f2508aeee35d32494760a Mon Sep 17 00:00:00 2001 From: Sam Chen Date: Thu, 10 Feb 2022 19:49:23 +0800 Subject: [PATCH 02/29] fix issue#5945 (#5947) * fix issue#5945 * refactor remark plugins * update css * cleanup * add some tests * clean up --- package.json | 3 +- src/components/Markdown/Markdown.scss | 11 ++-- .../__snapshots__/index.test.mjs.snap | 7 +++ .../remark-remove-heading-id/index.mjs | 14 +++++ .../remark-remove-heading-id/index.test.mjs | 23 ++++++++ .../__snapshots__/index.test.mjs.snap | 7 +++ src/remark-plugins/remark-slug/index.mjs | 56 +++++++++++++++++++ src/remark-plugins/remark-slug/index.test.mjs | 20 +++++++ src/remark-plugins/remark-slug/license | 22 ++++++++ src/utilities/content-tree-enhancers.mjs | 4 +- webpack.common.mjs | 4 +- yarn.lock | 31 ++-------- 12 files changed, 169 insertions(+), 33 deletions(-) create mode 100644 src/remark-plugins/remark-remove-heading-id/__snapshots__/index.test.mjs.snap create mode 100644 src/remark-plugins/remark-remove-heading-id/index.mjs create mode 100644 src/remark-plugins/remark-remove-heading-id/index.test.mjs create mode 100644 src/remark-plugins/remark-slug/__snapshots__/index.test.mjs.snap create mode 100644 src/remark-plugins/remark-slug/index.mjs create mode 100644 src/remark-plugins/remark-slug/index.test.mjs create mode 100644 src/remark-plugins/remark-slug/license diff --git a/package.json b/package.json index 7e7e430bfb79..2f8a2ae9807b 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "eslint-plugin-react": "^7.28.0", "eslint-plugin-react-hooks": "^4.3.0", "front-matter": "^4.0.2", + "github-slugger": "^1.4.0", "html-webpack-plugin": "^5.5.0", "http-server": "^14.1.0", "husky": "^7.0.4", @@ -105,6 +106,7 @@ "lodash": "^4.17.21", "markdownlint": "^0.25.1", "markdownlint-cli": "^0.31.0", + "mdast-util-to-string": "^3.1.0", "mini-css-extract-plugin": "^2.5.3", "mkdirp": "^1.0.4", "modularscale-sass": "^3.0.3", @@ -123,7 +125,6 @@ "remark-gfm": "^1.0.0", "remark-html": "^15.0.1", "remark-refractor": "montogeek/remark-refractor", - "remark-slug": "^7.0.1", "rimraf": "^3.0.2", "sass": "^1.49.7", "sass-loader": "^12.4.0", diff --git a/src/components/Markdown/Markdown.scss b/src/components/Markdown/Markdown.scss index f43030c17f0f..daabd9f61816 100644 --- a/src/components/Markdown/Markdown.scss +++ b/src/components/Markdown/Markdown.scss @@ -1,4 +1,4 @@ -@use "sass:color"; +@use 'sass:color'; @import 'vars'; @import 'functions'; @import 'prism-theme'; @@ -41,15 +41,16 @@ $topHeightMobileWithBanner: $bannerHeight + $topHeightMobile; h4, h5, h6 { - &:before { - content: ''; + > span[id] { + position: absolute; + width: 0; display: block; visibility: hidden; pointer-events: none; - height: $topHeightMobile; + padding-top: $topHeightMobile; margin-top: -#{$topHeightMobile}; @include break { - height: $topHeightDesktop; + padding-top: $topHeightDesktop; margin-top: -#{$topHeightDesktop}; } } diff --git a/src/remark-plugins/remark-remove-heading-id/__snapshots__/index.test.mjs.snap b/src/remark-plugins/remark-remove-heading-id/__snapshots__/index.test.mjs.snap new file mode 100644 index 000000000000..02e066d7ceb0 --- /dev/null +++ b/src/remark-plugins/remark-remove-heading-id/__snapshots__/index.test.mjs.snap @@ -0,0 +1,7 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`customize blockquote should add id 1`] = ` +"

hello world

+

this is me.

+" +`; diff --git a/src/remark-plugins/remark-remove-heading-id/index.mjs b/src/remark-plugins/remark-remove-heading-id/index.mjs new file mode 100644 index 000000000000..fe4df6e0b8ec --- /dev/null +++ b/src/remark-plugins/remark-remove-heading-id/index.mjs @@ -0,0 +1,14 @@ +import { visit } from 'unist-util-visit'; +export default function () { + return function transformer(ast) { + visit(ast, 'heading', visitor); + }; + function visitor(node) { + if (node.data && node.data.id) { + delete node.data.id; + } + if (node.data && node.data.hProperties && node.data.hProperties.id) { + delete node.data.hProperties.id; + } + } +} diff --git a/src/remark-plugins/remark-remove-heading-id/index.test.mjs b/src/remark-plugins/remark-remove-heading-id/index.test.mjs new file mode 100644 index 000000000000..1782ce1c2676 --- /dev/null +++ b/src/remark-plugins/remark-remove-heading-id/index.test.mjs @@ -0,0 +1,23 @@ +import { remark } from 'remark'; +import remarkHtml from 'remark-html'; +import Plugin from './index.mjs'; +import remarkSlug from '../remark-slug/index.mjs'; +describe('customize blockquote', () => { + it('should add id', () => { + remark() + .use(remarkSlug) + .use(Plugin) + .use(remarkHtml) + .process( + ` +## hello world + +this is me. +`, + function (err, { value: contents }) { + expect(err).toBeNull(); + expect(contents).toMatchSnapshot(); + } + ); + }); +}); diff --git a/src/remark-plugins/remark-slug/__snapshots__/index.test.mjs.snap b/src/remark-plugins/remark-slug/__snapshots__/index.test.mjs.snap new file mode 100644 index 000000000000..16c03e73a1c9 --- /dev/null +++ b/src/remark-plugins/remark-slug/__snapshots__/index.test.mjs.snap @@ -0,0 +1,7 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`remark slug should add id 1`] = ` +"

hello world

+

this is me.

+" +`; diff --git a/src/remark-plugins/remark-slug/index.mjs b/src/remark-plugins/remark-slug/index.mjs new file mode 100644 index 000000000000..79fdaef2aa23 --- /dev/null +++ b/src/remark-plugins/remark-slug/index.mjs @@ -0,0 +1,56 @@ +// based on https://github.com/remarkjs/remark-slug/blob/8e6394c3dd6232cc9f0fb0b05e7eaf33063effa5/index.js +// to fix https://github.com/webpack/webpack.js.org/pull/5947 +/** + * @typedef {import('mdast').Root} Root + * @typedef {import('hast').Properties} Properties + */ + +import { toString } from 'mdast-util-to-string'; +import { visit } from 'unist-util-visit'; +import BananaSlug from 'github-slugger'; + +const slugs = new BananaSlug(); + +/** + * Plugin to add anchors headings using GitHub’s algorithm. + * + * @type {import('unified').Plugin} + */ +export default function remarkSlug() { + return (tree) => { + slugs.reset(); + + visit(tree, 'heading', (node) => { + const data = node.data || (node.data = {}); + const props = /** @type {Properties} */ ( + data.hProperties || (data.hProperties = {}) + ); + let id = props.id; + + id = id ? slugs.slug(String(id), true) : slugs.slug(toString(node)); + + data.id = id; + props.id = id; + + // insert for headings + node.children = [ + { + type: 'paragraph', + data: { + hName: 'span', + hProperties: { + id, + }, + }, + children: [ + { + type: 'text', + value: '', + }, + ], + }, + ...node.children, + ]; + }); + }; +} diff --git a/src/remark-plugins/remark-slug/index.test.mjs b/src/remark-plugins/remark-slug/index.test.mjs new file mode 100644 index 000000000000..02eaa9eb64c4 --- /dev/null +++ b/src/remark-plugins/remark-slug/index.test.mjs @@ -0,0 +1,20 @@ +import { remark } from 'remark'; +import remarkHtml from 'remark-html'; +import Plugin from './index.mjs'; +describe('remark slug', () => { + it('should add id', () => { + remark() + .use(Plugin) + .use(remarkHtml) + .process( + `## hello world + +this is me. +`, + function (err, { value: contents }) { + expect(err).toBeNull(); + expect(contents).toMatchSnapshot(); + } + ); + }); +}); diff --git a/src/remark-plugins/remark-slug/license b/src/remark-plugins/remark-slug/license new file mode 100644 index 000000000000..32e7a3d93ca5 --- /dev/null +++ b/src/remark-plugins/remark-slug/license @@ -0,0 +1,22 @@ +(The MIT License) + +Copyright (c) 2015 Titus Wormer + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/utilities/content-tree-enhancers.mjs b/src/utilities/content-tree-enhancers.mjs index b9c18e3fd7bc..47ac93f68f75 100644 --- a/src/utilities/content-tree-enhancers.mjs +++ b/src/utilities/content-tree-enhancers.mjs @@ -2,12 +2,13 @@ import fs from 'fs'; import path from 'path'; import frontMatter from 'front-matter'; import {remark} from 'remark'; -import slug from 'remark-slug'; +import slug from '../../src/remark-plugins/remark-slug/index.mjs'; import extractAnchors from 'remark-extract-anchors'; import remarkHtml from 'remark-html'; import frontmatter from 'remark-frontmatter'; import gfm from 'remark-gfm'; import emoji from 'remark-emoji'; +import remarkRemoveHeadingId from '../remark-plugins/remark-remove-heading-id/index.mjs'; export const enhance = (tree, options) => { // delete `./` root directory on node @@ -46,6 +47,7 @@ export const enhance = (tree, options) => { .use(gfm) .use(emoji) .use(extractAnchors, { anchors, levels: 3 }) + .use(remarkRemoveHeadingId) .use(remarkHtml) .process(content, (err) => { if (err) { diff --git a/webpack.common.mjs b/webpack.common.mjs index b8cb05ccbb47..8dd46af61d30 100644 --- a/webpack.common.mjs +++ b/webpack.common.mjs @@ -4,7 +4,7 @@ import webpack from 'webpack'; import h from 'hastscript'; import remarkResponsiveTable from './src/remark-plugins/remark-responsive-table/remark-responsive-table.mjs'; import gfm from 'remark-gfm'; -import slug from 'remark-slug'; +import slug from './src/remark-plugins/remark-slug/index.mjs'; import cleanup from './src/remark-plugins/remark-cleanup-readme/index.mjs'; import aside from './src/remark-plugins/remark-custom-asides/index.mjs'; import autolink from 'remark-autolink-headings'; @@ -13,6 +13,7 @@ import frontmatter from 'remark-frontmatter'; import { createRequire } from 'module'; import remarkEmoji from 'remark-emoji'; import { fileURLToPath } from 'url'; +import remarkRemoveHeadingId from './src/remark-plugins/remark-remove-heading-id/index.mjs'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -44,6 +45,7 @@ const mdPlugins = [ }, ], refractor, + remarkRemoveHeadingId ]; export default ({ ssg = false }) => ({ diff --git a/yarn.lock b/yarn.lock index ecc8ee150dda..adcee83c67da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2486,7 +2486,7 @@ dependencies: "@types/node" "*" -"@types/hast@^2.0.0", "@types/hast@^2.3.2": +"@types/hast@^2.0.0": version "2.3.4" resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== @@ -4857,11 +4857,6 @@ emittery@^0.8.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== -"emoji-regex@>=6.0.0 <=6.1.1": - version "6.1.1" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" - integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4= - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -5849,12 +5844,10 @@ gifwrap@^0.9.2: image-q "^1.1.1" omggif "^1.0.10" -github-slugger@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9" - integrity sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q== - dependencies: - emoji-regex ">=6.0.0 <=6.1.1" +github-slugger@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" @@ -8299,7 +8292,7 @@ mdast-util-to-string@^2.0.0: resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== -mdast-util-to-string@^3.0.0: +mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== @@ -10363,18 +10356,6 @@ remark-refractor@montogeek/remark-refractor: refractor "^3.1.0" unist-util-visit "1.3.1" -remark-slug@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-7.0.1.tgz#9827ce6d6ee81ca82b79891b0e5931a8123ce63b" - integrity sha512-NRvYePr69LdeCkEGwL4KYAmq7kdWG5rEavCXMzUR4qndLoXHJAOLSUmPY6Qm4NJfKix7/EmgObyVaYivONAFhg== - dependencies: - "@types/hast" "^2.3.2" - "@types/mdast" "^3.0.0" - github-slugger "^1.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unist-util-visit "^4.0.0" - remark-squeeze-paragraphs@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" From 5be2b451a2febc36f25971ae7c85aa143528f1c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 18:09:20 +0530 Subject: [PATCH 03/29] build(deps-dev): bump tailwindcss from 3.0.18 to 3.0.19 (#5952) Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.18 to 3.0.19. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.0.18...v3.0.19) --- updated-dependencies: - dependency-name: tailwindcss 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 | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 2f8a2ae9807b..3b16c277ce7c 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "start-server-and-test": "^1.14.0", "static-site-generator-webpack-plugin": "^3.4.1", "style-loader": "^3.3.1", - "tailwindcss": "^3.0.18", + "tailwindcss": "^3.0.19", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", "webpack": "^5.68.0", diff --git a/yarn.lock b/yarn.lock index adcee83c67da..09fd2ef2c483 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6648,7 +6648,7 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" -is-core-module@^2.8.0: +is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -10498,12 +10498,12 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.3.2, resolve@^1.9.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f" - integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA== +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2, resolve@^1.9.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: - is-core-module "^2.8.0" + is-core-module "^2.8.1" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -11551,10 +11551,10 @@ table-layout@^1.0.1: typical "^5.2.0" wordwrapjs "^4.0.0" -tailwindcss@^3.0.18: - version "3.0.18" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5" - integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw== +tailwindcss@^3.0.19: + version "3.0.19" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.19.tgz#cd789953e6762af2e80c5a3e5d6da3a975ee8215" + integrity sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -11575,7 +11575,7 @@ tailwindcss@^3.0.18: postcss-selector-parser "^6.0.9" postcss-value-parser "^4.2.0" quick-lru "^5.1.1" - resolve "^1.21.0" + resolve "^1.22.0" tap-parser@^7.0.0: version "7.0.0" From 694074977dc82e028c64405a0cff7acda42d1935 Mon Sep 17 00:00:00 2001 From: Sam Chen Date: Fri, 11 Feb 2022 08:22:18 +0800 Subject: [PATCH 04/29] fix svg color for dark mode (#5957) --- src/styles/icons/hamburger.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/icons/hamburger.svg b/src/styles/icons/hamburger.svg index 376a57f2040e..b42a4c8f8cb4 100644 --- a/src/styles/icons/hamburger.svg +++ b/src/styles/icons/hamburger.svg @@ -1 +1 @@ - \ No newline at end of file + From 944426a2aa2e55a0d9b1cddd426241393b3d30dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 08:33:20 +0800 Subject: [PATCH 05/29] build(deps-dev): bump @babel/core from 7.17.0 to 7.17.2 (#5953) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.17.0 to 7.17.2. - [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.17.2/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" 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 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 3b16c277ce7c..6682ff2b6e35 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.17.0", + "@babel/core": "^7.17.2", "@babel/eslint-parser": "^7.17.0", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", diff --git a/yarn.lock b/yarn.lock index 09fd2ef2c483..d66a7e4f92ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -176,17 +176,17 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5" - integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA== +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.2", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337" + integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw== dependencies: "@ampproject/remapping" "^2.0.0" "@babel/code-frame" "^7.16.7" "@babel/generator" "^7.17.0" "@babel/helper-compilation-targets" "^7.16.7" "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.0" + "@babel/helpers" "^7.17.2" "@babel/parser" "^7.17.0" "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.0" @@ -438,10 +438,10 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b" - integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.2": + version "7.17.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417" + integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ== dependencies: "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.0" From 971d459ee1cfb95f51df1ab5032fbc78c12944d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 21:35:54 +0800 Subject: [PATCH 06/29] build(deps-dev): bump directory-tree from 3.1.0 to 3.2.0 (#5954) Bumps [directory-tree](https://github.com/mihneadb/node-directory-tree) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/mihneadb/node-directory-tree/releases) - [Commits](https://github.com/mihneadb/node-directory-tree/compare/3.1.0...3.2.0) --- updated-dependencies: - dependency-name: directory-tree 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 6682ff2b6e35..05600784716b 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "css-loader": "^6.6.0", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.4.1", - "directory-tree": "^3.1.0", + "directory-tree": "^3.2.0", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", "eslint": "^8.8.0", diff --git a/yarn.lock b/yarn.lock index d66a7e4f92ef..914d0e9ea36e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4638,10 +4638,10 @@ directory-tree@^2.0.0: resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-2.3.1.tgz#78b8aa84878eb84dd29a51dcd664ded4cd0247c7" integrity sha512-hxolIHCtQ/a56CUywaLzGD/V78zPwFihI+UK/4ZjOp7GoV4Mptmtv95yavOn/RlnTi7cCMjszvfcNrwCoWLH+Q== -directory-tree@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-3.1.0.tgz#3cf84a820237d917fa554084ae805e0137bd6ee2" - integrity sha512-zBRPgnOQyCgZn5kE8JQy/vDWqeFJfnMpQQMfR/XfJqbJqBJxFesEysZ+m0Mo1vy0ZsU690HLPVu3eTRat7JNAw== +directory-tree@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-3.2.0.tgz#292d21c1b67574aba493a526260d955bbf8ba69d" + integrity sha512-9DVfwzNHQITlFSMohak4ix2P/B6Q7eP2QH70plgaJ8bADwDKtZgttmn9djHWYWznOWaK0vbQ1dpE4oOIimthsA== dependencies: command-line-args "^5.2.0" command-line-usage "^6.1.1" From 423972e7bd617e0fa84214cdd20cbc6a33df5466 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 09:28:31 +0800 Subject: [PATCH 07/29] build(deps-dev): bump tailwindcss from 3.0.19 to 3.0.22 (#5961) Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.19 to 3.0.22. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.0.19...v3.0.22) --- updated-dependencies: - dependency-name: tailwindcss 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 | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 05600784716b..359372b97985 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "start-server-and-test": "^1.14.0", "static-site-generator-webpack-plugin": "^3.4.1", "style-loader": "^3.3.1", - "tailwindcss": "^3.0.19", + "tailwindcss": "^3.0.22", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", "webpack": "^5.68.0", diff --git a/yarn.lock b/yarn.lock index 914d0e9ea36e..1023ae32dba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11551,10 +11551,10 @@ table-layout@^1.0.1: typical "^5.2.0" wordwrapjs "^4.0.0" -tailwindcss@^3.0.19: - version "3.0.19" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.19.tgz#cd789953e6762af2e80c5a3e5d6da3a975ee8215" - integrity sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig== +tailwindcss@^3.0.22: + version "3.0.22" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.22.tgz#5f1aac83810261300ae5b2f98fd4a2fa2ded2c42" + integrity sha512-F8lt74RlNZirnkaSk310+vGQta7c0/hgx7/bqxruM4wS9lp8oqV93lzavajC3VT0Lp4UUtUVIt8ifKcmGzkr0A== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -11569,6 +11569,7 @@ tailwindcss@^3.0.19: is-glob "^4.0.3" normalize-path "^3.0.0" object-hash "^2.2.0" + postcss "^8.4.6" postcss-js "^4.0.0" postcss-load-config "^3.1.0" postcss-nested "5.0.6" From 1c118881cffe69db12d7d2362aac8f3c222a091e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 12:37:17 +0800 Subject: [PATCH 08/29] build(deps-dev): bump directory-tree from 3.2.0 to 3.2.1 (#5962) Bumps [directory-tree](https://github.com/mihneadb/node-directory-tree) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/mihneadb/node-directory-tree/releases) - [Commits](https://github.com/mihneadb/node-directory-tree/compare/3.2.0...3.2.1) --- updated-dependencies: - dependency-name: directory-tree 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 359372b97985..8215e33bdf4a 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "css-loader": "^6.6.0", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.4.1", - "directory-tree": "^3.2.0", + "directory-tree": "^3.2.1", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", "eslint": "^8.8.0", diff --git a/yarn.lock b/yarn.lock index 1023ae32dba1..06c26d97089e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4638,10 +4638,10 @@ directory-tree@^2.0.0: resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-2.3.1.tgz#78b8aa84878eb84dd29a51dcd664ded4cd0247c7" integrity sha512-hxolIHCtQ/a56CUywaLzGD/V78zPwFihI+UK/4ZjOp7GoV4Mptmtv95yavOn/RlnTi7cCMjszvfcNrwCoWLH+Q== -directory-tree@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-3.2.0.tgz#292d21c1b67574aba493a526260d955bbf8ba69d" - integrity sha512-9DVfwzNHQITlFSMohak4ix2P/B6Q7eP2QH70plgaJ8bADwDKtZgttmn9djHWYWznOWaK0vbQ1dpE4oOIimthsA== +directory-tree@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-3.2.1.tgz#969fe53b448fb8dd85801021414c26e1f3b1707c" + integrity sha512-e0RmTrL/X98Rt4e32W/2fZehBWu3rr8D59XDSWuym8nECXA9/04T5ar1LHLXF2sSG2upj8RZUfj2c14z6y/zKQ== dependencies: command-line-args "^5.2.0" command-line-usage "^6.1.1" From aca061597de0a6da7cc4f52424c49bf306bc7c09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 17:58:53 +0800 Subject: [PATCH 09/29] build(deps): bump follow-redirects from 1.14.7 to 1.14.8 (#5963) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... 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 06c26d97089e..8111331bfe5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5634,9 +5634,9 @@ flatted@^3.1.0: integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== forever-agent@~0.6.1: version "0.6.1" From f0353c6c8c23762181338d6a1fe61f9628326bc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Feb 2022 08:05:57 +0530 Subject: [PATCH 10/29] build(deps-dev): bump markdownlint-cli from 0.31.0 to 0.31.1 (#5955) Bumps [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) from 0.31.0 to 0.31.1. - [Release notes](https://github.com/igorshubovych/markdownlint-cli/releases) - [Commits](https://github.com/igorshubovych/markdownlint-cli/compare/v0.31.0...v0.31.1) --- updated-dependencies: - dependency-name: markdownlint-cli 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 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 8215e33bdf4a..9d4457f6c2fa 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "lint-staged": "^12.3.3", "lodash": "^4.17.21", "markdownlint": "^0.25.1", - "markdownlint-cli": "^0.31.0", + "markdownlint-cli": "^0.31.1", "mdast-util-to-string": "^3.1.0", "mini-css-extract-plugin": "^2.5.3", "mkdirp": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index 8111331bfe5d..e072e4d4b642 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8057,10 +8057,10 @@ markdown-table@^2.0.0: dependencies: repeat-string "^1.0.0" -markdownlint-cli@^0.31.0: - version "0.31.0" - resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.31.0.tgz#a44264a71066475228292b7af19d3d18b827676d" - integrity sha512-UCNA10I2evrEqGWUGM4I6ae6LubLeySkKegP1GQaZSES516BYBgOn8Ai8MXU+5rSIeCvMyKi91alqHyRDuUnYA== +markdownlint-cli@^0.31.1: + version "0.31.1" + resolved "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz#8db34eec453e84bed06a954c8a289333f7c2c1c7" + integrity sha512-keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g== dependencies: commander "~9.0.0" get-stdin "~9.0.0" @@ -8070,7 +8070,7 @@ markdownlint-cli@^0.31.0: jsonc-parser "~3.0.0" markdownlint "~0.25.1" markdownlint-rule-helpers "~0.16.0" - minimatch "~3.0.4" + minimatch "~3.0.5" run-con "~1.2.10" markdownlint-rule-helpers@~0.16.0: @@ -8720,10 +8720,10 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@^3.0.4, minimatch@~3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^3.0.4, minimatch@~3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== dependencies: brace-expansion "^1.1.7" From 6a74a3ced1e08c5496697d545a1cdf6009279c81 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sun, 13 Feb 2022 08:32:20 +0530 Subject: [PATCH 11/29] docs(api): update description for `WEBPACK_SERVE` env variable (#5965) --- src/content/api/cli.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/api/cli.mdx b/src/content/api/cli.mdx index 9baacade9df6..9e372b800312 100644 --- a/src/content/api/cli.mdx +++ b/src/content/api/cli.mdx @@ -580,7 +580,7 @@ In addition to the customized `env` showed above, there are some built-in ones u | Environment Variable | Description | | -------------------- | -------------------------------------------- | -| `WEBPACK_SERVE` | `true` if `serve\|s` is being used. | +| `WEBPACK_SERVE` | `true` if `serve\|server\|s` is being used. | | `WEBPACK_BUILD` | `true` if `build\|bundle\|b` is being used. | | `WEBPACK_WATCH` | `true` if `--watch\|watch\|w` is being used. | From a345efa655b905807b998b6b5f98a6f87055026c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 06:18:28 +0530 Subject: [PATCH 12/29] build(deps-dev): bump eslint from 8.8.0 to 8.9.0 (#5967) Bumps [eslint](https://github.com/eslint/eslint) from 8.8.0 to 8.9.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.8.0...v8.9.0) --- updated-dependencies: - dependency-name: eslint 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 | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 9d4457f6c2fa..e5f6a2b3461f 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "directory-tree": "^3.2.1", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", - "eslint": "^8.8.0", + "eslint": "^8.9.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-mdx": "^1.16.0", diff --git a/yarn.lock b/yarn.lock index e072e4d4b642..2f78f1d9525a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1269,14 +1269,14 @@ "@docsearch/css" "3.0.0-alpha.50" algoliasearch "^4.0.0" -"@eslint/eslintrc@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318" - integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ== +"@eslint/eslintrc@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.1.0.tgz#583d12dbec5d4f22f333f9669f7d0b7c7815b4d3" + integrity sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.2.0" + espree "^9.3.1" globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" @@ -5150,10 +5150,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153" - integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg== +eslint-scope@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -5170,17 +5170,17 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1" - integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ== +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.8.0.tgz#9762b49abad0cb4952539ffdb0a046392e571a2d" - integrity sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ== +eslint@^8.9.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz#a2a8227a99599adc4342fd9b854cb8d8d6412fdb" + integrity sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q== dependencies: - "@eslint/eslintrc" "^1.0.5" + "@eslint/eslintrc" "^1.1.0" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -5188,10 +5188,10 @@ eslint@^8.8.0: debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.0" + eslint-scope "^7.1.1" eslint-utils "^3.0.0" - eslint-visitor-keys "^3.2.0" - espree "^9.3.0" + eslint-visitor-keys "^3.3.0" + espree "^9.3.1" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -5216,14 +5216,14 @@ eslint@^8.8.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^9.2.0, espree@^9.3.0: - version "9.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8" - integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ== +espree@^9.3.1: + version "9.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" + integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== dependencies: acorn "^8.7.0" acorn-jsx "^5.3.1" - eslint-visitor-keys "^3.1.0" + eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" From 9cd1fb05b19d334c2a1b6685ee8ac3a78d57b502 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 16 Feb 2022 07:17:04 +0530 Subject: [PATCH 13/29] docs(configuration): add note for resource name when filename is data URI (#5946) --- src/content/configuration/output.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/content/configuration/output.mdx b/src/content/configuration/output.mdx index fc9c78cca913..b5aea1674c39 100644 --- a/src/content/configuration/output.mdx +++ b/src/content/configuration/output.mdx @@ -38,6 +38,8 @@ The top-level `output` key contains a set of options instructing webpack on how The same as [`output.filename`](#outputfilename) but for [Asset Modules](/guides/asset-modules/). +`[name]`, `[file]`, `[query]`, `[fragment]`, `[base]`, and `[path]` are set to an empty string for the assets built from data URI replacements. + ## output.asyncChunks `boolean = true` From 05fd0bc359eedb31b1463794b73ab1592f899950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 08:25:16 +0530 Subject: [PATCH 14/29] build(deps-dev): bump lint-staged from 12.3.3 to 12.3.4 (#5968) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 12.3.3 to 12.3.4. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](https://github.com/okonet/lint-staged/compare/v12.3.3...v12.3.4) --- updated-dependencies: - dependency-name: lint-staged 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 e5f6a2b3461f..1a1b7b0a60d3 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "husky": "^7.0.4", "hyperlink": "^5.0.4", "jest": "^27.5.1", - "lint-staged": "^12.3.3", + "lint-staged": "^12.3.4", "lodash": "^4.17.21", "markdownlint": "^0.25.1", "markdownlint-cli": "^0.31.1", diff --git a/yarn.lock b/yarn.lock index 2f78f1d9525a..78f6c8cf2484 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7706,10 +7706,10 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lint-staged@^12.3.3: - version "12.3.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.3.tgz#0a465962fe53baa2b4b9da50801ead49a910e03b" - integrity sha512-OqcLsqcPOqzvsfkxjeBpZylgJ3SRG1RYqc9LxC6tkt6tNsq1bNVkAixBwX09f6CobcHswzqVOCBpFR1Fck0+ag== +lint-staged@^12.3.4: + version "12.3.4" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.4.tgz#4b1ff8c394c3e6da436aaec5afd4db18b5dac360" + integrity sha512-yv/iK4WwZ7/v0GtVkNb3R82pdL9M+ScpIbJLJNyCXkJ1FGaXvRCOg/SeL59SZtPpqZhE7BD6kPKFLIDUhDx2/w== dependencies: cli-truncate "^3.1.0" colorette "^2.0.16" From 071299ed6e49b2801a815e46c17550220190f62c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 08:41:14 +0530 Subject: [PATCH 15/29] build(deps-dev): bump webpack from 5.68.0 to 5.69.0 (#5972) Bumps [webpack](https://github.com/webpack/webpack) from 5.68.0 to 5.69.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.68.0...v5.69.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 | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 1a1b7b0a60d3..c49f848d1d19 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "tailwindcss": "^3.0.22", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", - "webpack": "^5.68.0", + "webpack": "^5.69.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 78f6c8cf2484..3064cc1e0b83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2434,10 +2434,10 @@ dependencies: "@types/ms" "*" -"@types/eslint-scope@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" - integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== +"@types/eslint-scope@^3.7.3": + version "3.7.3" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" + integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== dependencies: "@types/eslint" "*" "@types/estree" "*" @@ -2450,10 +2450,10 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.50": - version "0.0.50" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" - integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== +"@types/estree@*", "@types/estree@^0.0.51": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== "@types/estree@0.0.39": version "0.0.39" @@ -4889,10 +4889,10 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.8.3: - version "5.8.3" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" - integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== +enhanced-resolve@^5.9.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee" + integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -12587,13 +12587,13 @@ webpack-sources@^3.2.3: react-textarea-autosize "^5.2.1" uuid "^3.1.0" -webpack@^5.68.0: - version "5.68.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.68.0.tgz#a653a58ed44280062e47257f260117e4be90d560" - integrity sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g== +webpack@^5.69.0: + version "5.69.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.0.tgz#c9eb607d4f6c49f1e5755492323a7b055c3450e3" + integrity sha512-E5Fqu89Gu8fR6vejRqu26h8ld/k6/dCVbeGUcuZjc+goQHDfCPU9rER71JmdtBYGmci7Ec2aFEATQ2IVXKy2wg== dependencies: - "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.50" + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^0.0.51" "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" @@ -12601,7 +12601,7 @@ webpack@^5.68.0: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.3" + enhanced-resolve "^5.9.0" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" From 721a919dc2a22673b5dca912d051c58c3b7c2137 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:43:22 +0530 Subject: [PATCH 16/29] build(deps-dev): bump cypress from 9.4.1 to 9.5.0 (#5974) Bumps [cypress](https://github.com/cypress-io/cypress) from 9.4.1 to 9.5.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v9.4.1...v9.5.0) --- updated-dependencies: - dependency-name: cypress 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 c49f848d1d19..bb1f5243e119 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.6.0", "css-minimizer-webpack-plugin": "^3.4.1", - "cypress": "^9.4.1", + "cypress": "^9.5.0", "directory-tree": "^3.2.1", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 3064cc1e0b83..ff4f770a308b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4372,10 +4372,10 @@ csstype@^3.0.6: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef" integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw== -cypress@^9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.4.1.tgz#1a4ba706435829c24b7edf350c2b059e05da9084" - integrity sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ== +cypress@^9.5.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.0.tgz#704a79f0d3d4e775f433334eb8f5ae065e3bea31" + integrity sha512-rC5QPolKsVjJ8QJZ7IeZ6HlKM4gswBGZc0XvoAJNL8urQCSL8zTX0A/ai/h35WfF47NQ0iSZnwIXBlHX3MOUIQ== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" From b043cd3e5c52e19d9a60ad279ae3581a15c5aa8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 11:01:17 +0530 Subject: [PATCH 17/29] build(deps-dev): bump @babel/core from 7.17.2 to 7.17.3 (#5971) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.17.2 to 7.17.3. - [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.17.3/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" 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 | 72 +++++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index bb1f5243e119..0fd27366af09 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.17.2", + "@babel/core": "^7.17.3", "@babel/eslint-parser": "^7.17.0", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", diff --git a/yarn.lock b/yarn.lock index ff4f770a308b..0e9f6b394c18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -125,13 +125,12 @@ "@algolia/logger-common" "4.10.3" "@algolia/requester-common" "4.10.3" -"@ampproject/remapping@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.2.tgz#f3d9760bf30588c51408dbe7c05ff2bb13069307" - integrity sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA== +"@ampproject/remapping@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.1.tgz#7922fb0817bf3166d8d9e258c57477e3fd1c3610" + integrity sha512-Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA== dependencies: - "@jridgewell/trace-mapping" "^0.2.2" - sourcemap-codec "1.4.8" + "@jridgewell/trace-mapping" "^0.3.0" "@apideck/better-ajv-errors@^0.3.1": version "0.3.1" @@ -176,20 +175,20 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.2", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337" - integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw== +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.3.tgz#6a6f7e9b5cc0182aef531b93cb5dde94071dc20d" + integrity sha512-TolSoY0D/G6/e5bufjUK7wqQeHdcK4NbdxHg0hrhx/zN6boloG52oNpxbZuil/GqmAIz2qEnJ0s8ay24j2YwVg== dependencies: - "@ampproject/remapping" "^2.0.0" + "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" + "@babel/generator" "^7.17.3" "@babel/helper-compilation-targets" "^7.16.7" "@babel/helper-module-transforms" "^7.16.7" "@babel/helpers" "^7.17.2" - "@babel/parser" "^7.17.0" + "@babel/parser" "^7.17.3" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" + "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" @@ -206,10 +205,10 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.17.0", "@babel/generator@^7.7.2": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e" - integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw== +"@babel/generator@^7.12.5", "@babel/generator@^7.17.3", "@babel/generator@^7.7.2": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" + integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -456,10 +455,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" - integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" + integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -1188,18 +1187,18 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.7.2": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" - integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== +"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.7.2": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" + "@babel/generator" "^7.17.3" "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.0" + "@babel/parser" "^7.17.3" "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" @@ -1822,13 +1821,18 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== -"@jridgewell/trace-mapping@^0.2.2": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.5.tgz#d5061cc513fd3a0a949feb56b8073989865b1abe" - integrity sha512-K+Eths78fXDFOvQ2hgJhCiI5s+g81r2yXmACBpbn+f2+Qt94PNoTgUcAXPT8DZkhXCsZRsHVWVtY5KIBMcpDqQ== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.11" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" + integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== + +"@jridgewell/trace-mapping@^0.3.0": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" + integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== dependencies: "@jridgewell/resolve-uri" "^3.0.3" - sourcemap-codec "1.4.8" + "@jridgewell/sourcemap-codec" "^1.4.10" "@mdx-js/loader@^2.0.0-next.9": version "2.0.0-next.9" @@ -11052,7 +11056,7 @@ source-map@^0.8.0-beta.0: dependencies: whatwg-url "^7.0.0" -sourcemap-codec@1.4.8, sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: +sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== From cbb23938eff50a58972ef96a11a61c34fb231a05 Mon Sep 17 00:00:00 2001 From: Artem Malko Date: Wed, 16 Feb 2022 21:12:33 +0700 Subject: [PATCH 18/29] =?UTF-8?q?docs(guides):=20clarify=20some=20caveats?= =?UTF-8?q?=20about=20dynamic=20import=20manual=20preloa=E2=80=A6=20(#5960?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs(guides): clarify some caveats about dynamic import manual preload via script tag webpack/webpack/issues/14874 * docs(guides): fix lint errors --- src/content/guides/code-splitting.mdx | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/content/guides/code-splitting.mdx b/src/content/guides/code-splitting.mdx index 7f73c30b4b97..2274d1568489 100644 --- a/src/content/guides/code-splitting.mdx +++ b/src/content/guides/code-splitting.mdx @@ -34,6 +34,7 @@ contributors: - Adarah - atesgoral - snitin315 + - artem-malko related: - title: in webpack url: https://medium.com/webpack/link-rel-prefetch-preload-in-webpack-51a52358f84c @@ -425,6 +426,30 @@ When a page which uses the `ChartComponent` is requested, the charting-library-c T> Using `webpackPreload` incorrectly can actually hurt performance, so be careful when using it. +Sometimes you need to have your own control over preload. For example, preload of any dynamic import can be done via async script. This can be useful in case of streamming server side rendering. + +```js +const lazyComp = () => + import('DynamicComponent').catch((error) => { + // Do something with the error. + // For example, we can retry the request in case of any net error + }); +``` + +If the script loading will fail before webpack starts loading of that script by itself (webpack just creates a script tag to load its code, if that script is not on a page), that catch handler won't start till [chunkLoadTimeout](/configuration/output/#outputchunkloadtimeout) is not passed. This behavior can be unexpected. But it's explainable — webpack can not throw any error, cause webpack doesn't know, that script failed. Webpack will add onerror handler to the script right after the error has happen. + +To prevent such problem you can add your own onerror handler, which removes the script in case of any error: + +```html + +``` + +In that case, errored script will be removed. Webpack will create its own script and any error will be processed without any timeouts. + ## Bundle Analysis Once you start splitting your code, it can be useful to analyze the output to check where modules have ended up. The [official analyze tool](https://github.com/webpack/analyse) is a good place to start. There are some other community-supported options out there as well: From b081da66ba53f6152490b5cb0b7a65d0eabf7d7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:15:18 +0800 Subject: [PATCH 19/29] build(deps): bump react-spring from 9.4.2 to 9.4.3 (#5969) Bumps [react-spring](https://github.com/pmndrs/react-spring) from 9.4.2 to 9.4.3. - [Release notes](https://github.com/pmndrs/react-spring/releases) - [Commits](https://github.com/pmndrs/react-spring/commits) --- updated-dependencies: - dependency-name: react-spring dependency-type: direct:production 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 | 192 +++++++++++++++++++++++++-------------------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/package.json b/package.json index 0fd27366af09..708b2741699e 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "react-dom": "^17.0.2", "react-helmet-async": "^1.2.2", "react-router-dom": "^6.2.1", - "react-spring": "^9.4.2", + "react-spring": "^9.4.3", "react-tiny-popover": "5", "react-use": "^17.3.2", "react-visibility-sensor": "^5.0.2", diff --git a/yarn.lock b/yarn.lock index 0e9f6b394c18..15cd30d0b8b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2074,91 +2074,91 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@react-spring/animated@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.4.0.tgz#35b6bed5572484b8655989791d3d224a92501839" - integrity sha512-hOj90pXC1ovukgA63l6zQRr7jq6Lay/kUgwlMZWOwgaZoPb1J02BjLtS0rbFvx+BUMd3mrL0QVdno+B6eYsLQQ== - dependencies: - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/core@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.4.0.tgz#ef4d3b9a677fd382020329693ebe3928b09c0b2e" - integrity sha512-zJC6JgLTv42tdNLZiN8eRgKnVaQxRvGHt329GxZFB9/bhH9FqjOMQ2GsEu8uImw3eicaXlWy10Ssp4SQftZSPg== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/rafz" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/konva@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.4.0.tgz#d7c31242b4bc6ccf5390bc42dd3f828d560ffdcd" - integrity sha512-Ry5JhwYri3rjlTB3VLIxl0bMcQgPlHEWFbkD1QjDVhgeT01Q6fPprxRuI63MMEHiKs/syN6xypAbM65yP3ZdJw== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/core" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/native@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.4.0.tgz#ed069bd2271e9d0e4ce33e004bbc05fa0c15bd2e" - integrity sha512-nj1V7isaWRvmJQYcRTyh0ATw/O9nlzETw0yfK9G1ZzWi/50NpuratQQhPYLfHatiaNwPeQoKg1PB3WxkakK1RA== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/core" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/rafz@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.4.0.tgz#aa77b8961cfb8359a170d62cb6f6803f0dd84125" - integrity sha512-CqBLODaAZ9HrTNZyOtrr4XQ7CdUNd4OU3Hh7T6JSdB88MyJScsJBKCT9QaJop6wuhvQPiQEviMnD8TfKEkVfuw== - -"@react-spring/shared@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.4.0.tgz#d83824c0362298f8e047913bb309e0dae10ef520" - integrity sha512-VgQd8NxfbLTeWqzKpGMXXVf1IrmBKO8/fsHFiW+OxZdmFpz77G1aJZ+AnMgCcwrV9KtLdeG0G8YXOQrhsLA7dA== - dependencies: - "@react-spring/rafz" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/three@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.4.0.tgz#e87d6560df8648d7b462912daad1eb93bba844b8" - integrity sha512-DPh1ZhUPqwSF4mkQmIUbemXdkAMInwb3l9yCpmoZTmnjt34ndPNGbUyyB7Mim7J5eR5/HH8b1PdWFHNEi1olRw== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/core" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/types@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.4.0.tgz#fca70dc588b4dfaadac9f881bdcdf25c5dc23ac5" - integrity sha512-K49Fb/rPX6cSb15ZcW6d45NBYqAJbGh4MKpsBmvZWahJTXKtFDfQq10Bq0+wlLYQr8r1bgsE8v4blfCIdm6UoA== - -"@react-spring/web@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.4.0.tgz#42460c30e978187ba9295c3b0cf91136c720a38b" - integrity sha512-czg38A12w5glP33cfbjiwRnpCw3TNBuJ8eVxP6H2frMnADESsxmSpe0vNlvxrCEOhZxbhUu3ILJ2v02H9LV7bw== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/core" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" - -"@react-spring/zdog@~9.4.0": - version "9.4.0" - resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.4.0.tgz#e9b2e59d29e0d0c2e74199ea49bae1d7e98b9549" - integrity sha512-BLEnfnLOtStEHKpW5covI9XHtNFKptbT0bH8RCkSAaoOwnMgZVpGwhZGH2iIweQVID6S4edW3tER/5QYMkLgOg== - dependencies: - "@react-spring/animated" "~9.4.0" - "@react-spring/core" "~9.4.0" - "@react-spring/shared" "~9.4.0" - "@react-spring/types" "~9.4.0" +"@react-spring/animated@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.4.3.tgz#2f8d2b50dfc1975fa490ed3bc03f5ad865180866" + integrity sha512-hKKmeXPoGpJ/zrG/RC8stwW8PmMH0BbewHD8aUPLbyzD9fNvZEJ0mjKmOI0CcSwMpb43kuwY2nX3ZJVImPQCoQ== + dependencies: + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/core@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.4.3.tgz#95c883fa53ff534ff882ba42f863a26a26a6a1c8" + integrity sha512-Jr6/GjHwXYxAtttcYDXOtH36krO0XGjYaSsGR6g+vOUO4y0zAPPXoAwpK6vS7Haip5fRwk7rMdNG+OzU7bB4Bg== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/rafz" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/konva@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.4.3.tgz#ef5332fc0960fa4313ac0ab6a122fd9247b3b111" + integrity sha512-JWxx0YIwipjJTDs7q9XtArlBCTjejyAJZrbhvxmizOM6ZukUj8hcEFYU03Vt5HUTSC4WfG0rkg2O9V1EAXuzCQ== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/native@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.4.3.tgz#748ee1f588c1515a76766e319aa48151308bd5ad" + integrity sha512-dfOwzSxJcbHKTNJ26pceZ7xCrqf2+L6W/U17/7aogQwGec4yf1zocWXV3QS+h0HDuY0Bk/yYa7PEy+D+HWc7Og== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/rafz@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.4.3.tgz#0d578072c9692ef5ab74a3b1d49c1432dce32ab6" + integrity sha512-KnujiZNIHzXsRq1D4tVbCajl8Lx+e6vtvUk7o69KbuneSpEgil9P/x3b+hMDk8U0NHGhJjzhU7723/CNsQansA== + +"@react-spring/shared@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.4.3.tgz#86e03ddd47911ba89be1d0f5a6d11966e305ee04" + integrity sha512-mB1UUD/pl1LzaY0XeNWZtvJzxMa8gLQf02nY12HAz4Rukm9dFRj0jeYwQYLdfYLsGFo1ldvHNurun6hZMG7kiQ== + dependencies: + "@react-spring/rafz" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/three@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.4.3.tgz#1836ea12f7cb7ccb4c4a1f39101f4fb17955c386" + integrity sha512-AhCPqoZZXUnzVcKal01sdYBRqkVd2iNxDMk7BGXZsQNWeqaOMaaBT/a6d3oG3wwPX6xIa9ogBtzmzEasN6HYzA== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/types@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.4.3.tgz#8926d7a09812374127b1f8a904a755c7579124e6" + integrity sha512-dzJrPvUc42K2un9y6D1IsrPQO5tKsbWwUo+wsATnXjG3ePWyuDBIOMJuPe605NhIXUmPH+Vik2wMoZz06hD1uA== + +"@react-spring/web@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.4.3.tgz#b59c1491de344545590598b7fde52b607c4e5d10" + integrity sha512-llKve/uJ73JVagBAVvA74S/LfZP4oSB3XP1qmggSUNXzPZZo5ylIMrs55PxpLyxgzzihuhDU5N17ct3ATViOHw== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" + +"@react-spring/zdog@~9.4.3-beta.0": + version "9.4.3" + resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.4.3.tgz#0a76564ea635ab00a1720a3843faf4f46ca3c82a" + integrity sha512-ujRJBKEWC6miwPhCwHkn13h9OfqK+Kkq49crebo5neY4kCK2efNoagQo54DwXFgbVNFJV+6GwcAZVI2ybS5L1Q== + dependencies: + "@react-spring/animated" "~9.4.3-beta.0" + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/shared" "~9.4.3-beta.0" + "@react-spring/types" "~9.4.3-beta.0" "@rollup/plugin-babel@^5.2.0": version "5.2.2" @@ -9991,17 +9991,17 @@ react-router@6.2.1: dependencies: history "^5.2.0" -react-spring@^9.4.2: - version "9.4.2" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.4.2.tgz#71fcbe2d317fae9271058c8b70823af0c3b8ad4d" - integrity sha512-mK9xdq1kAhbe5YpP4EG2IzRa2C1M1UfR/MO1f83PE+IpHwCm1nGQhteF3MGyX6I3wnkoBWTXbY6n4443Dp52Og== - dependencies: - "@react-spring/core" "~9.4.0" - "@react-spring/konva" "~9.4.0" - "@react-spring/native" "~9.4.0" - "@react-spring/three" "~9.4.0" - "@react-spring/web" "~9.4.0" - "@react-spring/zdog" "~9.4.0" +react-spring@^9.4.3: + version "9.4.3" + resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.4.3.tgz#3f697d3d6e990dbf7d182619dc75a72a63a302c1" + integrity sha512-GGKAqQQ790JLoA2SAUgdJErFRG8oFR6pzX8jnJoqORVWX5Wo9bJUWs4563f2oN19+yQkVhc77neAkqQ7GCN8Lw== + dependencies: + "@react-spring/core" "~9.4.3-beta.0" + "@react-spring/konva" "~9.4.3-beta.0" + "@react-spring/native" "~9.4.3-beta.0" + "@react-spring/three" "~9.4.3-beta.0" + "@react-spring/web" "~9.4.3-beta.0" + "@react-spring/zdog" "~9.4.3-beta.0" react-textarea-autosize@^5.2.1: version "5.2.1" From e9d15c57011600536062c57361b59ff099af0d93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:34:50 +0800 Subject: [PATCH 20/29] build(deps-dev): bump sass-loader from 12.4.0 to 12.6.0 (#5973) Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 12.4.0 to 12.6.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v12.4.0...v12.6.0) --- updated-dependencies: - dependency-name: sass-loader 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 708b2741699e..fda5944bd680 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "remark-refractor": "montogeek/remark-refractor", "rimraf": "^3.0.2", "sass": "^1.49.7", - "sass-loader": "^12.4.0", + "sass-loader": "^12.6.0", "sirv-cli": "^2.0.2", "sitemap-static": "^0.4.2", "start-server-and-test": "^1.14.0", diff --git a/yarn.lock b/yarn.lock index 15cd30d0b8b1..b3e82331c670 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10631,10 +10631,10 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-loader@^12.4.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.4.0.tgz#260b0d51a8a373bb8e88efc11f6ba5583fea0bcf" - integrity sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg== +sass-loader@^12.6.0: + version "12.6.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb" + integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA== dependencies: klona "^2.0.4" neo-async "^2.6.2" From 627c26026678f2f44c40a7631c7799c04936ff40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:48:19 +0800 Subject: [PATCH 21/29] build(deps-dev): bump @babel/core from 7.17.3 to 7.17.4 (#5976) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.17.3 to 7.17.4. - [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.17.4/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" 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 fda5944bd680..4bc0b6c9d608 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.17.3", + "@babel/core": "^7.17.4", "@babel/eslint-parser": "^7.17.0", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", diff --git a/yarn.lock b/yarn.lock index b3e82331c670..5dad36313572 100644 --- a/yarn.lock +++ b/yarn.lock @@ -175,10 +175,10 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.3.tgz#6a6f7e9b5cc0182aef531b93cb5dde94071dc20d" - integrity sha512-TolSoY0D/G6/e5bufjUK7wqQeHdcK4NbdxHg0hrhx/zN6boloG52oNpxbZuil/GqmAIz2qEnJ0s8ay24j2YwVg== +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.4", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.4.tgz#a22f1ae8999122873b3d18865e98c7a3936b8c8b" + integrity sha512-R9x5r4t4+hBqZTmioSnkrW+I6NmbojwjGT8p4G2Gw1thWbXIHGDnmGdLdFw0/7ljucdIrNRp7Npgb4CyBYzzJg== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" From 805d6eb79bf902fcab2639d8b904501bfbe2328d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 06:34:28 +0530 Subject: [PATCH 22/29] build(deps-dev): bump webpack from 5.69.0 to 5.69.1 (#5980) Bumps [webpack](https://github.com/webpack/webpack) from 5.69.0 to 5.69.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.69.0...v5.69.1) --- updated-dependencies: - dependency-name: webpack 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 | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4bc0b6c9d608..c9b6f8181deb 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "tailwindcss": "^3.0.22", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", - "webpack": "^5.69.0", + "webpack": "^5.69.1", "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 5dad36313572..54f082c4bb1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4893,7 +4893,7 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.9.0: +enhanced-resolve@^5.8.3: version "5.9.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee" integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA== @@ -12591,10 +12591,10 @@ webpack-sources@^3.2.3: react-textarea-autosize "^5.2.1" uuid "^3.1.0" -webpack@^5.69.0: - version "5.69.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.0.tgz#c9eb607d4f6c49f1e5755492323a7b055c3450e3" - integrity sha512-E5Fqu89Gu8fR6vejRqu26h8ld/k6/dCVbeGUcuZjc+goQHDfCPU9rER71JmdtBYGmci7Ec2aFEATQ2IVXKy2wg== +webpack@^5.69.1: + version "5.69.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5" + integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -12605,7 +12605,7 @@ webpack@^5.69.0: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.0" + enhanced-resolve "^5.8.3" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" From 636d1990f75f7fb27db2c0898d7cb41d3d373c64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 07:11:49 +0530 Subject: [PATCH 23/29] build(deps-dev): bump tailwindcss from 3.0.22 to 3.0.23 (#5978) Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.22 to 3.0.23. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.0.22...v3.0.23) --- updated-dependencies: - dependency-name: tailwindcss 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 c9b6f8181deb..6030b3a05722 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "start-server-and-test": "^1.14.0", "static-site-generator-webpack-plugin": "^3.4.1", "style-loader": "^3.3.1", - "tailwindcss": "^3.0.22", + "tailwindcss": "^3.0.23", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", "webpack": "^5.69.1", diff --git a/yarn.lock b/yarn.lock index 54f082c4bb1e..56d01087127e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11555,10 +11555,10 @@ table-layout@^1.0.1: typical "^5.2.0" wordwrapjs "^4.0.0" -tailwindcss@^3.0.22: - version "3.0.22" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.22.tgz#5f1aac83810261300ae5b2f98fd4a2fa2ded2c42" - integrity sha512-F8lt74RlNZirnkaSk310+vGQta7c0/hgx7/bqxruM4wS9lp8oqV93lzavajC3VT0Lp4UUtUVIt8ifKcmGzkr0A== +tailwindcss@^3.0.23: + version "3.0.23" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.23.tgz#c620521d53a289650872a66adfcb4129d2200d10" + integrity sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA== dependencies: arg "^5.0.1" chalk "^4.1.2" From af70cb90508c1d1a00d285babbec6a94b39c50eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Feb 2022 06:42:07 +0530 Subject: [PATCH 24/29] build(deps-dev): bump sass from 1.49.7 to 1.49.8 (#5981) Bumps [sass](https://github.com/sass/dart-sass) from 1.49.7 to 1.49.8. - [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.7...1.49.8) --- 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 6030b3a05722..1a7b3725eb50 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "remark-html": "^15.0.1", "remark-refractor": "montogeek/remark-refractor", "rimraf": "^3.0.2", - "sass": "^1.49.7", + "sass": "^1.49.8", "sass-loader": "^12.6.0", "sirv-cli": "^2.0.2", "sitemap-static": "^0.4.2", diff --git a/yarn.lock b/yarn.lock index 56d01087127e..051f5a840365 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10639,10 +10639,10 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.49.7: - version "1.49.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" - integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ== +sass@^1.49.8: + version "1.49.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.8.tgz#9bbbc5d43d14862db07f1c04b786c9da9b641828" + integrity sha512-NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From d21cfcfed5a3938c57fabd049b5e32de09a78e99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Feb 2022 06:57:15 +0530 Subject: [PATCH 25/29] build(deps-dev): bump @babel/core from 7.17.4 to 7.17.5 (#5979) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.17.4 to 7.17.5. - [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.17.5/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" 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 1a7b3725eb50..47f4d5a97d36 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.17.4", + "@babel/core": "^7.17.5", "@babel/eslint-parser": "^7.17.0", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", diff --git a/yarn.lock b/yarn.lock index 051f5a840365..eb04ce24b50e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -175,10 +175,10 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.4", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.17.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.4.tgz#a22f1ae8999122873b3d18865e98c7a3936b8c8b" - integrity sha512-R9x5r4t4+hBqZTmioSnkrW+I6NmbojwjGT8p4G2Gw1thWbXIHGDnmGdLdFw0/7ljucdIrNRp7Npgb4CyBYzzJg== +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.17.5", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225" + integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" From c9cfd74a32f97728e5f2174377cd386063625d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Feb 2022 08:33:37 +0530 Subject: [PATCH 26/29] build(deps): bump react-helmet-async from 1.2.2 to 1.2.3 (#5977) Bumps [react-helmet-async](https://github.com/staylor/react-helmet-async) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/staylor/react-helmet-async/releases) - [Commits](https://github.com/staylor/react-helmet-async/commits) --- updated-dependencies: - dependency-name: react-helmet-async dependency-type: direct:production 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 | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 47f4d5a97d36..dcf9499f12d9 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "prop-types": "^15.8.1", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-helmet-async": "^1.2.2", + "react-helmet-async": "^1.2.3", "react-router-dom": "^6.2.1", "react-spring": "^9.4.3", "react-tiny-popover": "5", diff --git a/yarn.lock b/yarn.lock index eb04ce24b50e..6fd29dabfb92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1164,14 +1164,7 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-transform-typescript" "^7.16.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" - integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.7.6": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4": version "7.16.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== @@ -9950,10 +9943,10 @@ react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-helmet-async@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.2.2.tgz#38d58d32ebffbc01ba42b5ad9142f85722492389" - integrity sha512-XgSQezeCbLfCxdZhDA3T/g27XZKnOYyOkruopTLSJj8RvFZwdXnM4djnfYaiBSDzOidDgTo1jcEozoRu/+P9UQ== +react-helmet-async@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.2.3.tgz#57326a69304ea3293036eafb49475e9ba454cb37" + integrity sha512-mCk2silF53Tq/YaYdkl2sB+/tDoPnaxN7dFS/6ZLJb/rhUY2EWGI5Xj2b4jHppScMqY45MbgPSwTxDchKpZ5Kw== dependencies: "@babel/runtime" "^7.12.5" invariant "^2.2.4" From 610667bbdbfe0af6d4c8416867b158d09cb475c4 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Wed, 23 Feb 2022 10:09:12 +0800 Subject: [PATCH 27/29] docs(en): fix conflicts --- package.json | 11 +------- src/content/api/cli.mdx | 10 +------ src/content/configuration/output.mdx | 8 ++---- src/content/guides/code-splitting.mdx | 23 ++++++--------- .../docschina-remark-slugger/index.mjs | 2 +- webpack.common.mjs | 4 --- yarn.lock | 28 ------------------- 7 files changed, 13 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 79ad81b0e287..eea0a79ec466 100644 --- a/package.json +++ b/package.json @@ -99,12 +99,8 @@ "eslint-plugin-react": "^7.28.0", "eslint-plugin-react-hooks": "^4.3.0", "front-matter": "^4.0.2", -<<<<<<< HEAD - "github-slugger": "^1.3.0", - "html-loader": "^2.1.2", -======= "github-slugger": "^1.4.0", ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f + "html-loader": "^2.1.2", "html-webpack-plugin": "^5.5.0", "http-server": "^14.1.0", "husky": "^7.0.4", @@ -113,13 +109,8 @@ "lint-staged": "^12.3.4", "lodash": "^4.17.21", "markdownlint": "^0.25.1", -<<<<<<< HEAD - "markdownlint-cli": "^0.31.0", - "mdast-util-to-string": "^1.1.0", -======= "markdownlint-cli": "^0.31.1", "mdast-util-to-string": "^3.1.0", ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f "mini-css-extract-plugin": "^2.5.3", "mkdirp": "^1.0.4", "modularscale-sass": "^3.0.3", diff --git a/src/content/api/cli.mdx b/src/content/api/cli.mdx index 6204cd3111ef..8d7405816ffb 100644 --- a/src/content/api/cli.mdx +++ b/src/content/api/cli.mdx @@ -581,19 +581,11 @@ T> 请查阅 [environment 变量指南](/guides/environment-variables/)了解更 除了上面所说的自定义 `env` 变量,在你的 webpack 配置中也使用了一些 `env` 内置变量: -<<<<<<< HEAD | 变量名 | 描述 | | --------------- | --------------------------------------------- | -| `WEBPACK_SERVE` | 如果使用了 `serve\|s`,则为 `true`。 | +| `WEBPACK_SERVE` | 如果使用了 `serve\|server\|s`,则为 `true`。 | | `WEBPACK_BUILD` | 如果使用了 `build\|bundle\|b`,则为 `true`。 | | `WEBPACK_WATCH` | 如果使用了 `--watch\|watch\|w`,则为 `true`。 | -======= -| Environment Variable | Description | -| -------------------- | -------------------------------------------- | -| `WEBPACK_SERVE` | `true` if `serve\|server\|s` is being used. | -| `WEBPACK_BUILD` | `true` if `build\|bundle\|b` is being used. | -| `WEBPACK_WATCH` | `true` if `--watch\|watch\|w` is being used. | ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f 请注意你不能在 bundle 代码中使用这些内置环境变量。 diff --git a/src/content/configuration/output.mdx b/src/content/configuration/output.mdx index b7bfdf282af9..00736b0e608b 100644 --- a/src/content/configuration/output.mdx +++ b/src/content/configuration/output.mdx @@ -42,13 +42,9 @@ translators: 与 [`output.filename`](#outputfilename) 相同,不过应用于 [Asset Modules](/guides/asset-modules/)。 -<<<<<<< HEAD -## output.asyncChunks $#outputasyncchunks$ -======= -`[name]`, `[file]`, `[query]`, `[fragment]`, `[base]`, and `[path]` are set to an empty string for the assets built from data URI replacements. +`[name]`、`[file]`、`[query]`、`[fragment]`、`[base]` 与 `[path]` 设置为空字符串,用于从数据 URI 替换构建的静态资源。 -## output.asyncChunks ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f +## output.asyncChunks $#outputasyncchunks$ `boolean = true` diff --git a/src/content/guides/code-splitting.mdx b/src/content/guides/code-splitting.mdx index 82ff5229e92e..f3b9b410ac6d 100644 --- a/src/content/guides/code-splitting.mdx +++ b/src/content/guides/code-splitting.mdx @@ -34,14 +34,11 @@ contributors: - Adarah - atesgoral - snitin315 -<<<<<<< HEAD + - artem-malko translators: - QC-L - jacob-lcs - dear-lizhihua -======= - - artem-malko ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f related: - title: webpack 中的 url: https://medium.com/webpack/link-rel-prefetch-preload-in-webpack-51a52358f84c @@ -433,22 +430,19 @@ import(/* webpackPreload: true */ 'ChartingLibrary'); T> 不正确地使用 `webpackPreload` 会有损性能,请谨慎使用。 -<<<<<<< HEAD -## bundle 分析(bundle analysis) $#bundle-analysis$ -======= -Sometimes you need to have your own control over preload. For example, preload of any dynamic import can be done via async script. This can be useful in case of streamming server side rendering. +有时你需要自己控制预加载。例如,动态引入的预加载可以通过异步脚本(async script)完成。这对于流式服务端渲染比较有用。 ```js const lazyComp = () => import('DynamicComponent').catch((error) => { - // Do something with the error. - // For example, we can retry the request in case of any net error + // 错误处理。 + // 例如,我们可以在网络错误的情况下重发请求。 }); ``` -If the script loading will fail before webpack starts loading of that script by itself (webpack just creates a script tag to load its code, if that script is not on a page), that catch handler won't start till [chunkLoadTimeout](/configuration/output/#outputchunkloadtimeout) is not passed. This behavior can be unexpected. But it's explainable — webpack can not throw any error, cause webpack doesn't know, that script failed. Webpack will add onerror handler to the script right after the error has happen. +如果在 webpack 自己开始加载该脚本之前脚本加载将失败(如果该脚本不在页面上,webpack 只是创建一个 script 标签来加载其代码),则该 catch 处理程序将不会启动,直到 [chunkLoadTimeout](/configuration/output/#outputchunkloadtimeout) 未通过。此行为可能是意料之外的。但这是可以解释的——webpack 不能抛出任何错误,因为 webpack 不知道那个脚本失败了。Webpack 将在错误发生后立即将 onerror 处理程序添加到 script 中。 -To prevent such problem you can add your own onerror handler, which removes the script in case of any error: +为了防止这样的问题,你可以加载自己的 onerror 处理程序,在出现任何错误的情况下删除脚本。 ```html ``` -In that case, errored script will be removed. Webpack will create its own script and any error will be processed without any timeouts. +在这种情况下,错误的脚本将被删除。Webpack 将创建自己的脚本,并且任何错误都将被处理而没有任何延时。 -## Bundle Analysis ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f +## bundle 分析(bundle analysis) $#bundle-analysis$ 一旦开始分离代码,一件很有帮助的事情是,分析输出结果来检查模块在何处结束。 [官方分析工具](https://github.com/webpack/analyse) 是一个不错的开始。还有一些其他社区支持的可选项: diff --git a/src/remark-plugins/docschina-remark-slugger/index.mjs b/src/remark-plugins/docschina-remark-slugger/index.mjs index e7cfbb2db29f..8692d392e0b6 100644 --- a/src/remark-plugins/docschina-remark-slugger/index.mjs +++ b/src/remark-plugins/docschina-remark-slugger/index.mjs @@ -1,6 +1,6 @@ 'use strict'; -import toString from 'mdast-util-to-string'; +import { toString } from 'mdast-util-to-string'; import { visit } from 'unist-util-visit'; import slugs from 'github-slugger'; diff --git a/webpack.common.mjs b/webpack.common.mjs index e4bfc5331a30..42fc8e2644e2 100644 --- a/webpack.common.mjs +++ b/webpack.common.mjs @@ -4,11 +4,7 @@ import webpack from 'webpack'; import h from 'hastscript'; import remarkResponsiveTable from './src/remark-plugins/remark-responsive-table/remark-responsive-table.mjs'; import gfm from 'remark-gfm'; -<<<<<<< HEAD import slug from './src/remark-plugins/docschina-remark-slugger/index.mjs'; -======= -import slug from './src/remark-plugins/remark-slug/index.mjs'; ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f import cleanup from './src/remark-plugins/remark-cleanup-readme/index.mjs'; import aside from './src/remark-plugins/remark-custom-asides/index.mjs'; import autolink from 'remark-autolink-headings'; diff --git a/yarn.lock b/yarn.lock index 2a99c8caa983..c20887ef9d44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6175,7 +6175,6 @@ gifwrap@^0.9.2: image-q "^1.1.1" omggif "^1.0.10" -<<<<<<< HEAD github-slugger@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" @@ -6187,12 +6186,6 @@ github-slugger@^1.3.0: integrity sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q== dependencies: emoji-regex ">=6.0.0 <=6.1.1" -======= -github-slugger@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" - integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" @@ -9777,21 +9770,7 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -<<<<<<< HEAD parse5@6.0.1, parse5@^6.0.1: -======= -parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@6.0.1: ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f version "6.0.1" resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== @@ -12228,7 +12207,6 @@ table-layout@^1.0.1: typical "^5.2.0" wordwrapjs "^4.0.0" -<<<<<<< HEAD table@^3.8.3: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -12245,12 +12223,6 @@ tailwindcss@^3.0.18: version "3.0.18" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5" integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw== -======= -tailwindcss@^3.0.23: - version "3.0.23" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.23.tgz#c620521d53a289650872a66adfcb4129d2200d10" - integrity sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA== ->>>>>>> c9cfd74a32f97728e5f2174377cd386063625d6f dependencies: arg "^5.0.1" chalk "^4.1.2" From e7c0f63f03c7b97d9c399fd0905b6a6b898da785 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Wed, 23 Feb 2022 10:14:58 +0800 Subject: [PATCH 28/29] docs(en): fix conflicts --- yarn.lock | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index c20887ef9d44..1508b27a2a20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6175,18 +6175,11 @@ gifwrap@^0.9.2: image-q "^1.1.1" omggif "^1.0.10" -github-slugger@^1.0.0: +github-slugger@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== -github-slugger@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9" - integrity sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q== - dependencies: - emoji-regex ">=6.0.0 <=6.1.1" - glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -8741,11 +8734,6 @@ mdast-util-to-markdown@^1.0.0: unist-util-visit "^4.0.0" zwitch "^2.0.0" -mdast-util-to-string@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" - integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== - mdast-util-to-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" @@ -9770,6 +9758,16 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + parse5@6.0.1, parse5@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -12219,10 +12217,10 @@ table@^3.8.3: slice-ansi "0.0.4" string-width "^2.0.0" -tailwindcss@^3.0.18: - version "3.0.18" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5" - integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw== +tailwindcss@^3.0.23: + version "3.0.23" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.23.tgz#c620521d53a289650872a66adfcb4129d2200d10" + integrity sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA== dependencies: arg "^5.0.1" chalk "^4.1.2" From 42d995212ec7070dae59c68d9f9faa74f104c238 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Thu, 24 Feb 2022 10:18:31 +0800 Subject: [PATCH 29/29] feat: headings have huge content areas --- .../docschina-remark-slugger/index.mjs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/remark-plugins/docschina-remark-slugger/index.mjs b/src/remark-plugins/docschina-remark-slugger/index.mjs index 8692d392e0b6..378631a76bb1 100644 --- a/src/remark-plugins/docschina-remark-slugger/index.mjs +++ b/src/remark-plugins/docschina-remark-slugger/index.mjs @@ -30,6 +30,26 @@ function transformer(ast) { } data.id = id; props.id = id; + + // insert for headings + node.children = [ + { + type: 'paragraph', + data: { + hName: 'span', + hProperties: { + id, + }, + }, + children: [ + { + type: 'text', + value: '', + }, + ], + }, + ...node.children, + ]; } }