-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: regen yarn.lock after merge conflict
- Loading branch information
1 parent
d403124
commit 9ebcc51
Showing
1 changed file
with
18 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4620,11 +4620,6 @@ abort-controller@^3.0.0: | |
| dependencies: | ||
| event-target-shim "^5.0.0" | ||
|
|
||
| acorn-import-attributes@^1.9.5: | ||
| version "1.9.5" | ||
| resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" | ||
| integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== | ||
|
|
||
| acorn-jsx@^5.3.2: | ||
| version "5.3.2" | ||
| resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" | ||
|
|
@@ -5198,7 +5193,14 @@ brace-expansion@^2.0.1: | |
| dependencies: | ||
| balanced-match "^1.0.0" | ||
|
|
||
| braces@^3.0.3, braces@~3.0.2: | ||
| braces@^3.0.3: | ||
| version "3.0.3" | ||
| resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" | ||
| integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== | ||
| dependencies: | ||
| fill-range "^7.1.1" | ||
|
|
||
| braces@~3.0.2: | ||
| version "3.0.2" | ||
| resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" | ||
| integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== | ||
|
|
@@ -6346,14 +6348,6 @@ enhanced-resolve@^5.12.0, enhanced-resolve@^5.7.0: | |
| graceful-fs "^4.2.4" | ||
| tapable "^2.2.0" | ||
|
|
||
| enhanced-resolve@^5.17.1: | ||
| version "5.17.1" | ||
| resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" | ||
| integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== | ||
| dependencies: | ||
| graceful-fs "^4.2.4" | ||
| tapable "^2.2.0" | ||
|
|
||
| enquirer@^2.3.0: | ||
| version "2.4.1" | ||
| resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" | ||
|
|
@@ -7162,6 +7156,13 @@ fill-range@^7.0.1: | |
| dependencies: | ||
| to-regex-range "^5.0.1" | ||
|
|
||
| fill-range@^7.1.1: | ||
| version "7.1.1" | ||
| resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" | ||
| integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== | ||
| dependencies: | ||
| to-regex-range "^5.0.1" | ||
|
|
||
| filter-obj@^1.1.0: | ||
| version "1.1.0" | ||
| resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" | ||
|
|
@@ -10873,16 +10874,7 @@ string-format@^2.0.0: | |
| resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b" | ||
| integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA== | ||
|
|
||
| "string-width-cjs@npm:string-width@^4.2.0": | ||
| version "4.2.3" | ||
| resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" | ||
| integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== | ||
| dependencies: | ||
| emoji-regex "^8.0.0" | ||
| is-fullwidth-code-point "^3.0.0" | ||
| strip-ansi "^6.0.1" | ||
|
|
||
| string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: | ||
| "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: | ||
| version "4.2.3" | ||
| resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" | ||
| integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== | ||
|
|
@@ -10978,14 +10970,7 @@ string_decoder@~1.1.1: | |
| dependencies: | ||
| safe-buffer "~5.1.0" | ||
|
|
||
| "strip-ansi-cjs@npm:strip-ansi@^6.0.1": | ||
| version "6.0.1" | ||
| resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" | ||
| integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== | ||
| dependencies: | ||
| ansi-regex "^5.0.1" | ||
|
|
||
| strip-ansi@^6.0.0, strip-ansi@^6.0.1: | ||
| "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: | ||
| version "6.0.1" | ||
| resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" | ||
| integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== | ||
|
|
@@ -11980,68 +11965,6 @@ [email protected]: | |
| sirv "^2.0.3" | ||
| ws "^7.3.1" | ||
|
|
||
| webpack-cli@^5.1.4: | ||
| version "5.1.4" | ||
| resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" | ||
| integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== | ||
| dependencies: | ||
| "@discoveryjs/json-ext" "^0.5.0" | ||
| "@webpack-cli/configtest" "^2.1.1" | ||
| "@webpack-cli/info" "^2.0.2" | ||
| "@webpack-cli/serve" "^2.0.5" | ||
| colorette "^2.0.14" | ||
| commander "^10.0.1" | ||
| cross-spawn "^7.0.3" | ||
| envinfo "^7.7.3" | ||
| fastest-levenshtein "^1.0.12" | ||
| import-local "^3.0.2" | ||
| interpret "^3.1.1" | ||
| rechoir "^0.8.0" | ||
| webpack-merge "^5.7.3" | ||
|
|
||
| webpack-merge@^5.7.3: | ||
| version "5.10.0" | ||
| resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" | ||
| integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== | ||
| dependencies: | ||
| clone-deep "^4.0.1" | ||
| flat "^5.0.2" | ||
| wildcard "^2.0.0" | ||
|
|
||
| webpack-sources@^3.2.3: | ||
| version "3.2.3" | ||
| resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" | ||
| integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== | ||
|
|
||
| webpack@^5.91.0: | ||
| version "5.94.0" | ||
| resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" | ||
| integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== | ||
| dependencies: | ||
| "@types/estree" "^1.0.5" | ||
| "@webassemblyjs/ast" "^1.12.1" | ||
| "@webassemblyjs/wasm-edit" "^1.12.1" | ||
| "@webassemblyjs/wasm-parser" "^1.12.1" | ||
| acorn "^8.7.1" | ||
| acorn-import-attributes "^1.9.5" | ||
| browserslist "^4.21.10" | ||
| chrome-trace-event "^1.0.2" | ||
| enhanced-resolve "^5.17.1" | ||
| es-module-lexer "^1.2.1" | ||
| eslint-scope "5.1.1" | ||
| events "^3.2.0" | ||
| glob-to-regexp "^0.4.1" | ||
| graceful-fs "^4.2.11" | ||
| json-parse-even-better-errors "^2.3.1" | ||
| loader-runner "^4.2.0" | ||
| mime-types "^2.1.27" | ||
| neo-async "^2.6.2" | ||
| schema-utils "^3.2.0" | ||
| tapable "^2.1.1" | ||
| terser-webpack-plugin "^5.3.10" | ||
| watchpack "^2.4.1" | ||
| webpack-sources "^3.2.3" | ||
|
|
||
| whatwg-url@^5.0.0: | ||
| version "5.0.0" | ||
| resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" | ||
|
|
@@ -12151,7 +12074,7 @@ wordwrapjs@^4.0.0: | |
| reduce-flatten "^2.0.0" | ||
| typical "^5.2.0" | ||
|
|
||
| "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": | ||
| "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: | ||
| version "7.0.0" | ||
| resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" | ||
| integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== | ||
|
|
@@ -12169,15 +12092,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: | |
| string-width "^4.1.0" | ||
| strip-ansi "^6.0.0" | ||
|
|
||
| wrap-ansi@^7.0.0: | ||
| version "7.0.0" | ||
| resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" | ||
| integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== | ||
| dependencies: | ||
| ansi-styles "^4.0.0" | ||
| string-width "^4.1.0" | ||
| strip-ansi "^6.0.0" | ||
|
|
||
| wrap-ansi@^8.1.0: | ||
| version "8.1.0" | ||
| resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" | ||
|
|
||