From c520f2137e1000c719e57b087ac39c94c321c698 Mon Sep 17 00:00:00 2001 From: Sam Chen Date: Sat, 29 Jan 2022 14:46:50 +0800 Subject: [PATCH 01/26] docs(concepts): add note about deprecated CLI usage for loaders (#5916) --- src/content/concepts/loaders.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/content/concepts/loaders.mdx b/src/content/concepts/loaders.mdx index 92c7e4426b38..774ac03a7b16 100644 --- a/src/content/concepts/loaders.mdx +++ b/src/content/concepts/loaders.mdx @@ -51,6 +51,8 @@ There are two ways to use loaders in your application: - [Configuration](#configuration) (recommended): Specify them in your **webpack.config.js** file. - [Inline](#inline): Specify them explicitly in each `import` statement. +Note that loaders can be used from CLI under webpack v4, but the feature was deprecated in webpack v5. + ### Configuration [`module.rules`](/configuration/module/#modulerules) allows you to specify several loaders within your webpack configuration. From 6e0fed8b6ef2095d9a6ccf2b01155cf0a10406ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 30 Jan 2022 09:41:39 +0800 Subject: [PATCH 02/26] build(deps-dev): bump copy-webpack-plugin from 10.2.1 to 10.2.2 (#5915) Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 10.2.1 to 10.2.2. - [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v10.2.1...v10.2.2) --- updated-dependencies: - dependency-name: copy-webpack-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b4553892ac40..25dd58d34482 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@svgr/webpack": "^6.2.0", "autoprefixer": "^10.4.2", "babel-loader": "^8.2.3", - "copy-webpack-plugin": "^10.2.1", + "copy-webpack-plugin": "^10.2.2", "css-loader": "^6.5.1", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.3.1", diff --git a/yarn.lock b/yarn.lock index 7231501a59bb..9832275a1453 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4032,10 +4032,10 @@ copy-to-clipboard@^3.3.1: dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz#115a41f913070ac236a1b576066204cbf35341a1" - integrity sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg== +copy-webpack-plugin@^10.2.2: + version "10.2.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.2.tgz#40a0475ea3921794bc4ea78a15c431a725ae3dee" + integrity sha512-hNdS4YM9NmbpW++GT2QevyXdeG9m2NZYFNDWN63MzZzFO1IFuH1KMtVJAoXX6yzTgsVz/x00exWcgdyX57ta9g== dependencies: fast-glob "^3.2.7" glob-parent "^6.0.1" From 5bc65001f7ffdb7d3de702fdb190232507c1e49d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 07:34:43 +0530 Subject: [PATCH 03/26] build(deps-dev): bump eslint from 8.7.0 to 8.8.0 (#5920) Bumps [eslint](https://github.com/eslint/eslint) from 8.7.0 to 8.8.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.7.0...v8.8.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 | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 25dd58d34482..11da52f69de5 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "directory-tree": "^3.0.1", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", - "eslint": "^8.7.0", + "eslint": "^8.8.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 9832275a1453..4cc56af7e854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5116,20 +5116,15 @@ 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: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" - integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== - -eslint-visitor-keys@^3.2.0: +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@^8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c" - integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w== +eslint@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.8.0.tgz#9762b49abad0cb4952539ffdb0a046392e571a2d" + integrity sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ== dependencies: "@eslint/eslintrc" "^1.0.5" "@humanwhocodes/config-array" "^0.9.2" @@ -6369,16 +6364,16 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@^5.1.8, ignore@~5.1.9: - version "5.1.9" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" - integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== - -ignore@^5.2.0: +ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +ignore@~5.1.9: + version "5.1.9" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== + image-q@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056" From 238c76a317d4f3d5f7cc6910612817216ed5543a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 07:46:37 +0530 Subject: [PATCH 04/26] build(deps-dev): bump tailwindcss from 3.0.17 to 3.0.18 (#5923) Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.17 to 3.0.18. - [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.17...v3.0.18) --- 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 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 11da52f69de5..22ca08f19912 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "start-server-and-test": "^1.14.0", "static-site-generator-webpack-plugin": "^3.4.1", "style-loader": "^3.3.1", - "tailwindcss": "^3.0.17", + "tailwindcss": "^3.0.18", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", "webpack": "^5.67.0", diff --git a/yarn.lock b/yarn.lock index 4cc56af7e854..3896fb805d37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9653,10 +9653,10 @@ postcss-scss@^0.3.0: dependencies: postcss "^5.2.4" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.8: - version "6.0.8" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914" - integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ== +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: + version "6.0.9" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" + integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -11496,10 +11496,10 @@ synckit@^0.4.1: tslib "^2.3.1" uuid "^8.3.2" -tailwindcss@^3.0.17: - version "3.0.17" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.17.tgz#2c5fe6c364d76ec54644347c6f09befe0113b06f" - integrity sha512-OiHUsmOKQQEg/ocXaLIjk/kOz8EK2jF6iPuc1bQ4NsmhYl7sk70UDsGV02AJvBAAiJhinPCkDR8egT9qY+ulCw== +tailwindcss@^3.0.18: + version "3.0.18" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5" + integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -11517,7 +11517,7 @@ tailwindcss@^3.0.17: postcss-js "^4.0.0" postcss-load-config "^3.1.0" postcss-nested "5.0.6" - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" postcss-value-parser "^4.2.0" quick-lru "^5.1.1" resolve "^1.21.0" From 2624ab43e59e75f588821754ec18f4f0391e8666 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:06:58 +0530 Subject: [PATCH 05/26] build(deps-dev): bump webpack from 5.67.0 to 5.68.0 (#5922) Bumps [webpack](https://github.com/webpack/webpack) from 5.67.0 to 5.68.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.67.0...v5.68.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 22ca08f19912..3073e3d6a0b0 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "tailwindcss": "^3.0.18", "tap-spot": "^1.1.1", "unist-util-visit": "^4.1.0", - "webpack": "^5.67.0", + "webpack": "^5.68.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^4.9.2", "webpack-dev-server": "^4.7.3", diff --git a/yarn.lock b/yarn.lock index 3896fb805d37..e1982e0867de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12520,10 +12520,10 @@ webpack-sources@^3.2.3: react-textarea-autosize "^5.2.1" uuid "^3.1.0" -webpack@^5.67.0: - version "5.67.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.67.0.tgz#cb43ca2aad5f7cc81c4cd36b626e6b819805dbfd" - integrity sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw== +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== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" From 4aa99de7d69c558c38544b7c972ca5ba95b18823 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:36:25 +0530 Subject: [PATCH 06/26] build(deps-dev): bump @svgr/webpack from 6.2.0 to 6.2.1 (#5921) Bumps [@svgr/webpack](https://github.com/gregberge/svgr) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/gregberge/svgr/releases) - [Changelog](https://github.com/gregberge/svgr/blob/main/CHANGELOG.md) - [Commits](https://github.com/gregberge/svgr/compare/v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: "@svgr/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 | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 3073e3d6a0b0..2d5694ec4f85 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@octokit/auth-action": "^1.3.3", "@octokit/rest": "^18.12.0", "@pmmmwh/react-refresh-webpack-plugin": "next", - "@svgr/webpack": "^6.2.0", + "@svgr/webpack": "^6.2.1", "autoprefixer": "^10.4.2", "babel-loader": "^8.2.3", "copy-webpack-plugin": "^10.2.2", diff --git a/yarn.lock b/yarn.lock index e1982e0867de..e599f3f1ab43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2267,31 +2267,31 @@ "@svgr/babel-plugin-transform-react-native-svg" "^6.0.0" "@svgr/babel-plugin-transform-svg-component" "^6.2.0" -"@svgr/core@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.0.tgz#187a7930695635382c1ab42f476a1d4d45a65994" - integrity sha512-n5PrYAPoTpWGykqa8U05/TVTHOrVR/TxrUJ5EWHP9Db6vR3qnqzwAVLiFT1+slA7zQoJTXafQb+akwThf9SxGw== +"@svgr/core@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz#195de807a9f27f9e0e0d678e01084b05c54fdf61" + integrity sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA== dependencies: - "@svgr/plugin-jsx" "^6.2.0" + "@svgr/plugin-jsx" "^6.2.1" camelcase "^6.2.0" cosmiconfig "^7.0.1" -"@svgr/hast-util-to-babel-ast@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.0.0.tgz#423329ad866b6c169009cc82b5e28ffee80c857c" - integrity sha512-S+TxtCdDyRGafH1VG1t/uPZ87aOYOHzWL8kqz4FoSZcIbzWA6rnOmjNViNiDzqmEpzp2PW5o5mZfvC9DiVZhTQ== +"@svgr/hast-util-to-babel-ast@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz#ae065567b74cbe745afae617053adf9a764bea25" + integrity sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ== dependencies: "@babel/types" "^7.15.6" entities "^3.0.1" -"@svgr/plugin-jsx@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.0.tgz#5e41a75b12b34cb66509e63e535606161770ff42" - integrity sha512-QJDEe7K5Hkd4Eewu4pcjiOKTCtjB47Ol6lDLXVhf+jEewi+EKJAaAmM+bNixfW6LSNEg8RwOYQN3GZcprqKfHw== +"@svgr/plugin-jsx@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz#5668f1d2aa18c2f1bb7a1fc9f682d3f9aed263bd" + integrity sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g== dependencies: "@babel/core" "^7.15.5" "@svgr/babel-preset" "^6.2.0" - "@svgr/hast-util-to-babel-ast" "^6.0.0" + "@svgr/hast-util-to-babel-ast" "^6.2.1" svg-parser "^2.0.2" "@svgr/plugin-svgo@^6.2.0": @@ -2303,18 +2303,18 @@ deepmerge "^4.2.2" svgo "^2.5.0" -"@svgr/webpack@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.0.tgz#00fafd32e1d59add7b554c40aa2e97e83f975686" - integrity sha512-KlLdGe93A8GDs19g8kjEmHwArgMAP6cUfegr2Nx+yDAYY32IPtjzm3SoqNP+I+cnOF1CToJu1clWTPEmdd8dXg== +"@svgr/webpack@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" + integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== dependencies: "@babel/core" "^7.15.5" "@babel/plugin-transform-react-constant-elements" "^7.14.5" "@babel/preset-env" "^7.15.6" "@babel/preset-react" "^7.14.5" "@babel/preset-typescript" "^7.15.0" - "@svgr/core" "^6.2.0" - "@svgr/plugin-jsx" "^6.2.0" + "@svgr/core" "^6.2.1" + "@svgr/plugin-jsx" "^6.2.1" "@svgr/plugin-svgo" "^6.2.0" "@tootallnate/once@1": From 17241db0cbfe2ab64f79e8d609b73563ec83637b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 18:52:43 +0530 Subject: [PATCH 07/26] build(deps-dev): bump copy-webpack-plugin from 10.2.2 to 10.2.4 (#5924) Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 10.2.2 to 10.2.4. - [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v10.2.2...v10.2.4) --- updated-dependencies: - dependency-name: copy-webpack-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2d5694ec4f85..2e763c2567de 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@svgr/webpack": "^6.2.1", "autoprefixer": "^10.4.2", "babel-loader": "^8.2.3", - "copy-webpack-plugin": "^10.2.2", + "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.5.1", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.3.1", diff --git a/yarn.lock b/yarn.lock index e599f3f1ab43..702aea442a40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4032,10 +4032,10 @@ copy-to-clipboard@^3.3.1: dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^10.2.2: - version "10.2.2" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.2.tgz#40a0475ea3921794bc4ea78a15c431a725ae3dee" - integrity sha512-hNdS4YM9NmbpW++GT2QevyXdeG9m2NZYFNDWN63MzZzFO1IFuH1KMtVJAoXX6yzTgsVz/x00exWcgdyX57ta9g== +copy-webpack-plugin@^10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" + integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== dependencies: fast-glob "^3.2.7" glob-parent "^6.0.1" From 22a468176de21a48af9015eb971ce0b7536a3154 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Tue, 1 Feb 2022 19:21:47 +0530 Subject: [PATCH 08/26] docs: avoid `Badge` in heading (#5926) --- src/content/configuration/output.mdx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/content/configuration/output.mdx b/src/content/configuration/output.mdx index 5f52e8ec6d9f..fa9dc6a00932 100644 --- a/src/content/configuration/output.mdx +++ b/src/content/configuration/output.mdx @@ -967,7 +967,9 @@ MyLibrary = _entry_return_; Be aware that if `MyLibrary` isn't defined earlier your library will be set in global scope. -##### type: 'assign-properties' +##### type: 'assign-properties' + + ```js module.exports = { @@ -1148,7 +1150,7 @@ T> Wondering the difference between CommonJS and CommonJS2 is? While they are si ##### type: 'commonjs-static' - + ```js module.exports = { @@ -1617,7 +1619,9 @@ MyLibrary = _entry_return_; Be aware that if `MyLibrary` isn't defined earlier your library will be set in the global scope. -#### libraryTarget: 'assign-properties' +#### libraryTarget: 'assign-properties' + + W> Prefer to use [output.library.type: 'assign-properties'`](#type-assign-properties). From bb60545c99581848fac1e6fecd5e3595b72cddab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 05:05:09 +0530 Subject: [PATCH 09/26] build(deps-dev): bump lint-staged from 12.3.2 to 12.3.3 (#5930) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 12.3.2 to 12.3.3. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](https://github.com/okonet/lint-staged/compare/v12.3.2...v12.3.3) --- 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 2e763c2567de..4b2c7556c3c5 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "husky": "^7.0.4", "hyperlink": "^5.0.4", "jest": "^27.4.7", - "lint-staged": "^12.3.2", + "lint-staged": "^12.3.3", "lodash": "^4.17.21", "markdownlint": "^0.25.1", "markdownlint-cli": "^0.30.0", diff --git a/yarn.lock b/yarn.lock index 702aea442a40..1a6d75d5136c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7642,10 +7642,10 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lint-staged@^12.3.2: - version "12.3.2" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.2.tgz#c87fe59dca475b7d1cb56863c5faa03c145e1446" - integrity sha512-gtw4Cbj01SuVSfAOXC6ivd/7VKHTj51yj5xV8TgktFmYNMsZzXuSd5/brqJEA93v63wL7R6iDlunMANOechC0A== +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== dependencies: cli-truncate "^3.1.0" colorette "^2.0.16" From f93fbd1b1edd075697e42aec7b6913ad67e64eef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 05:23:30 +0530 Subject: [PATCH 10/26] build(deps-dev): bump postcss from 8.4.5 to 8.4.6 (#5934) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.5 to 8.4.6. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.5...8.4.6) --- updated-dependencies: - dependency-name: postcss 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 4b2c7556c3c5..0c476e3ad01e 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "modularscale-sass": "^3.0.3", "node-fetch": "^3.2.0", "npm-run-all": "^4.1.1", - "postcss": "^8.4.5", + "postcss": "^8.4.6", "postcss-loader": "^6.2.1", "prettier": "^2.5.1", "react-refresh": "^0.11.0", diff --git a/yarn.lock b/yarn.lock index 1a6d75d5136c..a4de3c84610b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8767,7 +8767,7 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.1.30: +nanoid@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== @@ -9698,14 +9698,14 @@ postcss@^5.0.8, postcss@^5.2.4: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^8.2.15, postcss@^8.3.10, postcss@^8.3.5, postcss@^8.4.5: - version "8.4.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" - integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== +postcss@^8.2.15, postcss@^8.3.10, postcss@^8.3.5, postcss@^8.4.6: + version "8.4.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" + integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== dependencies: - nanoid "^3.1.30" + nanoid "^3.2.0" picocolors "^1.0.0" - source-map-js "^1.0.1" + source-map-js "^1.0.2" prelude-ls@^1.2.1: version "1.2.1" @@ -10954,10 +10954,10 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" - integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" From e0911c6b830b7545a926bcfff75516a08efc8990 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 05:33:22 +0530 Subject: [PATCH 11/26] build(deps-dev): bump directory-tree from 3.0.1 to 3.1.0 (#5932) Bumps [directory-tree](https://github.com/mihneadb/node-directory-tree) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/mihneadb/node-directory-tree/releases) - [Commits](https://github.com/mihneadb/node-directory-tree/compare/3.0.1...3.1.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 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0c476e3ad01e..e9b61d321316 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "css-loader": "^6.5.1", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.3.1", - "directory-tree": "^3.0.1", + "directory-tree": "^3.1.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 a4de3c84610b..a1999932b5fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3056,6 +3056,16 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +array-back@^3.0.1, array-back@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" + integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== + +array-back@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e" + integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg== + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -3916,6 +3926,26 @@ comma-separated-tokens@^2.0.0: resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98" integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg== +command-line-args@^5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e" + integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg== + dependencies: + array-back "^3.1.0" + find-replace "^3.0.0" + lodash.camelcase "^4.3.0" + typical "^4.0.0" + +command-line-usage@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.1.tgz#c908e28686108917758a49f45efb4f02f76bc03f" + integrity sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA== + dependencies: + array-back "^4.0.1" + chalk "^2.4.2" + table-layout "^1.0.1" + typical "^5.2.0" + commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -4582,10 +4612,13 @@ 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.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-3.0.1.tgz#ce7e087d7a9a58947ab802125b4c45481270db72" - integrity sha512-IJL5L/zd73xbchfsIKMrhaRJCt28ek1UsS6LNZ6b9r7m+VbU1fd7JZAypn6gl1g4hpxn21QF3/scAWKIOMk4Ug== +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== + dependencies: + command-line-args "^5.2.0" + command-line-usage "^6.1.1" dlv@^1.1.3: version "1.1.3" @@ -5538,6 +5571,13 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-replace@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" + integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== + dependencies: + array-back "^3.0.1" + find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -7775,6 +7815,11 @@ lodash.bind@^4.1.4: resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -10077,6 +10122,11 @@ redirect-webpack-plugin@^1.0.0: dependencies: webpack-sources "^1.1.0" +reduce-flatten@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" + integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== + refractor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.1.0.tgz#b05a43c8a1b4fccb30001ffcbd5cd781f7f06f78" @@ -11496,6 +11546,16 @@ synckit@^0.4.1: tslib "^2.3.1" uuid "^8.3.2" +table-layout@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" + integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== + dependencies: + array-back "^4.0.1" + deep-extend "~0.6.0" + 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" @@ -11894,6 +11954,16 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typical@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" + integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== + +typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -12645,6 +12715,14 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrapjs@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f" + integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA== + dependencies: + reduce-flatten "^2.0.0" + typical "^5.2.0" + workbox-background-sync@6.4.2: version "6.4.2" resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.4.2.tgz#bb31b95928d376abcb9bde0de3a0cef9bae46cf7" From 57e5c085d0be54991df21119449c7c290a893d00 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 2 Feb 2022 05:58:05 +0530 Subject: [PATCH 12/26] docs(configuration): update `externals` option types (#5936) --- src/content/configuration/externals.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/configuration/externals.mdx b/src/content/configuration/externals.mdx index b2211153896e..6b7e43f0ed98 100644 --- a/src/content/configuration/externals.mdx +++ b/src/content/configuration/externals.mdx @@ -24,7 +24,7 @@ The `externals` configuration option provides a way of excluding dependencies fr ## externals -`string` `[string]` `object` `function` `RegExp` +`string` `object` `function` `RegExp` `[string, object, function, RegExp]` **Prevent bundling** of certain `import`ed packages and instead retrieve these _external dependencies_ at runtime. From f8579534e709a0634453e90b1fb7c674ae6b6129 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 06:05:47 +0530 Subject: [PATCH 13/26] build(deps-dev): bump sass from 1.49.0 to 1.49.7 (#5935) Bumps [sass](https://github.com/sass/dart-sass) from 1.49.0 to 1.49.7. - [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.0...1.49.7) --- 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 e9b61d321316..ab4b2d247bc3 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "remark-refractor": "montogeek/remark-refractor", "remark-slug": "^7.0.1", "rimraf": "^3.0.2", - "sass": "^1.49.0", + "sass": "^1.49.7", "sass-loader": "^12.4.0", "sirv-cli": "^2.0.2", "sitemap-static": "^0.4.2", diff --git a/yarn.lock b/yarn.lock index a1999932b5fb..b40729b91d1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10640,10 +10640,10 @@ sass-loader@^12.4.0: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.49.0: - version "1.49.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078" - integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw== +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== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From a34a46b229098a5cc416c97679caf728f18cadb1 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Wed, 2 Feb 2022 06:24:54 +0530 Subject: [PATCH 14/26] docs(configuration): update `devServer` option types (#5937) --- src/content/configuration/dev-server.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/content/configuration/dev-server.mdx b/src/content/configuration/dev-server.mdx index db839cb4d730..bde7fe719f43 100644 --- a/src/content/configuration/dev-server.mdx +++ b/src/content/configuration/dev-server.mdx @@ -1117,7 +1117,7 @@ module.exports = { ## devServer.open -`boolean` `string` `[string]` `object` `[object]` +`boolean` `string` `object` `[string, object]` Tells dev-server to open the browser after server had been started. Set it to `true` to open your default browser. @@ -1612,7 +1612,7 @@ module.exports = { ## devServer.static -`boolean` `string` `[string]` `object` `[object]` +`boolean` `string` `object` `[string, object]` This option allows configuring options for serving static files from the directory (by default 'public' directory). To disable set it to `false`: @@ -1882,7 +1882,7 @@ module.exports = { ## devServer.watchFiles -`string` `[string]` `object` `[object]` +`string` `object` `[string, object]` This option allows you to configure a list of globs/directories/files to watch for file changes. For example: From 91675d2e502c012b4f9446f28d2f567c3be3d7e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:11:05 +0530 Subject: [PATCH 15/26] build(deps-dev): bump cypress from 9.3.1 to 9.4.1 (#5931) Bumps [cypress](https://github.com/cypress-io/cypress) from 9.3.1 to 9.4.1. - [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.3.1...v9.4.1) --- 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 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ab4b2d247bc3..fd15bbbffae5 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.5.1", "css-minimizer-webpack-plugin": "^3.4.1", - "cypress": "^9.3.1", + "cypress": "^9.4.1", "directory-tree": "^3.1.0", "directory-tree-webpack-plugin": "^1.0.3", "duplexer": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index b40729b91d1c..610cf6016f5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4346,10 +4346,10 @@ csstype@^3.0.6: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef" integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw== -cypress@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.3.1.tgz#8116f52d49d6daf90a91e88f3eafd940234d2958" - integrity sha512-BODdPesxX6bkVUnH8BVsV8I/jn57zQtO1FEOUTiuG2us3kslW7g0tcuwiny7CKCmJUZz8S/D587ppC+s58a+5Q== +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== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" @@ -4388,10 +4388,10 @@ cypress@^9.3.1: pretty-bytes "^5.6.0" proxy-from-env "1.0.0" request-progress "^3.0.0" + semver "^7.3.2" supports-color "^8.1.1" tmp "~0.2.1" untildify "^4.0.0" - url "^0.11.0" yauzl "^2.10.0" dashdash@^1.12.0: From 7d6bc78c0225afdfaa7ff10b5dd35f2f6bef130f Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Thu, 3 Feb 2022 05:47:30 +0530 Subject: [PATCH 16/26] docs(api): add `__webpack_module__` and `__webpack_module__.id` (#5925) --- src/content/api/module-variables.mdx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/content/api/module-variables.mdx b/src/content/api/module-variables.mdx index cd941f43d6b7..9146e134d1d3 100644 --- a/src/content/api/module-variables.mdx +++ b/src/content/api/module-variables.mdx @@ -13,6 +13,7 @@ contributors: - anikethsaha - chenxsan - jamesgeorge007 + - snitin315 related: - title: CommonJS url: https://en.wikipedia.org/wiki/CommonJS @@ -164,6 +165,18 @@ import('./module-a').then((moduleA) => { }); ``` +## \_\_webpack_module\_\_ (webpack-specific) + + + +It provides access to the the current `module`. `module` is not available in strict ESM. + +## \_\_webpack_module\_\_.id (webpack-specific) + + + +It provides access to the ID of current `module` (`module.id`). `module` is not available in strict ESM. + ## \_\_webpack_modules\_\_ (webpack-specific) Access to the internal object of all modules. From 0197662324453b8bc684647ea197f6f5910876dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 08:09:52 +0530 Subject: [PATCH 17/26] build(deps-dev): bump css-loader from 6.5.1 to 6.6.0 (#5940) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.5.1...v6.6.0) --- updated-dependencies: - dependency-name: css-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 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index fd15bbbffae5..1616f2fe37b5 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "autoprefixer": "^10.4.2", "babel-loader": "^8.2.3", "copy-webpack-plugin": "^10.2.4", - "css-loader": "^6.5.1", + "css-loader": "^6.6.0", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.4.1", "directory-tree": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 610cf6016f5d..37be5b4cf872 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4173,18 +4173,18 @@ css-in-js-utils@^2.0.0: hyphenate-style-name "^1.0.2" isobject "^3.0.1" -css-loader@^6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1" - integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ== +css-loader@^6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.6.0.tgz#c792ad5510bd1712618b49381bd0310574fafbd3" + integrity sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg== dependencies: icss-utils "^5.1.0" - postcss "^8.2.15" + postcss "^8.4.5" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" semver "^7.3.5" css-minimizer-webpack-plugin@^3.4.1: @@ -9743,7 +9743,7 @@ postcss@^5.0.8, postcss@^5.2.4: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^8.2.15, postcss@^8.3.10, postcss@^8.3.5, postcss@^8.4.6: +postcss@^8.3.10, postcss@^8.3.5, postcss@^8.4.5, postcss@^8.4.6: version "8.4.6" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== From abdf77799c5e83614cedf6e70d9090aeb5adcdc4 Mon Sep 17 00:00:00 2001 From: Ivan Kopeykin Date: Thu, 3 Feb 2022 15:52:16 +0300 Subject: [PATCH 18/26] docs(configuration): fix link to Node.js docs (#5938) --- src/content/configuration/output.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/configuration/output.mdx b/src/content/configuration/output.mdx index fa9dc6a00932..fc9c78cca913 100644 --- a/src/content/configuration/output.mdx +++ b/src/content/configuration/output.mdx @@ -678,7 +678,7 @@ module.exports = { `string = 'hex'` -The encoding to use when generating the hash. All encodings from Node.JS' [`hash.digest`](https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding) are supported. Using `'base64'` for filenames might be problematic since it has the character `/` in its alphabet. Likewise `'latin1'` could contain any character. +The encoding to use when generating the hash. All encodings from Node.JS' [`hash.digest`](https://nodejs.org/api/buffer.html#buffers-and-character-encodings) are supported. Using `'base64'` for filenames might be problematic since it has the character `/` in its alphabet. Likewise `'latin1'` could contain any character. ## output.hashDigestLength From 4c1dcbcf99dab7a727a0b3848aced276f91d1027 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 21:12:10 +0800 Subject: [PATCH 19/26] build(deps-dev): bump webpack-dev-server from 4.7.3 to 4.7.4 (#5939) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.7.3 to 4.7.4. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.7.3...v4.7.4) --- updated-dependencies: - dependency-name: webpack-dev-server 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 | 45 +++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 1616f2fe37b5..6deac6a0d58d 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "webpack": "^5.68.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.7.3", + "webpack-dev-server": "^4.7.4", "webpack-merge": "^5.8.0", "workbox-webpack-plugin": "^6.4.2" }, diff --git a/yarn.lock b/yarn.lock index 37be5b4cf872..135ad46a0074 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2448,7 +2448,7 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*": +"@types/express@*", "@types/express@^4.17.13": version "4.17.13" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== @@ -3735,7 +3735,7 @@ cheerio@^0.22.0: lodash.reject "^4.4.0" lodash.some "^4.4.0" -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2, chokidar@^3.5.3: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -8315,10 +8315,10 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memfs@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== +memfs@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" + integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== dependencies: fs-monkey "1.0.3" @@ -12499,30 +12499,31 @@ webpack-cli@^4.9.2: rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c" - integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg== +webpack-dev-middleware@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" + integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== dependencies: colorette "^2.0.10" - memfs "^3.2.2" + memfs "^3.4.1" mime-types "^2.1.31" range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa" - integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q== +webpack-dev-server@^4.7.4: + version "4.7.4" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" + integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" + "@types/express" "^4.17.13" "@types/serve-index" "^1.9.1" "@types/sockjs" "^0.3.33" "@types/ws" "^8.2.2" ansi-html-community "^0.0.8" bonjour "^3.5.0" - chokidar "^3.5.2" + chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^1.6.0" @@ -12542,8 +12543,8 @@ webpack-dev-server@^4.7.3: sockjs "^0.3.21" spdy "^4.0.2" strip-ansi "^7.0.0" - webpack-dev-middleware "^5.3.0" - ws "^8.1.0" + webpack-dev-middleware "^5.3.1" + ws "^8.4.2" webpack-merge@^5.7.3, webpack-merge@^5.8.0: version "5.8.0" @@ -13063,10 +13064,10 @@ ws@^7.3.1, ws@^7.4.5, ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== -ws@^8.1.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz#0b738cd484bfc9303421914b11bb4011e07615bb" - integrity sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g== +ws@^8.4.2: + version "8.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b" + integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA== xhr@^2.0.1: version "2.5.0" From 72ac3063309c70fd07390646d4f1e7626de84be5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 09:38:02 +0530 Subject: [PATCH 20/26] build(deps-dev): bump @babel/core from 7.16.12 to 7.17.0 (#5944) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.12 to 7.17.0. - [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.0/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" 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 | 95 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 6deac6a0d58d..470e36006c03 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.16.12", + "@babel/core": "^7.17.0", "@babel/eslint-parser": "^7.16.5", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", diff --git a/yarn.lock b/yarn.lock index 135ad46a0074..9c68c6e314b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -125,6 +125,14 @@ "@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== + dependencies: + "@jridgewell/trace-mapping" "^0.2.2" + sourcemap-codec "1.4.8" + "@apideck/better-ajv-errors@^0.3.1": version "0.3.1" resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.1.tgz#a8d4ef3ce67c418b8b24f2b76b6bc84eb547baf7" @@ -168,26 +176,26 @@ 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.16.12", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.16.12" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784" - integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg== +"@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== dependencies: + "@ampproject/remapping" "^2.0.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.16.8" + "@babel/generator" "^7.17.0" "@babel/helper-compilation-targets" "^7.16.7" "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.16.7" - "@babel/parser" "^7.16.12" + "@babel/helpers" "^7.17.0" + "@babel/parser" "^7.17.0" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.10" - "@babel/types" "^7.16.8" + "@babel/traverse" "^7.17.0" + "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.1.2" semver "^6.3.0" - source-map "^0.5.0" "@babel/eslint-parser@^7.16.5": version "7.16.5" @@ -198,12 +206,12 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.16.8", "@babel/generator@^7.7.2": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe" - integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw== +"@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== dependencies: - "@babel/types" "^7.16.8" + "@babel/types" "^7.17.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -430,14 +438,14 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" - integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== +"@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== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/traverse" "^7.17.0" + "@babel/types" "^7.17.0" "@babel/highlight@^7.16.7": version "7.16.7" @@ -448,10 +456,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.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7": - version "7.16.12" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6" - integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A== +"@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/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -1180,26 +1188,26 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.7.2": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f" - integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw== +"@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== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.16.8" + "@babel/generator" "^7.17.0" "@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.16.10" - "@babel/types" "^7.16.8" + "@babel/parser" "^7.17.0" + "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1" - integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" @@ -1809,6 +1817,19 @@ "@babel/runtime" "^7.7.2" regenerator-runtime "^0.13.3" +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.4" + 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== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + sourcemap-codec "1.4.8" + "@mdx-js/loader@^2.0.0-next.9": version "2.0.0-next.9" resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-2.0.0-next.9.tgz#46b9cc1db2f51f89ac230e40156edc70a2bbae3f" @@ -11057,7 +11078,7 @@ source-map@^0.8.0-beta.0: dependencies: whatwg-url "^7.0.0" -sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: +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 661464982d600f2b3b25355a648befad76f9d4bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 12:49:17 +0800 Subject: [PATCH 21/26] build(deps-dev): bump @babel/eslint-parser from 7.16.5 to 7.17.0 (#5942) Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.16.5 to 7.17.0. - [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.0/eslint/babel-eslint-parser) --- updated-dependencies: - dependency-name: "@babel/eslint-parser" 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 470e36006c03..f9f6c821e4c7 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@babel/core": "^7.17.0", - "@babel/eslint-parser": "^7.16.5", + "@babel/eslint-parser": "^7.17.0", "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/preset-env": "^7.16.11", "@babel/preset-react": "^7.16.7", diff --git a/yarn.lock b/yarn.lock index 9c68c6e314b0..6b47375cfbbc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -197,10 +197,10 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/eslint-parser@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz#48d3485091d6e36915358e4c0d0b2ebe6da90462" - integrity sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA== +"@babel/eslint-parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: eslint-scope "^5.1.1" eslint-visitor-keys "^2.1.0" From 63e6785c9b9e123f26cd0d4000326467734ed215 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 13:27:43 +0800 Subject: [PATCH 22/26] build(deps): bump @docsearch/react from 3.0.0-alpha.42 to 3.0.0-alpha.50 (#5943) Bumps [@docsearch/react](https://github.com/algolia/docsearch) from 3.0.0-alpha.42 to 3.0.0-alpha.50. - [Release notes](https://github.com/algolia/docsearch/releases) - [Changelog](https://github.com/algolia/docsearch/blob/next/CHANGELOG.md) - [Commits](https://github.com/algolia/docsearch/compare/v3.0.0-alpha.42...v3.0.0-alpha.50) --- updated-dependencies: - dependency-name: "@docsearch/react" 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 | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index f9f6c821e4c7..846c04278d56 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "workbox-webpack-plugin": "^6.4.2" }, "dependencies": { - "@docsearch/react": "^3.0.0-alpha.42", + "@docsearch/react": "^3.0.0-alpha.50", "path-browserify": "^1.0.1", "prop-types": "^15.8.1", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 6b47375cfbbc..2325d2ed5b2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@algolia/autocomplete-core@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.0.tgz#6c91c9de7748e9c103846828a58dfe92bd4d6689" - integrity sha512-E7+VJwcvwMM8vPeaVn7fNUgix8WHV8A1WUeHDi2KHemCaaGc8lvUnP3QnvhMxiDhTe7OpMEv4o2TBUMyDgThaw== +"@algolia/autocomplete-core@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37" + integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A== dependencies: - "@algolia/autocomplete-shared" "1.5.0" + "@algolia/autocomplete-shared" "1.5.2" -"@algolia/autocomplete-preset-algolia@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.0.tgz#61671f09c0c77133d9baf1356719f8378c48437a" - integrity sha512-iiFxKERGHkvkiupmrFJbvESpP/zv5jSgH714XRiP5LDvUHaYOo4GLAwZCFf2ef/L5tdtPBARvekn6k1Xf33gjA== +"@algolia/autocomplete-preset-algolia@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca" + integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw== dependencies: - "@algolia/autocomplete-shared" "1.5.0" + "@algolia/autocomplete-shared" "1.5.2" -"@algolia/autocomplete-shared@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.0.tgz#09580bc89408a2ab5f29e312120dad68f58019bd" - integrity sha512-bRSkqHHHSwZYbFY3w9hgMyQRm86Wz27bRaGCbNldLfbk0zUjApmE4ajx+ZCVSLqxvcUEjMqZFJzDsder12eKsg== +"@algolia/autocomplete-shared@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79" + integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug== "@algolia/cache-browser-local-storage@4.10.3": version "4.10.3" @@ -1254,19 +1254,19 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@docsearch/css@3.0.0-alpha.42": - version "3.0.0-alpha.42" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0-alpha.42.tgz#deb6049e999d6ca9451eba4793cb5b6da28c8773" - integrity sha512-AGwI2AXUacYhVOHmYnsXoYDJKO6Ued2W+QO80GERbMLhC7GH5tfvtW5REs/s7jSdcU3vzFoxT8iPDBCh/PkrlQ== +"@docsearch/css@3.0.0-alpha.50": + version "3.0.0-alpha.50" + resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0-alpha.50.tgz#794c6a8d301840a49b55f5b331c7be84b9723643" + integrity sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w== -"@docsearch/react@^3.0.0-alpha.42": - version "3.0.0-alpha.42" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0-alpha.42.tgz#1d22a2b05779f24d090ff8d7ff2699e4d50dff5c" - integrity sha512-1aOslZJDxwUUcm2QRNmlEePUgL8P5fOAeFdOLDMctHQkV2iTja9/rKVbkP8FZbIUnZxuuCCn8ErLrjD/oXWOag== +"@docsearch/react@^3.0.0-alpha.50": + version "3.0.0-alpha.50" + resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0-alpha.50.tgz#a7dc547836c2b221fd3aa8eb87bfb47a579ef141" + integrity sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg== dependencies: - "@algolia/autocomplete-core" "1.5.0" - "@algolia/autocomplete-preset-algolia" "1.5.0" - "@docsearch/css" "3.0.0-alpha.42" + "@algolia/autocomplete-core" "1.5.2" + "@algolia/autocomplete-preset-algolia" "1.5.2" + "@docsearch/css" "3.0.0-alpha.50" algoliasearch "^4.0.0" "@eslint/eslintrc@^1.0.5": From 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 Mon Sep 17 00:00:00 2001 From: Behnam Mohammadi Date: Fri, 4 Feb 2022 16:39:01 +0330 Subject: [PATCH 23/26] docs(concepts): remove npm from installation way (#5919) --- src/content/concepts/index.mdx | 2 +- src/content/concepts/plugins.mdx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content/concepts/index.mdx b/src/content/concepts/index.mdx index c5824bddcf29..0454b287af6c 100644 --- a/src/content/concepts/index.mdx +++ b/src/content/concepts/index.mdx @@ -132,7 +132,7 @@ In order to use a plugin, you need to `require()` it and add it to the `plugins` **webpack.config.js** ```javascript -const HtmlWebpackPlugin = require('html-webpack-plugin'); //installed via npm +const HtmlWebpackPlugin = require('html-webpack-plugin'); const webpack = require('webpack'); //to access built-in plugins module.exports = { diff --git a/src/content/concepts/plugins.mdx b/src/content/concepts/plugins.mdx index 5da86f0c67c8..d03e371fd107 100644 --- a/src/content/concepts/plugins.mdx +++ b/src/content/concepts/plugins.mdx @@ -50,7 +50,7 @@ Depending on how you are using webpack, there are multiple ways to use plugins. **webpack.config.js** ```javascript -const HtmlWebpackPlugin = require('html-webpack-plugin'); //installed via npm +const HtmlWebpackPlugin = require('html-webpack-plugin'); const webpack = require('webpack'); //to access built-in plugins const path = require('path'); From 2d4a25153a96d024c8ca9b323c34a1919ab2115e Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Sun, 6 Feb 2022 21:00:21 +0800 Subject: [PATCH 24/26] docs(en): fix conflicts --- src/content/api/module-variables.mdx | 14 +++---- src/content/concepts/index.mdx | 7 +--- src/content/concepts/loaders.mdx | 8 +--- src/content/concepts/plugins.mdx | 7 +--- src/content/configuration/output.mdx | 18 ++------- yarn.lock | 59 ---------------------------- 6 files changed, 12 insertions(+), 101 deletions(-) diff --git a/src/content/api/module-variables.mdx b/src/content/api/module-variables.mdx index 701512fd9bfb..c6cac50144ed 100644 --- a/src/content/api/module-variables.mdx +++ b/src/content/api/module-variables.mdx @@ -169,23 +169,19 @@ import('./module-a').then((moduleA) => { }); ``` -<<<<<<< HEAD -## \_\_webpack_modules\_\_ (webpack-specific) $#__webpack_modules__-webpack-specific$ -======= -## \_\_webpack_module\_\_ (webpack-specific) +## \_\_webpack_module\_\_ (webpack-specific) $#__webpack_module__-webpack-specific$ -It provides access to the the current `module`. `module` is not available in strict ESM. +它提供对当前 `module` 的访问。`module` 在 ESM 严格模式下不可用。 -## \_\_webpack_module\_\_.id (webpack-specific) +## \_\_webpack_module\_\_.id (webpack-specific) $#__webpack_module__id-webpack-specific$ -It provides access to the ID of current `module` (`module.id`). `module` is not available in strict ESM. +它提供对当前 `module`(`module.id`) ID 的访问。`module` 在 ESM 严格模式下不可用。 -## \_\_webpack_modules\_\_ (webpack-specific) ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 +## \_\_webpack_modules\_\_ (webpack-specific) $#__webpack_modules__-webpack-specific$ 访问所有模块的内部对象。 diff --git a/src/content/concepts/index.mdx b/src/content/concepts/index.mdx index 02af2abad7ce..d551e94b59da 100644 --- a/src/content/concepts/index.mdx +++ b/src/content/concepts/index.mdx @@ -139,13 +139,8 @@ T> 查看 [插件接口(plugin interface)](/api/plugins)，学习如何使用它 **webpack.config.js** ```javascript -<<<<<<< HEAD -const HtmlWebpackPlugin = require('html-webpack-plugin'); // 通过 npm 安装 -const webpack = require('webpack'); // 用于访问内置插件 -======= const HtmlWebpackPlugin = require('html-webpack-plugin'); -const webpack = require('webpack'); //to access built-in plugins ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 +const webpack = require('webpack'); // 用于访问内置插件 module.exports = { module: { diff --git a/src/content/concepts/loaders.mdx b/src/content/concepts/loaders.mdx index a9730026488a..faeddea9a898 100644 --- a/src/content/concepts/loaders.mdx +++ b/src/content/concepts/loaders.mdx @@ -53,13 +53,9 @@ module.exports = { - [配置方式](#configuration)（推荐）：在 **webpack.config.js** 文件中指定 loader。 - [内联方式](#inline)：在每个 `import` 语句中显式指定 loader。 -<<<<<<< HEAD -### 配置方式 $#configuration$ -======= -Note that loaders can be used from CLI under webpack v4, but the feature was deprecated in webpack v5. +注意在 webpack v4 版本可以通过 CLI 使用 loader，但是在 webpack v5 中被弃用。 -### Configuration ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 +### Configuration $#configuration$ [`module.rules`](/configuration/module/#modulerules) 允许你在 webpack 配置中指定多个 loader。 这种方式是展示 loader 的一种简明方式，并且有助于使代码变得简洁和易于维护。同时让你对各个 loader 有个全局概览： diff --git a/src/content/concepts/plugins.mdx b/src/content/concepts/plugins.mdx index 1ebe0c08c31c..bb8d54f9cade 100644 --- a/src/content/concepts/plugins.mdx +++ b/src/content/concepts/plugins.mdx @@ -55,13 +55,8 @@ compiler hook 的 tap 方法的第一个参数，应该是驼峰式命名的插 **webpack.config.js** ```javascript -<<<<<<< HEAD -const HtmlWebpackPlugin = require('html-webpack-plugin'); // 通过 npm 安装 -const webpack = require('webpack'); // 访问内置的插件 -======= const HtmlWebpackPlugin = require('html-webpack-plugin'); -const webpack = require('webpack'); //to access built-in plugins ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 +const webpack = require('webpack'); // 访问内置的插件 const path = require('path'); module.exports = { diff --git a/src/content/configuration/output.mdx b/src/content/configuration/output.mdx index cd299b1f9258..35b7105e9ce1 100644 --- a/src/content/configuration/output.mdx +++ b/src/content/configuration/output.mdx @@ -681,11 +681,7 @@ module.exports = { `string = 'hex'` -<<<<<<< HEAD -在生成 hash 时使用的编码方式。支持 Node.js [`hash.digest`](https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding) 的所有编码。对文件名使用 `'base64'`，可能会出现问题，因为 base64 字母表中具有 `/` 这个字符(character)。同样的，`'latin1'` 规定可以含有任何字符(character)。 -======= -The encoding to use when generating the hash. All encodings from Node.JS' [`hash.digest`](https://nodejs.org/api/buffer.html#buffers-and-character-encodings) are supported. Using `'base64'` for filenames might be problematic since it has the character `/` in its alphabet. Likewise `'latin1'` could contain any character. ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 +在生成 hash 时使用的编码方式。支持 Node.js [`hash.digest`](https://nodejs.org/api/buffer.html#buffers-and-character-encodings) 的所有编码。对文件名使用 `'base64'`，可能会出现问题，因为 base64 字母表中具有 `/` 这个字符(character)。同样的，`'latin1'` 规定可以含有任何字符(character)。 ## output.hashDigestLength $#outputhashdigestlength$ @@ -974,13 +970,9 @@ MyLibrary = _entry_return_; 请注意，如果 `MyLibrary` 没有在你的库之前定义，那么它将会被设置在全局作用域。 -<<<<<<< HEAD -##### type: 'assign-properties' $#typeassignproperties$ -======= -##### type: 'assign-properties' +##### type: 'assign-properties' $#typeassignproperties$ ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 ```js module.exports = { @@ -1630,13 +1622,9 @@ MyLibrary = _entry_return_; 注意，如果 `MyLibrary` 在作用域中未在前面代码进行定义，则你的 library 将被设置在全局作用域内。 -<<<<<<< HEAD -#### libraryTarget: 'assign-properties' $#libraryTarget-assign-properties$ -======= -#### libraryTarget: 'assign-properties' +#### libraryTarget: 'assign-properties' $#libraryTarget-assign-properties$ ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 W> 最好使用 [output.library.type: 'assign-properties'`](#type-assign-properties)。 diff --git a/yarn.lock b/yarn.lock index 9767f7191054..2ee0c1cd1c1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5900,21 +5900,12 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -<<<<<<< HEAD find-up@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= dependencies: locate-path "^2.0.0" -======= -find-replace@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" - integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== - dependencies: - array-back "^3.0.1" ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" @@ -9295,7 +9286,6 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -<<<<<<< HEAD nanocolors@^0.1.0, nanocolors@^0.1.5: version "0.1.12" resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" @@ -9305,12 +9295,6 @@ nanoid@^3.1.30: version "3.1.30" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== -======= -nanoid@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 natural-compare@^1.4.0: version "1.4.0" @@ -12243,7 +12227,6 @@ synckit@^0.4.1: tslib "^2.3.1" uuid "^8.3.2" -<<<<<<< HEAD table@^3.8.3: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -12260,22 +12243,6 @@ tailwindcss@^3.0.17: version "3.0.17" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.17.tgz#2c5fe6c364d76ec54644347c6f09befe0113b06f" integrity sha512-OiHUsmOKQQEg/ocXaLIjk/kOz8EK2jF6iPuc1bQ4NsmhYl7sk70UDsGV02AJvBAAiJhinPCkDR8egT9qY+ulCw== -======= -table-layout@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" - integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== - dependencies: - array-back "^4.0.1" - deep-extend "~0.6.0" - 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== ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -12722,22 +12689,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -<<<<<<< HEAD typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -======= -typical@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" - integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== - -typical@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" - integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -13343,17 +13298,10 @@ webpack-cli@^4.9.2: rechoir "^0.7.0" webpack-merge "^5.7.3" -<<<<<<< HEAD webpack-dev-middleware@^5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c" integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg== -======= -webpack-dev-middleware@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" - integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 dependencies: colorette "^2.0.10" memfs "^3.4.1" @@ -13913,7 +13861,6 @@ ws@^7.3.1, ws@^7.4.5, ws@^7.4.6: resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== -<<<<<<< HEAD ws@^8.1.0: version "8.4.0" resolved "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6" @@ -13923,12 +13870,6 @@ x-is-string@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI= -======= -ws@^8.4.2: - version "8.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b" - integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA== ->>>>>>> 0462e9b4100e33f9d1fd6b1b8730bf51369a4ea4 xhr@^2.0.1: version "2.6.0" From 8d178e2798f4ca8cf4019135043c6698fbac4b09 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Sun, 6 Feb 2022 21:03:40 +0800 Subject: [PATCH 25/26] docs(en): fix conflicts --- yarn.lock | 59 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2ee0c1cd1c1e..e19a021ba26e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5900,6 +5900,13 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-replace@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" + integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== + dependencies: + array-back "^3.0.1" + find-up@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -9291,10 +9298,10 @@ nanocolors@^0.1.0, nanocolors@^0.1.5: resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== -nanoid@^3.1.30: - version "3.1.30" - resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" - integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== +nanoid@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== natural-compare@^1.4.0: version "1.4.0" @@ -12227,6 +12234,16 @@ synckit@^0.4.1: tslib "^2.3.1" uuid "^8.3.2" +table-layout@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" + integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== + dependencies: + array-back "^4.0.1" + deep-extend "~0.6.0" + typical "^5.2.0" + wordwrapjs "^4.0.0" + table@^3.8.3: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -12239,10 +12256,10 @@ table@^3.8.3: slice-ansi "0.0.4" string-width "^2.0.0" -tailwindcss@^3.0.17: - version "3.0.17" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.17.tgz#2c5fe6c364d76ec54644347c6f09befe0113b06f" - integrity sha512-OiHUsmOKQQEg/ocXaLIjk/kOz8EK2jF6iPuc1bQ4NsmhYl7sk70UDsGV02AJvBAAiJhinPCkDR8egT9qY+ulCw== +tailwindcss@^3.0.18: + version "3.0.18" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.18.tgz#ea4825e6496d77dc21877b6b61c7cc56cda3add5" + integrity sha512-ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -12694,6 +12711,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +typical@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" + integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== + +typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -13298,10 +13325,10 @@ webpack-cli@^4.9.2: rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c" - integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg== +webpack-dev-middleware@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" + integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== dependencies: colorette "^2.0.10" memfs "^3.4.1" @@ -13861,10 +13888,10 @@ ws@^7.3.1, ws@^7.4.5, ws@^7.4.6: resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== -ws@^8.1.0: - version "8.4.0" - resolved "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6" - integrity sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ== +ws@^8.4.2: + version "8.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b" + integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA== x-is-string@^0.1.0: version "0.1.0" From 94532a5630cc6dc85e9f036078ab73e8c54a01b9 Mon Sep 17 00:00:00 2001 From: jacob-lcs Date: Sun, 6 Feb 2022 21:10:30 +0800 Subject: [PATCH 26/26] docs(en): fix conflicts --- src/content/api/module-variables.mdx | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/content/api/module-variables.mdx b/src/content/api/module-variables.mdx index c6cac50144ed..4ce4dd95b494 100644 --- a/src/content/api/module-variables.mdx +++ b/src/content/api/module-variables.mdx @@ -85,7 +85,7 @@ exports.aFunction = function doSomething() { 如果在一个被 Parser 解析的表达式内部使用，则配置选项会被当作 `true` 处理。 -## import.meta.url $#import-meta-url$ +## import.meta.url 返回模块以 `file:` 开头绝对路径的 URL。 @@ -95,7 +95,7 @@ exports.aFunction = function doSomething() { console.log(import.meta.url); // 输出结果类似于 `file:///path/to/your/project/src/index.js` ``` -## import.meta.webpack $#import-meta-webpack$ +## import.meta.webpack 返回 webpack 的版本 @@ -105,7 +105,7 @@ console.log(import.meta.url); // 输出结果类似于 `file:///path/to/your/pro console.log(import.meta.webpack); // output `5` for webpack 5 ``` -## import.meta.webpackHot $#importmetawebpackhot$ +## import.meta.webpackHot webpack 特定。[`module.hot`](#modulehot-webpack-specific) 的一个别名，[strict ESM](/guides/ecma-script-modules/#flagging-modules-as-esm) 中可以使用 `import.meta.webpackHot` 但是不能使用 `module.hot`。 @@ -133,15 +133,15 @@ require('file.js?test'); __resourceQuery === '?test'; ``` -## \_\_webpack_public_path\_\_ (webpack-specific) $#__webpack_public_path__-webpack-specific$ +## \_\_webpack_public_path\_\_ (webpack-specific) 等同于 `output.publicPath` 配置选项。 -## \_\_webpack_require\_\_ (webpack-specific) $#__webpack_require__-webpack-specific$ +## \_\_webpack_require\_\_ (webpack-specific) 原始 require 函数。这个表达式不会被解析器解析为依赖。 -## `__webpack_chunk_load__` (webpack 特有变量) $#__webpack_chunk_load__-webpack-specific$ +## `__webpack_chunk_load__` (webpack-specific) 内部 chunk 载入函数，有一个输入参数： @@ -169,27 +169,27 @@ import('./module-a').then((moduleA) => { }); ``` -## \_\_webpack_module\_\_ (webpack-specific) $#__webpack_module__-webpack-specific$ +## \_\_webpack_module\_\_ (webpack-specific) 它提供对当前 `module` 的访问。`module` 在 ESM 严格模式下不可用。 -## \_\_webpack_module\_\_.id (webpack-specific) $#__webpack_module__id-webpack-specific$ +## \_\_webpack_module\_\_.id (webpack-specific) 它提供对当前 `module`(`module.id`) ID 的访问。`module` 在 ESM 严格模式下不可用。 -## \_\_webpack_modules\_\_ (webpack-specific) $#__webpack_modules__-webpack-specific$ +## \_\_webpack_modules\_\_ (webpack-specific) 访问所有模块的内部对象。 -## \_\_webpack_hash\_\_ (webpack-specific) $#__webpack_hash__-webpack-specific$ +## \_\_webpack_hash\_\_ (webpack-specific) 这个变量提供对编译过程中(compilation)的 hash 信息的访问。 -## \_\_webpack_get_script_filename\_\_ (webpack-specific) $#__webpack_get_script_filename__-webpack-specific$ +## \_\_webpack_get_script_filename\_\_ (webpack-specific) `function (chunkId)` @@ -206,11 +206,11 @@ __webpack_get_script_filename__ = (chunkId) => { }; ``` -## \_\_non_webpack_require\_\_ (webpack-specific) $#__non_webpack_require__-webpack-specific$ +## \_\_non_webpack_require\_\_ (webpack-specific) 生成一个不会被 webpack 解析的 `require` 函数。配合全局可以获取到的 require 函数，可以完成一些酷炫操作。 -## \_\_webpack_exports_info\_\_ (webpack-specific) $#__webpack_exports_info__-webpack-specific$ +## \_\_webpack_exports_info\_\_ (webpack-specific) 在模块中, `__webpack_exports_info__` 可以被获取到，以便导出模块用以自我检查： @@ -234,7 +234,7 @@ __webpack_get_script_filename__ = (chunkId) => { - 可以从嵌套的 exports 中得到相关信息: 例如 `__webpack_exports_info__....used` -## \_\_webpack_is_included\_\_ (webpack-specific) $#webpack-is-included$ +## \_\_webpack_is_included\_\_ (webpack-specific) @@ -246,7 +246,7 @@ if (__webpack_is_included__('./module-a.js')) { } ``` -## \_\_webpack_base_uri\_\_ (webpack-specific) $#webpack-base-uri$ +## \_\_webpack_base_uri\_\_ (webpack-specific) 运行时修改 base 的 URI。 @@ -257,7 +257,7 @@ if (__webpack_is_included__('./module-a.js')) { __webpack_base_uri__ = 'https://example.com'; ``` -## \_\_webpack_runtime_id\_\_ $#webpackruntimeid$ +## \_\_webpack_runtime_id\_\_ 访问当前入口的 [runtime](/blog/2020-10-10-webpack-5-release/#entry-point-runtime) id。 @@ -269,6 +269,6 @@ if (__webpack_is_included__('./module-a.js')) { console.log(__webpack_runtime_id__ === 'main'); ``` -## DEBUG (webpack-specific) $#debug--webpack-specific$ +## DEBUG (webpack-specific) 等同于 `debug` 配置选项。