From e213345b061b0d8f2c4afef88717bfa7e97c2aef Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 12 Sep 2024 15:11:30 +0200 Subject: [PATCH 0001/1338] Add OpenAI dependency --- app/package.json | 1 + app/yarn.lock | 282 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+) diff --git a/app/package.json b/app/package.json index 36c664d02b7..0662f39baa4 100644 --- a/app/package.json +++ b/app/package.json @@ -46,6 +46,7 @@ "memoize-one": "^4.0.3", "minimist": "^1.2.8", "mri": "^1.1.0", + "openai": "^4.58.2", "p-limit": "^2.2.0", "p-memoize": "^7.1.1", "primer-support": "^4.0.0", diff --git a/app/yarn.lock b/app/yarn.lock index 84850ea8f84..82ed5418ce3 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -67,6 +67,47 @@ resolved "https://registry.yarnpkg.com/@github/stable-socket/-/stable-socket-1.1.0.tgz#b8598c02df1a935fb0c970252f0b0062f4bdaa29" integrity sha512-kzLHnrWGvmXka7AIUnsyF+SO5dP4dxEXX2sMixXW5ngRf3i4RhvXzFNgXVy4qBKsIsg6V3fNb3NOto0z6o4XAw== +"@types/node-fetch@^2.6.4": + version "2.6.11" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" + integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== + dependencies: + "@types/node" "*" + form-data "^4.0.0" + +"@types/node@*": + version "22.5.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8" + integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg== + dependencies: + undici-types "~6.19.2" + +"@types/node@^18.11.18": + version "18.19.50" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.50.tgz#8652b34ee7c0e7e2004b3f08192281808d41bf5a" + integrity sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg== + dependencies: + undici-types "~5.26.4" + +"@types/qs@^6.9.15": + version "6.9.15" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" + integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg== + +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +agentkeepalive@^4.2.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" + integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== + dependencies: + humanize-ms "^1.2.1" + ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -114,6 +155,11 @@ async@^3.2.3: resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + b4a@^1.6.4: version "1.6.7" resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4" @@ -157,6 +203,17 @@ byline@^5.0.0: resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + chain-function@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc" @@ -254,6 +311,13 @@ colorspace@1.1.x: color "^3.1.3" text-hex "1.0.x" +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + compare-versions@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" @@ -319,6 +383,20 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -420,6 +498,18 @@ end-of-stream@^1.4.1: dependencies: once "^1.4.0" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -430,6 +520,11 @@ event-kit@^2.0.0: resolved "https://registry.yarnpkg.com/event-kit/-/event-kit-2.4.0.tgz#718aaf22df76670024ad66922483e1bba0544f33" integrity sha512-ZXd9jxUoc/f/zdLdR3OUcCzT84WnpaNWefquLyE125akIC90sDs8S3T/qihliuVsaj7Osc0z8lLL2fjooE9Z4A== +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -477,6 +572,28 @@ focus-trap@^6.1.0: dependencies: tabbable "^5.1.0" +form-data-encoder@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040" + integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +formdata-node@^4.3.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz#23f6a5cb9cb55315912cbec4ff7b0f59bbd191e2" + integrity sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ== + dependencies: + node-domexception "1.0.0" + web-streams-polyfill "4.0.0-beta.3" + fs-admin@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/fs-admin/-/fs-admin-0.19.0.tgz#c2b077b21607ca1982bf9bc8c3fc096be7a1186e" @@ -495,6 +612,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + fuzzaldrin-plus@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/fuzzaldrin-plus/-/fuzzaldrin-plus-0.6.0.tgz#832f6489fbe876769459599c914a670ec22947ee" @@ -514,6 +636,17 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -538,6 +671,13 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -548,16 +688,47 @@ has-flag@^2.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-proto@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= +hasown@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + html-entities@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" @@ -728,6 +899,18 @@ memoize-one@^4.0.3: resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.0.3.tgz#cdfdd942853f1a1b4c71c5336b8c49da0bf0273c" integrity sha512-QmpUu4KqDmX0plH4u+tf0riMc1KHE1+lw95cMrLlXQAFOx/xnBtwhZ52XJxd9X2O6kwKBqX32kmhbhlobD0cuw== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + mimic-fn@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -782,6 +965,11 @@ mri@^1.1.0: resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.0.tgz#5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a" integrity sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o= +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -831,6 +1019,18 @@ node-addon-api@^7.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== +node-domexception@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" + integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== + +node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" @@ -863,6 +1063,11 @@ object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-inspect@^1.13.1: + version "1.13.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" + integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -877,6 +1082,21 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" +openai@^4.58.2: + version "4.58.2" + resolved "https://registry.yarnpkg.com/openai/-/openai-4.58.2.tgz#e45a41fe91eb626b8f07afb522c27016f58aab58" + integrity sha512-hIalypYELt7/PcryFpz4Gi1z/8ZDzukWyOhr+jKM6L/GVE+t4NseaENXKt+OxnkkIm/1R2EkdGxgnHrZ0kB5bQ== + dependencies: + "@types/node" "^18.11.18" + "@types/node-fetch" "^2.6.4" + "@types/qs" "^6.9.15" + abort-controller "^3.0.0" + agentkeepalive "^4.2.1" + form-data-encoder "1.7.2" + formdata-node "^4.3.2" + node-fetch "^2.6.7" + qs "^6.10.3" + os-tmpdir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -1043,6 +1263,13 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" +qs@^6.10.3: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + dependencies: + side-channel "^1.0.6" + querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -1244,6 +1471,18 @@ set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -1261,6 +1500,16 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -1454,6 +1703,11 @@ textarea-caret@^3.0.2: resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf" integrity sha1-82DEhpmqGr9xhoCkOjGoUGZcLK8= +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -1486,6 +1740,16 @@ type-fest@^3.0.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + untildify@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1" @@ -1522,6 +1786,16 @@ warning@^3.0.0: dependencies: loose-envify "^1.0.0" +web-streams-polyfill@4.0.0-beta.3: + version "4.0.0-beta.3" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz#2898486b74f5156095e473efe989dcf185047a38" + integrity sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug== + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + webpack-hot-middleware@^2.10.0: version "2.19.1" resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" @@ -1532,6 +1806,14 @@ webpack-hot-middleware@^2.10.0: querystring "^0.2.0" strip-ansi "^3.0.0" +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which-pm-runs@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" From ee875c075b8878b897fafb7ce0b4177f6417e318 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 12 Sep 2024 15:12:11 +0200 Subject: [PATCH 0002/1338] Add Copilot commit message generation Introduces an integration with OpenAI for generating commit titles and descriptions using diff data. This includes updates to API, git utils, and UI components. The commit message component now supports a new button to trigger Copilot, and styles are updated accordingly. --- app/src/lib/api.ts | 73 ++++++++++++++++++++++ app/src/lib/git/diff.ts | 28 +++++++++ app/src/ui/changes/commit-message.tsx | 59 ++++++++++++++++- app/styles/ui/changes/_commit-message.scss | 15 ++++- 4 files changed, 171 insertions(+), 4 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index d6f38944169..bc952df2c16 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -21,6 +21,7 @@ import { clearCertificateErrorSuppressionFor, suppressCertificateErrorFor, } from './suppress-certificate-error' +import OpenAI from 'openai' const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT'] const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL'] @@ -275,6 +276,11 @@ export interface IAPIMentionableUser { readonly name: string | null } +export interface ICopilotCommitDetails { + readonly title: string + readonly description: string +} + /** * Error thrown by `fetchUpdatedPullRequests` when receiving more results than * what the `maxResults` parameter allows for. @@ -1858,6 +1864,73 @@ export class API { throw e } } + + public async getDiffChangesCommitDetails( + diff: string + ): Promise { + const endpoint = 'https://models.inference.ai.azure.com' + const modelName = 'gpt-4o' + + const client = new OpenAI({ + baseURL: endpoint, + apiKey: this.token, + dangerouslyAllowBrowser: true, + }) + + const response = await client.chat.completions.create({ + messages: [ + { + role: 'system', + content: ` + You are a software developer who gets a code changeset (in the git + diff output format) affecting one or multiple files and writes a + commit title and commit description. The commit title should be no + longer than 50 characters, and should summarize the contents of the + changeset for fellow developers reading the commit history. The commit + description can be larger, and should provide more context about the + changeset, including why the changeset is being made, and any other + relevant information. The commit description is optional if the + changeset is small enought that it can be described in the commit + title. Be brief and concise. Do not sound like ChatGPT. Do NOT include + a description of changes in "lock" files from dependency managers like + npm, yarn, or pip, unless those are the only changes in the commit. + Your response must be a JSON object with the attributes "title" + and "description" containing the commit title and commit description. + `, + }, + { + role: 'user', + content: diff, + }, + ], + model: modelName, + temperature: 1, + max_tokens: 1000, + top_p: 1, + }) + + const bestChoice = response.choices.find( + choice => choice.finish_reason === 'stop' + ) + + if (!bestChoice) { + return null + } + + const message = bestChoice.message.content + if ( + !message || + !message.startsWith('```json\n') || + !message.endsWith('\n```') + ) { + return null + } + + // The message starts with ""```json\n" and then the JSON object, and ends with "\n```" + // We want to extract the JSON object itself + const jsonString = message.slice(8, message.length - 4) + return JSON.parse(jsonString) + } } export async function deleteToken(account: Account) { diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 2322d90fc9b..bfe1120b177 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -395,6 +395,34 @@ export async function getWorkingDirectoryDiff( return buildDiff(stdout, repository, file, 'HEAD', lineEndingsChange) } +/** + * Render the diff for a file within the repository working directory. The file will be + * compared against HEAD if it's tracked, if not it'll be compared to an empty file meaning + * that all content in the file will be treated as additions. + */ +export async function getWholeWorkingDirectoryDiffText( + repository: Repository +): Promise { + // `--no-ext-diff` should be provided wherever we invoke `git diff` so that any + // diff.external program configured by the user is ignored + const args = ['diff', '--no-ext-diff', '--patch-with-raw', '--no-color'] + const successExitCodes = new Set([0]) + + const { output } = await spawnAndComplete( + args, + repository.path, + 'getWorkingDirectoryDiff', + successExitCodes + ) + + // No more than 10MB + if (output.length > 10 * 1024 * 1024) { + throw new Error('Diff is too large to render') + } + + return output.toString('utf-8') +} + async function getImageDiff( repository: Repository, file: FileChange, diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 52471ab5439..2aac35a4dbb 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -29,7 +29,7 @@ import { CommitMessageAvatar, CommitMessageAvatarWarningType, } from './commit-message-avatar' -import { getDotComAPIEndpoint } from '../../lib/api' +import { API, getDotComAPIEndpoint } from '../../lib/api' import { isAttributableEmailFor, lookupPreferredEmail } from '../../lib/email' import { setGlobalConfigValue } from '../../lib/git/config' import { Popup, PopupType } from '../../models/popup' @@ -55,6 +55,7 @@ import { RepoRulesetsForBranchLink } from '../repository-rules/repo-rulesets-for import { RepoRulesMetadataFailureList } from '../repository-rules/repo-rules-failure-list' import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' +import { getWholeWorkingDirectoryDiffText } from '../../lib/git' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -795,13 +796,60 @@ export class CommitMessage extends React.Component< } } - private onCoAuthorToggleButtonClick = ( + private onCopilotButtonClick = async ( e: React.MouseEvent ) => { e.preventDefault() + + const account = this.props.accounts.find( + account => account.endpoint === getDotComAPIEndpoint() + ) + if (!account) { + return + } + + const diff = await getWholeWorkingDirectoryDiffText(this.props.repository) + if (!diff) { + return + } + + const api = API.fromAccount(account) + const response = await api.getDiffChangesCommitDetails(diff) + if (!response) { + return + } + + this.setState({ + summary: response.title, + description: response.description, + }) + } + + private onCoAuthorToggleButtonClick = async ( + e: React.MouseEvent + ) => { + e.preventDefault() + this.onToggleCoAuthors() } + private renderCopilotButton() { + if (this.props.repository.gitHubRepository === null) { + return null + } + + return ( + + ) + } + private renderCoAuthorToggleButton() { if (this.props.repository.gitHubRepository === null) { return null @@ -882,7 +930,12 @@ export class CommitMessage extends React.Component< disabled: this.props.isCommitting === true, }) - return
{this.renderCoAuthorToggleButton()}
+ return ( +
+ {this.renderCopilotButton()} + {this.renderCoAuthorToggleButton()} +
+ ) } private renderAmendCommitNotice() { diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 02970c9eabb..99d1ec66ef2 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -82,6 +82,18 @@ } } + .copilot-button { + color: var(--text-secondary-color); + + &:hover { + color: var(--text-color); + } + + &:focus { + outline-offset: 2px; + } + } + .co-authors-toggle { color: var(--text-secondary-color); @@ -182,7 +194,8 @@ } } - .co-authors-toggle { + .co-authors-toggle, + .copilot-button { // button reset styles border: none; border-radius: 0px; From ac73cb4ebe4aa570bb7ce70d0eecddab98c08e06 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 13 Sep 2024 10:18:47 +0200 Subject: [PATCH 0003/1338] Add loading state for commit message generation --- app/src/ui/changes/commit-message.tsx | 44 +++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 2aac35a4dbb..44395ca9d2c 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -180,6 +180,8 @@ interface ICommitMessageState { readonly summary: string readonly description: string | null + readonly isGeneratingCommitDetails: boolean + readonly commitMessageAutocompletionProviders: ReadonlyArray< IAutocompletionProvider > @@ -245,6 +247,7 @@ export class CommitMessage extends React.Component< this.state = { summary: commitMessage ? commitMessage.summary : '', description: commitMessage ? commitMessage.description : null, + isGeneratingCommitDetails: false, commitMessageAutocompletionProviders: findCommitMessageAutoCompleteProvider(props.autocompletionProviders), coAuthorAutocompletionProvider: findCoAuthorAutoCompleteProvider( @@ -801,27 +804,41 @@ export class CommitMessage extends React.Component< ) => { e.preventDefault() + this.setState({ + isGeneratingCommitDetails: true, + }) + + const notGeneratingCommitDetails = () => { + this.setState({ + isGeneratingCommitDetails: false, + }) + } + const account = this.props.accounts.find( account => account.endpoint === getDotComAPIEndpoint() ) if (!account) { + notGeneratingCommitDetails() return } const diff = await getWholeWorkingDirectoryDiffText(this.props.repository) if (!diff) { + notGeneratingCommitDetails() return } const api = API.fromAccount(account) const response = await api.getDiffChangesCommitDetails(diff) if (!response) { + notGeneratingCommitDetails() return } this.setState({ summary: response.title, description: response.description, + isGeneratingCommitDetails: false, }) } @@ -843,7 +860,10 @@ export class CommitMessage extends React.Component< className="copilot-button" onClick={this.onCopilotButtonClick} aria-label="Generate commit message with Copilot" - disabled={this.props.isCommitting === true} // TODO: check "is generating" too + disabled={ + this.props.isCommitting === true || + this.state.isGeneratingCommitDetails + } > @@ -861,7 +881,10 @@ export class CommitMessage extends React.Component< onClick={this.onCoAuthorToggleButtonClick} ariaLabel={this.toggleCoAuthorsText} tooltip={this.toggleCoAuthorsText} - disabled={this.props.isCommitting === true} + disabled={ + this.props.isCommitting === true || + this.state.isGeneratingCommitDetails + } > @@ -1278,12 +1301,21 @@ export class CommitMessage extends React.Component< private renderSubmitButton() { const { isCommitting } = this.props + const { isGeneratingCommitDetails } = this.state const isSummaryBlank = isEmptyOrWhitespace(this.summaryOrPlaceholder) const buttonEnabled = - (this.canCommit() || this.canAmend()) && !isCommitting && !isSummaryBlank - const loading = isCommitting ? : undefined - const tooltip = this.getButtonTooltip(buttonEnabled) - const commitButton = this.getButtonText() + (this.canCommit() || this.canAmend()) && + !isCommitting && + !isSummaryBlank && + !isGeneratingCommitDetails + const loading = + isCommitting || isGeneratingCommitDetails ? : undefined + const generatingCommitDetailsMessage = isGeneratingCommitDetails + ? 'Generating commit details…' + : null + const tooltip = + generatingCommitDetailsMessage ?? this.getButtonTooltip(buttonEnabled) + const commitButton = generatingCommitDetailsMessage ?? this.getButtonText() return ( + ) } @@ -955,8 +955,8 @@ export class CommitMessage extends React.Component< return (
- {this.renderCopilotButton()} {this.renderCoAuthorToggleButton()} + {this.renderCopilotButton()}
) } diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 99d1ec66ef2..99e06412a0a 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -174,6 +174,8 @@ } .action-bar { + display: flex; + padding: var(--spacing-half); background: var(--box-background-color); From ccc708481b7583623beb077c42e51a344875212e Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 16 Oct 2024 13:44:28 +0200 Subject: [PATCH 0011/1338] Adopt styling from mocks --- app/src/ui/changes/commit-message.tsx | 6 +++++- app/styles/ui/changes/_commit-message.scss | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 583caaa0e41..913ca3f451c 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -855,11 +855,14 @@ export class CommitMessage extends React.Component< return null } + const ariaLabel = 'Generate commit message with Copilot' + return ( + <> +
+ + ) } @@ -964,7 +967,6 @@ export class CommitMessage extends React.Component< return (
{this.renderCoAuthorToggleButton()} -
{this.renderCopilotButton()}
) From f488ec706c3557886c2ee0f8de9bcceb03e7665d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 8 Jan 2025 12:29:07 +0100 Subject: [PATCH 0020/1338] Check feature flags for accounts --- app/src/lib/feature-flag.ts | 13 +++++++++++++ app/src/ui/changes/commit-message.tsx | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 5bc16eda80b..81e1e1142c5 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -1,3 +1,5 @@ +import { Account } from '../models/account' + const Disable = false /** @@ -103,3 +105,14 @@ export const enableResizingToolbarButtons = () => true export const enableGitConfigParameters = enableBetaFeatures export const enableFilteredChangesList = enableDevelopmentFeatures + +export const enableCommitMessageGeneration = ( + accounts: ReadonlyArray +) => { + return ( + enableBetaFeatures() && + accounts.some(a => + a.features?.includes('desktop_copilot_commit_message_generation') + ) + ) +} diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index f0401eb34dc..30e33c22fd9 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -57,6 +57,7 @@ import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' import { getSelectedFilesDiffText } from '../../lib/git' import { WorkingDirectoryFileChange } from '../../models/status' +import { enableCommitMessageGeneration } from '../../lib/feature-flag' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -856,7 +857,10 @@ export class CommitMessage extends React.Component< } private renderCopilotButton() { - if (this.props.repository.gitHubRepository === null) { + if ( + this.props.repository.gitHubRepository === null || + !enableCommitMessageGeneration(this.props.accounts) + ) { return null } From e7ce7493cafb3849d96ca0dc2e7b18a69e3b1e0c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Jan 2025 13:01:31 +0100 Subject: [PATCH 0021/1338] Fetch and parse Copilot license type --- app/src/lib/api.ts | 40 ++++++++++++++++++++++++++++++--------- app/src/models/account.ts | 5 ++++- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index ee035bfbc36..1e9b16d6f22 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -40,17 +40,32 @@ type AffiliationFilter = | 'collaborator,organization_member' | 'owner,collaborator,organization_member' -/** Response type of GraphQL query of Copilot endpoints */ -type CopilotEndpointsResponse = { +/// Indicates the type of access a user has to GitHub Copilot +export enum CopilotLicenseType { + Business = 'COPILOT_BUSINESS', + Enterprise = 'COPILOT_ENTERPRISE', + Free = 'COPILOT_FREE', + Individual = 'COPILOT_INDIVIDUAL', + NoAccess = 'NO_ACCESS', +} + +/** Response type of GraphQL query of Copilot-related info */ +type ViewerCopilotResponse = { readonly data: { readonly viewer: { readonly copilotEndpoints: { readonly api: string } + readonly copilotLicenseType: CopilotLicenseType } } } +type UserCopilotInfo = { + readonly copilotLicenseType: CopilotLicenseType + readonly copilotEndpoint: string +} + /** Response type Copilot chat completions response API */ type CopilotChatCompletionResponse = { readonly choices: ReadonlyArray<{ @@ -1992,20 +2007,22 @@ export class API { public async fetchFeatureFlags(): Promise | undefined> { try { const response = await this.ghRequest('GET', '/desktop_internal/features') - return parsedResponse>(response) + return await parsedResponse>(response) } catch (e) { log.warn(`fetchFeatureFlags: failed with endpoint ${this.endpoint}`, e) return undefined } } - public async fetchCopilotAPIEndpoint(): Promise { + public async fetchUserCopilotInfo(): Promise { const graphql = ` { viewer { copilotEndpoints { api } + + copilotLicenseType } } ` @@ -2018,9 +2035,13 @@ export class API { return undefined } - const json: CopilotEndpointsResponse = - (await response.json()) as CopilotEndpointsResponse - return json.data.viewer.copilotEndpoints.api + const json: ViewerCopilotResponse = + (await response.json()) as ViewerCopilotResponse + const { viewer } = json.data + return { + copilotEndpoint: viewer.copilotEndpoints.api, + copilotLicenseType: viewer.copilotLicenseType, + } } catch (e) { log.warn( `fetchCopilotAPIEndpoint: failed with endpoint ${this.endpoint}`, @@ -2089,7 +2110,7 @@ export async function fetchUser( try { const user = await api.fetchAccount() const emails = await api.fetchEmails() - const copilotEndpoint = await api.fetchCopilotAPIEndpoint() + const copilotInfo = await api.fetchUserCopilotInfo() const features = await api.fetchFeatureFlags() return new Account( @@ -2101,7 +2122,8 @@ export async function fetchUser( user.id, user.name || user.login, user.plan?.name, - copilotEndpoint, + copilotInfo?.copilotEndpoint, + copilotInfo?.copilotLicenseType, features ) } catch (e) { diff --git a/app/src/models/account.ts b/app/src/models/account.ts index 6b79106c7bb..dc7ee0a78d1 100644 --- a/app/src/models/account.ts +++ b/app/src/models/account.ts @@ -1,4 +1,4 @@ -import { getDotComAPIEndpoint, IAPIEmail } from '../lib/api' +import { CopilotLicenseType, getDotComAPIEndpoint, IAPIEmail } from '../lib/api' /** * Returns a value indicating whether two account instances @@ -35,6 +35,7 @@ export class Account { * @param name The friendly name associated with this account * @param plan The plan associated with this account * @param copilotEndpoint The endpoint for the Copilot API + * @param copilotLicenseType The Copilot license type * @param features The features available to this account */ public constructor( @@ -47,6 +48,7 @@ export class Account { public readonly name: string, public readonly plan?: string, public readonly copilotEndpoint?: string, + public readonly copilotLicenseType?: CopilotLicenseType, public readonly features?: ReadonlyArray ) {} @@ -61,6 +63,7 @@ export class Account { this.name, this.plan, this.copilotEndpoint, + this.copilotLicenseType, this.features ) } From bcd07f192723fc60174d0dabc15fe18beb71c0d9 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 10:33:36 +0100 Subject: [PATCH 0022/1338] Fix parsing user feature flags --- app/src/lib/api.ts | 9 ++++++++- app/src/lib/feature-flag.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 1e9b16d6f22..1aa6c8d9ca2 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -319,6 +319,10 @@ export interface ICopilotCommitDetails { readonly description: string } +interface IUserFeaturesResponse { + readonly features: ReadonlyArray +} + /** * Error thrown by `fetchUpdatedPullRequests` when receiving more results than * what the `maxResults` parameter allows for. @@ -2007,7 +2011,10 @@ export class API { public async fetchFeatureFlags(): Promise | undefined> { try { const response = await this.ghRequest('GET', '/desktop_internal/features') - return await parsedResponse>(response) + const featuresResponse = await parsedResponse( + response + ) + return featuresResponse.features } catch (e) { log.warn(`fetchFeatureFlags: failed with endpoint ${this.endpoint}`, e) return undefined diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 81e1e1142c5..c1d46a6773d 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -112,7 +112,7 @@ export const enableCommitMessageGeneration = ( return ( enableBetaFeatures() && accounts.some(a => - a.features?.includes('desktop_copilot_commit_message_generation') + (a.features ?? []).includes('desktop_copilot_commit_message_generation') ) ) } From ff3a5d4d12707bb0f5ca33024c01ac5c841be052 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 15:00:11 +0100 Subject: [PATCH 0023/1338] Use the Copilot license from _any_ account where it's available to generate commit messages --- app/src/ui/changes/commit-message.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 30e33c22fd9..5b8b2a87280 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -817,8 +817,8 @@ export class CommitMessage extends React.Component< }) } - const account = this.props.accounts.find( - account => account.endpoint === getDotComAPIEndpoint() + const account = this.props.accounts.find(account => + enableCommitMessageGeneration([account]) ) if (!account) { notGeneratingCommitDetails() From 5c633c4ca37d767f6ed16d850a91fc67022fe41c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 15:00:24 +0100 Subject: [PATCH 0024/1338] Disable Copilot button if no changes are selected --- app/src/ui/changes/commit-message.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 5b8b2a87280..3ead940ebc2 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -864,7 +864,13 @@ export class CommitMessage extends React.Component< return null } - const ariaLabel = 'Generate commit message with Copilot' + const noSelectedFiles = this.props.selectedFiles.length === 0 + + const ariaLabel = + 'Generate commit message with Copilot' + + (noSelectedFiles + ? '. Files must be selected to generate a commit message.' + : '') return ( <> @@ -876,7 +882,8 @@ export class CommitMessage extends React.Component< tooltip={ariaLabel} disabled={ this.props.isCommitting === true || - this.state.isGeneratingCommitDetails + this.state.isGeneratingCommitDetails || + noSelectedFiles } > From 092cf0701d94b8d8e41a0cfe954f27b3e0a5f809 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 16:06:30 +0100 Subject: [PATCH 0025/1338] Move generate commit message logic to the dispatcher --- app/src/lib/app-state.ts | 3 + app/src/lib/stores/app-store.ts | 64 ++++++++++++++++++- app/src/lib/stores/repository-state-cache.ts | 1 + app/src/ui/changes/changes-list.tsx | 12 ++++ app/src/ui/changes/commit-message.tsx | 67 +++++--------------- app/src/ui/changes/sidebar.tsx | 2 + app/src/ui/dispatcher/dispatcher.ts | 7 ++ app/src/ui/repository.tsx | 1 + 8 files changed, 104 insertions(+), 53 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 2d8dfa290a2..f336f235b88 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -529,6 +529,9 @@ export interface IRepositoryState { /** Is a commit in progress? */ readonly isCommitting: boolean + /** Is generating a commit message? */ + readonly isGeneratingCommitMessage: boolean + /** Commit being amended, or null if none. */ readonly commitToAmend: Commit | null diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 0a8b7a361e6..7e3d665e486 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -185,6 +185,7 @@ import { checkoutCommit, getRemoteURL, getGlobalConfigPath, + getSelectedFilesDiffText, } from '../git' import { installGlobalLFSFilters, @@ -243,7 +244,10 @@ import { } from './updates/changes-state' import { ManualConflictResolution } from '../../models/manual-conflict-resolution' import { BranchPruner } from './helpers/branch-pruner' -import { enableCustomIntegration } from '../feature-flag' +import { + enableCommitMessageGeneration, + enableCustomIntegration, +} from '../feature-flag' import { Banner, BannerType } from '../../models/banner' import { ComputedAction } from '../../models/computed-action' import { @@ -4705,6 +4709,31 @@ export class AppStore extends TypedBaseStore { } } + private async withIsGeneratingCommitMessage( + repository: Repository, + fn: () => Promise + ): Promise { + const state = this.repositoryStateCache.get(repository) + // ensure the user doesn't try and commit again + if (state.isGeneratingCommitMessage) { + return false + } + + this.repositoryStateCache.update(repository, () => ({ + isGeneratingCommitMessage: true, + })) + this.emitUpdate() + + try { + return await fn() + } finally { + this.repositoryStateCache.update(repository, () => ({ + isGeneratingCommitMessage: false, + })) + this.emitUpdate() + } + } + private async withPushPullFetch( repository: Repository, fn: () => Promise @@ -5356,6 +5385,39 @@ export class AppStore extends TypedBaseStore { return gitStore.setCommitMessage(message) } + public async _generateCommitMessage( + repository: Repository, + selectedFiles: ReadonlyArray + ): Promise { + const account = this.getState().accounts.find(account => + enableCommitMessageGeneration([account]) + ) + + if (!account) { + return false + } + + return this.withIsGeneratingCommitMessage(repository, async () => { + const diff = await getSelectedFilesDiffText(repository, selectedFiles) + if (!diff) { + return false + } + + const api = API.fromAccount(account) + const response = await api.getDiffChangesCommitDetails(diff) + if (!response) { + return false + } + + this._setCommitMessage(repository, { + summary: response.title, + description: response.description, + }) + + return true + }) + } + /** * Set the global application menu. * diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 04e37e0faaa..8330641ca04 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -355,6 +355,7 @@ function getInitialRepositoryState(): IRepositoryState { remote: null, isPushPullFetchInProgress: false, isCommitting: false, + isGeneratingCommitMessage: false, commitToAmend: null, lastFetched: null, checkoutProgress: null, diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 98973e083d3..892302dd4e0 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -170,6 +170,7 @@ interface IChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean + readonly isGeneratingCommitMessage: boolean readonly commitToAmend: Commit | null readonly currentBranchProtected: boolean readonly currentRepoRulesInfo: RepoRulesInfo @@ -766,6 +767,7 @@ export class ChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, + isGeneratingCommitMessage, commitToAmend, currentBranchProtected, currentRepoRulesInfo: currentRepoRulesInfo, @@ -832,6 +834,7 @@ export class ChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} + isGeneratingCommitMessage={isGeneratingCommitMessage} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -854,6 +857,7 @@ export class ChangesList extends React.Component< this.onConfirmCommitWithUnknownCoAuthors } onPersistCommitMessage={this.onPersistCommitMessage} + onGenerateCommitMessage={this.onGenerateCommitMessage} onCommitMessageFocusSet={this.onCommitMessageFocusSet} onRefreshAuthor={this.onRefreshAuthor} onShowPopup={this.onShowPopup} @@ -891,6 +895,14 @@ export class ChangesList extends React.Component< private onPersistCommitMessage = (message: ICommitMessage) => this.props.dispatcher.setCommitMessage(this.props.repository, message) + private onGenerateCommitMessage = ( + selectedFiles: ReadonlyArray + ) => + this.props.dispatcher.generateCommitMessage( + this.props.repository, + selectedFiles + ) + private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 3ead940ebc2..b266baab649 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -29,7 +29,7 @@ import { CommitMessageAvatar, CommitMessageAvatarWarningType, } from './commit-message-avatar' -import { API, getDotComAPIEndpoint } from '../../lib/api' +import { getDotComAPIEndpoint } from '../../lib/api' import { isAttributableEmailFor, lookupPreferredEmail } from '../../lib/email' import { setGlobalConfigValue } from '../../lib/git/config' import { Popup, PopupType } from '../../models/popup' @@ -55,7 +55,6 @@ import { RepoRulesetsForBranchLink } from '../repository-rules/repo-rulesets-for import { RepoRulesMetadataFailureList } from '../repository-rules/repo-rules-failure-list' import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' -import { getSelectedFilesDiffText } from '../../lib/git' import { WorkingDirectoryFileChange } from '../../models/status' import { enableCommitMessageGeneration } from '../../lib/feature-flag' @@ -101,6 +100,7 @@ interface ICommitMessageProps { readonly repositoryAccount: Account | null readonly autocompletionProviders: ReadonlyArray> readonly isCommitting?: boolean + readonly isGeneratingCommitMessage?: boolean readonly commitToAmend: Commit | null readonly placeholder: string readonly prepopulateCommitSummary: boolean @@ -156,6 +156,10 @@ interface ICommitMessageProps { */ readonly onPersistCommitMessage?: (message: ICommitMessage) => void + readonly onGenerateCommitMessage?: ( + selectedFiles: ReadonlyArray + ) => void + /** * Called when the component has given the commit message focus due to * `focusCommitMessage` being set. Used to reset the `focusCommitMessage` @@ -183,8 +187,6 @@ interface ICommitMessageState { readonly summary: string readonly description: string | null - readonly isGeneratingCommitDetails: boolean - readonly commitMessageAutocompletionProviders: ReadonlyArray< IAutocompletionProvider > @@ -250,7 +252,6 @@ export class CommitMessage extends React.Component< this.state = { summary: commitMessage ? commitMessage.summary : '', description: commitMessage ? commitMessage.description : null, - isGeneratingCommitDetails: false, commitMessageAutocompletionProviders: findCommitMessageAutoCompleteProvider(props.autocompletionProviders), coAuthorAutocompletionProvider: findCoAuthorAutoCompleteProvider( @@ -807,45 +808,7 @@ export class CommitMessage extends React.Component< ) => { e.preventDefault() - this.setState({ - isGeneratingCommitDetails: true, - }) - - const notGeneratingCommitDetails = () => { - this.setState({ - isGeneratingCommitDetails: false, - }) - } - - const account = this.props.accounts.find(account => - enableCommitMessageGeneration([account]) - ) - if (!account) { - notGeneratingCommitDetails() - return - } - - const diff = await getSelectedFilesDiffText( - this.props.repository, - this.props.selectedFiles - ) - if (!diff) { - notGeneratingCommitDetails() - return - } - - const api = API.fromAccount(account) - const response = await api.getDiffChangesCommitDetails(diff) - if (!response) { - notGeneratingCommitDetails() - return - } - - this.setState({ - summary: response.title, - description: response.description, - isGeneratingCommitDetails: false, - }) + this.props.onGenerateCommitMessage?.(this.props.selectedFiles) } private onCoAuthorToggleButtonClick = async ( @@ -859,7 +822,8 @@ export class CommitMessage extends React.Component< private renderCopilotButton() { if ( this.props.repository.gitHubRepository === null || - !enableCommitMessageGeneration(this.props.accounts) + !enableCommitMessageGeneration(this.props.accounts) || + this.props.onGenerateCommitMessage === undefined ) { return null } @@ -882,7 +846,7 @@ export class CommitMessage extends React.Component< tooltip={ariaLabel} disabled={ this.props.isCommitting === true || - this.state.isGeneratingCommitDetails || + this.props.isGeneratingCommitMessage || noSelectedFiles } > @@ -905,7 +869,7 @@ export class CommitMessage extends React.Component< tooltip={this.toggleCoAuthorsText} disabled={ this.props.isCommitting === true || - this.state.isGeneratingCommitDetails + this.props.isGeneratingCommitMessage } > @@ -1322,17 +1286,16 @@ export class CommitMessage extends React.Component< } private renderSubmitButton() { - const { isCommitting } = this.props - const { isGeneratingCommitDetails } = this.state + const { isCommitting, isGeneratingCommitMessage } = this.props const isSummaryBlank = isEmptyOrWhitespace(this.summaryOrPlaceholder) const buttonEnabled = (this.canCommit() || this.canAmend()) && !isCommitting && !isSummaryBlank && - !isGeneratingCommitDetails + !isGeneratingCommitMessage const loading = - isCommitting || isGeneratingCommitDetails ? : undefined - const generatingCommitDetailsMessage = isGeneratingCommitDetails + isCommitting || isGeneratingCommitMessage ? : undefined + const generatingCommitDetailsMessage = isGeneratingCommitMessage ? 'Generating commit details…' : null const tooltip = diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 34f3c23c98e..13267ac8ed9 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -56,6 +56,7 @@ interface IChangesSidebarProps { readonly issuesStore: IssuesStore readonly availableWidth: number readonly isCommitting: boolean + readonly isGeneratingCommitMessage: boolean readonly commitToAmend: Commit | null readonly isPushPullFetchInProgress: boolean // Used in receiveProps, no-unused-prop-types doesn't know that @@ -442,6 +443,7 @@ export class ChangesSidebar extends React.Component { onIgnoreFile={this.onIgnoreFile} onIgnorePattern={this.onIgnorePattern} isCommitting={this.props.isCommitting} + isGeneratingCommitMessage={this.props.isGeneratingCommitMessage} commitToAmend={this.props.commitToAmend} showCoAuthoredBy={showCoAuthoredBy} coAuthors={coAuthors} diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 9640074def0..d3b30217724 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -1071,6 +1071,13 @@ export class Dispatcher { return this.appStore._setCommitMessage(repository, message) } + public generateCommitMessage( + repository: Repository, + selectedFiles: ReadonlyArray + ) { + return this.appStore._generateCommitMessage(repository, selectedFiles) + } + /** Remove the given account from the app. */ public removeAccount(account: Account): Promise { return this.appStore._removeAccount(account) diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 76e3b72c2bf..69b26e576a9 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -247,6 +247,7 @@ export class RepositoryView extends React.Component< availableWidth={availableWidth} gitHubUserStore={this.props.gitHubUserStore} isCommitting={this.props.state.isCommitting} + isGeneratingCommitMessage={this.props.state.isGeneratingCommitMessage} commitToAmend={this.props.state.commitToAmend} isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress} focusCommitMessage={this.props.focusCommitMessage} From f3120f04c0f26ef22587ab0ff2bff97df34164c7 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 16:09:18 +0100 Subject: [PATCH 0026/1338] Disable textboxes while generating commit messages --- app/src/ui/changes/commit-message.tsx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index b266baab649..c0a81f03692 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -935,8 +935,10 @@ export class CommitMessage extends React.Component< return null } + const { isCommitting, isGeneratingCommitMessage } = this.props + const className = classNames('action-bar', { - disabled: this.props.isCommitting === true, + disabled: isCommitting === true || isGeneratingCommitMessage === true, }) return ( @@ -1414,7 +1416,12 @@ export class CommitMessage extends React.Component< ? this.COMMIT_MSG_ERROR_BTN_ID : undefined - const { placeholder, isCommitting, commitSpellcheckEnabled } = this.props + const { + placeholder, + isCommitting, + isGeneratingCommitMessage, + commitSpellcheckEnabled, + } = this.props return ( // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions @@ -1442,7 +1449,9 @@ export class CommitMessage extends React.Component< } aria-describedby={ariaDescribedBy} onContextMenu={this.onAutocompletingInputContextMenu} - readOnly={isCommitting === true} + readOnly={ + isCommitting === true || isGeneratingCommitMessage === true + } spellcheck={commitSpellcheckEnabled} /> {showRepoRuleCommitMessageFailureHint && @@ -1477,7 +1486,9 @@ export class CommitMessage extends React.Component< ref={this.onDescriptionFieldRef} onElementRef={this.onDescriptionTextAreaRef} onContextMenu={this.onAutocompletingInputContextMenu} - readOnly={isCommitting === true} + readOnly={ + isCommitting === true || isGeneratingCommitMessage === true + } spellcheck={commitSpellcheckEnabled} /> {this.renderActionBar()} From 3049df588bfd63a0166f10efffe6860bb7bdeb73 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 16:30:32 +0100 Subject: [PATCH 0027/1338] Add warning when trying to generate a commit message would override an existing one --- app/src/lib/stores/app-store.ts | 16 ++++- app/src/models/popup.ts | 6 ++ app/src/ui/app.tsx | 12 ++++ app/src/ui/dispatcher/dispatcher.ts | 9 ++- .../GenerateCommitMessageOverrideWarning.tsx | 59 +++++++++++++++++++ 5 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 7e3d665e486..5765b3260ee 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5387,7 +5387,8 @@ export class AppStore extends TypedBaseStore { public async _generateCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + selectedFiles: ReadonlyArray, + skipOverrideWarning: boolean ): Promise { const account = this.getState().accounts.find(account => enableCommitMessageGeneration([account]) @@ -5397,6 +5398,19 @@ export class AppStore extends TypedBaseStore { return false } + if (!skipOverrideWarning) { + const { commitMessage } = this.gitStoreCache.get(repository) + if (commitMessage.summary || commitMessage.description) { + await this._showPopup({ + type: PopupType.GenerateCommitMessageOverrideWarning, + repository, + selectedFiles, + }) + + return false + } + } + return this.withIsGeneratingCommitMessage(repository, async () => { const diff = await getSelectedFilesDiffText(repository, selectedFiles) if (!diff) { diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 90adb6d6c36..38b7efcf257 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -97,6 +97,7 @@ export enum PopupType { TestIcons = 'TestIcons', ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges', MarkdownMessage = 'MarkdownMessage', + GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', } interface IBasePopup { @@ -435,5 +436,10 @@ export type PopupDetail = title: string markdownBody: string } + | { + type: PopupType.GenerateCommitMessageOverrideWarning + repository: Repository + selectedFiles: ReadonlyArray + } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 3fbe484531f..fb41475927e 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -182,6 +182,7 @@ import { webUtils } from 'electron' import { showTestUI } from './lib/test-ui-components/test-ui-components' import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog' import { MarkdownMessageDialog } from './markdown-message/markdown-message' +import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/GenerateCommitMessageOverrideWarning' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2495,6 +2496,17 @@ export class App extends React.Component { /> ) } + case PopupType.GenerateCommitMessageOverrideWarning: { + return ( + + ) + } default: return assertNever(popup, `Unknown popup type: ${popup}`) } diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index d3b30217724..58489e4d07e 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -1073,9 +1073,14 @@ export class Dispatcher { public generateCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + selectedFiles: ReadonlyArray, + skipOverrideWarning: boolean = false ) { - return this.appStore._generateCommitMessage(repository, selectedFiles) + return this.appStore._generateCommitMessage( + repository, + selectedFiles, + skipOverrideWarning + ) } /** Remove the given account from the app. */ diff --git a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx new file mode 100644 index 00000000000..3195cf00e47 --- /dev/null +++ b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx @@ -0,0 +1,59 @@ +import * as React from 'react' +import { + Dialog, + DialogContent, + DialogFooter, + OkCancelButtonGroup, +} from '../dialog' +import { Dispatcher } from '../dispatcher' +import { Repository } from '../../models/repository' +import { WorkingDirectoryFileChange } from '../../models/status' + +interface IGenerateCommitMessageOverrideWarningProps { + readonly dispatcher: Dispatcher + readonly repository: Repository + readonly selectedFiles: ReadonlyArray + + /** + * Callback to use when the dialog gets closed. + */ + readonly onDismissed: () => void +} + +export class GenerateCommitMessageOverrideWarning extends React.Component { + public constructor(props: IGenerateCommitMessageOverrideWarningProps) { + super(props) + } + + public render() { + return ( + + +

+ The commit message you have entered will be overridden by the + generated commit message. +

+ + + + + + ) + } + + private onOverride = async () => { + this.props.dispatcher.generateCommitMessage( + this.props.repository, + this.props.selectedFiles, + true + ) + this.props.onDismissed() + } +} From 7670b1424b208bb95e0720d851baf0ecf9e9d98b Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 16:56:03 +0100 Subject: [PATCH 0028/1338] Use a timestamp to decide when commit messages should be overridden --- app/src/lib/stores/app-store.ts | 1 + app/src/lib/stores/git-store.ts | 4 ++ app/src/models/commit-message.ts | 6 ++ app/src/ui/changes/commit-message.tsx | 71 +++++++++++--------- app/src/ui/history/compare.tsx | 1 + app/test/unit/repository-state-cache-test.ts | 1 + 6 files changed, 53 insertions(+), 31 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 5765b3260ee..d681d44e498 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5426,6 +5426,7 @@ export class AppStore extends TypedBaseStore { this._setCommitMessage(repository, { summary: response.title, description: response.description, + timestamp: Date.now(), }) return true diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 2ad88655838..1d8668ab853 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -713,6 +713,7 @@ export class GitStore extends BaseStore { this._commitMessage = { summary: commit.summary, description: commit.body, + timestamp: Date.now(), } this.emitUpdate() } @@ -726,6 +727,7 @@ export class GitStore extends BaseStore { this._commitMessage = { summary: commit.summary, description: commit.body, + timestamp: Date.now(), } this.emitUpdate() } @@ -778,6 +780,7 @@ export class GitStore extends BaseStore { this._commitMessage = { summary: commit.summary, description: commit.body, + timestamp: Date.now(), } return @@ -855,6 +858,7 @@ export class GitStore extends BaseStore { this._commitMessage = { summary: commit.summary, description: newBody, + timestamp: Date.now(), } const extractedAuthors = extractedTrailers.map(t => diff --git a/app/src/models/commit-message.ts b/app/src/models/commit-message.ts index 90f0bcbaaeb..9c747acfa0a 100644 --- a/app/src/models/commit-message.ts +++ b/app/src/models/commit-message.ts @@ -2,9 +2,15 @@ export interface ICommitMessage { readonly summary: string readonly description: string | null + /** + * Timestamp when the message was created. Used to compare and update the UI + * with the newest commit message. + */ + readonly timestamp: number } export const DefaultCommitMessage: ICommitMessage = { summary: '', description: '', + timestamp: 0, } diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index c0a81f03692..f9f8fd61e01 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -7,7 +7,10 @@ import { CoAuthorAutocompletionProvider, } from '../autocompletion' import { CommitIdentity } from '../../models/commit-identity' -import { ICommitMessage } from '../../models/commit-message' +import { + DefaultCommitMessage, + ICommitMessage, +} from '../../models/commit-message' import { Repository } from '../../models/repository' import { Button } from '../lib/button' import { Loading } from '../lib/loading' @@ -37,7 +40,6 @@ import { RepositorySettingsTab } from '../repository-settings/repository-setting import { IdealSummaryLength } from '../../lib/wrap-rich-text-commit-message' import { isEmptyOrWhitespace } from '../../lib/is-empty-or-whitespace' import { TooltipDirection } from '../lib/tooltip' -import { pick } from '../../lib/pick' import { ToggledtippedContent } from '../lib/toggletipped-content' import { PreferencesTab } from '../../models/preferences' import { @@ -184,8 +186,7 @@ interface ICommitMessageProps { } interface ICommitMessageState { - readonly summary: string - readonly description: string | null + readonly commitMessage: ICommitMessage readonly commitMessageAutocompletionProviders: ReadonlyArray< IAutocompletionProvider @@ -250,8 +251,7 @@ export class CommitMessage extends React.Component< const { commitMessage } = this.props this.state = { - summary: commitMessage ? commitMessage.summary : '', - description: commitMessage ? commitMessage.description : null, + commitMessage: commitMessage ?? DefaultCommitMessage, commitMessageAutocompletionProviders: findCommitMessageAutoCompleteProvider(props.autocompletionProviders), coAuthorAutocompletionProvider: findCoAuthorAutoCompleteProvider( @@ -270,7 +270,7 @@ export class CommitMessage extends React.Component< // Persist our current commit message if the caller wants to public componentWillUnmount() { const { props, state } = this - props.onPersistCommitMessage?.(pick(state, 'summary', 'description')) + props.onPersistCommitMessage?.(state.commitMessage) window.removeEventListener('keydown', this.onKeyDown) } @@ -295,14 +295,8 @@ export class CommitMessage extends React.Component< return } - if ( - (this.state.summary === '' && !this.state.description) || - (this.props.commitToAmend === null && nextProps.commitToAmend) - ) { - this.setState({ - summary: commitMessage.summary, - description: commitMessage.description, - }) + if (commitMessage.timestamp > this.state.commitMessage.timestamp) { + this.setState({ commitMessage }) } } @@ -399,22 +393,23 @@ export class CommitMessage extends React.Component< ) { if ( forceUpdate || - prevState?.summary !== this.state.summary || - prevState?.description !== this.state.description || + prevState?.commitMessage.summary !== this.state.commitMessage.summary || + prevState?.commitMessage.description !== + this.state.commitMessage.description || prevProps?.coAuthors !== this.props.coAuthors || prevProps?.commitToAmend !== this.props.commitToAmend || prevProps?.repository !== this.props.repository || prevProps?.repoRulesInfo.commitMessagePatterns !== this.props.repoRulesInfo.commitMessagePatterns ) { - let summary = this.state.summary - if (!summary && !this.state.description) { + let summary = this.state.commitMessage.summary + if (!summary && !this.state.commitMessage.description) { summary = this.summaryOrPlaceholder } const context: ICommitContext = { summary, - description: this.state.description, + description: this.state.commitMessage.description, trailers: this.getCoAuthorTrailers(), amend: this.props.commitToAmend !== null, } @@ -478,7 +473,7 @@ export class CommitMessage extends React.Component< } private clearCommitMessage() { - this.setState({ summary: '', description: null }) + this.setState({ commitMessage: DefaultCommitMessage }) } private focusSummary() { @@ -489,11 +484,23 @@ export class CommitMessage extends React.Component< } private onSummaryChanged = (summary: string) => { - this.setState({ summary }) + this.setState({ + commitMessage: { + ...this.state.commitMessage, + summary, + timestamp: Date.now(), + }, + }) } private onDescriptionChanged = (description: string) => { - this.setState({ description }) + this.setState({ + commitMessage: { + ...this.state.commitMessage, + description, + timestamp: Date.now(), + }, + }) } private onSubmit = () => { @@ -511,13 +518,14 @@ export class CommitMessage extends React.Component< } private get summaryOrPlaceholder() { - return this.props.prepopulateCommitSummary && !this.state.summary + return this.props.prepopulateCommitSummary && + !this.state.commitMessage.summary ? this.props.placeholder - : this.state.summary + : this.state.commitMessage.summary } private async createCommit(options?: ICreateCommitOptions) { - const { description } = this.state + const { description } = this.state.commitMessage if (!this.canCommit() && !this.canAmend()) { return @@ -575,7 +583,7 @@ export class CommitMessage extends React.Component< private canCommit(): boolean { return ( ((this.props.anyFilesSelected === true && - this.state.summary.length > 0) || + this.state.commitMessage.summary.length > 0) || this.props.prepopulateCommitSummary) && !this.hasRepoRuleFailure() ) @@ -584,7 +592,8 @@ export class CommitMessage extends React.Component< private canAmend(): boolean { return ( this.props.commitToAmend !== null && - (this.state.summary.length > 0 || this.props.prepopulateCommitSummary) && + (this.state.commitMessage.summary.length > 0 || + this.props.prepopulateCommitSummary) && !this.hasRepoRuleFailure() ) } @@ -1402,7 +1411,7 @@ export class CommitMessage extends React.Component< const showSummaryLengthHint = this.props.showCommitLengthWarning && !showRepoRuleCommitMessageFailureHint && - this.state.summary.length > IdealSummaryLength + this.state.commitMessage.summary.length > IdealSummaryLength const summaryClassName = classNames('summary', { 'with-trailing-icon': @@ -1441,7 +1450,7 @@ export class CommitMessage extends React.Component< screenReaderLabel="Commit summary" className={summaryInputClassName} placeholder={placeholder} - value={this.state.summary} + value={this.state.commitMessage.summary} onValueChanged={this.onSummaryChanged} onElementRef={this.onSummaryInputRef} autocompletionProviders={ @@ -1477,7 +1486,7 @@ export class CommitMessage extends React.Component< : undefined } placeholder="Description" - value={this.state.description || ''} + value={this.state.commitMessage.description || ''} onValueChanged={this.onDescriptionChanged} autocompletionProviders={ this.state.commitMessageAutocompletionProviders diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx index 4f7c545cd7c..196e10429b3 100644 --- a/app/src/ui/history/compare.tsx +++ b/app/src/ui/history/compare.tsx @@ -703,6 +703,7 @@ export class CompareSidebar extends React.Component< commitMessage: { summary: squashOnto.summary, description: squashedDescription, + timestamp: Date.now(), }, dialogTitle: `Squash ${allCommitsInSquash.length} Commits`, dialogButtonText: `Squash ${allCommitsInSquash.length} Commits`, diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index 62b58750d49..5ab06f5d1ae 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -89,6 +89,7 @@ describe('RepositoryStateCache', () => { commitMessage: { summary, description: null, + timestamp: Date.now(), }, showCoAuthoredBy: true, } From 93ca0c8db449ea9563c83ea1871137a553f5c38a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 14 Jan 2025 18:05:09 +0100 Subject: [PATCH 0029/1338] Check for need to override commit message from the commit message component --- app/src/lib/stores/app-store.ts | 27 +++++++++---------- app/src/ui/changes/changes-list.tsx | 16 +++++++---- app/src/ui/changes/commit-message.tsx | 9 +++++-- app/src/ui/dispatcher/dispatcher.ts | 17 +++++++----- .../GenerateCommitMessageOverrideWarning.tsx | 3 +-- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index d681d44e498..84e6e322f17 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5385,10 +5385,20 @@ export class AppStore extends TypedBaseStore { return gitStore.setCommitMessage(message) } + public async _promptOverrideWithGeneratedCommitMessage( + repository: Repository, + selectedFiles: ReadonlyArray + ): Promise { + return this._showPopup({ + type: PopupType.GenerateCommitMessageOverrideWarning, + repository, + selectedFiles, + }) + } + public async _generateCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray, - skipOverrideWarning: boolean + selectedFiles: ReadonlyArray ): Promise { const account = this.getState().accounts.find(account => enableCommitMessageGeneration([account]) @@ -5398,19 +5408,6 @@ export class AppStore extends TypedBaseStore { return false } - if (!skipOverrideWarning) { - const { commitMessage } = this.gitStoreCache.get(repository) - if (commitMessage.summary || commitMessage.description) { - await this._showPopup({ - type: PopupType.GenerateCommitMessageOverrideWarning, - repository, - selectedFiles, - }) - - return false - } - } - return this.withIsGeneratingCommitMessage(repository, async () => { const diff = await getSelectedFilesDiffText(repository, selectedFiles) if (!diff) { diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 892302dd4e0..c1ee8ea4ad5 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -896,12 +896,18 @@ export class ChangesList extends React.Component< this.props.dispatcher.setCommitMessage(this.props.repository, message) private onGenerateCommitMessage = ( - selectedFiles: ReadonlyArray + selectedFiles: ReadonlyArray, + mustOverrideExistingMessage: boolean ) => - this.props.dispatcher.generateCommitMessage( - this.props.repository, - selectedFiles - ) + mustOverrideExistingMessage + ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( + this.props.repository, + selectedFiles + ) + : this.props.dispatcher.generateCommitMessage( + this.props.repository, + selectedFiles + ) private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index f9f8fd61e01..ef36af4e459 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -159,7 +159,8 @@ interface ICommitMessageProps { readonly onPersistCommitMessage?: (message: ICommitMessage) => void readonly onGenerateCommitMessage?: ( - selectedFiles: ReadonlyArray + selectedFiles: ReadonlyArray, + mustOverrideExistingMessage: boolean ) => void /** @@ -816,8 +817,12 @@ export class CommitMessage extends React.Component< e: React.MouseEvent ) => { e.preventDefault() + const { commitMessage } = this.state - this.props.onGenerateCommitMessage?.(this.props.selectedFiles) + this.props.onGenerateCommitMessage?.( + this.props.selectedFiles, + !!commitMessage.summary || !!commitMessage.description + ) } private onCoAuthorToggleButtonClick = async ( diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 58489e4d07e..7a8358e3343 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -1071,18 +1071,23 @@ export class Dispatcher { return this.appStore._setCommitMessage(repository, message) } - public generateCommitMessage( + public promptOverrideWithGeneratedCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray, - skipOverrideWarning: boolean = false + selectedFiles: ReadonlyArray ) { - return this.appStore._generateCommitMessage( + return this.appStore._promptOverrideWithGeneratedCommitMessage( repository, - selectedFiles, - skipOverrideWarning + selectedFiles ) } + public generateCommitMessage( + repository: Repository, + selectedFiles: ReadonlyArray + ) { + return this.appStore._generateCommitMessage(repository, selectedFiles) + } + /** Remove the given account from the app. */ public removeAccount(account: Account): Promise { return this.appStore._removeAccount(account) diff --git a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx index 3195cf00e47..c5ce6f9296f 100644 --- a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx +++ b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx @@ -51,8 +51,7 @@ export class GenerateCommitMessageOverrideWarning extends React.Component { this.props.dispatcher.generateCommitMessage( this.props.repository, - this.props.selectedFiles, - true + this.props.selectedFiles ) this.props.onDismissed() } From b25594a811ec3b0269db8102caa233982a9e05cc Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 11:53:02 +0100 Subject: [PATCH 0030/1338] Fix usage of `CommitMessage` in `FilterChangesList` --- app/src/ui/changes/filter-changes-list.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 8ec3fc42d91..71b3923ea5d 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -931,6 +931,7 @@ export class FilterChangesList extends React.Component< showPromptForCommittingFileHiddenByFilter } anyFilesAvailable={fileCount > 0} + selectedFiles={filesSelected} filesToBeCommittedCount={filesSelected.length} repository={repository} repositoryAccount={repositoryAccount} From 89f23cc787406b9807f889a9e445f77ec7c6e806 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 12:14:29 +0100 Subject: [PATCH 0031/1338] Remove unnecessary dependency --- app/package.json | 1 - app/yarn.lock | 282 ----------------------------------------------- 2 files changed, 283 deletions(-) diff --git a/app/package.json b/app/package.json index 0662f39baa4..36c664d02b7 100644 --- a/app/package.json +++ b/app/package.json @@ -46,7 +46,6 @@ "memoize-one": "^4.0.3", "minimist": "^1.2.8", "mri": "^1.1.0", - "openai": "^4.58.2", "p-limit": "^2.2.0", "p-memoize": "^7.1.1", "primer-support": "^4.0.0", diff --git a/app/yarn.lock b/app/yarn.lock index 82ed5418ce3..84850ea8f84 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -67,47 +67,6 @@ resolved "https://registry.yarnpkg.com/@github/stable-socket/-/stable-socket-1.1.0.tgz#b8598c02df1a935fb0c970252f0b0062f4bdaa29" integrity sha512-kzLHnrWGvmXka7AIUnsyF+SO5dP4dxEXX2sMixXW5ngRf3i4RhvXzFNgXVy4qBKsIsg6V3fNb3NOto0z6o4XAw== -"@types/node-fetch@^2.6.4": - version "2.6.11" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" - integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== - dependencies: - "@types/node" "*" - form-data "^4.0.0" - -"@types/node@*": - version "22.5.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8" - integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg== - dependencies: - undici-types "~6.19.2" - -"@types/node@^18.11.18": - version "18.19.50" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.50.tgz#8652b34ee7c0e7e2004b3f08192281808d41bf5a" - integrity sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg== - dependencies: - undici-types "~5.26.4" - -"@types/qs@^6.9.15": - version "6.9.15" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" - integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg== - -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - -agentkeepalive@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" - integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== - dependencies: - humanize-ms "^1.2.1" - ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -155,11 +114,6 @@ async@^3.2.3: resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - b4a@^1.6.4: version "1.6.7" resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4" @@ -203,17 +157,6 @@ byline@^5.0.0: resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= -call-bind@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - set-function-length "^1.2.1" - chain-function@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc" @@ -311,13 +254,6 @@ colorspace@1.1.x: color "^3.1.3" text-hex "1.0.x" -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - compare-versions@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" @@ -383,20 +319,6 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -define-data-property@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" - integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - gopd "^1.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -498,18 +420,6 @@ end-of-stream@^1.4.1: dependencies: once "^1.4.0" -es-define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" - integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== - dependencies: - get-intrinsic "^1.2.4" - -es-errors@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" - integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -520,11 +430,6 @@ event-kit@^2.0.0: resolved "https://registry.yarnpkg.com/event-kit/-/event-kit-2.4.0.tgz#718aaf22df76670024ad66922483e1bba0544f33" integrity sha512-ZXd9jxUoc/f/zdLdR3OUcCzT84WnpaNWefquLyE125akIC90sDs8S3T/qihliuVsaj7Osc0z8lLL2fjooE9Z4A== -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -572,28 +477,6 @@ focus-trap@^6.1.0: dependencies: tabbable "^5.1.0" -form-data-encoder@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040" - integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A== - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -formdata-node@^4.3.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz#23f6a5cb9cb55315912cbec4ff7b0f59bbd191e2" - integrity sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ== - dependencies: - node-domexception "1.0.0" - web-streams-polyfill "4.0.0-beta.3" - fs-admin@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/fs-admin/-/fs-admin-0.19.0.tgz#c2b077b21607ca1982bf9bc8c3fc096be7a1186e" @@ -612,11 +495,6 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - fuzzaldrin-plus@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/fuzzaldrin-plus/-/fuzzaldrin-plus-0.6.0.tgz#832f6489fbe876769459599c914a670ec22947ee" @@ -636,17 +514,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== - dependencies: - es-errors "^1.3.0" - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -671,13 +538,6 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -688,47 +548,16 @@ has-flag@^2.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= -has-property-descriptors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" - integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== - dependencies: - es-define-property "^1.0.0" - -has-proto@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" - integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= -hasown@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== - dependencies: - function-bind "^1.1.2" - html-entities@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" @@ -899,18 +728,6 @@ memoize-one@^4.0.3: resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.0.3.tgz#cdfdd942853f1a1b4c71c5336b8c49da0bf0273c" integrity sha512-QmpUu4KqDmX0plH4u+tf0riMc1KHE1+lw95cMrLlXQAFOx/xnBtwhZ52XJxd9X2O6kwKBqX32kmhbhlobD0cuw== -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - mimic-fn@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -965,11 +782,6 @@ mri@^1.1.0: resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.0.tgz#5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a" integrity sha1-XAo/KcjM/7ux7JQdzsCdcfoy82o= -ms@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -1019,18 +831,6 @@ node-addon-api@^7.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== -node-domexception@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" @@ -1063,11 +863,6 @@ object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-inspect@^1.13.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" - integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== - once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -1082,21 +877,6 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" -openai@^4.58.2: - version "4.58.2" - resolved "https://registry.yarnpkg.com/openai/-/openai-4.58.2.tgz#e45a41fe91eb626b8f07afb522c27016f58aab58" - integrity sha512-hIalypYELt7/PcryFpz4Gi1z/8ZDzukWyOhr+jKM6L/GVE+t4NseaENXKt+OxnkkIm/1R2EkdGxgnHrZ0kB5bQ== - dependencies: - "@types/node" "^18.11.18" - "@types/node-fetch" "^2.6.4" - "@types/qs" "^6.9.15" - abort-controller "^3.0.0" - agentkeepalive "^4.2.1" - form-data-encoder "1.7.2" - formdata-node "^4.3.2" - node-fetch "^2.6.7" - qs "^6.10.3" - os-tmpdir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -1263,13 +1043,6 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -qs@^6.10.3: - version "6.13.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" - integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== - dependencies: - side-channel "^1.0.6" - querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -1471,18 +1244,6 @@ set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-function-length@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" - integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== - dependencies: - define-data-property "^1.1.4" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - gopd "^1.0.1" - has-property-descriptors "^1.0.2" - setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -1500,16 +1261,6 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= -side-channel@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" - integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - get-intrinsic "^1.2.4" - object-inspect "^1.13.1" - signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -1703,11 +1454,6 @@ textarea-caret@^3.0.2: resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf" integrity sha1-82DEhpmqGr9xhoCkOjGoUGZcLK8= -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -1740,16 +1486,6 @@ type-fest@^3.0.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - -undici-types@~6.19.2: - version "6.19.8" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" - integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== - untildify@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1" @@ -1786,16 +1522,6 @@ warning@^3.0.0: dependencies: loose-envify "^1.0.0" -web-streams-polyfill@4.0.0-beta.3: - version "4.0.0-beta.3" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz#2898486b74f5156095e473efe989dcf185047a38" - integrity sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug== - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - webpack-hot-middleware@^2.10.0: version "2.19.1" resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" @@ -1806,14 +1532,6 @@ webpack-hot-middleware@^2.10.0: querystring "^0.2.0" strip-ansi "^3.0.0" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - which-pm-runs@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" From b07a7d0a23d063890007dcc6bad4399dfb3d4be3 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 13:26:23 +0100 Subject: [PATCH 0032/1338] Improve API documentation --- app/src/lib/api.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 1aa6c8d9ca2..61ceb8555cf 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -61,6 +61,7 @@ type ViewerCopilotResponse = { } } +/** Copilot-related info relevant to Desktop */ type UserCopilotInfo = { readonly copilotLicenseType: CopilotLicenseType readonly copilotEndpoint: string @@ -2008,6 +2009,11 @@ export class API { } } + /** + * Fetches the Desktop-specific features that are enabled for the user. + * + * @returns An array of strings with the feature flags enabled for the user. + */ public async fetchFeatureFlags(): Promise | undefined> { try { const response = await this.ghRequest('GET', '/desktop_internal/features') @@ -2021,6 +2027,11 @@ export class API { } } + /** + * Fetches the Copilot info related to the user (license and API endpoint). + * + * @returns Copilot license and API endpoint. + */ public async fetchUserCopilotInfo(): Promise { const graphql = ` { @@ -2058,6 +2069,13 @@ export class API { } } + /** + * Leverages Copilot to generate the commit details (title and description) + * for a given diff. + * + * @param diff Diff of changes to be committed, in git format + * @returns Commit details (title and description) generated by Copilot + */ public async getDiffChangesCommitDetails( diff: string ): Promise { From 4e6b2b8503ca108bdc660272f4d6564317d1ffaf Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 13:29:18 +0100 Subject: [PATCH 0033/1338] Improve naming --- app/src/lib/api.ts | 8 +++++--- app/src/lib/stores/app-store.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 61ceb8555cf..8fbf0244fda 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -315,11 +315,13 @@ export interface IAPIMentionableUser { readonly name: string | null } -export interface ICopilotCommitDetails { +/** Represents the commit details (title and description) generated by Copilot */ +interface ICopilotCommitMessage { readonly title: string readonly description: string } +/** The response we get from the desktop_internal/features endpoint. */ interface IUserFeaturesResponse { readonly features: ReadonlyArray } @@ -2076,9 +2078,9 @@ export class API { * @param diff Diff of changes to be committed, in git format * @returns Commit details (title and description) generated by Copilot */ - public async getDiffChangesCommitDetails( + public async getDiffChangesCommitMessage( diff: string - ): Promise { + ): Promise { try { const response = await this.copilotRequest( '/agents/github-desktop-commit-message-generation', diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 84e6e322f17..0a575d11613 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5415,7 +5415,7 @@ export class AppStore extends TypedBaseStore { } const api = API.fromAccount(account) - const response = await api.getDiffChangesCommitDetails(diff) + const response = await api.getDiffChangesCommitMessage(diff) if (!response) { return false } From 0cd6b13d2ca4fd00e1b7de2ec719e7c5030d9aa4 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:09:05 +0100 Subject: [PATCH 0034/1338] Rename `getSelectedFilesDiffText` to `getFilesDiffText` --- app/src/lib/git/diff.ts | 19 +++++++++---------- app/src/lib/stores/app-store.ts | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 7670e623a0c..d4902ca9e81 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -398,11 +398,12 @@ export async function getWorkingDirectoryDiff( } /** - * Render the diff for a file within the repository working directory. The file will be - * compared against HEAD if it's tracked, if not it'll be compared to an empty file meaning - * that all content in the file will be treated as additions. + * Render the diff for a list of files within the repository working directory. + * The files will be compared against HEAD if it's tracked, if not it'll be + * compared to an empty file meaning that all content in the file will be + * treated as additions. */ -export async function getSelectedFilesDiffText( +export async function getFilesDiffText( repository: Repository, files: ReadonlyArray ): Promise { @@ -424,12 +425,10 @@ export async function getSelectedFilesDiffText( ] const successExitCodes = new Set([0]) - const { stdout } = await git( - args, - repository.path, - 'getSelectedFilesDiffText', - { successExitCodes, encoding: 'buffer' } - ) + const { stdout } = await git(args, repository.path, 'getFilesDiffText', { + successExitCodes, + encoding: 'buffer', + }) await unstageAll(repository) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 0a575d11613..a9576005054 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -185,7 +185,7 @@ import { checkoutCommit, getRemoteURL, getGlobalConfigPath, - getSelectedFilesDiffText, + getFilesDiffText, } from '../git' import { installGlobalLFSFilters, @@ -5409,7 +5409,7 @@ export class AppStore extends TypedBaseStore { } return this.withIsGeneratingCommitMessage(repository, async () => { - const diff = await getSelectedFilesDiffText(repository, selectedFiles) + const diff = await getFilesDiffText(repository, selectedFiles) if (!diff) { return false } From 5b18e8e5a7028ddf8e48b8d85cd10191a45fc93e Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:12:42 +0100 Subject: [PATCH 0035/1338] Improve documentation --- app/src/models/account.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/models/account.ts b/app/src/models/account.ts index dc7ee0a78d1..afad4e82777 100644 --- a/app/src/models/account.ts +++ b/app/src/models/account.ts @@ -36,7 +36,7 @@ export class Account { * @param plan The plan associated with this account * @param copilotEndpoint The endpoint for the Copilot API * @param copilotLicenseType The Copilot license type - * @param features The features available to this account + * @param features The Desktop-specific features available to this account */ public constructor( public readonly login: string, From bea3280d2c138c7ddd65e2c89e7155c2aaf4a7bb Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:13:22 +0100 Subject: [PATCH 0036/1338] Selected files files Selected --- app/src/ui/changes/changes-list.tsx | 8 ++++---- app/src/ui/changes/commit-message.tsx | 10 +++++----- app/src/ui/changes/filter-changes-list.tsx | 2 +- app/src/ui/commit-message/commit-message-dialog.tsx | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index c1ee8ea4ad5..66a65eade75 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -800,7 +800,7 @@ export class ChangesList extends React.Component< const anyFilesSelected = fileCount > 0 && includeAllValue !== CheckboxValue.Off - const selectedFiles = workingDirectory.files.filter( + const filesSelected = workingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ) @@ -809,7 +809,7 @@ export class ChangesList extends React.Component< // However, for onboarding tutorial repositories, we don't want to do this. // See https://github.com/desktop/desktop/issues/8354 const prepopulateCommitSummary = - selectedFiles.length === 1 && !repository.isTutorialRepository + filesSelected.length === 1 && !repository.isTutorialRepository // if this is not a github repo, we don't want to // restrict what the user can do at all @@ -827,7 +827,7 @@ export class ChangesList extends React.Component< isShowingFoldout={this.props.isShowingFoldout} anyFilesSelected={anyFilesSelected} anyFilesAvailable={fileCount > 0} - selectedFiles={selectedFiles} + filesSelected={filesSelected} repository={repository} repositoryAccount={repositoryAccount} commitMessage={this.props.commitMessage} @@ -839,7 +839,7 @@ export class ChangesList extends React.Component< showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} placeholder={this.getPlaceholderMessage( - selectedFiles, + filesSelected, prepopulateCommitSummary )} prepopulateCommitSummary={prepopulateCommitSummary} diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index ef36af4e459..b2d61bad348 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -95,7 +95,7 @@ interface ICommitMessageProps { * when commit button is disabled */ readonly anyFilesAvailable: boolean - readonly selectedFiles: ReadonlyArray + readonly filesSelected: ReadonlyArray readonly focusCommitMessage: boolean readonly commitMessage: ICommitMessage | null readonly repository: Repository @@ -820,7 +820,7 @@ export class CommitMessage extends React.Component< const { commitMessage } = this.state this.props.onGenerateCommitMessage?.( - this.props.selectedFiles, + this.props.filesSelected, !!commitMessage.summary || !!commitMessage.description ) } @@ -842,11 +842,11 @@ export class CommitMessage extends React.Component< return null } - const noSelectedFiles = this.props.selectedFiles.length === 0 + const noFilesSelected = this.props.filesSelected.length === 0 const ariaLabel = 'Generate commit message with Copilot' + - (noSelectedFiles + (noFilesSelected ? '. Files must be selected to generate a commit message.' : '') @@ -861,7 +861,7 @@ export class CommitMessage extends React.Component< disabled={ this.props.isCommitting === true || this.props.isGeneratingCommitMessage || - noSelectedFiles + noFilesSelected } > diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 71b3923ea5d..f4f766bec7d 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -931,7 +931,7 @@ export class FilterChangesList extends React.Component< showPromptForCommittingFileHiddenByFilter } anyFilesAvailable={fileCount > 0} - selectedFiles={filesSelected} + filesSelected={filesSelected} filesToBeCommittedCount={filesSelected.length} repository={repository} repositoryAccount={repositoryAccount} diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 9069aeeda45..245161402ec 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -152,7 +152,7 @@ export class CommitMessageDialog extends React.Component< onCreateCommit={this.props.onSubmitCommitMessage} anyFilesAvailable={true} anyFilesSelected={true} - selectedFiles={[]} + filesSelected={[]} onCommitMessageFocusSet={noop} onRefreshAuthor={this.onRefreshAuthor} onShowPopup={this.onShowPopup} From 916710a5c4dd9ff5d70f621182cf0649c5025f09 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:15:38 +0100 Subject: [PATCH 0037/1338] More filesSelected --- app/src/lib/stores/app-store.ts | 8 ++++---- app/src/models/popup.ts | 2 +- app/src/ui/app.tsx | 2 +- app/src/ui/changes/changes-list.tsx | 6 +++--- app/src/ui/dispatcher/dispatcher.ts | 8 ++++---- .../GenerateCommitMessageOverrideWarning.tsx | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index a9576005054..efe26ac5bcb 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5387,18 +5387,18 @@ export class AppStore extends TypedBaseStore { public async _promptOverrideWithGeneratedCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + filesSelected: ReadonlyArray ): Promise { return this._showPopup({ type: PopupType.GenerateCommitMessageOverrideWarning, repository, - selectedFiles, + filesSelected, }) } public async _generateCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + filesSelected: ReadonlyArray ): Promise { const account = this.getState().accounts.find(account => enableCommitMessageGeneration([account]) @@ -5409,7 +5409,7 @@ export class AppStore extends TypedBaseStore { } return this.withIsGeneratingCommitMessage(repository, async () => { - const diff = await getFilesDiffText(repository, selectedFiles) + const diff = await getFilesDiffText(repository, filesSelected) if (!diff) { return false } diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 38b7efcf257..db83eff6f1f 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -439,7 +439,7 @@ export type PopupDetail = | { type: PopupType.GenerateCommitMessageOverrideWarning repository: Repository - selectedFiles: ReadonlyArray + filesSelected: ReadonlyArray } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index fb41475927e..533a309e92a 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -2502,7 +2502,7 @@ export class App extends React.Component { key="generate-commit-message-override-warning" dispatcher={this.props.dispatcher} repository={popup.repository} - selectedFiles={popup.selectedFiles} + filesSelected={popup.filesSelected} onDismissed={onPopupDismissedFn} /> ) diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 66a65eade75..6631fc82bad 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -896,17 +896,17 @@ export class ChangesList extends React.Component< this.props.dispatcher.setCommitMessage(this.props.repository, message) private onGenerateCommitMessage = ( - selectedFiles: ReadonlyArray, + filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => mustOverrideExistingMessage ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( this.props.repository, - selectedFiles + filesSelected ) : this.props.dispatcher.generateCommitMessage( this.props.repository, - selectedFiles + filesSelected ) private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 7a8358e3343..22be6011dc0 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -1073,19 +1073,19 @@ export class Dispatcher { public promptOverrideWithGeneratedCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + filesSelected: ReadonlyArray ) { return this.appStore._promptOverrideWithGeneratedCommitMessage( repository, - selectedFiles + filesSelected ) } public generateCommitMessage( repository: Repository, - selectedFiles: ReadonlyArray + filesSelected: ReadonlyArray ) { - return this.appStore._generateCommitMessage(repository, selectedFiles) + return this.appStore._generateCommitMessage(repository, filesSelected) } /** Remove the given account from the app. */ diff --git a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx index c5ce6f9296f..7580343305d 100644 --- a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx +++ b/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx @@ -12,7 +12,7 @@ import { WorkingDirectoryFileChange } from '../../models/status' interface IGenerateCommitMessageOverrideWarningProps { readonly dispatcher: Dispatcher readonly repository: Repository - readonly selectedFiles: ReadonlyArray + readonly filesSelected: ReadonlyArray /** * Callback to use when the dialog gets closed. @@ -51,7 +51,7 @@ export class GenerateCommitMessageOverrideWarning extends React.Component { this.props.dispatcher.generateCommitMessage( this.props.repository, - this.props.selectedFiles + this.props.filesSelected ) this.props.onDismissed() } From ba3390607d297e5988c5ac28257bc0befca91c87 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:17:00 +0100 Subject: [PATCH 0038/1338] Remove `MarkdownMessage` --- app/src/models/popup.ts | 6 --- app/src/ui/app.tsx | 12 ----- .../ui/markdown-message/markdown-message.tsx | 46 ------------------- 3 files changed, 64 deletions(-) delete mode 100644 app/src/ui/markdown-message/markdown-message.tsx diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index db83eff6f1f..b7b70661b56 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -96,7 +96,6 @@ export enum PopupType { UnknownAuthors = 'UnknownAuthors', TestIcons = 'TestIcons', ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges', - MarkdownMessage = 'MarkdownMessage', GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', } @@ -431,11 +430,6 @@ export type PopupDetail = onCommitAnyway: () => void onClearFilter: () => void } - | { - type: PopupType.MarkdownMessage - title: string - markdownBody: string - } | { type: PopupType.GenerateCommitMessageOverrideWarning repository: Repository diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 533a309e92a..c83a00b4cba 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -181,7 +181,6 @@ import { isCertificateErrorSuppressedFor } from '../lib/suppress-certificate-err import { webUtils } from 'electron' import { showTestUI } from './lib/test-ui-components/test-ui-components' import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog' -import { MarkdownMessageDialog } from './markdown-message/markdown-message' import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/GenerateCommitMessageOverrideWarning' const MinuteInMilliseconds = 1000 * 60 @@ -2485,17 +2484,6 @@ export class App extends React.Component { /> ) } - case PopupType.MarkdownMessage: { - return ( - - ) - } case PopupType.GenerateCommitMessageOverrideWarning: { return ( - - /** - * Callback to use when the dialog gets closed. - */ - readonly onDismissed: () => void -} - -export class MarkdownMessageDialog extends React.Component { - public constructor(props: IMarkdownMessageDialogProps) { - super(props) - } - - public render() { - return ( - - -
- -
- - - - ) - } -} From a4ac526654c595a9d874fc7442c908f7ebff8e6c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 20 Jan 2025 16:39:21 +0100 Subject: [PATCH 0039/1338] Request user data in parallel --- app/src/lib/api.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 8fbf0244fda..fe282cd2d09 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -2135,10 +2135,12 @@ export async function fetchUser( ): Promise { const api = new API(endpoint, token) try { - const user = await api.fetchAccount() - const emails = await api.fetchEmails() - const copilotInfo = await api.fetchUserCopilotInfo() - const features = await api.fetchFeatureFlags() + const [user, emails, copilotInfo, features] = await Promise.all([ + api.fetchAccount(), + api.fetchEmails(), + api.fetchUserCopilotInfo(), + api.fetchFeatureFlags(), + ]) return new Account( user.login, From c2f1a45038ceec6074d60cb63bd38bbcfe4f08ef Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 23 Jan 2025 17:04:29 +0100 Subject: [PATCH 0040/1338] Update commit-message.tsx --- app/src/ui/changes/commit-message.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index b2d61bad348..c9cbb846b7a 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -159,7 +159,7 @@ interface ICommitMessageProps { readonly onPersistCommitMessage?: (message: ICommitMessage) => void readonly onGenerateCommitMessage?: ( - selectedFiles: ReadonlyArray, + filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => void From 0ca2404891e71fc5cd89a23a1ce2585306a298e9 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 23 Jan 2025 17:35:17 +0100 Subject: [PATCH 0041/1338] Remove unnecessary restriction --- app/src/ui/changes/commit-message.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index c9cbb846b7a..3362550fee0 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -835,7 +835,6 @@ export class CommitMessage extends React.Component< private renderCopilotButton() { if ( - this.props.repository.gitHubRepository === null || !enableCommitMessageGeneration(this.props.accounts) || this.props.onGenerateCommitMessage === undefined ) { From 22cf28498bd12db61e55c6d70053cedc8971bd50 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 23 Jan 2025 17:35:29 +0100 Subject: [PATCH 0042/1338] Bring Copilot changes to the FilterChangesList component --- app/src/ui/changes/filter-changes-list.tsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index f4f766bec7d..9a9a539813c 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -151,6 +151,7 @@ interface IFilterChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean + readonly isGeneratingCommitMessage: boolean readonly commitToAmend: Commit | null readonly currentBranchProtected: boolean readonly currentRepoRulesInfo: RepoRulesInfo @@ -865,6 +866,7 @@ export class FilterChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, + isGeneratingCommitMessage, commitToAmend, currentBranchProtected, currentRepoRulesInfo: currentRepoRulesInfo, @@ -939,6 +941,7 @@ export class FilterChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} + isGeneratingCommitMessage={isGeneratingCommitMessage} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -961,6 +964,7 @@ export class FilterChangesList extends React.Component< this.onConfirmCommitWithUnknownCoAuthors } onPersistCommitMessage={this.onPersistCommitMessage} + onGenerateCommitMessage={this.onGenerateCommitMessage} onCommitMessageFocusSet={this.onCommitMessageFocusSet} onRefreshAuthor={this.onRefreshAuthor} onShowPopup={this.onShowPopup} @@ -1004,6 +1008,20 @@ export class FilterChangesList extends React.Component< private onPersistCommitMessage = (message: ICommitMessage) => this.props.dispatcher.setCommitMessage(this.props.repository, message) + private onGenerateCommitMessage = ( + filesSelected: ReadonlyArray, + mustOverrideExistingMessage: boolean + ) => + mustOverrideExistingMessage + ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( + this.props.repository, + filesSelected + ) + : this.props.dispatcher.generateCommitMessage( + this.props.repository, + filesSelected + ) + private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f) From cf5d0c2968a4cd6503a80220a3c5ae5f374fd19f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 24 Jan 2025 16:11:36 +0100 Subject: [PATCH 0043/1338] Use new feature flag name --- app/src/lib/feature-flag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index c1d46a6773d..fb11f11824d 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -112,7 +112,7 @@ export const enableCommitMessageGeneration = ( return ( enableBetaFeatures() && accounts.some(a => - (a.features ?? []).includes('desktop_copilot_commit_message_generation') + (a.features ?? []).includes('desktop_copilot_generate_commit_message') ) ) } From 0d07a6730d826294b4cd371e8b21ce90c5b65c64 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 28 Jan 2025 17:59:56 +0100 Subject: [PATCH 0044/1338] Display errors generating commit messages --- app/src/lib/api.ts | 8 ++++---- app/src/lib/stores/app-store.ts | 22 ++++++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index fe282cd2d09..955c9c61e19 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -2080,7 +2080,7 @@ export class API { */ public async getDiffChangesCommitMessage( diff: string - ): Promise { + ): Promise { try { const response = await this.copilotRequest( '/agents/github-desktop-commit-message-generation', @@ -2090,12 +2090,12 @@ export class API { const choice = response.choices.at(0) if (!choice) { - return null + throw new Error('No choice found in response') } const message = choice.message.content if (!message) { - return null + throw new Error('No message found in response') } return JSON.parse(message) @@ -2104,7 +2104,7 @@ export class API { `getDiffChangesCommitDetails: failed with endpoint ${this.endpoint}`, e ) - return null + throw e } } } diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index efe26ac5bcb..41110556ae1 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5415,17 +5415,23 @@ export class AppStore extends TypedBaseStore { } const api = API.fromAccount(account) - const response = await api.getDiffChangesCommitMessage(diff) - if (!response) { + try { + const response = await api.getDiffChangesCommitMessage(diff) + + this._setCommitMessage(repository, { + summary: response.title, + description: response.description, + timestamp: Date.now(), + }) + } catch (e) { + this.emitError( + new ErrorWithMetadata(e, { + repository, + }) + ) return false } - this._setCommitMessage(repository, { - summary: response.title, - description: response.description, - timestamp: Date.now(), - }) - return true }) } From 71d87da27ae2d8048bb938b300408fb66951249c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 29 Jan 2025 12:39:18 +0100 Subject: [PATCH 0045/1338] Show Copilot disclaimer after generating a commit message --- app/src/lib/stores/app-store.ts | 1 + app/src/models/commit-message.ts | 5 ++++ app/src/ui/changes/commit-message.tsx | 43 +++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 41110556ae1..b3439bd1ce7 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5422,6 +5422,7 @@ export class AppStore extends TypedBaseStore { summary: response.title, description: response.description, timestamp: Date.now(), + generatedByCopilot: true, }) } catch (e) { this.emitError( diff --git a/app/src/models/commit-message.ts b/app/src/models/commit-message.ts index 9c747acfa0a..6baf0717313 100644 --- a/app/src/models/commit-message.ts +++ b/app/src/models/commit-message.ts @@ -7,6 +7,11 @@ export interface ICommitMessage { * with the newest commit message. */ readonly timestamp: number + /** + * Whether the commit message was generated by Copilot. Optional. When it's + * not present, it's assumed to be false. + */ + readonly generatedByCopilot?: boolean } export const DefaultCommitMessage: ICommitMessage = { diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 3362550fee0..8b193c9f03c 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -59,6 +59,7 @@ import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' import { WorkingDirectoryFileChange } from '../../models/status' import { enableCommitMessageGeneration } from '../../lib/feature-flag' +import { Checkbox, CheckboxValue } from '../lib/checkbox' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -202,6 +203,7 @@ interface ICommitMessageState { readonly descriptionObscured: boolean readonly isCommittingStatusMessage: string + readonly isCopilotDisclaimerPopoverOpen: boolean readonly repoRulesEnabled: boolean @@ -238,6 +240,7 @@ export class CommitMessage extends React.Component< > { private descriptionComponent: AutocompletingTextArea | null = null + private summaryGroupRef = React.createRef() private summaryTextInput: HTMLInputElement | null = null private descriptionTextArea: HTMLTextAreaElement | null = null @@ -260,6 +263,7 @@ export class CommitMessage extends React.Component< ), descriptionObscured: false, isCommittingStatusMessage: '', + isCopilotDisclaimerPopoverOpen: false, repoRulesEnabled: false, isRuleFailurePopoverOpen: false, repoRuleCommitMessageFailures: new RepoRulesMetadataFailures(), @@ -297,7 +301,11 @@ export class CommitMessage extends React.Component< } if (commitMessage.timestamp > this.state.commitMessage.timestamp) { - this.setState({ commitMessage }) + this.setState({ + commitMessage, + isCopilotDisclaimerPopoverOpen: + commitMessage.generatedByCopilot === true, + }) } } @@ -1153,6 +1161,36 @@ export class CommitMessage extends React.Component< } } + private renderCopilotDisclaimerPopover() { + if (!this.state.isCopilotDisclaimerPopoverOpen) { + return null + } + + return ( + +

GitHub Copilot

+

+ Copilot is powered by AI, so mistakes are possible. Review and edit + the generated message carefully before use.{' '} + + Learn more about GitHub Copilot. + +

+ + + ) + } + + public closeCopilotDisclaimerPopover = () => { + this.setState({ isCopilotDisclaimerPopoverOpen: false }) + } + private renderRuleFailurePopover() { const { branch, repository } = this.props @@ -1445,7 +1483,8 @@ export class CommitMessage extends React.Component< onContextMenu={this.onContextMenu} onKeyDown={this.onKeyDown} > -
+ {this.renderCopilotDisclaimerPopover()} +
{this.renderAvatar()} Date: Thu, 30 Jan 2025 12:39:36 +0100 Subject: [PATCH 0046/1338] Improve CSS of Copilot disclaimer popover --- app/src/ui/changes/commit-message.tsx | 11 ++++++++++- app/styles/ui/changes/_commit-message.scss | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 8b193c9f03c..a86c9499fe7 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -1174,7 +1174,16 @@ export class CommitMessage extends React.Component< ariaLabelledby="copilot-disclaimer-popover-header" onClickOutside={this.closeCopilotDisclaimerPopover} > -

GitHub Copilot

+
+

GitHub Copilot

+ +

Copilot is powered by AI, so mistakes are possible. Review and edit the generated message carefully before use.{' '} diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 2f96f362d64..fa4750f8134 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -12,6 +12,21 @@ padding: var(--spacing); + .copilot-disclaimer-popover-header { + display: flex; + + h3 { + margin-bottom: 0; + font-size: var(--font-size); + } + + @include close-button; + + .close { + margin-right: 0; + } + } + .summary { position: relative; display: flex; From 5fc5b590b9d229990f60dddf7f0d5c688be9b99e Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 6 Feb 2025 17:20:55 +0100 Subject: [PATCH 0047/1338] Make sure the Copilot disclaimer popover is not shown again if user accepted --- app/src/lib/app-state.ts | 2 ++ app/src/lib/stores/app-store.ts | 23 ++++++++++++++++++++++ app/src/ui/app.tsx | 3 +++ app/src/ui/changes/changes-list.tsx | 7 +++++++ app/src/ui/changes/commit-message.tsx | 15 ++++++++++---- app/src/ui/changes/filter-changes-list.tsx | 7 +++++++ app/src/ui/changes/sidebar.tsx | 4 ++++ app/src/ui/dispatcher/dispatcher.ts | 8 ++++++++ app/src/ui/repository.tsx | 4 ++++ 9 files changed, 69 insertions(+), 4 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index f336f235b88..a34fced692b 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -373,6 +373,8 @@ export interface IAppState { readonly underlineLinks: boolean readonly canFilterChanges: boolean + + readonly showCopilotCommitMessageDisclaimer: boolean } export enum FoldoutType { diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index b3439bd1ce7..901fb179994 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -453,6 +453,9 @@ export const showDiffCheckMarksKey = 'diff-check-marks-visible' export const canFilterChangesDefault = false export const canFilterChangesKey = 'can-filter-changes' +export const showCopilotCommitMessageDisclaimerKey = + 'show-copilot-commit-message-disclaimer' + export class AppStore extends TypedBaseStore { private readonly gitStoreCache: GitStoreCache @@ -605,6 +608,8 @@ export class AppStore extends TypedBaseStore { private canFilterChanges: boolean = canFilterChangesDefault + private showCopilotCommitMessageDisclaimer: boolean = true + public constructor( private readonly gitHubUserStore: GitHubUserStore, private readonly cloningRepositoriesStore: CloningRepositoriesStore, @@ -1093,6 +1098,8 @@ export class AppStore extends TypedBaseStore { underlineLinks: this.underlineLinks, showDiffCheckMarks: this.showDiffCheckMarks, canFilterChanges: this.canFilterChanges, + showCopilotCommitMessageDisclaimer: + this.showCopilotCommitMessageDisclaimer, } } @@ -2324,6 +2331,11 @@ export class AppStore extends TypedBaseStore { canFilterChangesDefault ) + this.showCopilotCommitMessageDisclaimer = getBoolean( + showCopilotCommitMessageDisclaimerKey, + true + ) + this.emitUpdateNow() this.accountsStore.refresh() @@ -3731,6 +3743,17 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } + public _setShowCopilotCommitMessageDisclaimer( + showCopilotCommitMessageDisclaimer: boolean + ) { + setBoolean( + showCopilotCommitMessageDisclaimerKey, + showCopilotCommitMessageDisclaimer + ) + this.showCopilotCommitMessageDisclaimer = showCopilotCommitMessageDisclaimer + this.emitUpdate() + } + /** * Refresh all the data for the Changes section. * diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index c83a00b4cba..f76defaa665 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -3233,6 +3233,9 @@ export class App extends React.Component { showDiffCheckMarks={state.showDiffCheckMarks} showSideBySideDiff={state.showSideBySideDiff} focusCommitMessage={state.focusCommitMessage} + showCopilotCommitMessageDisclaimer={ + state.showCopilotCommitMessageDisclaimer + } askForConfirmationOnDiscardChanges={ state.askForConfirmationOnDiscardChanges } diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 6631fc82bad..79a3cfb1ea0 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -135,6 +135,7 @@ interface IChangesListProps { readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void readonly askForConfirmationOnDiscardChanges: boolean readonly focusCommitMessage: boolean + readonly showCopilotCommitMessageDisclaimer: boolean readonly isShowingModal: boolean readonly isShowingFoldout: boolean readonly onDiscardChangesFromFiles: ( @@ -835,6 +836,8 @@ export class ChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} + showCopilotDisclaimer={this.props.showCopilotCommitMessageDisclaimer} + onCopilotDisclaimerDontShowAgain={this.onCopilotDisclaimerDontShowAgain} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -870,6 +873,10 @@ export class ChangesList extends React.Component< ) } + private onCopilotDisclaimerDontShowAgain = () => { + this.props.dispatcher.setShowCopilotCommitMessageDisclaimer(false) + } + private onCoAuthorsUpdated = (coAuthors: ReadonlyArray) => this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index a86c9499fe7..009aec36b19 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -59,7 +59,6 @@ import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' import { WorkingDirectoryFileChange } from '../../models/status' import { enableCommitMessageGeneration } from '../../lib/feature-flag' -import { Checkbox, CheckboxValue } from '../lib/checkbox' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -111,6 +110,7 @@ interface ICommitMessageProps { readonly repoRulesInfo: RepoRulesInfo readonly aheadBehind: IAheadBehind | null readonly showNoWriteAccess: boolean + readonly showCopilotDisclaimer?: boolean /** * Whether or not to show a field for adding co-authors to @@ -163,6 +163,7 @@ interface ICommitMessageProps { filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => void + readonly onCopilotDisclaimerDontShowAgain?: () => void /** * Called when the component has given the commit message focus due to @@ -304,6 +305,7 @@ export class CommitMessage extends React.Component< this.setState({ commitMessage, isCopilotDisclaimerPopoverOpen: + nextProps.showCopilotDisclaimer === true && commitMessage.generatedByCopilot === true, }) } @@ -1191,12 +1193,17 @@ export class CommitMessage extends React.Component< Learn more about GitHub Copilot.

- + ) } - public closeCopilotDisclaimerPopover = () => { + private onCopilotDisclaimerDontShowAgain = () => { + this.closeCopilotDisclaimerPopover() + this.props.onCopilotDisclaimerDontShowAgain?.() + } + + private closeCopilotDisclaimerPopover = () => { this.setState({ isCopilotDisclaimerPopoverOpen: false }) } @@ -1246,7 +1253,7 @@ export class CommitMessage extends React.Component< }) } - public closeRuleFailurePopover = () => { + private closeRuleFailurePopover = () => { this.setState({ isRuleFailurePopoverOpen: false }) } diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 9a9a539813c..0437ee30c99 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -116,6 +116,7 @@ interface IFilterChangesListProps { readonly askForConfirmationOnDiscardChanges: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean readonly focusCommitMessage: boolean + readonly showCopilotCommitMessageDisclaimer: boolean readonly isShowingModal: boolean readonly isShowingFoldout: boolean readonly onDiscardChangesFromFiles: ( @@ -942,6 +943,8 @@ export class FilterChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} + showCopilotDisclaimer={this.props.showCopilotCommitMessageDisclaimer} + onCopilotDisclaimerDontShowAgain={this.onCopilotDisclaimerDontShowAgain} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -983,6 +986,10 @@ export class FilterChangesList extends React.Component< this.clearFilter() } + private onCopilotDisclaimerDontShowAgain = () => { + this.props.dispatcher.setShowCopilotCommitMessageDisclaimer(false) + } + private onCoAuthorsUpdated = (coAuthors: ReadonlyArray) => this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors) diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 13267ac8ed9..4ea4356eb83 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -63,6 +63,7 @@ interface IChangesSidebarProps { // eslint-disable-next-line react/no-unused-prop-types readonly gitHubUserStore: GitHubUserStore readonly focusCommitMessage: boolean + readonly showCopilotCommitMessageDisclaimer: boolean readonly askForConfirmationOnDiscardChanges: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean readonly accounts: ReadonlyArray @@ -418,6 +419,9 @@ export class ChangesSidebar extends React.Component { mostRecentLocalCommit={this.props.mostRecentLocalCommit} rebaseConflictState={rebaseConflictState} selectedFileIDs={selectedFileIDs} + showCopilotCommitMessageDisclaimer={ + this.props.showCopilotCommitMessageDisclaimer + } onFileSelectionChanged={this.onFileSelectionChanged} onCreateCommit={this.onCreateCommit} onIncludeChanged={this.onIncludeChanged} diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 22be6011dc0..75ce02eacde 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -2740,6 +2740,14 @@ export class Dispatcher { this.appStore._setNotificationsEnabled(notificationsEnabled) } + public setShowCopilotCommitMessageDisclaimer( + showCopilotCommitMessageDisclaimer: boolean + ) { + this.appStore._setShowCopilotCommitMessageDisclaimer( + showCopilotCommitMessageDisclaimer + ) + } + private logHowToRevertCherryPick( targetBranchName: string, beforeSha: string | null diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 69b26e576a9..6568bd7f1ee 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -56,6 +56,7 @@ interface IRepositoryViewProps { readonly askForConfirmationOnDiscardStash: boolean readonly askForConfirmationOnCheckoutCommit: boolean readonly focusCommitMessage: boolean + readonly showCopilotCommitMessageDisclaimer: boolean readonly commitSpellcheckEnabled: boolean readonly showCommitLengthWarning: boolean readonly accounts: ReadonlyArray @@ -251,6 +252,9 @@ export class RepositoryView extends React.Component< commitToAmend={this.props.state.commitToAmend} isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress} focusCommitMessage={this.props.focusCommitMessage} + showCopilotCommitMessageDisclaimer={ + this.props.showCopilotCommitMessageDisclaimer + } askForConfirmationOnDiscardChanges={ this.props.askForConfirmationOnDiscardChanges } From 66af6add66b737f265ff3f0147e858e147be8c1a Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 13:34:03 -0500 Subject: [PATCH 0048/1338] Switch to semantically to radio group control --- app/src/ui/lib/radio-button.tsx | 14 +- app/src/ui/lib/radio-group.tsx | 16 +- .../segmented-item.tsx | 69 ++------ .../vertical-segmented-control.tsx | 157 ++++-------------- 4 files changed, 65 insertions(+), 191 deletions(-) diff --git a/app/src/ui/lib/radio-button.tsx b/app/src/ui/lib/radio-button.tsx index 13d7eea1f85..6e9d71a63f1 100644 --- a/app/src/ui/lib/radio-button.tsx +++ b/app/src/ui/lib/radio-button.tsx @@ -33,13 +33,19 @@ interface IRadioButtonProps { /** Whether the textarea field should auto focus when mounted. */ readonly autoFocus?: boolean + + /** Optional: The onDoubleClick event handler for radio button */ + readonly onDoubleClick?: ( + key: T, + event: React.MouseEvent + ) => void } interface IRadioButtonState { readonly inputId: string } -export class RadioButton extends React.Component< +export class RadioButton extends React.Component< IRadioButtonProps, IRadioButtonState > { @@ -67,7 +73,7 @@ export class RadioButton extends React.Component< tabIndex={this.props.tabIndex} autoFocus={this.props.autoFocus} /> -
@@ -77,4 +83,8 @@ export class RadioButton extends React.Component< private onSelected = (evt: React.FormEvent) => { this.props.onSelected(this.props.value, evt) } + + private onDoubleClick = (evt: React.MouseEvent) => { + this.props.onDoubleClick?.(this.props.value, evt) + } } diff --git a/app/src/ui/lib/radio-group.tsx b/app/src/ui/lib/radio-group.tsx index 60f792ea77c..a6045f51316 100644 --- a/app/src/ui/lib/radio-group.tsx +++ b/app/src/ui/lib/radio-group.tsx @@ -27,6 +27,12 @@ interface IRadioGroupProps { */ readonly onSelectionChanged: (key: T) => void + /** Optional: The onDoubleClick event handler for radio button */ + readonly onRadioButtonDoubleClick?: ( + key: T, + event: React.MouseEvent + ) => void + /** Render radio button label contents */ readonly renderRadioButtonLabelContents: (key: T) => JSX.Element | string } @@ -34,13 +40,20 @@ interface IRadioGroupProps { /** * A component for presenting a small number of choices to the user. */ -export class RadioGroup extends React.Component< +export class RadioGroup extends React.Component< IRadioGroupProps > { private onSelectionChanged = (key: T) => { this.props.onSelectionChanged(key) } + private onRadioButtonDoubleClick = ( + key: T, + event: React.MouseEvent + ) => { + this.props.onRadioButtonDoubleClick?.(key, event) + } + private renderRadioButtons() { const { radioButtonKeys, selectedKey } = this.props @@ -53,6 +66,7 @@ export class RadioGroup extends React.Component< value={key} onSelected={this.onSelectionChanged} tabIndex={checked ? 0 : -1} + onDoubleClick={this.onRadioButtonDoubleClick} > {this.props.renderRadioButtonLabelContents(key)} diff --git a/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx b/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx index 6801d5f6d41..86d98be1399 100644 --- a/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx +++ b/app/src/ui/lib/vertical-segmented-control/segmented-item.tsx @@ -1,18 +1,6 @@ import * as React from 'react' -interface ISegmentedItemProps { - /** - * An id for the item, used to assist in accessibility - */ - readonly id: string - - /** - * The value of the item among the other choices in the segmented - * control. This is passed along to the onClick handler to differentiate - * between clicked items. - */ - readonly value: T - +interface ISegmentedItemProps { /** * The title for the segmented item. This should be kept short. */ @@ -23,60 +11,23 @@ interface ISegmentedItemProps { * selecting this item. */ readonly description?: string | JSX.Element - - /** - * Whether or not the item is currently the active selection among the - * other choices in the segmented control. - */ - readonly isSelected: boolean - - /** - * A function that's called when a user clicks on the item using - * a pointer device. - */ - readonly onClick: (value: T) => void - - /** - * A function that's called when a user double-clicks on the item - * using a pointer device. - */ - readonly onDoubleClick: (value: T) => void } -export class SegmentedItem extends React.Component< - ISegmentedItemProps, - {} -> { - private onClick = () => { - this.props.onClick(this.props.value) - } +export class SegmentedItem extends React.Component { + private renderDescription() { + if (!this.props.description) { + return null + } - private onDoubleClick = () => { - this.props.onDoubleClick(this.props.value) + return

{this.props.description}

} public render() { - const description = this.props.description ? ( -

{this.props.description}

- ) : undefined - - const isSelected = this.props.isSelected - const className = isSelected ? 'selected' : undefined - return ( - // eslint-disable-next-line jsx-a11y/click-events-have-key-events - + {this.renderDescription()} + ) } } diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx index 17a35899c5f..248ba0d49e9 100644 --- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx +++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx @@ -1,13 +1,11 @@ import * as React from 'react' -import { createUniqueId, releaseUniqueId } from '../id-pool' import { SegmentedItem } from './segmented-item' - -type Key = string | number +import { RadioGroup } from '../radio-group' /** * An item which is rendered as a choice in the segmented control. */ -export interface ISegmentedItem { +export interface ISegmentedItem { /** * The title for the segmented item. This should be kept short. */ @@ -30,7 +28,7 @@ export interface ISegmentedItem { readonly key: T } -interface IVerticalSegmentedControlProps { +interface IVerticalSegmentedControlProps { /** * An optional label for the segmented control. Will be rendered * as a legend element inside a field group. Consumers are strongly @@ -60,156 +58,57 @@ interface IVerticalSegmentedControlProps { readonly onSelectionChanged: (key: T) => void } -interface IVerticalSegmentedControlState { - /** - * An automatically generated id for the list element used to reference - * it from the label element. This is generated once via the id pool when the - * component is mounted and then released once the component unmounts. - */ - readonly listId?: string -} - /** * A component for presenting a small number of choices to the user. Equivalent * of a radio button group but styled as a vertically oriented segmented control. */ -export class VerticalSegmentedControl extends React.Component< - IVerticalSegmentedControlProps, - IVerticalSegmentedControlState +export class VerticalSegmentedControl extends React.Component< + IVerticalSegmentedControlProps > { - private formRef: HTMLFormElement | null = null - - public constructor(props: IVerticalSegmentedControlProps) { - super(props) - this.state = {} + private onRadioButtonDoubleClick = (key: T) => { + console.log('TBD - submit form: ', key) + // this.submitForm() + // Also, we should see if enter is pressed, and if so, submit the form } - private updateListId(label: string | undefined) { - if (this.state.listId) { - releaseUniqueId(this.state.listId) - this.setState({ listId: undefined }) + private renderItem = (key: T) => { + const item = this.props.items.find(item => item.key === key) + if (!item) { + return {key} } - if (label) { - this.setState({ - listId: createUniqueId(`VerticalSegmentedControl_${label}`), - }) - } - } - - public componentWillMount() { - this.updateListId(this.props.label) - } - - public componentWillUnmount() { - if (this.state.listId) { - releaseUniqueId(this.state.listId) - } - } - - public componentWillReceiveProps( - nextProps: IVerticalSegmentedControlProps - ) { - if (this.props.label !== nextProps.label) { - this.updateListId(nextProps.label) - } - } - - private submitForm() { - const form = this.formRef - if (form) { - // NB: In order to play nicely with React's custom event dispatching, - // we dispatch an event instead of calling `submit` directly on the - // form. - form.dispatchEvent(new Event('submit')) - } - } - - private onItemClick = (key: T) => { - if (key !== this.props.selectedKey) { - this.props.onSelectionChanged(key) - } - } - - private onItemDoubleClick = (key: T) => { - this.onItemClick(key) - this.submitForm() - } - - private getListItemId(index: number) { - return `${this.state.listId}_Item_${index}` - } - - private renderItem(item: ISegmentedItem, index: number) { return ( ) } - private onKeyDown = (event: React.KeyboardEvent) => { - const selectedIndex = this.findSelectedIndex(this.props.items) - - if (event.key === 'ArrowUp') { - if (selectedIndex > 0) { - this.props.onSelectionChanged(this.props.items[selectedIndex - 1].key) - } - event.preventDefault() - } else if (event.key === 'ArrowDown') { - if (selectedIndex < this.props.items.length - 1) { - this.props.onSelectionChanged(this.props.items[selectedIndex + 1].key) - } - event.preventDefault() - } else if (event.key === 'Enter') { - this.submitForm() - } - } - - private onFieldsetRef = (ref: HTMLFieldSetElement | null) => { - this.formRef = ref ? ref.form : null + private onSelectionChanged = (key: T) => { + console.log(key) + this.props.onSelectionChanged(key) } public render() { if (this.props.items.length === 0) { return null } - - const label = this.props.label ? ( - {this.props.label} - ) : undefined - - const selectedIndex = this.findSelectedIndex(this.props.items) - const activeDescendant = this.getListItemId(selectedIndex) - - // Using a fieldset with a legend seems to be the way to go here since - // we can't use a label to point to a list (https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Form_labelable). - // See http://stackoverflow.com/a/13273907/2114 return ( -
- {label} -
    +

    {this.props.label}

    + + + ariaLabelledBy="theme-heading" className="vertical-segmented-control" - tabIndex={0} - onKeyDown={this.onKeyDown} - role="radiogroup" - aria-activedescendant={activeDescendant} - > - {this.props.items.map((item, index) => this.renderItem(item, index))} -
-
+ selectedKey={this.props.selectedKey} + radioButtonKeys={this.props.items.map(item => item.key)} + onSelectionChanged={this.onSelectionChanged} + renderRadioButtonLabelContents={this.renderItem} + onRadioButtonDoubleClick={this.onRadioButtonDoubleClick} + /> +
) } - - private findSelectedIndex(items: ReadonlyArray>) { - return items.findIndex(item => item.key === this.props.selectedKey) - } } From 2ea394c480939b11f083f9bb8755302489df76bf Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 14:03:47 -0500 Subject: [PATCH 0049/1338] Don't use h2, it is just label and associated for screen readers. --- .../vertical-segmented-control/vertical-segmented-control.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx index 248ba0d49e9..fc04d5d762d 100644 --- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx +++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx @@ -97,10 +97,10 @@ export class VerticalSegmentedControl extends React.Compone } return (
-

{this.props.label}

+

{this.props.label}

- ariaLabelledBy="theme-heading" + ariaLabelledBy="vertical-segment-control-label" className="vertical-segmented-control" selectedKey={this.props.selectedKey} radioButtonKeys={this.props.items.map(item => item.key)} From 267d2407c7557976aa97404742645fae9ad23fbb Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 14:04:13 -0500 Subject: [PATCH 0050/1338] Apply similar styles to today, but include radio circles --- .../ui/_vertical-segmented-control.scss | 109 ++++++------------ 1 file changed, 38 insertions(+), 71 deletions(-) diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index f022eac9a8e..b11db0fc35f 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -1,92 +1,59 @@ @import '../mixins'; -fieldset.vertical-segmented-control { - // Reset styles for fieldset - border: none; - margin: 0; - padding: 0; - min-width: 0; - +.vertical-segmented-control { // Make the component use the whole width of its container. width: 100%; - legend { - margin-bottom: var(--spacing-third); - padding: 0 0 5px 0; - @include ellipsis; - } - - ul { - list-style: none; - padding: 0; + .radio-button-component { + padding: var(--spacing); margin: 0; + border-left: var(--base-border); + border-right: var(--base-border); + border-top: var(--base-border); + border-bottom: none; + + &:first-child { + border-top-left-radius: var(--border-radius); + border-top-right-radius: var(--border-radius); + } - li { - padding: var(--spacing); - margin: 0; - border-left: var(--base-border); - border-right: var(--base-border); - border-top: var(--base-border); - border-bottom: none; - - &:first-child { - border-top-left-radius: var(--border-radius); - border-top-right-radius: var(--border-radius); - } - - &:last-child { - border-bottom: var(--base-border); - border-bottom-left-radius: var(--border-radius); - border-bottom-right-radius: var(--border-radius); - } - - &.selected { - color: var(--box-selected-active-text-color); - background: var(--box-selected-active-background-color); - border-color: var(--box-selected-active-background-color); - - p { - color: var(--box-selected-active-text-color); - } + &:last-child { + border-bottom: var(--base-border); + border-bottom-left-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); + } - // The list item that immediately follows a selected item - // should have its top border be the same color as the background - // of the selected one. This makes for crisp division between - // selected and non-selected without a gray border to interfere. - & + li { - border-top-color: var(--box-selected-active-background-color); - } - } + .title { + font-weight: var(--font-weight-semibold); + @include ellipsis; + } - &:hover:not(.selected) { - background: var(--box-hover-background-color); - color: var(--box-hover-text-color); + p { + color: var(--text-secondary-color); + } - p { - color: var(--box-hover-text-color); - } - } + input[type='radio']{ + margin-right: var(--spacing); + } - .title { - font-weight: var(--font-weight-semibold); - @include ellipsis; - } + &:has(input[type='radio']:checked) { + background: var(--box-selected-active-background-color); + color: var(--box-selected-active-text-color); + border-color: var(--box-selected-active-background-color); p { - color: var(--text-secondary-color); + color: var(--box-selected-active-text-color); } } - &:focus-visible li { - &:first-child { - border-top-left-radius: var(--outlined-border-radius); - border-top-right-radius: var(--outlined-border-radius); - } + &:hover:not(:has(input[type='radio']:checked)) { + background: var(--box-hover-background-color); + color: var(--box-hover-text-color); - &:last-child { - border-bottom-left-radius: var(--outlined-border-radius); - border-bottom-right-radius: var(--outlined-border-radius); + p { + color: var(--box-hover-text-color); } } } } + From 0266dd946303b1c2ef416f9006656ae06f0700dc Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 14:08:37 -0500 Subject: [PATCH 0051/1338] Remove console.log --- .../vertical-segmented-control/vertical-segmented-control.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx index fc04d5d762d..ef859687b1a 100644 --- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx +++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx @@ -87,7 +87,6 @@ export class VerticalSegmentedControl extends React.Compone } private onSelectionChanged = (key: T) => { - console.log(key) this.props.onSelectionChanged(key) } @@ -95,6 +94,7 @@ export class VerticalSegmentedControl extends React.Compone if (this.props.items.length === 0) { return null } + return (

{this.props.label}

From d3ca6a36a9d04d81369f308a4416c0fc237f9bd7 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 14:18:52 -0500 Subject: [PATCH 0052/1338] Put fieldset back so we can submit form on double click --- .../vertical-segmented-control.tsx | 24 +++++++++---------- .../ui/_vertical-segmented-control.scss | 14 ++++++++++- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx index ef859687b1a..74a79285dff 100644 --- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx +++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx @@ -30,11 +30,9 @@ export interface ISegmentedItem { interface IVerticalSegmentedControlProps { /** - * An optional label for the segmented control. Will be rendered - * as a legend element inside a field group. Consumers are strongly - * encouraged to use this in order to aid accessibility. + * An label for the radio group. */ - readonly label?: string + readonly label: string /** * A set of items to be rendered as choices in the segmented control. @@ -62,13 +60,13 @@ interface IVerticalSegmentedControlProps { * A component for presenting a small number of choices to the user. Equivalent * of a radio button group but styled as a vertically oriented segmented control. */ -export class VerticalSegmentedControl extends React.Component< - IVerticalSegmentedControlProps -> { +export class VerticalSegmentedControl< + T extends React.Key +> extends React.Component> { + private onFieldsetRef = React.createRef() + private onRadioButtonDoubleClick = (key: T) => { - console.log('TBD - submit form: ', key) - // this.submitForm() - // Also, we should see if enter is pressed, and if so, submit the form + this.onFieldsetRef.current?.form?.dispatchEvent(new Event('submit')) } private renderItem = (key: T) => { @@ -96,8 +94,8 @@ export class VerticalSegmentedControl extends React.Compone } return ( -
-

{this.props.label}

+
+ {this.props.label} ariaLabelledBy="vertical-segment-control-label" @@ -108,7 +106,7 @@ export class VerticalSegmentedControl extends React.Compone renderRadioButtonLabelContents={this.renderItem} onRadioButtonDoubleClick={this.onRadioButtonDoubleClick} /> -
+ ) } } diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index b11db0fc35f..ce108dd9c29 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -1,6 +1,18 @@ @import '../mixins'; -.vertical-segmented-control { +fieldset.vertical-segmented-control { + // Reset styles for fieldset + border: none; + margin: 0; + padding: 0; + min-width: 0; + + legend { + margin-bottom: var(--spacing-third); + padding: 0 0 5px 0; + @include ellipsis; + } + // Make the component use the whole width of its container. width: 100%; From ac124340f9fa288eabf7ae8158f9288f74cbb5e4 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Feb 2025 15:05:58 -0500 Subject: [PATCH 0053/1338] Linter --- app/styles/ui/_vertical-segmented-control.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index ce108dd9c29..2f8398d49e9 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -44,7 +44,7 @@ fieldset.vertical-segmented-control { color: var(--text-secondary-color); } - input[type='radio']{ + input[type='radio'] { margin-right: var(--spacing); } @@ -68,4 +68,3 @@ fieldset.vertical-segmented-control { } } } - From efb1d26f0b81879f16d401c9355b62f62a30433c Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:59:49 -0500 Subject: [PATCH 0054/1338] Update app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx Co-authored-by: Sergio Padrino --- .../vertical-segmented-control/vertical-segmented-control.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx index 74a79285dff..e308a46c0fd 100644 --- a/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx +++ b/app/src/ui/lib/vertical-segmented-control/vertical-segmented-control.tsx @@ -30,7 +30,7 @@ export interface ISegmentedItem { interface IVerticalSegmentedControlProps { /** - * An label for the radio group. + * A label for the radio group. */ readonly label: string From bffe51213a5b35f4494beae7174922d050b689ee Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 20 Feb 2025 08:20:12 -0500 Subject: [PATCH 0055/1338] Iterate on visual appearance --- .../ui/_vertical-segmented-control.scss | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index 2f8398d49e9..2b3a5479af8 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -19,10 +19,8 @@ fieldset.vertical-segmented-control { .radio-button-component { padding: var(--spacing); margin: 0; - border-left: var(--base-border); - border-right: var(--base-border); - border-top: var(--base-border); - border-bottom: none; + border: var(--base-border); + &:first-child { border-top-left-radius: var(--border-radius); @@ -45,20 +43,18 @@ fieldset.vertical-segmented-control { } input[type='radio'] { - margin-right: var(--spacing); + margin-right: var(--spacing-half); + margin-left: var(--spacing-half); + align-self: flex-start; + margin-top: 4px; } + &:has(input[type='radio']:checked) { - background: var(--box-selected-active-background-color); - color: var(--box-selected-active-text-color); border-color: var(--box-selected-active-background-color); - - p { - color: var(--box-selected-active-text-color); - } } - &:hover:not(:has(input[type='radio']:checked)) { + &:hover { background: var(--box-hover-background-color); color: var(--box-hover-text-color); From b26130819bdb17c09f1133e452d6beae05d56106 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 20 Feb 2025 08:22:13 -0500 Subject: [PATCH 0056/1338] linter --- app/styles/ui/_vertical-segmented-control.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index 2b3a5479af8..97b86e3f28c 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -21,7 +21,6 @@ fieldset.vertical-segmented-control { margin: 0; border: var(--base-border); - &:first-child { border-top-left-radius: var(--border-radius); border-top-right-radius: var(--border-radius); @@ -49,7 +48,6 @@ fieldset.vertical-segmented-control { margin-top: 4px; } - &:has(input[type='radio']:checked) { border-color: var(--box-selected-active-background-color); } From 537083ef554fb6d89e007c8c89733e4b2d1f129f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 20 Feb 2025 16:23:46 +0100 Subject: [PATCH 0057/1338] Fix CAPI error parsing --- app/src/lib/api.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 955c9c61e19..30d98064002 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -147,6 +147,7 @@ enum HttpStatusCode { NotModified = 304, BadRequest = 400, Unauthorized = 401, + Forbidden = 403, NotFound = 404, TooManyRequests = 429, } @@ -1880,8 +1881,12 @@ export class API { const retryAfter = response.headers.get('Retry-After') if (retryAfter) { throw new Error(`Rate limited, retry after ${retryAfter} seconds`) + } else { + throw new Error('Rate limited, try again in a few minutes') } } else if (response.status === HttpStatusCode.Unauthorized) { + throw new Error('Unauthorized: error with authentication') + } else if (response.status === HttpStatusCode.Forbidden) { const body = await response.text() if (body.includes('unauthorized: not licensed to use Copilot')) { throw new Error('Unauthorized: not licensed to use Copilot') From 3f8a6d04237c1d2f85a4feab68b9475cb3edff54 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:04:56 -0500 Subject: [PATCH 0058/1338] Relocate rendering of custom filter row into the filter-changes-list --- app/src/ui/changes/filter-changes-list.tsx | 85 +++++++++++++++------- app/src/ui/lib/augmented-filter-list.tsx | 16 ++-- 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 0e3a5848e9c..efa88aa4ae1 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -61,6 +61,8 @@ import { ClickSource } from '../lib/list' import memoizeOne from 'memoize-one' import { IMatches } from '../../lib/fuzzy-find' import { Button } from '../lib/button' +import { Row } from '../lib/row' +import { TextBox } from '../lib/text-box' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -246,6 +248,8 @@ export class FilterChangesList extends React.Component< IFilterChangesListProps, IFilterChangesListState > { + private filterTextBox: TextBox | undefined = undefined + private isCommittingFileHiddenByFilter = memoizeOne( ( filterText: string, @@ -319,6 +323,8 @@ export class FilterChangesList extends React.Component< private headerRef = createObservableRef() private includeAllCheckBoxRef = React.createRef() + private filterListRef = + React.createRef>() public constructor(props: IFilterChangesListProps) { super(props) @@ -1132,7 +1138,17 @@ export class FilterChangesList extends React.Component< this.setState({ filterText: '', filterToIncludedCommit: true }) } - private renderFilterResultsHeader = () => { + private onTextBoxRef = (component: TextBox | null) => { + this.filterTextBox = component ?? undefined + } + + private onFilterKeyDown = (event: React.KeyboardEvent) => { + if (this.filterListRef.current) { + this.filterListRef.current.onKeyDown(event) + } + } + + private renderFilterRow = () => { const { workingDirectory, rebaseConflictState, isCommitting } = this.props const { files } = workingDirectory @@ -1154,31 +1170,47 @@ export class FilterChangesList extends React.Component< : 'Only show files to be included in the commit' return ( -
- + <> + + + - - -
+ + + + +
+ ) } @@ -1197,10 +1229,11 @@ export class FilterChangesList extends React.Component< <>
+ ref={this.filterListRef} id="changes-list" rowHeight={RowHeight} filterText={this.state.filterText} - onFilterTextChanged={this.onFilterTextChanged} + filterTextBox={this.filterTextBox} onFilterListResultsChanged={this.onFilterListResultsChanged} selectedItems={this.state.selectedItems} selectionMode="multi" @@ -1226,7 +1259,7 @@ export class FilterChangesList extends React.Component< }} onItemContextMenu={this.onItemContextMenu} ariaLabel={filesDescription} - renderPostFilterRow={this.renderFilterResultsHeader} + renderCustomFilterRow={this.renderFilterRow} renderNoItems={this.renderNoChanges} postNoResultsMessage={this.getNoResultsMessage()} /> diff --git a/app/src/ui/lib/augmented-filter-list.tsx b/app/src/ui/lib/augmented-filter-list.tsx index cc4347b9ec2..7ac7392aef7 100644 --- a/app/src/ui/lib/augmented-filter-list.tsx +++ b/app/src/ui/lib/augmented-filter-list.tsx @@ -147,11 +147,9 @@ interface IAugmentedSectionFilterListProps { readonly renderPostFilter?: () => JSX.Element | null /** - * Called to render content after the filter input element. - * - Can be used when you want content between the filter input and the filter - * list items. + * Called to to allow providing a custom filter row as opposed to the default one. */ - readonly renderPostFilterRow?: () => JSX.Element | null + readonly renderCustomFilterRow?: () => JSX.Element | null /** Called when there are no items to render. */ readonly renderNoItems?: () => JSX.Element | null @@ -381,6 +379,10 @@ export class AugmentedSectionFilterList< return null } + if (this.props.renderCustomFilterRow) { + return this.props.renderCustomFilterRow() + } + return ( {this.props.filterTextBox === undefined ? this.renderTextBox() : null} @@ -398,10 +400,6 @@ export class AugmentedSectionFilterList< {this.renderFilterRow()} - {this.props.renderPostFilterRow - ? this.props.renderPostFilterRow() - : null} -
{this.renderContent()}
) @@ -719,7 +717,7 @@ export class AugmentedSectionFilterList< } } - private onKeyDown = (event: React.KeyboardEvent) => { + public onKeyDown = (event: React.KeyboardEvent) => { const list = this.list const key = event.key From fb8f5645bd8a27136a329c4e53d4075809f028f8 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:35:12 -0500 Subject: [PATCH 0059/1338] Put all the header pieces on one row. --- app/src/ui/changes/filter-changes-list.tsx | 35 ++++++++++------------ app/styles/ui/changes/_changes-list.scss | 8 ++--- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index efa88aa4ae1..fa4367ec555 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -61,7 +61,6 @@ import { ClickSource } from '../lib/list' import memoizeOne from 'memoize-one' import { IMatches } from '../../lib/fuzzy-find' import { Button } from '../lib/button' -import { Row } from '../lib/row' import { TextBox } from '../lib/text-box' interface IChangesListItem extends IFilterListItem { @@ -1153,8 +1152,7 @@ export class FilterChangesList extends React.Component< const { files } = workingDirectory const visibleFiles = this.state.filteredItems.size - const filesPlural = files.length === 1 ? 'file' : 'files' - const filesDescription = `${visibleFiles}/${files.length} changed ${filesPlural}` + const filesDescription = `${visibleFiles}/${files.length}` const includeAllValue = this.getCheckAllValue( workingDirectory, @@ -1171,22 +1169,8 @@ export class FilterChangesList extends React.Component< return ( <> - - - -
@@ -1198,6 +1182,20 @@ export class FilterChangesList extends React.Component< ariaLabelledBy="changes-list-check-all-label" /> + + + + -
) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 0774c3a6f31..16bb58c401d 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -48,13 +48,14 @@ .header { display: flex; align-items: center; + height: auto; label { - flex: 1; text-align: right; + padding: 0 var(--spacing-half); } - button { + > button { padding: 1px 3px; margin-left: var(--spacing-half); border: none; @@ -88,8 +89,7 @@ .filter-field-row { background-color: var(--box-alt-background-color); - padding: var(--spacing); - padding-bottom: 0px; + padding: var(--spacing-half) var(--spacing); margin: 0; } From 491d586b7522894144fdc9c82387f9a38f53f925 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:36:11 -0500 Subject: [PATCH 0060/1338] Update filter-changes-list.tsx --- app/src/ui/changes/filter-changes-list.tsx | 74 +++++++++++----------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index fa4367ec555..1b6ddaae702 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1168,46 +1168,44 @@ export class FilterChangesList extends React.Component< : 'Only show files to be included in the commit' return ( - <> -
- +
+ - - - + + + - -
- + +
) } From cdc54cbb8662964abcede1ecc5e56fbb1084dbd0 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 21 Feb 2025 12:56:46 +0100 Subject: [PATCH 0061/1338] Replace disclaimer popover with dialog --- app/src/lib/app-state.ts | 2 +- app/src/lib/stores/app-store.ts | 45 +++++++------ app/src/models/popup.ts | 8 +++ app/src/ui/app.tsx | 17 +++-- app/src/ui/changes/changes-list.tsx | 8 --- app/src/ui/changes/commit-message.tsx | 52 --------------- app/src/ui/changes/filter-changes-list.tsx | 7 --- app/src/ui/changes/sidebar.tsx | 4 -- app/src/ui/dispatcher/dispatcher.ts | 12 ++-- .../generate-commit-message-disclaimer.tsx | 63 +++++++++++++++++++ ...erate-commit-message-override-warning.tsx} | 0 app/src/ui/repository.tsx | 4 -- 12 files changed, 114 insertions(+), 108 deletions(-) create mode 100644 app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx rename app/src/ui/generate-commit-message/{GenerateCommitMessageOverrideWarning.tsx => generate-commit-message-override-warning.tsx} (100%) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 5a0907efa12..29429cabf66 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -377,7 +377,7 @@ export interface IAppState { readonly updateState: IUpdateState - readonly showCopilotCommitMessageDisclaimer: boolean + readonly commitMessageGenerationDisclaimerLastSeen: number | null } export enum FoldoutType { diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 6d8b30898ee..9485efba219 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -454,8 +454,8 @@ export const showDiffCheckMarksKey = 'diff-check-marks-visible' export const canFilterChangesDefault = false export const canFilterChangesKey = 'can-filter-changes' -export const showCopilotCommitMessageDisclaimerKey = - 'show-copilot-commit-message-disclaimer' +export const commitMessageGenerationDisclaimerLastSeenKey = + 'commit-message-generation-disclaimer-last-seen' export class AppStore extends TypedBaseStore { private readonly gitStoreCache: GitStoreCache @@ -609,7 +609,7 @@ export class AppStore extends TypedBaseStore { private canFilterChanges: boolean = canFilterChangesDefault - private showCopilotCommitMessageDisclaimer: boolean = true + private commitMessageGenerationDisclaimerLastSeen: number | null = null public constructor( private readonly gitHubUserStore: GitHubUserStore, @@ -1104,8 +1104,8 @@ export class AppStore extends TypedBaseStore { showDiffCheckMarks: this.showDiffCheckMarks, canFilterChanges: this.canFilterChanges, updateState: updateStore.state, - showCopilotCommitMessageDisclaimer: - this.showCopilotCommitMessageDisclaimer, + commitMessageGenerationDisclaimerLastSeen: + this.commitMessageGenerationDisclaimerLastSeen, } } @@ -2337,10 +2337,8 @@ export class AppStore extends TypedBaseStore { canFilterChangesDefault ) - this.showCopilotCommitMessageDisclaimer = getBoolean( - showCopilotCommitMessageDisclaimerKey, - true - ) + this.commitMessageGenerationDisclaimerLastSeen = + getNumber(commitMessageGenerationDisclaimerLastSeenKey) ?? null this.emitUpdateNow() @@ -3749,17 +3747,6 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } - public _setShowCopilotCommitMessageDisclaimer( - showCopilotCommitMessageDisclaimer: boolean - ) { - setBoolean( - showCopilotCommitMessageDisclaimerKey, - showCopilotCommitMessageDisclaimer - ) - this.showCopilotCommitMessageDisclaimer = showCopilotCommitMessageDisclaimer - this.emitUpdate() - } - /** * Refresh all the data for the Changes section. * @@ -5425,10 +5412,28 @@ export class AppStore extends TypedBaseStore { }) } + public _updateCommitMessageGenerationDisclaimerLastSeen(): void { + this.commitMessageGenerationDisclaimerLastSeen = Date.now() + setNumber( + commitMessageGenerationDisclaimerLastSeenKey, + this.commitMessageGenerationDisclaimerLastSeen + ) + this.emitUpdate() + } + public async _generateCommitMessage( repository: Repository, filesSelected: ReadonlyArray ): Promise { + if (this.commitMessageGenerationDisclaimerLastSeen === null) { + await this._showPopup({ + type: PopupType.GenerateCommitMessageDisclaimer, + repository, + filesSelected, + }) + return false + } + const account = this.getState().accounts.find(account => enableCommitMessageGeneration([account]) ) diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 280e151c748..39a4153e889 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -98,6 +98,7 @@ export enum PopupType { ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges', TestAbout = 'TestAbout', GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', + GenerateCommitMessageDisclaimer = 'GenerateCommitMessageDisclaimer', } interface IBasePopup { @@ -439,5 +440,12 @@ export type PopupDetail = repository: Repository filesSelected: ReadonlyArray } + | { + type: PopupType.GenerateCommitMessageDisclaimer + // Same parameters as PopupType.GenerateCommitMessageOverrideWarning because + // from this popup we will trigger the commit message generation too. + repository: Repository + filesSelected: ReadonlyArray + } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 2bbe8dd296d..7e3db7ebe94 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -182,7 +182,8 @@ import { webUtils } from 'electron' import { showTestUI } from './lib/test-ui-components/test-ui-components' import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog' import { AboutTestDialog } from './about/about-test-dialog' -import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/GenerateCommitMessageOverrideWarning' +import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/generate-commit-message-override-warning' +import { GenerateCommitMessageDisclaimer } from './generate-commit-message/generate-commit-message-disclaimer' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2507,6 +2508,17 @@ export class App extends React.Component { /> ) } + case PopupType.GenerateCommitMessageDisclaimer: { + return ( + + ) + } default: return assertNever(popup, `Unknown popup type: ${popup}`) } @@ -3247,9 +3259,6 @@ export class App extends React.Component { showDiffCheckMarks={state.showDiffCheckMarks} showSideBySideDiff={state.showSideBySideDiff} focusCommitMessage={state.focusCommitMessage} - showCopilotCommitMessageDisclaimer={ - state.showCopilotCommitMessageDisclaimer - } askForConfirmationOnDiscardChanges={ state.askForConfirmationOnDiscardChanges } diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 2e48dc66c35..6d8ef048ec0 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -136,7 +136,6 @@ interface IChangesListProps { readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void readonly askForConfirmationOnDiscardChanges: boolean readonly focusCommitMessage: boolean - readonly showCopilotCommitMessageDisclaimer: boolean readonly isShowingModal: boolean readonly isShowingFoldout: boolean readonly onDiscardChangesFromFiles: ( @@ -840,8 +839,6 @@ export class ChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} - showCopilotDisclaimer={this.props.showCopilotCommitMessageDisclaimer} - onCopilotDisclaimerDontShowAgain={this.onCopilotDisclaimerDontShowAgain} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -876,11 +873,6 @@ export class ChangesList extends React.Component< /> ) } - - private onCopilotDisclaimerDontShowAgain = () => { - this.props.dispatcher.setShowCopilotCommitMessageDisclaimer(false) - } - private onCoAuthorsUpdated = (coAuthors: ReadonlyArray) => this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index c053151c925..49a7b06b815 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -115,7 +115,6 @@ interface ICommitMessageProps { readonly repoRulesInfo: RepoRulesInfo readonly aheadBehind: IAheadBehind | null readonly showNoWriteAccess: boolean - readonly showCopilotDisclaimer?: boolean /** * Whether or not to show a field for adding co-authors to @@ -168,7 +167,6 @@ interface ICommitMessageProps { filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => void - readonly onCopilotDisclaimerDontShowAgain?: () => void /** * Called when the component has given the commit message focus due to @@ -209,7 +207,6 @@ interface ICommitMessageState { readonly descriptionObscured: boolean readonly isCommittingStatusMessage: string - readonly isCopilotDisclaimerPopoverOpen: boolean readonly repoRulesEnabled: boolean @@ -269,7 +266,6 @@ export class CommitMessage extends React.Component< ), descriptionObscured: false, isCommittingStatusMessage: '', - isCopilotDisclaimerPopoverOpen: false, repoRulesEnabled: false, isRuleFailurePopoverOpen: false, repoRuleCommitMessageFailures: new RepoRulesMetadataFailures(), @@ -309,9 +305,6 @@ export class CommitMessage extends React.Component< if (commitMessage.timestamp > this.state.commitMessage.timestamp) { this.setState({ commitMessage, - isCopilotDisclaimerPopoverOpen: - nextProps.showCopilotDisclaimer === true && - commitMessage.generatedByCopilot === true, }) } } @@ -1183,50 +1176,6 @@ export class CommitMessage extends React.Component< } } - private renderCopilotDisclaimerPopover() { - if (!this.state.isCopilotDisclaimerPopoverOpen) { - return null - } - - return ( - -
-

GitHub Copilot

- -
-

- Copilot is powered by AI, so mistakes are possible. Review and edit - the generated message carefully before use.{' '} - - Learn more about GitHub Copilot. - -

- - - ) - } - - private onCopilotDisclaimerDontShowAgain = () => { - this.closeCopilotDisclaimerPopover() - this.props.onCopilotDisclaimerDontShowAgain?.() - } - - private closeCopilotDisclaimerPopover = () => { - this.setState({ isCopilotDisclaimerPopoverOpen: false }) - } - private renderRuleFailurePopover() { const { branch, repository } = this.props @@ -1524,7 +1473,6 @@ export class CommitMessage extends React.Component< className={className} onContextMenu={this.onContextMenu} > - {this.renderCopilotDisclaimerPopover()}
{this.renderAvatar()} diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 4e2e2e2f1ed..3510a3ae199 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -117,7 +117,6 @@ interface IFilterChangesListProps { readonly askForConfirmationOnDiscardChanges: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean readonly focusCommitMessage: boolean - readonly showCopilotCommitMessageDisclaimer: boolean readonly isShowingModal: boolean readonly isShowingFoldout: boolean readonly onDiscardChangesFromFiles: ( @@ -946,8 +945,6 @@ export class FilterChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} - showCopilotDisclaimer={this.props.showCopilotCommitMessageDisclaimer} - onCopilotDisclaimerDontShowAgain={this.onCopilotDisclaimerDontShowAgain} commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} @@ -989,10 +986,6 @@ export class FilterChangesList extends React.Component< this.clearFilter() } - private onCopilotDisclaimerDontShowAgain = () => { - this.props.dispatcher.setShowCopilotCommitMessageDisclaimer(false) - } - private onCoAuthorsUpdated = (coAuthors: ReadonlyArray) => this.props.dispatcher.setCoAuthors(this.props.repository, coAuthors) diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 4ea4356eb83..13267ac8ed9 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -63,7 +63,6 @@ interface IChangesSidebarProps { // eslint-disable-next-line react/no-unused-prop-types readonly gitHubUserStore: GitHubUserStore readonly focusCommitMessage: boolean - readonly showCopilotCommitMessageDisclaimer: boolean readonly askForConfirmationOnDiscardChanges: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean readonly accounts: ReadonlyArray @@ -419,9 +418,6 @@ export class ChangesSidebar extends React.Component { mostRecentLocalCommit={this.props.mostRecentLocalCommit} rebaseConflictState={rebaseConflictState} selectedFileIDs={selectedFileIDs} - showCopilotCommitMessageDisclaimer={ - this.props.showCopilotCommitMessageDisclaimer - } onFileSelectionChanged={this.onFileSelectionChanged} onCreateCommit={this.onCreateCommit} onIncludeChanged={this.onIncludeChanged} diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 75ce02eacde..991e0505559 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -1081,6 +1081,10 @@ export class Dispatcher { ) } + public updateCommitMessageGenerationDisclaimerLastSeen() { + return this.appStore._updateCommitMessageGenerationDisclaimerLastSeen() + } + public generateCommitMessage( repository: Repository, filesSelected: ReadonlyArray @@ -2740,14 +2744,6 @@ export class Dispatcher { this.appStore._setNotificationsEnabled(notificationsEnabled) } - public setShowCopilotCommitMessageDisclaimer( - showCopilotCommitMessageDisclaimer: boolean - ) { - this.appStore._setShowCopilotCommitMessageDisclaimer( - showCopilotCommitMessageDisclaimer - ) - } - private logHowToRevertCherryPick( targetBranchName: string, beforeSha: string | null diff --git a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx new file mode 100644 index 00000000000..40e3d47d31e --- /dev/null +++ b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx @@ -0,0 +1,63 @@ +import * as React from 'react' +import { + Dialog, + DialogContent, + DialogFooter, + OkCancelButtonGroup, +} from '../dialog' +import { Dispatcher } from '../dispatcher' +import { Repository } from '../../models/repository' +import { WorkingDirectoryFileChange } from '../../models/status' +import { LinkButton } from '../lib/link-button' + +interface IGenerateCommitMessageDisclaimerProps { + readonly dispatcher: Dispatcher + readonly repository: Repository + readonly filesSelected: ReadonlyArray + + /** + * Callback to use when the dialog gets closed. + */ + readonly onDismissed: () => void +} + +export class GenerateCommitMessageDisclaimer extends React.Component { + public constructor(props: IGenerateCommitMessageDisclaimerProps) { + super(props) + } + + public render() { + return ( + + +

+ Copilot is powered by AI, so mistakes are possible. Review and edit + the generated message carefully before use.{' '} + + Learn more about GitHub Copilot. + +

+ + + + + + ) + } + + private onSubmit = async () => { + this.props.dispatcher.updateCommitMessageGenerationDisclaimerLastSeen() + this.props.dispatcher.generateCommitMessage( + this.props.repository, + this.props.filesSelected + ) + this.props.onDismissed() + } +} diff --git a/app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx b/app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx similarity index 100% rename from app/src/ui/generate-commit-message/GenerateCommitMessageOverrideWarning.tsx rename to app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 6568bd7f1ee..69b26e576a9 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -56,7 +56,6 @@ interface IRepositoryViewProps { readonly askForConfirmationOnDiscardStash: boolean readonly askForConfirmationOnCheckoutCommit: boolean readonly focusCommitMessage: boolean - readonly showCopilotCommitMessageDisclaimer: boolean readonly commitSpellcheckEnabled: boolean readonly showCommitLengthWarning: boolean readonly accounts: ReadonlyArray @@ -252,9 +251,6 @@ export class RepositoryView extends React.Component< commitToAmend={this.props.state.commitToAmend} isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress} focusCommitMessage={this.props.focusCommitMessage} - showCopilotCommitMessageDisclaimer={ - this.props.showCopilotCommitMessageDisclaimer - } askForConfirmationOnDiscardChanges={ this.props.askForConfirmationOnDiscardChanges } From df388e6c0807c13a1dc0a27302efc66b52ebda3a Mon Sep 17 00:00:00 2001 From: Alex Ravenna Date: Mon, 24 Feb 2025 09:41:05 +0100 Subject: [PATCH 0062/1338] add missing space --- app/src/ui/about/about.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index 28bd5626017..ba6a1cf3d85 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -169,7 +169,7 @@ export class About extends React.Component { const richMessage = ( <> - You have the latest version (last checked{' '} + You have the latest version (last checked {' '} ) ) From afb3d0587550921107af1eb483e55d658fb77608 Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Mon, 24 Feb 2025 13:48:06 -0800 Subject: [PATCH 0063/1338] ci: use macos-13-xlarge instead of deprecated beta label --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77d119c0b4e..f10d52bb576 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,10 +70,10 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13-xl-arm64, windows-2019] + os: [macos-13-xlarge, windows-2019] arch: [x64, arm64] include: - - os: macos-13-xl-arm64 + - os: macos-13-xlarge friendlyName: macOS - os: windows-2019 friendlyName: Windows From a931f2a82edeb3643a66e567b6929328c10a3547 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Feb 2025 12:10:23 +0100 Subject: [PATCH 0064/1338] Show disclaimer once every 30 days --- app/src/lib/stores/app-store.ts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 9485efba219..c070a12f046 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5425,15 +5425,6 @@ export class AppStore extends TypedBaseStore { repository: Repository, filesSelected: ReadonlyArray ): Promise { - if (this.commitMessageGenerationDisclaimerLastSeen === null) { - await this._showPopup({ - type: PopupType.GenerateCommitMessageDisclaimer, - repository, - filesSelected, - }) - return false - } - const account = this.getState().accounts.find(account => enableCommitMessageGeneration([account]) ) @@ -5442,6 +5433,19 @@ export class AppStore extends TypedBaseStore { return false } + if ( + this.commitMessageGenerationDisclaimerLastSeen && + offsetFromNow(-30, 'days') > + this.commitMessageGenerationDisclaimerLastSeen + ) { + await this._showPopup({ + type: PopupType.GenerateCommitMessageDisclaimer, + repository, + filesSelected, + }) + return false + } + return this.withIsGeneratingCommitMessage(repository, async () => { const diff = await getFilesDiffText(repository, filesSelected) if (!diff) { From 1f0593c1bff5fcf4a2d4b4b50986efa44324a5fe Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 25 Feb 2025 20:59:21 -0500 Subject: [PATCH 0065/1338] Update remove-triage-label.yml --- .github/workflows/remove-triage-label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/remove-triage-label.yml b/.github/workflows/remove-triage-label.yml index 7eac3f2f8ed..2b70c4f3c3c 100644 --- a/.github/workflows/remove-triage-label.yml +++ b/.github/workflows/remove-triage-label.yml @@ -9,7 +9,7 @@ permissions: jobs: remove-triage-label-from-issues: - if: github.event.label.name != 'triage' + if: github.event.label.name != 'triage' && github.event.label.name != 'more-info-needed' runs-on: ubuntu-latest steps: - run: gh issue edit "$NUMBER" --remove-label "$LABELS" From 8448e8b71287b3114030f11a745e3cad3fdb2b7e Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 25 Feb 2025 21:05:09 -0500 Subject: [PATCH 0066/1338] Prettier --- .github/workflows/remove-triage-label.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/remove-triage-label.yml b/.github/workflows/remove-triage-label.yml index 2b70c4f3c3c..b4834e051d4 100644 --- a/.github/workflows/remove-triage-label.yml +++ b/.github/workflows/remove-triage-label.yml @@ -9,7 +9,9 @@ permissions: jobs: remove-triage-label-from-issues: - if: github.event.label.name != 'triage' && github.event.label.name != 'more-info-needed' + if: + github.event.label.name != 'triage' && github.event.label.name != + 'more-info-needed' runs-on: ubuntu-latest steps: - run: gh issue edit "$NUMBER" --remove-label "$LABELS" From bcfd83c4f6576830ef7ba6822381b7a8344b8be0 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 25 Feb 2025 21:08:36 -0500 Subject: [PATCH 0067/1338] external pr into triage --- .github/workflows/pr-is-external.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-is-external.yml b/.github/workflows/pr-is-external.yml index 37a20941951..55355c65cba 100644 --- a/.github/workflows/pr-is-external.yml +++ b/.github/workflows/pr-is-external.yml @@ -19,4 +19,4 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_REPO: ${{ github.repository }} NUMBER: ${{ github.event.pull_request.number }} - LABELS: external + LABELS: external,triage From f63a12809d743735404a4179df0095283e0ce3e5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Feb 2025 10:35:15 +0100 Subject: [PATCH 0068/1338] Revert to using paragraph to preserve trailing space Co-Authored-By: Alex Ravenna --- app/src/ui/about/about.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index ba6a1cf3d85..26dc9fb12a2 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -168,10 +168,10 @@ export class About extends React.Component { } const richMessage = ( - <> - You have the latest version (last checked {' '} +

+ You have the latest version (last checked{' '} ) - +

) const absoluteDate = formatDate(lastSuccessfulCheck, { From 3cba210e8caf8d74bead03f5c932e7e5965143d5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Feb 2025 16:20:13 +0100 Subject: [PATCH 0069/1338] Use account helpers instead of comparing endpoints --- app/src/lib/find-account.ts | 8 +++--- app/src/lib/friendly-endpoint-name.ts | 5 ++-- app/src/lib/stats/stats-store.ts | 27 +++++++------------ app/src/lib/stores/app-store.ts | 5 ++-- app/src/lib/stores/sign-in-store.ts | 6 ++--- app/src/models/account.ts | 14 ++++++++++ app/src/ui/app.tsx | 17 +++++------- app/src/ui/changes/commit-message.tsx | 5 ++-- .../cloneable-repository-filter-list.tsx | 13 +++++---- .../invalidated-token/invalidated-token.tsx | 14 ++++------ app/src/ui/lib/configure-git-user.tsx | 6 ++--- .../ui/lib/git-email-not-found-warning.tsx | 10 +++---- app/src/ui/publish-repository/publish.tsx | 11 +++++--- app/src/ui/repository-settings/git-config.tsx | 16 ++++++----- 14 files changed, 76 insertions(+), 81 deletions(-) diff --git a/app/src/lib/find-account.ts b/app/src/lib/find-account.ts index de6bc675b5c..38717afbaae 100644 --- a/app/src/lib/find-account.ts +++ b/app/src/lib/find-account.ts @@ -1,7 +1,7 @@ import * as URL from 'url' -import { getHTMLURL, API, getDotComAPIEndpoint } from './api' +import { getHTMLURL, API } from './api' import { parseRemote, parseRepositoryIdentifier } from './remote-parsing' -import { Account } from '../models/account' +import { Account, isDotComAccount } from '../models/account' type RepositoryLookupFunc = ( account: Account, @@ -81,9 +81,9 @@ export async function findAccountForRemoteURL( // `getDotComAPIEndpoint()` to be GitHub Enterprise accounts, and accounts // without a token to be unauthenticated. const sortedAccounts = allAccounts.toSorted((a1, a2) => { - if (a1.endpoint === getDotComAPIEndpoint()) { + if (isDotComAccount(a1)) { return a1.token.length ? -1 : 1 - } else if (a2.endpoint === getDotComAPIEndpoint()) { + } else if (isDotComAccount(a2)) { return a2.token.length ? 1 : -1 } else { return 0 diff --git a/app/src/lib/friendly-endpoint-name.ts b/app/src/lib/friendly-endpoint-name.ts index b809d899a63..3922cb2e7bc 100644 --- a/app/src/lib/friendly-endpoint-name.ts +++ b/app/src/lib/friendly-endpoint-name.ts @@ -1,6 +1,5 @@ import * as URL from 'url' -import { Account } from '../models/account' -import { getDotComAPIEndpoint } from './api' +import { Account, isDotComAccount } from '../models/account' /** * Generate a human-friendly description of the Account endpoint. @@ -10,7 +9,7 @@ import { getDotComAPIEndpoint } from './api' * hostname without the protocol and/or path. */ export function friendlyEndpointName(account: Account) { - return account.endpoint === getDotComAPIEndpoint() + return isDotComAccount(account) ? 'GitHub.com' : URL.parse(account.endpoint).hostname || account.endpoint } diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index 6bb2cb08189..af3b11c523f 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -1,8 +1,11 @@ import { StatsDatabase, ILaunchStats, IDailyMeasures } from './stats-database' -import { getDotComAPIEndpoint } from '../api' import { getVersion } from '../../ui/lib/app-proxy' import { hasShownWelcomeFlow } from '../welcome' -import { Account } from '../../models/account' +import { + Account, + isDotComAccount, + isEnterpriseAccount, +} from '../../models/account' import { getOS } from '../get-os' import { Repository } from '../../models/repository' import { merge } from '../../lib/merge' @@ -663,16 +666,9 @@ export class StatsStore implements IStatsStore { /** Determines if an account is a dotCom and/or enterprise user */ private determineUserType(accounts: ReadonlyArray) { - const dotComAccount = !!accounts.find( - a => a.endpoint === getDotComAPIEndpoint() - ) - const enterpriseAccount = !!accounts.find( - a => a.endpoint !== getDotComAPIEndpoint() - ) - return { - dotComAccount, - enterpriseAccount, + dotComAccount: accounts.some(isDotComAccount), + enterpriseAccount: accounts.some(isEnterpriseAccount), } } @@ -808,13 +804,10 @@ export class StatsStore implements IStatsStore { return this.optOut } - public async recordPush( - githubAccount: Account | null, - options?: PushOptions - ) { - if (githubAccount === null) { + public async recordPush(account: Account | null, options?: PushOptions) { + if (account === null) { await this.recordPushToGenericRemote(options) - } else if (githubAccount.endpoint === getDotComAPIEndpoint()) { + } else if (isDotComAccount(account)) { await this.recordPushToGitHub(options) } else { await this.recordPushToGitHubEnterprise(options) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 51f21cd24b5..ab2cd484ddd 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -11,7 +11,7 @@ import { SignInStore, UpstreamRemoteName, } from '.' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { AppMenu, IMenu } from '../../models/app-menu' import { Author } from '../../models/author' import { Branch, BranchType, IAheadBehind } from '../../models/branch' @@ -95,7 +95,6 @@ import { import { API, getAccountForEndpoint, - getDotComAPIEndpoint, IAPIOrganization, getEndpointForRepository, IAPIFullRepository, @@ -3345,7 +3344,7 @@ export class AppStore extends TypedBaseStore { const account = getAccountForRepository(this.accounts, repository) if (repository.gitHubRepository !== null) { if (account !== null) { - if (account.endpoint === getDotComAPIEndpoint()) { + if (isDotComAccount(account)) { this.statsStore.increment('dotcomCommits') } else { this.statsStore.increment('enterpriseCommits') diff --git a/app/src/lib/stores/sign-in-store.ts b/app/src/lib/stores/sign-in-store.ts index fa243b2145a..4d1eb529172 100644 --- a/app/src/lib/stores/sign-in-store.ts +++ b/app/src/lib/stores/sign-in-store.ts @@ -1,5 +1,5 @@ import { Disposable } from 'event-kit' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { fatalError } from '../fatal-error' import { validateURL, @@ -231,9 +231,7 @@ export class SignInStore extends TypedBaseStore { this.reset() } - const existingAccount = this.accounts.find( - x => x.endpoint === getDotComAPIEndpoint() - ) + const existingAccount = this.accounts.find(isDotComAccount) if (existingAccount) { this.setState({ diff --git a/app/src/models/account.ts b/app/src/models/account.ts index 95929859a27..4e4dd956f76 100644 --- a/app/src/models/account.ts +++ b/app/src/models/account.ts @@ -68,3 +68,17 @@ export class Account { return this.name !== '' ? this.name : this.login } } + +/** + * Whether or not the given account is a GitHub.com account as opposed to + * a GitHub Enteprise account. + */ +export const isDotComAccount = (account: Account) => + account.endpoint === getDotComAPIEndpoint() + +/** + * Whether or not the given account is a GitHub Enterprise account (as opposed to + * a GitHub.com account) + */ +export const isEnterpriseAccount = (account: Account) => + !isDotComAccount(account) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 8bb5f504ea7..6aea67d87b6 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -18,7 +18,6 @@ import { RetryAction } from '../models/retry-actions' import { FetchType } from '../models/fetch' import { shouldRenderApplicationMenu } from './lib/features' import { matchExistingRepository } from '../lib/repository-matching' -import { getDotComAPIEndpoint } from '../lib/api' import { getVersion, getName } from './lib/app-proxy' import { getOS, @@ -36,7 +35,11 @@ import { import { Branch } from '../models/branch' import { PreferencesTab } from '../models/preferences' import { findItemByAccessKey, itemIsSelectable } from '../models/app-menu' -import { Account } from '../models/account' +import { + Account, + isDotComAccount, + isEnterpriseAccount, +} from '../models/account' import { TipState } from '../models/tip' import { CloneRepositoryTab } from '../models/clone-repository-tab' import { CloningRepository } from '../models/cloning-repository' @@ -609,17 +612,11 @@ export class App extends React.Component { } private getDotComAccount(): Account | null { - const dotComAccount = this.state.accounts.find( - a => a.endpoint === getDotComAPIEndpoint() - ) - return dotComAccount || null + return this.state.accounts.find(isDotComAccount) ?? null } private getEnterpriseAccount(): Account | null { - const enterpriseAccount = this.state.accounts.find( - a => a.endpoint !== getDotComAPIEndpoint() - ) - return enterpriseAccount || null + return this.state.accounts.find(isEnterpriseAccount) ?? null } private updateBranchWithContributionTargetBranch() { diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 48e57beb624..a2669a35e60 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -24,12 +24,11 @@ import { LinkButton } from '../lib/link-button' import { Foldout, FoldoutType } from '../../lib/app-state' import { IAvatarUser, getAvatarUserFromAuthor } from '../../models/avatar' import { showContextualMenu } from '../../lib/menu-item' -import { Account } from '../../models/account' +import { Account, isEnterpriseAccount } from '../../models/account' import { CommitMessageAvatar, CommitMessageAvatarWarningType, } from './commit-message-avatar' -import { getDotComAPIEndpoint } from '../../lib/api' import { getStealthEmailForUser, isAttributableEmailFor, @@ -677,7 +676,7 @@ export class CommitMessage extends React.Component< user={avatarUser} email={commitAuthor?.email} isEnterpriseAccount={ - repositoryAccount?.endpoint !== getDotComAPIEndpoint() + repositoryAccount !== null && isEnterpriseAccount(repositoryAccount) } warningType={warningType} emailRuleFailures={this.state.repoRuleCommitAuthorFailures} diff --git a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx index 27ef18f984f..6053f31ccaf 100644 --- a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx +++ b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { IFilterListGroup } from '../lib/filter-list' -import { IAPIRepository, getDotComAPIEndpoint, getHTMLURL } from '../../lib/api' +import { IAPIRepository, getHTMLURL } from '../../lib/api' import { ICloneableRepositoryListItem, groupRepositories, @@ -273,11 +273,10 @@ export class CloneableRepositoryFilterList extends React.PureComponent { - const { loading, repositories } = this.props - const endpointName = - this.props.account.endpoint === getDotComAPIEndpoint() - ? 'GitHub.com' - : getHTMLURL(this.props.account.endpoint) + const { loading, repositories, account } = this.props + const endpointName = isDotComAccount(account) + ? 'GitHub.com' + : getHTMLURL(this.props.account.endpoint) if (loading && (repositories === null || repositories.length === 0)) { return ( diff --git a/app/src/ui/invalidated-token/invalidated-token.tsx b/app/src/ui/invalidated-token/invalidated-token.tsx index d1f1c7b6160..e7691bcadaa 100644 --- a/app/src/ui/invalidated-token/invalidated-token.tsx +++ b/app/src/ui/invalidated-token/invalidated-token.tsx @@ -3,8 +3,7 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog' import { Dispatcher } from '../dispatcher' import { Row } from '../lib/row' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' -import { Account } from '../../models/account' -import { getDotComAPIEndpoint } from '../../lib/api' +import { Account, isEnterpriseAccount } from '../../models/account' interface IInvalidatedTokenProps { readonly dispatcher: Dispatcher @@ -18,7 +17,8 @@ interface IInvalidatedTokenProps { */ export class InvalidatedToken extends React.Component { public render() { - const accountTypeSuffix = this.isEnterpriseAccount ? ' Enterprise' : '' + const { account } = this.props + const accountTypeSuffix = isEnterpriseAccount(account) ? ' Enterprise' : '' return ( { ) } - private get isEnterpriseAccount() { - return this.props.account.endpoint !== getDotComAPIEndpoint() - } - private onSubmit = () => { - const { dispatcher, onDismissed } = this.props + const { dispatcher, onDismissed, account } = this.props onDismissed() - if (this.isEnterpriseAccount) { + if (isEnterpriseAccount(account)) { dispatcher.showEnterpriseSignInDialog(this.props.account.endpoint) } else { dispatcher.showDotComSignInDialog() diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx index 80243501454..55cac7f8aa7 100644 --- a/app/src/ui/lib/configure-git-user.tsx +++ b/app/src/ui/lib/configure-git-user.tsx @@ -6,7 +6,7 @@ import { setGlobalConfigValue, } from '../../lib/git/config' import { CommitListItem } from '../history/commit-list-item' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { CommitIdentity } from '../../models/commit-identity' import { Form } from '../lib/form' import { Button } from '../lib/button' @@ -20,7 +20,6 @@ import { ConfigLockFileExists } from './config-lock-file-exists' import { RadioButton } from './radio-button' import { Select } from './select' import { GitEmailNotFoundWarning } from './git-email-not-found-warning' -import { getDotComAPIEndpoint } from '../../lib/api' import { Loading } from './loading' interface IConfigureGitUserProps { @@ -266,8 +265,7 @@ export class ConfigureGitUser extends React.Component< return } - const accountTypeSuffix = - account.endpoint === getDotComAPIEndpoint() ? '' : ' Enterprise' + const accountTypeSuffix = isDotComAccount(account) ? '' : ' Enterprise' return (
diff --git a/app/src/ui/lib/git-email-not-found-warning.tsx b/app/src/ui/lib/git-email-not-found-warning.tsx index 56de1ce113c..2343a0477ce 100644 --- a/app/src/ui/lib/git-email-not-found-warning.tsx +++ b/app/src/ui/lib/git-email-not-found-warning.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { LinkButton } from './link-button' -import { getDotComAPIEndpoint } from '../../lib/api' import { isAttributableEmailFor } from '../../lib/email' import { Octicon } from '../octicons' import * as octicons from '../octicons/octicons.generated' @@ -88,10 +87,9 @@ export class GitEmailNotFoundWarning extends React.Component { const accounts = this.props.accounts switch (tab) { case PublishTab.DotCom: - return accounts.find(a => a.endpoint === getDotComAPIEndpoint()) || null + return accounts.find(isDotComAccount) ?? null case PublishTab.Enterprise: - return accounts.find(a => a.endpoint !== getDotComAPIEndpoint()) || null + return accounts.find(isEnterpriseAccount) ?? null default: return assertNever(tab, `Unknown tab: ${tab}`) } diff --git a/app/src/ui/repository-settings/git-config.tsx b/app/src/ui/repository-settings/git-config.tsx index d8968ef37bc..d9383a224b3 100644 --- a/app/src/ui/repository-settings/git-config.tsx +++ b/app/src/ui/repository-settings/git-config.tsx @@ -1,8 +1,11 @@ import * as React from 'react' import { DialogContent } from '../dialog' -import { Account } from '../../models/account' +import { + Account, + isDotComAccount, + isEnterpriseAccount, +} from '../../models/account' import { GitConfigUserForm } from '../lib/git-config-user-form' -import { getDotComAPIEndpoint } from '../../lib/api' import { Row } from '../lib/row' import { RadioGroup } from '../lib/radio-group' import { assertNever } from '../../lib/fatal-error' @@ -45,11 +48,10 @@ export class GitConfig extends React.Component { } public render() { - const isDotComAccount = - this.props.account !== null && - this.props.account.endpoint === getDotComAPIEndpoint() - const enterpriseAccount = isDotComAccount ? null : this.props.account - const dotComAccount = isDotComAccount ? this.props.account : null + const { account } = this.props + const dotComAccount = account && isDotComAccount(account) ? account : null + const enterpriseAccount = + account && isEnterpriseAccount(account) ? account : null const configOptions = [GitConfigLocation.Global, GitConfigLocation.Local] const selectionOption = From 553efda556b749adeb8743c1089d816a5d80b8f6 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Feb 2025 16:20:18 +0100 Subject: [PATCH 0070/1338] No one saw that --- app/src/lib/endpoint-capabilities.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/endpoint-capabilities.ts b/app/src/lib/endpoint-capabilities.ts index b39d0372a7e..eecfe55594b 100644 --- a/app/src/lib/endpoint-capabilities.ts +++ b/app/src/lib/endpoint-capabilities.ts @@ -42,7 +42,7 @@ const versionCache = new Map() const endpointVersionKey = (ep: string) => `endpoint-version:${ep}` /** - * Whether or not the given endpoint belong's to GitHub.com + * Whether or not the given endpoint belongs to GitHub.com */ export const isDotCom = (ep: string) => { if (ep === getDotComAPIEndpoint()) { From da0317bddbc256bee24333a4ff93b2d193f68f23 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 26 Feb 2025 10:29:23 -0500 Subject: [PATCH 0071/1338] Release 3.4.17 --- app/package.json | 2 +- changelog.json | 14 ++++++++++++++ script/validate-electron-version.ts | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 4e16765d6b6..3e8e96860d9 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.17-beta3", + "version": "3.4.17", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index ea590403af5..91e83712db1 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,19 @@ { "releases": { + "3.4.17": [ + "[Fixed] Dialogs announce their titles on macOS Sequoia for VoiceOver users - #20009", + "[Fixed] The commit button words are separated by spaces for screen reader users - #20011", + "[Fixed] Prevent crash when attempting to launch external editor with insufficient permissions - #19929", + "[Fixed] Running the Desktop CLI on Windows no longer waits for Desktop to exit before exiting itself - #19916", + "[Improved] Announce update progress in about dialog - #20018", + "[Improved] Buttons with dropdown caret that trigger context menus can be opened with down arrow - #20007", + "[Improved] Links that do not open external urls now have a role of button for improved screen reader semantics - #20010", + "[Improved] Email attribution warning only considers verified emails - #19968", + "[Improved] Improve tooltip for unknown co-authors - #19992", + "[Improved] The length of shortened SHAs are consistently 9 characters - #19902. Thanks @molnarriso!", + "[Improved] Upgrade Electron to v34.0.1 - #19919", + "[Removed] Remove support for macOS 10.15 - #19919" + ], "3.4.17-beta3": [ "[Fixed] Dialogs announce their titles on macOS Sequoia for VoiceOver users - #20009", "[Fixed] The commit button words are separated by spaces for screen reader users - #20011", diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index 5d4856e2a00..5cb3e0bc208 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -18,7 +18,7 @@ type ChannelToValidate = 'production' | 'beta' * to a previous version of GitHub Desktop without losing all settings. */ const ValidElectronVersions: Record = { - production: '32.1.2', + production: '34.0.1', beta: '34.0.1', } From dd36e2aab03bde5d0bc8b304d6622b101a488543 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 26 Feb 2025 12:49:41 -0500 Subject: [PATCH 0072/1338] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 91e83712db1..8bac5fcaea5 100644 --- a/changelog.json +++ b/changelog.json @@ -10,7 +10,7 @@ "[Improved] Links that do not open external urls now have a role of button for improved screen reader semantics - #20010", "[Improved] Email attribution warning only considers verified emails - #19968", "[Improved] Improve tooltip for unknown co-authors - #19992", - "[Improved] The length of shortened SHAs are consistently 9 characters - #19902. Thanks @molnarriso!", + "[Improved] The length of shortened SHAs are consistently 7 characters - #19902. Thanks @molnarriso!", "[Improved] Upgrade Electron to v34.0.1 - #19919", "[Removed] Remove support for macOS 10.15 - #19919" ], From 7956a88d3db372507fa534af8f4bd506af967cbf Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 26 Feb 2025 13:17:40 -0500 Subject: [PATCH 0073/1338] Button to show/hide filter with filter options --- app/src/ui/changes/filter-changes-list.tsx | 186 ++++++++++++++++++--- app/src/ui/lib/checkbox.tsx | 3 + app/styles/ui/changes/_changes-list.scss | 94 +++++++---- 3 files changed, 226 insertions(+), 57 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 1b6ddaae702..961d21f0779 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -60,8 +60,13 @@ import { IFilterListGroup, IFilterListItem } from '../lib/filter-list' import { ClickSource } from '../lib/list' import memoizeOne from 'memoize-one' import { IMatches } from '../../lib/fuzzy-find' -import { Button } from '../lib/button' import { TextBox } from '../lib/text-box' +import { Button } from '../lib/button' +import { + Popover, + PopoverAnchorPosition, + PopoverDecoration, +} from '../lib/popover' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -216,6 +221,8 @@ interface IFilterChangesListState { readonly focusedRow: string | null readonly groups: ReadonlyArray> readonly filterToIncludedCommit: boolean + readonly showFilter: boolean + readonly isFilterOptionsOpen: boolean } function getSelectedItemsFromProps( @@ -321,6 +328,7 @@ export class FilterChangesList extends React.Component< ) private headerRef = createObservableRef() + private filterOptionsButtonRef: HTMLButtonElement | null = null private includeAllCheckBoxRef = React.createRef() private filterListRef = React.createRef>() @@ -340,6 +348,8 @@ export class FilterChangesList extends React.Component< focusedRow: null, groups, filterToIncludedCommit: false, + showFilter: false, + isFilterOptionsOpen: false, } } @@ -1152,7 +1162,6 @@ export class FilterChangesList extends React.Component< const { files } = workingDirectory const visibleFiles = this.state.filteredItems.size - const filesDescription = `${visibleFiles}/${files.length}` const includeAllValue = this.getCheckAllValue( workingDirectory, @@ -1163,9 +1172,18 @@ export class FilterChangesList extends React.Component< const disableAllCheckbox = files.length === 0 || isCommitting || rebaseConflictState !== null - const toBeCommittedFilterText = this.state.filterToIncludedCommit - ? 'Show files included and not included in the commit' - : 'Only show files to be included in the commit' + const fileCount = files.length + + const filesChecked = workingDirectory.files.filter( + f => f.selection.getSelectionType() !== DiffSelectionType.None + ) + + const showHiddenCheckedFilesWarning = this.isCommittingFileHiddenByFilter( + this.state.filterText, + filesChecked.map(f => f.id), + this.state.filteredItems, + fileCount + ) return (
- + {this.renderFilterBox()} +
+ + + + + {showHiddenCheckedFilesWarning ? ( + + ) : null} + + {this.state.filterToIncludedCommit ? ( + + ) : null} + + + + {this.state.isFilterOptionsOpen && this.renderFilterOptions()} +
+
+ ) + } - + private onFilterOptionsButtonRef = (buttonRef: HTMLButtonElement | null) => { + this.filterOptionsButtonRef = buttonRef + } + private openFilterOptions = () => { + if (!this.state.showFilter) { + this.setState({ showFilter: !this.state.showFilter }) + return + } + this.setState({ isFilterOptionsOpen: true }) + } + + private closeFilterOptions = () => { + this.setState({ isFilterOptionsOpen: false }) + } + private renderFilterOptions() { + const filesSelectedCount = this.props.workingDirectory.files.filter( + f => f.selection.getSelectionType() !== DiffSelectionType.None + ).length + + return ( + +
+

Filter Options

+ +
+
+ +
+ + + + ) + } + + private disableFilters = () => { + this.setState({ + showFilter: false, + filterText: '', + filterToIncludedCommit: false, + isFilterOptionsOpen: false, + }) + } + + private clearNonTextFilters = () => { + this.setState({ filterToIncludedCommit: false }) + } + + private renderFilterBox = () => { + if (!this.state.showFilter) { + return + } + + return ( +
- -
) } @@ -1298,6 +1435,7 @@ export class FilterChangesList extends React.Component< this.setState({ filterToIncludedCommit: !this.state.filterToIncludedCommit, }) + this.closeFilterOptions() } private onChangedFileFocus = (changeListItem: IChangesListItem) => { diff --git a/app/src/ui/lib/checkbox.tsx b/app/src/ui/lib/checkbox.tsx index 716f5b202a7..4c9cbc8b8fc 100644 --- a/app/src/ui/lib/checkbox.tsx +++ b/app/src/ui/lib/checkbox.tsx @@ -31,6 +31,8 @@ interface ICheckboxProps { /** An aria description of a checkbox - intended to provide more verbose * information than a label that a the user might need */ readonly ariaDescribedBy?: string + + readonly className?: string } interface ICheckboxState { @@ -121,6 +123,7 @@ export class Checkbox extends React.Component { disabled={this.props.disabled} aria-describedby={this.props.ariaDescribedBy} aria-labelledby={this.props.ariaLabelledBy} + className={this.props.className} /> {this.renderLabel()}
diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 16bb58c401d..fc64fdefbe2 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -19,7 +19,7 @@ flex: 0 0 auto; } - .checkbox-component { + .changes-list-check-all { align-items: center; height: 100%; position: relative; @@ -45,57 +45,85 @@ } &.filtered-changes-list { + .filter-options-popover { + .filter-options-header { + display: flex; + justify-content: space-between; + align-items: center; + h3 { + margin-bottom: var(--spacing-half); + } + } + + .filter-options { + margin: var(--spacing) 0; + } + + .popover-content { + padding: var(--spacing); + } + + @include close-button; + + .close{ + margin: 0; + } + } + .header { display: flex; - align-items: center; height: auto; + flex-direction: column; + padding: var(--spacing-half) var(--spacing); + margin: 0; - label { - text-align: right; - padding: 0 var(--spacing-half); + .filter-box-container { + display: flex; + align-items: center; + margin-bottom: var(--spacing-half); + transition: all .3s ease-out; } - > button { - padding: 1px 3px; - margin-left: var(--spacing-half); - border: none; - height: auto; + .checkbox-container { + display: flex; + align-items: center; - &:focus-visible { - outline-offset: 0px; + .spacer { + flex-grow: 1; } - &:hover { - color: var(--text-secondary-color); - background-color: var(--secondary-button-background); - } + .filter-button { + padding: 0; + height: auto; + border: none; - &.included-in-commit-filter-on { - color: var(--link-button-color); + &.remove-filter { + margin-right: var(--spacing-half); + } + &.hidden-files-warning { + margin-right: var(--spacing-half); + } + &:hover { - color: var(--link-button-hover-color); + color: var(--text-secondary-color); + background-color: inherit; } } + + } + + label { + text-align: right; + padding: 0 var(--spacing-half); } } } .filter-list { - flex-grow: 1; - display: flex; - flex-direction: column; - min-height: 100px; - - .filter-field-row { - background-color: var(--box-alt-background-color); - padding: var(--spacing-half) var(--spacing); - margin: 0; - } - - .filter-list-container { - height: 100%; - } + // This is important when app is zoomed in. Otherwise, the filter list + // will be overlapped by the commit message form. + min-height: 0; } .no-changes-in-list { From ffeaee817c9b7e43104e07e77cb40059a4e5050d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Feb 2025 10:15:14 +0100 Subject: [PATCH 0074/1338] Stop passing specific account types to account preferences --- app/src/ui/app.tsx | 1 + app/src/ui/preferences/accounts.tsx | 31 +++++++++++++------------- app/src/ui/preferences/preferences.tsx | 9 ++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 6aea67d87b6..67e17a2b269 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -1524,6 +1524,7 @@ export class App extends React.Component { key="preferences" initialSelectedTab={popup.initialSelectedTab} dispatcher={this.props.dispatcher} + accounts={this.state.accounts} dotComAccount={this.getDotComAccount()} confirmRepositoryRemoval={ this.state.askForConfirmationOnRepositoryRemoval diff --git a/app/src/ui/preferences/accounts.tsx b/app/src/ui/preferences/accounts.tsx index 0d961e2c426..8671a4a31e6 100644 --- a/app/src/ui/preferences/accounts.tsx +++ b/app/src/ui/preferences/accounts.tsx @@ -1,5 +1,9 @@ import * as React from 'react' -import { Account } from '../../models/account' +import { + Account, + isDotComAccount, + isEnterpriseAccount, +} from '../../models/account' import { IAvatarUser } from '../../models/avatar' import { lookupPreferredEmail } from '../../lib/email' import { assertNever } from '../../lib/fatal-error' @@ -10,8 +14,7 @@ import { Avatar } from '../lib/avatar' import { CallToAction } from '../lib/call-to-action' interface IAccountsProps { - readonly dotComAccount: Account | null - readonly enterpriseAccount: Account | null + readonly accounts: ReadonlyArray readonly onDotComSignIn: () => void readonly onEnterpriseSignIn: () => void @@ -25,19 +28,20 @@ enum SignInType { export class Accounts extends React.Component { public render() { + const { accounts } = this.props + const dotComAccount = accounts.find(isDotComAccount) + const enterpriseAccount = accounts.find(isEnterpriseAccount) + return (

GitHub.com

- {this.props.dotComAccount - ? this.renderAccount(this.props.dotComAccount, SignInType.DotCom) + {dotComAccount + ? this.renderAccount(dotComAccount, SignInType.DotCom) : this.renderSignIn(SignInType.DotCom)}

GitHub Enterprise

- {this.props.enterpriseAccount - ? this.renderAccount( - this.props.enterpriseAccount, - SignInType.Enterprise - ) + {enterpriseAccount + ? this.renderAccount(enterpriseAccount, SignInType.Enterprise) : this.renderSignIn(SignInType.Enterprise)} ) @@ -54,11 +58,6 @@ export class Accounts extends React.Component { const accountTypeLabel = type === SignInType.DotCom ? 'GitHub.com' : 'GitHub Enterprise' - const accounts = [ - ...(this.props.dotComAccount ? [this.props.dotComAccount] : []), - ...(this.props.enterpriseAccount ? [this.props.enterpriseAccount] : []), - ] - // The DotCom account is shown first, so its sign in/out button should be // focused initially when the dialog is opened. const className = @@ -67,7 +66,7 @@ export class Accounts extends React.Component { return (
- +
{account.name}
@{account.login}
diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx index 53f97e7850d..3d6ac74f3e8 100644 --- a/app/src/ui/preferences/preferences.tsx +++ b/app/src/ui/preferences/preferences.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Account } from '../../models/account' +import { Account, isDotComAccount } from '../../models/account' import { PreferencesTab } from '../../models/preferences' import { Dispatcher } from '../dispatcher' import { TabBar, TabBarType } from '../tab-bar' @@ -50,6 +50,7 @@ import { interface IPreferencesProps { readonly dispatcher: Dispatcher + readonly accounts: ReadonlyArray readonly dotComAccount: Account | null readonly enterpriseAccount: Account | null readonly repository: Repository | null @@ -206,7 +207,8 @@ export class Preferences extends React.Component< let committerEmail = initialCommitterEmail if (!committerName || !committerEmail) { - const account = this.props.dotComAccount || this.props.enterpriseAccount + const { accounts } = this.props + const account = accounts.find(isDotComAccount) ?? accounts.at(0) if (account) { if (!committerName) { @@ -394,8 +396,7 @@ export class Preferences extends React.Component< case PreferencesTab.Accounts: View = ( Date: Thu, 27 Feb 2025 10:15:56 +0100 Subject: [PATCH 0075/1338] Keep track of when a commit message was generated by copilot (MIGHT NEED TO REVERT IT) --- app/src/models/commit.ts | 5 +++++ app/src/ui/changes/commit-message.tsx | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/models/commit.ts b/app/src/models/commit.ts index e2e1814d38b..0ce8d724493 100644 --- a/app/src/models/commit.ts +++ b/app/src/models/commit.ts @@ -17,6 +17,11 @@ export interface ICommitContext { * Additional details for the commit message (optional) */ readonly description: string | null + /** + * Whether or not the message was generated by Copilot + * (optional, default: false) + */ + readonly messageGeneratedByCopilot?: boolean /** * Whether or not it should amend the last commit (optional, default: false) */ diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 49a7b06b815..a9c429d12fd 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -421,6 +421,8 @@ export class CommitMessage extends React.Component< description: this.state.commitMessage.description, trailers: this.getCoAuthorTrailers(), amend: this.props.commitToAmend !== null, + messageGeneratedByCopilot: + this.state.commitMessage.generatedByCopilot ?? false, } const msg = await formatCommitMessage(this.props.repository, context) @@ -558,11 +560,13 @@ export class CommitMessage extends React.Component< const trailers = this.getCoAuthorTrailers() - const commitContext = { + const commitContext: ICommitContext = { summary: this.summaryOrPlaceholder, description, trailers, amend: this.props.commitToAmend !== null, + messageGeneratedByCopilot: + this.state.commitMessage.generatedByCopilot ?? false, } if ( From ea70f8366ddc96025829bad88083331636ffb194 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Feb 2025 13:44:39 +0100 Subject: [PATCH 0076/1338] Pass accounts to GitConfig preferences tab --- app/src/lib/email.ts | 10 ++ app/src/ui/app.tsx | 2 - app/src/ui/lib/git-config-user-form.tsx | 135 +++++++++--------- app/src/ui/preferences/git.tsx | 6 +- app/src/ui/preferences/preferences.tsx | 5 +- app/src/ui/repository-settings/git-config.tsx | 21 ++- 6 files changed, 89 insertions(+), 90 deletions(-) diff --git a/app/src/lib/email.ts b/app/src/lib/email.ts index ee06ea2fe3d..fbd00259156 100644 --- a/app/src/lib/email.ts +++ b/app/src/lib/email.ts @@ -73,6 +73,16 @@ export function getLegacyStealthEmailForUser(login: string, endpoint: string) { return `${login}@${stealthEmailHost}` } +/** + * Generate a stealth email address for the account. Convenience method + * for getStealthEmailForUser that takes an Account object instead of + * individual parameters. + * + * Ex: 123456+desktop@users.noreply.github.com + */ +export const getStealthEmailForAccount = (account: Account) => + getStealthEmailForUser(account.id, account.login, account.endpoint) + /** * Generate a stealth email address for the user on the given * server. diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 67e17a2b269..28159b85c10 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -1525,7 +1525,6 @@ export class App extends React.Component { initialSelectedTab={popup.initialSelectedTab} dispatcher={this.props.dispatcher} accounts={this.state.accounts} - dotComAccount={this.getDotComAccount()} confirmRepositoryRemoval={ this.state.askForConfirmationOnRepositoryRemoval } @@ -1551,7 +1550,6 @@ export class App extends React.Component { notificationsEnabled={this.state.notificationsEnabled} optOutOfUsageTracking={this.state.optOutOfUsageTracking} useExternalCredentialHelper={this.state.useExternalCredentialHelper} - enterpriseAccount={this.getEnterpriseAccount()} repository={repository} onDismissed={onPopupDismissedFn} selectedShell={this.state.selectedShell} diff --git a/app/src/ui/lib/git-config-user-form.tsx b/app/src/ui/lib/git-config-user-form.tsx index 6df6d8c09a0..c55883e210f 100644 --- a/app/src/ui/lib/git-config-user-form.tsx +++ b/app/src/ui/lib/git-config-user-form.tsx @@ -1,10 +1,15 @@ import * as React from 'react' import { TextBox } from './text-box' import { Row } from './row' -import { Account } from '../../models/account' +import { + Account, + isDotComAccount, + isEnterpriseAccount, +} from '../../models/account' import { Select } from './select' import { GitEmailNotFoundWarning } from './git-email-not-found-warning' -import { getStealthEmailForUser } from '../../lib/email' +import { getStealthEmailForAccount } from '../../lib/email' +import memoizeOne from 'memoize-one' const OtherEmailSelectValue = 'Other' @@ -12,9 +17,14 @@ interface IGitConfigUserFormProps { readonly name: string readonly email: string - readonly dotComAccount: Account | null - readonly enterpriseAccount: Account | null - + /** + * The accounts from which to source candidates for email selection + * + * When the GitConfigUserForm is used from the repository settings, this + * should contain only the account associated with the current repository but + * when used from the Preferences dialog it should contain all accounts. + */ + readonly accounts: ReadonlyArray readonly disabled?: boolean readonly onNameChanged: (name: string) => void @@ -32,6 +42,12 @@ interface IGitConfigUserFormState { readonly emailIsOther: boolean } +type AccountEmail = { + readonly email: string + readonly normalizedEmail: string + readonly account: Account +} + /** * Form with a name and email address used to present and change the user's info * via git config. @@ -46,17 +62,50 @@ export class GitConfigUserForm extends React.Component< > { private emailInputRef = React.createRef() + private getAccountEmailsFromAccounts = memoizeOne( + (accounts: ReadonlyArray) => { + const seenEmails = new Set() + const accountEmails = new Array() + + for (const account of accounts) { + const verifiedEmails = account.emails + .filter(x => x.verified) + .map(x => x.email) + + // For GitHub.com we always include the stealth email, see + // https://github.com/desktop/desktop/pull/19968 + const emails = isDotComAccount(account) + ? [...verifiedEmails, getStealthEmailForAccount(account)] + : verifiedEmails + + for (const email of emails) { + const normalizedEmail = email.toLowerCase() + + if (!seenEmails.has(normalizedEmail)) { + seenEmails.add(normalizedEmail) + accountEmails.push({ email, normalizedEmail, account }) + } + } + } + + return accountEmails + } + ) + public constructor(props: IGitConfigUserFormProps) { super(props) this.state = { emailIsOther: - this.accountEmails.length > 0 && - !this.accountEmails.includes(this.props.email) && - !this.props.isLoadingGitConfig, + !this.isValidEmail(props.email) && !props.isLoadingGitConfig, } } + private isValidEmail = (email: string) => { + const normalizedEmail = email.toLowerCase() + return this.accountEmails.some(x => x.normalizedEmail === normalizedEmail) + } + public componentDidUpdate( prevProps: IGitConfigUserFormProps, prevState: IGitConfigUserFormState @@ -74,8 +123,7 @@ export class GitConfigUserForm extends React.Component< if (prevProps.email !== this.props.email && !isEmailInputFocused) { this.setState({ emailIsOther: - this.accountEmails.length > 0 && - !this.accountEmails.includes(this.props.email) && + !this.isValidEmail(this.props.email) && !this.props.isLoadingGitConfig, }) } @@ -108,7 +156,7 @@ export class GitConfigUserForm extends React.Component< {this.renderEmailTextBox()} {this.state.emailIsOther ? ( ) : null} @@ -121,36 +169,14 @@ export class GitConfigUserForm extends React.Component< return null } - const { dotComAccount } = this.props - - const dotComEmails = - dotComAccount?.emails.filter(x => x.verified).map(e => e.email) ?? [] - - if (dotComAccount) { - const { id, login, endpoint } = dotComAccount - const stealthEmail = getStealthEmailForUser(id, login, endpoint) - - if ( - !dotComEmails - .map(x => x.toLowerCase()) - .includes(stealthEmail.toLowerCase()) - ) { - dotComEmails.push(stealthEmail) - } - } - - const enterpriseEmails = - this.props.enterpriseAccount?.emails - .filter(x => x.verified) - .map(e => e.email) ?? [] - // When the user signed in both accounts, show a suffix to differentiate // the origin of each email address const shouldShowAccountType = - this.props.dotComAccount !== null && this.props.enterpriseAccount !== null + this.props.accounts.some(isDotComAccount) && + this.props.accounts.some(isEnterpriseAccount) - const dotComSuffix = shouldShowAccountType ? '(GitHub.com)' : '' - const enterpriseSuffix = shouldShowAccountType ? '(GitHub Enterprise)' : '' + const accountSuffix = (account: Account) => + isDotComAccount(account) ? '(GitHub.com)' : '(GitHub Enterprise)' return ( @@ -162,14 +188,9 @@ export class GitConfigUserForm extends React.Component< disabled={this.props.disabled} onChange={this.onEmailSelectChange} > - {dotComEmails.map(e => ( - - ))} - {enterpriseEmails.map(e => ( - ))}
) From 6bb7898f14e3477b4bd6f2ae88ef3955debc3076 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Feb 2025 15:37:27 +0100 Subject: [PATCH 0078/1338] List all enterprise accounts in Accounts tab --- app/src/lib/feature-flag.ts | 1 + app/src/ui/preferences/accounts.tsx | 54 +++++++++++++++++++++++++---- app/styles/ui/_preferences.scss | 1 + 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 5bc16eda80b..95f57ef34f9 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -103,3 +103,4 @@ export const enableResizingToolbarButtons = () => true export const enableGitConfigParameters = enableBetaFeatures export const enableFilteredChangesList = enableDevelopmentFeatures +export const enableMultipleEnterpriseAccounts = enableDevelopmentFeatures diff --git a/app/src/ui/preferences/accounts.tsx b/app/src/ui/preferences/accounts.tsx index a57ec78fa0e..4853897fd54 100644 --- a/app/src/ui/preferences/accounts.tsx +++ b/app/src/ui/preferences/accounts.tsx @@ -12,6 +12,8 @@ import { Row } from '../lib/row' import { DialogContent, DialogPreferredFocusClassName } from '../dialog' import { Avatar } from '../lib/avatar' import { CallToAction } from '../lib/call-to-action' +import { enableMultipleEnterpriseAccounts } from '../../lib/feature-flag' +import { getHTMLURL } from '../../lib/api' interface IAccountsProps { readonly accounts: ReadonlyArray @@ -30,7 +32,6 @@ export class Accounts extends React.Component { public render() { const { accounts } = this.props const dotComAccount = accounts.find(isDotComAccount) - const enterpriseAccount = accounts.find(isEnterpriseAccount) return ( @@ -40,13 +41,40 @@ export class Accounts extends React.Component { : this.renderSignIn(SignInType.DotCom)}

GitHub Enterprise

- {enterpriseAccount - ? this.renderAccount(enterpriseAccount, SignInType.Enterprise) - : this.renderSignIn(SignInType.Enterprise)} + {enableMultipleEnterpriseAccounts() + ? this.renderMultipleEnterpriseAccounts() + : this.renderSingleEnterpriseAccount()} ) } + private renderSingleEnterpriseAccount() { + const enterpriseAccount = this.props.accounts.find(isEnterpriseAccount) + + return enterpriseAccount + ? this.renderAccount(enterpriseAccount, SignInType.Enterprise) + : this.renderSignIn(SignInType.Enterprise) + } + + private renderMultipleEnterpriseAccounts() { + const enterpriseAccounts = this.props.accounts.filter(isEnterpriseAccount) + + return ( + <> + {enterpriseAccounts.map(account => { + return this.renderAccount(account, SignInType.Enterprise) + })} + {enterpriseAccounts.length === 0 ? ( + this.renderSignIn(SignInType.Enterprise) + ) : ( + + )} + + ) + } + private renderAccount(account: Account, type: SignInType) { const avatarUser: IAvatarUser = { name: account.name, @@ -65,8 +93,22 @@ export class Accounts extends React.Component {
-
{account.name}
-
@{account.login}
+ {enableMultipleEnterpriseAccounts() && + isEnterpriseAccount(account) ? ( + <> +
+ {account.name === account.login + ? `@${account.login}` + : `@${account.login} (${account.name})`} +
+
{getHTMLURL(account.endpoint)}
+ + ) : ( + <> +
{account.name}
+
@{account.login}
+ + )}
- + Disable Filter ) } diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index eaddfd5d2e1..a97f370c61e 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -46,6 +46,8 @@ &.filtered-changes-list { .filter-options-popover { + text-align: right; + .filter-options-header { display: flex; justify-content: space-between; From cbec836fd844ab59b49470c27217587736d68983 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 27 Feb 2025 14:36:41 -0500 Subject: [PATCH 0087/1338] Make Filter icon blue when filters are active --- app/src/ui/changes/filter-changes-list.tsx | 4 +++- app/styles/ui/changes/_changes-list.scss | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index e836883cd3e..fb400e11c0b 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1228,7 +1228,9 @@ export class FilterChangesList extends React.Component< ) : null} - ) : null} - - {this.state.filterToIncludedCommit ? ( - - ) : null} +
+ + + + {showHiddenCheckedFilesWarning ? ( + ) : null} - {this.state.isFilterOptionsOpen && this.renderFilterOptions()} -
+ {this.state.filterToIncludedCommit ? ( + + ) : null} + + + + {this.state.isFilterOptionsOpen && this.renderFilterOptions()}
) } @@ -1259,8 +1265,8 @@ export class FilterChangesList extends React.Component< this.filterOptionsButtonRef = buttonRef } private openFilterOptions = () => { - if (!this.state.showFilter) { - this.setState({ showFilter: !this.state.showFilter }) + if (!this.props.canFilterChanges) { + this.props.dispatcher.setCanFilterChanges(true) return } this.setState({ isFilterOptionsOpen: true }) @@ -1314,11 +1320,11 @@ export class FilterChangesList extends React.Component< private disableFilters = () => { this.setState({ - showFilter: false, filterText: '', filterToIncludedCommit: false, isFilterOptionsOpen: false, }) + this.props.dispatcher.setCanFilterChanges(false) } private clearNonTextFilters = () => { @@ -1326,7 +1332,7 @@ export class FilterChangesList extends React.Component< } private renderFilterBox = () => { - if (!this.state.showFilter) { + if (!this.props.canFilterChanges) { return } diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 34f3c23c98e..84be80dda83 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -400,10 +400,9 @@ export class ChangesSidebar extends React.Component { this.props.repository ) - const ChangesListComponent = - enableFilteredChangesList() && this.props.canFilterChanges - ? FilterChangesList - : ChangesList + const ChangesListComponent = enableFilteredChangesList() + ? FilterChangesList + : ChangesList return (
@@ -458,6 +457,7 @@ export class ChangesSidebar extends React.Component { currentRepoRulesInfo={currentRepoRulesInfo} aheadBehind={this.props.aheadBehind} accounts={this.props.accounts} + canFilterChanges={this.props.canFilterChanges} /> {this.renderUndoCommit(rebaseConflictState)}
diff --git a/app/src/ui/preferences/advanced.tsx b/app/src/ui/preferences/advanced.tsx index 3ebfd60c428..d27fb62c2e4 100644 --- a/app/src/ui/preferences/advanced.tsx +++ b/app/src/ui/preferences/advanced.tsx @@ -4,19 +4,16 @@ import { Checkbox, CheckboxValue } from '../lib/checkbox' import { LinkButton } from '../lib/link-button' import { SamplesURL } from '../../lib/stats' import { isWindowsOpenSSHAvailable } from '../../lib/ssh/ssh' -import { enableFilteredChangesList } from '../../lib/feature-flag' interface IAdvancedPreferencesProps { readonly useWindowsOpenSSH: boolean readonly optOutOfUsageTracking: boolean readonly useExternalCredentialHelper: boolean readonly repositoryIndicatorsEnabled: boolean - readonly canFilterChanges: boolean readonly onUseWindowsOpenSSHChanged: (checked: boolean) => void readonly onOptOutofReportingChanged: (checked: boolean) => void readonly onUseExternalCredentialHelperChanged: (checked: boolean) => void readonly onRepositoryIndicatorsEnabledChanged: (enabled: boolean) => void - readonly onCanFilterChangesChanged: (enabled: boolean) => void } interface IAdvancedPreferencesState { @@ -77,12 +74,6 @@ export class Advanced extends React.Component< this.props.onUseWindowsOpenSSHChanged(event.currentTarget.checked) } - private onCanFilterChangesChanged = ( - event: React.FormEvent - ) => { - this.props.onCanFilterChangesChanged(event.currentTarget.checked) - } - private reportDesktopUsageLabel() { return ( @@ -162,32 +153,10 @@ export class Advanced extends React.Component<

- {this.renderFilteredChangesSetting()} ) } - private renderFilteredChangesSetting() { - if (!enableFilteredChangesList()) { - return - } - - return ( - <> -

Filter Changes

-
- -
{' '} - - ) - } - private renderSSHSettings() { if (!this.state.canUseWindowsSSH) { return null diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx index 53f97e7850d..485da893886 100644 --- a/app/src/ui/preferences/preferences.tsx +++ b/app/src/ui/preferences/preferences.tsx @@ -81,7 +81,6 @@ interface IPreferencesProps { readonly onEditGlobalGitConfig: () => void readonly underlineLinks: boolean readonly showDiffCheckMarks: boolean - readonly canFilterChanges: boolean } interface IPreferencesState { @@ -134,8 +133,6 @@ interface IPreferencesState { readonly underlineLinks: boolean readonly showDiffCheckMarks: boolean - - readonly canFilterChanges: boolean } /** @@ -193,7 +190,6 @@ export class Preferences extends React.Component< isLoadingGitConfig: true, underlineLinks: this.props.underlineLinks, showDiffCheckMarks: this.props.showDiffCheckMarks, - canFilterChanges: this.props.canFilterChanges, } } @@ -521,7 +517,6 @@ export class Preferences extends React.Component< optOutOfUsageTracking={this.state.optOutOfUsageTracking} useExternalCredentialHelper={this.state.useExternalCredentialHelper} repositoryIndicatorsEnabled={this.state.repositoryIndicatorsEnabled} - canFilterChanges={this.state.canFilterChanges} onUseWindowsOpenSSHChanged={this.onUseWindowsOpenSSHChanged} onOptOutofReportingChanged={this.onOptOutofReportingChanged} onUseExternalCredentialHelperChanged={ @@ -530,7 +525,6 @@ export class Preferences extends React.Component< onRepositoryIndicatorsEnabledChanged={ this.onRepositoryIndicatorsEnabledChanged } - onCanFilterChangesChanged={this.onCanFilterChangesChanged} /> ) break @@ -566,10 +560,6 @@ export class Preferences extends React.Component< this.setState({ repositoryIndicatorsEnabled }) } - private onCanFilterChangesChanged = (canFilterChanges: boolean) => { - this.setState({ canFilterChanges }) - } - private onLockFileDeleted = () => { this.setState({ existingLockFilePath: undefined }) } @@ -838,8 +828,6 @@ export class Preferences extends React.Component< dispatcher.setDiffCheckMarksSetting(this.state.showDiffCheckMarks) - dispatcher.setCanFilterChanges(this.state.canFilterChanges) - this.props.onDismissed() } From 25027b99186860c677388fd63266425ecd2178c7 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 27 Feb 2025 15:27:54 -0500 Subject: [PATCH 0091/1338] Flip beta flag --- app/src/lib/feature-flag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 5bc16eda80b..5d9cb614e7f 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -102,4 +102,4 @@ export const enableCustomIntegration = () => true export const enableResizingToolbarButtons = () => true export const enableGitConfigParameters = enableBetaFeatures -export const enableFilteredChangesList = enableDevelopmentFeatures +export const enableFilteredChangesList = enableBetaFeatures From 2a244ae91ca463cbaf71f7601ff5b0a85d0d8577 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 27 Feb 2025 16:46:45 -0500 Subject: [PATCH 0092/1338] Update filter count based on text filter --- app/src/ui/changes/filter-changes-list.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a0c56b903d3..de2eb0d6a3f 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1277,8 +1277,13 @@ export class FilterChangesList extends React.Component< } private renderFilterOptions() { - const filesSelectedCount = this.props.workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None + const checkedFilesThatAreVisibleCount = [ + ...this.state.filteredItems.values(), + ].filter( + f => + this.props.workingDirectory + .findFileWithID(f.id) + ?.selection.getSelectionType() !== DiffSelectionType.None ).length return ( @@ -1309,7 +1314,7 @@ export class FilterChangesList extends React.Component< : CheckboxValue.Off } onChange={this.onFilterToIncludedInCommit} - label={`Show Only Checked Files (${filesSelectedCount})`} + label={`Being committed (${checkedFilesThatAreVisibleCount})`} /> From 57b70ea794b226679bea7443f3f8d4291b7f5b7e Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Fri, 28 Feb 2025 19:23:17 +0800 Subject: [PATCH 0093/1338] Cursor integration updates --- app/src/lib/editors/win32.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts index 4df4a5e9ebf..e2d03d6d565 100644 --- a/app/src/lib/editors/win32.ts +++ b/app/src/lib/editors/win32.ts @@ -481,10 +481,11 @@ const editors: WindowsExternalEditor[] = [ name: 'Cursor', registryKeys: [ CurrentUserUninstallKey('62625861-8486-5be9-9e46-1da50df5f8ff'), + CurrentUserUninstallKey('{DADADADA-ADAD-ADAD-ADAD-ADADADADADAD}}_is1'), ], installLocationRegistryKey: 'DisplayIcon', - displayNamePrefixes: ['Cursor'], - publishers: ['Cursor AI, Inc.'], + displayNamePrefixes: ['Cursor', 'Cursor (User)'], + publishers: ['Cursor AI, Inc.', 'Anysphere'], }, ] From bef680a5f39f8ef53d47777d1a56bf7c7db042ec Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Fri, 28 Feb 2025 19:23:17 +0800 Subject: [PATCH 0094/1338] WindSurf added This reverts commit 57b70ea794b226679bea7443f3f8d4291b7f5b7e. Cursor integration updates Windsurf updated --- app/src/lib/editors/win32.ts | 9 +++++++++ docs/technical/editor-integration.md | 1 + 2 files changed, 10 insertions(+) diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts index 4df4a5e9ebf..745ddeffcb4 100644 --- a/app/src/lib/editors/win32.ts +++ b/app/src/lib/editors/win32.ts @@ -486,6 +486,15 @@ const editors: WindowsExternalEditor[] = [ displayNamePrefixes: ['Cursor'], publishers: ['Cursor AI, Inc.'], }, + { + name: 'Windsurf', + registryKeys: [ + CurrentUserUninstallKey('{5A8B7D94-9B5F-4D1F-93FC-5609F7159349}_is1'), + ], + installLocationRegistryKey: 'DisplayIcon', + displayNamePrefixes: ['Windsurf', 'Windsurf (User)'], + publishers: ['Codeium'], + }, ] function getKeyOrEmpty( diff --git a/docs/technical/editor-integration.md b/docs/technical/editor-integration.md index f82fe1e1e9f..cdce949eee5 100644 --- a/docs/technical/editor-integration.md +++ b/docs/technical/editor-integration.md @@ -50,6 +50,7 @@ These editors are currently supported: - [Zed](https://zed.dev/) - both Stable and Preview channel - [Pulsar](https://pulsar-edit.dev/) - [Cursor](https://www.cursor.com/) + - [Windsurf](https://www.codeium.com/windsurf) These are defined in a list at the top of the file: From 5a4881db94dcf4f7499e66b60426a81fabc21b45 Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Fri, 28 Feb 2025 21:21:56 +0800 Subject: [PATCH 0095/1338] MacOs Windsurf --- app/src/lib/editors/darwin.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/lib/editors/darwin.ts b/app/src/lib/editors/darwin.ts index dd30b20b661..a89b579ebfb 100644 --- a/app/src/lib/editors/darwin.ts +++ b/app/src/lib/editors/darwin.ts @@ -224,6 +224,10 @@ const editors: IDarwinExternalEditor[] = [ name: 'Cursor', bundleIdentifiers: ['com.todesktop.230313mzl4w4u92'], }, + { + name: 'Windsurf', + bundleIdentifiers: ['com.exafunction.windsurf'], + }, ] async function findApplication( From dd3cab308a3b5af1569b87794ec5a5c5908d614e Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Fri, 28 Feb 2025 08:57:16 -0500 Subject: [PATCH 0096/1338] Use popover for hidden changes warning Update filter-changes-list.tsx --- app/src/ui/changes/filter-changes-list.tsx | 129 +++++++++++++++------ app/styles/ui/changes/_changes-list.scss | 9 +- 2 files changed, 102 insertions(+), 36 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index de2eb0d6a3f..017f78dd618 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -225,6 +225,10 @@ interface IFilterChangesListState { readonly groups: ReadonlyArray> readonly filterToIncludedCommit: boolean readonly isFilterOptionsOpen: boolean + /** + * Whether the warning about committing hidden files is open. + */ + readonly isFilesWarningOpen: boolean } function getSelectedItemsFromProps( @@ -331,6 +335,7 @@ export class FilterChangesList extends React.Component< private headerRef = createObservableRef() private filterOptionsButtonRef: HTMLButtonElement | null = null + private filterWarningButtonRef: HTMLButtonElement | null = null private includeAllCheckBoxRef = React.createRef() private filterListRef = React.createRef>() @@ -351,6 +356,7 @@ export class FilterChangesList extends React.Component< groups, filterToIncludedCommit: false, isFilterOptionsOpen: false, + isFilesWarningOpen: false, } } @@ -1145,7 +1151,11 @@ export class FilterChangesList extends React.Component< } private showFilesToBeCommitted = () => { - this.setState({ filterText: '', filterToIncludedCommit: true }) + this.setState({ + filterText: '', + filterToIncludedCommit: true, + isFilesWarningOpen: false, + }) } private onTextBoxRef = (component: TextBox | null) => { @@ -1213,14 +1223,19 @@ export class FilterChangesList extends React.Component< {showHiddenCheckedFilesWarning ? ( - + + + {this.state.isFilesWarningOpen && this.renderFilterWarning()} + ) : null} {this.state.filterToIncludedCommit ? ( @@ -1234,29 +1249,30 @@ export class FilterChangesList extends React.Component< ) : null} - - - {this.state.isFilterOptionsOpen && this.renderFilterOptions()} + + + {this.state.isFilterOptionsOpen && this.renderFilterOptions()} + ) } @@ -1264,6 +1280,51 @@ export class FilterChangesList extends React.Component< private onFilterOptionsButtonRef = (buttonRef: HTMLButtonElement | null) => { this.filterOptionsButtonRef = buttonRef } + + private onFilterWarningButtonRef = (buttonRef: HTMLButtonElement | null) => { + this.filterWarningButtonRef = buttonRef + } + + private openFilterWarning = () => { + this.setState({ isFilesWarningOpen: true }) + } + + private closeFilterWarning = () => { + this.setState({ isFilesWarningOpen: false }) + } + + private renderFilterWarning() { + return ( + +
+

Committing Hidden Files

+ +
+
+ You have a filter applied. There are{' '} + + hidden changes + {' '} + that will be committed. +
+ + ) + } + private openFilterOptions = () => { if (!this.props.canFilterChanges) { this.props.dispatcher.setCanFilterChanges(true) @@ -1288,7 +1349,7 @@ export class FilterChangesList extends React.Component< return ( -
+

Filter Options

) @@ -1423,19 +1424,24 @@ export class FilterChangesList extends React.Component< } return ( -
- -
+ +
+ +
+ ) } diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 8d0b975bbbb..ca8a709d221 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -253,3 +253,27 @@ transition: max-height var(--undo-animation-duration) ease-out; } + + + // animations for entering and leaving + .filter-box-enter { + height: 0px; + opacity: 0; + + &.filter-box-enter-active { + height: 25px; + opacity: 1; + transition: max-height 300ms ease-in-out, opacity 200ms ease-in 300ms; + } +} + +.filter-box-exit { + height: 25px; + opacity: 1; + + &.filter-box-exit-active { + height: 0px; + opacity: 0; + transition: max-height 225ms ease-in-out 175ms, opacity 175ms ease-in; + } +} From ce7e879ecd677ef0c800e1d70608133f2244772c Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Fri, 28 Feb 2025 10:22:38 -0500 Subject: [PATCH 0099/1338] Linter --- app/styles/ui/changes/_changes-list.scss | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index ca8a709d221..d680d1af330 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -113,7 +113,7 @@ padding: 0 var(--spacing-half); display: inline-block; - > span { + > span { background: -webkit-linear-gradient(-70deg, #9867f0 0%, #ed4e50 100%); -webkit-background-clip: text; background-clip: text; @@ -121,11 +121,9 @@ -webkit-box-decoration-break: clone; font-weight: 600 !important; font-size: var(--font-size-sm); - padding-bottom:2px; + padding-bottom: 2px; } } - - } .filter-button { @@ -254,9 +252,8 @@ transition: max-height var(--undo-animation-duration) ease-out; } - - // animations for entering and leaving - .filter-box-enter { +// animations for entering and leaving +.filter-box-enter { height: 0px; opacity: 0; From 8b390648f3213bda331e345d7ee1f216f5602f1f Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:55:19 -0500 Subject: [PATCH 0100/1338] Update filter-changes-list.tsx Co-authored-by: Melissa Xie --- app/src/ui/changes/filter-changes-list.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index fa6be6eee91..6ce172a1340 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1243,8 +1243,8 @@ export class FilterChangesList extends React.Component< From 97ae932f8e6c844d25b62a83c1d3ab58bdb5a694 Mon Sep 17 00:00:00 2001 From: ANightly Date: Fri, 28 Feb 2025 21:42:23 +0200 Subject: [PATCH 0101/1338] Use Dev protocol when using Dev secrets --- app/app-info.ts | 1 + app/src/lib/globals.d.ts | 3 +++ app/src/main-process/main.ts | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/app-info.ts b/app/app-info.ts index b1317a989da..e29b1a09b32 100644 --- a/app/app-info.ts +++ b/app/app-info.ts @@ -23,6 +23,7 @@ export function getReplacements() { __APP_NAME__: s(productName), __APP_VERSION__: s(version), __DEV__: isDevBuild, + __DEV_SECRETS__: isDevBuild || !process.env.DESKTOP_OAUTH_CLIENT_SECRET, __RELEASE_CHANNEL__: s(channel), __UPDATES_URL__: s(getUpdatesURL()), __SHA__: s(getSHA()), diff --git a/app/src/lib/globals.d.ts b/app/src/lib/globals.d.ts index 7c065f2ed85..b6bc8193eca 100644 --- a/app/src/lib/globals.d.ts +++ b/app/src/lib/globals.d.ts @@ -2,6 +2,9 @@ /** Is the app running in dev mode? */ declare const __DEV__: boolean +/** Is the app using dev secrets? */ +declare const __DEV_SECRETS__: boolean + /** The OAuth client id the app should use */ declare const __OAUTH_CLIENT_ID__: string | undefined diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts index 438afb81f4f..18cf6cd92f9 100644 --- a/app/src/main-process/main.ts +++ b/app/src/main-process/main.ts @@ -103,7 +103,7 @@ function getExtraErrorContext(): Record { const protocolLauncherArg = '--protocol-launcher' const possibleProtocols = new Set(['x-github-client']) -if (__DEV__) { +if (__DEV_SECRETS__) { possibleProtocols.add('x-github-desktop-dev-auth') } else { possibleProtocols.add('x-github-desktop-auth') From 3c3406ab95b5ef30e9b26cede1d2345e198c4b27 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Mar 2025 11:56:28 +0100 Subject: [PATCH 0102/1338] Stringify non-standard error mesages --- app/src/lib/source-map-support.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/lib/source-map-support.ts b/app/src/lib/source-map-support.ts index b31016bf0b1..a98f2da2520 100644 --- a/app/src/lib/source-map-support.ts +++ b/app/src/lib/source-map-support.ts @@ -106,9 +106,20 @@ export function enableSourceMaps() { * perform the source mapping, it'll use the original error stack. */ export function withSourceMappedStack(error: Error): Error { + // Guard against `throw "Foo"` which is totally a thing that can happen + if (typeof error === 'string') { + return { + name: 'StringError', + message: error, + } + } + return { name: error.name, - message: error.message, + message: + typeof error.message === 'string' + ? error.message + : JSON.stringify(error.message), stack: sourceMappedStackTrace(error), } } From ef6941955f75ea89ad397d3d142f3ef9137135eb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Mar 2025 12:18:08 +0100 Subject: [PATCH 0103/1338] Take two --- app/src/lib/source-map-support.ts | 38 +++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/app/src/lib/source-map-support.ts b/app/src/lib/source-map-support.ts index a98f2da2520..c6e8a3b80ec 100644 --- a/app/src/lib/source-map-support.ts +++ b/app/src/lib/source-map-support.ts @@ -105,7 +105,7 @@ export function enableSourceMaps() { * Make a copy of the error with a source-mapped stack trace. If it couldn't * perform the source mapping, it'll use the original error stack. */ -export function withSourceMappedStack(error: Error): Error { +export function withSourceMappedStack(error: unknown): Error { // Guard against `throw "Foo"` which is totally a thing that can happen if (typeof error === 'string') { return { @@ -114,13 +114,37 @@ export function withSourceMappedStack(error: Error): Error { } } + let message + + if (error && typeof error === 'object' && 'message' in error) { + if (error.message === null) { + message = 'null' + } else if (error.message === undefined) { + message = 'undefined' + } else if (typeof error.message === 'string') { + message = error.message + } else if (typeof error.message === 'object') { + message = JSON.stringify( + error.message, + Object.getOwnPropertyNames(error.message) + ) + } else { + message = `${error.message}` + } + } else { + message = '[Unknown]' + } + return { - name: error.name, - message: - typeof error.message === 'string' - ? error.message - : JSON.stringify(error.message), - stack: sourceMappedStackTrace(error), + name: + error && + typeof error === 'object' && + 'name' in error && + typeof error.name === 'string' + ? error.name + : '[Unknown]', + message, + stack: error instanceof Error ? sourceMappedStackTrace(error) : undefined, } } From 1377fffcf20151ed80110b6269a12b1c46f604c3 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 3 Mar 2025 12:24:34 +0100 Subject: [PATCH 0104/1338] Update api.ts --- app/src/lib/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 30d98064002..0d0c5851383 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -2106,7 +2106,7 @@ export class API { return JSON.parse(message) } catch (e) { log.warn( - `getDiffChangesCommitDetails: failed with endpoint ${this.endpoint}`, + `getDiffChangesCommitMessage: failed with endpoint ${this.endpoint}`, e ) throw e From 3c2f7d4c19a3f86cf298ad2668f7b7a5579f84d7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Mar 2025 13:22:24 +0100 Subject: [PATCH 0105/1338] Changelog and version bump --- app/package.json | 2 +- changelog.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index a71b8916716..dbec3cef88c 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.17", + "version": "3.4.18-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 8bac5fcaea5..688c5c985ce 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,9 @@ { "releases": { + "3.4.18-beta1": [ + "[Fixed] Fix: inconsistent rebase behaviour - #19816. Thanks @sfadschm!", + "[Fixed] Pressing Ctrl+A in the Find dialog now selects the search text instead of the diff content - #20049" + ], "3.4.17": [ "[Fixed] Dialogs announce their titles on macOS Sequoia for VoiceOver users - #20009", "[Fixed] The commit button words are separated by spaces for screen reader users - #20011", From a710efe7f33bf2c28cc43a35919af4ccdd63d333 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 4 Mar 2025 13:02:32 +0100 Subject: [PATCH 0106/1338] Support arbitrary types as the group identifier in filter and section filter lists --- app/src/ui/lib/filter-list.tsx | 64 +++++++++++++++----------- app/src/ui/lib/section-filter-list.tsx | 62 ++++++++++++++----------- 2 files changed, 73 insertions(+), 53 deletions(-) diff --git a/app/src/ui/lib/filter-list.tsx b/app/src/ui/lib/filter-list.tsx index 655785bd730..c29268149ed 100644 --- a/app/src/ui/lib/filter-list.tsx +++ b/app/src/ui/lib/filter-list.tsx @@ -24,17 +24,20 @@ export interface IFilterListItem { } /** A group of items in the list. */ -export interface IFilterListGroup { +export interface IFilterListGroup< + Item extends IFilterListItem, + Identifier = string +> { /** The identifier for this group. */ - readonly identifier: string + readonly identifier: Identifier /** The items in the group. */ - readonly items: ReadonlyArray + readonly items: ReadonlyArray } -interface IFlattenedGroup { +interface IFlattenedGroup { readonly kind: 'group' - readonly identifier: string + readonly identifier: T } interface IFlattenedItem { @@ -48,11 +51,11 @@ interface IFlattenedItem { * A row in the list. This is used internally after the user-provided groups are * flattened. */ -type IFilterListRow = - | IFlattenedGroup +type IFilterListRow = + | IFlattenedGroup | IFlattenedItem -interface IFilterListProps { +interface IFilterListProps { /** A class name for the wrapping element. */ readonly className?: string @@ -61,7 +64,7 @@ interface IFilterListProps { /** The ordered groups to display in the list. */ // eslint-disable-next-line react/no-unused-prop-types - readonly groups: ReadonlyArray> + readonly groups: ReadonlyArray> /** The selected item. */ readonly selectedItem: T | null @@ -70,7 +73,9 @@ interface IFilterListProps { readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null /** Called to render header for the group with the given identifier. */ - readonly renderGroupHeader?: (identifier: string) => JSX.Element | null + readonly renderGroupHeader?: ( + identifier: GroupIdentifier + ) => JSX.Element | null /** Called to render content before/above the filter and list. */ readonly renderPreList?: () => JSX.Element | null @@ -170,8 +175,8 @@ interface IFilterListProps { ) => void } -interface IFilterListState { - readonly rows: ReadonlyArray> +interface IFilterListState { + readonly rows: ReadonlyArray> readonly selectedRow: number readonly filterValue: string readonly filterValueChanged: boolean @@ -191,14 +196,17 @@ export interface IFilterSelectionSource { export type SelectionSource = ListSelectionSource | IFilterSelectionSource /** A List which includes the ability to filter based on its contents. */ -export class FilterList extends React.Component< - IFilterListProps, - IFilterListState +export class FilterList< + T extends IFilterListItem, + GroupIdentifier = string +> extends React.Component< + IFilterListProps, + IFilterListState > { private list: List | null = null private filterTextBox: TextBox | null = null - public constructor(props: IFilterListProps) { + public constructor(props: IFilterListProps) { super(props) if (props.filterTextBox !== undefined) { @@ -208,13 +216,15 @@ export class FilterList extends React.Component< this.state = createStateUpdate(props, null) } - public componentWillReceiveProps(nextProps: IFilterListProps) { + public componentWillReceiveProps( + nextProps: IFilterListProps + ) { this.setState(createStateUpdate(nextProps, this.state)) } public componentDidUpdate( - prevProps: IFilterListProps, - prevState: IFilterListState + prevProps: IFilterListProps, + prevState: IFilterListState ) { if (this.props.onSelectionChanged) { const oldSelectedItemId = getItemIdFromRowIndex( @@ -587,11 +597,11 @@ export function getText( return item['text'] } -function createStateUpdate( - props: IFilterListProps, - state: IFilterListState | null +function createStateUpdate( + props: IFilterListProps, + state: IFilterListState | null ) { - const flattenedRows = new Array>() + const flattenedRows = new Array>() const filter = (props.filterText || '').toLowerCase() for (const group of props.groups) { @@ -643,8 +653,8 @@ function createStateUpdate( } } -function getItemFromRowIndex( - items: ReadonlyArray>, +function getItemFromRowIndex( + items: ReadonlyArray>, index: number ): T | null { if (index >= 0 && index < items.length) { @@ -658,8 +668,8 @@ function getItemFromRowIndex( return null } -function getItemIdFromRowIndex( - items: ReadonlyArray>, +function getItemIdFromRowIndex( + items: ReadonlyArray>, index: number ): string | null { const item = getItemFromRowIndex(items, index) diff --git a/app/src/ui/lib/section-filter-list.tsx b/app/src/ui/lib/section-filter-list.tsx index 1752c8f9125..e14f17af6e0 100644 --- a/app/src/ui/lib/section-filter-list.tsx +++ b/app/src/ui/lib/section-filter-list.tsx @@ -23,9 +23,9 @@ import { } from './filter-list' import * as octicons from '../octicons/octicons.generated' -interface IFlattenedGroup { +interface IFlattenedGroup { readonly kind: 'group' - readonly identifier: string + readonly identifier: T } interface IFlattenedItem { @@ -39,11 +39,11 @@ interface IFlattenedItem { * A row in the list. This is used internally after the user-provided groups are * flattened. */ -type IFilterListRow = - | IFlattenedGroup +type IFilterListRow = + | IFlattenedGroup | IFlattenedItem -interface ISectionFilterListProps { +interface ISectionFilterListProps { /** A class name for the wrapping element. */ readonly className?: string @@ -52,7 +52,7 @@ interface ISectionFilterListProps { /** The ordered groups to display in the list. */ // eslint-disable-next-line react/no-unused-prop-types - readonly groups: ReadonlyArray> + readonly groups: ReadonlyArray> /** The selected item. */ readonly selectedItem: T | null @@ -61,7 +61,9 @@ interface ISectionFilterListProps { readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null /** Called to render header for the group with the given identifier. */ - readonly renderGroupHeader?: (identifier: string) => JSX.Element | null + readonly renderGroupHeader?: ( + identifier: GroupIdentifier + ) => JSX.Element | null /** Called to render content before/above the filter and list. */ readonly renderPreList?: () => JSX.Element | null @@ -167,8 +169,10 @@ interface ISectionFilterListProps { ) => void } -interface IFilterListState { - readonly rows: ReadonlyArray>> +interface IFilterListState { + readonly rows: ReadonlyArray< + ReadonlyArray> + > readonly selectedRow: RowIndexPath readonly filterValue: string readonly filterValueChanged: boolean @@ -178,12 +182,16 @@ interface IFilterListState { /** A List which includes the ability to filter based on its contents. */ export class SectionFilterList< - T extends IFilterListItem -> extends React.Component, IFilterListState> { + T extends IFilterListItem, + GroupIdentifier = string +> extends React.Component< + ISectionFilterListProps, + IFilterListState +> { private list: SectionList | null = null private filterTextBox: TextBox | null = null - public constructor(props: ISectionFilterListProps) { + public constructor(props: ISectionFilterListProps) { super(props) if (props.filterTextBox !== undefined) { @@ -193,13 +201,15 @@ export class SectionFilterList< this.state = createStateUpdate(props, null) } - public componentWillReceiveProps(nextProps: ISectionFilterListProps) { + public componentWillReceiveProps( + nextProps: ISectionFilterListProps + ) { this.setState(createStateUpdate(nextProps, this.state)) } public componentDidUpdate( - prevProps: ISectionFilterListProps, - prevState: IFilterListState + prevProps: ISectionFilterListProps, + prevState: IFilterListState ) { if (this.props.onSelectionChanged) { const oldSelectedItemId = getItemIdFromRowIndex( @@ -630,8 +640,8 @@ export function getText( return item['text'] } -function getFirstVisibleRow( - rows: ReadonlyArray>> +function getFirstVisibleRow( + rows: ReadonlyArray>> ): RowIndexPath { for (let i = 0; i < rows.length; i++) { const groupRows = rows[i] @@ -646,11 +656,11 @@ function getFirstVisibleRow( return InvalidRowIndexPath } -function createStateUpdate( - props: ISectionFilterListProps, - state: IFilterListState | null +function createStateUpdate( + props: ISectionFilterListProps, + state: IFilterListState | null ) { - const rows = new Array>>() + const rows = new Array>>() const filter = (props.filterText || '').toLowerCase() let selectedRow = InvalidRowIndexPath let section = 0 @@ -658,7 +668,7 @@ function createStateUpdate( const groupIndices = [] for (const [idx, group] of props.groups.entries()) { - const groupRows = new Array>() + const groupRows = new Array>() const items: ReadonlyArray> = filter ? match(filter, group.items, getText) : group.items.map(item => ({ @@ -712,8 +722,8 @@ function createStateUpdate( } } -function getItemFromRowIndex( - items: ReadonlyArray>>, +function getItemFromRowIndex( + items: ReadonlyArray>>, index: RowIndexPath ): T | null { if (index.section < 0 || index.section >= items.length) { @@ -734,8 +744,8 @@ function getItemFromRowIndex( return null } -function getItemIdFromRowIndex( - items: ReadonlyArray>>, +function getItemIdFromRowIndex( + items: ReadonlyArray>>, index: RowIndexPath ): string | null { const item = getItemFromRowIndex(items, index) From a20633b54f2c4e31266d2a569284c9f5ad182794 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 4 Mar 2025 17:16:24 +0100 Subject: [PATCH 0107/1338] Group repositories per endpoint --- .../repositories-list/group-repositories.ts | 236 ++++++++---------- .../repositories-list/repositories-list.tsx | 73 +++--- .../unit/repositories-list-grouping-test.ts | 38 +-- 3 files changed, 160 insertions(+), 187 deletions(-) diff --git a/app/src/ui/repositories-list/group-repositories.ts b/app/src/ui/repositories-list/group-repositories.ts index da4bd01afdc..4bee60ce350 100644 --- a/app/src/ui/repositories-list/group-repositories.ts +++ b/app/src/ui/repositories-list/group-repositories.ts @@ -2,27 +2,51 @@ import { Repository, ILocalRepositoryState, nameOf, + isRepositoryWithGitHubRepository, + RepositoryWithGitHubRepository, } from '../../models/repository' import { CloningRepository } from '../../models/cloning-repository' -import { getDotComAPIEndpoint } from '../../lib/api' -import { caseInsensitiveCompare } from '../../lib/compare' +import { getHTMLURL } from '../../lib/api' +import { caseInsensitiveCompare, compare } from '../../lib/compare' import { IFilterListGroup, IFilterListItem } from '../lib/filter-list' import { IAheadBehind } from '../../models/branch' +import { assertNever } from '../../lib/fatal-error' +import { isDotCom } from '../../lib/endpoint-capabilities' +import { Owner } from '../../models/owner' +import { enableMultipleEnterpriseAccounts } from '../../lib/feature-flag' + +export type RepositoryListGroup = + | { + kind: 'recent' | 'other' + } + | { + kind: 'dotcom' + owner: Owner + } + | { + kind: 'enterprise' + host: string + } -/** - * Special, reserved repository group names - * - * (GitHub.com user and org names cannot contain `_`, - * so these are safe to union with all possible - * GitHub repo owner names) - */ -export enum KnownRepositoryGroup { - Enterprise = '_Enterprise_', - NonGitHub = '_Non-GitHub_', +// Unique grouping key for a repository group. Doubles as a case sensitive +// sorting key +export const getGroupKey = (group: RepositoryListGroup) => { + const { kind } = group + switch (kind) { + case 'recent': + return `0:recent` + case 'dotcom': + return `1:dotcom:${group.owner.login}` + case 'enterprise': + return enableMultipleEnterpriseAccounts() + ? `2:enterprise:${group.host}` + : `2:enterprise` + case 'other': + return `3:other` + default: + assertNever(group, `Unknown repository group kind ${kind}`) + } } - -export type RepositoryGroupIdentifier = KnownRepositoryGroup | string - export type Repositoryish = Repository | CloningRepository export interface IRepositoryListItem extends IFilterListItem { @@ -34,144 +58,88 @@ export interface IRepositoryListItem extends IFilterListItem { readonly changedFilesCount: number } -const fallbackValue = { - changedFilesCount: 0, - aheadBehind: null, +const recentRepositoriesThreshold = 7 + +const getHostForRepository = (repo: RepositoryWithGitHubRepository) => + new URL(getHTMLURL(repo.gitHubRepository.endpoint)).host + +const getGroupForRepository = (repo: Repositoryish): RepositoryListGroup => { + if (repo instanceof Repository && isRepositoryWithGitHubRepository(repo)) { + return isDotCom(repo.gitHubRepository.endpoint) + ? { kind: 'dotcom', owner: repo.gitHubRepository.owner } + : { kind: 'enterprise', host: getHostForRepository(repo) } + } + return { kind: 'other' } } +type RepoGroupItem = { group: RepositoryListGroup; repos: Repositoryish[] } + export function groupRepositories( repositories: ReadonlyArray, - localRepositoryStateLookup: ReadonlyMap -): ReadonlyArray> { - const grouped = new Map() - const gitHubOwners = new Set() - for (const repository of repositories) { - const gitHubRepository = - repository instanceof Repository ? repository.gitHubRepository : null - let group: RepositoryGroupIdentifier = KnownRepositoryGroup.NonGitHub - if (gitHubRepository) { - if (gitHubRepository.endpoint === getDotComAPIEndpoint()) { - group = gitHubRepository.owner.login - gitHubOwners.add(group) - } else { - group = KnownRepositoryGroup.Enterprise - } - } else { - group = KnownRepositoryGroup.NonGitHub - } - - let repositories = grouped.get(group) - if (!repositories) { - repositories = new Array() - grouped.set(group, repositories) + localRepositoryStateLookup: ReadonlyMap, + recentRepositories: ReadonlyArray +): ReadonlyArray> { + const includeRecentGroup = repositories.length > recentRepositoriesThreshold + const recentSet = includeRecentGroup ? new Set(recentRepositories) : undefined + const groups = new Map() + + const addToGroup = (group: RepositoryListGroup, repo: Repositoryish) => { + const key = getGroupKey(group) + let rg = groups.get(key) + if (!rg) { + rg = { group, repos: [] } + groups.set(key, rg) } - repositories.push(repository) + rg.repos.push(repo) } - const groups = new Array>() - - const addGroup = (identifier: RepositoryGroupIdentifier) => { - const repositories = grouped.get(identifier) - if (!repositories || repositories.length === 0) { - return - } - - const names = new Map() - for (const repository of repositories) { - const existingCount = names.get(repository.name) || 0 - names.set(repository.name, existingCount + 1) + for (const repo of repositories) { + if (recentSet?.has(repo.id) && repo instanceof Repository) { + addToGroup({ kind: 'recent' }, repo) } - repositories.sort((x, y) => - caseInsensitiveCompare(repositorySortingKey(x), repositorySortingKey(y)) - ) - const items: ReadonlyArray = repositories.map(r => { - const nameCount = names.get(r.name) || 0 - const { aheadBehind, changedFilesCount } = - localRepositoryStateLookup.get(r.id) || fallbackValue - const repositoryText = - r instanceof Repository ? [r.alias ?? r.name, nameOf(r)] : [r.name] - - return { - text: repositoryText, - id: r.id.toString(), - repository: r, - needsDisambiguation: - nameCount > 1 && identifier === KnownRepositoryGroup.Enterprise, - aheadBehind, - changedFilesCount, - } - }) - - groups.push({ identifier, items }) + addToGroup(getGroupForRepository(repo), repo) } - // NB: This ordering reflects the order in the repositories sidebar. - const owners = [...gitHubOwners.values()] - owners.sort(caseInsensitiveCompare) - owners.forEach(addGroup) - - addGroup(KnownRepositoryGroup.Enterprise) - addGroup(KnownRepositoryGroup.NonGitHub) - - return groups + return Array.from(groups) + .sort(([xKey], [yKey]) => compare(xKey, yKey)) + .map>( + ([_, { group, repos }]) => ({ + identifier: group, + items: toSortedListItems(group, repos, localRepositoryStateLookup), + }) + ) } -/** - * Creates the group `Recent` of repositories recently opened for use with `FilterList` component - * - * @param recentRepositories list of recent repositories' ids - * @param repositories full list of repositories (we use this to get data about the `recentRepositories`) - * @param localRepositoryStateLookup cache of local state about full list of repositories (we use this to get data about the `recentRepositories`) - */ -export function makeRecentRepositoriesGroup( - recentRepositories: ReadonlyArray, +const toSortedListItems = ( + group: RepositoryListGroup, repositories: ReadonlyArray, localRepositoryStateLookup: ReadonlyMap -): IFilterListGroup { - const names = new Map() - for (const id of recentRepositories) { - const repository = repositories.find(r => r.id === id) - if (repository !== undefined) { - const alias = repository instanceof Repository ? repository.alias : null - const name = alias ?? repository.name - const existingCount = names.get(name) || 0 - names.set(name, existingCount + 1) - } - } +): IRepositoryListItem[] => { + const names = repositories.reduce( + (map, repo) => map.set(repo.name, (map.get(repo.name) ?? 0) + 1), + new Map() + ) - const items = new Array() + return repositories + .map(r => { + const nameCount = names.get(r.name) ?? 0 + const repoState = localRepositoryStateLookup.get(r.id) - for (const id of recentRepositories) { - const repository = repositories.find(r => r.id === id) - if (repository === undefined) { - continue - } - - const { aheadBehind, changedFilesCount } = - localRepositoryStateLookup.get(id) || fallbackValue - const repositoryAlias = - repository instanceof Repository ? repository.alias : null - const repositoryText = - repository instanceof Repository - ? [repositoryAlias ?? repository.name, nameOf(repository)] - : [repository.name] - const nameCount = names.get(repositoryAlias ?? repository.name) || 0 - items.push({ - text: repositoryText, - id: id.toString(), - repository, - needsDisambiguation: nameCount > 1, - aheadBehind, - changedFilesCount, + return { + text: + r instanceof Repository ? [r.alias ?? r.name, nameOf(r)] : [r.name], + id: r.id.toString(), + repository: r, + needsDisambiguation: nameCount > 1 && group.kind === 'enterprise', + aheadBehind: repoState?.aheadBehind ?? null, + changedFilesCount: repoState?.changedFilesCount ?? 0, + } }) - } - - return { - identifier: 'Recent', - items, - } + .sort(({ repository: x }, { repository: y }) => + caseInsensitiveCompare(repositorySortingKey(x), repositorySortingKey(y)) + ) } // Use either the configured alias or the repository name when sorting the diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx index 0b937931888..6ffa4b2f7f5 100644 --- a/app/src/ui/repositories-list/repositories-list.tsx +++ b/app/src/ui/repositories-list/repositories-list.tsx @@ -5,9 +5,8 @@ import { groupRepositories, IRepositoryListItem, Repositoryish, - RepositoryGroupIdentifier, - KnownRepositoryGroup, - makeRecentRepositoriesGroup, + RepositoryListGroup, + getGroupKey, } from './group-repositories' import { IFilterListGroup } from '../lib/filter-list' import { IMatches } from '../../lib/fuzzy-find' @@ -25,11 +24,11 @@ import memoizeOne from 'memoize-one' import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut' import { generateRepositoryListContextMenu } from '../repositories-list/repository-list-item-context-menu' import { SectionFilterList } from '../lib/section-filter-list' +import { assertNever } from '../../lib/fatal-error' +import { enableMultipleEnterpriseAccounts } from '../../lib/feature-flag' const BlankSlateImage = encodePathAsUrl(__dirname, 'static/empty-no-repo.svg') -const recentRepositoriesThreshold = 7 - interface IRepositoriesListProps { readonly selectedRepository: Repositoryish | null readonly repositories: ReadonlyArray @@ -88,7 +87,9 @@ const RowHeight = 29 * the id of the provided repository. */ function findMatchingListItem( - groups: ReadonlyArray>, + groups: ReadonlyArray< + IFilterListGroup + >, selectedRepository: Repositoryish | null ) { if (selectedRepository !== null) { @@ -118,11 +119,16 @@ export class RepositoriesList extends React.Component< private getRepositoryGroups = memoizeOne( ( repositories: ReadonlyArray | null, - localRepositoryStateLookup: ReadonlyMap + localRepositoryStateLookup: ReadonlyMap, + recentRepositories: ReadonlyArray ) => repositories === null ? [] - : groupRepositories(repositories, localRepositoryStateLookup) + : groupRepositories( + repositories, + localRepositoryStateLookup, + recentRepositories + ) ) /** @@ -158,23 +164,27 @@ export class RepositoriesList extends React.Component< ) } - private getGroupLabel(identifier: RepositoryGroupIdentifier) { - if (identifier === KnownRepositoryGroup.Enterprise) { - return 'Enterprise' - } else if (identifier === KnownRepositoryGroup.NonGitHub) { + private getGroupLabel(group: RepositoryListGroup) { + const { kind } = group + if (kind === 'enterprise') { + return enableMultipleEnterpriseAccounts() ? group.host : 'Enterprise' + } else if (kind === 'other') { return 'Other' + } else if (kind === 'dotcom') { + return group.owner.login + } else if (kind === 'recent') { + return 'Recent' } else { - return identifier + assertNever(kind, `Unknown repository group kind ${kind}`) } } - private renderGroupHeader = (id: string) => { - const identifier = id as RepositoryGroupIdentifier - const label = this.getGroupLabel(identifier) + private renderGroupHeader = (group: RepositoryListGroup) => { + const label = this.getGroupLabel(group) return ( item.repository.name private getGroupAriaLabelGetter = - (groups: ReadonlyArray>) => + ( + groups: ReadonlyArray< + IFilterListGroup + > + ) => (group: number) => - groups[group].identifier + this.getGroupLabel(groups[group].identifier) public render() { - const baseGroups = this.getRepositoryGroups( + const groups = this.getRepositoryGroups( this.props.repositories, - this.props.localRepositoryStateLookup + this.props.localRepositoryStateLookup, + this.props.recentRepositories ) const selectedItem = this.getSelectedListItem( - baseGroups, + groups, this.props.selectedRepository ) - const groups = - this.props.repositories.length > recentRepositoriesThreshold - ? [ - makeRecentRepositoriesGroup( - this.props.recentRepositories, - this.props.repositories, - this.props.localRepositoryStateLookup - ), - ...baseGroups, - ] - : baseGroups - return (
- + rowHeight={RowHeight} selectedItem={selectedItem} filterText={this.props.filterText} diff --git a/app/test/unit/repositories-list-grouping-test.ts b/app/test/unit/repositories-list-grouping-test.ts index 9f7a7495f18..6d37b09cb2e 100644 --- a/app/test/unit/repositories-list-grouping-test.ts +++ b/app/test/unit/repositories-list-grouping-test.ts @@ -1,7 +1,4 @@ -import { - groupRepositories, - KnownRepositoryGroup, -} from '../../src/ui/repositories-list/group-repositories' +import { groupRepositories } from '../../src/ui/repositories-list/group-repositories' import { Repository, ILocalRepositoryState } from '../../src/models/repository' import { CloningRepository } from '../../src/models/cloning-repository' import { gitHubRepoFixture } from '../helpers/github-repo-builder' @@ -21,7 +18,7 @@ describe('repository list grouping', () => { gitHubRepoFixture({ owner: '', name: 'my-repo3', - endpoint: 'github.big-corp.com', + endpoint: 'https://github.big-corp.com/api/v3', }), false ), @@ -30,22 +27,23 @@ describe('repository list grouping', () => { const cache = new Map() it('groups repositories by owners/Enterprise/Other', () => { - const grouped = groupRepositories(repositories, cache) + const grouped = groupRepositories(repositories, cache, []) expect(grouped).toHaveLength(3) - expect(grouped[0].identifier).toBe('me') + expect(grouped[0].identifier.kind).toBe('dotcom') + expect((grouped[0].identifier as any).owner.login).toBe('me') expect(grouped[0].items).toHaveLength(1) let item = grouped[0].items[0] expect(item.repository.path).toBe('repo2') - expect(grouped[1].identifier).toBe(KnownRepositoryGroup.Enterprise) + expect(grouped[1].identifier.kind).toBe('enterprise') expect(grouped[1].items).toHaveLength(1) item = grouped[1].items[0] expect(item.repository.path).toBe('repo3') - expect(grouped[2].identifier).toBe(KnownRepositoryGroup.NonGitHub) + expect(grouped[2].identifier.kind).toBe('other') expect(grouped[2].items).toHaveLength(1) item = grouped[2].items[0] @@ -71,18 +69,20 @@ describe('repository list grouping', () => { const grouped = groupRepositories( [repoC, repoB, repoZ, repoD, repoA], - cache + cache, + [] ) expect(grouped).toHaveLength(2) - expect(grouped[0].identifier).toBe('me') + expect(grouped[0].identifier.kind).toBe('dotcom') + expect((grouped[0].identifier as any).owner.login).toBe('me') expect(grouped[0].items).toHaveLength(2) let items = grouped[0].items expect(items[0].repository.path).toBe('b') expect(items[1].repository.path).toBe('d') - expect(grouped[1].identifier).toBe(KnownRepositoryGroup.NonGitHub) + expect(grouped[1].identifier.kind).toBe('other') expect(grouped[1].items).toHaveLength(3) items = grouped[1].items @@ -110,7 +110,7 @@ describe('repository list grouping', () => { gitHubRepoFixture({ owner: 'business', name: 'enterprise-repo', - endpoint: '', + endpoint: 'https://ghe.io/api/v3', }), false ) @@ -120,21 +120,23 @@ describe('repository list grouping', () => { gitHubRepoFixture({ owner: 'silliness', name: 'enterprise-repo', - endpoint: '', + endpoint: 'https://ghe.io/api/v3', }), false ) - const grouped = groupRepositories([repoA, repoB, repoC, repoD], cache) + const grouped = groupRepositories([repoA, repoB, repoC, repoD], cache, []) expect(grouped).toHaveLength(3) - expect(grouped[0].identifier).toBe('user1') + expect(grouped[0].identifier.kind).toBe('dotcom') + expect((grouped[0].identifier as any).owner.login).toBe('user1') expect(grouped[0].items).toHaveLength(1) - expect(grouped[1].identifier).toBe('user2') + expect(grouped[1].identifier.kind).toBe('dotcom') + expect((grouped[1].identifier as any).owner.login).toBe('user2') expect(grouped[1].items).toHaveLength(1) - expect(grouped[2].identifier).toBe(KnownRepositoryGroup.Enterprise) + expect(grouped[2].identifier.kind).toBe('enterprise') expect(grouped[2].items).toHaveLength(2) expect(grouped[0].items[0].text[0]).toBe('repo') From fe6081741171f12ae70240f38ce47458bd46f216 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Mar 2025 09:50:25 +0100 Subject: [PATCH 0108/1338] :book: --- app/src/ui/repositories-list/group-repositories.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/ui/repositories-list/group-repositories.ts b/app/src/ui/repositories-list/group-repositories.ts index 4bee60ce350..733f09db9d5 100644 --- a/app/src/ui/repositories-list/group-repositories.ts +++ b/app/src/ui/repositories-list/group-repositories.ts @@ -28,8 +28,11 @@ export type RepositoryListGroup = host: string } -// Unique grouping key for a repository group. Doubles as a case sensitive -// sorting key +/** + * Returns a unique grouping key (string) for a repository group. Doubles as a + * case sensitive sorting key (i.e the case sensitive sort order of the keys is + * the order in which the groups will be displayed in the repository list). + */ export const getGroupKey = (group: RepositoryListGroup) => { const { kind } = group switch (kind) { From 772f73a1cb732718481a7fcac1bca9e8b4407af9 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Mar 2025 09:50:30 +0100 Subject: [PATCH 0109/1338] :art: --- app/src/ui/repositories-list/group-repositories.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/ui/repositories-list/group-repositories.ts b/app/src/ui/repositories-list/group-repositories.ts index 733f09db9d5..65f7157381e 100644 --- a/app/src/ui/repositories-list/group-repositories.ts +++ b/app/src/ui/repositories-list/group-repositories.ts @@ -107,12 +107,10 @@ export function groupRepositories( return Array.from(groups) .sort(([xKey], [yKey]) => compare(xKey, yKey)) - .map>( - ([_, { group, repos }]) => ({ - identifier: group, - items: toSortedListItems(group, repos, localRepositoryStateLookup), - }) - ) + .map(([, { group, repos }]) => ({ + identifier: group, + items: toSortedListItems(group, repos, localRepositoryStateLookup), + })) } const toSortedListItems = ( From f6d840bf7d30fa8d27486a98bab00ffa88d07a48 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Mar 2025 09:50:45 +0100 Subject: [PATCH 0110/1338] Ain't that some sadness --- app/src/models/cloning-repository.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/models/cloning-repository.ts b/app/src/models/cloning-repository.ts index 74d67bd0a47..89d256b0b23 100644 --- a/app/src/models/cloning-repository.ts +++ b/app/src/models/cloning-repository.ts @@ -1,6 +1,11 @@ import * as Path from 'path' -let CloningRepositoryID = 1 +/** + * A sufficiently large number that it's unlikely it'll ever collide with the id + * of a real repository which is auto-incremented in the database. If someone + * adds more that 1M repos, all bets are off. + */ +let CloningRepositoryID = 1_000_000 /** A repository which is currently being cloned. */ export class CloningRepository { From 800f208f0ef3a1363b0fd3ddd71b925f332d3cf7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Mar 2025 11:15:30 +0100 Subject: [PATCH 0111/1338] Select enterprise account when cloning --- app/src/ui/app.tsx | 1 + .../clone-github-repository.tsx | 37 +++++++++++++- .../ui/clone-repository/clone-repository.tsx | 48 ++++++++++++++++--- app/src/ui/lib/section-filter-list.tsx | 6 ++- app/src/ui/lib/select.tsx | 6 ++- app/styles/ui/_add-repository.scss | 7 +++ 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 28159b85c10..93f463f0255 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -1620,6 +1620,7 @@ export class App extends React.Component { return ( + /** The path to clone to. */ readonly path: string @@ -78,12 +82,43 @@ interface ICloneGithubRepositoryProps { repository: IAPIRepository, source: ClickSource ) => void + + readonly onSelectedAccountChanged: (account: Account) => void } export class CloneGithubRepository extends React.PureComponent { + private onSelectedAccountChanged = ( + event: React.FormEvent + ) => { + const accountEndpoint = event.currentTarget.value + const account = this.props.accounts.find( + a => a.endpoint === accountEndpoint + ) + + if (account) { + this.props.onSelectedAccountChanged(account) + } + } + public render() { return ( + + {enableMultipleEnterpriseAccounts() && + this.props.accounts.length > 1 && ( + + )} + + /** The initial URL or `owner/name` shortcut to use. */ readonly initialURL: string | null @@ -122,6 +130,8 @@ interface IBaseTabState { /** The user-entered URL or `owner/name` shortcut. */ readonly url: string + + readonly selectedAccount: Account | null } interface IUrlTabState extends IBaseTabState { @@ -162,6 +172,13 @@ export class CloneRepository extends React.Component< } ) + private getAccountsForTab = memoizeOne( + (tab: CloneRepositoryTab, accounts: ReadonlyArray) => + tab === CloneRepositoryTab.DotCom || !enableMultipleEnterpriseAccounts() + ? accounts.filter(isDotComAccount) + : accounts.filter(isEnterpriseAccount) + ) + public constructor(props: ICloneRepositoryProps) { super(props) @@ -172,6 +189,7 @@ export class CloneRepository extends React.Component< lastParsedIdentifier: null, path: defaultDirectory, url: this.props.initialURL || '', + selectedAccount: null, } this.state = { @@ -341,21 +359,29 @@ export class CloneRepository extends React.Component< case CloneRepositoryTab.DotCom: case CloneRepositoryTab.Enterprise: { - const account = this.getAccountForTab(tab) - if (!account) { + const tabState = this.getGitHubTabState(tab) + const tabAccounts = this.getAccountsForTab(tab, this.props.accounts) + const selectedAccount = + (tabState.selectedAccount + ? tabAccounts.find( + a => a.endpoint === tabState.selectedAccount?.endpoint + ) + : undefined) ?? tabAccounts.at(0) + + if (!selectedAccount) { return {this.renderSignIn(tab)} } else { - const accountState = this.props.apiRepositories.get(account) + const accountState = this.props.apiRepositories.get(selectedAccount) const repositories = accountState === undefined ? null : accountState.repositories const loading = accountState === undefined ? false : accountState.loading - const tabState = this.getGitHubTabState(tab) return ( ) } @@ -375,6 +402,15 @@ export class CloneRepository extends React.Component< } } + private onSelectedAccountChanged = (account: Account) => { + if (this.props.selectedTab !== CloneRepositoryTab.Generic) { + this.setGitHubTabState( + { selectedAccount: account }, + this.props.selectedTab + ) + } + } + private getAccountForTab(tab: CloneRepositoryTab): Account | null { switch (tab) { case CloneRepositoryTab.DotCom: diff --git a/app/src/ui/lib/section-filter-list.tsx b/app/src/ui/lib/section-filter-list.tsx index e14f17af6e0..38fe6e14c5f 100644 --- a/app/src/ui/lib/section-filter-list.tsx +++ b/app/src/ui/lib/section-filter-list.tsx @@ -131,6 +131,9 @@ interface ISectionFilterListProps { /** Any props which should cause a re-render if they change. */ readonly invalidationProps: any + /** Called to render content before the filter. */ + readonly renderPreFilter?: () => JSX.Element | null + /** Called to render content after the filter. */ readonly renderPostFilter?: () => JSX.Element | null @@ -296,8 +299,9 @@ export class SectionFilterList< return ( + {this.props.renderPreFilter?.()} {this.props.filterTextBox === undefined ? this.renderTextBox() : null} - {this.props.renderPostFilter ? this.props.renderPostFilter() : null} + {this.props.renderPostFilter?.()} ) } diff --git a/app/src/ui/lib/select.tsx b/app/src/ui/lib/select.tsx index 4d5e0069fe3..219d30a20ac 100644 --- a/app/src/ui/lib/select.tsx +++ b/app/src/ui/lib/select.tsx @@ -1,10 +1,14 @@ import * as React from 'react' import { createUniqueId, releaseUniqueId } from './id-pool' +import classNames from 'classnames' interface ISelectProps { /** The label for the select control. */ readonly label?: string + /** The className for the select component. */ + readonly className?: string + /** The value of the select control. */ readonly value?: string @@ -55,7 +59,7 @@ export class Select extends React.Component { public render() { return ( -
+
{this.renderLabel()} - {this.props.accounts.map(account => ( - - ))} - + )} diff --git a/app/styles/_ui.scss b/app/styles/_ui.scss index 7a0ce429eb0..5cc75b93fbb 100644 --- a/app/styles/_ui.scss +++ b/app/styles/_ui.scss @@ -108,3 +108,4 @@ @import 'ui/_pull-request-merge-status'; @import 'ui/_input-description'; @import 'ui/repository-rules/_repo-rules-failure-list'; +@import 'ui/account-picker'; diff --git a/app/styles/ui/_account-picker.scss b/app/styles/ui/_account-picker.scss new file mode 100644 index 00000000000..b14637c1646 --- /dev/null +++ b/app/styles/ui/_account-picker.scss @@ -0,0 +1,67 @@ +.account-list { + height: 100%; + width: 100%; + + &.filter-list .filter-field-row { + // The rows have built-in margin to their content so + // we only need half a spacer here + margin-bottom: var(--spacing-half); + } + + .list-item.selected:focus { + .ci-status { + color: inherit; + } + } + + .account-list-item { + padding: 0 var(--spacing); + display: flex; + flex-direction: row; + align-items: center; + min-width: 0; + flex-grow: 1; + height: 100%; + + .avatar { + width: 32px; + height: 32px; + } + + .icon { + margin-left: var(--spacing-half); + margin-right: var(--spacing); + flex-shrink: 0; + + // Align the icon baseline with the title text + align-self: flex-start; + margin-top: 2px; + } + + .info { + display: flex; + flex-direction: column; + min-width: 0; + flex-grow: 1; + margin: 0 var(--spacing); + + .title { + @include ellipsis; + min-width: 0; + font-weight: var(--font-weight-semibold); + } + + .subtitle { + @include ellipsis; + min-width: 0; + font-weight: var(--font-weight-light); + font-size: var(--font-size-sm); + color: var(--text-secondary-color); + } + } + } + + .filter-list-group-header { + @include ellipsis; + } +} From 580a2a90f5857c6f0bcec4e0a9ed9ef12bc33526 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:11:31 +0100 Subject: [PATCH 0123/1338] Put the picker where you'd expect it --- .../clone-github-repository.tsx | 26 ++++++++++++------- .../cloneable-repository-filter-list.tsx | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/src/ui/clone-repository/clone-github-repository.tsx b/app/src/ui/clone-repository/clone-github-repository.tsx index 5d6c1cefbf6..e808f4b3f97 100644 --- a/app/src/ui/clone-repository/clone-github-repository.tsx +++ b/app/src/ui/clone-repository/clone-github-repository.tsx @@ -87,19 +87,19 @@ interface ICloneGithubRepositoryProps { } export class CloneGithubRepository extends React.PureComponent { + private renderAccountPicker = () => { + return ( + + ) + } + public render() { return ( - - {enableMultipleEnterpriseAccounts() && - this.props.accounts.length > 1 && ( - - )} - 1 + ? this.renderAccountPicker + : undefined + } /> diff --git a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx index 6053f31ccaf..0f967ff7b26 100644 --- a/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx +++ b/app/src/ui/clone-repository/cloneable-repository-filter-list.tsx @@ -76,6 +76,8 @@ interface ICloneableRepositoryFilterListProps { repository: IAPIRepository, source: ClickSource ) => void + + readonly renderPreFilter?: () => JSX.Element | null } const RowHeight = 31 @@ -184,6 +186,7 @@ export class CloneableRepositoryFilterList extends React.PureComponent Date: Fri, 7 Mar 2025 11:11:34 +0100 Subject: [PATCH 0124/1338] :art: --- app/styles/ui/_account-picker.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/styles/ui/_account-picker.scss b/app/styles/ui/_account-picker.scss index b14637c1646..6e7ce3c131d 100644 --- a/app/styles/ui/_account-picker.scss +++ b/app/styles/ui/_account-picker.scss @@ -6,12 +6,9 @@ // The rows have built-in margin to their content so // we only need half a spacer here margin-bottom: var(--spacing-half); - } - - .list-item.selected:focus { - .ci-status { - color: inherit; - } + margin-top: var(--spacing); + margin-left: var(--spacing); + margin-right: var(--spacing); } .account-list-item { From 7936cb467e8dab1a1c29f5bec2172da7b0e79aca Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:25:59 +0100 Subject: [PATCH 0125/1338] We're gonna use this errywhere --- app/src/models/account.ts | 10 +++++++++- app/src/ui/account-picker.tsx | 14 ++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/src/models/account.ts b/app/src/models/account.ts index 4e4dd956f76..21545929c14 100644 --- a/app/src/models/account.ts +++ b/app/src/models/account.ts @@ -1,4 +1,4 @@ -import { getDotComAPIEndpoint, IAPIEmail } from '../lib/api' +import { getDotComAPIEndpoint, getHTMLURL, IAPIEmail } from '../lib/api' /** * Returns a value indicating whether two account instances @@ -23,6 +23,8 @@ export class Account { return new Account('', getDotComAPIEndpoint(), '', [], '', -1, '', 'free') } + private _friendlyEndpoint: string | undefined = undefined + /** * Create an instance of an account * @@ -67,6 +69,12 @@ export class Account { public get friendlyName(): string { return this.name !== '' ? this.name : this.login } + + public get friendlyEndpoint(): string { + return (this._friendlyEndpoint ??= new URL( + getHTMLURL(this.endpoint) + ).hostname) + } } /** diff --git a/app/src/ui/account-picker.tsx b/app/src/ui/account-picker.tsx index e987bf155af..258d0c351c0 100644 --- a/app/src/ui/account-picker.tsx +++ b/app/src/ui/account-picker.tsx @@ -11,7 +11,6 @@ import { IMatches } from '../lib/fuzzy-find' import { Avatar } from './lib/avatar' import { lookupPreferredEmail } from '../lib/email' import { IAvatarUser } from '../models/avatar' -import { getHTMLURL } from '../lib/api' interface IAccountPickerProps { readonly accounts: ReadonlyArray @@ -130,9 +129,7 @@ export class AccountPicker extends React.Component<
@{item.account.login}
-
- {new URL(getHTMLURL(item.account.endpoint)).host} -
+
{item.account.friendlyEndpoint}
) @@ -157,8 +154,13 @@ export class AccountPicker extends React.Component< return ( + {this.props.selectedAccount.friendlyEndpoint} - @ + {this.props.selectedAccount.login} + + } + label="account: " ref={this.popoverRef} > From 75fa7b362547bbc78d5d33e9845695a80028cd3e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:26:07 +0100 Subject: [PATCH 0126/1338] Eh.. perhaps it should be on its own row --- .../ui/clone-repository/clone-github-repository.tsx | 10 ++++------ app/styles/ui/_add-repository.scss | 12 ++++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/ui/clone-repository/clone-github-repository.tsx b/app/src/ui/clone-repository/clone-github-repository.tsx index e808f4b3f97..94471d69895 100644 --- a/app/src/ui/clone-repository/clone-github-repository.tsx +++ b/app/src/ui/clone-repository/clone-github-repository.tsx @@ -100,6 +100,10 @@ export class CloneGithubRepository extends React.PureComponent + {enableMultipleEnterpriseAccounts() && + this.props.accounts.length > 1 ? ( + {this.renderAccountPicker()} + ) : undefined} 1 - ? this.renderAccountPicker - : undefined - } /> diff --git a/app/styles/ui/_add-repository.scss b/app/styles/ui/_add-repository.scss index b3fe42b3153..3bb413a1fd4 100644 --- a/app/styles/ui/_add-repository.scss +++ b/app/styles/ui/_add-repository.scss @@ -57,6 +57,18 @@ &.clone-github-repository-content { padding: 0; padding-top: var(--spacing-double); + + .account-picker-row { + margin: 0 var(--spacing-double); + padding-bottom: var(--spacing); + + .popover-dropdown-component { + &, + .button-component { + width: 100%; + } + } + } } &.clone-generic-repository-content { From 6f6881cd1894e9fdb3b3ab01001ef9387fbd33a5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:45:34 +0100 Subject: [PATCH 0127/1338] Make the label optional and add a flex container --- app/src/ui/lib/popover-dropdown.tsx | 10 +++++++--- app/styles/ui/_popover-dropdown.scss | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/ui/lib/popover-dropdown.tsx b/app/src/ui/lib/popover-dropdown.tsx index 6d00356b4ed..10a7c1b55e1 100644 --- a/app/src/ui/lib/popover-dropdown.tsx +++ b/app/src/ui/lib/popover-dropdown.tsx @@ -11,7 +11,7 @@ interface IPopoverDropdownProps { readonly className?: string readonly contentTitle: string readonly buttonContent: JSX.Element | string - readonly label: string + readonly label?: string } interface IPopoverDropdownState { @@ -93,8 +93,12 @@ export class PopoverDropdown extends React.Component< onClick={this.togglePopover} onButtonRef={this.onInvokeButtonRef} > - {label} - {buttonContent} +
+ {label && ( + {label} + )} + {buttonContent} +
{this.renderPopover()} diff --git a/app/styles/ui/_popover-dropdown.scss b/app/styles/ui/_popover-dropdown.scss index 3a6ebf5913c..1693a1586a0 100644 --- a/app/styles/ui/_popover-dropdown.scss +++ b/app/styles/ui/_popover-dropdown.scss @@ -3,14 +3,24 @@ .popover-dropdown-component { display: inline-flex; - .button-content, - .popover-dropdown-button-label { + .button-component { + display: flex; + align-items: center; + flex-grow: 1; + padding-right: var(--spacing-half); + } + + .button-content { + flex-grow: 1; font-weight: var(--font-weight-semibold); + display: flex; + justify-content: flex-start; } .popover-dropdown-button-label { color: var(--text-secondary-color); - margin: 0 var(--spacing-half); + margin: 0; + margin-right: var(--spacing-half); } .popover-dropdown-popover { From 31b7b54be8ec51c5fe31f809c40ad446a349b37e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:45:45 +0100 Subject: [PATCH 0128/1338] Styling --- app/src/ui/account-picker.tsx | 27 +++++--- app/styles/ui/_account-picker.scss | 100 ++++++++++++++++------------- app/styles/ui/_add-repository.scss | 5 +- 3 files changed, 76 insertions(+), 56 deletions(-) diff --git a/app/src/ui/account-picker.tsx b/app/src/ui/account-picker.tsx index 258d0c351c0..80e5dcd251f 100644 --- a/app/src/ui/account-picker.tsx +++ b/app/src/ui/account-picker.tsx @@ -115,18 +115,24 @@ export class AccountPicker extends React.Component< this.setState({ filterText: text }) } - private renderAccount = (item: IAccountListItem, matches: IMatches) => { - const account = item.account - const avatarUser: IAvatarUser = { + private getAvatarUser = (account: Account): IAvatarUser => { + return { name: account.name, email: lookupPreferredEmail(account), avatarURL: account.avatarURL, endpoint: account.endpoint, } + } + + private renderAccount = (item: IAccountListItem, matches: IMatches) => { + const account = item.account return (
- +
@{item.account.login}
{item.account.friendlyEndpoint}
@@ -151,14 +157,19 @@ export class AccountPicker extends React.Component< } public render() { + const account = this.props.selectedAccount + return ( - {this.props.selectedAccount.friendlyEndpoint} - @ - {this.props.selectedAccount.login} - +
+ @{account.login} -{' '} + + {this.props.selectedAccount.friendlyEndpoint} + +
} label="account: " ref={this.popoverRef} diff --git a/app/styles/ui/_account-picker.scss b/app/styles/ui/_account-picker.scss index 6e7ce3c131d..7907ae29892 100644 --- a/app/styles/ui/_account-picker.scss +++ b/app/styles/ui/_account-picker.scss @@ -1,64 +1,76 @@ -.account-list { - height: 100%; - width: 100%; +.account-picker { + > .button-component .button-content { + .account { + font-weight: normal; - &.filter-list .filter-field-row { - // The rows have built-in margin to their content so - // we only need half a spacer here - margin-bottom: var(--spacing-half); - margin-top: var(--spacing); - margin-left: var(--spacing); - margin-right: var(--spacing); + .login { + font-weight: var(--font-weight-semibold); + } + } } - .account-list-item { - padding: 0 var(--spacing); - display: flex; - flex-direction: row; - align-items: center; - min-width: 0; - flex-grow: 1; + .account-list { height: 100%; + width: 100%; - .avatar { - width: 32px; - height: 32px; - } - - .icon { - margin-left: var(--spacing-half); + &.filter-list .filter-field-row { + // The rows have built-in margin to their content so + // we only need half a spacer here + margin-bottom: var(--spacing-half); + margin-top: var(--spacing); + margin-left: var(--spacing); margin-right: var(--spacing); - flex-shrink: 0; - - // Align the icon baseline with the title text - align-self: flex-start; - margin-top: 2px; } - .info { + .account-list-item { + padding: 0 var(--spacing); display: flex; - flex-direction: column; + flex-direction: row; + align-items: center; min-width: 0; flex-grow: 1; - margin: 0 var(--spacing); + height: 100%; - .title { - @include ellipsis; - min-width: 0; - font-weight: var(--font-weight-semibold); + .avatar { + width: 32px; + height: 32px; } - .subtitle { - @include ellipsis; + .icon { + margin-left: var(--spacing-half); + margin-right: var(--spacing); + flex-shrink: 0; + + // Align the icon baseline with the title text + align-self: flex-start; + margin-top: 2px; + } + + .info { + display: flex; + flex-direction: column; min-width: 0; - font-weight: var(--font-weight-light); - font-size: var(--font-size-sm); - color: var(--text-secondary-color); + flex-grow: 1; + margin: 0 var(--spacing); + + .title { + @include ellipsis; + min-width: 0; + font-weight: var(--font-weight-semibold); + } + + .subtitle { + @include ellipsis; + min-width: 0; + font-weight: var(--font-weight-light); + font-size: var(--font-size-sm); + color: var(--text-secondary-color); + } } } - } - .filter-list-group-header { - @include ellipsis; + .filter-list-group-header { + @include ellipsis; + } } } diff --git a/app/styles/ui/_add-repository.scss b/app/styles/ui/_add-repository.scss index 3bb413a1fd4..25fb9569493 100644 --- a/app/styles/ui/_add-repository.scss +++ b/app/styles/ui/_add-repository.scss @@ -63,10 +63,7 @@ padding-bottom: var(--spacing); .popover-dropdown-component { - &, - .button-component { - width: 100%; - } + width: 100%; } } } From 7d1dd57c09a3faba06a3a8d4596ac3df8c669f4a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 11:55:02 +0100 Subject: [PATCH 0129/1338] Support more than one concurrent popover dropdown by using unique ids for aria attributes --- app/src/ui/lib/popover-dropdown.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/ui/lib/popover-dropdown.tsx b/app/src/ui/lib/popover-dropdown.tsx index 10a7c1b55e1..3d6d387fe23 100644 --- a/app/src/ui/lib/popover-dropdown.tsx +++ b/app/src/ui/lib/popover-dropdown.tsx @@ -4,6 +4,7 @@ import { Popover, PopoverAnchorPosition, PopoverDecoration } from './popover' import { Octicon } from '../octicons' import * as octicons from '../octicons/octicons.generated' import classNames from 'classnames' +import { createUniqueId, releaseUniqueId } from './id-pool' const maxPopoverContentHeight = 500 @@ -27,6 +28,7 @@ export class PopoverDropdown extends React.Component< IPopoverDropdownState > { private invokeButtonRef: HTMLButtonElement | null = null + private dropdownHeaderId: string | undefined = undefined public constructor(props: IPopoverDropdownProps) { super(props) @@ -36,6 +38,13 @@ export class PopoverDropdown extends React.Component< } } + public componentWillUnmount() { + if (this.dropdownHeaderId) { + releaseUniqueId(this.dropdownHeaderId) + this.dropdownHeaderId = undefined + } + } + private onInvokeButtonRef = (buttonRef: HTMLButtonElement | null) => { this.invokeButtonRef = buttonRef } @@ -54,6 +63,7 @@ export class PopoverDropdown extends React.Component< } const { contentTitle } = this.props + this.dropdownHeaderId ??= createUniqueId('popover-dropdown-header') return (
-

{contentTitle}

+

{contentTitle}

} - label="account: " ref={this.popoverRef} > diff --git a/app/src/ui/branches/branch-select.tsx b/app/src/ui/branches/branch-select.tsx index 909f7dd1eef..ae9797647e3 100644 --- a/app/src/ui/branches/branch-select.tsx +++ b/app/src/ui/branches/branch-select.tsx @@ -109,11 +109,17 @@ export class BranchSelect extends React.Component< const { filterText, selectedBranch } = this.state + const buttonContent = ( + <> + base: + {selectedBranch?.name ?? ''} + + ) + return ( -
- {label && ( - {label} - )} - {buttonContent} -
+
{buttonContent}
{this.renderPopover()} From dcb22afd88e6abad2b1f61472f75956371ed5054 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Mar 2025 14:44:53 +0100 Subject: [PATCH 0131/1338] Add an actual label for the account picker --- app/src/ui/account-picker.tsx | 1 + app/src/ui/lib/button.tsx | 7 +++++++ app/src/ui/lib/popover-dropdown.tsx | 7 ++++++- app/styles/ui/_popover-dropdown.scss | 9 ++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/ui/account-picker.tsx b/app/src/ui/account-picker.tsx index 2642bd5464b..d9036bcc4d8 100644 --- a/app/src/ui/account-picker.tsx +++ b/app/src/ui/account-picker.tsx @@ -171,6 +171,7 @@ export class AccountPicker extends React.Component<
} + label="Account" ref={this.popoverRef} > diff --git a/app/src/ui/lib/button.tsx b/app/src/ui/lib/button.tsx index 32fc7c14dd8..f39a9e06927 100644 --- a/app/src/ui/lib/button.tsx +++ b/app/src/ui/lib/button.tsx @@ -189,6 +189,12 @@ export interface IButtonProps { * Defaults to true */ readonly tooltipDismissable?: boolean + + /** + * An optional html id for the button. This is useful for refering to the + * button in a label element. + */ + readonly id?: string } /** @@ -231,6 +237,7 @@ export class Button extends React.Component { return (
) @@ -1260,23 +1257,11 @@ export class FilterChangesList extends React.Component< onClick={this.openFilterOptions} ariaExpanded={this.state.isFilterOptionsOpen} onButtonRef={this.onFilterOptionsButtonRef} - tooltip={ - !this.props.canFilterChanges - ? 'Enable Filter (Beta)' - : 'Filter Options' - } - ariaLabel={ - !this.props.canFilterChanges - ? 'Enable Filter (Beta)' - : 'Filter Options' - } + tooltip={'Filter Options'} + ariaLabel={'Filter Options'} > - {this.props.canFilterChanges ? ( - - ) : ( - - )} + {this.state.isFilterOptionsOpen && this.renderFilterOptions()} @@ -1285,10 +1270,6 @@ export class FilterChangesList extends React.Component< } private renderBetaPill = () => { - if (this.props.canFilterChanges) { - return - } - return ( @@ -1347,10 +1328,6 @@ export class FilterChangesList extends React.Component< } private openFilterOptions = () => { - if (!this.props.canFilterChanges) { - this.props.dispatcher.setCanFilterChanges(true) - return - } this.setState({ isFilterOptionsOpen: true }) } @@ -1411,7 +1388,6 @@ export class FilterChangesList extends React.Component< filterToIncludedCommit: false, isFilterOptionsOpen: false, }) - this.props.dispatcher.setCanFilterChanges(false) } private clearNonTextFilters = () => { @@ -1419,29 +1395,20 @@ export class FilterChangesList extends React.Component< } private renderFilterBox = () => { - if (!this.props.canFilterChanges) { - return - } - return ( - -
- -
- +
+ +
) } diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 84be80dda83..dfe253d9407 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -88,8 +88,6 @@ interface IChangesSidebarProps { readonly commitSpellcheckEnabled: boolean readonly showCommitLengthWarning: boolean - - readonly canFilterChanges: boolean } export class ChangesSidebar extends React.Component { @@ -457,7 +455,6 @@ export class ChangesSidebar extends React.Component { currentRepoRulesInfo={currentRepoRulesInfo} aheadBehind={this.props.aheadBehind} accounts={this.props.accounts} - canFilterChanges={this.props.canFilterChanges} /> {this.renderUndoCommit(rebaseConflictState)}
diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 9640074def0..a48001dbbc7 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -3966,10 +3966,6 @@ export class Dispatcher { return this.appStore._updateShowDiffCheckMarks(diffCheckMarks) } - public setCanFilterChanges(canFilterChanges: boolean) { - return this.appStore._updateCanFilterChanges(canFilterChanges) - } - public testPruneBranches() { return this.appStore._testPruneBranches() } diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 76e3b72c2bf..2ee6862d77f 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -109,8 +109,6 @@ interface IRepositoryViewProps { /** The user's preference of pull request suggested next action to use **/ readonly pullRequestSuggestedNextAction?: PullRequestSuggestedNextAction - - readonly canFilterChanges: boolean } interface IRepositoryViewState { @@ -268,7 +266,6 @@ export class RepositoryView extends React.Component< } commitSpellcheckEnabled={this.props.commitSpellcheckEnabled} showCommitLengthWarning={this.props.showCommitLengthWarning} - canFilterChanges={this.props.canFilterChanges} /> ) } From 679802c601e7a2f0a4085b48616b9b48ea7c400c Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 13:03:22 -0400 Subject: [PATCH 0174/1338] Remove beta pill --- app/src/ui/changes/filter-changes-list.tsx | 12 ------ app/styles/ui/changes/_changes-list.scss | 50 ---------------------- 2 files changed, 62 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index bf7337f4ddc..ceea63fe61a 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1248,8 +1248,6 @@ export class FilterChangesList extends React.Component< ) : null} - {this.renderBetaPill()} - - ) : null} - - - - {this.state.isFilterOptionsOpen && this.renderFilterOptions()} -
) } @@ -1364,27 +1336,34 @@ export class FilterChangesList extends React.Component< label={`Being committed (${checkedFilesThatAreVisibleCount})`} />
- - Disable Filter ) } - private disableFilters = () => { - this.setState({ - filterText: '', - filterToIncludedCommit: false, - isFilterOptionsOpen: false, - }) - } - - private clearNonTextFilters = () => { - this.setState({ filterToIncludedCommit: false }) - } - private renderFilterBox = () => { return (
+ + + {this.state.isFilterOptionsOpen && this.renderFilterOptions()} + Date: Tue, 18 Mar 2025 14:13:19 -0400 Subject: [PATCH 0176/1338] Add total count to check all box --- app/src/ui/changes/filter-changes-list.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index c43d114b441..34056dba2a0 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1194,8 +1194,6 @@ export class FilterChangesList extends React.Component< const disableAllCheckbox = files.length === 0 || isCommitting || rebaseConflictState !== null - const fileCount = files.length - const filesChecked = workingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ) @@ -1204,7 +1202,7 @@ export class FilterChangesList extends React.Component< this.state.filterText, filesChecked.map(f => f.id), this.state.filteredItems, - fileCount + files.length ) return ( @@ -1218,7 +1216,9 @@ export class FilterChangesList extends React.Component< className="changes-list-check-all" /> - + {showHiddenCheckedFilesWarning ? ( From 6942a521e250935185765977857f3efd4d685ca4 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 14:13:38 -0400 Subject: [PATCH 0177/1338] Use established "included" verbiage --- app/src/ui/changes/filter-changes-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 34056dba2a0..1a9430dcfb5 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1333,7 +1333,7 @@ export class FilterChangesList extends React.Component< : CheckboxValue.Off } onChange={this.onFilterToIncludedInCommit} - label={`Being committed (${checkedFilesThatAreVisibleCount})`} + label={`Included in commit (${checkedFilesThatAreVisibleCount})`} />
From cdb25fa89609926937c7fc33f1bdcd34fd348527 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 14:19:30 -0400 Subject: [PATCH 0178/1338] Remove Hidden changes popover --- app/src/ui/changes/filter-changes-list.tsx | 91 ++++------------------ app/styles/ui/changes/_changes-list.scss | 6 +- 2 files changed, 15 insertions(+), 82 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 1a9430dcfb5..33072e70b60 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -67,7 +67,6 @@ import { PopoverAnchorPosition, PopoverDecoration, } from '../lib/popover' -import { LinkButton } from '../lib/link-button' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -223,10 +222,6 @@ interface IFilterChangesListState { readonly groups: ReadonlyArray> readonly filterToIncludedCommit: boolean readonly isFilterOptionsOpen: boolean - /** - * Whether the warning about committing hidden files is open. - */ - readonly isFilesWarningOpen: boolean } function getSelectedItemsFromProps( @@ -333,7 +328,6 @@ export class FilterChangesList extends React.Component< private headerRef = createObservableRef() private filterOptionsButtonRef: HTMLButtonElement | null = null - private filterWarningButtonRef: HTMLButtonElement | null = null private includeAllCheckBoxRef = React.createRef() private filterListRef = React.createRef>() @@ -354,7 +348,6 @@ export class FilterChangesList extends React.Component< groups, filterToIncludedCommit: false, isFilterOptionsOpen: false, - isFilesWarningOpen: false, } } @@ -1152,7 +1145,6 @@ export class FilterChangesList extends React.Component< this.setState({ filterText: '', filterToIncludedCommit: true, - isFilesWarningOpen: false, }) } @@ -1194,16 +1186,21 @@ export class FilterChangesList extends React.Component< const disableAllCheckbox = files.length === 0 || isCommitting || rebaseConflictState !== null - const filesChecked = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ) + /** + * + * + const filesChecked = workingDirectory.files.filter( + f => f.selection.getSelectionType() !== DiffSelectionType.None + ) - const showHiddenCheckedFilesWarning = this.isCommittingFileHiddenByFilter( - this.state.filterText, - filesChecked.map(f => f.id), - this.state.filteredItems, - files.length - ) + const showHiddenCheckedFilesWarning = this.isCommittingFileHiddenByFilter( + this.state.filterText, + filesChecked.map(f => f.id), + this.state.filteredItems, + files.length + ) + + **/ return (
@@ -1219,22 +1216,6 @@ export class FilterChangesList extends React.Component< - - {showHiddenCheckedFilesWarning ? ( - - - {this.state.isFilesWarningOpen && this.renderFilterWarning()} - - ) : null}
) } @@ -1243,50 +1224,6 @@ export class FilterChangesList extends React.Component< this.filterOptionsButtonRef = buttonRef } - private onFilterWarningButtonRef = (buttonRef: HTMLButtonElement | null) => { - this.filterWarningButtonRef = buttonRef - } - - private openFilterWarning = () => { - this.setState({ isFilesWarningOpen: true }) - } - - private closeFilterWarning = () => { - this.setState({ isFilesWarningOpen: false }) - } - - private renderFilterWarning() { - return ( - -
-

Committing Hidden Files

- -
-
- You have a filter applied. There are{' '} - - hidden changes - {' '} - that will be committed. -
- - ) - } - private openFilterOptions = () => { this.setState({ isFilterOptionsOpen: true }) } diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 20943b5fa18..ffc4aba28cd 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -119,11 +119,7 @@ border-radius: 20px; line-height: 1; } - - &.hidden-files-warning { - margin-right: var(--spacing-half); - } - + &:hover { color: var(--text-secondary-color); background-color: inherit; From 66c5f98ad60d7d9408d818410d9ed9ba509adf7e Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 15:14:54 -0400 Subject: [PATCH 0179/1338] css cleanup --- app/styles/ui/changes/_changes-list.scss | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index ffc4aba28cd..fbe29a647a7 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -57,15 +57,6 @@ } } - .filter-options { - margin: var(--spacing) 0; - } - - .filter-warning-text { - max-width: 200px; - text-align: left; - } - .popover-content { padding: var(--spacing); } @@ -119,7 +110,7 @@ border-radius: 20px; line-height: 1; } - + &:hover { color: var(--text-secondary-color); background-color: inherit; From 2f52b26b69127288e55cc72f94ab82bb912b231d Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 15:15:04 -0400 Subject: [PATCH 0180/1338] Verbiage stuff --- app/src/ui/changes/filter-changes-list.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 33072e70b60..83d9e67faf3 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1214,7 +1214,8 @@ export class FilterChangesList extends React.Component< />
) From 897a080c0bf7c937093fade2fb09db06eb1e49b9 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 15:17:52 -0400 Subject: [PATCH 0181/1338] Prettier --- app/styles/ui/changes/_changes-list.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index fbe29a647a7..39a80036755 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -52,11 +52,15 @@ display: flex; justify-content: space-between; align-items: center; + h3 { margin-bottom: var(--spacing-half); } } + .filter-options { + margin: var(--spacing) 0; + } .popover-content { padding: var(--spacing); } @@ -126,7 +130,7 @@ flex-grow: 1; } - + } label { @@ -183,10 +187,12 @@ background-color: var(--secondary-button-hover-background); background: var(--box-selected-background-color); } + &.selected, &.selected:hover { color: var(--box-selected-active-text-color); background-color: var(--box-selected-active-background-color); + .stack-icon { fill: var(--box-selected-active-text-color); } From e0fa31c21bb7eeb2db701f2dcb2887d38cd8b6b4 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 16:41:10 -0400 Subject: [PATCH 0182/1338] Linter --- app/styles/ui/changes/_changes-list.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 39a80036755..5cb4ee49009 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -58,9 +58,9 @@ } } - .filter-options { - margin: var(--spacing) 0; - } + .filter-options { + margin: var(--spacing) 0; + } .popover-content { padding: var(--spacing); } @@ -129,8 +129,6 @@ .spacer { flex-grow: 1; } - - } label { From 3c417cc75f168e52a5b8c9413a790141f14c7777 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 18 Mar 2025 16:43:35 -0400 Subject: [PATCH 0183/1338] Remove showHiddenCheckedFilesWarningBit --- app/src/ui/changes/filter-changes-list.tsx | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 83d9e67faf3..a4bcbf19373 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1186,22 +1186,6 @@ export class FilterChangesList extends React.Component< const disableAllCheckbox = files.length === 0 || isCommitting || rebaseConflictState !== null - /** - * - * - const filesChecked = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ) - - const showHiddenCheckedFilesWarning = this.isCommittingFileHiddenByFilter( - this.state.filterText, - filesChecked.map(f => f.id), - this.state.filteredItems, - files.length - ) - - **/ - return (
Date: Wed, 19 Mar 2025 07:36:27 -0400 Subject: [PATCH 0184/1338] Add filtering changes metrics --- app/src/lib/stats/stats-database.ts | 9 +++++++++ app/src/lib/stats/stats-store.ts | 3 +++ app/src/ui/changes/filter-changes-list.tsx | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 66bff8a4610..2dca384b6e5 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -601,6 +601,15 @@ export interface IDailyMeasures { /** The number of times a user has opened the preview pull request dialog */ readonly previewedPullRequestCount: number + + /** The number of times a user initiates (from an empty state) typing in the changes filter bar */ + typedInChangesFilterCount: 0 + + /** The number of times the user applies the "Included in Commit" Filter */ + appliesIncludedInCommitFilterCount: 0 + + /** The number of times the user adjust the filter from warnings about hidden changes */ + adjustedFiltersForHiddenChangesCount: 0 } export class StatsDatabase extends Dexie { diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index af3b11c523f..3bf46857cf5 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -238,6 +238,9 @@ const DefaultDailyMeasures: IDailyMeasures = { submoduleDiffViewedFromHistoryCount: 0, openSubmoduleFromDiffCount: 0, previewedPullRequestCount: 0, + typedInChangesFilterCount: 0, + appliesIncludedInCommitFilterCount: 0, + adjustedFiltersForHiddenChangesCount: 0, } // A subtype of IDailyMeasures filtered to contain only its numeric properties diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a4bcbf19373..250074bc12b 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1111,6 +1111,10 @@ export class FilterChangesList extends React.Component< } private onFilterTextChanged = (text: string) => { + if (this.state.filterText === '' && text !== '') { + this.props.dispatcher.incrementMetric('typedInChangesFilterCount') + } + this.setState({ filterText: text }) } @@ -1142,6 +1146,9 @@ export class FilterChangesList extends React.Component< } private showFilesToBeCommitted = () => { + this.props.dispatcher.incrementMetric( + 'adjustedFiltersForHiddenChangesCount' + ) this.setState({ filterText: '', filterToIncludedCommit: true, @@ -1389,6 +1396,11 @@ export class FilterChangesList extends React.Component< } private onFilterToIncludedInCommit = () => { + if (!this.state.filterToIncludedCommit) { + this.props.dispatcher.incrementMetric( + 'appliesIncludedInCommitFilterCount' + ) + } this.setState({ filterToIncludedCommit: !this.state.filterToIncludedCommit, }) From 63157d3b4e9c453074154cb15f5199b7f70b76d4 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 19 Mar 2025 09:07:01 -0400 Subject: [PATCH 0185/1338] Update app/src/ui/changes/filter-changes-list.tsx Co-authored-by: Markus Olsson --- app/src/ui/changes/filter-changes-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a4bcbf19373..97319d6cadc 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1199,7 +1199,7 @@ export class FilterChangesList extends React.Component<
) From bd42713a4687fe9501fb054cd84d1b604f6d2e11 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 09:25:33 -0400 Subject: [PATCH 0186/1338] No need for special label now --- app/src/ui/changes/filter-changes-list.tsx | 13 +++++++------ app/styles/ui/changes/_changes-list.scss | 12 +++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 97319d6cadc..85472c0f242 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1186,6 +1186,11 @@ export class FilterChangesList extends React.Component< const disableAllCheckbox = files.length === 0 || isCommitting || rebaseConflictState !== null + const checkAllLabel = `${ + visibleFiles !== files.length ? `${visibleFiles} of ` : '' + } + ${files.length} changed file${files.length === 1 ? '' : 's'}` + return (
- -
) } @@ -1210,7 +1211,7 @@ export class FilterChangesList extends React.Component< } private openFilterOptions = () => { - this.setState({ isFilterOptionsOpen: true }) + this.setState({ isFilterOptionsOpen: !this.state.isFilterOptionsOpen }) } private closeFilterOptions = () => { diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 5cb4ee49009..0527b12a5ae 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -131,9 +131,15 @@ } } - label { - text-align: right; - padding: 0 var(--spacing-half); + .changes-list-check-all { + input { + margin-right: 7px; + } + label { + text-align: right; + padding: 0; + position: unset; + } } } } From 1eef13d8da503e4c83612f235c2c257e7979a06c Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 09:51:58 -0400 Subject: [PATCH 0187/1338] Update filter-changes-list.tsx --- app/src/ui/changes/filter-changes-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 250074bc12b..9b10d8d7f12 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1114,7 +1114,7 @@ export class FilterChangesList extends React.Component< if (this.state.filterText === '' && text !== '') { this.props.dispatcher.incrementMetric('typedInChangesFilterCount') } - + this.setState({ filterText: text }) } From f63be7bc6c09cf3d0cc9695a59ac703ae9d37614 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 11:29:28 -0400 Subject: [PATCH 0188/1338] First take at hidden changes warning --- app/src/ui/changes/filter-changes-list.tsx | 32 ++++++++++++++++++++++ app/styles/ui/changes/_changes-list.scss | 16 +++++++++++ 2 files changed, 48 insertions(+) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 9b10d8d7f12..fdbbbb678cb 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -67,6 +67,7 @@ import { PopoverAnchorPosition, PopoverDecoration, } from '../lib/popover' +import { LinkButton } from '../lib/link-button' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -1361,11 +1362,42 @@ export class FilterChangesList extends React.Component< /> {this.renderStashedChanges()} + {this.renderHiddenChangesWarning()} {this.renderCommitMessageForm()} ) } + private renderHiddenChangesWarning = () => { + const { files } = this.props.workingDirectory + const filesSelected = files.filter( + f => f.selection.getSelectionType() !== DiffSelectionType.None + ) + + if ( + !this.isCommittingFileHiddenByFilter( + this.state.filterText, + filesSelected.map(f => f.id), + this.state.filteredItems, + files.length + ) + ) { + return null + } + + return ( +
+ + + + Adjust the filters + {' '} + to see all ${filesSelected} changes that will be committed. + +
+ ) + } + private getNoResultsMessage = () => { if (this.state.filterText === '' && !this.state.filterToIncludedCommit) { return undefined diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 5cb4ee49009..9a260086ac0 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -233,3 +233,19 @@ transition: max-height var(--undo-animation-duration) ease-out; } + + +.hidden-changes-warning { + background-color: var(--file-warning-background-color); + padding: var(--spacing-half) var(--spacing); + border-bottom: var(--file-warning-border-color) solid 1px; + border-top: var(--file-warning-border-color) solid 1px; + + .octicon { + color: var(--file-warning-color); + margin-right: var(--spacing); + vertical-align: text-bottom; + } +} + + From 41e16efbe489c106a8d042e098788205cd80bba9 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 11:37:57 -0400 Subject: [PATCH 0189/1338] Use badge for filter applied visual indicator --- app/src/ui/changes/filter-changes-list.tsx | 19 ++++++++----- app/src/ui/lib/plural.ts | 4 +++ app/styles/ui/changes/_changes-list.scss | 32 ++++++++++++++++------ 3 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 app/src/ui/lib/plural.ts diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 85472c0f242..42df7220745 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -67,6 +67,7 @@ import { PopoverAnchorPosition, PopoverDecoration, } from '../lib/popover' +import { plural } from '../lib/plural' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -1189,7 +1190,7 @@ export class FilterChangesList extends React.Component< const checkAllLabel = `${ visibleFiles !== files.length ? `${visibleFiles} of ` : '' } - ${files.length} changed file${files.length === 1 ? '' : 's'}` + ${files.length} changed file${plural(files.length)}` return (
@@ -1264,6 +1265,8 @@ export class FilterChangesList extends React.Component< } private renderFilterBox = () => { + const buttonTextLabel = `Filter Options ${this.state.filterToIncludedCommit ? '(1 applied)' : ''}` + return (
@@ -1274,14 +1277,18 @@ export class FilterChangesList extends React.Component< onClick={this.openFilterOptions} ariaExpanded={this.state.isFilterOptionsOpen} onButtonRef={this.onFilterOptionsButtonRef} - tooltip={'Filter Options'} - ariaLabel={'Filter Options'} + tooltip={buttonTextLabel} + ariaLabel={buttonTextLabel} > {this.state.filterToIncludedCommit ? ( - 1 + +
+
+
+ ) : null} @@ -1290,7 +1297,6 @@ export class FilterChangesList extends React.Component< { const { files } = this.props.workingDirectory - const filesPlural = files.length === 1 ? 'file' : 'files' - return `${files.length} changed ${filesPlural}` + return `${files.length} changed file${plural(files.length)}` } public render() { diff --git a/app/src/ui/lib/plural.ts b/app/src/ui/lib/plural.ts new file mode 100644 index 00000000000..d66ea80457a --- /dev/null +++ b/app/src/ui/lib/plural.ts @@ -0,0 +1,4 @@ +/** Returns '' if count === 1 or 's' otherwise */ +export function plural(count: number): string { + return count === 1 ? '' : 's' +} diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 0527b12a5ae..f9bcefca641 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -98,6 +98,7 @@ display: inline-flex; align-items: center; padding-right: var(--spacing-half); + position: relative; &.active { span:first-child { @@ -105,19 +106,34 @@ } } - .counter { - color: var(--box-selected-active-text-color); - background-color: var(--box-selected-active-background-color); - margin-left: 4px; - padding: 2px 5px; - font-size: var(--font-size-xs); - border-radius: 20px; - line-height: 1; + .active-badge { + position: absolute; + right: 18px; + top: 4px; + + + .badge { + width: 5px; + height: 5px; + background-color: var(--box-selected-active-background-color); + border-radius: 50%; + } + + .badge-bg { + padding: 1px; + border-radius: 50%; + background-color: var(--secondary-button-background); + } + } &:hover { color: var(--text-secondary-color); background-color: inherit; + + .badge-bg { + background-color: var(--secondary-button-background); + } } } } From 1fa63c27e35d3fbc3ee966a3533f859e3c019555 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 11:41:09 -0400 Subject: [PATCH 0190/1338] Prettier --- app/src/ui/changes/filter-changes-list.tsx | 4 +++- app/styles/ui/changes/_changes-list.scss | 16 +++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 42df7220745..23c2cb639a2 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1265,7 +1265,9 @@ export class FilterChangesList extends React.Component< } private renderFilterBox = () => { - const buttonTextLabel = `Filter Options ${this.state.filterToIncludedCommit ? '(1 applied)' : ''}` + const buttonTextLabel = `Filter Options ${ + this.state.filterToIncludedCommit ? '(1 applied)' : '' + }` return (
diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index f9bcefca641..4afea57e8da 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -110,21 +110,19 @@ position: absolute; right: 18px; top: 4px; - - + + .badge-bg { + padding: 1px; + border-radius: 50%; + background-color: var(--secondary-button-background); + .badge { width: 5px; height: 5px; background-color: var(--box-selected-active-background-color); border-radius: 50%; } - - .badge-bg { - padding: 1px; - border-radius: 50%; - background-color: var(--secondary-button-background); - } - + } } &:hover { From 75e819c8072a3a0c5de6e1b6d6c98e35dd4df942 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 12:16:59 -0400 Subject: [PATCH 0191/1338] Adding to commit button aria-describedby, verbiage iteration --- app/src/ui/changes/commit-message.tsx | 5 +++++ app/src/ui/changes/filter-changes-list.tsx | 12 ++++++------ app/styles/ui/changes/_changes-list.scss | 10 +++++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index a2669a35e60..b580ee500da 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -177,6 +177,10 @@ interface ICommitMessageProps { readonly onFilesToCommitNotVisible?: (onCommitAnyway: () => {}) => void readonly onSuccessfulCommitCreated?: () => void readonly accounts: ReadonlyArray + + /** Optional to add an id to a message that should be provided as an aria + * description of the submit button */ + readonly submitButtonAriaDescribedBy?: string } interface ICommitMessageState { @@ -1267,6 +1271,7 @@ export class CommitMessage extends React.Component< tooltip={tooltip} tooltipDismissable={false} onlyShowTooltipWhenOverflowed={buttonEnabled} + ariaDescribedBy={this.props.submitButtonAriaDescribedBy} > <> {loading} diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 68ce65262ff..49e5ec58d5e 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -988,6 +988,7 @@ export class FilterChangesList extends React.Component< onFilesToCommitNotVisible={this.onFilesToCommitNotVisible} accounts={this.props.accounts} onSuccessfulCommitCreated={this.onSuccessfulCommitCreated} + submitButtonAriaDescribedBy={'hidden-changes-warning'} /> ) } @@ -1396,12 +1397,11 @@ export class FilterChangesList extends React.Component< return (
- - - Adjust the filters - {' '} - to see all ${filesSelected} changes that will be committed. - + Warning: + Hidden changes will be committed. + + Adjust the filters to see all {filesSelected.length} changes +
) } diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 81dea059f86..bb0dcc96691 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -261,11 +261,19 @@ border-bottom: var(--file-warning-border-color) solid 1px; border-top: var(--file-warning-border-color) solid 1px; + // To overlap the commit message form border + margin-bottom: -1px; + z-index: 1; + .octicon { color: var(--file-warning-color); - margin-right: var(--spacing); + margin-right: var(--spacing-half); vertical-align: text-bottom; } + + .link-button-component { + display: inline; + } } From 10e362b8ff04ae9309a0d2808a8eb84512c59d35 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 12:17:34 -0400 Subject: [PATCH 0192/1338] prettier --- app/styles/ui/changes/_changes-list.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index bb0dcc96691..6cfc841e51e 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -254,7 +254,6 @@ transition: max-height var(--undo-animation-duration) ease-out; } - .hidden-changes-warning { background-color: var(--file-warning-background-color); padding: var(--spacing-half) var(--spacing); @@ -275,5 +274,3 @@ display: inline; } } - - From 73da37e6c2c6df8bbc8561ed87b38bb5278e0892 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 19 Mar 2025 14:23:00 -0400 Subject: [PATCH 0193/1338] Track changes list filtering state in app state --- app/src/lib/app-state.ts | 6 ++ app/src/lib/stores/app-store.ts | 17 +++++ app/src/lib/stores/repository-state-cache.ts | 2 + app/src/ui/changes/filter-changes-list.tsx | 66 +++++++++++--------- app/src/ui/changes/sidebar.tsx | 4 ++ app/src/ui/dispatcher/dispatcher.ts | 13 ++++ app/test/helpers/changes-state-helper.ts | 2 + 7 files changed, 81 insertions(+), 29 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index a29779c5de1..13689ec4bcb 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -760,6 +760,12 @@ export interface IChangesState { * Repo rules that apply to the current branch. */ readonly currentRepoRulesInfo: RepoRulesInfo + + /** The text entered into the compare branch filter text box */ + readonly filterText: string + + /** The state of the changes list filter of included changes. */ + readonly includedChangesInCommitFilter: boolean } /** diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 5ab0adf10fd..76a7867edcc 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -8148,6 +8148,23 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } } + + public _setChangesListFilterText(repository: Repository, filterText: string) { + this.repositoryStateCache.updateChangesState(repository, () => ({ + filterText, + })) + this.emitUpdate() + } + + public _setIncludedChangesInCommitFilter( + repository: Repository, + includedChangesInCommitFilter: boolean + ) { + this.repositoryStateCache.updateChangesState(repository, () => ({ + includedChangesInCommitFilter, + })) + this.emitUpdate() + } } /** diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 04e37e0faaa..31defddb601 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -318,6 +318,8 @@ function getInitialRepositoryState(): IRepositoryState { stashEntry: null, currentBranchProtected: false, currentRepoRulesInfo: new RepoRulesInfo(), + filterText: '', + includedChangesInCommitFilter: false, }, selectedSection: RepositorySectionTab.Changes, branchesState: { diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 49e5ec58d5e..de2e9354315 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -214,15 +214,17 @@ interface IFilterChangesListProps { readonly showCommitLengthWarning: boolean readonly accounts: ReadonlyArray + + readonly filterText: string + + readonly includedChangesInCommitFilter: boolean } interface IFilterChangesListState { - readonly filterText: string readonly filteredItems: Map readonly selectedItems: ReadonlyArray readonly focusedRow: string | null readonly groups: ReadonlyArray> - readonly filterToIncludedCommit: boolean readonly isFilterOptionsOpen: boolean } @@ -341,14 +343,12 @@ export class FilterChangesList extends React.Component< const groups = [listItems] this.state = { - filterText: '', filteredItems: new Map( listItems.items.map(i => [i.id, i]) ), selectedItems: getSelectedItemsFromProps(props), focusedRow: null, groups, - filterToIncludedCommit: false, isFilterOptionsOpen: false, } } @@ -930,7 +930,7 @@ export class FilterChangesList extends React.Component< const showPromptForCommittingFileHiddenByFilter = this.props.askForConfirmationOnCommitFilteredChanges && this.isCommittingFileHiddenByFilter( - this.state.filterText, + this.props.filterText, filesSelected.map(f => f.id), this.state.filteredItems, fileCount @@ -1114,11 +1114,11 @@ export class FilterChangesList extends React.Component< } private onFilterTextChanged = (text: string) => { - if (this.state.filterText === '' && text !== '') { + if (this.props.filterText === '' && text !== '') { this.props.dispatcher.incrementMetric('typedInChangesFilterCount') } - this.setState({ filterText: text }) + this.props.dispatcher.setChangesListFilterText(this.props.repository, text) } private onFilterListResultsChanged = ( @@ -1145,17 +1145,18 @@ export class FilterChangesList extends React.Component< } private clearFilter = () => { - this.setState({ filterText: '' }) + this.props.dispatcher.setChangesListFilterText(this.props.repository, '') } private showFilesToBeCommitted = () => { this.props.dispatcher.incrementMetric( 'adjustedFiltersForHiddenChangesCount' ) - this.setState({ - filterText: '', - filterToIncludedCommit: true, - }) + this.props.dispatcher.setIncludedChangesInCommitFilter( + this.props.repository, + true + ) + this.clearFilter() } private onTextBoxRef = (component: TextBox | null) => { @@ -1261,7 +1262,7 @@ export class FilterChangesList extends React.Component<
{ const buttonTextLabel = `Filter Options ${ - this.state.filterToIncludedCommit ? '(1 applied)' : '' + this.props.includedChangesInCommitFilter ? '(1 applied)' : '' }` return ( @@ -1283,7 +1284,7 @@ export class FilterChangesList extends React.Component<
diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index a48001dbbc7..f32bc96e980 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -3973,4 +3973,17 @@ export class Dispatcher { public editGlobalGitConfig() { return this.appStore._editGlobalGitConfig() } + + public setChangesListFilterText(repository: Repository, filterText: string) { + return this.appStore._setChangesListFilterText(repository, filterText) + } + public setIncludedChangesInCommitFilter( + repository: Repository, + includedChangesInCommitFilter: boolean + ) { + return this.appStore._setIncludedChangesInCommitFilter( + repository, + includedChangesInCommitFilter + ) + } } diff --git a/app/test/helpers/changes-state-helper.ts b/app/test/helpers/changes-state-helper.ts index a0a7bf523b2..7432911ca03 100644 --- a/app/test/helpers/changes-state-helper.ts +++ b/app/test/helpers/changes-state-helper.ts @@ -22,6 +22,8 @@ export function createState( stashEntry: null, currentBranchProtected: false, currentRepoRulesInfo: new RepoRulesInfo(), + filterText: '', + includedChangesInCommitFilter: false, } return merge(baseChangesState, pick) From 40b4ba9f4640aa1c11291aabed2ff9e017323055 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 20 Mar 2025 08:47:32 +0100 Subject: [PATCH 0194/1338] Enable multiple enterprise accounts on beta --- app/src/lib/feature-flag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 44f66074424..91a956a3c24 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -102,4 +102,4 @@ export const enableCustomIntegration = () => true export const enableResizingToolbarButtons = () => true export const enableFilteredChangesList = enableDevelopmentFeatures -export const enableMultipleEnterpriseAccounts = enableDevelopmentFeatures +export const enableMultipleEnterpriseAccounts = enableBetaFeatures From 72f9d04509615006657c84f8afbbe005717cf99c Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 20 Mar 2025 07:25:07 -0400 Subject: [PATCH 0195/1338] Merge fail fix --- app/src/ui/changes/filter-changes-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 39914e9656b..de2e9354315 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1114,7 +1114,7 @@ export class FilterChangesList extends React.Component< } private onFilterTextChanged = (text: string) => { - if (this.state.filterText === '' && text !== '') { + if (this.props.filterText === '' && text !== '') { this.props.dispatcher.incrementMetric('typedInChangesFilterCount') } From cbc3f36aba596708dc7ee57d031a174ebc436dc8 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 20 Mar 2025 13:26:41 -0400 Subject: [PATCH 0196/1338] Release 3.4.19-beta1 --- app/package.json | 2 +- changelog.json | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 010f537cfe9..def453250eb 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.18", + "version": "3.4.19-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index f933c78c989..ed769e0501a 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,18 @@ { "releases": { + "3.4.19-beta1": [ + "[New] Add support for multiple enterprise accounts - #20227", + "[New] Users can filter the change files list - #20220", + "[Fixed] Resizing the list of files in \"Preview Pull Request\" does not open/create the pull request - #20200", + "[Fixed] Sections lists such as the repository list in the cloning dialog and the pull request list announce their labels to screen readers - #20184", + "[Fixed] The added and removed prefixes of diff do not wrap making diff contents width equal in side by side diffs - #20191", + "[Fixed] Improve default README formatting - #20161. Thanks @OctCarp!", + "[Fixed] Pressing Ctrl+A in the Find dialog now selects the search text instead of the diff content - #20049", + "[Improved] The radio options label in the \"How do you plan to use this fork?\" dialog reflects their purpose - #20183", + "[Improved] The radio controls in the create branch, stashing changes, and fork behavior dialogs have visual selection indicators - #20052", + "[Improved] Promote use of GIT_CONFIG_PARAMETERS to production - #20198", + "[Improved] Use the default, not text cursor in whitespace hint popover - #20153" + ], "3.4.18": [ "[Fixed] Prevent crash due to non-critical error - #20150", "[Fixed] Reinstate missing space in the About dialog last checked text - #20094. Thanks @alexravenna!" From d5be425dfdb6c5da3cfa180f168c2f7072708621 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 18 Mar 2025 12:59:23 +0100 Subject: [PATCH 0197/1338] Add new stats related to Copilot usage --- app/src/lib/stats/stats-database.ts | 9 +++++++++ app/src/lib/stats/stats-store.ts | 3 +++ 2 files changed, 12 insertions(+) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 66bff8a4610..60d9e938936 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -601,6 +601,15 @@ export interface IDailyMeasures { /** The number of times a user has opened the preview pull request dialog */ readonly previewedPullRequestCount: number + + /** The number of times a user has clicked the "Generate commit message" button */ + readonly generateCommitMessageButtonClickCount: number + + /** The number of times a user got a commit message generated by Copilot */ + readonly generateCommitMessageCount: number + + /** The number of times a user used the verbatim commit message generated by Copilot */ + readonly generateCommitMessageUsedVerbatimCount: number } export class StatsDatabase extends Dexie { diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index af3b11c523f..48ce44f58e1 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -238,6 +238,9 @@ const DefaultDailyMeasures: IDailyMeasures = { submoduleDiffViewedFromHistoryCount: 0, openSubmoduleFromDiffCount: 0, previewedPullRequestCount: 0, + generateCommitMessageButtonClickCount: 0, + generateCommitMessageCount: 0, + generateCommitMessageUsedVerbatimCount: 0, } // A subtype of IDailyMeasures filtered to contain only its numeric properties From c5bee15f87bc88ff03af97bdb80e647255aac9ab Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 18 Mar 2025 13:00:06 +0100 Subject: [PATCH 0198/1338] Track number of clicks on the Copilot button --- app/src/ui/changes/changes-list.tsx | 7 +++++-- app/src/ui/changes/filter-changes-list.tsx | 7 +++++-- app/src/ui/dispatcher/dispatcher.ts | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 6d8ef048ec0..9a4f9ef7c69 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -901,8 +901,10 @@ export class ChangesList extends React.Component< private onGenerateCommitMessage = ( filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean - ) => - mustOverrideExistingMessage + ) => { + this.props.dispatcher.recordGenerateCommitMessageButtonClicked() + + return mustOverrideExistingMessage ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( this.props.repository, filesSelected @@ -911,6 +913,7 @@ export class ChangesList extends React.Component< this.props.repository, filesSelected ) + } private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 96ec561a893..16cd386cdf3 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1014,8 +1014,10 @@ export class FilterChangesList extends React.Component< private onGenerateCommitMessage = ( filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean - ) => - mustOverrideExistingMessage + ) => { + this.props.dispatcher.recordGenerateCommitMessageButtonClicked() + + return mustOverrideExistingMessage ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( this.props.repository, filesSelected @@ -1024,6 +1026,7 @@ export class FilterChangesList extends React.Component< this.props.repository, filesSelected ) + } private onShowPopup = (p: Popup) => this.props.dispatcher.showPopup(p) private onShowFoldout = (f: Foldout) => this.props.dispatcher.showFoldout(f) diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 991e0505559..f7448c5a640 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -2514,6 +2514,10 @@ export class Dispatcher { this.statsStore.recordAddExistingRepository() } + public recordGenerateCommitMessageButtonClicked() { + this.statsStore.increment('generateCommitMessageButtonClickCount') + } + // TODO: more rebase-related actions /** From fa615e6ea7bb8cc11bed4b38f992c9ccf8b62272 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 18 Mar 2025 15:44:46 +0100 Subject: [PATCH 0199/1338] Track commit messages generated by Copilot --- app/src/lib/stores/app-store.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 6842faabecf..bbe46b81af9 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3346,6 +3346,10 @@ export class AppStore extends TypedBaseStore { this.statsStore.increment('partialCommits') } + if (context.messageGeneratedByCopilot === true) { + this.statsStore.increment('generateCommitMessageUsedVerbatimCount') + } + if (isAmend) { this.statsStore.recordAmendCommitSuccessful(selectedFiles.length > 0) } @@ -5459,6 +5463,8 @@ export class AppStore extends TypedBaseStore { timestamp: Date.now(), generatedByCopilot: true, }) + + this.statsStore.increment('generateCommitMessageCount') } catch (e) { this.emitError( new ErrorWithMetadata(e, { From 818acde812960cc04ce6d5ab505cf51c660cc720 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 18 Mar 2025 15:51:43 +0100 Subject: [PATCH 0200/1338] Assume a commit message is not generated by Copilot (anymore) when user types --- app/src/ui/changes/commit-message.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index ba157d4cef7..762b22f3945 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -498,6 +498,9 @@ export class CommitMessage extends React.Component< commitMessage: { ...this.state.commitMessage, summary, + // Since this method is called when the user types, we can assume + // that the commit message was not generated by Copilot (anymore). + generatedByCopilot: false, timestamp: Date.now(), }, }) @@ -508,6 +511,9 @@ export class CommitMessage extends React.Component< commitMessage: { ...this.state.commitMessage, description, + // Since this method is called when the user types, we can assume + // that the commit message was not generated by Copilot (anymore). + generatedByCopilot: false, timestamp: Date.now(), }, }) From d7c9931e2162f4abc46ed66ea72e0f84266db572 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 21 Mar 2025 16:30:54 +0100 Subject: [PATCH 0201/1338] Check for 402 errors with CAPI --- app/src/lib/api.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index c9dd7ebc00b..52aea9e3b33 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -138,6 +138,7 @@ enum HttpStatusCode { NotModified = 304, BadRequest = 400, Unauthorized = 401, + PaymentRequired = 402, Forbidden = 403, NotFound = 404, TooManyRequests = 429, @@ -1887,6 +1888,13 @@ export class API { } else { throw new Error('Rate limited, try again in a few minutes') } + } else if (response.status === HttpStatusCode.PaymentRequired) { + const message = (await response.text()) || 'You have exceeded your quota.' + + throw new Error( + message + + '\nUpgrade your plan: https://github.com/features/copilot/plans' + ) } else if (response.status === HttpStatusCode.Unauthorized) { throw new Error('Unauthorized: error with authentication') } else if (response.status === HttpStatusCode.Forbidden) { From 6f5bd621009109cfbeb7d0f322bec3c4ab3d51e5 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 21 Mar 2025 16:49:49 +0100 Subject: [PATCH 0202/1338] Use new Copilot error --- app/src/lib/api.ts | 59 +++++++++++++++++++-------------- app/src/lib/copilot-error.ts | 18 ++++++++++ app/src/lib/http-status-code.ts | 9 +++++ 3 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 app/src/lib/copilot-error.ts create mode 100644 app/src/lib/http-status-code.ts diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 52aea9e3b33..46984fc98f4 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -21,6 +21,8 @@ import { clearCertificateErrorSuppressionFor, suppressCertificateErrorFor, } from './suppress-certificate-error' +import { HttpStatusCode } from './http-status-code' +import { CopilotError } from './copilot-error' const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT'] const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL'] @@ -134,16 +136,6 @@ export type GitHubAccountType = 'User' | 'Organization' /** The OAuth scopes we want to request */ const oauthScopes = ['repo', 'user', 'workflow'] -enum HttpStatusCode { - NotModified = 304, - BadRequest = 400, - Unauthorized = 401, - PaymentRequired = 402, - Forbidden = 403, - NotFound = 404, - TooManyRequests = 429, -} - /** * Information about a repository as returned by the GitHub API. */ @@ -1884,45 +1876,62 @@ export class API { if (response.status === HttpStatusCode.TooManyRequests) { const retryAfter = response.headers.get('Retry-After') if (retryAfter) { - throw new Error(`Rate limited, retry after ${retryAfter} seconds`) + throw new CopilotError( + `Rate limited, retry after ${retryAfter} seconds`, + response.status + ) } else { - throw new Error('Rate limited, try again in a few minutes') + throw new CopilotError( + 'Rate limited, try again in a few minutes', + response.status + ) } } else if (response.status === HttpStatusCode.PaymentRequired) { const message = (await response.text()) || 'You have exceeded your quota.' - throw new Error( - message + - '\nUpgrade your plan: https://github.com/features/copilot/plans' - ) + throw new CopilotError(message, response.status) } else if (response.status === HttpStatusCode.Unauthorized) { - throw new Error('Unauthorized: error with authentication') + throw new CopilotError( + 'Unauthorized: error with authentication', + response.status + ) } else if (response.status === HttpStatusCode.Forbidden) { const body = await response.text() if (body.includes('unauthorized: not licensed to use Copilot')) { - throw new Error('Unauthorized: not licensed to use Copilot') + throw new CopilotError( + 'Unauthorized: not licensed to use Copilot', + response.status + ) } else if ( body.includes( - 'unauthorized: not authorized to use this Copilot feature' + 'unauthorized: not authorized to use this Copilot feature', + response.status ) ) { - throw new Error( - 'Unauthorized: not authorized to use this Copilot feature' + throw new CopilotError( + 'Unauthorized: not authorized to use this Copilot feature', + response.status ) } else if ( body.includes('integration does not have GitHub chat enabled') ) { - throw new Error('Integration does not have GitHub chat enabled') + throw new CopilotError( + 'Integration does not have GitHub chat enabled', + response.status + ) } else { - throw new Error('Unauthorized: unknown') + throw new CopilotError('Unauthorized: unknown', response.status) } } else if (response.status === 466) { - throw new Error('Client issue: unsupported API version') + throw new CopilotError( + 'Client issue: unsupported API version', + response.status + ) } else if (response.status >= HttpStatusCode.BadRequest) { const internalError = `Internal server error, code: ${ response.status }, request ID: ${response.headers.get('X-Github-Request-Id')}` - throw new Error(internalError) + throw new CopilotError(internalError, response.status) } const text = await response.text() diff --git a/app/src/lib/copilot-error.ts b/app/src/lib/copilot-error.ts new file mode 100644 index 00000000000..1643bec5842 --- /dev/null +++ b/app/src/lib/copilot-error.ts @@ -0,0 +1,18 @@ +import { HttpStatusCode } from './http-status-code' + +/** An error which contains additional metadata. */ +export class CopilotError extends Error { + /** The error's metadata. */ + private readonly statusCode: number + + public constructor(message: string, statusCode: number) { + super(message) + + this.name = 'CopilotError' + this.statusCode = statusCode + } + + public get isQuotaExceededError(): boolean { + return this.statusCode === HttpStatusCode.PaymentRequired + } +} diff --git a/app/src/lib/http-status-code.ts b/app/src/lib/http-status-code.ts new file mode 100644 index 00000000000..261efc2e259 --- /dev/null +++ b/app/src/lib/http-status-code.ts @@ -0,0 +1,9 @@ +export enum HttpStatusCode { + NotModified = 304, + BadRequest = 400, + Unauthorized = 401, + PaymentRequired = 402, + Forbidden = 403, + NotFound = 404, + TooManyRequests = 429, +} From beac3655f493f6c5ecd0823211ada7ef353acfce Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 21 Mar 2025 17:05:18 +0100 Subject: [PATCH 0203/1338] Handle Copilot exceeded quota errors --- app/src/lib/api.ts | 4 ++-- app/src/ui/app-error.tsx | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 46984fc98f4..a7f0f19772f 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -1887,9 +1887,9 @@ export class API { ) } } else if (response.status === HttpStatusCode.PaymentRequired) { - const message = (await response.text()) || 'You have exceeded your quota.' + const errorMsg = (await response.text()) || 'You have exceeded your quota' - throw new CopilotError(message, response.status) + throw new CopilotError(errorMsg, response.status) } else if (response.status === HttpStatusCode.Unauthorized) { throw new CopilotError( 'Unauthorized: error with authentication', diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx index f5d745f8892..8549bc521db 100644 --- a/app/src/ui/app-error.tsx +++ b/app/src/ui/app-error.tsx @@ -16,6 +16,7 @@ import { Ref } from './lib/ref' import { GitError as DugiteError } from 'dugite' import { LinkButton } from './lib/link-button' import { getFileFromExceedsError } from '../lib/helpers/regex' +import { CopilotError } from '../lib/copilot-error' interface IAppErrorProps { /** The error to be displayed */ @@ -124,10 +125,27 @@ export class AppError extends React.Component { ) } + if (isCopilotExceededQuotaError(e)) { + const copilotPlansURL = 'https://github.com/features/copilot/plans' + return ( + <> +

{e.message}

+

+ Upgrade your plan:{' '} + {copilotPlansURL} +

+ + ) + } + return

{e.message}

} private getTitle(error: Error) { + if (isCopilotExceededQuotaError(error)) { + return 'Quota exceeded' + } + switch (getDugiteError(error)) { case DugiteError.PushWithFileSizeExceedingLimit: return 'File size limit exceeded' @@ -312,6 +330,15 @@ function getRetryActionType(error: Error) { return error.metadata.retryAction?.type } +function isCopilotExceededQuotaError(error: Error) { + const e = getUnderlyingError(error) + + if (e instanceof CopilotError) { + return e.isQuotaExceededError + } + return false +} + function getDugiteError(error: Error) { const e = getUnderlyingError(error) return isGitError(e) ? e.result.gitError : undefined From 63566fddcb220426244d538a9988349f033c8347 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Sat, 22 Mar 2025 19:13:29 -0400 Subject: [PATCH 0204/1338] Update changelog.json Co-authored-by: Sergio Padrino --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index ed769e0501a..babf8d57165 100644 --- a/changelog.json +++ b/changelog.json @@ -2,7 +2,7 @@ "releases": { "3.4.19-beta1": [ "[New] Add support for multiple enterprise accounts - #20227", - "[New] Users can filter the change files list - #20220", + "[New] Users can filter the changed files list - #20220", "[Fixed] Resizing the list of files in \"Preview Pull Request\" does not open/create the pull request - #20200", "[Fixed] Sections lists such as the repository list in the cloning dialog and the pull request list announce their labels to screen readers - #20184", "[Fixed] The added and removed prefixes of diff do not wrap making diff contents width equal in side by side diffs - #20191", From 9fdd2a20e11b377eedd142f46632306dec388c45 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Sat, 22 Mar 2025 19:13:40 -0400 Subject: [PATCH 0205/1338] Update changelog.json Co-authored-by: Sergio Padrino --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index babf8d57165..e6d04a37939 100644 --- a/changelog.json +++ b/changelog.json @@ -4,7 +4,7 @@ "[New] Add support for multiple enterprise accounts - #20227", "[New] Users can filter the changed files list - #20220", "[Fixed] Resizing the list of files in \"Preview Pull Request\" does not open/create the pull request - #20200", - "[Fixed] Sections lists such as the repository list in the cloning dialog and the pull request list announce their labels to screen readers - #20184", + "[Fixed] Section lists such as the repository list in the cloning dialog and the pull request list announce their labels to screen readers - #20184", "[Fixed] The added and removed prefixes of diff do not wrap making diff contents width equal in side by side diffs - #20191", "[Fixed] Improve default README formatting - #20161. Thanks @OctCarp!", "[Fixed] Pressing Ctrl+A in the Find dialog now selects the search text instead of the diff content - #20049", From e1f1d0727982057fb26cfed6bd3072a905c389e8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 11:40:30 +0100 Subject: [PATCH 0206/1338] Don't use bare expect --- app/test/unit/git/commit-test.ts | 2 +- app/test/unit/git/diff-test.ts | 4 ++-- app/test/unit/patch-formatter-test.ts | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index ae8860ee2a0..3404ae8e9e9 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -41,7 +41,7 @@ async function getTextDiff( file: WorkingDirectoryFileChange ): Promise { const diff = await getWorkingDirectoryDiff(repo, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) return diff as ITextDiff } diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 74b329d72a8..10878b67e63 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -40,7 +40,7 @@ async function getTextDiff( file: WorkingDirectoryFileChange ): Promise { const diff = await getWorkingDirectoryDiff(repo, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) return diff as ITextDiff } @@ -131,7 +131,7 @@ describe('git/diff', () => { ) const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind === DiffType.Image) + expect(diff.kind).toEqual(DiffType.Image) const imageDiff = diff as IImageDiff expect(imageDiff.previous).not.toBeUndefined() diff --git a/app/test/unit/patch-formatter-test.ts b/app/test/unit/patch-formatter-test.ts index 14951ba43fb..d687aa20509 100644 --- a/app/test/unit/patch-formatter-test.ts +++ b/app/test/unit/patch-formatter-test.ts @@ -26,7 +26,7 @@ async function parseDiff(diff: string): Promise { kind: AppFileStatusKind.Modified, }) const output = await convertDiff(repository, fileChange, rawDiff, 'HEAD') - expect(output.kind === DiffType.Text) + expect(output.kind).toEqual(DiffType.Text) return output as ITextDiff } @@ -53,7 +53,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) const textDiff = diff as ITextDiff const second = textDiff.hunks[1] @@ -92,7 +92,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) const textDiff = diff as ITextDiff const first = textDiff.hunks[0] @@ -132,7 +132,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) const textDiff = diff as ITextDiff const second = textDiff.hunks[1] @@ -172,7 +172,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind === DiffType.Text) + expect(diff.kind).toEqual(DiffType.Text) const textDiff = diff as ITextDiff From fcb82208c616ee1a7e77ce95b8ef38205f35f6f8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 11:59:26 +0100 Subject: [PATCH 0207/1338] Don't use bare expect --- app/test/unit/path-test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 43cc574f6cf..8f55387b5fd 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -12,14 +12,16 @@ describe('path', () => { const dirName = 'C:/Users/shiftkey\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'folder/file.html') - expect(uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/')) + expect( + uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/') + ).toBeTrue() }) it('encodes spaces and hashes', () => { const dirName = 'C:/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'index.html') - expect(uri.startsWith('file:///C:/Users/The%20Kong%20%232/')) + expect(uri.startsWith('file:///C:/Users/The%20Kong%20%232/')).toBeTrue() }) } From 3b53575bf5d7faae8b7702ff7910a9ed927308c5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 11:59:47 +0100 Subject: [PATCH 0208/1338] Don't use bare expect: Fix faulty expected value --- app/test/unit/path-test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 8f55387b5fd..8c325147958 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -28,9 +28,9 @@ describe('path', () => { if (__DARWIN__ || __LINUX__) { it('encodes spaces and hashes', () => { const dirName = - '/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' + '/Users/The Kong #2/AppData/Local/GitHubDesktop/app-1.0.4/resources/app' const uri = encodePathAsUrl(dirName, 'index.html') - expect(uri.startsWith('file:////Users/The%20Kong%20%232/')) + expect(uri.startsWith('file:///Users/The%20Kong%20%232/')).toBeTrue() }) } }) From a32d616278975a785a634eaee5d68e8013826e30 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 13:33:16 +0100 Subject: [PATCH 0209/1338] Don't use bare expect: Fix faulty implementation --- app/src/lib/git/gitignore.ts | 2 +- app/test/unit/git/gitignore-test.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/lib/git/gitignore.ts b/app/src/lib/git/gitignore.ts index d43cdbd0a89..671f703b0e9 100644 --- a/app/src/lib/git/gitignore.ts +++ b/app/src/lib/git/gitignore.ts @@ -133,7 +133,7 @@ async function formatGitIgnoreContents( if (autocrlf === 'true' && safecrlf === 'true') { // based off https://stackoverflow.com/a/141069/1363815 const normalizedText = text.replace(/\r\n|\n\r|\n|\r/g, '\r\n') - resolve(normalizedText) + resolve(normalizedText + '\r\n') return } diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts index 7d810a21b5b..0c8ed1966d4 100644 --- a/app/test/unit/git/gitignore-test.ts +++ b/app/test/unit/git/gitignore-test.ts @@ -37,7 +37,7 @@ describe('gitignore', () => { expect(gitignore).toBe(expected) }) - it('when autocrlf=true and safecrlf=true, appends CRLF to file', async () => { + it.only('when autocrlf=true and safecrlf=true, appends CRLF to file', async () => { const repo = await setupEmptyRepository() await setupLocalConfig(repo, [ @@ -57,7 +57,7 @@ describe('gitignore', () => { expect(commit.exitCode).toBe(0) const contents = await readGitIgnoreAtRoot(repo) - expect(contents!.endsWith('\r\n')) + expect(contents!.endsWith('\r\n')).toBeTrue() }) it('when autocrlf=input, appends LF to file', async () => { @@ -82,7 +82,7 @@ describe('gitignore', () => { expect(commit.exitCode).toBe(0) const contents = await readGitIgnoreAtRoot(repo) - expect(contents!.endsWith('\n')) + expect(contents!.endsWith('\n')).toBeTrue() }) }) From 39d624f996619de9cfe9a9d754bcedf909898bdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 20:19:34 +0000 Subject: [PATCH 0210/1338] Bump @babel/runtime from 7.2.0 to 7.27.0 in /app Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.2.0 to 7.27.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.27.0/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index 82456f95980..698bfa36c15 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2,19 +2,12 @@ # yarn lockfile v1 -"@babel/runtime@^7.1.2": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f" - integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762" + integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw== dependencies: - regenerator-runtime "^0.12.0" - -"@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.0.tgz#f10245877042a815e07f7e693faff0ae9d3a2aac" - integrity sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw== - dependencies: - regenerator-runtime "^0.13.4" + regenerator-runtime "^0.14.0" "@colors/colors@1.5.0": version "1.5.0" @@ -1126,15 +1119,10 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1" integrity sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== -regenerator-runtime@^0.12.0: - version "0.12.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" - integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== - -regenerator-runtime@^0.13.4: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== registry-js@^1.16.0: version "1.16.0" From 4549696c2bd68caaf2e55807454236e53b4376cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 20:20:09 +0000 Subject: [PATCH 0211/1338] Bump @babel/helpers from 7.25.0 to 7.27.0 Bumps [@babel/helpers](https://github.com/babel/babel/tree/HEAD/packages/babel-helpers) from 7.25.0 to 7.27.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.27.0/packages/babel-helpers) --- updated-dependencies: - dependency-name: "@babel/helpers" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 84 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 54d4e575acd..8dd75730fdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -178,6 +178,15 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" +"@babel/code-frame@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/compat-data@^7.25.2": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" @@ -297,6 +306,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + "@babel/helper-validator-identifier@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" @@ -307,18 +321,23 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + "@babel/helper-validator-option@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== "@babel/helpers@^7.23.5", "@babel/helpers@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a" - integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw== + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.0.tgz#53d156098defa8243eab0f32fa17589075a1b808" + integrity sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg== dependencies: - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/template" "^7.27.0" + "@babel/types" "^7.27.0" "@babel/highlight@^7.0.0": version "7.0.0" @@ -365,6 +384,13 @@ dependencies: "@babel/types" "^7.25.4" +"@babel/parser@^7.27.0": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec" + integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg== + dependencies: + "@babel/types" "^7.27.0" + "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -488,6 +514,15 @@ "@babel/parser" "^7.25.0" "@babel/types" "^7.25.0" +"@babel/template@^7.27.0": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4" + integrity sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA== + dependencies: + "@babel/code-frame" "^7.26.2" + "@babel/parser" "^7.27.0" + "@babel/types" "^7.27.0" + "@babel/template@^7.3.3": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" @@ -537,6 +572,14 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" +"@babel/types@^7.27.0": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559" + integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -7503,7 +7546,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3: +"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== @@ -7521,6 +7564,15 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.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== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -7635,7 +7687,7 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"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== @@ -7649,6 +7701,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +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== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -8425,7 +8484,16 @@ worker-farm@^1.3.1: errno "^0.1.4" xtend "^4.0.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm: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@^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== From cc4de083aa387cf556fb237be5314793e41ea931 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 10:43:46 +0100 Subject: [PATCH 0212/1338] Bring desktop-notifications to this repo --- .gitignore | 1 + app/package.json | 2 +- app/yarn.lock | 13 +- vendor/desktop-notifications/LICENSE | 21 + vendor/desktop-notifications/README.md | 98 + vendor/desktop-notifications/binding.gyp | 58 + vendor/desktop-notifications/docs/index.md | 62 + vendor/desktop-notifications/docs/releases.md | 33 + vendor/desktop-notifications/jest.json | 4 + vendor/desktop-notifications/lib/index.ts | 14 + .../lib/native-module.ts | 67 + .../lib/notification-callback.ts | 27 + .../lib/notification-event-type.ts | 1 + .../lib/notification-options.ts | 4 + .../lib/notification-permission.ts | 8 + .../lib/notification-settings-url.ts | 15 + .../lib/notification-support.ts | 55 + vendor/desktop-notifications/package.json | 60 + .../sample-app/index.html | 29 + .../desktop-notifications/sample-app/main.ts | 68 + .../sample-app/package.json | 25 + .../sample-app/preload.ts | 1 + .../sample-app/renderer.ts | 75 + .../sample-app/tsconfig.json | 22 + .../sample-app/webpack.main.config.js | 27 + .../sample-app/yarn.lock | 3141 +++++++++ .../script/download-node-lib-win-arm64.ps1 | 36 + vendor/desktop-notifications/script/upload.js | 14 + .../src/mac/GHDesktopNotificationsManager.h | 29 + .../src/mac/GHDesktopNotificationsManager.m | 134 + vendor/desktop-notifications/src/mac/Utils.h | 5 + vendor/desktop-notifications/src/mac/Utils.mm | 129 + .../desktop-notifications/src/mac/main_mac.mm | 274 + .../src/win/DesktopNotification.cpp | 235 + .../src/win/DesktopNotification.h | 52 + ...esktopNotificationsActionCenterActivator.h | 54 + .../src/win/DesktopNotificationsManager.cpp | 330 + .../src/win/DesktopNotificationsManager.h | 148 + .../desktop-notifications/src/win/main_win.cc | 195 + .../desktop-notifications/src/win/utils.cpp | 151 + vendor/desktop-notifications/src/win/utils.h | 57 + vendor/desktop-notifications/tsconfig.json | 21 + vendor/desktop-notifications/yarn.lock | 5669 +++++++++++++++++ 43 files changed, 11453 insertions(+), 11 deletions(-) create mode 100644 vendor/desktop-notifications/LICENSE create mode 100644 vendor/desktop-notifications/README.md create mode 100644 vendor/desktop-notifications/binding.gyp create mode 100644 vendor/desktop-notifications/docs/index.md create mode 100644 vendor/desktop-notifications/docs/releases.md create mode 100644 vendor/desktop-notifications/jest.json create mode 100644 vendor/desktop-notifications/lib/index.ts create mode 100644 vendor/desktop-notifications/lib/native-module.ts create mode 100644 vendor/desktop-notifications/lib/notification-callback.ts create mode 100644 vendor/desktop-notifications/lib/notification-event-type.ts create mode 100644 vendor/desktop-notifications/lib/notification-options.ts create mode 100644 vendor/desktop-notifications/lib/notification-permission.ts create mode 100644 vendor/desktop-notifications/lib/notification-settings-url.ts create mode 100644 vendor/desktop-notifications/lib/notification-support.ts create mode 100644 vendor/desktop-notifications/package.json create mode 100644 vendor/desktop-notifications/sample-app/index.html create mode 100644 vendor/desktop-notifications/sample-app/main.ts create mode 100644 vendor/desktop-notifications/sample-app/package.json create mode 100644 vendor/desktop-notifications/sample-app/preload.ts create mode 100644 vendor/desktop-notifications/sample-app/renderer.ts create mode 100644 vendor/desktop-notifications/sample-app/tsconfig.json create mode 100644 vendor/desktop-notifications/sample-app/webpack.main.config.js create mode 100644 vendor/desktop-notifications/sample-app/yarn.lock create mode 100644 vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 create mode 100644 vendor/desktop-notifications/script/upload.js create mode 100644 vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.h create mode 100644 vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.m create mode 100644 vendor/desktop-notifications/src/mac/Utils.h create mode 100644 vendor/desktop-notifications/src/mac/Utils.mm create mode 100644 vendor/desktop-notifications/src/mac/main_mac.mm create mode 100644 vendor/desktop-notifications/src/win/DesktopNotification.cpp create mode 100644 vendor/desktop-notifications/src/win/DesktopNotification.h create mode 100644 vendor/desktop-notifications/src/win/DesktopNotificationsActionCenterActivator.h create mode 100644 vendor/desktop-notifications/src/win/DesktopNotificationsManager.cpp create mode 100644 vendor/desktop-notifications/src/win/DesktopNotificationsManager.h create mode 100644 vendor/desktop-notifications/src/win/main_win.cc create mode 100644 vendor/desktop-notifications/src/win/utils.cpp create mode 100644 vendor/desktop-notifications/src/win/utils.h create mode 100644 vendor/desktop-notifications/tsconfig.json create mode 100644 vendor/desktop-notifications/yarn.lock diff --git a/.gitignore b/.gitignore index 91bdd56682f..110817983d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ npm-debug.log yarn-error.log app/node_modules/ vendor/windows-argv-parser/build/ +vendor/desktop-notifications/build/ .DS_Store .awcache .idea/ diff --git a/app/package.json b/app/package.json index 010f537cfe9..9079c22e62b 100644 --- a/app/package.json +++ b/app/package.json @@ -29,7 +29,7 @@ "codemirror-mode-zig": "^1.0.7", "compare-versions": "^3.6.0", "deep-equal": "^1.0.1", - "desktop-notifications": "^0.2.4", + "desktop-notifications": "file:../vendor/desktop-notifications", "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10", "dexie": "^3.2.2", "dompurify": "^3.2.4", diff --git a/app/yarn.lock b/app/yarn.lock index 82456f95980..2239bb4452a 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -319,12 +319,10 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -desktop-notifications@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.4.tgz#d51db18be583784a296748efd361fe3a5aefea70" - integrity sha512-Au0CbBE4TQ09vsC4/L15FhDsCr/daIyYUY3vkx4S3Y0Sp9EPpbXxBdmz0ry1cOnQ8A47K45zTYsuKP7a+xHm7Q== +"desktop-notifications@file:../vendor/desktop-notifications": + version "0.2.5" dependencies: - node-addon-api "^5.0.0" + node-addon-api "^7.0.0" prebuild-install "^7.0.1" uuid "^8.3.2" @@ -783,11 +781,6 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-addon-api@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" - integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== - node-addon-api@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" diff --git a/vendor/desktop-notifications/LICENSE b/vendor/desktop-notifications/LICENSE new file mode 100644 index 00000000000..4b206762ea9 --- /dev/null +++ b/vendor/desktop-notifications/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 GitHub Desktop + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/desktop-notifications/README.md b/vendor/desktop-notifications/README.md new file mode 100644 index 00000000000..9d4e1f7d231 --- /dev/null +++ b/vendor/desktop-notifications/README.md @@ -0,0 +1,98 @@ +# desktop-notifications + +## A simple and opinionated library for working with OS notifications + +## Goals + +- zero dependencies +- good support for Windows notifications +- leverage TypeScript declarations wherever possible + +**Note:** This is currently in preview, with support for features that GitHub +Desktop uses. + +## Install + +```shellsession +$ npm install --save desktop-notifications +# or +$ yarn add desktop-notifications +``` + +## But Why? + +The current set of options for interacting with notifications, especially on +Windows, have some limitations that meant we couldn't use them easily in GitHub +Desktop: + +- [`electron`](https://www.electronjs.org/) doesn't support Windows + notifications when those are hidden away in the Action Center, because it + doesn't have a COM activator that could leverage CLSID-based activation. More + details about this can be found in + [electron/electron#29461](https://github.com/electron/electron/issues/29461). +- [`node-notifier`](https://www.npmjs.com/package/node-notifier) relies on + [`snoretoast`](https://github.com/KDE/snoretoast) to handle notifications on + Windows, and the way it's used is only able to detect one event with each + notification, and also requires the app to use the same CLSID that is + [hardcoded](https://github.com/KDE/snoretoast/blob/17f88b2c757d54581bb7d5aa4d0d4462c3e75a98/CMakeLists.txt#L5) + in snoretoast. +- [`electron-windows-notifications`](https://github.com/felixrieseberg/electron-windows-notifications) + has **many** dependencies around [`NodeRT`](https://github.com/NodeRT/NodeRT) + which, as of today, also require some + [manual steps](https://stackoverflow.com/a/54591996/673745) in order to build + them. + +After exploring all these options, we decided to write our own library to do the +stuff we require using no dependencies at all and having all the features we +need. + +## Building and running the sample app + +In order to get the sample app up and running you need to: + +1. Build `desktop-notifications`. +2. Build the sample app. +3. (macOS only) Sign the Electron binary, so that macOS will allow the sample + app to display notifications. +4. Start the sample app. + +These are the commands to make that happen: + +``` +$ yarn install +$ yarn build +$ cd sample-app +$ yarn install +$ yarn build +$ /usr/bin/codesign --deep --force --sign - --timestamp\=none node_modules/electron/dist/Electron.app/Contents/MacOS/Electron # macOS only +$ yarn start +``` + +## Documentation + +See the documentation under the +[`docs`](https://github.com/desktop/desktop-notifications/tree/master/docs) +folder. + +## Supported versions + +Each release of `desktop-notifications` includes prebuilt binaries based on +[N-API](https://nodejs.org/api/n-api.html), with support for different versions +of Node and Electron. Please refer to the +[N-API version matrix](https://nodejs.org/api/n-api.html#node-api-version-matrix) +and the release documentation for [Node](https://github.com/nodejs/Release) and +[Electron](https://electronjs.org/docs/tutorial/support) to see what is +supported currently. + +## Contributing + +Read the +[Setup](https://github.com/desktop/desktop-notifications/blob/master/docs/index.md#setup) +section to ensure your development environment is setup for what you need. + +This project isn't about implementing a 1-1 replication of any other +notifications API, but implementing just enough for whatever usage GitHub +Desktop needs. + +If you want to see something supported, open an issue to start a discussion +about it. diff --git a/vendor/desktop-notifications/binding.gyp b/vendor/desktop-notifications/binding.gyp new file mode 100644 index 00000000000..5bc86d7b7f5 --- /dev/null +++ b/vendor/desktop-notifications/binding.gyp @@ -0,0 +1,58 @@ +{ + 'targets': [ + { + 'target_name': 'desktop-notifications', + 'cflags': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions' ], + 'msvs_settings': { + 'VCCLCompilerTool': { 'ExceptionHandling': 1 }, + }, + 'include_dirs': [ + ' { + console.log('Hello world!') +} + +// Then show it! +notification.show() + +// ... + +// Finally, clean up any resources used by the notifications environment +terminateNotifications() +``` + +## Setup + +```shellsession +$ git clone https://github.com/desktop/desktop-notifications +$ cd desktop-notifications +$ yarn +``` + +As this project builds a native module, you'll need these dependencies along +with a recent version of Node: + +- [Python 2.7](https://www.python.org/downloads/windows/) + - _Let Python install into the default suggested path (`c:\Python27`), + otherwise you'll have to configure node-gyp manually with the path which is + annoying._ + - _Ensure the **Add python.exe to Path** option is selected._ +- One of Visual Studio 2019, Visual C++ Build Tools or Visual Studio 2019 + - [Visual C++ Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) + - _Run `npm config set msvs_version 2019` to tell node to use this + toolchain._ + - [Visual Studio 2019](https://www.visualstudio.com/vs/community/) + - _Ensure you select the **Desktop development with C++** feature as that is + required by Node.js for installing native modules._ + - _Run `npm config set msvs_version 2019` to tell node to use this + toolchain._ + - **IMPORTANT:** Make sure to install Windows 10 SDK. diff --git a/vendor/desktop-notifications/docs/releases.md b/vendor/desktop-notifications/docs/releases.md new file mode 100644 index 00000000000..4553c3ec6fb --- /dev/null +++ b/vendor/desktop-notifications/docs/releases.md @@ -0,0 +1,33 @@ +# Releases + +## Release/Publishing + +Before running the commands in 'Publishing to NPM', create a new release branch +of the form `releases/x.x.x` + +After running commands in 'Publishing to NPM', the release branch should be +pushed. Now, you need to get it reviewed and merged. + +After that, don't forget publish the release on the repo. + +- Go to https://github.com/desktop/desktop-notifications/releases +- Click click `Draft a New Release` +- Fill in form +- Hit `Publish release` + +## Publishing to NPM + +Releases are done to NPM, and are currently limited to the core team. + +```sh +# to ensure everything is up-to-date and tests pass +npm ci +npm test + +# you might need to do a different sort of version bump here +npm version minor + +# this will also run the test suite and fail if any errors found +# this will also run `git push --follow-tags` at the end +npm publish +``` diff --git a/vendor/desktop-notifications/jest.json b/vendor/desktop-notifications/jest.json new file mode 100644 index 00000000000..3b48fa9cb5d --- /dev/null +++ b/vendor/desktop-notifications/jest.json @@ -0,0 +1,4 @@ +{ + "testMatch": ["**/dist/**/*-test.js"], + "testTimeout": 50000 +} diff --git a/vendor/desktop-notifications/lib/index.ts b/vendor/desktop-notifications/lib/index.ts new file mode 100644 index 00000000000..b4052d45c3d --- /dev/null +++ b/vendor/desktop-notifications/lib/index.ts @@ -0,0 +1,14 @@ +export { + initializeNotifications, + showNotification, + closeNotification, + terminateNotifications, + getNotificationsPermission, + requestNotificationsPermission, +} from './native-module' +export { + supportsNotifications, + supportsNotificationsPermissionRequest, +} from './notification-support' +export { getNotificationSettingsUrl } from './notification-settings-url' +export { onNotificationEvent } from './notification-callback' diff --git a/vendor/desktop-notifications/lib/native-module.ts b/vendor/desktop-notifications/lib/native-module.ts new file mode 100644 index 00000000000..8a2d49442f5 --- /dev/null +++ b/vendor/desktop-notifications/lib/native-module.ts @@ -0,0 +1,67 @@ +import { supportsNotifications } from './notification-support' +import { notificationCallback } from './notification-callback' +import { DesktopNotificationPermission } from './notification-permission' +import { INotificationOptions } from './notification-options' +import { v4 as uuidv4 } from 'uuid' + +// The native binary will be loaded lazily to avoid any possible crash at start +// time, which are harder to trace. +let _nativeModule: any | null | undefined = undefined + +function getNativeModule(): any | null { + if (_nativeModule !== undefined) { + return _nativeModule + } + + _nativeModule = supportsNotifications() + ? require('../build/Release/desktop-notifications.node') + : null + + return _nativeModule +} + +/** Initializes the desktop-notifications system. */ +export const initializeNotifications: ( + opts: INotificationOptions +) => void = opts => + getNativeModule()?.initializeNotifications(notificationCallback, opts) + +/** Terminates the desktop-notifications system. */ +export const terminateNotifications: () => void = () => + getNativeModule()?.terminateNotifications() + +/** Gets the current state of the notifications permission. */ +export const getNotificationsPermission: () => Promise< + DesktopNotificationPermission +> = () => getNativeModule()?.getNotificationsPermission() + +/** Requests the user to grant permission to display notifications. */ +export const requestNotificationsPermission: () => Promise = () => + getNativeModule()?.requestNotificationsPermission() + +/** + * Displays a system notification. + * @param title Title of the notification + * @param body Body of the notification + * @param userInfo (Optional) An object with any information that needs to be + * passed to the notification callback when the user clicks on the notification. + * @returns The ID of the notification displayed. This ID can be used to close + * the notification. + */ +export const showNotification: ( + title: string, + body: string, + userInfo?: Record +) => Promise = async (...args) => { + const id = uuidv4() + try { + await getNativeModule()?.showNotification(id, ...args) + } catch (e) { + return null + } + return id +} + +/** Closes the notification with the given ID. */ +export const closeNotification: (id: string) => void = (...args) => + getNativeModule()?.closeNotification(...args) diff --git a/vendor/desktop-notifications/lib/notification-callback.ts b/vendor/desktop-notifications/lib/notification-callback.ts new file mode 100644 index 00000000000..8cc7e6643ea --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-callback.ts @@ -0,0 +1,27 @@ +import { DesktopNotificationEvent } from './notification-event-type' + +/** + * Callback for notification events. The specific type of userInfo can be chosen + * as long as it's a Record. + */ +export type NotificationCallback< + T extends Record = Record +> = (event: DesktopNotificationEvent, id: string, userInfo: T) => void + +let globalNotificationCallback: NotificationCallback | null = null + +/** + * This is used internally to handle notification events sent from the native + * side. + */ +export const notificationCallback: NotificationCallback = (...args) => + globalNotificationCallback?.(...args) + +/** Sets a handler for notification events. */ +export const onNotificationEvent = < + T extends Record = Record +>( + callback: NotificationCallback | null +) => { + globalNotificationCallback = callback as NotificationCallback +} diff --git a/vendor/desktop-notifications/lib/notification-event-type.ts b/vendor/desktop-notifications/lib/notification-event-type.ts new file mode 100644 index 00000000000..673352a7fec --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-event-type.ts @@ -0,0 +1 @@ +export type DesktopNotificationEvent = 'click' diff --git a/vendor/desktop-notifications/lib/notification-options.ts b/vendor/desktop-notifications/lib/notification-options.ts new file mode 100644 index 00000000000..238d6594084 --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-options.ts @@ -0,0 +1,4 @@ +export interface INotificationOptions { + /** CLSID used by Windows to report notification events */ + readonly toastActivatorClsid?: string +} diff --git a/vendor/desktop-notifications/lib/notification-permission.ts b/vendor/desktop-notifications/lib/notification-permission.ts new file mode 100644 index 00000000000..2d65ee0342f --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-permission.ts @@ -0,0 +1,8 @@ +/** + * Different types of notification permissions: + * - "default": The user has not yet made a choice regarding whether to allow + * or deny notifications. On Windows, this is the same as "granted". + * - "granted": The user has granted permission to display notifications. + * - "denied": The user has denied permission to display notifications. + */ +export type DesktopNotificationPermission = 'default' | 'granted' | 'denied' diff --git a/vendor/desktop-notifications/lib/notification-settings-url.ts b/vendor/desktop-notifications/lib/notification-settings-url.ts new file mode 100644 index 00000000000..4b516d42828 --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-settings-url.ts @@ -0,0 +1,15 @@ +import { supportsNotifications } from './notification-support' + +/** + * Returns the special URL that leads to the Notifications settings in the + * current OS. On Windows, this is only available on versions 10+. + */ +export function getNotificationSettingsUrl() { + if (!supportsNotifications()) { + return null + } + + return process.platform === 'darwin' + ? 'x-apple.systempreferences:com.apple.preference.notifications' + : 'ms-settings:notifications' +} diff --git a/vendor/desktop-notifications/lib/notification-support.ts b/vendor/desktop-notifications/lib/notification-support.ts new file mode 100644 index 00000000000..3ae1065e1fe --- /dev/null +++ b/vendor/desktop-notifications/lib/notification-support.ts @@ -0,0 +1,55 @@ +import * as os from 'os' + +/** + * Whether or not the current system supports these notifications. As of today, + * only macOS and Windows 10+ are supported. + */ +export function supportsNotifications() { + if (process.platform === 'darwin') { + return supportsDarwinNotifications() + } + + if (process.platform === 'win32') { + return supportsWindowsNotifications() + } + + return false +} + +function supportsDarwinNotifications() { + const versionComponents = os.release().split('.') + const majorVersion = parseInt(versionComponents[0], 10) + + // Only macOS 10.14 and newer are supported. Since os.release() gives us the + // Darwin kernel version, it should be a major version of 18 or higher, according + // to https://en.wikipedia.org/wiki/Darwin_%28operating_system%29#Release_history + return majorVersion >= 18 +} + +function supportsWindowsNotifications() { + // The Windows Notification APIs we use are only available on Windows 10+, and + // some of them are limited before the Creators Update (build 15063). + // See: https://docs.microsoft.com/en-us/uwp/api/windows.ui.notifications.toastnotification.tag?view=winrt-22621#remarks + const CreatorsUpdateBuildNumber = 15063 + + const versionComponents = os.release().split('.') + const majorVersion = parseInt(versionComponents[0], 10) + const buildNumber = + versionComponents.length >= 3 + ? parseInt(versionComponents[2], 10) + : CreatorsUpdateBuildNumber + + // Only Windows 10 (15063) and newer are supported + return ( + majorVersion > 10 || + (majorVersion === 10 && buildNumber >= CreatorsUpdateBuildNumber) + ) +} + +/** + * Whether or not the current system supports asking the user for permission to + * display notifications. As of today, only macOS supports this. + */ +export function supportsNotificationsPermissionRequest() { + return process.platform === 'darwin' && supportsDarwinNotifications() +} diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json new file mode 100644 index 00000000000..be99df433e7 --- /dev/null +++ b/vendor/desktop-notifications/package.json @@ -0,0 +1,60 @@ +{ + "name": "desktop-notifications", + "version": "0.2.5", + "description": "A simple and opinionated library for handling Windows notifications", + "main": "dist/index.js", + "typings": "dist/index.d.ts", + "scripts": { + "install": "prebuild-install || (node-gyp rebuild && tsc)", + "build": "node-gyp rebuild && tsc", + "pretest": "yarn build", + "test": "jest -c jest.json", + "prepublishOnly": "yarn build", + "postpublish": "git push --follow-tags", + "prettify": "yarn prettier --write \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", + "check-prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", + "prebuild-napi-x64": "prebuild -t 4 -r napi -a x64 --strip", + "prebuild-napi-ia32": "prebuild -t 4 -r napi -a ia32 --strip", + "prebuild-napi-arm64": "prebuild -t 4 -r napi -a arm64 --strip", + "prebuild-all": "yarn prebuild-napi-x64 && yarn prebuild-napi-ia32 && yarn prebuild-napi-arm64", + "upload": "node ./script/upload.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/desktop/desktop-notifications.git" + }, + "keywords": [], + "author": "", + "license": "MIT", + "bugs": { + "url": "https://github.com/desktop/desktop-notifications/issues" + }, + "homepage": "https://github.com/desktop/desktop-notifications#readme", + "devDependencies": { + "@types/benchmark": "^1.0.31", + "@types/jest": "^26.0.13", + "@types/node": "^12.0.0", + "@types/uuid": "^8.3.4", + "benchmark": "^2.1.4", + "jest": "^26.4.2", + "node-gyp": "^10.1.0", + "prebuild": "^11.0.2", + "prettier": "^2.0.5", + "ts-node": "^9.0.0", + "typescript": "^3.9.0" + }, + "dependencies": { + "node-addon-api": "^7.0.0", + "prebuild-install": "^7.0.1", + "uuid": "^8.3.2" + }, + "binary": { + "napi_versions": [ + 4 + ] + }, + "config": { + "runtime": "napi", + "target": 4 + } +} diff --git a/vendor/desktop-notifications/sample-app/index.html b/vendor/desktop-notifications/sample-app/index.html new file mode 100644 index 00000000000..7afd792e6d9 --- /dev/null +++ b/vendor/desktop-notifications/sample-app/index.html @@ -0,0 +1,29 @@ + + + + + + + + Desktop Notifications + + +

Desktop Notifications

+

This is a sample app to test the package desktop-notifications.

+ + + + + Notifications Settings + + + + diff --git a/vendor/desktop-notifications/sample-app/main.ts b/vendor/desktop-notifications/sample-app/main.ts new file mode 100644 index 00000000000..87167bd8b6c --- /dev/null +++ b/vendor/desktop-notifications/sample-app/main.ts @@ -0,0 +1,68 @@ +import { app, BrowserWindow, ipcMain } from 'electron' +import path from 'path' +import * as url from 'url' +import { + getNotificationsPermission, + initializeNotifications, + showNotification, + onNotificationEvent, + requestNotificationsPermission, + getNotificationSettingsUrl, + terminateNotifications, +} from 'desktop-notifications' + +const createWindow = () => { + const win = new BrowserWindow({ + width: 800, + height: 600, + webPreferences: { + preload: path.join(__dirname, 'preload.js'), + nodeIntegration: true, + contextIsolation: false, + }, + }) + + win.loadURL( + url.format({ + pathname: path.join(__dirname, '../index.html'), + protocol: 'file:', + slashes: true, + }) + ) + win.webContents.openDevTools() + win.on('closed', () => { + terminateNotifications() + }) + return win +} + +app.setAppUserModelId('com.squirrel.GitHubDesktop.GitHubDesktop') + +app.whenReady().then(() => { + const window = createWindow() + + initializeNotifications({ + toastActivatorClsid: '{27D44D0C-A542-5B90-BCDB-AC3126048BA2}', + }) + + onNotificationEvent((event, id, userInfo) => { + console.log(`[MAIN] Notification event: ${event} ${id}`, userInfo) + window.webContents.send('notification-event', event, id, userInfo) + }) + + ipcMain.handle( + 'show-notification', + (_, title: string, body: string, userInfo: Record) => { + return showNotification(title, body, userInfo) + } + ) + + ipcMain.handle('get-notifications-permission', getNotificationsPermission) + + ipcMain.handle( + 'request-notifications-permission', + requestNotificationsPermission + ) + + ipcMain.handle('get-notification-settings-url', getNotificationSettingsUrl) +}) diff --git a/vendor/desktop-notifications/sample-app/package.json b/vendor/desktop-notifications/sample-app/package.json new file mode 100644 index 00000000000..b5f736634ee --- /dev/null +++ b/vendor/desktop-notifications/sample-app/package.json @@ -0,0 +1,25 @@ +{ + "name": "desktop-notifications-sample-app", + "version": "1.0.0", + "description": "Sample app for desktop-notifications package", + "main": "./dist/main.js", + "license": "MIT", + "devDependencies": { + "awesome-node-loader": "^1.1.1", + "electron": "^18.0.1", + "ts-loader": "^9.2.8", + "typescript": "^4.6.3", + "webpack": "^5.71.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "^4.7.4" + }, + "scripts": { + "build": "tsc", + "start": "cross-env NODE_ENV=development webpack --config webpack.main.config.js --mode development && electron ." + }, + "dependencies": { + "cross-env": "^7.0.3", + "desktop-notifications": "../", + "quick-lru": "^3.0.0" + } +} diff --git a/vendor/desktop-notifications/sample-app/preload.ts b/vendor/desktop-notifications/sample-app/preload.ts new file mode 100644 index 00000000000..b95eb0b4a36 --- /dev/null +++ b/vendor/desktop-notifications/sample-app/preload.ts @@ -0,0 +1 @@ +global.exports = {} diff --git a/vendor/desktop-notifications/sample-app/renderer.ts b/vendor/desktop-notifications/sample-app/renderer.ts new file mode 100644 index 00000000000..d0b46723f04 --- /dev/null +++ b/vendor/desktop-notifications/sample-app/renderer.ts @@ -0,0 +1,75 @@ +import { ipcRenderer } from 'electron' +import QuickLRU from 'quick-lru' + +const notificationCallbacks = new QuickLRU void>({ + maxSize: 200, +}) + +ipcRenderer.on('notification-event', (event, id, userInfo) => { + console.log(`[RENDERER] Notification event: ${event} ${id}`, userInfo) + + const callback = notificationCallbacks.get(id) + callback?.() + notificationCallbacks.delete(id) +}) + +setupClickEventListener('showNotificationButton', showNotification) +setupClickEventListener('checkPermissionsButton', checkNotificationsPermission) +setupClickEventListener( + 'requestPermissionsButton', + requestNotificationsPermission +) +updateNotificationsSettingsLink() + +function setupClickEventListener(id: string, onclick: () => void) { + const element = document.getElementById(id) + if (element === null) { + throw new Error(`Could not find notification with id ${id}`) + } + element.addEventListener('click', onclick) +} + +async function updateNotificationsSettingsLink() { + const notificationsSettingsLink = document.getElementById( + 'notificationsSettingsLink' + ) as HTMLLinkElement + notificationsSettingsLink.href = await ipcRenderer.invoke( + 'get-notification-settings-url' + ) +} + +async function showNotification() { + const notificationID = await ipcRenderer.invoke( + 'show-notification', + 'Test notification', + 'This notification is a test. Hello! 👋', + { + myDict: { foo: 'bar' }, + myString: 'Hello world!', + myBool: true, + myArray: ['one', 2, 'three'], + type: 'pr-review-submit-fake', + myNumber: 42, + } + ) + + console.log('Shown notification with ID:', notificationID) + + notificationCallbacks.set(notificationID, () => { + console.log(`[RENDERER] Notification clicked: ${notificationID}`) + }) +} + +async function checkNotificationsPermission() { + console.log( + 'checkPermissions', + await ipcRenderer.invoke('get-notifications-permission') + ) +} + +async function requestNotificationsPermission() { + console.log( + 'requestPermissions', + await ipcRenderer.invoke('request-notifications-permission') + ) +} diff --git a/vendor/desktop-notifications/sample-app/tsconfig.json b/vendor/desktop-notifications/sample-app/tsconfig.json new file mode 100644 index 00000000000..53c469aba7c --- /dev/null +++ b/vendor/desktop-notifications/sample-app/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "module": "commonjs", + "moduleResolution": "node", + "target": "es2020", + "esModuleInterop": true, + "resolveJsonModule": true, + "allowUnreachableCode": false, + "allowUnusedLabels": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "noUnusedLocals": true, + "sourceMap": true, + "jsx": "react", + "strict": true, + "outDir": "./dist", + "useUnknownInCatchVariables": false + }, + "include": ["**/*.ts", "**/*.tsx", "**/*.d.tsx"], + "exclude": ["node_modules", "dist", "out"], + "compileOnSave": false +} diff --git a/vendor/desktop-notifications/sample-app/webpack.main.config.js b/vendor/desktop-notifications/sample-app/webpack.main.config.js new file mode 100644 index 00000000000..65ad95b6059 --- /dev/null +++ b/vendor/desktop-notifications/sample-app/webpack.main.config.js @@ -0,0 +1,27 @@ +const path = require('path') + +module.exports = { + resolve: { + extensions: ['.tsx', '.ts', '.js'], + }, + devtool: 'source-map', + entry: './main.ts', + target: 'electron-main', + module: { + rules: [ + { + test: /\.(js|ts|tsx)$/, + exclude: /node_modules/, + loader: 'ts-loader', + }, + { + test: /\.node$/, + loader: 'awesome-node-loader', + }, + ], + }, + output: { + path: path.resolve(__dirname, './dist'), + filename: '[name].js', + }, +} diff --git a/vendor/desktop-notifications/sample-app/yarn.lock b/vendor/desktop-notifications/sample-app/yarn.lock new file mode 100644 index 00000000000..35c0ea30e43 --- /dev/null +++ b/vendor/desktop-notifications/sample-app/yarn.lock @@ -0,0 +1,3141 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@electron/get@^1.13.0": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^9.6.0" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + global-tunnel-ng "^2.7.1" + +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.14" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" + integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@types/body-parser@*": + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/bonjour@^3.5.9": + version "3.5.10" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" + integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== + dependencies: + "@types/node" "*" + +"@types/connect-history-api-fallback@^1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + dependencies: + "@types/express-serve-static-core" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/eslint-scope@^3.7.3": + version "3.7.3" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" + integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.4.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" + integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.51": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== + +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": + version "4.17.28" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" + integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@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== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/http-proxy@^1.17.8": + version "1.17.8" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" + integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== + dependencies: + "@types/node" "*" + +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/node@*": + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" + integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== + +"@types/node@^16.11.26": + version "16.11.26" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" + integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/retry@^0.12.0": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== + +"@types/serve-index@^1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" + integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== + dependencies: + "@types/express" "*" + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/sockjs@^0.3.33": + version "0.3.33" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" + integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== + dependencies: + "@types/node" "*" + +"@types/ws@^8.2.2": + version "8.5.3" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" + integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== + dependencies: + "@types/node" "*" + +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" + integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== + +"@webpack-cli/info@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" + integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" + integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + +acorn@^8.4.1, acorn@^8.5.0: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv-keywords@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.0, ajv@^8.8.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-html-community@^0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-flatten@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +async@^2.6.2: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +awesome-node-loader@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.1.tgz#a402b7f09f72cd1c7b1a65e75180236f2f5438d9" + integrity sha1-pAK38J9yzRx7GmXnUYAjby9UONk= + dependencies: + loader-utils "^1.1.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +body-parser@1.19.2: + version "1.19.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" + integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== + dependencies: + bytes "3.1.2" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.8.1" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.9.7" + raw-body "2.4.3" + type-is "~1.6.18" + +bonjour@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= + dependencies: + array-flatten "^2.1.0" + deep-equal "^1.0.1" + dns-equal "^1.0.0" + dns-txt "^2.0.2" + multicast-dns "^6.0.1" + multicast-dns-service-types "^1.1.0" + +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.2, 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== + dependencies: + fill-range "^7.0.1" + +browserslist@^4.14.5: + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== + dependencies: + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" + escalade "^3.1.1" + node-releases "^2.0.2" + picocolors "^1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer-indexof@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +caniuse-lite@^1.0.30001317: + version "1.0.30001325" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz#2b4ad19b77aa36f61f2eaf72e636d7481d55e606" + integrity sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ== + +chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chokidar@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colorette@^2.0.10, colorette@^2.0.14: + version "2.0.16" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + safe-buffer "5.1.2" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +connect-history-api-fallback@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^7.0.1, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +debug@2.6.9, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.1.1: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +debug@^4.1.0, debug@^4.1.1: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-equal@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +default-gateway@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" + integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== + dependencies: + execa "^5.0.0" + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +del@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== + dependencies: + globby "^11.0.1" + graceful-fs "^4.2.4" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.2" + p-map "^4.0.0" + rimraf "^3.0.2" + slash "^3.0.0" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +desktop-notifications@../: + version "0.2.4" + dependencies: + node-addon-api "^5.0.0" + prebuild-install "^7.0.1" + uuid "^8.3.2" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dns-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= + +dns-packet@^1.3.1: + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== + dependencies: + ip "^1.1.0" + safe-buffer "^5.0.1" + +dns-txt@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= + dependencies: + buffer-indexof "^1.0.0" + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +electron-to-chromium@^1.4.84: + version "1.4.103" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a" + integrity sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg== + +electron@^18.0.1: + version "18.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.0.1.tgz#70653ecee008bea8a4240da78d0f5a426bb24d50" + integrity sha512-8y3nxmK+v/tiuaR8yd4K83ApHxgomMIPAEl3J+2Jfv/D5G6M3KnvxNlNiNoTXI8uOegfmoqiDm5/2xlWFLzfLQ== + dependencies: + "@electron/get" "^1.13.0" + "@types/node" "^16.11.26" + extract-zip "^1.0.3" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@^1.0.2, encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.0.0, enhanced-resolve@^5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" + integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +express@^4.17.1: + version "4.17.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" + integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== + dependencies: + accepts "~1.3.8" + array-flatten "1.1.1" + body-parser "1.19.2" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.4.2" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.9.7" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extract-zip@^1.0.3: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + +faye-websocket@^0.11.3: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== + dependencies: + websocket-driver ">=0.5.1" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +follow-redirects@^1.0.0: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-monkey@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-intrinsic@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== + +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.1.3: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-tunnel-ng@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" + integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== + dependencies: + encodeurl "^1.0.2" + lodash "^4.17.10" + npm-conf "^1.1.3" + tunnel "^0.0.6" + +globalthis@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + dependencies: + define-properties "^1.1.3" + +globby@^11.0.1: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + +handle-thing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + +html-entities@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" + integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= + +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-parser-js@>=0.5.1: + version "0.5.6" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd" + integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA== + +http-proxy-middleware@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" + integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== + dependencies: + "@types/http-proxy" "^1.17.8" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +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== + +import-local@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@^1.3.4, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + +ip@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +ipaddr.js@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" + integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== + +is-arguments@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== + dependencies: + has "^1.0.3" + +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + +is-path-inside@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-regex@^1.0.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + +loader-utils@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash@^4.17.10, lodash@^4.17.14: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +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" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +minimalistic-assert@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +mkdirp@^0.5.4, mkdirp@^0.5.5: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multicast-dns-service-types@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= + +multicast-dns@^6.0.1: + version "6.2.3" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== + dependencies: + dns-packet "^1.3.1" + thunky "^1.0.2" + +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-abi@^3.3.0: + version "3.22.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362" + integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w== + dependencies: + semver "^7.3.5" + +node-addon-api@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" + integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== + +node-forge@^1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== + +node-releases@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" + integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +npm-conf@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-is@^1.0.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +open@^8.0.9: + version "8.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-retry@^4.5.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== + dependencies: + "@types/retry" "^0.12.0" + retry "^0.13.1" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parseurl@~1.3.2, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +portfinder@^1.0.28: + version "1.0.28" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== + dependencies: + async "^2.6.2" + debug "^3.1.1" + mkdirp "^0.5.5" + +prebuild-install@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.0.tgz#991b6ac16c81591ba40a6d5de93fb33673ac1370" + integrity sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@6.9.7: + version "6.9.7" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" + integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +quick-lru@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-3.0.0.tgz#2f96145481567e5bc442c6c4a66e86158405c696" + integrity sha512-WLzHLB/msD8Q/5jNh4LviurG896aIEJRS1M3gHz91nSmaXn8q+/q4yOQvNMIETl9f5pAu3igqexB62ARWOUoOg== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" + integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== + dependencies: + bytes "3.1.2" + http-errors "1.8.1" + iconv-lite "0.4.24" + unpipe "1.0.0" + +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + +regexp.prototype.flags@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" + integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.9.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + dependencies: + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +schema-utils@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.8.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.0.0" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= + +selfsigned@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" + integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== + dependencies: + node-forge "^1" + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.2, semver@^7.3.4: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +semver@^7.3.5: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + dependencies: + lru-cache "^6.0.0" + +send@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "1.8.1" + mime "1.6.0" + ms "2.1.3" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serve-index@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.0, signal-exit@^3.0.3: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +sockjs@^0.3.21: + version "0.3.24" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== + dependencies: + faye-websocket "^0.11.3" + uuid "^8.3.2" + websocket-driver "^0.7.4" + +source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== + dependencies: + debug "^4.1.0" + detect-node "^2.0.4" + hpack.js "^2.1.6" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" + +spdy@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== + dependencies: + debug "^4.1.0" + handle-thing "^2.0.0" + http-deceiver "^1.2.7" + select-hose "^2.0.0" + spdy-transport "^3.0.0" + +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2 || 3 || 4": + 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_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.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== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== + dependencies: + ansi-regex "^6.0.1" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +terser-webpack-plugin@^5.1.3: + version "5.3.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" + integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== + dependencies: + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + source-map "^0.6.1" + terser "^5.7.2" + +terser@^5.7.2: + version "5.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" + integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" + +thunky@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +ts-loader@^9.2.8: + version "9.2.8" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.8.tgz#e89aa32fa829c5cad0a1d023d6b3adecd51d5a48" + integrity sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.0.0" + micromatch "^4.0.0" + semver "^7.3.4" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript@^4.6.3: + version "4.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" + integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +watchpack@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + dependencies: + minimalistic-assert "^1.0.0" + +webpack-cli@^4.9.2: + version "4.9.2" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" + integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.1.1" + "@webpack-cli/info" "^1.4.1" + "@webpack-cli/serve" "^1.6.1" + colorette "^2.0.14" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + webpack-merge "^5.7.3" + +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" + mime-types "^2.1.31" + range-parser "^1.2.1" + schema-utils "^4.0.0" + +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.3" + colorette "^2.0.10" + compression "^1.7.4" + connect-history-api-fallback "^1.6.0" + default-gateway "^6.0.3" + del "^6.0.0" + express "^4.17.1" + graceful-fs "^4.2.6" + html-entities "^2.3.2" + http-proxy-middleware "^2.0.0" + ipaddr.js "^2.0.1" + open "^8.0.9" + p-retry "^4.5.0" + portfinder "^1.0.28" + schema-utils "^4.0.0" + selfsigned "^2.0.0" + serve-index "^1.9.1" + sockjs "^0.3.21" + spdy "^4.0.2" + strip-ansi "^7.0.0" + webpack-dev-middleware "^5.3.1" + ws "^8.4.2" + +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + 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.71.0: + version "5.71.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.71.0.tgz#b01fcf379570b8c5ee06ca06c829ca168c951884" + integrity sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A== + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^0.0.51" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.4.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.9.2" + es-module-lexer "^0.9.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.9" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.3.1" + webpack-sources "^3.2.3" + +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^8.4.2: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 b/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 new file mode 100644 index 00000000000..7cad55263a9 --- /dev/null +++ b/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 @@ -0,0 +1,36 @@ +# This script can be removed as soon as official Windows arm64 builds are published: +# https://github.com/nodejs/build/issues/2450#issuecomment-705853342 + +$nodeVersion = $args[0] +$fallbackVersion = $args[1] + +If ($null -eq $nodeVersion -Or $null -eq $fallbackVersion) { + Write-Error "No NodeJS version given as argument to this file. Run it like download-nodejs-win-arm64.ps1 NODE_VERSION NODE_FALLBACK_VERSION" + exit 1 +} + +$url = "https://unofficial-builds.nodejs.org/download/release/v$nodeVersion/win-arm64/node.lib" +$fallbackUrl = "https://unofficial-builds.nodejs.org/download/release/v$fallbackVersion/win-arm64/node.lib" + +# Always write to the $nodeVersion cache folder, even if we're using the fallbackVersion +$cacheFolder = "$env:TEMP\prebuild\napi\$nodeVersion\arm64" + +If (!(Test-Path $cacheFolder)) { + New-Item -ItemType Directory -Force -Path $cacheFolder +} + +$output = "$cacheFolder\node.lib" +$start_time = Get-Date + +Try { + Invoke-WebRequest -Uri $url -OutFile $output + $downloadedNodeVersion = $nodeVersion +} Catch { + If ($_.Exception.Response -And $_.Exception.Response.StatusCode -eq "NotFound") { + Write-Output "No arm64 node.lib found for Node Windows $nodeVersion, trying fallback version $fallbackVersion..." + Invoke-WebRequest -Uri $fallbackUrl -OutFile $output + $downloadedNodeVersion = $fallbackVersion + } +} + +Write-Output "Downloaded arm64 NodeJS lib v$downloadedNodeVersion to $output in $((Get-Date).Subtract($start_time).Seconds) second(s)" diff --git a/vendor/desktop-notifications/script/upload.js b/vendor/desktop-notifications/script/upload.js new file mode 100644 index 00000000000..a79e4d92979 --- /dev/null +++ b/vendor/desktop-notifications/script/upload.js @@ -0,0 +1,14 @@ +// to ensure that env not in the CI server log + +const path = require('path') +const { spawnSync } = require('child_process') + +spawnSync( + path.join( + __dirname, + '../node_modules/.bin/prebuild' + + (process.platform === 'win32' ? '.cmd' : '') + ), + ['--upload-all', process.env.GITHUB_AUTH_TOKEN], + { stdio: 'inherit' } +) diff --git a/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.h b/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.h new file mode 100644 index 00000000000..3fe470e216b --- /dev/null +++ b/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.h @@ -0,0 +1,29 @@ +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef void (^GHNotificationCompletionHandler)( + NSString *event, + NSString *identifier, + NSDictionary *userInfo, + dispatch_block_t completionHandler +); + +API_AVAILABLE(macos(10.14)) +@interface GHDesktopNotificationsManager : NSObject + +@property(nonatomic, nullable) GHNotificationCompletionHandler completionHandler; + +- (void)getNotificationSettingsWithCompletionHandler:(void(^)(NSString *permission))completionHandler; +- (void)requestAuthorizationWithCompletionHandler:(void(^)(BOOL granted, NSError * _Nullable error))completionHandler; + +- (void)showNotificationWithIdentifier:(NSString *)identifier + title:(NSString *)title + body:(NSString *)body + userInfo:(NSDictionary * _Nullable)userInfo + completionHandler:(void(^)(NSError * _Nullable error))completionHandler; +- (void)removePendingNotificationRequestsWithIdentifiers:(NSArray *)identifiers; + +@end + +NS_ASSUME_NONNULL_END diff --git a/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.m b/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.m new file mode 100644 index 00000000000..51dc988a59b --- /dev/null +++ b/vendor/desktop-notifications/src/mac/GHDesktopNotificationsManager.m @@ -0,0 +1,134 @@ +#import "GHDesktopNotificationsManager.h" + +#import + +@interface GHDesktopNotificationsManager () + +@end + +@implementation GHDesktopNotificationsManager + +- (instancetype)init +{ + if ((self = [super init])) + { + [self configureNotificationsDelegate]; + } + return self; +} + +- (void)configureNotificationsDelegate +{ + UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter]; + center.delegate = self; +} + +- (void)getNotificationSettingsWithCompletionHandler:(void(^)(NSString *permission))completionHandler +{ + UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter]; + [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *settings) { + NSString *permission = @"default"; + + if (settings.authorizationStatus == UNAuthorizationStatusNotDetermined) + { + permission = @"default"; + } + else if (settings.authorizationStatus == UNAuthorizationStatusDenied) + { + permission = @"denied"; + } + else + { + permission = @"granted"; + } + + completionHandler(permission); + }]; +} + +- (void)requestAuthorizationWithCompletionHandler:(void(^)(BOOL granted, NSError * _Nullable error))completionHandler +{ + UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter]; + [center + requestAuthorizationWithOptions:UNAuthorizationOptionBadge | UNAuthorizationOptionSound | UNAuthorizationOptionAlert + completionHandler:completionHandler]; +} + +- (void)showNotificationWithIdentifier:(NSString *)identifier + title:(NSString *)title + body:(NSString *)body + userInfo:(NSDictionary * _Nullable)userInfo + completionHandler:(void(^)(NSError * _Nullable error))completionHandler +{ + UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init]; + content.title = [NSString localizedUserNotificationStringForKey:title arguments:nil]; + content.body = [NSString localizedUserNotificationStringForKey:body arguments:nil]; + content.sound = [UNNotificationSound defaultSound]; + + if (userInfo != nil) + { + content.userInfo = userInfo; + } + + // Create the request object. + UNNotificationRequest* request = [UNNotificationRequest + requestWithIdentifier:identifier content:content trigger:nil]; + + UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter]; + + [center + requestAuthorizationWithOptions:UNAuthorizationOptionBadge | UNAuthorizationOptionSound | UNAuthorizationOptionAlert + completionHandler:^(BOOL granted, NSError *error) { + + if (error != nil || !granted) + { + NSLog(@"Permission to display notification wasn't granted: %@", error); + completionHandler(error ?: [NSError errorWithDomain:@"GHDesktopNotificationManagerError" code:-1 userInfo:nil]); + return; + } + + [center addNotificationRequest:request withCompletionHandler:^(NSError * _Nullable error) { + if (error != nil) { + NSLog(@"Error posting notification: %@", error.localizedDescription); + completionHandler(error); + return; + } + + completionHandler(nil); + }]; + }]; +} + +- (void)removePendingNotificationRequestsWithIdentifiers:(NSArray *)identifiers +{ + UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter]; + [center removePendingNotificationRequestsWithIdentifiers:identifiers]; +} + +#pragma mark - UNUserNotificationCenterDelegate methods + +- (void)userNotificationCenter:(UNUserNotificationCenter *)center +didReceiveNotificationResponse:(UNNotificationResponse *)response + withCompletionHandler:(void (^)(void))completionHandler +{ + if (self.completionHandler == nil) + { + completionHandler(); + return; + } + + UNNotificationRequest *request = response.notification.request; + self.completionHandler(@"click", request.identifier, request.content.userInfo, completionHandler); +} + +- (void)userNotificationCenter:(UNUserNotificationCenter *)center + willPresentNotification:(UNNotification *)notification + withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler +{ + // This will make sure the notification is displayed even when the app is focused + completionHandler(UNNotificationPresentationOptionAlert + | UNNotificationPresentationOptionBadge + | UNNotificationPresentationOptionSound); +} + +@end diff --git a/vendor/desktop-notifications/src/mac/Utils.h b/vendor/desktop-notifications/src/mac/Utils.h new file mode 100644 index 00000000000..d9f1a288cca --- /dev/null +++ b/vendor/desktop-notifications/src/mac/Utils.h @@ -0,0 +1,5 @@ +#include +#import + +Napi::Value getNapiValueFromNSObject(const Napi::Env &env, id value); +id getNSObjectFromNapiValue(const Napi::Env &env, const Napi::Value &value); diff --git a/vendor/desktop-notifications/src/mac/Utils.mm b/vendor/desktop-notifications/src/mac/Utils.mm new file mode 100644 index 00000000000..e7ed44917a2 --- /dev/null +++ b/vendor/desktop-notifications/src/mac/Utils.mm @@ -0,0 +1,129 @@ +#import "Utils.h" + +Napi::Object getNapiObjectFromDictionary(const Napi::Env &env, NSDictionary *d) +{ + Napi::Object obj = Napi::Object::New(env); + for (NSString *key in d) { + id value = d[key]; + obj.Set(Napi::String::New(env, key.UTF8String), getNapiValueFromNSObject(env, value)); + } + return obj; +} + +Napi::Array getNapiArrayFromArray(const Napi::Env &env, NSArray *a) +{ + Napi::Array result = Napi::Array::New(env); + for (NSUInteger i = 0; i < a.count; i++) { + id value = a[i]; + result.Set(i, getNapiValueFromNSObject(env, value)); + } + return result; +} + +Napi::Value getNapiValueFromNSObject(const Napi::Env &env, id value) +{ + if (value == nil) + { + return env.Undefined(); + } + + if ([value isKindOfClass:[NSString class]]) + { + NSString *string = (NSString *)value; + return Napi::String::New(env, string.UTF8String); + } + else if ([value isKindOfClass:[NSNumber class]]) + { + NSNumber *number = value; + + // Booleans wrapped in NSNumber require special treatment + CFTypeID boolID = CFBooleanGetTypeID(); // the type ID of CFBoolean + CFTypeID numID = CFGetTypeID((__bridge CFTypeRef)(number)); // the type ID of number + if (numID == boolID) + { + return Napi::Boolean::New(env, [number boolValue]); + } + + CFNumberType numberType = CFNumberGetType((CFNumberRef)value); + if (numberType == kCFNumberFloatType || numberType == kCFNumberDoubleType) + { + return Napi::Number::New(env, number.doubleValue); + } + else if (numberType == kCFNumberSInt64Type || numberType == kCFNumberLongLongType) + { + return Napi::Number::New(env, number.longLongValue); + } + else if (numberType == kCFNumberSInt32Type || numberType == kCFNumberIntType) + { + return Napi::Number::New(env, number.intValue); + } + else if (numberType == kCFNumberSInt16Type || numberType == kCFNumberShortType) + { + return Napi::Number::New(env, number.shortValue); + } + else if (numberType == kCFNumberSInt8Type || numberType == kCFNumberCharType) + { + return Napi::Number::New(env, number.charValue); + } + else if (numberType == kCFNumberCFIndexType || numberType == kCFNumberNSIntegerType) + { + return Napi::Number::New(env, number.integerValue); + } + else + { + return Napi::Number::New(env, number.longValue); + } + } + else if ([value isKindOfClass:[NSDictionary class]]) + { + return getNapiObjectFromDictionary(env, value); + } + else if ([value isKindOfClass:[NSArray class]]) + { + return getNapiArrayFromArray(env, value); + } + + return env.Undefined(); +} + +id getNSObjectFromNapiValue(const Napi::Env &env, const Napi::Value &value) +{ + if (value.IsString()) + { + return [NSString stringWithUTF8String:value.As().Utf8Value().c_str()]; + } + else if (value.IsNumber()) + { + return @(value.As().DoubleValue()); + } + else if (value.IsBoolean()) + { + return [NSNumber numberWithBool:value.As().Value()]; + } + else if (value.IsNull()) + { + return [NSNull null]; + } + else if (value.IsObject()) + { + Napi::Object obj = value.As(); + NSMutableDictionary *d = [NSMutableDictionary dictionary]; + for (auto it = obj.begin(); it != obj.end(); ++it) { + auto entry = *it; + NSString *key = [NSString stringWithUTF8String:entry.first.As().Utf8Value().c_str()]; + d[key] = getNSObjectFromNapiValue(env, entry.second); + } + return d; + } + else if (value.IsArray()) + { + Napi::Array arr = value.As(); + NSMutableArray *a = [NSMutableArray array]; + for (uint32_t i = 0; i < arr.Length(); i++) { + a[i] = getNSObjectFromNapiValue(env, arr[i]); + } + return a; + } + + return nil; +} diff --git a/vendor/desktop-notifications/src/mac/main_mac.mm b/vendor/desktop-notifications/src/mac/main_mac.mm new file mode 100644 index 00000000000..94b2c6b40ea --- /dev/null +++ b/vendor/desktop-notifications/src/mac/main_mac.mm @@ -0,0 +1,274 @@ +#include +#include "uv.h" + +#include + +#include +#include +#include + +#import + +#import "GHDesktopNotificationsManager.h" +#import "Utils.h" + +using namespace Napi; + +// Disable API availability warning here. Availability will be handled when +// the instance is created. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" +GHDesktopNotificationsManager *desktopNotificationsManager = nil; +#pragma clang diagnostic pop + +Napi::ThreadSafeFunction notificationsCallback; + +// Dummy value to pass into function parameter for ThreadSafeFunction. +Napi::Value NoOp(const Napi::CallbackInfo &info) { + return info.Env().Undefined(); +} + +namespace +{ + Napi::ThreadSafeFunction notificationCallback; + + Napi::Value initializeNotifications(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + + if (desktopNotificationsManager) + { + return env.Undefined(); + } + + // There is a second argument, which is an object with options, but it is + // not used on macOS. + if (info.Length() < 1) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsFunction()) + { + Napi::TypeError::New(env, "Callback must be a function.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + // Create the desktop notifications manager only if it's a supported macOS version + if (@available(macOS 10.14, *)) + { + desktopNotificationsManager = [GHDesktopNotificationsManager new]; + } + else + { + return env.Undefined(); + } + + auto callback = info[0].As(); + notificationsCallback = Napi::ThreadSafeFunction::New(callback.Env(), callback, "Notification Callback", 0, 1); + + desktopNotificationsManager.completionHandler = ^(NSString *event, NSString *identifier, NSDictionary *userInfo, dispatch_block_t completionHandler) { + auto cb = [event, identifier, userInfo, completionHandler](Napi::Env env, Napi::Function jsCallback) + { + jsCallback.Call({ + Napi::String::New(env, event.UTF8String), + Napi::String::New(env, identifier.UTF8String), + getNapiValueFromNSObject(env, userInfo), + }); + + // Invoke the OS completion handler + completionHandler(); + }; + + notificationsCallback.BlockingCall(cb); + }; + + return info.Env().Undefined(); + } + + Napi::Value showNotification(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + + if (desktopNotificationsManager == nil) + { + return env.Undefined(); + } + + if (info.Length() < 3) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the first argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[1].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the second argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[2].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the third argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + NSString *notificationID = [NSString stringWithCString:info[0].As().Utf8Value().c_str() + encoding:[NSString defaultCStringEncoding]]; + auto titleUTF16 = info[1].As().Utf16Value(); + NSString *title = [NSString stringWithCharacters:(const unichar *)titleUTF16.c_str() + length:titleUTF16.size()]; + auto bodyUTF16 = info[2].As().Utf16Value(); + NSString *body = [NSString stringWithCharacters:(const unichar *)bodyUTF16.c_str() + length:bodyUTF16.size()]; + + NSDictionary *userInfo = nil; + if (info.Length() > 3 && info[3].IsObject()) + { + auto userInfoObject = info[3].As(); + userInfo = getNSObjectFromNapiValue(env, userInfoObject); + } + + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New( + env, Napi::Function::New(env, NoOp), "showNotificationCallback", 0, 1); + __block Napi::ThreadSafeFunction tsfn = ts_fn; + + [desktopNotificationsManager showNotificationWithIdentifier:notificationID + title:title + body:body + userInfo:userInfo + completionHandler:^(NSError *error) { + + if (error != nil) { + auto callback = [deferred](Napi::Env env, Napi::Function js_cb) { + deferred.Reject(env.Undefined()); + }; + tsfn.BlockingCall(callback); + tsfn.Release(); + return; + } + + auto callback = [deferred](Napi::Env env, Napi::Function js_cb) { + deferred.Resolve(env.Undefined()); + }; + tsfn.BlockingCall(callback); + tsfn.Release(); + }]; + + return deferred.Promise(); + } + + Napi::Value terminateNotifications(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + desktopNotificationsManager = nil; + return env.Undefined(); + } + + Napi::Value closeNotification(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + + if (desktopNotificationsManager == nil) + { + return env.Undefined(); + } + + if (info.Length() < 1) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the first argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + NSString *notificationID = [NSString stringWithCString:info[0].As().Utf8Value().c_str() + encoding:[NSString defaultCStringEncoding]]; + + [desktopNotificationsManager removePendingNotificationRequestsWithIdentifiers:@[notificationID]]; + + return env.Undefined(); + } + + Napi::Value getNotificationsPermission(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + + if (desktopNotificationsManager == nil) + { + return env.Undefined(); + } + + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New( + env, Napi::Function::New(env, NoOp), "getNotificationsPermissionCallback", 0, 1); + + __block Napi::ThreadSafeFunction tsfn = ts_fn; + [desktopNotificationsManager getNotificationSettingsWithCompletionHandler:^(NSString *permission) { + auto callback = [permission, deferred](Napi::Env env, Napi::Function js_cb) { + deferred.Resolve(Napi::String::New(env, permission.UTF8String)); + }; + tsfn.BlockingCall(callback); + tsfn.Release(); + }]; + + return deferred.Promise(); + } + + Napi::Value requestNotificationsPermission(const Napi::CallbackInfo &info) + { + const Napi::Env &env = info.Env(); + + if (desktopNotificationsManager == nil) + { + return env.Undefined(); + } + + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New( + env, Napi::Function::New(env, NoOp), "requestNotificationsPermissionCallback", 0, 1); + + __block Napi::ThreadSafeFunction tsfn = ts_fn; + [desktopNotificationsManager + requestAuthorizationWithCompletionHandler:^(BOOL granted, NSError *error) { + + if (error != nil) { + NSLog(@"Error requesting permission %@", error); + } + + auto callback = [granted, deferred](Napi::Env env, Napi::Function js_cb) { + deferred.Resolve(Napi::Boolean::New(env, granted)); + }; + tsfn.BlockingCall(callback); + tsfn.Release(); + }]; + + return deferred.Promise(); + } + + Napi::Object Init(Napi::Env env, Napi::Object exports) + { + exports.Set(Napi::String::New(env, "initializeNotifications"), Napi::Function::New(env, initializeNotifications)); + exports.Set(Napi::String::New(env, "terminateNotifications"), Napi::Function::New(env, terminateNotifications)); + exports.Set(Napi::String::New(env, "showNotification"), Napi::Function::New(env, showNotification)); + exports.Set(Napi::String::New(env, "closeNotification"), Napi::Function::New(env, closeNotification)); + exports.Set(Napi::String::New(env, "getNotificationsPermission"), Napi::Function::New(env, getNotificationsPermission)); + exports.Set(Napi::String::New(env, "requestNotificationsPermission"), Napi::Function::New(env, requestNotificationsPermission)); + + return exports; + } +} + +NODE_API_MODULE(desktopNotificationsNativeModule, Init); diff --git a/vendor/desktop-notifications/src/win/DesktopNotification.cpp b/vendor/desktop-notifications/src/win/DesktopNotification.cpp new file mode 100644 index 00000000000..569d100b9c1 --- /dev/null +++ b/vendor/desktop-notifications/src/win/DesktopNotification.cpp @@ -0,0 +1,235 @@ +#include "DesktopNotificationsManager.h" +#include "DesktopNotification.h" +#include "Utils.h" + +#include +#include +#include +#include +#include +#include + +const std::wstring kLaunchAttribute = L"launch"; + +using namespace ABI::Windows::UI::Notifications; +using namespace Windows::Foundation; +using namespace Wrappers; + +DesktopNotification::DesktopNotification(const std::wstring &id, + const std::wstring &appID, + const std::wstring &title, + const std::wstring &body, + const std::wstring &userInfo) + : m_title(title), + m_body(body), + m_userInfo(userInfo), + m_appID(appID), + m_id(id) +{ +} + +// Set the values of each of the text nodes +HRESULT DesktopNotification::setTextValues() +{ + ComPtr nodeList; + DN_RETURN_ON_ERROR( + m_toastXml->GetElementsByTagName(HStringReference(L"text").Get(), &nodeList)); + // create the title + ComPtr textNode; + DN_RETURN_ON_ERROR(nodeList->Item(0, &textNode)); + DN_RETURN_ON_ERROR( + setNodeValueString(HStringReference(m_title.c_str()).Get(), textNode.Get())); + DN_RETURN_ON_ERROR(nodeList->Item(1, &textNode)); + return setNodeValueString(HStringReference(m_body.c_str()).Get(), textNode.Get()); +} + +HRESULT DesktopNotification::startListeningEvents(DesktopNotificationsManager *desktopNotificationsManager) +{ + ComPtr toast = m_notification; + + // TODO: Register the event handlers if we need more control over them. For + // now, just using the events from the activator is enough. + // DN_RETURN_ON_ERROR(toast->add_Activated(desktopNotificationsManager, &m_activatedToken)); + // DN_RETURN_ON_ERROR(toast->add_Dismissed(desktopNotificationsManager, &m_dismissedToken)); + // DN_RETURN_ON_ERROR(toast->add_Failed(desktopNotificationsManager, &m_failedToken)); + + return S_OK; +} + +HRESULT DesktopNotification::setNodeValueString(const HSTRING &inputString, IXmlNode *node) +{ + ComPtr inputText; + DN_RETURN_ON_ERROR(m_toastXml->CreateTextNode(inputString, &inputText)); + + ComPtr inputTextNode; + DN_RETURN_ON_ERROR(inputText.As(&inputTextNode)); + + ComPtr pAppendedChild; + return node->AppendChild(inputTextNode.Get(), &pAppendedChild); +} + +HRESULT DesktopNotification::addAttribute(const std::wstring &name, IXmlNamedNodeMap *attributeMap) +{ + ComPtr srcAttribute; + HRESULT hr = + m_toastXml->CreateAttribute(HStringReference(name.c_str()).Get(), &srcAttribute); + + if (SUCCEEDED(hr)) + { + ComPtr node; + hr = srcAttribute.As(&node); + if (SUCCEEDED(hr)) + { + ComPtr pNode; + hr = attributeMap->SetNamedItem(node.Get(), &pNode); + } + } + return hr; +} + +HRESULT DesktopNotification::addAttribute(const std::wstring &name, IXmlNamedNodeMap *attributeMap, + const std::wstring &value) +{ + ComPtr srcAttribute; + DN_RETURN_ON_ERROR( + m_toastXml->CreateAttribute(HStringReference(name.c_str()).Get(), &srcAttribute)); + + ComPtr node; + DN_RETURN_ON_ERROR(srcAttribute.As(&node)); + + ComPtr pNode; + DN_RETURN_ON_ERROR(attributeMap->SetNamedItem(node.Get(), &pNode)); + return setNodeValueString(HStringReference(value.c_str()).Get(), node.Get()); +} + +void DesktopNotification::printXML() +{ + ComPtr s; + ComPtr ss(m_toastXml); + ss.As(&s); + HSTRING string; + s->GetXml(&string); + PCWSTR str = WindowsGetStringRawBuffer(string, nullptr); + DN_LOG_DEBUG(L"------------------------\n\t\t\t" << str << L"\n\t\t" << L"------------------------"); +} + +// Create and display the toast +HRESULT DesktopNotification::createToast(ComPtr toastManager, + DesktopNotificationsManager *desktopNotificationsManager) +{ + DN_RETURN_ON_ERROR(toastManager->GetTemplateContent( + ToastTemplateType_ToastImageAndText02, &m_toastXml)); + ComPtr rootList; + DN_RETURN_ON_ERROR( + m_toastXml->GetElementsByTagName(HStringReference(L"toast").Get(), &rootList)); + + ComPtr root; + DN_RETURN_ON_ERROR(rootList->Item(0, &root)); + ComPtr rootAttributes; + DN_RETURN_ON_ERROR(root->get_Attributes(&rootAttributes)); + + const auto data = Utils::formatLaunchArgs(m_id, m_userInfo); + DN_RETURN_ON_ERROR(addAttribute(kLaunchAttribute, rootAttributes.Get(), data)); + DN_RETURN_ON_ERROR(setTextValues()); + + // printXML(); + + DN_RETURN_ON_ERROR(toastManager->CreateToastNotifierWithId( + HStringReference(m_appID.c_str()).Get(), &m_notifier)); + + ComPtr factory; + DN_RETURN_ON_ERROR(GetActivationFactory( + HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(), + &factory)); + DN_RETURN_ON_ERROR(factory->CreateToastNotification(m_toastXml.Get(), &m_notification)); + + ComPtr toastV2; + if (SUCCEEDED(m_notification.As(&toastV2))) + { + DN_RETURN_ON_ERROR(toastV2->put_Tag(HStringReference(m_id.c_str()).Get())); + DN_RETURN_ON_ERROR(toastV2->put_Group(HStringReference(DN_GROUP_NAME).Get())); + } + + std::wstring error; + NotificationSetting setting = NotificationSetting_Enabled; + if (!DN_CHECK_RESULT(m_notifier->get_Setting(&setting))) + { + DN_LOG_ERROR("Failed to retreive NotificationSettings ensure your appId is registered"); + } + switch (setting) + { + case NotificationSetting_Enabled: + DN_RETURN_ON_ERROR(startListeningEvents(desktopNotificationsManager)); + break; + case NotificationSetting_DisabledForApplication: + error = L"DisabledForApplication"; + break; + case NotificationSetting_DisabledForUser: + error = L"DisabledForUser"; + break; + case NotificationSetting_DisabledByGroupPolicy: + error = L"DisabledByGroupPolicy"; + break; + case NotificationSetting_DisabledByManifest: + error = L"DisabledByManifest"; + break; + } + if (!error.empty()) + { + std::wstringstream err; + err << L"Notifications are disabled\n" + << L"Reason: " << error << L" Please make sure that the app id is set correctly.\n" + << L"Command Line: " << GetCommandLineW(); + DN_LOG_ERROR(err.str()); + } + return m_notifier->Show(m_notification.Get()); +} + +std::wstring DesktopNotification::getLaunchArgsFromToast(IToastNotification *toast) +{ + IXmlDocument *xmlDoc = nullptr; + toast->get_Content(&xmlDoc); + if (xmlDoc == nullptr) + { + DN_LOG_ERROR(L"Could not get xml document from toast"); + return L""; + } + + // Get "launch" attribute and split it to obtain the notification ID + HSTRING launchArgs; + IXmlElement *rootElement = nullptr; + xmlDoc->get_DocumentElement(&rootElement); + rootElement->GetAttribute(HStringReference(kLaunchAttribute.c_str()).Get(), &launchArgs); + + if (launchArgs == nullptr) + { + DN_LOG_ERROR(L"Could not get launch attribute from toast"); + return L""; + } + + return WindowsGetStringRawBuffer(launchArgs, nullptr); +} + +std::string DesktopNotification::getNotificationIDFromToast(IToastNotification *toast) +{ + std::wstring launchArgs = getLaunchArgsFromToast(toast); + if (launchArgs == L"") + { + DN_LOG_ERROR(L"Could not get launch arguments from toast"); + return ""; + } + + return Utils::parseNotificationID(launchArgs); +} + +std::wstring DesktopNotification::getUserInfoFromToast(IToastNotification *toast) +{ + std::wstring launchArgs = getLaunchArgsFromToast(toast); + if (launchArgs == L"") + { + DN_LOG_ERROR(L"Could not get launch arguments from toast"); + return L""; + } + + return Utils::parseUserInfo(launchArgs); +} diff --git a/vendor/desktop-notifications/src/win/DesktopNotification.h b/vendor/desktop-notifications/src/win/DesktopNotification.h new file mode 100644 index 00000000000..c7a0767c2b6 --- /dev/null +++ b/vendor/desktop-notifications/src/win/DesktopNotification.h @@ -0,0 +1,52 @@ +#pragma once +#include "DesktopNotificationsManager.h" +#include + +class DesktopNotificationsManager; + +class DesktopNotification +{ + +public: + explicit DesktopNotification::DesktopNotification(const std::wstring &id, + const std::wstring &appID, + const std::wstring &title, + const std::wstring &body, + const std::wstring &userInfo); + + std::wstring getID() + { + return m_id; + } + + // Create and display the toast + HRESULT createToast(Microsoft::WRL::ComPtr toastManager, + DesktopNotificationsManager *desktopNotificationsManager); + + static std::string getNotificationIDFromToast(ABI::Windows::UI::Notifications::IToastNotification *toast); + static std::wstring getUserInfoFromToast(ABI::Windows::UI::Notifications::IToastNotification *toast); + +private: + std::wstring m_appID; + + std::wstring m_title; + std::wstring m_body; + std::wstring m_userInfo; + std::wstring m_id; + EventRegistrationToken m_activatedToken, m_dismissedToken, m_failedToken; + + Microsoft::WRL::ComPtr m_toastXml; + Microsoft::WRL::ComPtr m_notifier; + Microsoft::WRL::ComPtr m_notification; + + // Set the values of each of the text nodes + HRESULT setTextValues(); + HRESULT startListeningEvents(DesktopNotificationsManager *desktopNotificationsManager); + HRESULT setNodeValueString(const HSTRING &inputString, ABI::Windows::Data::Xml::Dom::IXmlNode *node); + HRESULT addAttribute(const std::wstring &name, ABI::Windows::Data::Xml::Dom::IXmlNamedNodeMap *attributeMap); + HRESULT addAttribute(const std::wstring &name, ABI::Windows::Data::Xml::Dom::IXmlNamedNodeMap *attributeMap, + const std::wstring &value); + void printXML(); + + static std::wstring getLaunchArgsFromToast(ABI::Windows::UI::Notifications::IToastNotification *toast); +}; diff --git a/vendor/desktop-notifications/src/win/DesktopNotificationsActionCenterActivator.h b/vendor/desktop-notifications/src/win/DesktopNotificationsActionCenterActivator.h new file mode 100644 index 00000000000..7668c80a66d --- /dev/null +++ b/vendor/desktop-notifications/src/win/DesktopNotificationsActionCenterActivator.h @@ -0,0 +1,54 @@ +#pragma once + +#include +#include +#include +#include + +#include "DesktopNotificationsManager.h" +#include "Utils.h" + +#define DN_WSTRINGIFY(X) L##X +#define DN_STRINGIFY(X) DN_WSTRINGIFY(X) + +typedef struct NOTIFICATION_USER_INPUT_DATA +{ + LPCWSTR Key; + LPCWSTR Value; +} NOTIFICATION_USER_INPUT_DATA; + +MIDL_INTERFACE("53E31837-6600-4A81-9395-75CFFE746F94") +INotificationActivationCallback : public IUnknown +{ +public: + virtual HRESULT STDMETHODCALLTYPE Activate( + __RPC__in_string LPCWSTR appUserModelId, __RPC__in_opt_string LPCWSTR invokedArgs, + __RPC__in_ecount_full_opt(count) const NOTIFICATION_USER_INPUT_DATA *data, + ULONG count) = 0; +}; + +// The COM server which implements the callback notifcation from Action Center +class DesktopNotificationsActionCenterActivator + : public Microsoft::WRL::RuntimeClass< + Microsoft::WRL::RuntimeClassFlags, + INotificationActivationCallback> +{ +public: + DesktopNotificationsActionCenterActivator() {} + virtual HRESULT STDMETHODCALLTYPE Activate(__RPC__in_string LPCWSTR appUserModelId, + __RPC__in_opt_string LPCWSTR invokedArgs, + __RPC__in_ecount_full_opt(count) + const NOTIFICATION_USER_INPUT_DATA *data, + ULONG count) override + { + if (!desktopNotificationsManager) + { + DN_LOG_ERROR("Cannot handle notification activator: notifications not initialized."); + return S_OK; + } + + desktopNotificationsManager->handleActivatorEvent(invokedArgs); + + return S_OK; + } +}; diff --git a/vendor/desktop-notifications/src/win/DesktopNotificationsManager.cpp b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.cpp new file mode 100644 index 00000000000..efdf8e15d11 --- /dev/null +++ b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.cpp @@ -0,0 +1,330 @@ +#include "DesktopNotificationsManager.h" +#include "DesktopNotification.h" +#include "Utils.h" +#include "DesktopNotificationsActionCenterActivator.h" + +#include +#include +#include + +using namespace Microsoft::WRL; +using namespace Microsoft::WRL::Details; +using namespace ABI::Windows::UI; +using namespace ABI::Windows::UI::Notifications; +using namespace ABI::Windows::Data::Xml::Dom; +using namespace Windows::Foundation; +using namespace Wrappers; + +DesktopNotificationsManager::DesktopNotificationsManager(const std::wstring &toastActivatorClsid, + Napi::Function &callback) + : m_ref(0), + m_toastActivatorClsid(toastActivatorClsid), + m_callback(Napi::ThreadSafeFunction::New(callback.Env(), callback, "Notification Callback", 0, 1)) +{ + { + HRESULT hr = Windows::Foundation::Initialize(RO_INIT_MULTITHREADED); + if (!SUCCEEDED(hr)) + { + DN_LOG_ERROR(L"Failed to initialize with RO_INIT_MULTITHREADED: " << hr); + } + } + { + HRESULT hr = GetActivationFactory( + HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager) + .Get(), + &m_toastManager); + if (!SUCCEEDED(hr)) + { + DN_LOG_ERROR(L"Failed to register com Factory, please make sure you " + L"correctly initialized with RO_INIT_MULTITHREADED: " + << hr); + } + } + + if (char *envAppID = std::getenv("DN_APP_ID")) + { + DN_LOG_INFO(L"Using custom App User Model ID '" << envAppID << "'"); + + HRESULT hr = SetCurrentProcessExplicitAppUserModelID(Utils::utf8ToWideChar(std::string(envAppID))); + if (!SUCCEEDED(hr)) + { + DN_LOG_ERROR(L"DesktopNotificationsManager: Failed to set AUMID"); + return; + } + } + + { + PWSTR appID; + HRESULT hr = GetCurrentProcessExplicitAppUserModelID(&appID); + if (!SUCCEEDED(hr)) + { + DN_LOG_ERROR(L"Couldn't retrieve AUMID"); + return; + } + else + { + m_appID = std::wstring(appID); + CoTaskMemFree(appID); + } + } + + RegisterClassObjects(m_toastActivatorClsid); +} + +void DesktopNotificationsManager::SignalObjectCountZero() +{ + // Do nothing +} + +HRESULT DesktopNotificationsManager::RegisterClassObjects(const std::wstring &toastActivatorClsid) +{ + // Create an out-of-proc COM module with caching disabled. The supplied + // method is invoked when the last instance object of the module is released. + auto &module = Module::Create( + this, &DesktopNotificationsManager::SignalObjectCountZero); + + // Usually COM module classes statically define their CLSID at compile time + // through the use of various macros, and WRL::Module internals takes care of + // creating the class objects and registering them. However, we need to + // register the same object with different CLSIDs depending on a runtime + // setting, so we handle that logic here. + + ComPtr factory; + unsigned int flags = ModuleType::OutOfProcDisableCaching; + + HRESULT hr = CreateClassFactory< + SimpleClassFactory>( + &flags, nullptr, __uuidof(IClassFactory), &factory); + if (FAILED(hr)) + { + DN_LOG_ERROR("Failed to create Factory for Action Center activator; hr: " << hr); + return hr; + } + + ComPtr class_factory; + hr = factory.As(&class_factory); + if (FAILED(hr)) + { + DN_LOG_ERROR("Failed to create IClassFactory for Action Center activator; hr: " << hr); + return hr; + } + + CLSID activatorClsid; + CLSIDFromString(toastActivatorClsid.c_str(), &activatorClsid); + + // All pointers in this array are unowned. Do not release them. + IClassFactory *class_factories[] = {class_factory.Get()}; + IID class_ids[] = {activatorClsid}; + + hr = module.RegisterCOMObject(nullptr, class_ids, class_factories, m_comCookies, + std::extent()); + if (FAILED(hr)) + { + DN_LOG_ERROR("Failed to register Action Center activator; hr: " << hr); + } + else + { + module.IncrementObjectCount(); + } + + return hr; +} + +DesktopNotificationsManager::~DesktopNotificationsManager() +{ + m_callback.Release(); + m_desktopNotifications.clear(); + + UnregisterClassObjects(); +} + +HRESULT DesktopNotificationsManager::UnregisterClassObjects() +{ + auto &module = Module::GetModule(); + + module.DecrementObjectCount(); + + HRESULT hr = module.UnregisterCOMObject(nullptr, m_comCookies, + std::extent()); + if (FAILED(hr)) + { + DN_LOG_ERROR("Failed to unregister Action Center activator; hr: " << hr); + } + + return hr; +} + +const std::string DesktopNotificationsManager::getCurrentPermission() +{ + Microsoft::WRL::ComPtr notifier; + if (!DN_CHECK_RESULT(m_toastManager->CreateToastNotifierWithId( + HStringReference(m_appID.c_str()).Get(), ¬ifier))) + { + DN_LOG_ERROR("Failed to create a ToastNotifier to ensure your appId is registered"); + return "default"; + } + + NotificationSetting setting = NotificationSetting_Enabled; + if (!DN_CHECK_RESULT(notifier->get_Setting(&setting))) + { + DN_LOG_ERROR("Failed to retreive NotificationSettings to ensure your appId is registered"); + return "default"; + } + + return (setting == NotificationSetting_Enabled ? "granted" : "denied"); +} + +ComPtr DesktopNotificationsManager::getHistory() +{ + ComPtr toastStatics2; + if (DN_CHECK_RESULT(m_toastManager.As(&toastStatics2))) + { + ComPtr nativeHistory; + DN_CHECK_RESULT(toastStatics2->get_History(&nativeHistory)); + return nativeHistory; + } + return {}; +} + +HRESULT DesktopNotificationsManager::displayToast(const std::wstring &id, + const std::wstring &title, + const std::wstring &body, + const std::wstring &userInfo) +{ + std::shared_ptr d = std::make_shared(id, m_appID, title, body, userInfo); + m_desktopNotifications.push_back(d); + return d->createToast(m_toastManager, this); +} + +bool DesktopNotificationsManager::closeToast(const std::wstring &id) +{ + // Iterate through m_desktopNotifications looking for a notification with + // the given id, close that notification and remove it from the list. + for (auto it = m_desktopNotifications.begin(); it != m_desktopNotifications.end(); ++it) + { + auto notification = *it; + if (notification->getID() == id) + { + m_desktopNotifications.erase(it); + return closeNotification(notification); + } + } + + return false; +} + +void DesktopNotificationsManager::handleActivatorEvent(const std::wstring &launchArgs) +{ + const auto notificationID = Utils::parseNotificationID(launchArgs); + const auto userInfo = Utils::parseUserInfo(launchArgs); + invokeJSCallback("click", notificationID, userInfo); +} + +bool DesktopNotificationsManager::closeNotification(std::shared_ptr d) +{ + if (auto history = getHistory()) + { + if (DN_CHECK_RESULT(history->RemoveGroupedTagWithId( + HStringReference(d->getID().c_str()).Get(), HStringReference(DN_GROUP_NAME).Get(), + HStringReference(m_appID.c_str()).Get()))) + { + return true; + } + } + + DN_LOG_ERROR("Notification " << d->getID() << " does not exist"); + return false; +} + +// DesktopToastActivatedEventHandler +IFACEMETHODIMP DesktopNotificationsManager::Invoke(_In_ IToastNotification *sender, + _In_ IInspectable *args) +{ + IToastActivatedEventArgs *buttonReply = nullptr; + args->QueryInterface(&buttonReply); + if (buttonReply == nullptr) + { + DN_LOG_ERROR(L"args is not a IToastActivatedEventArgs"); + return S_OK; + } + + const auto notificationID = DesktopNotification::getNotificationIDFromToast(sender); + const auto userInfo = DesktopNotification::getUserInfoFromToast(sender); + invokeJSCallback("click", notificationID, userInfo); + + return S_OK; +} + +// DesktopToastDismissedEventHandler +IFACEMETHODIMP DesktopNotificationsManager::Invoke(_In_ IToastNotification *sender, + _In_ IToastDismissedEventArgs *e) +{ + const auto notificationID = DesktopNotification::getNotificationIDFromToast(sender); + if (notificationID == "") + { + DN_LOG_ERROR(L"Could not get notification ID from toast"); + return S_OK; + } + const auto userInfo = DesktopNotification::getUserInfoFromToast(sender); + + ToastDismissalReason tdr; + HRESULT hr = e->get_Reason(&tdr); + if (SUCCEEDED(hr)) + { + switch (tdr) + { + case ToastDismissalReason_ApplicationHidden: + invokeJSCallback("hidden", notificationID, userInfo); + break; + case ToastDismissalReason_UserCanceled: + invokeJSCallback("dismissed", notificationID, userInfo); + break; + case ToastDismissalReason_TimedOut: + invokeJSCallback("timedout", notificationID, userInfo); + break; + } + } + + return S_OK; +} + +// DesktopToastFailedEventHandler +IFACEMETHODIMP DesktopNotificationsManager::Invoke(_In_ IToastNotification *sender, + _In_ IToastFailedEventArgs *e) +{ + const auto notificationID = DesktopNotification::getNotificationIDFromToast(sender); + if (notificationID == "") + { + DN_LOG_ERROR(L"Could not get notification ID from toast"); + return S_OK; + } + const auto userInfo = DesktopNotification::getUserInfoFromToast(sender); + + DN_LOG_ERROR(L"The toast encountered an error."); + invokeJSCallback("error", notificationID, userInfo); + return S_OK; +} + +void DesktopNotificationsManager::invokeJSCallback(const std::string &eventName, + const std::string ¬ificationID, + const std::wstring &userInfo) +{ + auto cb = [=](Napi::Env env, Napi::Function jsCallback) + { + Napi::Value userInfoObject = env.Undefined(); + if (userInfo != L"") + { + Napi::String userInfoString = Napi::String::New(env, (const char16_t *)userInfo.c_str()); + userInfoObject = Utils::JSONParse(env, userInfoString); + } + jsCallback.Call({ + Napi::String::New(env, eventName), + Napi::String::New(env, notificationID), + userInfoObject, + }); + }; + + m_callback.BlockingCall(cb); +} + +std::shared_ptr desktopNotificationsManager = nullptr; diff --git a/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h new file mode 100644 index 00000000000..d1ecfb00b07 --- /dev/null +++ b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h @@ -0,0 +1,148 @@ +#pragma once + +#include + +// Windows Header Files: +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include + +#include "DesktopNotification.h" + +using namespace Microsoft::WRL; +using namespace ABI::Windows::Data::Xml::Dom; + +typedef ABI::Windows::Foundation::ITypedEventHandler< + ABI::Windows::UI::Notifications::ToastNotification *, ::IInspectable *> + DesktopToastActivatedEventHandler; +typedef ABI::Windows::Foundation::ITypedEventHandler< + ABI::Windows::UI::Notifications::ToastNotification *, + ABI::Windows::UI::Notifications::ToastDismissedEventArgs *> + DesktopToastDismissedEventHandler; +typedef ABI::Windows::Foundation::ITypedEventHandler< + ABI::Windows::UI::Notifications::ToastNotification *, + ABI::Windows::UI::Notifications::ToastFailedEventArgs *> + DesktopToastFailedEventHandler; + +class DesktopNotificationsManager : public Microsoft::WRL::Implements +{ + friend class DesktopNotification; + +public: + DesktopNotificationsManager(const std::wstring &toastActivatorClsid, + Napi::Function &callback); + ~DesktopNotificationsManager(); + + const std::string getCurrentPermission(); + + HRESULT displayToast(const std::wstring &id, + const std::wstring &title, + const std::wstring &body, + const std::wstring &userInfo); + bool closeToast(const std::wstring &id); + + void handleActivatorEvent(const std::wstring &launchArgs); + + // DesktopToastActivatedEventHandler + IFACEMETHODIMP Invoke(_In_ ABI::Windows::UI::Notifications::IToastNotification *sender, + _In_ IInspectable *args); + + // DesktopToastDismissedEventHandler + IFACEMETHODIMP Invoke(_In_ ABI::Windows::UI::Notifications::IToastNotification *sender, + _In_ ABI::Windows::UI::Notifications::IToastDismissedEventArgs *e); + + // DesktopToastFailedEventHandler + IFACEMETHODIMP Invoke(_In_ ABI::Windows::UI::Notifications::IToastNotification *sender, + _In_ ABI::Windows::UI::Notifications::IToastFailedEventArgs *e); + + // IUnknown + IFACEMETHODIMP_(ULONG) + AddRef() + { + return InterlockedIncrement(&m_ref); + } + + IFACEMETHODIMP_(ULONG) + Release() + { + ULONG l = InterlockedDecrement(&m_ref); + if (l == 0) + { + delete this; + } + return l; + } + + IFACEMETHODIMP QueryInterface(_In_ REFIID riid, _COM_Outptr_ void **ppv) + { + if (IsEqualIID(riid, IID_IUnknown)) + { + *ppv = static_cast(static_cast(this)); + } + else if (IsEqualIID(riid, __uuidof(DesktopToastActivatedEventHandler))) + { + *ppv = static_cast(this); + } + else if (IsEqualIID(riid, __uuidof(DesktopToastDismissedEventHandler))) + { + *ppv = static_cast(this); + } + else if (IsEqualIID(riid, __uuidof(DesktopToastFailedEventHandler))) + { + *ppv = static_cast(this); + } + else + { + *ppv = nullptr; + } + + if (*ppv) + { + reinterpret_cast(*ppv)->AddRef(); + return S_OK; + } + + return E_NOINTERFACE; + } + +private: + Microsoft::WRL::ComPtr getHistory(); + + Microsoft::WRL::ComPtr m_toastManager; + + std::vector> m_desktopNotifications; + + void SignalObjectCountZero(); + HRESULT RegisterClassObjects(const std::wstring &toastActivatorClsid); + HRESULT UnregisterClassObjects(); + bool closeNotification(std::shared_ptr d); + void DesktopNotificationsManager::invokeJSCallback(const std::string &eventName, + const std::string ¬ificationID, + const std::wstring &userInfo); + + // Identifiers of registered class objects. Used for unregistration. + DWORD m_comCookies[1] = {0}; + const std::wstring m_toastActivatorClsid; + Napi::ThreadSafeFunction m_callback; + std::wstring m_appID; + ULONG m_ref; +}; + +extern std::shared_ptr desktopNotificationsManager; diff --git a/vendor/desktop-notifications/src/win/main_win.cc b/vendor/desktop-notifications/src/win/main_win.cc new file mode 100644 index 00000000000..fd3445c57e3 --- /dev/null +++ b/vendor/desktop-notifications/src/win/main_win.cc @@ -0,0 +1,195 @@ +// Windows.h strict mode +#define STRICT + +#include +#include "uv.h" + +#include +#include + +#include +#include +#include + +#include "DesktopNotificationsManager.h" +#include "Utils.h" + +using namespace Napi; + +namespace +{ + Napi::Value initializeNotifications(const Napi::CallbackInfo &info) + { + Napi::Env &env = info.Env(); + + if (desktopNotificationsManager) + { + return env.Undefined(); + } + + if (info.Length() < 2) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsFunction()) + { + Napi::TypeError::New(env, "Callback must be a function.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[1].IsObject()) + { + Napi::TypeError::New(env, "An object was expected for the second argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + auto callback = info[0].As(); + + Napi::Object options = info[1].As(); + if (!options.Has("toastActivatorClsid")) + { + Napi::TypeError::New(env, "The options object must have the \"toastActivatorClsid\" property.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + auto toastActivatorClsid = Utils::utf8ToWideChar(options.Get("toastActivatorClsid").As()); + + desktopNotificationsManager = std::make_shared(toastActivatorClsid, callback); + + return info.Env().Undefined(); + } + + Napi::Value terminateNotifications(const Napi::CallbackInfo &info) + { + desktopNotificationsManager = nullptr; + return info.Env().Undefined(); + } + + Napi::Value showNotification(const Napi::CallbackInfo &info) + { + Napi::Env &env = info.Env(); + + if (!desktopNotificationsManager) + { + DN_LOG_ERROR("Cannot show notification: notifications not initialized."); + return env.Undefined(); + } + + if (info.Length() < 3) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the first argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[1].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the second argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[2].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the third argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + auto id = Utils::utf8ToWideChar(info[0].As()); + auto title = Utils::utf8ToWideChar(info[1].As()); + auto body = Utils::utf8ToWideChar(info[2].As()); + auto userInfo = L""; + + if (info[3].IsObject()) + { + auto userInfoObject = info[3].As(); + auto userInfoString = Utils::JSONStringify(env, userInfoObject); + userInfo = Utils::utf8ToWideChar(userInfoString); + } + + desktopNotificationsManager->displayToast(id, title, body, userInfo); + + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + deferred.Resolve(env.Undefined()); + return deferred.Promise(); + } + + Napi::Value closeNotification(const Napi::CallbackInfo &info) + { + Napi::Env &env = info.Env(); + + if (!desktopNotificationsManager) + { + DN_LOG_ERROR("Cannot close notification: notifications not initialized."); + return env.Undefined(); + } + + if (info.Length() < 1) + { + Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + if (!info[0].IsString()) + { + Napi::TypeError::New(env, "A string was expected for the first argument, but wasn't received.").ThrowAsJavaScriptException(); + return env.Undefined(); + } + + auto id = Utils::utf8ToWideChar(info[0].As()); + + desktopNotificationsManager->closeToast(id); + + return env.Undefined(); + } + + Napi::Value getNotificationsPermission(const Napi::CallbackInfo &info) + { + Napi::Env &env = info.Env(); + + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + + if (!desktopNotificationsManager) + { + DN_LOG_ERROR("Cannot show notification: notifications not initialized."); + deferred.Resolve(Napi::String::New(env, "default")); + } + else + { + const std::string permission = desktopNotificationsManager->getCurrentPermission(); + deferred.Resolve(Napi::String::New(env, permission)); + } + + return deferred.Promise(); + } + + Napi::Value requestNotificationsPermission(const Napi::CallbackInfo &info) + { + Napi::Env &env = info.Env(); + + // Do nothing. There is no way of requesting permission on Windows. + Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); + deferred.Resolve(Napi::Boolean::New(env, true)); + return deferred.Promise(); + } + + Napi::Object Init(Napi::Env env, Napi::Object exports) + { + exports.Set(Napi::String::New(env, "initializeNotifications"), Napi::Function::New(env, initializeNotifications)); + exports.Set(Napi::String::New(env, "terminateNotifications"), Napi::Function::New(env, terminateNotifications)); + exports.Set(Napi::String::New(env, "showNotification"), Napi::Function::New(env, showNotification)); + exports.Set(Napi::String::New(env, "closeNotification"), Napi::Function::New(env, closeNotification)); + exports.Set(Napi::String::New(env, "getNotificationsPermission"), Napi::Function::New(env, getNotificationsPermission)); + exports.Set(Napi::String::New(env, "requestNotificationsPermission"), Napi::Function::New(env, requestNotificationsPermission)); + + return exports; + } +} + +NODE_API_MODULE(desktopNotificationsNativeModule, Init); diff --git a/vendor/desktop-notifications/src/win/utils.cpp b/vendor/desktop-notifications/src/win/utils.cpp new file mode 100644 index 00000000000..94808cfe572 --- /dev/null +++ b/vendor/desktop-notifications/src/win/utils.cpp @@ -0,0 +1,151 @@ +#include "Utils.h" +#include "DesktopNotificationsManager.h" + +#include +#include +#include +#include + +using namespace Microsoft::WRL; + +namespace Utils +{ + LPWSTR Utils::utf8ToWideChar(std::string utf8) + { + int wide_char_length = MultiByteToWideChar(CP_UTF8, + 0, + utf8.c_str(), + -1, + nullptr, + 0); + if (wide_char_length == 0) + { + return nullptr; + } + + LPWSTR result = new WCHAR[wide_char_length]; + if (MultiByteToWideChar(CP_UTF8, + 0, + utf8.c_str(), + -1, + result, + wide_char_length) == 0) + { + delete[] result; + return nullptr; + } + + return result; + } + + std::string Utils::wideCharToUTF8(std::wstring wstr) + { + if (wstr.empty()) + { + return std::string(); + } + int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL); + std::string strTo(size_needed, 0); + WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &strTo[0], size_needed, NULL, NULL); + return strTo; + } + + std::unordered_map splitData(const std::wstring &data) + { + std::unordered_map out; + size_t start = 0; + for (size_t end = data.find(L";", start); end != std::wstring::npos; + start = end + 1, end = data.find(L";", start)) + { + if (start == end) + { + end = data.size(); + } + const std::wstring tmp(data.data() + start, end - start); + const auto pos = tmp.find(L"="); + if (pos > 0) + { + out[tmp.substr(0, pos)] = tmp.substr(pos + 1); + } + } + return out; + } + + std::wstring formatLaunchArgs(const std::wstring ¬ificationID, const std::wstring &userInfo) + { + std::wstringstream out; + out << notificationID << L";" << userInfo; + return out.str(); + } + + std::string parseNotificationID(const std::wstring &launchArgs) + { + std::wstringstream out; + size_t end = launchArgs.find(L";"); + if (end == std::wstring::npos) + { + return ""; + } + + return wideCharToUTF8(launchArgs.substr(0, end)); + } + + std::wstring parseUserInfo(const std::wstring &launchArgs) + { + std::wstringstream out; + size_t start = launchArgs.find(L";"); + if (start == std::wstring::npos) + { + return L""; + } + + return launchArgs.substr(start + 1); + } + + std::wstring formatWinError(unsigned long errorCode) + { + wchar_t *error = nullptr; + size_t len = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + nullptr, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + reinterpret_cast(&error), 0, nullptr); + const auto out = std::wstring(error, len); + LocalFree(error); + return out; + } + + Napi::String JSONStringify(const Napi::Env &env, const Napi::Object &object) + { + Napi::Object json = env.Global().Get("JSON").As(); + Napi::Function stringify = json.Get("stringify").As(); + Napi::String result = Napi::String::New(env, ""); + + try + { + result = stringify.Call(json, {object}).As(); + } + catch (...) + { + DN_LOG_ERROR("Failed to stringify JSON object"); + } + + return result; + } + + Napi::Value JSONParse(const Napi::Env &env, const Napi::String &string) + { + Napi::Object json = env.Global().Get("JSON").As(); + Napi::Function parse = json.Get("parse").As(); + Napi::Value result = env.Undefined(); + + try + { + result = parse.Call(json, {string}).As(); + } + catch (...) + { + DN_LOG_ERROR("Failed to parse JSON"); + } + + return result; + } +} diff --git a/vendor/desktop-notifications/src/win/utils.h b/vendor/desktop-notifications/src/win/utils.h new file mode 100644 index 00000000000..37d2ceae1a8 --- /dev/null +++ b/vendor/desktop-notifications/src/win/utils.h @@ -0,0 +1,57 @@ +#pragma once + +#include +#include +#include +#include +#include + +#define DN_LOG(stream, level, msg) stream << L"[desktop-notifications] [" << level << L"] " << msg << std::endl + +#define DN_LOG_VERBOSE(msg) DN_LOG(std::wcout, "verbose", msg) +#define DN_LOG_INFO(msg) DN_LOG(std::wcout, "info", msg) +#define DN_LOG_DEBUG(msg) DN_LOG(std::wcout, "debug", msg) +#define DN_LOG_WARN(msg) DN_LOG(std::wcout, "warning", msg) +#define DN_LOG_ERROR(msg) DN_LOG(std::wcerr, "error", msg) + +namespace Utils +{ + LPWSTR utf8ToWideChar(std::string utf8); + std::string wideCharToUTF8(std::wstring wstr); + + std::unordered_map splitData(const std::wstring &data); + + // Formats the launch args like this: ; + std::wstring formatLaunchArgs(const std::wstring ¬ificationID, const std::wstring &userInfo); + std::string parseNotificationID(const std::wstring &launchArgs); + std::wstring parseUserInfo(const std::wstring &launchArgs); + + inline bool checkResult(const char *file, const long line, const char *func, const HRESULT &hr) + { + if (FAILED(hr)) + { + DN_LOG_ERROR(file << line << func << L":\n\t\t\t" << hr); + return false; + } + return true; + } + + std::wstring formatWinError(unsigned long errorCode); + + Napi::String JSONStringify(const Napi::Env &env, const Napi::Object &object); + Napi::Value JSONParse(const Napi::Env &env, const Napi::String &string); +}; + +#define DN_GROUP_NAME L"desktop-notifications" + +#define DN_CHECK_RESULT(hr) Utils::checkResult(__FILE__, __LINE__, __FUNCSIG__, hr) + +#define DN_RETURN_ON_ERROR(hr) \ + do \ + { \ + HRESULT _tmp = hr; \ + if (!DN_CHECK_RESULT(_tmp)) \ + { \ + return _tmp; \ + } \ + } while (false) diff --git a/vendor/desktop-notifications/tsconfig.json b/vendor/desktop-notifications/tsconfig.json new file mode 100644 index 00000000000..1ec3235fa68 --- /dev/null +++ b/vendor/desktop-notifications/tsconfig.json @@ -0,0 +1,21 @@ +{ + "compilerOptions": { + "module": "commonjs", + "moduleResolution": "node", + "target": "es6", + "noImplicitAny": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noFallthroughCasesInSwitch": true, + "noUnusedLocals": true, + "strict": true, + "sourceMap": true, + "outDir": "./dist", + "declaration": true, + "types": ["node"], + "typeRoots": ["./node_modules/@types"] + }, + "exclude": ["node_modules", "build"], + "include": ["lib/**/*.ts", "test/**/*.ts"], + "compileOnSave": false +} diff --git a/vendor/desktop-notifications/yarn.lock b/vendor/desktop-notifications/yarn.lock new file mode 100644 index 00000000000..f153f0e2ea9 --- /dev/null +++ b/vendor/desktop-notifications/yarn.lock @@ -0,0 +1,5669 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" + integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== + dependencies: + "@babel/highlight" "^7.0.0" + +"@babel/code-frame@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/core@^7.1.0": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687" + integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/generator" "^7.2.2" + "@babel/helpers" "^7.2.0" + "@babel/parser" "^7.2.2" + "@babel/template" "^7.2.2" + "@babel/traverse" "^7.2.2" + "@babel/types" "^7.2.2" + convert-source-map "^1.1.0" + debug "^4.1.0" + json5 "^2.1.0" + lodash "^4.17.10" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/core@^7.7.5": + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651" + integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.11.6" + "@babel/helper-module-transforms" "^7.11.0" + "@babel/helpers" "^7.10.4" + "@babel/parser" "^7.11.5" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.11.5" + "@babel/types" "^7.11.5" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.11.5", "@babel/generator@^7.11.6": + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620" + integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA== + dependencies: + "@babel/types" "^7.11.5" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/generator@^7.2.2": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb" + integrity sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg== + dependencies: + "@babel/types" "^7.3.0" + jsesc "^2.5.1" + lodash "^4.17.10" + source-map "^0.5.0" + trim-right "^1.0.1" + +"@babel/helper-function-name@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" + integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== + dependencies: + "@babel/helper-get-function-arity" "^7.0.0" + "@babel/template" "^7.1.0" + "@babel/types" "^7.0.0" + +"@babel/helper-function-name@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-get-function-arity@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" + integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-get-function-arity@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" + integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-member-expression-to-functions@^7.10.4": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" + integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-module-imports@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620" + integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-module-transforms@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" + integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-replace-supers" "^7.10.4" + "@babel/helper-simple-access" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/template" "^7.10.4" + "@babel/types" "^7.11.0" + lodash "^4.17.19" + +"@babel/helper-optimise-call-expression@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" + integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-plugin-utils@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" + integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== + +"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + +"@babel/helper-replace-supers@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf" + integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.10.4" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-simple-access@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461" + integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw== + dependencies: + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-split-export-declaration@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813" + integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag== + dependencies: + "@babel/types" "^7.0.0" + +"@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + +"@babel/helpers@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044" + integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA== + dependencies: + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helpers@^7.2.0": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9" + integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA== + dependencies: + "@babel/template" "^7.1.2" + "@babel/traverse" "^7.1.5" + "@babel/types" "^7.3.0" + +"@babel/highlight@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" + integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^4.0.0" + +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.1.0": + version "7.3.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c" + integrity sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ== + +"@babel/parser@^7.10.4", "@babel/parser@^7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" + integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== + +"@babel/parser@^7.2.2", "@babel/parser@^7.2.3": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" + integrity sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA== + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" + integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" + integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.2.2" + "@babel/types" "^7.2.2" + +"@babel/template@^7.10.4", "@babel/template@^7.3.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" + integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" + integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/generator" "^7.2.2" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.0.0" + "@babel/parser" "^7.2.3" + "@babel/types" "^7.2.2" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.10" + +"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" + integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.11.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + +"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0" + integrity sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw== + dependencies: + esutils "^2.0.2" + lodash "^4.17.10" + to-fast-properties "^2.0.0" + +"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.3": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" + integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@cnakazawa/watch@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" + integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA== + dependencies: + exec-sh "^0.3.2" + minimist "^1.2.0" + +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" + integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w== + dependencies: + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^26.3.0" + jest-util "^26.3.0" + slash "^3.0.0" + +"@jest/core@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc" + integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg== + dependencies: + "@jest/console" "^26.3.0" + "@jest/reporters" "^26.4.1" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-changed-files "^26.3.0" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-resolve-dependencies "^26.4.2" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" + jest-watcher "^26.3.0" + micromatch "^4.0.2" + p-each-series "^2.1.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" + integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA== + dependencies: + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + +"@jest/fake-timers@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" + integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A== + dependencies: + "@jest/types" "^26.3.0" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" + jest-util "^26.3.0" + +"@jest/globals@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" + integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow== + dependencies: + "@jest/environment" "^26.3.0" + "@jest/types" "^26.3.0" + expect "^26.4.2" + +"@jest/reporters@^26.4.1": + version "26.4.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795" + integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.4" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.3" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.2" + jest-haste-map "^26.3.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-worker "^26.3.0" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^5.0.1" + optionalDependencies: + node-notifier "^8.0.0" + +"@jest/source-map@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" + integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.4" + source-map "^0.6.0" + +"@jest/test-result@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" + integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg== + dependencies: + "@jest/console" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" + integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog== + dependencies: + "@jest/test-result" "^26.3.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.3.0" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" + +"@jest/transform@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" + integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^26.3.0" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.3.0" + jest-regex-util "^26.0.0" + jest-util "^26.3.0" + micromatch "^4.0.2" + pirates "^4.0.1" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^25.5.0": + version "25.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" + integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + +"@jest/types@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" + integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + +"@npmcli/agent@^2.0.0": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" + integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== + dependencies: + agent-base "^7.1.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.1" + lru-cache "^10.0.1" + socks-proxy-agent "^8.0.3" + +"@npmcli/fs@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" + integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== + dependencies: + semver "^7.3.5" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@sinonjs/commons@^1.7.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" + integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": + version "7.1.9" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d" + integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" + integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307" + integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2" + integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw== + dependencies: + "@babel/types" "^7.3.0" + +"@types/benchmark@^1.0.31": + version "1.0.31" + resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-1.0.31.tgz#2dd3514e93396f362ba5551a7c9ff0da405c1d38" + +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + +"@types/graceful-fs@^4.1.2": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" + integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ== + dependencies: + "@types/node" "*" + +"@types/istanbul-lib-coverage@*": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" + integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== + +"@types/istanbul-lib-coverage@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85" + integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg== + +"@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + +"@types/istanbul-lib-report@*": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" + integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" + integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== + dependencies: + "@types/istanbul-lib-coverage" "*" + "@types/istanbul-lib-report" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/jest@^26.0.13": + version "26.0.13" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e" + integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" + +"@types/node@*": + version "14.6.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a" + integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ== + +"@types/node@^12.0.0": + version "12.6.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.2.tgz#a5ccec6abb6060d5f20d256fb03ed743e9774999" + integrity sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ== + +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + +"@types/prettier@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.0.tgz#5f96562c1075ee715a5b138f0b7f591c1f40f6b8" + integrity sha512-hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA== + +"@types/stack-utils@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" + integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== + +"@types/uuid@^8.3.4": + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== + +"@types/yargs-parser@*": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" + integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + +"@types/yargs@^15.0.0": + version "15.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" + integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== + dependencies: + "@types/yargs-parser" "*" + +abab@^2.0.3, abab@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +acorn@^8.2.4: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + +after@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agent-base@^7.1.0, agent-base@^7.1.2: + version "7.1.3" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" + integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + +ansi-escapes@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + dependencies: + type-fest "^0.11.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-regex@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654" + integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +anymatch@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.0.0: + version "1.0.6" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" + integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.0 || ^1.1.13" + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +arg@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-index@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" + integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= + dependencies: + debug "^2.2.0" + es6-symbol "^3.0.2" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +atob@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== + +babel-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" + integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g== + dependencies: + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.3.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" + +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^4.0.0" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" + integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-preset-current-node-syntax@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" + integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +babel-preset-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" + integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw== + dependencies: + babel-plugin-jest-hoist "^26.2.0" + babel-preset-current-node-syntax "^0.1.3" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base64-js@^1.0.2: + version "1.3.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +benchmark@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629" + dependencies: + lodash "^4.17.4" + platform "^1.3.3" + +big-integer@^1.6.17: + version "1.6.41" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.41.tgz#6fb0e51bc8661129ef3832d46c939170b81ca794" + integrity sha512-d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w== + +binary@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" + integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + dependencies: + buffers "~0.1.1" + chainsaw "~0.1.0" + +bl@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" + integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bl@~1.2.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" + integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + dependencies: + inherits "~2.0.0" + +bluebird@^3: + version "3.5.5" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" + integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== + +bluebird@~3.4.1: + version "3.4.7" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +bser@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" + integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= + dependencies: + node-int64 "^0.4.0" + +buffer-from@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" + integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + +buffer-indexof-polyfill@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf" + integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8= + +buffer-shims@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" + integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= + +buffer@^5.5.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786" + integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + +buffers@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" + integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + +cacache@^18.0.0: + version "18.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5" + integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^10.0.1" + minipass "^7.0.3" + minipass-collect "^2.0.1" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + p-map "^4.0.0" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.0.0" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +callsites@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" + integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== + +camelcase@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + +camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e" + integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w== + +capture-exit@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" + integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28= + dependencies: + rsvp "^3.3.3" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chainsaw@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" + integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + dependencies: + traverse ">=0.3.0 <0.4" + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + +chownr@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" + integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cliui@^3.0.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + +cmake-js@~5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" + integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== + dependencies: + bluebird "^3" + debug "^4" + fs-extra "^5.0.0" + is-iojs "^1.0.1" + lodash "^4" + memory-stream "0" + npmlog "^1.2.0" + rc "^1.2.7" + request "^2.54.0" + semver "^5.0.3" + splitargs "0" + tar "^4" + traceur "0.0.x" + unzipper "^0.8.13" + url-join "0" + which "^1.0.9" + yargs "^3.6.0" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" + integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w== + dependencies: + delayed-stream "~1.0.0" + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@2.9.x: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^2.9.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" + integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== + +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +convert-source-map@^1.1.0, convert-source-map@^1.4.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" + integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== + dependencies: + safe-buffer "~5.1.1" + +convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +cross-spawn@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +d@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" + integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8= + dependencies: + es5-ext "^0.10.9" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + +debug@4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4, debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +debug@^4.3.4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== + dependencies: + ms "^2.1.3" + +decamelize@^1.1.1, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-libc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" + integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== + +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + +diff-sequences@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" + integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== + +diff-sequences@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2" + integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig== + +diff@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" + integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + +duplexer2@~0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= + dependencies: + readable-stream "~1.1.9" + +duplexer2@~0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + +each-series-async@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" + integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== + +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +emittery@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" + integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +end-of-stream@^1.1.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" + integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + dependencies: + once "^1.4.0" + +end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.47" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11" + integrity sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw== + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.1" + next-tick "1" + +es6-iterator@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" + integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc= + dependencies: + d "1" + es5-ext "~0.10.14" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +exec-sh@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" + integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" + integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +execspawn@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" + integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= + dependencies: + util-extend "^1.0.1" + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +expect@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" + integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA== + dependencies: + "@jest/types" "^26.3.0" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-regex-util "^26.0.0" + +exponential-backoff@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91" + integrity sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA== + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fb-watchman@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" + integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= + dependencies: + bser "^2.0.0" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.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" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +foreground-child@^3.1.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f" + integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw== + dependencies: + cross-spawn "^7.0.6" + signal-exit "^4.0.1" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-minipass@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ== + dependencies: + minipass "^2.2.1" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs-minipass@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" + integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw== + dependencies: + minipass "^7.0.3" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + +fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +gauge@~1.2.0, gauge@~1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" + integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= + dependencies: + ansi "^0.3.0" + has-unicode "^2.0.0" + lodash.pad "^4.1.0" + lodash.padend "^4.1.0" + lodash.padstart "^4.1.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +gensync@^1.0.0-beta.1: + version "1.0.0-beta.1" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" + integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +ghreleases@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" + integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== + dependencies: + after "~0.8.1" + ghrepos "~2.1.0" + ghutils "~3.2.0" + lodash.uniq "^4.5.0" + simple-mime "~0.1.0" + url-template "~2.0.6" + +ghrepos@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" + integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== + dependencies: + ghutils "~3.2.0" + +ghutils@~3.2.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" + integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== + dependencies: + jsonist "~2.1.0" + xtend "~4.0.1" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + +"glob@3 || 4 || 5 || 6 || 7", glob@^7.0.3, glob@^7.1.1, glob@^7.1.2: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@5.0.x: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^10.2.2, glob@^10.3.10: + version "10.4.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" + integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + package-json-from-dist "^1.0.0" + path-scurry "^1.11.1" + +glob@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.4, glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" + integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ== + +graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.1.15" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== + +graceful-fs@^4.2.2, graceful-fs@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +graceful-fs@^4.2.6: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +http-cache-semantics@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http-proxy-agent@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" + integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== + dependencies: + agent-base "^7.1.0" + debug "^4.3.4" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +https-proxy-agent@^7.0.1: + version "7.0.6" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" + integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== + dependencies: + agent-base "^7.1.2" + debug "4" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +hyperquest@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" + integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== + dependencies: + buffer-from "^0.1.1" + duplexer2 "~0.0.2" + through2 "~0.6.3" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.4: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +inherits@^2.0.3, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + +ip-address@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" + integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== + dependencies: + jsbn "1.1.0" + sprintf-js "^1.1.3" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-docker@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" + integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-fn@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e" + integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g== + +is-iojs@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" + integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + +is-typedarray@^1.0.0, is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isexe@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" + integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + +jackspeak@^3.1.2: + version "3.4.3" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a" + integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + +jest-changed-files@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1" + integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g== + dependencies: + "@jest/types" "^26.3.0" + execa "^4.0.0" + throat "^5.0.0" + +jest-cli@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da" + integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw== + dependencies: + "@jest/core" "^26.4.2" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + import-local "^3.0.2" + is-ci "^2.0.0" + jest-config "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" + prompts "^2.0.1" + yargs "^15.3.1" + +jest-config@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" + integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^26.4.2" + "@jest/types" "^26.3.0" + babel-jest "^26.3.0" + chalk "^4.0.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.4" + jest-environment-jsdom "^26.3.0" + jest-environment-node "^26.3.0" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.4.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-validate "^26.4.2" + micromatch "^4.0.2" + pretty-format "^26.4.2" + +jest-diff@^25.2.1: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" + integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== + dependencies: + chalk "^3.0.0" + diff-sequences "^25.2.6" + jest-get-type "^25.2.6" + pretty-format "^25.5.0" + +jest-diff@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" + integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.3.0" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" + +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== + dependencies: + detect-newline "^3.0.0" + +jest-each@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" + integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA== + dependencies: + "@jest/types" "^26.3.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + jest-util "^26.3.0" + pretty-format "^26.4.2" + +jest-environment-jsdom@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" + integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA== + dependencies: + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" + jsdom "^16.2.2" + +jest-environment-node@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" + integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw== + dependencies: + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" + +jest-get-type@^25.2.6: + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" + integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== + +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== + +jest-haste-map@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" + integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA== + dependencies: + "@jest/types" "^26.3.0" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + jest-regex-util "^26.0.0" + jest-serializer "^26.3.0" + jest-util "^26.3.0" + jest-worker "^26.3.0" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" + integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^26.3.0" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^26.4.2" + is-generator-fn "^2.0.0" + jest-each "^26.4.2" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + pretty-format "^26.4.2" + throat "^5.0.0" + +jest-leak-detector@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" + integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA== + dependencies: + jest-get-type "^26.3.0" + pretty-format "^26.4.2" + +jest-matcher-utils@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" + integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q== + dependencies: + chalk "^4.0.0" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" + +jest-message-util@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" + integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/types" "^26.3.0" + "@types/stack-utils" "^1.0.1" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + slash "^3.0.0" + stack-utils "^2.0.2" + +jest-mock@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" + integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q== + dependencies: + "@jest/types" "^26.3.0" + "@types/node" "*" + +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== + +jest-resolve-dependencies@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5" + integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ== + dependencies: + "@jest/types" "^26.3.0" + jest-regex-util "^26.0.0" + jest-snapshot "^26.4.2" + +jest-resolve@^26.4.0: + version "26.4.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" + integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg== + dependencies: + "@jest/types" "^26.3.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + jest-pnp-resolver "^1.2.2" + jest-util "^26.3.0" + read-pkg-up "^7.0.1" + resolve "^1.17.0" + slash "^3.0.0" + +jest-runner@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" + integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g== + dependencies: + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.7.1" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-config "^26.4.2" + jest-docblock "^26.0.0" + jest-haste-map "^26.3.0" + jest-leak-detector "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" + jest-runtime "^26.4.2" + jest-util "^26.3.0" + jest-worker "^26.3.0" + source-map-support "^0.5.6" + throat "^5.0.0" + +jest-runtime@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" + integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ== + dependencies: + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/globals" "^26.4.2" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.4" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.3.1" + +jest-serializer@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" + integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" + +jest-snapshot@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" + integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg== + dependencies: + "@babel/types" "^7.0.0" + "@jest/types" "^26.3.0" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.4.2" + graceful-fs "^4.2.4" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" + natural-compare "^1.4.0" + pretty-format "^26.4.2" + semver "^7.3.2" + +jest-util@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" + integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== + dependencies: + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + +jest-validate@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" + integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ== + dependencies: + "@jest/types" "^26.3.0" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + leven "^3.1.0" + pretty-format "^26.4.2" + +jest-watcher@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08" + integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ== + dependencies: + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^26.3.0" + string-length "^4.0.1" + +jest-worker@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" + integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" + integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== + dependencies: + "@jest/core" "^26.4.2" + import-local "^3.0.2" + jest-cli "^26.4.2" + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsdom@^16.2.2: + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== + dependencies: + abab "^2.0.5" + acorn "^8.2.4" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.3.0" + data-urls "^2.0.0" + decimal.js "^10.2.1" + domexception "^2.0.1" + escodegen "^2.0.0" + form-data "^3.0.0" + html-encoding-sniffer "^2.0.1" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "6.0.1" + saxes "^5.0.1" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.5.0" + ws "^7.4.6" + xml-name-validator "^3.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" + integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== + dependencies: + minimist "^1.2.0" + +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonist@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.0.tgz#4477a4d16cd377faec58d8cf870b7e392f6d7fe9" + integrity sha1-RHek0WzTd/rsWNjPhwt+OS9tf+k= + dependencies: + bl "~1.2.0" + hyperquest "~2.1.2" + json-stringify-safe "~5.0.1" + xtend "~4.0.1" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +kleur@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62" + integrity sha512-P3kRv+B+Ra070ng2VKQqW4qW7gd/v3iD8sy/zOdcYRsfiD+QBokQNOps/AfP6Hr48cBhIIBFWckB9aO+IZhrWg== + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + dependencies: + invert-kv "^1.0.0" + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +listenercount@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" + integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.pad@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" + integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= + +lodash.padend@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" + integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= + +lodash.padstart@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" + integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4, lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lru-cache@^10.0.1, lru-cache@^10.2.0: + version "10.4.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" + integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-error@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96" + +make-fetch-happen@^13.0.0: + version "13.0.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" + integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== + dependencies: + "@npmcli/agent" "^2.0.0" + cacache "^18.0.0" + http-cache-semantics "^4.1.1" + is-lambda "^1.0.1" + minipass "^7.0.2" + minipass-fetch "^3.0.0" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + proc-log "^4.2.0" + promise-retry "^2.0.1" + ssri "^10.0.0" + +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +memory-stream@0: + version "0.0.3" + resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" + integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= + dependencies: + readable-stream "~1.0.26-2" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-db@~1.37.0: + version "1.37.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" + integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime-types@~2.1.19: + version "2.1.21" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" + integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg== + dependencies: + mime-db "~1.37.0" + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +"minimatch@2 || 3", minimatch@3, minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^9.0.4: + version "9.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" + integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== + dependencies: + brace-expansion "^2.0.1" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + +minimist@^1.1.1, minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minipass-collect@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" + integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw== + dependencies: + minipass "^7.0.3" + +minipass-fetch@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" + integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== + dependencies: + minipass "^7.0.3" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^2.2.1, minipass@^2.3.4: + version "2.3.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" + integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minipass@^3.0.0: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== + +minizlib@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== + dependencies: + minipass "^2.2.1" + +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +napi-build-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508" + integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +negotiator@^0.6.3: + version "0.6.4" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + +next-tick@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" + integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-abi@^3.0.0, node-abi@^3.3.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz#ed980f6dbb6db9ff3b31aeb27d43cd9b096f6e9e" + integrity sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ== + dependencies: + semver "^7.3.5" + +node-addon-api@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" + integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== + +node-gyp@^10.1.0: + version "10.3.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.3.1.tgz#1dd1a1a1c6c5c59da1a76aea06a062786b2c8a1a" + integrity sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^10.3.10" + graceful-fs "^4.2.6" + make-fetch-happen "^13.0.0" + nopt "^7.0.0" + proc-log "^4.1.0" + semver "^7.3.5" + tar "^6.2.1" + which "^4.0.0" + +node-gyp@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" + integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.1.2" + request "^2.88.0" + rimraf "^2.6.3" + semver "^5.7.1" + tar "^4.4.12" + which "^1.3.1" + +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + +node-ninja@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" + integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= + dependencies: + fstream "^1.0.0" + glob "3 || 4 || 5 || 6 || 7" + graceful-fs "^4.1.2" + minimatch "3" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2" + osenv "0" + path-array "^1.0.0" + request "2" + rimraf "2" + semver "2.x || 3.x || 4 || 5" + tar "^2.0.0" + which "1" + +node-notifier@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" + integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + dependencies: + growly "^1.3.0" + is-wsl "^2.2.0" + semver "^7.3.2" + shellwords "^0.1.1" + uuid "^8.3.0" + which "^2.0.2" + +noop-logger@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + dependencies: + abbrev "1" + osenv "^0.1.4" + +nopt@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== + dependencies: + abbrev "^2.0.0" + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-path@^2.0.2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" + integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== + dependencies: + which "^1.2.10" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npm-which@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" + integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= + dependencies: + commander "^2.9.0" + npm-path "^2.0.2" + which "^1.2.10" + +"npmlog@0 || 1 || 2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= + dependencies: + ansi "~0.3.1" + are-we-there-yet "~1.1.2" + gauge "~1.2.5" + +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +npmlog@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" + integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= + dependencies: + ansi "~0.3.0" + are-we-there-yet "~1.0.0" + gauge "~1.2.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +nw-gyp@^3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.3.tgz#3ee9c7973a80e44163b3b47d0cfb734192dc8c2c" + integrity sha512-EpzoqMs7ZnRpjzNMGozuQT+1lp+mUNg5nkPlTelo+LXUyqAMnPJ48kNy3KNpaTMmI9G+9XrOCEEaRDGlIsDq7Q== + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + dependencies: + lcid "^1.0.0" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +osenv@0, osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-each-series@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" + integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-try@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" + integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== + +package-json-from-dist@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" + integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== + +parse-json@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-array@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" + integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= + dependencies: + array-index "^1.0.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-scurry@^1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.0.4, picomatch@^2.0.5: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +pirates@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" + integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== + dependencies: + node-modules-regexp "^1.0.0" + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +platform@^1.3.3: + version "1.3.4" + resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +prebuild-install@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" + integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prebuild@^11.0.2: + version "11.0.2" + resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-11.0.2.tgz#e8c277c25b972dd35a746cf900c03096b090da56" + integrity sha512-r4LIdJJRyinhijoqERq9ySOeJwt8qSR3Upd8mt+l7pWUDHWSzpZ2d/nTkIaNgrrV4VBMBR8+EVZ3YGlZ0sHBvw== + dependencies: + cmake-js "~5.2.0" + detect-libc "^2.0.0" + each-series-async "^1.0.1" + execspawn "^1.0.1" + ghreleases "^3.0.2" + github-from-package "0.0.0" + glob "^7.1.6" + minimist "^1.1.2" + mkdirp "^0.5.1" + napi-build-utils "^1.0.1" + node-abi "^3.0.0" + node-gyp "^6.0.1" + node-ninja "^1.0.1" + noop-logger "^0.1.0" + npm-which "^3.0.1" + npmlog "^4.0.1" + nw-gyp "^3.6.3" + rc "^1.0.3" + run-waterfall "^1.1.6" + tar-stream "^2.1.0" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + +prettier@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" + integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== + +pretty-format@^25.2.1, pretty-format@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" + integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== + dependencies: + "@jest/types" "^25.5.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" + +pretty-format@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237" + integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA== + dependencies: + "@jest/types" "^26.3.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" + +proc-log@^4.1.0, proc-log@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" + integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +prompts@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c" + integrity sha512-8lnEOSIGQbgbnO47+13S+H204L8ISogGulyi0/NNEFAQ9D1VMNTrJ9SBX2Ra03V4iPn/zt36HQMndRYkaPoWiQ== + dependencies: + kleur "^3.0.0" + sisteransi "^1.0.0" + +psl@^1.1.28: + version "1.1.31" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw== + +psl@^1.1.33: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +rc@^1.0.3, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^16.12.0: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@~2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" + integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= + dependencies: + buffer-shims "^1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request@2, request@^2.54.0, request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.10.0, resolve@^1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + +resolve@^1.3.2: + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== + dependencies: + path-parse "^1.0.6" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +rimraf@2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rsvp@^3.0.13, rsvp@^3.3.3: + version "3.6.2" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" + integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== + +run-waterfall@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.6.tgz#3aebfeb60155539bf1ff4a30b66706ae77df9f74" + integrity sha512-dApPbpIK0hbFi2zqfJxrsnfmJW2HCQHFrSsmqF3Fp9TKm5WVf++zE6BSw0hPcA7rPapO37h12Swk2E6Va3tF7Q== + +safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sane@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181" + integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^2.0.0" + capture-exit "^1.2.0" + exec-sh "^0.3.2" + execa "^1.0.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + +saxes@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.5.0, semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^4.3.3: + version "4.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= + +semver@^6.0.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.2: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setimmediate@~1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + +simple-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" + integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-mime@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" + integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= + +sisteransi@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" + integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +socks-proxy-agent@^8.0.3: + version "8.0.5" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee" + integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw== + dependencies: + agent-base "^7.1.2" + debug "^4.3.4" + socks "^2.8.3" + +socks@^2.8.3: + version "2.8.4" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.4.tgz#07109755cdd4da03269bda4725baa061ab56d5cc" + integrity sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ== + dependencies: + ip-address "^9.0.5" + smart-buffer "^4.2.0" + +source-map-resolve@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" + integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + dependencies: + atob "^2.1.1" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.5.17: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@^0.5.6: + version "0.5.9" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.2.8: + version "0.2.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" + integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= + dependencies: + source-map "0.1.32" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@0.1.32: + version "0.1.32" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" + integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +spdx-correct@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" + integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e" + integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g== + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +splitargs@0: + version "0.0.7" + resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" + integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= + +sprintf-js@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +ssri@^10.0.0: + version "10.0.6" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" + integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== + dependencies: + minipass "^7.0.3" + +stack-utils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" + integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg== + dependencies: + escape-string-regexp "^2.0.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + +"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@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", 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@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +tar-fs@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5" + integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.0.0" + +tar-stream@^2.0.0, tar-stream@^2.1.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" + integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== + dependencies: + bl "^4.0.1" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tar@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== + dependencies: + block-stream "*" + fstream "^1.0.12" + inherits "2" + +tar@^4: + version "4.4.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" + integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.4" + minizlib "^1.1.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + +tar@^4.4.12: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + +tar@^6.1.11, tar@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== + +through2@~0.6.3: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + dependencies: + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" + +tmpl@1.0.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.1.2" + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== + dependencies: + punycode "^2.1.1" + +traceur@0.0.x: + version "0.0.111" + resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" + integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= + dependencies: + commander "2.9.x" + glob "5.0.x" + rsvp "^3.0.13" + semver "^4.3.3" + source-map-support "~0.2.8" + +"traverse@>=0.3.0 <0.4": + version "0.3.9" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" + integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= + +ts-node@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== + dependencies: + arg "^4.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typescript@^3.9.0: + version "3.9.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== + dependencies: + unique-slug "^4.0.0" + +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== + dependencies: + imurmurhash "^0.1.4" + +universalify@^0.1.0, universalify@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unzipper@^0.8.13: + version "0.8.14" + resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" + integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== + dependencies: + big-integer "^1.6.17" + binary "~0.3.0" + bluebird "~3.4.1" + buffer-indexof-polyfill "~1.0.0" + duplexer2 "~0.1.4" + fstream "~1.0.10" + listenercount "~1.0.1" + readable-stream "~2.1.5" + setimmediate "~1.0.4" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +url-join@0: + version "0.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" + integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= + +url-template@~2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" + integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util-extend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" + integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= + +uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== + +uuid@^8.3.0, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8-to-istanbul@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5" + integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walker@^1.0.7, walker@~1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== + dependencies: + lodash "^4.7.0" + tr46 "^2.1.0" + webidl-conversions "^6.1.0" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@1, which@^1.0.9, which@^1.2.10, which@^1.2.9, which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +which@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a" + integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg== + dependencies: + isexe "^3.1.1" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +window-size@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + +word-wrap@~1.2.3: + version "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== + +"wrap-ansi-cjs@npm: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@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + 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" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^7.4.6: + version "7.5.8" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a" + integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= + +y18n@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== + +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + +yallist@^3.0.0, yallist@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== + +yallist@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs@^15.3.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^3.6.0: + version "3.32.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + dependencies: + camelcase "^2.0.1" + cliui "^3.0.3" + decamelize "^1.1.1" + os-locale "^1.4.0" + string-width "^1.0.1" + window-size "^0.1.4" + y18n "^3.2.0" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== From 37005913d966c2fc90888b6a2644ed54a47d5368 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 10:51:41 +0100 Subject: [PATCH 0213/1338] Remove prebuild stuff from desktop-notifications --- app/yarn.lock | 1 - vendor/desktop-notifications/package.json | 21 +- .../script/download-node-lib-win-arm64.ps1 | 36 - vendor/desktop-notifications/script/upload.js | 14 - vendor/desktop-notifications/yarn.lock | 1517 +---------------- 5 files changed, 32 insertions(+), 1557 deletions(-) delete mode 100644 vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 delete mode 100644 vendor/desktop-notifications/script/upload.js diff --git a/app/yarn.lock b/app/yarn.lock index 2239bb4452a..ddbf49d2723 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -323,7 +323,6 @@ delegates@^1.0.0: version "0.2.5" dependencies: node-addon-api "^7.0.0" - prebuild-install "^7.0.1" uuid "^8.3.2" desktop-trampoline@desktop/desktop-trampoline#v0.9.10: diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index be99df433e7..9372807d03f 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -5,31 +5,16 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "scripts": { - "install": "prebuild-install || (node-gyp rebuild && tsc)", + "install": "node-gyp rebuild && tsc", "build": "node-gyp rebuild && tsc", "pretest": "yarn build", "test": "jest -c jest.json", - "prepublishOnly": "yarn build", - "postpublish": "git push --follow-tags", "prettify": "yarn prettier --write \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", - "check-prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", - "prebuild-napi-x64": "prebuild -t 4 -r napi -a x64 --strip", - "prebuild-napi-ia32": "prebuild -t 4 -r napi -a ia32 --strip", - "prebuild-napi-arm64": "prebuild -t 4 -r napi -a arm64 --strip", - "prebuild-all": "yarn prebuild-napi-x64 && yarn prebuild-napi-ia32 && yarn prebuild-napi-arm64", - "upload": "node ./script/upload.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/desktop/desktop-notifications.git" + "check-prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"" }, "keywords": [], "author": "", "license": "MIT", - "bugs": { - "url": "https://github.com/desktop/desktop-notifications/issues" - }, - "homepage": "https://github.com/desktop/desktop-notifications#readme", "devDependencies": { "@types/benchmark": "^1.0.31", "@types/jest": "^26.0.13", @@ -38,14 +23,12 @@ "benchmark": "^2.1.4", "jest": "^26.4.2", "node-gyp": "^10.1.0", - "prebuild": "^11.0.2", "prettier": "^2.0.5", "ts-node": "^9.0.0", "typescript": "^3.9.0" }, "dependencies": { "node-addon-api": "^7.0.0", - "prebuild-install": "^7.0.1", "uuid": "^8.3.2" }, "binary": { diff --git a/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 b/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 deleted file mode 100644 index 7cad55263a9..00000000000 --- a/vendor/desktop-notifications/script/download-node-lib-win-arm64.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -# This script can be removed as soon as official Windows arm64 builds are published: -# https://github.com/nodejs/build/issues/2450#issuecomment-705853342 - -$nodeVersion = $args[0] -$fallbackVersion = $args[1] - -If ($null -eq $nodeVersion -Or $null -eq $fallbackVersion) { - Write-Error "No NodeJS version given as argument to this file. Run it like download-nodejs-win-arm64.ps1 NODE_VERSION NODE_FALLBACK_VERSION" - exit 1 -} - -$url = "https://unofficial-builds.nodejs.org/download/release/v$nodeVersion/win-arm64/node.lib" -$fallbackUrl = "https://unofficial-builds.nodejs.org/download/release/v$fallbackVersion/win-arm64/node.lib" - -# Always write to the $nodeVersion cache folder, even if we're using the fallbackVersion -$cacheFolder = "$env:TEMP\prebuild\napi\$nodeVersion\arm64" - -If (!(Test-Path $cacheFolder)) { - New-Item -ItemType Directory -Force -Path $cacheFolder -} - -$output = "$cacheFolder\node.lib" -$start_time = Get-Date - -Try { - Invoke-WebRequest -Uri $url -OutFile $output - $downloadedNodeVersion = $nodeVersion -} Catch { - If ($_.Exception.Response -And $_.Exception.Response.StatusCode -eq "NotFound") { - Write-Output "No arm64 node.lib found for Node Windows $nodeVersion, trying fallback version $fallbackVersion..." - Invoke-WebRequest -Uri $fallbackUrl -OutFile $output - $downloadedNodeVersion = $fallbackVersion - } -} - -Write-Output "Downloaded arm64 NodeJS lib v$downloadedNodeVersion to $output in $((Get-Date).Subtract($start_time).Seconds) second(s)" diff --git a/vendor/desktop-notifications/script/upload.js b/vendor/desktop-notifications/script/upload.js deleted file mode 100644 index a79e4d92979..00000000000 --- a/vendor/desktop-notifications/script/upload.js +++ /dev/null @@ -1,14 +0,0 @@ -// to ensure that env not in the CI server log - -const path = require('path') -const { spawnSync } = require('child_process') - -spawnSync( - path.join( - __dirname, - '../node_modules/.bin/prebuild' + - (process.platform === 'win32' ? '.cmd' : '') - ), - ['--upload-all', process.env.GITHUB_AUTH_TOKEN], - { stdio: 'inherit' } -) diff --git a/vendor/desktop-notifications/yarn.lock b/vendor/desktop-notifications/yarn.lock index f153f0e2ea9..9e199dfd8d6 100644 --- a/vendor/desktop-notifications/yarn.lock +++ b/vendor/desktop-notifications/yarn.lock @@ -790,11 +790,6 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - abbrev@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" @@ -823,11 +818,6 @@ acorn@^8.2.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -848,21 +838,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.12.3: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - ansi-escapes@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" @@ -870,16 +845,6 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -915,11 +880,6 @@ ansi-styles@^6.1.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -936,27 +896,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" - integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.0 || ^1.1.13" - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - arg@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0" @@ -983,31 +922,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-index@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" - integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= - dependencies: - debug "^2.2.0" - es6-symbol "^3.0.2" - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -1023,16 +942,6 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== - babel-jest@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" @@ -1098,11 +1007,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@^1.0.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -1116,13 +1020,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - benchmark@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629" @@ -1130,53 +1027,6 @@ benchmark@^2.1.4: lodash "^4.17.4" platform "^1.3.3" -big-integer@^1.6.17: - version "1.6.41" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.41.tgz#6fb0e51bc8661129ef3832d46c939170b81ca794" - integrity sha512-d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w== - -binary@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bl@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" - integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@~1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" - integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== - dependencies: - readable-stream "^2.3.5" - safe-buffer "^5.1.1" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -bluebird@^3: - version "3.5.5" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" - integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== - -bluebird@~3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1227,38 +1077,10 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" -buffer-indexof-polyfill@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf" - integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8= - -buffer-shims@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" - integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= - -buffer@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786" - integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - cacache@^18.0.0: version "18.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5" @@ -1297,11 +1119,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== -camelcase@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - camelcase@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" @@ -1324,18 +1141,6 @@ capture-exit@^1.2.0: dependencies: rsvp "^3.3.3" -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1366,11 +1171,6 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chownr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -1396,15 +1196,6 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -1414,39 +1205,11 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cmake-js@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" - integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== - dependencies: - bluebird "^3" - debug "^4" - fs-extra "^5.0.0" - is-iojs "^1.0.1" - lodash "^4" - memory-stream "0" - npmlog "^1.2.0" - rc "^1.2.7" - request "^2.54.0" - semver "^5.0.3" - splitargs "0" - tar "^4" - traceur "0.0.x" - unzipper "^0.8.13" - url-join "0" - which "^1.0.9" - yargs "^3.6.0" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -1484,13 +1247,6 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" - integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w== - dependencies: - delayed-stream "~1.0.0" - combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -1498,18 +1254,6 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@2.9.x: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^2.9.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== - component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -1520,11 +1264,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - convert-source-map@^1.1.0, convert-source-map@^1.4.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" @@ -1544,11 +1283,6 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1595,20 +1329,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8= - dependencies: - es5-ext "^0.10.9" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -1632,7 +1352,7 @@ debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^4, debug@^4.1.0, debug@^4.1.1: +debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -1646,7 +1366,7 @@ debug@^4.3.4: dependencies: ms "^2.1.3" -decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -1661,18 +1381,6 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -1710,16 +1418,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -detect-libc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" - integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== - detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -1747,38 +1445,11 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -duplexer2@~0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= - dependencies: - readable-stream "~1.1.9" - -duplexer2@~0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - dependencies: - readable-stream "^2.0.2" - -each-series-async@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" - integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== - eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - emittery@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" @@ -1808,13 +1479,6 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - env-paths@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" @@ -1832,32 +1496,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.47" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11" - integrity sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - next-tick "1" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" - integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc= - dependencies: - d "1" - es5-ext "~0.10.14" - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -1928,13 +1566,6 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execspawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" - integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= - dependencies: - util-extend "^1.0.1" - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -1953,11 +1584,6 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - expect@^26.4.2: version "26.4.2" resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" @@ -1990,11 +1616,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -2009,21 +1630,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -2079,11 +1685,6 @@ foreground-child@^3.1.0: cross-spawn "^7.0.6" signal-exit "^4.0.1" -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - form-data@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" @@ -2093,15 +1694,6 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -2109,27 +1701,6 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ== - dependencies: - minipass "^2.2.1" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -2154,41 +1725,6 @@ fsevents@^2.1.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== -fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~1.2.0, gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" @@ -2223,46 +1759,19 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -ghreleases@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" - integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== - dependencies: - after "~0.8.1" - ghrepos "~2.1.0" - ghutils "~3.2.0" - lodash.uniq "^4.5.0" - simple-mime "~0.1.0" - url-template "~2.0.6" - -ghrepos@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" - integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== - dependencies: - ghutils "~3.2.0" - -ghutils@~3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" - integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== +glob@^10.2.2, glob@^10.3.10: + version "10.4.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" + integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== dependencies: - jsonist "~2.1.0" - xtend "~4.0.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + foreground-child "^3.1.0" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + package-json-from-dist "^1.0.0" + path-scurry "^1.11.1" -"glob@3 || 4 || 5 || 6 || 7", glob@^7.0.3, glob@^7.1.1, glob@^7.1.2: +glob@^7.1.1, glob@^7.1.2: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== @@ -2274,29 +1783,6 @@ github-from-package@0.0.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@5.0.x: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^10.2.2, glob@^10.3.10: - version "10.4.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" - integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== - dependencies: - foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^1.11.1" - glob@^7.1.3: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" @@ -2309,7 +1795,7 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4, glob@^7.1.6: +glob@^7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2326,12 +1812,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ== -graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== - -graceful-fs@^4.2.2, graceful-fs@^4.2.4: +graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -2341,29 +1822,11 @@ graceful-fs@^4.2.6: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -2373,11 +1836,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -2448,15 +1906,6 @@ http-proxy-agent@^7.0.0: agent-base "^7.1.0" debug "^4.3.4" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -2478,15 +1927,6 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -hyperquest@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" - integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== - dependencies: - buffer-from "^0.1.1" - duplexer2 "~0.0.2" - through2 "~0.6.3" - iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -2501,11 +1941,6 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -ieee754@^1.1.4: - version "1.1.13" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" - integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== - import-local@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" @@ -2532,25 +1967,10 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" -inherits@^2.0.3, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - ip-address@^9.0.5: version "9.0.5" resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" @@ -2639,18 +2059,6 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2661,11 +2069,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e" integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g== -is-iojs@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" - integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= - is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" @@ -2705,7 +2108,7 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-typedarray@^1.0.0, is-typedarray@~1.0.0: +is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -2722,12 +2125,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -2754,11 +2152,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - istanbul-lib-coverage@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" @@ -3212,11 +2605,6 @@ jsbn@1.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - jsdom@^16.2.2: version "16.7.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" @@ -3260,21 +2648,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - json5@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" @@ -3289,33 +2662,6 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonist@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.0.tgz#4477a4d16cd377faec58d8cf870b7e392f6d7fe9" - integrity sha1-RHek0WzTd/rsWNjPhwt+OS9tf+k= - dependencies: - bl "~1.2.0" - hyperquest "~2.1.2" - json-stringify-safe "~5.0.1" - xtend "~4.0.1" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -3345,13 +2691,6 @@ kleur@^3.0.0: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62" integrity sha512-P3kRv+B+Ra070ng2VKQqW4qW7gd/v3iD8sy/zOdcYRsfiD+QBokQNOps/AfP6Hr48cBhIIBFWckB9aO+IZhrWg== -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -3370,11 +2709,6 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -listenercount@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3382,27 +2716,7 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4, lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.7.0: +lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3467,13 +2781,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -memory-stream@0: - version "0.0.3" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" - integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= - dependencies: - readable-stream "~1.0.26-2" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -3511,11 +2818,6 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-db@~1.37.0: - version "1.37.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" - integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg== - mime-types@^2.1.12: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" @@ -3523,24 +2825,12 @@ mime-types@^2.1.12: dependencies: mime-db "1.52.0" -mime-types@~2.1.19: - version "2.1.21" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" - integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg== - dependencies: - mime-db "~1.37.0" - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -"minimatch@2 || 3", minimatch@3, minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -3554,12 +2844,7 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.1.1, minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -3603,22 +2888,6 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^2.2.1, minipass@^2.3.4: - version "2.3.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" - integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - minipass@^3.0.0: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" @@ -3636,20 +2905,6 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minizlib@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" - integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== - dependencies: - minipass "^2.2.1" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -3666,18 +2921,6 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -3719,11 +2962,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -napi-build-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508" - integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -3734,23 +2972,11 @@ negotiator@^0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== -next-tick@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@^3.0.0, node-abi@^3.3.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz#ed980f6dbb6db9ff3b31aeb27d43cd9b096f6e9e" - integrity sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ== - dependencies: - semver "^7.3.5" - node-addon-api@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" @@ -3772,23 +2998,6 @@ node-gyp@^10.1.0: tar "^6.2.1" which "^4.0.0" -node-gyp@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" - integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.1.2" - request "^2.88.0" - rimraf "^2.6.3" - semver "^5.7.1" - tar "^4.4.12" - which "^1.3.1" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -3799,26 +3008,6 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-ninja@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" - integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= - dependencies: - fstream "^1.0.0" - glob "3 || 4 || 5 || 6 || 7" - graceful-fs "^4.1.2" - minimatch "3" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2" - osenv "0" - path-array "^1.0.0" - request "2" - rimraf "2" - semver "2.x || 3.x || 4 || 5" - tar "^2.0.0" - which "1" - node-notifier@^8.0.0: version "8.0.1" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" @@ -3831,26 +3020,6 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -noop-logger@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - nopt@^7.0.0: version "7.2.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" @@ -3880,13 +3049,6 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== - dependencies: - which "^1.2.10" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -3901,82 +3063,11 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" - integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= - dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" - -"npmlog@0 || 1 || 2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" - integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= - dependencies: - ansi "~0.3.0" - are-we-there-yet "~1.0.0" - gauge "~1.2.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -nw-gyp@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.3.tgz#3ee9c7973a80e44163b3b47d0cfb734192dc8c2c" - integrity sha512-EpzoqMs7ZnRpjzNMGozuQT+1lp+mUNg5nkPlTelo+LXUyqAMnPJ48kNy3KNpaTMmI9G+9XrOCEEaRDGlIsDq7Q== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -4025,31 +3116,6 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@0, osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - p-each-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" @@ -4111,13 +3177,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -path-array@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" - integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= - dependencies: - array-index "^1.0.0" - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -4151,11 +3210,6 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - picomatch@^2.0.4, picomatch@^2.0.5: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" @@ -4184,51 +3238,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -prebuild-install@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" - integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild@^11.0.2: - version "11.0.2" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-11.0.2.tgz#e8c277c25b972dd35a746cf900c03096b090da56" - integrity sha512-r4LIdJJRyinhijoqERq9ySOeJwt8qSR3Upd8mt+l7pWUDHWSzpZ2d/nTkIaNgrrV4VBMBR8+EVZ3YGlZ0sHBvw== - dependencies: - cmake-js "~5.2.0" - detect-libc "^2.0.0" - each-series-async "^1.0.1" - execspawn "^1.0.1" - ghreleases "^3.0.2" - github-from-package "0.0.0" - glob "^7.1.6" - minimist "^1.1.2" - mkdirp "^0.5.1" - napi-build-utils "^1.0.1" - node-abi "^3.0.0" - node-gyp "^6.0.1" - node-ninja "^1.0.1" - noop-logger "^0.1.0" - npm-which "^3.0.1" - npmlog "^4.0.1" - nw-gyp "^3.6.3" - rc "^1.0.3" - run-waterfall "^1.1.6" - tar-stream "^2.1.0" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -4264,16 +3273,6 @@ proc-log@^4.1.0, proc-log@^4.2.0: resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== - promise-retry@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" @@ -4290,11 +3289,6 @@ prompts@^2.0.1: kleur "^3.0.0" sisteransi "^1.0.0" -psl@^1.1.28: - version "1.1.31" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" - integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw== - psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -4308,26 +3302,11 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -rc@^1.0.3, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-is@^16.12.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -4352,61 +3331,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -4430,32 +3354,6 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -request@2, request@^2.54.0, request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -4507,20 +3405,6 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== -rimraf@2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - -rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - rimraf@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -4528,26 +3412,16 @@ rimraf@^3.0.0: dependencies: glob "^7.1.3" -rsvp@^3.0.13, rsvp@^3.3.3: +rsvp@^3.3.3: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== -run-waterfall@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.6.tgz#3aebfeb60155539bf1ff4a30b66706ae77df9f74" - integrity sha512-dApPbpIK0hbFi2zqfJxrsnfmJW2HCQHFrSsmqF3Fp9TKm5WVf++zE6BSw0hPcA7rPapO37h12Swk2E6Va3tF7Q== - -safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -4555,7 +3429,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -4582,16 +3456,11 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.5.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^4.3.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= - semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -4611,12 +3480,7 @@ semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -4641,11 +3505,6 @@ set-value@^2.0.0: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -4685,25 +3544,6 @@ signal-exit@^4.0.1: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== -simple-concat@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" - integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= - -simple-get@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-mime@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" - integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= - sisteransi@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" @@ -4792,25 +3632,11 @@ source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.2.8: - version "0.2.10" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" - integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= - dependencies: - source-map "0.1.32" - source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@0.1.32: - version "0.1.32" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" - integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= - dependencies: - amdefine ">=0.0.4" - source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -4858,11 +3684,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -splitargs@0: - version "0.0.7" - resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" - integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= - sprintf-js@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" @@ -4873,21 +3694,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@^10.0.0: version "10.0.6" resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" @@ -4927,23 +3733,6 @@ string-length@^4.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - string-width@^4.1.0, string-width@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" @@ -4962,46 +3751,14 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1: + name strip-ansi-cjs 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@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -5031,11 +3788,6 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -5063,62 +3815,6 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tar-fs@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5" - integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.0.0" - -tar-stream@^2.0.0, tar-stream@^2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" - integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== - dependencies: - bl "^4.0.1" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^4: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -tar@^4.4.12: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - tar@^6.1.11, tar@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" @@ -5153,14 +3849,6 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -through2@~0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - tmpl@1.0.x: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -5212,14 +3900,6 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" @@ -5227,22 +3907,6 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" -traceur@0.0.x: - version "0.0.111" - resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" - integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= - dependencies: - commander "2.9.x" - glob "5.0.x" - rsvp "^3.0.13" - semver "^4.3.3" - source-map-support "~0.2.8" - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -5259,18 +3923,6 @@ ts-node@^9.0.0: source-map-support "^0.5.17" yn "3.1.1" -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -5334,7 +3986,7 @@ unique-slug@^4.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.0, universalify@^0.1.2: +universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -5347,63 +3999,16 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -unzipper@^0.8.13: - version "0.8.14" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" - integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== - dependencies: - big-integer "^1.6.17" - binary "~0.3.0" - bluebird "~3.4.1" - buffer-indexof-polyfill "~1.0.0" - duplexer2 "~0.1.4" - fstream "~1.0.10" - listenercount "~1.0.1" - readable-stream "~2.1.5" - setimmediate "~1.0.4" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-join@0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" - integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= - -url-template@~2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - uuid@^8.3.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" @@ -5426,15 +4031,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -5492,7 +4088,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.0.9, which@^1.2.10, which@^1.2.9, which@^1.3.1: +which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -5513,18 +4109,6 @@ which@^4.0.0: dependencies: isexe "^3.1.1" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -5539,14 +4123,6 @@ word-wrap@~1.2.3: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -5595,31 +4171,11 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= - -y18n@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" - integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== - -yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" @@ -5650,19 +4206,6 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^3.6.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From c6f7efc4aa078ea823d30443403539f98997a72f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 10:52:54 +0100 Subject: [PATCH 0214/1338] =?UTF-8?q?Revert=20unnecessary=20cflags=20chang?= =?UTF-8?q?e=20=F0=9F=98=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/desktop-notifications/binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/desktop-notifications/binding.gyp b/vendor/desktop-notifications/binding.gyp index 5bc86d7b7f5..b0ccc87e66c 100644 --- a/vendor/desktop-notifications/binding.gyp +++ b/vendor/desktop-notifications/binding.gyp @@ -2,7 +2,7 @@ 'targets': [ { 'target_name': 'desktop-notifications', - 'cflags': [ '-fno-exceptions' ], + 'cflags!': [ '-fno-exceptions' ], 'cflags_cc!': [ '-fno-exceptions' ], 'msvs_settings': { 'VCCLCompilerTool': { 'ExceptionHandling': 1 }, From 5540d6f5e1e2e4c2d664366be7dbbc7b1505e9fb Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 11:43:58 +0100 Subject: [PATCH 0215/1338] Update tsconfig.json --- vendor/desktop-notifications/tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/desktop-notifications/tsconfig.json b/vendor/desktop-notifications/tsconfig.json index 1ec3235fa68..cdb274e30ad 100644 --- a/vendor/desktop-notifications/tsconfig.json +++ b/vendor/desktop-notifications/tsconfig.json @@ -12,7 +12,6 @@ "sourceMap": true, "outDir": "./dist", "declaration": true, - "types": ["node"], "typeRoots": ["./node_modules/@types"] }, "exclude": ["node_modules", "build"], From a071d1cc77a3b01d0f0f5e73ebfbfd710bd9e2c2 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 11:51:11 +0100 Subject: [PATCH 0216/1338] Clean up! --- vendor/desktop-notifications/package.json | 8 +- vendor/desktop-notifications/tsconfig.json | 16 +- vendor/desktop-notifications/yarn.lock | 3547 +------------------- 3 files changed, 31 insertions(+), 3540 deletions(-) diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index 9372807d03f..c64e1a2ba2a 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -16,16 +16,10 @@ "author": "", "license": "MIT", "devDependencies": { - "@types/benchmark": "^1.0.31", - "@types/jest": "^26.0.13", - "@types/node": "^12.0.0", "@types/uuid": "^8.3.4", - "benchmark": "^2.1.4", - "jest": "^26.4.2", "node-gyp": "^10.1.0", "prettier": "^2.0.5", - "ts-node": "^9.0.0", - "typescript": "^3.9.0" + "typescript": "^5.4.5" }, "dependencies": { "node-addon-api": "^7.0.0", diff --git a/vendor/desktop-notifications/tsconfig.json b/vendor/desktop-notifications/tsconfig.json index cdb274e30ad..2d1e9c8438a 100644 --- a/vendor/desktop-notifications/tsconfig.json +++ b/vendor/desktop-notifications/tsconfig.json @@ -2,19 +2,21 @@ "compilerOptions": { "module": "commonjs", "moduleResolution": "node", - "target": "es6", - "noImplicitAny": true, + "target": "ES2022", + "esModuleInterop": true, + "resolveJsonModule": true, + "importHelpers": true, + "allowUnreachableCode": false, + "allowUnusedLabels": false, "noImplicitReturns": true, - "noImplicitThis": true, "noFallthroughCasesInSwitch": true, "noUnusedLocals": true, - "strict": true, "sourceMap": true, + "strict": true, "outDir": "./dist", - "declaration": true, - "typeRoots": ["./node_modules/@types"] + "useUnknownInCatchVariables": false }, + "include": ["lib/**/*.ts"], "exclude": ["node_modules", "build"], - "include": ["lib/**/*.ts", "test/**/*.ts"], "compileOnSave": false } diff --git a/vendor/desktop-notifications/yarn.lock b/vendor/desktop-notifications/yarn.lock index 9e199dfd8d6..c40ee731666 100644 --- a/vendor/desktop-notifications/yarn.lock +++ b/vendor/desktop-notifications/yarn.lock @@ -2,402 +2,6 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/core@^7.1.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687" - integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" - "@babel/helpers" "^7.2.0" - "@babel/parser" "^7.2.2" - "@babel/template" "^7.2.2" - "@babel/traverse" "^7.2.2" - "@babel/types" "^7.2.2" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.10" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5": - version "7.11.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651" - integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.11.6" - "@babel/helper-module-transforms" "^7.11.0" - "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.11.5" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.11.5" - "@babel/types" "^7.11.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/generator@^7.11.5", "@babel/generator@^7.11.6": - version "7.11.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620" - integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA== - dependencies: - "@babel/types" "^7.11.5" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.2.2": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb" - integrity sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg== - dependencies: - "@babel/types" "^7.3.0" - jsesc "^2.5.1" - lodash "^4.17.10" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== - dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== - dependencies: - "@babel/types" "^7.0.0" - -"@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-member-expression-to-functions@^7.10.4": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" - integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== - dependencies: - "@babel/types" "^7.11.0" - -"@babel/helper-module-imports@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620" - integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-module-transforms@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" - integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@babel/helper-replace-supers" "^7.10.4" - "@babel/helper-simple-access" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/template" "^7.10.4" - "@babel/types" "^7.11.0" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-plugin-utils@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" - integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== - -"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-replace-supers@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf" - integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-simple-access@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461" - integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw== - dependencies: - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-split-export-declaration@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813" - integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag== - dependencies: - "@babel/types" "^7.0.0" - -"@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== - dependencies: - "@babel/types" "^7.11.0" - -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== - -"@babel/helpers@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044" - integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA== - dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helpers@^7.2.0": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9" - integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA== - dependencies: - "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.5" - "@babel/types" "^7.3.0" - -"@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.1.0": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c" - integrity sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ== - -"@babel/parser@^7.10.4", "@babel/parser@^7.11.5": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" - integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== - -"@babel/parser@^7.2.2", "@babel/parser@^7.2.3": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" - integrity sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA== - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" - integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-import-meta@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" - integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.2.2" - "@babel/types" "^7.2.2" - -"@babel/template@^7.10.4", "@babel/template@^7.3.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" - integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.2.3" - "@babel/types" "^7.2.2" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.10" - -"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" - integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.11.5" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.11.5" - "@babel/types" "^7.11.5" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" - -"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0" - integrity sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw== - dependencies: - esutils "^2.0.2" - lodash "^4.17.10" - to-fast-properties "^2.0.0" - -"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.3": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" - integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== - -"@cnakazawa/watch@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" - integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA== - dependencies: - exec-sh "^0.3.2" - minimist "^1.2.0" - "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" @@ -410,203 +14,6 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" - integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - get-package-type "^0.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== - -"@jest/console@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" - integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w== - dependencies: - "@jest/types" "^26.3.0" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^26.3.0" - jest-util "^26.3.0" - slash "^3.0.0" - -"@jest/core@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc" - integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg== - dependencies: - "@jest/console" "^26.3.0" - "@jest/reporters" "^26.4.1" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.4" - jest-changed-files "^26.3.0" - jest-config "^26.4.2" - jest-haste-map "^26.3.0" - jest-message-util "^26.3.0" - jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-resolve-dependencies "^26.4.2" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" - jest-watcher "^26.3.0" - micromatch "^4.0.2" - p-each-series "^2.1.0" - rimraf "^3.0.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" - integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA== - dependencies: - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - jest-mock "^26.3.0" - -"@jest/fake-timers@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" - integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A== - dependencies: - "@jest/types" "^26.3.0" - "@sinonjs/fake-timers" "^6.0.1" - "@types/node" "*" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" - jest-util "^26.3.0" - -"@jest/globals@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" - integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow== - dependencies: - "@jest/environment" "^26.3.0" - "@jest/types" "^26.3.0" - expect "^26.4.2" - -"@jest/reporters@^26.4.1": - version "26.4.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795" - integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.2" - graceful-fs "^4.2.4" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.3" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.2" - jest-haste-map "^26.3.0" - jest-resolve "^26.4.0" - jest-util "^26.3.0" - jest-worker "^26.3.0" - slash "^3.0.0" - source-map "^0.6.0" - string-length "^4.0.1" - terminal-link "^2.0.0" - v8-to-istanbul "^5.0.1" - optionalDependencies: - node-notifier "^8.0.0" - -"@jest/source-map@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" - integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.2.4" - source-map "^0.6.0" - -"@jest/test-result@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" - integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg== - dependencies: - "@jest/console" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" - integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog== - dependencies: - "@jest/test-result" "^26.3.0" - graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" - -"@jest/transform@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" - integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^26.3.0" - babel-plugin-istanbul "^6.0.0" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" - jest-regex-util "^26.0.0" - jest-util "^26.3.0" - micromatch "^4.0.2" - pirates "^4.0.1" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - -"@jest/types@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" - integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - -"@jest/types@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" - integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^15.0.0" - chalk "^4.0.0" - "@npmcli/agent@^2.0.0": version "2.2.2" resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" @@ -630,201 +37,21 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@sinonjs/commons@^1.7.0": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" - integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" - integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== - dependencies: - "@sinonjs/commons" "^1.7.0" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.9" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d" - integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" - integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ== - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307" - integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2" - integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw== - dependencies: - "@babel/types" "^7.3.0" - -"@types/benchmark@^1.0.31": - version "1.0.31" - resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-1.0.31.tgz#2dd3514e93396f362ba5551a7c9ff0da405c1d38" - "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/graceful-fs@^4.1.2": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" - integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" - integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== - -"@types/istanbul-lib-coverage@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85" - integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg== - -"@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== - -"@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" - integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jest@^26.0.13": - version "26.0.13" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e" - integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA== - dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" - -"@types/node@*": - version "14.6.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a" - integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ== - -"@types/node@^12.0.0": - version "12.6.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.2.tgz#a5ccec6abb6060d5f20d256fb03ed743e9774999" - integrity sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ== - -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== - -"@types/prettier@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.0.tgz#5f96562c1075ee715a5b138f0b7f591c1f40f6b8" - integrity sha512-hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA== - -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== - "@types/uuid@^8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== -"@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== - -"@types/yargs@^15.0.0": - version "15.0.5" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" - integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== - dependencies: - "@types/yargs-parser" "*" - -abab@^2.0.3, abab@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - abbrev@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - -acorn-walk@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn@^7.1.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -acorn@^8.2.4: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - agent-base@^7.1.0, agent-base@^7.1.2: version "7.1.3" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" @@ -838,13 +65,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -860,14 +80,7 @@ ansi-regex@^6.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654" integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -880,161 +93,11 @@ ansi-styles@^6.1.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -arg@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -atob@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -babel-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" - integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g== - dependencies: - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/babel__core" "^7.1.7" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.3.0" - chalk "^4.0.0" - graceful-fs "^4.2.4" - slash "^3.0.0" - -babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^26.2.0: - version "26.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" - integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" - "@types/babel__traverse" "^7.0.6" - -babel-preset-current-node-syntax@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" - integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -babel-preset-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" - integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw== - dependencies: - babel-plugin-jest-hoist "^26.2.0" - babel-preset-current-node-syntax "^0.1.3" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -benchmark@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629" - dependencies: - lodash "^4.17.4" - platform "^1.3.3" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - brace-expansion@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" @@ -1042,45 +105,6 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - -bser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" - integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= - dependencies: - node-int64 "^0.4.0" - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - cacache@^18.0.0: version "18.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5" @@ -1099,137 +123,16 @@ cacache@^18.0.0: tar "^6.1.11" unique-filename "^3.0.0" -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -callsites@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" - integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== - -camelcase@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" - integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e" - integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w== - -capture-exit@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" - integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28= - dependencies: - rsvp "^3.3.3" - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -char-regex@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cliui@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" - integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^6.2.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" - integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -1237,72 +140,11 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -convert-source-map@^1.1.0, convert-source-map@^1.4.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" - integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== - dependencies: - safe-buffer "~5.1.1" - -convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - cross-spawn@^7.0.6: version "7.0.6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" @@ -1312,32 +154,6 @@ cross-spawn@^7.0.6: shebang-command "^2.0.0" which "^2.0.1" -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - debug@4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -1345,20 +161,6 @@ debug@4: dependencies: ms "2.1.2" -debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debug@^4.3.4: version "4.4.0" resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" @@ -1366,95 +168,11 @@ debug@^4.3.4: dependencies: ms "^2.1.3" -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== - -diff-sequences@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2" - integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig== - -diff@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" - integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== - -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -emittery@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" - integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1472,13 +190,6 @@ encoding@^0.1.13: dependencies: iconv-lite "^0.6.2" -end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== - dependencies: - once "^1.4.0" - env-paths@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" @@ -1489,194 +200,11 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -exec-sh@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" - integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== - -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" - integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expect@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" - integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA== - dependencies: - "@jest/types" "^26.3.0" - ansi-styles "^4.0.0" - jest-get-type "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-regex-util "^26.0.0" - exponential-backoff@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91" integrity sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA== -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= - dependencies: - bser "^2.0.0" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.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" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - foreground-child@^3.1.0: version "3.3.1" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f" @@ -1685,22 +213,6 @@ foreground-child@^3.1.0: cross-spawn "^7.0.6" signal-exit "^4.0.1" -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -1715,189 +227,28 @@ fs-minipass@^3.0.0: dependencies: minipass "^7.0.3" -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== - -gensync@^1.0.0-beta.1: - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" - integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== - -get-caller-file@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-package-type@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" - integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - glob@^10.2.2, glob@^10.3.10: version "10.4.5" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== dependencies: foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^1.11.1" - -glob@^7.1.1, glob@^7.1.2: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.4: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^11.1.0: - version "11.10.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" - integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ== - -graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graceful-fs@^4.2.6: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -growly@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + package-json-from-dist "^1.0.0" + path-scurry "^1.11.1" -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +graceful-fs@^4.2.6: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-agent@^7.0.0: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" @@ -1906,14 +257,6 @@ http-proxy-agent@^7.0.0: agent-base "^7.1.0" debug "^4.3.4" -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - https-proxy-agent@^7.0.1: version "7.0.6" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" @@ -1922,18 +265,6 @@ https-proxy-agent@^7.0.1: agent-base "^7.1.2" debug "4" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" @@ -1941,14 +272,6 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -1959,18 +282,6 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - ip-address@^9.0.5: version "9.0.5" resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" @@ -1979,157 +290,16 @@ ip-address@^9.0.5: jsbn "1.1.0" sprintf-js "^1.1.3" -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-generator-fn@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e" - integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g== - is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -2140,59 +310,6 @@ isexe@^3.1.1: resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - -istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" - integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== - dependencies: - "@babel/core" "^7.7.5" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - jackspeak@^3.1.2: version "3.4.3" resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a" @@ -2202,525 +319,11 @@ jackspeak@^3.1.2: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jest-changed-files@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1" - integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g== - dependencies: - "@jest/types" "^26.3.0" - execa "^4.0.0" - throat "^5.0.0" - -jest-cli@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da" - integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw== - dependencies: - "@jest/core" "^26.4.2" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.4" - import-local "^3.0.2" - is-ci "^2.0.0" - jest-config "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" - prompts "^2.0.1" - yargs "^15.3.1" - -jest-config@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" - integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A== - dependencies: - "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.4.2" - "@jest/types" "^26.3.0" - babel-jest "^26.3.0" - chalk "^4.0.0" - deepmerge "^4.2.2" - glob "^7.1.1" - graceful-fs "^4.2.4" - jest-environment-jsdom "^26.3.0" - jest-environment-node "^26.3.0" - jest-get-type "^26.3.0" - jest-jasmine2 "^26.4.2" - jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-util "^26.3.0" - jest-validate "^26.4.2" - micromatch "^4.0.2" - pretty-format "^26.4.2" - -jest-diff@^25.2.1: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" - integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" - -jest-diff@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" - integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ== - dependencies: - chalk "^4.0.0" - diff-sequences "^26.3.0" - jest-get-type "^26.3.0" - pretty-format "^26.4.2" - -jest-docblock@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" - integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== - dependencies: - detect-newline "^3.0.0" - -jest-each@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" - integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA== - dependencies: - "@jest/types" "^26.3.0" - chalk "^4.0.0" - jest-get-type "^26.3.0" - jest-util "^26.3.0" - pretty-format "^26.4.2" - -jest-environment-jsdom@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" - integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA== - dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" - jsdom "^16.2.2" - -jest-environment-node@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" - integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw== - dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" - -jest-get-type@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" - integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== - -jest-get-type@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" - integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== - -jest-haste-map@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" - integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA== - dependencies: - "@jest/types" "^26.3.0" - "@types/graceful-fs" "^4.1.2" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.4" - jest-regex-util "^26.0.0" - jest-serializer "^26.3.0" - jest-util "^26.3.0" - jest-worker "^26.3.0" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.1.2" - -jest-jasmine2@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" - integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA== - dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.3.0" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - expect "^26.4.2" - is-generator-fn "^2.0.0" - jest-each "^26.4.2" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - pretty-format "^26.4.2" - throat "^5.0.0" - -jest-leak-detector@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" - integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA== - dependencies: - jest-get-type "^26.3.0" - pretty-format "^26.4.2" - -jest-matcher-utils@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" - integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q== - dependencies: - chalk "^4.0.0" - jest-diff "^26.4.2" - jest-get-type "^26.3.0" - pretty-format "^26.4.2" - -jest-message-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" - integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.3.0" - "@types/stack-utils" "^1.0.1" - chalk "^4.0.0" - graceful-fs "^4.2.4" - micromatch "^4.0.2" - slash "^3.0.0" - stack-utils "^2.0.2" - -jest-mock@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" - integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q== - dependencies: - "@jest/types" "^26.3.0" - "@types/node" "*" - -jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== - -jest-regex-util@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" - integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== - -jest-resolve-dependencies@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5" - integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ== - dependencies: - "@jest/types" "^26.3.0" - jest-regex-util "^26.0.0" - jest-snapshot "^26.4.2" - -jest-resolve@^26.4.0: - version "26.4.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" - integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg== - dependencies: - "@jest/types" "^26.3.0" - chalk "^4.0.0" - graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.2" - jest-util "^26.3.0" - read-pkg-up "^7.0.1" - resolve "^1.17.0" - slash "^3.0.0" - -jest-runner@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" - integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g== - dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.7.1" - exit "^0.1.2" - graceful-fs "^4.2.4" - jest-config "^26.4.2" - jest-docblock "^26.0.0" - jest-haste-map "^26.3.0" - jest-leak-detector "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" - jest-runtime "^26.4.2" - jest-util "^26.3.0" - jest-worker "^26.3.0" - source-map-support "^0.5.6" - throat "^5.0.0" - -jest-runtime@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" - integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ== - dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/globals" "^26.4.2" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/yargs" "^15.0.0" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.4" - jest-config "^26.4.2" - jest-haste-map "^26.3.0" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" - jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" - slash "^3.0.0" - strip-bom "^4.0.0" - yargs "^15.3.1" - -jest-serializer@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" - integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow== - dependencies: - "@types/node" "*" - graceful-fs "^4.2.4" - -jest-snapshot@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" - integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg== - dependencies: - "@babel/types" "^7.0.0" - "@jest/types" "^26.3.0" - "@types/prettier" "^2.0.0" - chalk "^4.0.0" - expect "^26.4.2" - graceful-fs "^4.2.4" - jest-diff "^26.4.2" - jest-get-type "^26.3.0" - jest-haste-map "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" - natural-compare "^1.4.0" - pretty-format "^26.4.2" - semver "^7.3.2" - -jest-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" - integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== - dependencies: - "@jest/types" "^26.3.0" - "@types/node" "*" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - micromatch "^4.0.2" - -jest-validate@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" - integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ== - dependencies: - "@jest/types" "^26.3.0" - camelcase "^6.0.0" - chalk "^4.0.0" - jest-get-type "^26.3.0" - leven "^3.1.0" - pretty-format "^26.4.2" - -jest-watcher@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08" - integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ== - dependencies: - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - jest-util "^26.3.0" - string-length "^4.0.1" - -jest-worker@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" - integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" - integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== - dependencies: - "@jest/core" "^26.4.2" - import-local "^3.0.2" - jest-cli "^26.4.2" - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== -jsdom@^16.2.2: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== - dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" - cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" - escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" - symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json5@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== - dependencies: - minimist "^1.2.0" - -json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== - dependencies: - minimist "^1.2.5" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -kleur@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62" - integrity sha512-P3kRv+B+Ra070ng2VKQqW4qW7gd/v3iD8sy/zOdcYRsfiD+QBokQNOps/AfP6Hr48cBhIIBFWckB9aO+IZhrWg== - -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.7.0: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" @@ -2733,17 +336,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-error@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96" - make-fetch-happen@^13.0.0: version "13.0.1" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" @@ -2762,81 +354,6 @@ make-fetch-happen@^13.0.0: promise-retry "^2.0.1" ssri "^10.0.0" -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= - dependencies: - tmpl "1.0.x" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@^9.0.4: version "9.0.5" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" @@ -2844,11 +361,6 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - minipass-collect@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" @@ -2913,70 +425,26 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - negotiator@^0.6.3: version "0.6.4" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - node-addon-api@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" @@ -2998,147 +466,12 @@ node-gyp@^10.1.0: tar "^6.2.1" which "^4.0.0" -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - -node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== - dependencies: - growly "^1.3.0" - is-wsl "^2.2.0" - semver "^7.3.2" - shellwords "^0.1.1" - uuid "^8.3.0" - which "^2.0.2" - nopt@^7.0.0: version "7.2.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" - integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== - dependencies: - abbrev "^2.0.0" - -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" - -normalize-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -p-each-series@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== dependencies: - p-limit "^2.2.0" + abbrev "^2.0.0" p-map@^4.0.0: version "4.0.0" @@ -3147,61 +480,16 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" - integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== - package-json-from-dist@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== -parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - path-scurry@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" @@ -3210,64 +498,11 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -picomatch@^2.0.4, picomatch@^2.0.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -platform@^1.3.3: - version "1.3.4" - resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - prettier@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== -pretty-format@^25.2.1, pretty-format@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" - integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== - dependencies: - "@jest/types" "^25.5.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -pretty-format@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237" - integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA== - dependencies: - "@jest/types" "^26.3.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - proc-log@^4.1.0, proc-log@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" @@ -3281,198 +516,16 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" -prompts@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c" - integrity sha512-8lnEOSIGQbgbnO47+13S+H204L8ISogGulyi0/NNEFAQ9D1VMNTrJ9SBX2Ra03V4iPn/zt36HQMndRYkaPoWiQ== - dependencies: - kleur "^3.0.0" - sisteransi "^1.0.0" - -psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -react-is@^16.12.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@^1.10.0, resolve@^1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== - dependencies: - path-parse "^1.0.6" - -resolve@^1.3.2: - version "1.10.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" - integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== - dependencies: - path-parse "^1.0.6" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== -rimraf@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rsvp@^3.3.3: - version "3.6.2" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" - integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== - -safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": +"safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sane@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181" - integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ== - dependencies: - "@cnakazawa/watch" "^1.0.3" - anymatch "^2.0.0" - capture-exit "^1.2.0" - exec-sh "^0.3.2" - execa "^1.0.0" - fb-watchman "^2.0.0" - micromatch "^3.1.4" - minimist "^1.1.1" - walker "~1.0.5" - -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== - dependencies: - xmlchars "^2.2.0" - -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" @@ -3480,38 +533,6 @@ semver@^7.3.5: dependencies: lru-cache "^6.0.0" -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3519,76 +540,21 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shellwords@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" - integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - signal-exit@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== -sisteransi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" - integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - socks-proxy-agent@^8.0.3: version "8.0.5" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee" @@ -3606,94 +572,11 @@ socks@^2.8.3: ip-address "^9.0.5" smart-buffer "^4.2.0" -source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.5.17: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.6: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= - -source-map@^0.5.0, source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e" - integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g== - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - sprintf-js@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - ssri@^10.0.0: version "10.0.6" resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" @@ -3701,29 +584,6 @@ ssri@^10.0.0: dependencies: minipass "^7.0.3" -stack-utils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" - integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg== - dependencies: - escape-string-regexp "^2.0.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== - dependencies: - char-regex "^1.0.2" - strip-ansi "^6.0.0" - "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" @@ -3733,7 +593,7 @@ string-length@^4.0.1: 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.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== @@ -3773,48 +633,6 @@ strip-ansi@^7.0.1: dependencies: ansi-regex "^6.0.1" -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - tar@^6.1.11, tar@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" @@ -3827,150 +645,10 @@ tar@^6.1.11, tar@^6.2.1: mkdirp "^1.0.3" yallist "^4.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== - dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" - -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - -throat@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" - integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== - -tmpl@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.1.2" - -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== - dependencies: - punycode "^2.1.1" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -ts-node@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== - dependencies: - arg "^4.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - -type-detect@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - -typescript@^3.9.0: - version "3.9.7" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" - integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" +typescript@^5.4.5: + version "5.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4" + integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ== unique-filename@^3.0.0: version "3.0.0" @@ -3986,116 +664,12 @@ unique-slug@^4.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -uuid@^8.3.0, uuid@^8.3.2: +uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-to-istanbul@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5" - integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - source-map "^0.7.3" - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - -walker@^1.0.7, walker@~1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= - dependencies: - makeerror "1.0.x" - -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== - dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -4109,11 +683,6 @@ which@^4.0.0: dependencies: isexe "^3.1.1" -word-wrap@~1.2.3: - version "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== - "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -4123,15 +692,6 @@ word-wrap@~1.2.3: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - 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" @@ -4141,72 +701,7 @@ wrap-ansi@^8.1.0: string-width "^5.0.1" strip-ansi "^7.0.1" -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@^7.4.6: - version "7.5.8" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a" - integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw== - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== - -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^18.1.2: - version "18.1.3" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs@^15.3.1: - version "15.4.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.2" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== From 29b7bf5bb11216ed476d1512ec246027e5b68623 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Mar 2025 10:59:29 +0100 Subject: [PATCH 0217/1338] Bump dexie to fix test hangs See https://github.com/dexie/Dexie.js/pull/1577 --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index def453250eb..6c5c0e137a2 100644 --- a/app/package.json +++ b/app/package.json @@ -31,7 +31,7 @@ "deep-equal": "^1.0.1", "desktop-notifications": "^0.2.4", "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10", - "dexie": "^3.2.2", + "dexie": "^3.2.3", "dompurify": "^3.2.4", "dugite": "3.0.0-rc10", "electron-window-state": "^5.0.3", diff --git a/app/yarn.lock b/app/yarn.lock index 82456f95980..33c458e53fd 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -345,10 +345,10 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== -dexie@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/dexie/-/dexie-3.2.2.tgz#fa6f2a3c0d6ed0766f8d97a03720056f88fe0e01" - integrity sha512-q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg== +dexie@^3.2.3: + version "3.2.7" + resolved "https://registry.yarnpkg.com/dexie/-/dexie-3.2.7.tgz#1346541c9c81e3bc6055a042a928837890595e3a" + integrity sha512-2a+BXvVhY5op+smDRLxeBAivE7YcYaneXJ1la3HOkUfX9zKkE/AJ8CNgjiXbtXepFyFmJNGSbmjOwqbT749r/w== "dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.3.1: version "3.4.0" From 9838ec10f12bae114f8d285bea9a3090205af559 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Mar 2025 11:15:28 +0100 Subject: [PATCH 0218/1338] Don't start timers within tests --- app/src/lib/stores/helpers/branch-pruner.ts | 4 ++++ app/test/unit/branch-pruner-test.ts | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/lib/stores/helpers/branch-pruner.ts b/app/src/lib/stores/helpers/branch-pruner.ts index 33b4b945a79..f6817daf6f1 100644 --- a/app/src/lib/stores/helpers/branch-pruner.ts +++ b/app/src/lib/stores/helpers/branch-pruner.ts @@ -69,6 +69,10 @@ export class BranchPruner { private readonly onPruneCompleted: (repository: Repository) => Promise ) {} + public runOnce() { + return this.pruneLocalBranches(DefaultPruneOptions) + } + public async start() { if (this.timer !== null) { fatalError( diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index 95e67a37838..56b188bdd25 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -65,7 +65,7 @@ describe('BranchPruner', () => { ) const branchesBeforePruning = await getBranchesFromGit(repo) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) expect(branchesBeforePruning).toEqual(branchesAfterPruning) @@ -91,7 +91,7 @@ describe('BranchPruner', () => { () => Promise.resolve() ) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) expect(branchesAfterPruning).not.toContain('deleted-branch-1') @@ -118,7 +118,7 @@ describe('BranchPruner', () => { ) const branchesBeforePruning = await getBranchesFromGit(repo) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) expect(branchesBeforePruning).toEqual(branchesAfterPruning) @@ -146,7 +146,7 @@ describe('BranchPruner', () => { ) const branchesBeforePruning = await getBranchesFromGit(repo) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) expect(branchesBeforePruning).toEqual(branchesAfterPruning) @@ -172,7 +172,7 @@ describe('BranchPruner', () => { () => Promise.resolve() ) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) const expectedBranchesAfterPruning = [ @@ -213,7 +213,7 @@ describe('BranchPruner', () => { () => Promise.resolve() ) - await branchPruner.start() + await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) expect(branchesAfterPruning).toContain('master') From 5aa96670f934f862dc4cb135eb7fcdbf1dd298a4 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 16:47:28 +0100 Subject: [PATCH 0219/1338] Remove test which has been skipped since 2019 --- app/test/unit/git/status-test.ts | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/app/test/unit/git/status-test.ts b/app/test/unit/git/status-test.ts index 40c5d498f2b..119d8fa168b 100644 --- a/app/test/unit/git/status-test.ts +++ b/app/test/unit/git/status-test.ts @@ -17,15 +17,11 @@ import { GitStatusEntry, isManualConflict, } from '../../../src/models/status' -import * as temp from 'temp' import { getStatus } from '../../../src/lib/git' import { isConflictedFile } from '../../../src/lib/status' import { setupLocalConfig } from '../../helpers/local-config' import { generateString } from '../../helpers/random-data' -const _temp = temp.track() -const mkdir = _temp.mkdir - describe('git/status', () => { describe('getStatus', () => { let repository: Repository @@ -282,26 +278,6 @@ describe('git/status', () => { }) }) - it.skip('Handles at least 10k untracked files without failing', async () => { - const numFiles = 10000 - const basePath = repository.path - - await mkdir(basePath) - - // create a lot of files - const promises = [] - for (let i = 0; i < numFiles; i++) { - promises.push( - FSE.writeFile(path.join(basePath, `test-file-${i}`), 'Hey there\n') - ) - } - await Promise.all(promises) - - const status = await getStatusOrThrow(repository) - const files = status.workingDirectory.files - expect(files).toHaveLength(numFiles) - }, 25000) // needs a little extra time on CI - it('returns null for directory without a .git directory', async () => { repository = setupEmptyDirectory() const status = await getStatus(repository) From 5772c0860444c7275bd472f85fabfef75928cb5f Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Mar 2025 11:54:56 +0100 Subject: [PATCH 0220/1338] Add TestStatsStore to simplify tests --- app/src/lib/stats/stats-store.ts | 13 ++----- app/src/lib/stores/git-store-cache.ts | 4 +-- app/src/lib/stores/git-store.ts | 6 ++-- app/src/lib/stores/repository-state-cache.ts | 4 +-- .../repository-builder-branch-pruner.ts | 14 ++------ app/test/helpers/test-stats-store.ts | 10 ++++++ app/test/unit/branch-pruner-test.ts | 28 +++++---------- app/test/unit/git-store-cache-test.ts | 36 ++++--------------- app/test/unit/git-store-test.ts | 34 ++++++------------ app/test/unit/git/branch-test.ts | 26 ++++---------- app/test/unit/git/checkout-test.ts | 18 ++-------- app/test/unit/repository-state-cache-test.ts | 26 ++++---------- .../stores/updates/update-remote-url-test.ts | 14 ++------ 13 files changed, 65 insertions(+), 168 deletions(-) create mode 100644 app/test/helpers/test-stats-store.ts diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index e317050af4c..41c49974b37 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -245,7 +245,7 @@ const DefaultDailyMeasures: IDailyMeasures = { } // A subtype of IDailyMeasures filtered to contain only its numeric properties -type NumericMeasures = { +export type NumericMeasures = { [P in keyof IDailyMeasures as IDailyMeasures[P] extends number ? P : never]: IDailyMeasures[P] @@ -420,13 +420,7 @@ type DailyStats = ICalculatedStats & * */ export interface IStatsStore { - increment: ( - metric: - | 'mergeAbortedAfterConflictsCount' - | 'rebaseAbortedAfterConflictsCount' - | 'mergeSuccessAfterConflictsCount' - | 'rebaseSuccessAfterConflictsCount' - ) => void + increment: (k: keyof NumericMeasures, n?: number) => Promise } const defaultPostImplementation = (body: Record) => @@ -986,9 +980,6 @@ export class StatsStore implements IStatsStore { } } - public recordTagCreated = (numCreatedTags: number) => - this.increment('tagsCreated', numCreatedTags) - private recordSquashUndone = () => this.increment('squashUndoneCount') public async recordOperationConflictsEncounteredCount( diff --git a/app/src/lib/stores/git-store-cache.ts b/app/src/lib/stores/git-store-cache.ts index ecc847c1a8f..f18793bd8c5 100644 --- a/app/src/lib/stores/git-store-cache.ts +++ b/app/src/lib/stores/git-store-cache.ts @@ -1,7 +1,7 @@ import { GitStore } from './git-store' import { Repository } from '../../models/repository' import { IAppShell } from '../app-shell' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' export class GitStoreCache { /** GitStores keyed by their hash. */ @@ -9,7 +9,7 @@ export class GitStoreCache { public constructor( private readonly shell: IAppShell, - private readonly statsStore: StatsStore, + private readonly statsStore: IStatsStore, private readonly onGitStoreUpdated: ( repository: Repository, gitStore: GitStore diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 2ad88655838..0e660c40253 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -93,7 +93,7 @@ import { BaseStore } from './base-store' import { getStashes, getStashedFiles } from '../git/stash' import { IStashEntry, StashedChangesLoadStates } from '../../models/stash-entry' import { PullRequest } from '../../models/pull-request' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' import { getTagsToPush, storeTagsToPush } from './helpers/tags-to-push-storage' import { DiffSelection, ITextDiff } from '../../models/diff' import { getDefaultBranch } from '../helpers/default-branch' @@ -161,7 +161,7 @@ export class GitStore extends BaseStore { public constructor( private readonly repository: Repository, private readonly shell: IAppShell, - private readonly statsStore: StatsStore + private readonly statsStore: IStatsStore ) { super() @@ -302,7 +302,7 @@ export class GitStore extends BaseStore { } if (numCreatedTags > 0) { - this.statsStore.recordTagCreated(numCreatedTags) + this.statsStore.increment('tagsCreated', numCreatedTags) } const commitsToStore = [] diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 31defddb601..e08106ba236 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -23,13 +23,13 @@ import { import { merge } from '../merge' import { DefaultCommitMessage } from '../../models/commit-message' import { sendNonFatalException } from '../helpers/non-fatal-exception' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' import { RepoRulesInfo } from '../../models/repo-rules' export class RepositoryStateCache { private readonly repositoryState = new Map() - public constructor(private readonly statsStore: StatsStore) {} + public constructor(private readonly statsStore: IStatsStore) {} /** Get the state for the repository. */ public get(repository: Repository): IRepositoryState { diff --git a/app/test/helpers/repository-builder-branch-pruner.ts b/app/test/helpers/repository-builder-branch-pruner.ts index c50ef2aca94..c837a9dc174 100644 --- a/app/test/helpers/repository-builder-branch-pruner.ts +++ b/app/test/helpers/repository-builder-branch-pruner.ts @@ -9,9 +9,7 @@ import { } from '../../src/models/repository' import { IAPIFullRepository, getDotComAPIEndpoint } from '../../src/lib/api' import { shell } from './test-app-shell' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from './test-stats-store' export async function createRepository() { const repo = await setupEmptyRepository() @@ -120,15 +118,7 @@ async function primeCaches( repository: Repository, repositoriesStateCache: RepositoryStateCache ) { - const gitStore = new GitStore( - repository, - shell, - new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - ) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) // rather than re-create the branches and stuff as objects, these calls // will run the underlying Git operations and update the GitStore state diff --git a/app/test/helpers/test-stats-store.ts b/app/test/helpers/test-stats-store.ts new file mode 100644 index 00000000000..fbddb7e41aa --- /dev/null +++ b/app/test/helpers/test-stats-store.ts @@ -0,0 +1,10 @@ +import { IStatsStore, NumericMeasures } from '../../src/lib/stats/stats-store' + +export class TestStatsStore implements IStatsStore { + public metrics: Partial> = {} + + public increment: IStatsStore['increment'] = async (k, n = 1) => { + this.metrics.adjustedFiltersForHiddenChangesCount = 1 + this.metrics[k] = (this.metrics[k] || 0) + n + } +} diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index 95e67a37838..b781bccdca8 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -11,40 +11,28 @@ import { createRepository as createPrunedRepository, setupRepository, } from '../helpers/repository-builder-branch-pruner' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' +import { TestStatsStore } from '../helpers/test-stats-store' import { offsetFromNow } from '../../src/lib/offset-from' import * as FSE from 'fs-extra' import * as path from 'path' -import { fakePost } from '../fake-stats-post' +import noop from 'lodash/noop' describe('BranchPruner', () => { - const onGitStoreUpdated = () => {} - const onDidError = () => {} - let gitStoreCache: GitStoreCache + let repositoriesDb: TestRepositoriesDatabase let repositoriesStore: RepositoriesStore let repositoriesStateCache: RepositoryStateCache beforeEach(async () => { - const statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - gitStoreCache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) - - const repositoriesDb = new TestRepositoriesDatabase() - await repositoriesDb.reset() + const statsStore = new TestStatsStore() + gitStoreCache = new GitStoreCache(shell, statsStore, noop, noop) + repositoriesDb = new TestRepositoriesDatabase() repositoriesStore = new RepositoriesStore(repositoriesDb) repositoriesStateCache = new RepositoryStateCache(statsStore) }) + afterEach(() => repositoriesDb.delete()) + it('does nothing on non GitHub repositories', async () => { const path = await setupFixtureRepository('branch-prune-tests') diff --git a/app/test/unit/git-store-cache-test.ts b/app/test/unit/git-store-cache-test.ts index 1301620a585..1d074f67001 100644 --- a/app/test/unit/git-store-cache-test.ts +++ b/app/test/unit/git-store-cache-test.ts @@ -1,33 +1,13 @@ import { Repository } from '../../src/models/repository' import { GitStoreCache } from '../../src/lib/stores/git-store-cache' import { shell } from '../helpers/test-app-shell' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' +import noop from 'lodash/noop' describe('GitStoreCache', () => { - let repository: Repository - let statsStore: StatsStore - - const onGitStoreUpdated = () => {} - const onDidError = () => {} - - beforeEach(() => { - repository = new Repository('/something/path', 1, null, false) - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('returns same instance of GitStore', () => { - const cache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) + const repository = new Repository('/something/path', 1, null, false) + const cache = new GitStoreCache(shell, new TestStatsStore(), noop, noop) const first = cache.get(repository) const second = cache.get(repository) @@ -36,12 +16,8 @@ describe('GitStoreCache', () => { }) it('returns different instance of GitStore after removing', () => { - const cache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) + const repository = new Repository('/something/path', 1, null, false) + const cache = new GitStoreCache(shell, new TestStatsStore(), noop, noop) const first = cache.get(repository) cache.remove(repository) diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index 48954e24b16..3c68e31b30b 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -20,26 +20,14 @@ import { cloneLocalRepository, } from '../helpers/repository-scaffolding' import { BranchType } from '../../src/models/branch' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' describe('GitStore', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - describe('loadCommitBatch', () => { it('includes HEAD when loading commits', async () => { const path = await setupFixtureRepository('repository-with-105-commits') const repo = new Repository(path, -1, null, false) - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const commits = await gitStore.loadCommitBatch('HEAD', 0) @@ -51,7 +39,7 @@ describe('GitStore', () => { it('can discard changes from a repository', async () => { const repo = await setupEmptyRepository() - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const readmeFile = 'README.md' const readmeFilePath = Path.join(repo.path, readmeFile) @@ -89,7 +77,7 @@ describe('GitStore', () => { it('can discard a renamed file', async () => { const repo = await setupEmptyRepository() - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const file = 'README.md' const renamedFile = 'NEW-README.md' @@ -137,7 +125,7 @@ describe('GitStore', () => { }) it('reports the repository is unborn', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() expect(gitStore.tip.kind).toEqual(TipState.Valid) @@ -149,7 +137,7 @@ describe('GitStore', () => { }) it('pre-fills the commit message', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.undoCommit(firstCommit!) @@ -159,7 +147,7 @@ describe('GitStore', () => { }) it('clears the undo commit dialog', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -179,7 +167,7 @@ describe('GitStore', () => { }) it('has no staged files', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -210,7 +198,7 @@ describe('GitStore', () => { it('can discard modified change cleanly', async () => { const path = await setupFixtureRepository('repository-with-HEAD-file') const repo = new Repository(path, 1, null, false) - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const file = 'README.md' const filePath = Path.join(repo.path, file) @@ -284,7 +272,7 @@ describe('GitStore', () => { }) it('will merge a local and remote branch when tracking branch set', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() expect(gitStore.allBranches).toHaveLength(2) @@ -302,7 +290,7 @@ describe('GitStore', () => { // checkout the other branch after cloning await exec(['checkout', 'some-other-branch'], repository.path) - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() const currentBranchBefore = gitStore.allBranches.find( diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index b60c2a18502..899d043b9e3 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -23,27 +23,15 @@ import { deleteLocalBranch, deleteRemoteBranch, } from '../../../src/lib/git' -import { StatsStore, StatsDatabase } from '../../../src/lib/stats' -import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor' import { assertNonNullable } from '../../../src/lib/fatal-error' -import { fakePost } from '../../fake-stats-post' +import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/branch', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - describe('tip', () => { it('returns unborn for new repository', async () => { const repository = await setupEmptyRepository() - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -57,7 +45,7 @@ describe('git/branch', () => { await exec(['checkout', '-b', 'not-master'], repository.path) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -70,7 +58,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('detached-head') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -85,7 +73,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-many-refs') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -101,7 +89,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -116,7 +104,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 19a758e4cf9..6b24f1fc359 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -11,21 +11,9 @@ import { GitStore } from '../../../src/lib/stores' import { Branch, BranchType } from '../../../src/models/branch' import { getStatusOrThrow } from '../../helpers/status' import { exec } from 'dugite' -import { StatsStore, StatsDatabase } from '../../../src/lib/stats' -import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../../fake-stats-post' +import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/checkout', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('throws when invalid characters are used for branch name', async () => { const repository = await setupEmptyRepository() @@ -68,7 +56,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, branches[0], null) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -103,7 +91,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, firstRemoteBranch, null) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index 62b58750d49..e46bea7c982 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -10,9 +10,7 @@ import { import { DiffSelection, DiffSelectionType } from '../../src/models/diff' import { HistoryTabMode, IDisplayHistory } from '../../src/lib/app-state' import { gitHubRepoFixture } from '../helpers/github-repo-builder' -import { StatsDatabase, StatsStore } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' function createSamplePullRequest(gitHubRepository: GitHubRepository) { return new PullRequest( @@ -36,27 +34,15 @@ function createSamplePullRequest(gitHubRepository: GitHubRepository) { } describe('RepositoryStateCache', () => { - let repository: Repository - let statsStore: StatsStore - - beforeEach(() => { - repository = new Repository('/something/path', 1, null, false) - - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('can update branches state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const gitHubRepository = gitHubRepoFixture({ name: 'desktop', owner: 'desktop', }) const firstPullRequest = createSamplePullRequest(gitHubRepository) - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateBranchesState(repository, () => { return { @@ -71,6 +57,7 @@ describe('RepositoryStateCache', () => { }) it('can update changes state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const files = [ new WorkingDirectoryFileChange( 'README.md', @@ -81,7 +68,7 @@ describe('RepositoryStateCache', () => { const summary = 'Hello world!' - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateChangesState(repository, () => { return { @@ -102,9 +89,10 @@ describe('RepositoryStateCache', () => { }) it('can update compare state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const filterText = 'my-cool-branch' - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateCompareState(repository, () => { const newState: IDisplayHistory = { diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts index d4e2e718a23..1795b5dcb7b 100644 --- a/app/test/unit/stores/updates/update-remote-url-test.ts +++ b/app/test/unit/stores/updates/update-remote-url-test.ts @@ -8,9 +8,7 @@ import { updateRemoteUrl } from '../../../../src/lib/stores/updates/update-remot import { shell } from '../../../helpers/test-app-shell' import { setupFixtureRepository } from '../../../helpers/repositories' import { addRemote } from '../../../../src/lib/git' -import { StatsStore, StatsDatabase } from '../../../../src/lib/stats' -import { UiActivityMonitor } from '../../../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../../../fake-stats-post' +import { TestStatsStore } from '../../../helpers/test-stats-store' describe('Update remote url', () => { const apiRepository: IAPIFullRepository = { @@ -51,15 +49,7 @@ describe('Update remote url', () => { await repositoriesStore.upsertGitHubRepository(endpoint, apiRepo) ) await addRemote(repository, 'origin', remoteUrl || apiRepo.clone_url) - gitStore = new GitStore( - repository, - shell, - new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - ) + gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadRemotes() const gitHubRepository = repository.gitHubRepository! From 9f4a336a8cc3414c61c5234f1ccce4256cb0a051 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 12:18:45 +0100 Subject: [PATCH 0221/1338] Update package.json --- vendor/desktop-notifications/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index c64e1a2ba2a..c18122567d9 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -2,8 +2,8 @@ "name": "desktop-notifications", "version": "0.2.5", "description": "A simple and opinionated library for handling Windows notifications", + "license": "MIT", "main": "dist/index.js", - "typings": "dist/index.d.ts", "scripts": { "install": "node-gyp rebuild && tsc", "build": "node-gyp rebuild && tsc", @@ -12,9 +12,6 @@ "prettify": "yarn prettier --write \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", "check-prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"" }, - "keywords": [], - "author": "", - "license": "MIT", "devDependencies": { "@types/uuid": "^8.3.4", "node-gyp": "^10.1.0", From 951b7a77549690b8bc8ddd2fa510af951b9c0f7c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 12:24:54 +0100 Subject: [PATCH 0222/1338] =?UTF-8?q?Bump=20desktop-notifications=20versio?= =?UTF-8?q?n=20just=20in=20case=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/yarn.lock | 2 +- vendor/desktop-notifications/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index ddbf49d2723..a57c4ab1556 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -320,7 +320,7 @@ delegates@^1.0.0: integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= "desktop-notifications@file:../vendor/desktop-notifications": - version "0.2.5" + version "0.2.6" dependencies: node-addon-api "^7.0.0" uuid "^8.3.2" diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index c18122567d9..6a97713e153 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -1,6 +1,6 @@ { "name": "desktop-notifications", - "version": "0.2.5", + "version": "0.2.6", "description": "A simple and opinionated library for handling Windows notifications", "license": "MIT", "main": "dist/index.js", From 0ba5163a09ed5727c55345f8886cffb2c47f0d34 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 12:56:43 +0100 Subject: [PATCH 0223/1338] =?UTF-8?q?More=20changes=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/lib/ipc-shared.ts | 4 ++-- vendor/desktop-notifications/lib/index.ts | 3 ++- vendor/desktop-notifications/package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/lib/ipc-shared.ts b/app/src/lib/ipc-shared.ts index f6539023518..3603e31d828 100644 --- a/app/src/lib/ipc-shared.ts +++ b/app/src/lib/ipc-shared.ts @@ -13,8 +13,8 @@ import { Architecture } from './get-architecture' import { EndpointToken } from './endpoint-token' import { PathType } from '../ui/lib/app-proxy' import { ThemeSource } from '../ui/lib/theme-source' -import { DesktopNotificationPermission } from 'desktop-notifications/dist/notification-permission' -import { NotificationCallback } from 'desktop-notifications/dist/notification-callback' +import { DesktopNotificationPermission } from 'desktop-notifications' +import { NotificationCallback } from 'desktop-notifications' import { DesktopAliveEvent } from './stores/alive-store' import { CLIAction } from './cli-action' diff --git a/vendor/desktop-notifications/lib/index.ts b/vendor/desktop-notifications/lib/index.ts index b4052d45c3d..865b1499bf7 100644 --- a/vendor/desktop-notifications/lib/index.ts +++ b/vendor/desktop-notifications/lib/index.ts @@ -11,4 +11,5 @@ export { supportsNotificationsPermissionRequest, } from './notification-support' export { getNotificationSettingsUrl } from './notification-settings-url' -export { onNotificationEvent } from './notification-callback' +export { NotificationCallback, onNotificationEvent } from './notification-callback' +export { DesktopNotificationPermission } from './notification-permission' diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index 6a97713e153..c01c8f45a54 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -6,7 +6,7 @@ "main": "dist/index.js", "scripts": { "install": "node-gyp rebuild && tsc", - "build": "node-gyp rebuild && tsc", + "build": "tsc", "pretest": "yarn build", "test": "jest -c jest.json", "prettify": "yarn prettier --write \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", From b4703e76be93bb6a74cff2a2216781ab68077349 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 15:36:56 +0100 Subject: [PATCH 0224/1338] Add "declaration": true --- vendor/desktop-notifications/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vendor/desktop-notifications/tsconfig.json b/vendor/desktop-notifications/tsconfig.json index 2d1e9c8438a..2081134abde 100644 --- a/vendor/desktop-notifications/tsconfig.json +++ b/vendor/desktop-notifications/tsconfig.json @@ -14,7 +14,8 @@ "sourceMap": true, "strict": true, "outDir": "./dist", - "useUnknownInCatchVariables": false + "useUnknownInCatchVariables": false, + "declaration": true }, "include": ["lib/**/*.ts"], "exclude": ["node_modules", "build"], From 3cf9b7f79c8966cdbcb28421253f32f0327e2123 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 11:28:05 +0100 Subject: [PATCH 0225/1338] Don't use toStrictEqual to compare strings --- app/test/unit/git/commit-test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 3404ae8e9e9..09359d59e5f 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -675,8 +675,8 @@ describe('git/commit', () => { 'utf8' ) - expect(fileContents).not.toStrictEqual(fileContentsOurs) - expect(fileContents).toStrictEqual(fileContentsTheirs) + expect(fileContents).not.toEqual(fileContentsOurs) + expect(fileContents).toEqual(fileContentsTheirs) }) it('chooses `our` version of a file and commits', async () => { @@ -708,7 +708,7 @@ describe('git/commit', () => { 'utf8' ) - expect(fileContents).toStrictEqual(fileContentsOurs) + expect(fileContents).toEqual(fileContentsOurs) }) }) }) From 80f4e93ddbc1f504b4cc533bfbe36bfd8fbd3f2d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 13:59:32 +0100 Subject: [PATCH 0226/1338] Use less exotic comparators --- app/test/unit/git/log-test.ts | 7 ++----- app/test/unit/git/tag-test.ts | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/test/unit/git/log-test.ts b/app/test/unit/git/log-test.ts index ee8a758375d..36582195e00 100644 --- a/app/test/unit/git/log-test.ts +++ b/app/test/unit/git/log-test.ts @@ -50,11 +50,8 @@ describe('git/log', () => { const commits = await getCommits(repository, 'HEAD', 100) expect(commits).toBeArrayOfSize(5) - expect(commits[0].tags).toIncludeSameMembers(['important']) - expect(commits[1].tags).toIncludeSameMembers([ - 'tentative', - 'less-important', - ]) + expect(commits[0].tags).toEqual(['important']) + expect(commits[1].tags).toEqual(['tentative', 'less-important']) expect(commits[2].tags).toBeArrayOfSize(0) }) }) diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 21c4e9d2d00..88a96c7945b 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -125,7 +125,7 @@ describe('git/tag', () => { it('returns an empty array when there are no tags to get pushed', async () => { expect( await fetchTagsToPush(repository, originRemote, 'master') - ).toIncludeAllMembers([]) + ).toBeArrayOfSize(0) }) it("returns local tags that haven't been pushed", async () => { From f9e925dfc39d680871dba6e1b001c3fe059b0ea8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 13:59:54 +0100 Subject: [PATCH 0227/1338] Less exotic comparators: toEqual works just fine here --- app/test/unit/progress/clone-test.ts | 8 ++++---- app/test/unit/progress/git-test.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test/unit/progress/clone-test.ts b/app/test/unit/progress/clone-test.ts index 2d726544686..cb80b6bde40 100644 --- a/app/test/unit/progress/clone-test.ts +++ b/app/test/unit/progress/clone-test.ts @@ -37,21 +37,21 @@ describe('CloneProgressParser', () => { 'remote: Compressing objects: 45% (10/22)' ) expect(compressing.kind).toBe('progress') - expect(compressing.percent).toBeCloseTo((10 / 22) * 0.1, 0.01) + expect(compressing.percent).toEqual((10 / 22) * 0.1) const receiving = parser.parse( 'Receiving objects: 17% (4808/28282), 3.30 MiB | 1.29 MiB/s' ) expect(receiving.kind).toBe('progress') - expect(receiving.percent).toBeCloseTo(0.1 + (4808 / 28282) * 0.6, 0.01) + expect(receiving.percent).toEqual(0.1 + (4808 / 28282) * 0.6) const resolving = parser.parse('Resolving deltas: 89% (18063/20263)') expect(resolving.kind).toBe('progress') - expect(resolving.percent).toBeCloseTo(0.7 + (18063 / 20263) * 0.1, 0.01) + expect(resolving.percent).toEqual(0.7 + (18063 / 20263) * 0.1) const checkingOut = parser.parse('Checking out files: 100% (579/579)') expect(checkingOut.kind).toBe('progress') - expect(checkingOut.percent).toBeCloseTo(0.8 + (579 / 579) * 0.2, 0.01) + expect(checkingOut.percent).toEqual(0.8 + (579 / 579) * 0.2) }) it('ignores wrong order', () => { diff --git a/app/test/unit/progress/git-test.ts b/app/test/unit/progress/git-test.ts index cc029236790..e87421ae5be 100644 --- a/app/test/unit/progress/git-test.ts +++ b/app/test/unit/progress/git-test.ts @@ -16,8 +16,8 @@ describe('GitProgressParser', () => { ]) expect( - parser.parse('remote: Compressing objects: 72% (16/22)') - ).toHaveProperty('percent', 16 / 22) + parser.parse('remote: Compressing objects: 72% (16/22)').percent + ).toEqual(16 / 22) }) it('parses progress with several steps', () => { From e852c97a0f63279a6b0339dbe499c322f8e92fcc Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:08:08 +0100 Subject: [PATCH 0228/1338] Less exotic comparators: don't be so strict --- app/test/unit/git/reorder-test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test/unit/git/reorder-test.ts b/app/test/unit/git/reorder-test.ts index 65e0d20a270..3b752ec6604 100644 --- a/app/test/unit/git/reorder-test.ts +++ b/app/test/unit/git/reorder-test.ts @@ -64,7 +64,7 @@ describe('git/reorder', () => { expect(log.length).toBe(5) const summaries = log.map(c => c.summary) - expect(summaries).toStrictEqual([ + expect(summaries).toEqual([ 'third', 'fourth', 'first', @@ -90,7 +90,7 @@ describe('git/reorder', () => { const log = await getCommits(repository, 'HEAD', 5) const summaries = log.map(c => c.summary) - expect(summaries).toStrictEqual([ + expect(summaries).toEqual([ 'first', 'last', 'third', @@ -111,7 +111,7 @@ describe('git/reorder', () => { expect(log.length).toBe(3) const summaries = log.map(c => c.summary) - expect(summaries).toStrictEqual(['second', 'initialize', 'first']) + expect(summaries).toEqual(['second', 'initialize', 'first']) }) it('handles reordering a conflicting commit', async () => { @@ -187,7 +187,7 @@ describe('git/reorder', () => { const log = await getCommits(repository, 'HEAD', 5) const summaries = log.map(c => c.summary) - expect(summaries).toStrictEqual([ + expect(summaries).toEqual([ 'second - fixed', 'third - fixed', 'first', From 3fefb61d81065a4b36b1aba3221533f8bd3de16f Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:27:20 +0100 Subject: [PATCH 0229/1338] Less exotic comparators: no snapshots --- app/test/unit/git/apply-test.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index 5767fbe3884..c24659b8ea0 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -142,8 +142,7 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)) - .toMatchInlineSnapshot(` + expect(getDifference(previousContents, fileContents)).toEqual(` "@@ -7,0 +7,1 @@ + Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor" `) @@ -173,8 +172,7 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)) - .toMatchInlineSnapshot(` + expect(getDifference(previousContents, fileContents)).toEqual(` "@@ -7,0 +7,4 @@ + Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor + nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in @@ -206,8 +204,7 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)) - .toMatchInlineSnapshot(` + expect(getDifference(previousContents, fileContents)).toEqual(` "@@ -21,1 +21,0 @@ - nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in" `) @@ -244,8 +241,7 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)) - .toMatchInlineSnapshot(` + expect(getDifference(previousContents, fileContents)).toEqual(` "@@ -20,4 +20,0 @@ - Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor - nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in From 570e91692ced6f2df567b5042a3d2c01cb2b615f Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:32:05 +0100 Subject: [PATCH 0230/1338] Await async expects --- app/test/unit/git/commit-test.ts | 2 +- app/test/unit/git/diff-test.ts | 4 ++-- app/test/unit/git/pull/ahead-and-behind-test.ts | 4 ++-- app/test/unit/git/remote-test.ts | 2 +- app/test/unit/git/tag-test.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 09359d59e5f..ef26132d2f0 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -725,7 +725,7 @@ describe('git/commit', () => { }) it('throws an error', async () => { const status = await getStatusOrThrow(repository) - expect( + await expect( createMergeCommit(repository, status.workingDirectory.files) ).rejects.toThrow('There are no changes to commit.') }) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 10878b67e63..8bd14c3a326 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -397,8 +397,8 @@ describe('git/diff', () => { beforeEach(async () => { repo = await setupEmptyRepository() }) - it('throws since HEAD doesnt exist', () => { - expect(getBinaryPaths(repo, 'HEAD', [])).rejects.toThrow() + it('throws since HEAD doesnt exist', async () => { + await expect(getBinaryPaths(repo, 'HEAD', [])).rejects.toThrow() }) }) diff --git a/app/test/unit/git/pull/ahead-and-behind-test.ts b/app/test/unit/git/pull/ahead-and-behind-test.ts index cc262ac96bb..79389fbadc1 100644 --- a/app/test/unit/git/pull/ahead-and-behind-test.ts +++ b/app/test/unit/git/pull/ahead-and-behind-test.ts @@ -161,8 +161,8 @@ describe('git/pull', () => { ]) }) - it(`throws an error as the user blocks merge commits on pull`, () => { - expect(pull(repository, remote)).rejects.toThrow() + it(`throws an error as the user blocks merge commits on pull`, async () => { + await expect(pull(repository, remote)).rejects.toThrow() }) }) }) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 9521fc8de03..9f4c19625b9 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -174,7 +174,7 @@ describe('git/remote', () => { expect(remotes[0].url).toEqual(newUrl) }) it('returns false for unknown remote name', async () => { - expect(setRemoteURL(repository, 'none', newUrl)).rejects.toThrow() + await expect(setRemoteURL(repository, 'none', newUrl)).rejects.toThrow() const remotes = await getRemotes(repository) expect(remotes).toHaveLength(1) diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 88a96c7945b..70176d5702f 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -73,7 +73,7 @@ describe('git/tag', () => { it('fails when creating a tag with a name that already exists', async () => { await createTag(repository, 'my-new-tag', 'HEAD') - expect(createTag(repository, 'my-new-tag', 'HEAD')).rejects.toThrow( + await expect(createTag(repository, 'my-new-tag', 'HEAD')).rejects.toThrow( /already exists/i ) }) From 93baf0129c676ae0a5020bafe7f16e2137fed207 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:36:53 +0100 Subject: [PATCH 0231/1338] Use non-deprecated toThrow --- app/test/unit/git/stash-test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index 953cbfa887f..6f6fab3bf3b 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -304,7 +304,7 @@ describe('git/stash', () => { const entryToApply = desktopEntries[0] await expect( popStashEntry(repository, entryToApply.stashSha) - ).rejects.toThrowError() + ).rejects.toThrow() }) }) }) From 17c5980f3a00b21a7aa2b1dafd4b538c99eb950b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:37:28 +0100 Subject: [PATCH 0232/1338] Use regex for future compatibility with assert --- app/test/unit/git/commit-test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index ef26132d2f0..bdcd6b5c628 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -727,7 +727,7 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repository) await expect( createMergeCommit(repository, status.workingDirectory.files) - ).rejects.toThrow('There are no changes to commit.') + ).rejects.toThrow(/There are no changes to commit./) }) }) }) From e1f42e3b7e62a75ae18e8bcab2cd812cbe4cb898 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:41:05 +0100 Subject: [PATCH 0233/1338] Await result instead --- app/test/unit/git/format-patch-test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/test/unit/git/format-patch-test.ts b/app/test/unit/git/format-patch-test.ts index 1959140520b..244a82fd04f 100644 --- a/app/test/unit/git/format-patch-test.ts +++ b/app/test/unit/git/format-patch-test.ts @@ -64,9 +64,7 @@ describe('formatPatch', () => { firstCommit = stdout.trim() }) it('can create a series of commits from start to HEAD', async () => { - await expect( - formatPatch(repository, firstCommit, 'HEAD') - ).resolves.toBeString() + expect(await formatPatch(repository, firstCommit, 'HEAD')).toBeString() }) }) }) From 8c94f443a29eeed79e6779bab7bfa3fafff1d4da Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:43:44 +0100 Subject: [PATCH 0234/1338] await async expect --- app/test/unit/git/remote-test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 9f4c19625b9..0d7390ca3a0 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -152,7 +152,7 @@ describe('git/remote', () => { describe('removeRemote', () => { it('silently fails when remote not defined', async () => { const repository = await setupEmptyRepository() - expect(removeRemote(repository, 'origin')).resolves.not.toThrow() + await expect(removeRemote(repository, 'origin')).resolves.not.toThrow() }) }) From 1d6921c770b2193d8473b8d7fe7b1bc0f1b61e19 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:46:47 +0100 Subject: [PATCH 0235/1338] Simplify for conversion parser --- app/test/unit/status-parser-test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/test/unit/status-parser-test.ts b/app/test/unit/status-parser-test.ts index 8e985bea610..2fafb12d43e 100644 --- a/app/test/unit/status-parser-test.ts +++ b/app/test/unit/status-parser-test.ts @@ -96,9 +96,10 @@ describe('parsePorcelainStatus', () => { expect(entries).toHaveLength(1) - expect(entries[0].path) - .toBe(`ProjectSID/Images.xcassets/iPhone 67/Status Center/Report X68 Y461 - /.DS_Store`) + const expectedPath = `ProjectSID/Images.xcassets/iPhone 67/Status Center/Report X68 Y461 + /.DS_Store` + + expect(entries[0].path).toBe(expectedPath) expect(entries[0].statusCode).toBe('D.') }) From fc5f69684a2d80ceffddb6de2c7ba1e8f3e8596d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:51:19 +0100 Subject: [PATCH 0236/1338] Simplify --- app/test/unit/git/diff-test.ts | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 8bd14c3a326..1eb8e6eec88 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -517,11 +517,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() expect(diff.oldSHA).toBeNull() expect(diff.newSHA).toBeNull() - expect(diff.status).toMatchObject({ - commitChanged: false, - modifiedChanges: true, - untrackedChanges: false, - }) + expect(diff.status.commitChanged).toBe(false) + expect(diff.status.modifiedChanges).toBe(true) + expect(diff.status.untrackedChanges).toBe(false) }) it('can get the diff for a submodule with only untracked changes', async () => { @@ -531,11 +529,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() expect(diff.oldSHA).toBeNull() expect(diff.newSHA).toBeNull() - expect(diff.status).toMatchObject({ - commitChanged: false, - modifiedChanges: false, - untrackedChanges: true, - }) + expect(diff.status.commitChanged).toBe(false) + expect(diff.status.modifiedChanges).toBe(false) + expect(diff.status.untrackedChanges).toBe(true) }) it('can get the diff for a submodule a commit change', async () => { @@ -546,11 +542,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() expect(diff.oldSHA).not.toBeNull() expect(diff.newSHA).not.toBeNull() - expect(diff.status).toMatchObject({ - commitChanged: true, - modifiedChanges: false, - untrackedChanges: false, - }) + expect(diff.status.commitChanged).toBe(true) + expect(diff.status.modifiedChanges).toBe(false) + expect(diff.status.untrackedChanges).toBe(false) }) it('can get the diff for a submodule a all kinds of changes', async () => { @@ -562,11 +556,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() expect(diff.oldSHA).not.toBeNull() expect(diff.newSHA).not.toBeNull() - expect(diff.status).toMatchObject({ - commitChanged: true, - modifiedChanges: true, - untrackedChanges: true, - }) + expect(diff.status.commitChanged).toBe(true) + expect(diff.status.modifiedChanges).toBe(true) + expect(diff.status.untrackedChanges).toBe(true) }) }) From fb278b3d99dcaf54b8787a6ba6e83522493073e1 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 15:59:21 +0100 Subject: [PATCH 0237/1338] Simplify for converter --- app/test/unit/git/remote-test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 0d7390ca3a0..694b112dcb1 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -83,7 +83,8 @@ describe('git/remote', () => { // Shows that the new remote does have a filter const rawGetRemote = await exec(['remote', '-v'], repository.path) - expect(rawGetRemote.stdout).toContain(url + ' (fetch) [blob:none]') + const needle = url + ' (fetch) [blob:none]' + expect(rawGetRemote.stdout).toContain(needle) // Shows that the `getRemote` returns that remote const result = await getRemotes(repository) From c62e264a2370b6f4c063a0d05f00a970bc81ce76 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 16:06:21 +0100 Subject: [PATCH 0238/1338] Use regexes for future compat with assert.throws --- app/test/unit/script/version-test.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/test/unit/script/version-test.ts b/app/test/unit/script/version-test.ts index 43b8914f454..c7e25a02929 100644 --- a/app/test/unit/script/version-test.ts +++ b/app/test/unit/script/version-test.ts @@ -10,15 +10,13 @@ describe('getNextVersionNumber', () => { describe("doesn't care for", () => { it('beta versions', () => { - const version = '1.0.1-beta1' - expect(() => getNextVersionNumber(version, channel)).toThrow( - `Unable to draft production release using beta version '${version}'` + expect(() => getNextVersionNumber('1.0.1-beta1', channel)).toThrow( + /Unable to draft production release using beta version '1\.0\.1-beta1'/ ) }) it('test versions', () => { - const version = '1.0.1-test42' expect(() => getNextVersionNumber('1.0.1-test42', channel)).toThrow( - `Unable to draft production release using test version '${version}'` + /Unable to draft production release using test version '1\.0\.1-test42'/ ) }) }) @@ -46,9 +44,8 @@ describe('getNextVersionNumber', () => { describe("doesn't care for", () => { it('test versions', () => { - const version = '1.0.1-test1' - expect(() => getNextVersionNumber(version, channel)).toThrow( - `Unable to draft beta release using test version '${version}'` + expect(() => getNextVersionNumber('1.0.1-test1', channel)).toThrow( + /Unable to draft beta release using test version '1\.0\.1-test1'/ ) }) }) From 0e5949ccd02f781465b4b89a45a7aaacdf0f9954 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 16:41:36 +0100 Subject: [PATCH 0239/1338] Simplify for converter --- app/test/unit/git/config-test.ts | 48 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index dc8ed21ae71..1372f4bfdef 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -37,31 +37,35 @@ describe('git/config', () => { describe('GIT_CONFIG_PARAMETERS', () => { it('picks them up', async () => { - expect( - await git(['config', 'desktop.test'], repository.path, '', { - successExitCodes: new Set([1]), - }).then(x => x.stdout) - ).toBeEmpty() - expect( - await git(['config', 'desktop.test'], repository.path, '', { - env: { - GIT_CONFIG_PARAMETERS: "'desktop.test=1'", - }, - }).then(x => x.stdout) - ).toEqual('1\n') + const withoutEnvOutput = await git( + ['config', 'desktop.test'], + repository.path, + '', + { successExitCodes: new Set([1]) } + ).then(x => x.stdout) + + expect(withoutEnvOutput).toBeEmpty() + const withEnvOutput = await git( + ['config', 'desktop.test'], + repository.path, + '', + { env: { GIT_CONFIG_PARAMETERS: "'desktop.test=1'" } } + ).then(x => x.stdout) + + expect(withEnvOutput).toEqual('1\n') }) it('takes precedence over GIT_CONFIG_*', async () => { - expect( - await git(['config', 'user.name'], repository.path, '', { - env: { - GIT_CONFIG_PARAMETERS: "'user.name=foobar'", - GIT_CONFIG_COUNT: '1', - GIT_CONFIG_KEY_0: 'user.name', - GIT_CONFIG_VALUE_0: 'baz', - }, - }).then(x => x.stdout) - ).toEqual('foobar\n') + const output = await git(['config', 'user.name'], repository.path, '', { + env: { + GIT_CONFIG_PARAMETERS: "'user.name=foobar'", + GIT_CONFIG_COUNT: '1', + GIT_CONFIG_KEY_0: 'user.name', + GIT_CONFIG_VALUE_0: 'baz', + }, + }).then(x => x.stdout) + + expect(output).toEqual('foobar\n') }) }) From a6198a59f7cc4e4fce0d9fd72d344394fb292fcb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 16:44:33 +0100 Subject: [PATCH 0240/1338] Assert not null --- app/test/unit/git/branch-test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index b60c2a18502..6495246dc00 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -139,12 +139,14 @@ describe('git/branch', () => { it('finds one branch name', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD') + expect(branches).not.toBeNull() expect(branches).toHaveLength(1) expect(branches![0]).toEqual('master') }) it('finds no branch names', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD^') + expect(branches).not.toBeNull() expect(branches).toHaveLength(0) }) @@ -162,6 +164,7 @@ describe('git/branch', () => { }) it('finds multiple branch names', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD') + expect(branches).not.toBeNull() expect(branches).toHaveLength(2) expect(branches).toContain('other-branch') expect(branches).toContain('master') From e2324a73826caaac03cb6bf7dc0838e08de713ab Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Mar 2025 16:49:47 +0100 Subject: [PATCH 0241/1338] Assert not undefined --- app/test/unit/text-diff-expansion-test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/test/unit/text-diff-expansion-test.ts b/app/test/unit/text-diff-expansion-test.ts index 68a4c5df85c..351a89f1538 100644 --- a/app/test/unit/text-diff-expansion-test.ts +++ b/app/test/unit/text-diff-expansion-test.ts @@ -91,7 +91,9 @@ describe('text-diff-expansion', () => { it('does not add a dummy hunk to the bottom when last hunk reaches bottom', async () => { const { textDiff } = await prepareDiff(100, [99]) - expect(textDiff.hunks.at(-1)?.lines).toHaveLength(6) + const lastHunk = textDiff.hunks.at(-1) + expect(lastHunk).not.toBeUndefined() + expect(lastHunk!.lines).toHaveLength(6) }) it('expands the initial hunk without reaching the top', async () => { From f3da7845edd67aaff7033aab7170b980f3425782 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Mar 2025 11:54:56 +0100 Subject: [PATCH 0242/1338] Add TestStatsStore to simplify tests --- app/src/lib/stats/stats-store.ts | 13 ++----- app/src/lib/stores/git-store-cache.ts | 4 +-- app/src/lib/stores/git-store.ts | 6 ++-- app/src/lib/stores/repository-state-cache.ts | 4 +-- .../repository-builder-branch-pruner.ts | 14 ++------ app/test/helpers/test-stats-store.ts | 10 ++++++ app/test/unit/branch-pruner-test.ts | 28 +++++---------- app/test/unit/git-store-cache-test.ts | 36 ++++--------------- app/test/unit/git-store-test.ts | 34 ++++++------------ app/test/unit/git/branch-test.ts | 26 ++++---------- app/test/unit/git/checkout-test.ts | 18 ++-------- app/test/unit/repository-state-cache-test.ts | 26 ++++---------- .../stores/updates/update-remote-url-test.ts | 14 ++------ 13 files changed, 65 insertions(+), 168 deletions(-) create mode 100644 app/test/helpers/test-stats-store.ts diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index e317050af4c..41c49974b37 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -245,7 +245,7 @@ const DefaultDailyMeasures: IDailyMeasures = { } // A subtype of IDailyMeasures filtered to contain only its numeric properties -type NumericMeasures = { +export type NumericMeasures = { [P in keyof IDailyMeasures as IDailyMeasures[P] extends number ? P : never]: IDailyMeasures[P] @@ -420,13 +420,7 @@ type DailyStats = ICalculatedStats & * */ export interface IStatsStore { - increment: ( - metric: - | 'mergeAbortedAfterConflictsCount' - | 'rebaseAbortedAfterConflictsCount' - | 'mergeSuccessAfterConflictsCount' - | 'rebaseSuccessAfterConflictsCount' - ) => void + increment: (k: keyof NumericMeasures, n?: number) => Promise } const defaultPostImplementation = (body: Record) => @@ -986,9 +980,6 @@ export class StatsStore implements IStatsStore { } } - public recordTagCreated = (numCreatedTags: number) => - this.increment('tagsCreated', numCreatedTags) - private recordSquashUndone = () => this.increment('squashUndoneCount') public async recordOperationConflictsEncounteredCount( diff --git a/app/src/lib/stores/git-store-cache.ts b/app/src/lib/stores/git-store-cache.ts index ecc847c1a8f..f18793bd8c5 100644 --- a/app/src/lib/stores/git-store-cache.ts +++ b/app/src/lib/stores/git-store-cache.ts @@ -1,7 +1,7 @@ import { GitStore } from './git-store' import { Repository } from '../../models/repository' import { IAppShell } from '../app-shell' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' export class GitStoreCache { /** GitStores keyed by their hash. */ @@ -9,7 +9,7 @@ export class GitStoreCache { public constructor( private readonly shell: IAppShell, - private readonly statsStore: StatsStore, + private readonly statsStore: IStatsStore, private readonly onGitStoreUpdated: ( repository: Repository, gitStore: GitStore diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 2ad88655838..0e660c40253 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -93,7 +93,7 @@ import { BaseStore } from './base-store' import { getStashes, getStashedFiles } from '../git/stash' import { IStashEntry, StashedChangesLoadStates } from '../../models/stash-entry' import { PullRequest } from '../../models/pull-request' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' import { getTagsToPush, storeTagsToPush } from './helpers/tags-to-push-storage' import { DiffSelection, ITextDiff } from '../../models/diff' import { getDefaultBranch } from '../helpers/default-branch' @@ -161,7 +161,7 @@ export class GitStore extends BaseStore { public constructor( private readonly repository: Repository, private readonly shell: IAppShell, - private readonly statsStore: StatsStore + private readonly statsStore: IStatsStore ) { super() @@ -302,7 +302,7 @@ export class GitStore extends BaseStore { } if (numCreatedTags > 0) { - this.statsStore.recordTagCreated(numCreatedTags) + this.statsStore.increment('tagsCreated', numCreatedTags) } const commitsToStore = [] diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 31defddb601..e08106ba236 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -23,13 +23,13 @@ import { import { merge } from '../merge' import { DefaultCommitMessage } from '../../models/commit-message' import { sendNonFatalException } from '../helpers/non-fatal-exception' -import { StatsStore } from '../stats' +import { IStatsStore } from '../stats' import { RepoRulesInfo } from '../../models/repo-rules' export class RepositoryStateCache { private readonly repositoryState = new Map() - public constructor(private readonly statsStore: StatsStore) {} + public constructor(private readonly statsStore: IStatsStore) {} /** Get the state for the repository. */ public get(repository: Repository): IRepositoryState { diff --git a/app/test/helpers/repository-builder-branch-pruner.ts b/app/test/helpers/repository-builder-branch-pruner.ts index c50ef2aca94..c837a9dc174 100644 --- a/app/test/helpers/repository-builder-branch-pruner.ts +++ b/app/test/helpers/repository-builder-branch-pruner.ts @@ -9,9 +9,7 @@ import { } from '../../src/models/repository' import { IAPIFullRepository, getDotComAPIEndpoint } from '../../src/lib/api' import { shell } from './test-app-shell' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from './test-stats-store' export async function createRepository() { const repo = await setupEmptyRepository() @@ -120,15 +118,7 @@ async function primeCaches( repository: Repository, repositoriesStateCache: RepositoryStateCache ) { - const gitStore = new GitStore( - repository, - shell, - new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - ) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) // rather than re-create the branches and stuff as objects, these calls // will run the underlying Git operations and update the GitStore state diff --git a/app/test/helpers/test-stats-store.ts b/app/test/helpers/test-stats-store.ts new file mode 100644 index 00000000000..fbddb7e41aa --- /dev/null +++ b/app/test/helpers/test-stats-store.ts @@ -0,0 +1,10 @@ +import { IStatsStore, NumericMeasures } from '../../src/lib/stats/stats-store' + +export class TestStatsStore implements IStatsStore { + public metrics: Partial> = {} + + public increment: IStatsStore['increment'] = async (k, n = 1) => { + this.metrics.adjustedFiltersForHiddenChangesCount = 1 + this.metrics[k] = (this.metrics[k] || 0) + n + } +} diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index 56b188bdd25..ca7f989523a 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -11,40 +11,28 @@ import { createRepository as createPrunedRepository, setupRepository, } from '../helpers/repository-builder-branch-pruner' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' +import { TestStatsStore } from '../helpers/test-stats-store' import { offsetFromNow } from '../../src/lib/offset-from' import * as FSE from 'fs-extra' import * as path from 'path' -import { fakePost } from '../fake-stats-post' +import noop from 'lodash/noop' describe('BranchPruner', () => { - const onGitStoreUpdated = () => {} - const onDidError = () => {} - let gitStoreCache: GitStoreCache + let repositoriesDb: TestRepositoriesDatabase let repositoriesStore: RepositoriesStore let repositoriesStateCache: RepositoryStateCache beforeEach(async () => { - const statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - gitStoreCache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) - - const repositoriesDb = new TestRepositoriesDatabase() - await repositoriesDb.reset() + const statsStore = new TestStatsStore() + gitStoreCache = new GitStoreCache(shell, statsStore, noop, noop) + repositoriesDb = new TestRepositoriesDatabase() repositoriesStore = new RepositoriesStore(repositoriesDb) repositoriesStateCache = new RepositoryStateCache(statsStore) }) + afterEach(() => repositoriesDb.delete()) + it('does nothing on non GitHub repositories', async () => { const path = await setupFixtureRepository('branch-prune-tests') diff --git a/app/test/unit/git-store-cache-test.ts b/app/test/unit/git-store-cache-test.ts index 1301620a585..1d074f67001 100644 --- a/app/test/unit/git-store-cache-test.ts +++ b/app/test/unit/git-store-cache-test.ts @@ -1,33 +1,13 @@ import { Repository } from '../../src/models/repository' import { GitStoreCache } from '../../src/lib/stores/git-store-cache' import { shell } from '../helpers/test-app-shell' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' +import noop from 'lodash/noop' describe('GitStoreCache', () => { - let repository: Repository - let statsStore: StatsStore - - const onGitStoreUpdated = () => {} - const onDidError = () => {} - - beforeEach(() => { - repository = new Repository('/something/path', 1, null, false) - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('returns same instance of GitStore', () => { - const cache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) + const repository = new Repository('/something/path', 1, null, false) + const cache = new GitStoreCache(shell, new TestStatsStore(), noop, noop) const first = cache.get(repository) const second = cache.get(repository) @@ -36,12 +16,8 @@ describe('GitStoreCache', () => { }) it('returns different instance of GitStore after removing', () => { - const cache = new GitStoreCache( - shell, - statsStore, - onGitStoreUpdated, - onDidError - ) + const repository = new Repository('/something/path', 1, null, false) + const cache = new GitStoreCache(shell, new TestStatsStore(), noop, noop) const first = cache.get(repository) cache.remove(repository) diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index 48954e24b16..3c68e31b30b 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -20,26 +20,14 @@ import { cloneLocalRepository, } from '../helpers/repository-scaffolding' import { BranchType } from '../../src/models/branch' -import { StatsStore, StatsDatabase } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' describe('GitStore', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - describe('loadCommitBatch', () => { it('includes HEAD when loading commits', async () => { const path = await setupFixtureRepository('repository-with-105-commits') const repo = new Repository(path, -1, null, false) - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const commits = await gitStore.loadCommitBatch('HEAD', 0) @@ -51,7 +39,7 @@ describe('GitStore', () => { it('can discard changes from a repository', async () => { const repo = await setupEmptyRepository() - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const readmeFile = 'README.md' const readmeFilePath = Path.join(repo.path, readmeFile) @@ -89,7 +77,7 @@ describe('GitStore', () => { it('can discard a renamed file', async () => { const repo = await setupEmptyRepository() - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const file = 'README.md' const renamedFile = 'NEW-README.md' @@ -137,7 +125,7 @@ describe('GitStore', () => { }) it('reports the repository is unborn', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() expect(gitStore.tip.kind).toEqual(TipState.Valid) @@ -149,7 +137,7 @@ describe('GitStore', () => { }) it('pre-fills the commit message', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.undoCommit(firstCommit!) @@ -159,7 +147,7 @@ describe('GitStore', () => { }) it('clears the undo commit dialog', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -179,7 +167,7 @@ describe('GitStore', () => { }) it('has no staged files', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -210,7 +198,7 @@ describe('GitStore', () => { it('can discard modified change cleanly', async () => { const path = await setupFixtureRepository('repository-with-HEAD-file') const repo = new Repository(path, 1, null, false) - const gitStore = new GitStore(repo, shell, statsStore) + const gitStore = new GitStore(repo, shell, new TestStatsStore()) const file = 'README.md' const filePath = Path.join(repo.path, file) @@ -284,7 +272,7 @@ describe('GitStore', () => { }) it('will merge a local and remote branch when tracking branch set', async () => { - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() expect(gitStore.allBranches).toHaveLength(2) @@ -302,7 +290,7 @@ describe('GitStore', () => { // checkout the other branch after cloning await exec(['checkout', 'some-other-branch'], repository.path) - const gitStore = new GitStore(repository, shell, statsStore) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() const currentBranchBefore = gitStore.allBranches.find( diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index 6495246dc00..d6e7553f1dc 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -23,27 +23,15 @@ import { deleteLocalBranch, deleteRemoteBranch, } from '../../../src/lib/git' -import { StatsStore, StatsDatabase } from '../../../src/lib/stats' -import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor' import { assertNonNullable } from '../../../src/lib/fatal-error' -import { fakePost } from '../../fake-stats-post' +import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/branch', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - describe('tip', () => { it('returns unborn for new repository', async () => { const repository = await setupEmptyRepository() - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -57,7 +45,7 @@ describe('git/branch', () => { await exec(['checkout', '-b', 'not-master'], repository.path) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -70,7 +58,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('detached-head') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -85,7 +73,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-many-refs') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -101,7 +89,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -116,7 +104,7 @@ describe('git/branch', () => { const path = await setupFixtureRepository('repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 19a758e4cf9..6b24f1fc359 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -11,21 +11,9 @@ import { GitStore } from '../../../src/lib/stores' import { Branch, BranchType } from '../../../src/models/branch' import { getStatusOrThrow } from '../../helpers/status' import { exec } from 'dugite' -import { StatsStore, StatsDatabase } from '../../../src/lib/stats' -import { UiActivityMonitor } from '../../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../../fake-stats-post' +import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/checkout', () => { - let statsStore: StatsStore - - beforeEach(() => { - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('throws when invalid characters are used for branch name', async () => { const repository = await setupEmptyRepository() @@ -68,7 +56,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, branches[0], null) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip @@ -103,7 +91,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, firstRemoteBranch, null) - const store = new GitStore(repository, shell, statsStore) + const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() const tip = store.tip diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index 62b58750d49..e46bea7c982 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -10,9 +10,7 @@ import { import { DiffSelection, DiffSelectionType } from '../../src/models/diff' import { HistoryTabMode, IDisplayHistory } from '../../src/lib/app-state' import { gitHubRepoFixture } from '../helpers/github-repo-builder' -import { StatsDatabase, StatsStore } from '../../src/lib/stats' -import { UiActivityMonitor } from '../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../fake-stats-post' +import { TestStatsStore } from '../helpers/test-stats-store' function createSamplePullRequest(gitHubRepository: GitHubRepository) { return new PullRequest( @@ -36,27 +34,15 @@ function createSamplePullRequest(gitHubRepository: GitHubRepository) { } describe('RepositoryStateCache', () => { - let repository: Repository - let statsStore: StatsStore - - beforeEach(() => { - repository = new Repository('/something/path', 1, null, false) - - statsStore = new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - }) - it('can update branches state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const gitHubRepository = gitHubRepoFixture({ name: 'desktop', owner: 'desktop', }) const firstPullRequest = createSamplePullRequest(gitHubRepository) - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateBranchesState(repository, () => { return { @@ -71,6 +57,7 @@ describe('RepositoryStateCache', () => { }) it('can update changes state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const files = [ new WorkingDirectoryFileChange( 'README.md', @@ -81,7 +68,7 @@ describe('RepositoryStateCache', () => { const summary = 'Hello world!' - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateChangesState(repository, () => { return { @@ -102,9 +89,10 @@ describe('RepositoryStateCache', () => { }) it('can update compare state for a repository', () => { + const repository = new Repository('/something/path', 1, null, false) const filterText = 'my-cool-branch' - const cache = new RepositoryStateCache(statsStore) + const cache = new RepositoryStateCache(new TestStatsStore()) cache.updateCompareState(repository, () => { const newState: IDisplayHistory = { diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts index d4e2e718a23..1795b5dcb7b 100644 --- a/app/test/unit/stores/updates/update-remote-url-test.ts +++ b/app/test/unit/stores/updates/update-remote-url-test.ts @@ -8,9 +8,7 @@ import { updateRemoteUrl } from '../../../../src/lib/stores/updates/update-remot import { shell } from '../../../helpers/test-app-shell' import { setupFixtureRepository } from '../../../helpers/repositories' import { addRemote } from '../../../../src/lib/git' -import { StatsStore, StatsDatabase } from '../../../../src/lib/stats' -import { UiActivityMonitor } from '../../../../src/ui/lib/ui-activity-monitor' -import { fakePost } from '../../../fake-stats-post' +import { TestStatsStore } from '../../../helpers/test-stats-store' describe('Update remote url', () => { const apiRepository: IAPIFullRepository = { @@ -51,15 +49,7 @@ describe('Update remote url', () => { await repositoriesStore.upsertGitHubRepository(endpoint, apiRepo) ) await addRemote(repository, 'origin', remoteUrl || apiRepo.clone_url) - gitStore = new GitStore( - repository, - shell, - new StatsStore( - new StatsDatabase('test-StatsDatabase'), - new UiActivityMonitor(), - fakePost - ) - ) + gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadRemotes() const gitHubRepository = repository.gitHubRepository! From 21cb2f8bde9250ea09bb66753b820c8848a5f83a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 25 Mar 2025 19:42:43 +0100 Subject: [PATCH 0243/1338] Fix compiler issues with desktop-notifications --- .../src/win/DesktopNotification.h | 10 +++++----- .../src/win/DesktopNotificationsManager.h | 6 +++--- vendor/desktop-notifications/src/win/main_win.cc | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vendor/desktop-notifications/src/win/DesktopNotification.h b/vendor/desktop-notifications/src/win/DesktopNotification.h index c7a0767c2b6..6352eb22206 100644 --- a/vendor/desktop-notifications/src/win/DesktopNotification.h +++ b/vendor/desktop-notifications/src/win/DesktopNotification.h @@ -8,11 +8,11 @@ class DesktopNotification { public: - explicit DesktopNotification::DesktopNotification(const std::wstring &id, - const std::wstring &appID, - const std::wstring &title, - const std::wstring &body, - const std::wstring &userInfo); + explicit DesktopNotification(const std::wstring &id, + const std::wstring &appID, + const std::wstring &title, + const std::wstring &body, + const std::wstring &userInfo); std::wstring getID() { diff --git a/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h index d1ecfb00b07..7f64d1fdb7a 100644 --- a/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h +++ b/vendor/desktop-notifications/src/win/DesktopNotificationsManager.h @@ -133,9 +133,9 @@ class DesktopNotificationsManager : public Microsoft::WRL::Implements d); - void DesktopNotificationsManager::invokeJSCallback(const std::string &eventName, - const std::string ¬ificationID, - const std::wstring &userInfo); + void invokeJSCallback(const std::string &eventName, + const std::string ¬ificationID, + const std::wstring &userInfo); // Identifiers of registered class objects. Used for unregistration. DWORD m_comCookies[1] = {0}; diff --git a/vendor/desktop-notifications/src/win/main_win.cc b/vendor/desktop-notifications/src/win/main_win.cc index fd3445c57e3..861af878743 100644 --- a/vendor/desktop-notifications/src/win/main_win.cc +++ b/vendor/desktop-notifications/src/win/main_win.cc @@ -20,7 +20,7 @@ namespace { Napi::Value initializeNotifications(const Napi::CallbackInfo &info) { - Napi::Env &env = info.Env(); + const Napi::Env &env = info.Env(); if (desktopNotificationsManager) { @@ -69,7 +69,7 @@ namespace Napi::Value showNotification(const Napi::CallbackInfo &info) { - Napi::Env &env = info.Env(); + const Napi::Env &env = info.Env(); if (!desktopNotificationsManager) { @@ -122,7 +122,7 @@ namespace Napi::Value closeNotification(const Napi::CallbackInfo &info) { - Napi::Env &env = info.Env(); + const Napi::Env &env = info.Env(); if (!desktopNotificationsManager) { @@ -151,7 +151,7 @@ namespace Napi::Value getNotificationsPermission(const Napi::CallbackInfo &info) { - Napi::Env &env = info.Env(); + const Napi::Env &env = info.Env(); Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); @@ -171,7 +171,7 @@ namespace Napi::Value requestNotificationsPermission(const Napi::CallbackInfo &info) { - Napi::Env &env = info.Env(); + const Napi::Env &env = info.Env(); // Do nothing. There is no way of requesting permission on Windows. Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(env); From 7de7dfbf4b1ceaed03d64698c84c3a793b6ac09a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 10:57:27 +0100 Subject: [PATCH 0244/1338] Remove releases doc from desktop-notifications --- vendor/desktop-notifications/docs/releases.md | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 vendor/desktop-notifications/docs/releases.md diff --git a/vendor/desktop-notifications/docs/releases.md b/vendor/desktop-notifications/docs/releases.md deleted file mode 100644 index 4553c3ec6fb..00000000000 --- a/vendor/desktop-notifications/docs/releases.md +++ /dev/null @@ -1,33 +0,0 @@ -# Releases - -## Release/Publishing - -Before running the commands in 'Publishing to NPM', create a new release branch -of the form `releases/x.x.x` - -After running commands in 'Publishing to NPM', the release branch should be -pushed. Now, you need to get it reviewed and merged. - -After that, don't forget publish the release on the repo. - -- Go to https://github.com/desktop/desktop-notifications/releases -- Click click `Draft a New Release` -- Fill in form -- Hit `Publish release` - -## Publishing to NPM - -Releases are done to NPM, and are currently limited to the core team. - -```sh -# to ensure everything is up-to-date and tests pass -npm ci -npm test - -# you might need to do a different sort of version bump here -npm version minor - -# this will also run the test suite and fail if any errors found -# this will also run `git push --follow-tags` at the end -npm publish -``` From 96897de48d6815f6afc3681d25ddda185fa689ee Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 12:10:51 +0100 Subject: [PATCH 0245/1338] Convert test suite to Node test runner --- .test.env | 8 + .vscode/launch.json | 19 + app/test/__mocks__/electron.mjs | 27 + app/test/globals.ts | 27 +- app/test/unit/accounts-store-test.ts | 28 +- app/test/unit/api-test.ts | 20 +- app/test/unit/branch-pruner-test.ts | 18 +- app/test/unit/bytes-test.ts | 36 +- app/test/unit/ci-checks-test.ts | 34 +- app/test/unit/cloning-repository-test.ts | 8 +- app/test/unit/commit-identity-test.ts | 23 +- app/test/unit/create-branch-test.ts | 20 +- app/test/unit/desktop-file-transport-test.ts | 20 +- app/test/unit/diff-parser-test.ts | 258 ++++---- app/test/unit/email-test.ts | 54 +- app/test/unit/endpoint-capabilities-test.ts | 32 +- app/test/unit/enterprise-validate-url-test.ts | 12 +- app/test/unit/enum-test.ts | 18 +- app/test/unit/fatal-error-test.ts | 10 +- app/test/unit/find-account-test.ts | 32 +- .../unit/find-forked-remotes-to-prune-test.ts | 20 +- app/test/unit/find-upstream-remote-test.ts | 8 +- app/test/unit/format-commit-message-test.ts | 42 +- app/test/unit/format-duration-test.ts | 14 +- app/test/unit/format-test.ts | 12 +- app/test/unit/fuzzy-find-test.ts | 16 +- app/test/unit/git-store-cache-test.ts | 6 +- app/test/unit/git-store-test.ts | 57 +- app/test/unit/git/apply-test.ts | 50 +- app/test/unit/git/branch-test.ts | 104 +-- app/test/unit/git/checkout-test.ts | 26 +- app/test/unit/git/cherry-pick-test.ts | 135 ++-- app/test/unit/git/commit-test.ts | 296 +++++---- app/test/unit/git/config-test.ts | 32 +- app/test/unit/git/core-test.ts | 34 +- app/test/unit/git/create-tail-stream-test.ts | 26 +- .../unit/git/create-terminal-stream-test.ts | 8 +- app/test/unit/git/credential-test.ts | 22 +- app/test/unit/git/description-test.ts | 8 +- app/test/unit/git/diff-check-test.ts | 14 +- app/test/unit/git/diff-test.ts | 207 +++--- app/test/unit/git/environment-test.ts | 98 +-- app/test/unit/git/fetch-test.ts | 14 +- app/test/unit/git/for-each-ref-test.ts | 38 +- app/test/unit/git/format-patch-test.ts | 18 +- app/test/unit/git/git-attributes-test.ts | 4 +- app/test/unit/git/gitignore-test.ts | 30 +- app/test/unit/git/lfs-test.ts | 22 +- app/test/unit/git/log-test.ts | 71 +- app/test/unit/git/merge-test.ts | 16 +- .../unit/git/pull/ahead-and-behind-test.ts | 33 +- app/test/unit/git/pull/only-ahead-test.ts | 29 +- app/test/unit/git/pull/only-behind-test.ts | 24 +- .../unit/git/rebase/detect-conflict-test.ts | 62 +- app/test/unit/git/rebase/progress-test.ts | 49 +- app/test/unit/git/ref-test.ts | 12 +- app/test/unit/git/reflog-test.ts | 26 +- app/test/unit/git/remote-test.ts | 58 +- app/test/unit/git/reorder-test.ts | 48 +- app/test/unit/git/reset-test.ts | 6 +- app/test/unit/git/rev-parse-test.ts | 24 +- app/test/unit/git/squash-test.ts | 104 +-- app/test/unit/git/stash-test.ts | 60 +- app/test/unit/git/status-test.ts | 113 ++-- app/test/unit/git/submodule-test.ts | 24 +- app/test/unit/git/tag-test.ts | 51 +- app/test/unit/group-branches-test.ts | 16 +- app/test/unit/http-test.ts | 16 +- app/test/unit/identifier-rules-test.ts | 34 +- app/test/unit/list-selection-test.ts | 10 +- app/test/unit/local-storage-test.ts | 26 +- app/test/unit/main-process/menu-test.ts | 20 +- .../main-process/spell-checker-menu-test.ts | 10 +- app/test/unit/name-of-test.ts | 6 +- app/test/unit/octicon-test.ts | 12 +- app/test/unit/parse-app-url-test.ts | 72 +- .../parse-files-to-be-overwritten-test.ts | 18 +- app/test/unit/parse-pac-string-test.ts | 60 +- app/test/unit/patch-formatter-test.ts | 53 +- app/test/unit/path-test.ts | 24 +- app/test/unit/path-text-test.ts | 66 +- app/test/unit/popup-manager-test.ts | 197 +++--- app/test/unit/progress/clone-test.ts | 38 +- app/test/unit/progress/git-test.ts | 43 +- app/test/unit/progress/lfs-test.ts | 6 +- app/test/unit/promise-test.ts | 15 +- app/test/unit/promise-with-timeout-test.ts | 37 +- app/test/unit/release-notes-test.ts | 50 +- app/test/unit/remote-parsing-test.ts | 150 ++--- app/test/unit/remove-remote-prefix-test.ts | 8 +- app/test/unit/repo-rules-test.ts | 50 +- .../unit/repositories-clone-grouping-test.ts | 22 +- app/test/unit/repositories-database-test.ts | 26 +- .../unit/repositories-list-grouping-test.ts | 80 +-- app/test/unit/repositories-store-test.ts | 14 +- app/test/unit/repository-matching-test.ts | 56 +- app/test/unit/repository-state-cache-test.ts | 20 +- app/test/unit/repository-test.ts | 6 +- app/test/unit/round-test.ts | 28 +- app/test/unit/sanitize-ref-name-test.ts | 20 +- .../unit/sanitized-repository-name-test.ts | 22 +- app/test/unit/script/version-test.ts | 16 +- app/test/unit/section-list-selection-test.ts | 20 +- .../unit/squashed-commit-description-test.ts | 8 +- app/test/unit/squirrel-error-parser-test.ts | 10 +- app/test/unit/ssh-test.ts | 10 +- app/test/unit/stats-store-test.ts | 16 +- app/test/unit/status-parser-test.ts | 60 +- .../updates/update-changed-files-test.ts | 32 +- .../updates/update-conflict-state-test.ts | 101 +-- .../stores/updates/update-remote-url-test.ts | 14 +- app/test/unit/text-diff-expansion-test.ts | 76 +-- app/test/unit/text-token-parser-test.ts | 326 ++++----- app/test/unit/truncate-with-ellipsis-test.ts | 14 +- .../unit/unique-coauthors-as-authors-test.ts | 26 +- app/test/unit/welcome-test.ts | 12 +- .../wrap-rich-text-commit-message-test.ts | 110 +-- app/test/unit/write-default-readme-test.ts | 6 +- package.json | 16 +- script/test.mjs | 42 ++ yarn.lock | 624 ++++++++++++++++-- 121 files changed, 3334 insertions(+), 2411 deletions(-) create mode 100644 .test.env create mode 100644 app/test/__mocks__/electron.mjs create mode 100644 script/test.mjs diff --git a/.test.env b/.test.env new file mode 100644 index 00000000000..6d82ff6fa02 --- /dev/null +++ b/.test.env @@ -0,0 +1,8 @@ +GIT_AUTHOR_NAME = 'Joe Bloggs' +GIT_AUTHOR_EMAIL = 'joe.bloggs@somewhere.com' +GIT_COMMITTER_NAME = 'Joe Bloggs' +GIT_COMMITTER_EMAIL = 'joe.bloggs@somewhere.com' +TEST_ENV = '1' +HOME = '' +USERPROFILE = '' +LOCAL_GIT_DIRECTORY = '' diff --git a/.vscode/launch.json b/.vscode/launch.json index 60e3be7c52d..73e101c4ea1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -41,6 +41,25 @@ "windows": { "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" } + }, + { + "type": "node", + "request": "launch", + "name": "Debug current test file", + "args": [ + "--experimental-test-module-mocks", + "--import", + "tsx", + "--import", + "${workspaceFolder}/app/test/__mocks__/electron.mjs", + "--import", + "${workspaceFolder}/app/test/globals.ts", + "--test", + "${relativeFile}" + ], + "envFile": "${workspaceFolder}/.test.env", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" } ] } diff --git a/app/test/__mocks__/electron.mjs b/app/test/__mocks__/electron.mjs new file mode 100644 index 00000000000..b20e6c60937 --- /dev/null +++ b/app/test/__mocks__/electron.mjs @@ -0,0 +1,27 @@ +import { mock } from 'node:test' + +mock.module('electron', { + namedExports: { + shell: { + trashItem: mock.fn(async () => {}), + }, + remote: { + app: { + on: mock.fn(() => {}), + }, + autoUpdater: { + on: mock.fn(() => {}), + }, + nativeTheme: { + addListener: mock.fn(() => {}), + removeAllListeners: mock.fn(() => {}), + shouldUseDarkColors: true, + }, + }, + ipcRenderer: { + on: mock.fn(x => {}), + send: mock.fn(() => {}), + invoke: mock.fn(() => {}), + }, + }, +}) diff --git a/app/test/globals.ts b/app/test/globals.ts index 0458e9e2557..1c4c58d42d7 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -1,10 +1,9 @@ -import Dexie from 'dexie' -import { - indexedDB as fakeIndexedDB, - IDBKeyRange as fakeIDBKeyRange, -} from 'fake-indexeddb' -Dexie.dependencies.indexedDB = fakeIndexedDB -Dexie.dependencies.IDBKeyRange = fakeIDBKeyRange +import 'fake-indexeddb/auto' +import jsdom from 'global-jsdom' + +jsdom(undefined, { + url: 'http://localhost', +}) // shims a bunch of browser specific methods // like fetch, requestIdleCallback, etc @@ -55,3 +54,17 @@ g.ResizeObserver = class ResizeObserver { // structuredClone doesn't exist in JSDOM, see: // https://github.com/jsdom/jsdom/issues/3363 global.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x)) + +// The following types are part of the WebWorker support in Node.js and are a +// common source of hangs in tests due to libraries creating them but not +// properly cleaning them up. See for example +// https://github.com/facebook/react/issues/20756, and +// https://github.com/dexie/Dexie.js/pull/1577. +// +// We've upgraded Dexie already but react-dom is a bigger beast and we don't +// need any of them to run our tests so we just delete them here. In fact, +// this is exactly what the react-16-node-hanging-test-fix patch does, see +// https://www.npmjs.com/package/react-16-node-hanging-test-fix?activeTab=code +delete g['MessageChannel'] +delete g['MessagePort'] +delete g['BroadcastChannel'] diff --git a/app/test/unit/accounts-store-test.ts b/app/test/unit/accounts-store-test.ts index 22c5382a5a1..eddbabe1fd8 100644 --- a/app/test/unit/accounts-store-test.ts +++ b/app/test/unit/accounts-store-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Account } from '../../src/models/account' import { AccountsStore } from '../../src/lib/stores' import { InMemoryStore, AsyncInMemoryStore } from '../helpers/stores' @@ -20,7 +22,7 @@ describe('AccountsStore', () => { ) const users = await accountsStore.getAll() - expect(users[0].login).toBe(newAccountLogin) + assert.equal(users[0].login, newAccountLogin) }) }) @@ -45,12 +47,12 @@ describe('AccountsStore', () => { accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore()) const users = await accountsStore.getAll() - expect(users[0].login).toBe('joan') - expect(users[0].endpoint).toBe('https://api.whatever.ghe.com/') + assert.equal(users[0].login, 'joan') + assert.equal(users[0].endpoint, 'https://api.whatever.ghe.com/') const persistedUsers = JSON.parse(dataStore.getItem('users')) - expect(persistedUsers[0].login).toBe('joan') - expect(persistedUsers[0].endpoint).toBe('https://api.whatever.ghe.com/') + assert.equal(persistedUsers[0].login, 'joan') + assert.equal(persistedUsers[0].endpoint, 'https://api.whatever.ghe.com/') }) it('does NOT migrate GHE users already using the api. subdomain', async () => { @@ -73,12 +75,12 @@ describe('AccountsStore', () => { accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore()) const users = await accountsStore.getAll() - expect(users[0].login).toBe('joan') - expect(users[0].endpoint).toBe('https://api.whatever.ghe.com/') + assert.equal(users[0].login, 'joan') + assert.equal(users[0].endpoint, 'https://api.whatever.ghe.com/') const persistedUsers = JSON.parse(dataStore.getItem('users')) - expect(persistedUsers[0].login).toBe('joan') - expect(persistedUsers[0].endpoint).toBe('https://api.whatever.ghe.com/') + assert.equal(persistedUsers[0].login, 'joan') + assert.equal(persistedUsers[0].endpoint, 'https://api.whatever.ghe.com/') }) it('does NOT migrate GHES users still using /api/v3 to api. subdomain', async () => { @@ -101,12 +103,12 @@ describe('AccountsStore', () => { accountsStore = new AccountsStore(dataStore, new AsyncInMemoryStore()) const users = await accountsStore.getAll() - expect(users[0].login).toBe('joan') - expect(users[0].endpoint).toBe('https://my-company-repos.com/api/v3') + assert.equal(users[0].login, 'joan') + assert.equal(users[0].endpoint, 'https://my-company-repos.com/api/v3') const persistedUsers = JSON.parse(dataStore.getItem('users')) - expect(persistedUsers[0].login).toBe('joan') - expect(persistedUsers[0].endpoint).toBe( + assert.equal(persistedUsers[0].login, 'joan') + assert.equal(persistedUsers[0].endpoint, 'https://my-company-repos.com/api/v3' ) }) diff --git a/app/test/unit/api-test.ts b/app/test/unit/api-test.ts index 9e2d2cd93b1..25f3824cd76 100644 --- a/app/test/unit/api-test.ts +++ b/app/test/unit/api-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { getNextPagePathWithIncreasingPageSize } from '../../src/lib/api' import * as URL from 'url' @@ -21,10 +23,10 @@ function assertNext(current: IPageInfo, expected: IPageInfo) { new Response(null, { headers }) ) - expect(nextPath).not.toBeNull() + assert(nextPath !== null) const { pathname, query } = URL.parse(nextPath!, true) - expect(pathname).toBe('/items') + assert.equal(pathname, '/items') const per_page = parseInt( typeof query.per_page === 'string' ? query.per_page : '', @@ -32,8 +34,8 @@ function assertNext(current: IPageInfo, expected: IPageInfo) { ) const page = parseInt(typeof query.page === 'string' ? query.page : '', 10) - expect(per_page).toBe(expected.per_page) - expect(page).toBe(expected.page) + assert.equal(per_page, expected.per_page) + assert.equal(page, expected.page) // If getNextPagePathWithIncreasingPageSize has fiddled with the // page size or page number we want to ensure that the next page will @@ -42,14 +44,14 @@ function assertNext(current: IPageInfo, expected: IPageInfo) { const receivedCurrent = current.per_page * current.page const receivedNext = per_page * page - expect(receivedNext).toBeGreaterThan(receivedCurrent) + assert(receivedNext > receivedCurrent) } } describe('API', () => { describe('getNextPagePathWithIncreasingPageSize', () => { it("returns null when there's no link header", () => { - expect(getNextPagePathWithIncreasingPageSize(new Response())).toBeNull() + assert(getNextPagePathWithIncreasingPageSize(new Response()) === null) }) it('returns raw link when missing page size', () => { @@ -59,7 +61,7 @@ describe('API', () => { }) ) - expect(nextPath).toEqual('/items?page=2') + assert.equal(nextPath, '/items?page=2') }) it('returns raw link when missing page number', () => { @@ -69,7 +71,7 @@ describe('API', () => { }) ) - expect(nextPath).toEqual('/items?per_page=10') + assert.equal(nextPath, '/items?per_page=10') }) it('does not increase page size when not aligned', () => { @@ -79,7 +81,7 @@ describe('API', () => { }) ) - expect(nextPath).toEqual('/items?per_page=10&page=2') + assert.equal(nextPath, '/items?per_page=10&page=2') }) it('increases page size on alignment with an initial page size of 10', () => { diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index ca7f989523a..f7dcc27e7da 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach, afterEach } from 'node:test' +import assert from 'node:assert' import { BranchPruner } from '../../src/lib/stores/helpers/branch-pruner' import { Repository } from '../../src/models/repository' import { GitStoreCache } from '../../src/lib/stores/git-store-cache' @@ -56,7 +58,7 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - expect(branchesBeforePruning).toEqual(branchesAfterPruning) + assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) it('prunes for GitHub repository', async () => { @@ -82,8 +84,8 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - expect(branchesAfterPruning).not.toContain('deleted-branch-1') - expect(branchesAfterPruning).toContain('not-deleted-branch-1') + assert.equal(branchesAfterPruning.includes('deleted-branch-1'), false) + assert(branchesAfterPruning.includes('not-deleted-branch-1')) }) it('does not prune if the last prune date is less than 24 hours ago', async () => { @@ -109,7 +111,7 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - expect(branchesBeforePruning).toEqual(branchesAfterPruning) + assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) it('does not prune if there is no default branch', async () => { @@ -137,7 +139,7 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - expect(branchesBeforePruning).toEqual(branchesAfterPruning) + assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) it('does not prune reserved branches', async () => { @@ -175,7 +177,7 @@ describe('BranchPruner', () => { ] for (const branch of expectedBranchesAfterPruning) { - expect(branchesAfterPruning).toContain(branch) + assert(branchesAfterPruning.includes(branch)) } }) @@ -204,8 +206,8 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - expect(branchesAfterPruning).toContain('master') - expect(branchesAfterPruning).toContain('other-branch') + assert(branchesAfterPruning.includes('master')) + assert(branchesAfterPruning.includes('other-branch')) }) }) diff --git a/app/test/unit/bytes-test.ts b/app/test/unit/bytes-test.ts index 2215d6a9c52..927d471d6a7 100644 --- a/app/test/unit/bytes-test.ts +++ b/app/test/unit/bytes-test.ts @@ -1,38 +1,40 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatBytes } from '../../src/ui/lib/bytes' describe('formatBytes', () => { it('rounds to the desired number decimals', () => { - expect(formatBytes(1342177280, 2)).toEqual('1.25 GiB') - expect(formatBytes(1342177280, 1)).toEqual('1.3 GiB') - expect(formatBytes(1342177280, 0)).toEqual('1 GiB') + assert.equal(formatBytes(1342177280, 2), '1.25 GiB') + assert.equal(formatBytes(1342177280, 1), '1.3 GiB') + assert.equal(formatBytes(1342177280, 0), '1 GiB') - expect(formatBytes(1879048192, 2)).toEqual('1.75 GiB') - expect(formatBytes(1879048192, 1)).toEqual('1.8 GiB') - expect(formatBytes(1879048192, 0)).toEqual('2 GiB') + assert.equal(formatBytes(1879048192, 2), '1.75 GiB') + assert.equal(formatBytes(1879048192, 1), '1.8 GiB') + assert.equal(formatBytes(1879048192, 0), '2 GiB') }) it('uses the correct units', () => { - expect(formatBytes(1023)).toEqual('1023 B') - expect(formatBytes(1024)).toEqual('1 KiB') + assert.equal(formatBytes(1023), '1023 B') + assert.equal(formatBytes(1024), '1 KiB') // N.B this codifies the current behavior, I personally // wouldn't object to formatBytes(1048575) returning 1 MiB - expect(formatBytes(1048575, 3)).toEqual('1023.999 KiB') - expect(formatBytes(1048575)).toEqual('1024 KiB') - expect(formatBytes(1048576)).toEqual('1 MiB') + assert.equal(formatBytes(1048575, 3), '1023.999 KiB') + assert.equal(formatBytes(1048575), '1024 KiB') + assert.equal(formatBytes(1048576), '1 MiB') - expect(formatBytes(1073741823)).toEqual('1024 MiB') - expect(formatBytes(1073741824)).toEqual('1 GiB') + assert.equal(formatBytes(1073741823), '1024 MiB') + assert.equal(formatBytes(1073741824), '1 GiB') - expect(formatBytes(1099511627775)).toEqual('1024 GiB') - expect(formatBytes(1099511627776)).toEqual('1 TiB') + assert.equal(formatBytes(1099511627775), '1024 GiB') + assert.equal(formatBytes(1099511627776), '1 TiB') }) it("doesn't attempt to format NaN", () => { - expect(formatBytes(NaN)).toEqual('NaN') + assert.equal(formatBytes(NaN), 'NaN') }) it("doesn't attempt to format Infinity", () => { - expect(formatBytes(Infinity)).toEqual('Infinity') + assert.equal(formatBytes(Infinity), 'Infinity') }) }) diff --git a/app/test/unit/ci-checks-test.ts b/app/test/unit/ci-checks-test.ts index 7761f478251..758452bca88 100644 --- a/app/test/unit/ci-checks-test.ts +++ b/app/test/unit/ci-checks-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { APICheckConclusion, APICheckStatus } from '../../src/lib/api' import { getCheckRunsGroupedByActionWorkflowNameAndEvent, @@ -12,8 +14,8 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('test2')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('test2'), true) }) it('groups any check run without an actions workflow name into Other', () => { @@ -23,8 +25,8 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('Other')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('Other'), true) }) it('groups any check run without an actions workflow name with an app name of "GitHub Code Scanning" into "Code scanning results"', () => { @@ -35,9 +37,9 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('Other')).toBe(true) - expect(groupNames.includes('Code scanning results')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('Other'), true) + assert.equal(groupNames.includes('Code scanning results'), true) }) it('groups by actions event type if more than one event type', () => { @@ -49,27 +51,27 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { let groupNames = [...groups.keys()] // no event types - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('test2')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('test2'), true) checkRuns.push(buildMockCheckRun('1', '', 'test3', 'pull_request')) groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) groupNames = [...groups.keys()] // only one event - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('test2')).toBe(true) - expect(groupNames.includes('test3')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('test2'), true) + assert.equal(groupNames.includes('test3'), true) checkRuns.push(buildMockCheckRun('1', '', 'test4', 'push')) groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) groupNames = [...groups.keys()] // two event types for test3 and test4 - expect(groupNames.includes('test1')).toBe(true) - expect(groupNames.includes('test2')).toBe(true) - expect(groupNames.includes('test3 (pull_request)')).toBe(true) - expect(groupNames.includes('test4 (push)')).toBe(true) + assert.equal(groupNames.includes('test1'), true) + assert.equal(groupNames.includes('test2'), true) + assert.equal(groupNames.includes('test3 (pull_request)'), true) + assert.equal(groupNames.includes('test4 (push)'), true) }) }) diff --git a/app/test/unit/cloning-repository-test.ts b/app/test/unit/cloning-repository-test.ts index 001c25d86e7..ad402a2bced 100644 --- a/app/test/unit/cloning-repository-test.ts +++ b/app/test/unit/cloning-repository-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { CloningRepository } from '../../src/models/cloning-repository' describe('CloningRepository', () => { @@ -8,7 +10,7 @@ describe('CloningRepository', () => { 'https://github.com/desktop/desktop' ) - expect(repository.name).toBe('desktop') + assert.equal(repository.name, 'desktop') }) it('extracts the repo name from the url not the path', () => { @@ -17,7 +19,7 @@ describe('CloningRepository', () => { 'https://github.com/desktop/desktop' ) - expect(repository.name).toBe('desktop') + assert.equal(repository.name, 'desktop') }) it('extracts the repo name without git suffix', () => { @@ -26,7 +28,7 @@ describe('CloningRepository', () => { 'https://github.com/desktop/desktop.git' ) - expect(repository.name).toBe('desktop') + assert.equal(repository.name, 'desktop') }) }) }) diff --git a/app/test/unit/commit-identity-test.ts b/app/test/unit/commit-identity-test.ts index 0c1503ec980..7bee0f86d80 100644 --- a/app/test/unit/commit-identity-test.ts +++ b/app/test/unit/commit-identity-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { CommitIdentity } from '../../src/models/commit-identity' describe('CommitIdentity', () => { @@ -6,29 +8,32 @@ describe('CommitIdentity', () => { const identity = CommitIdentity.parseIdentity( 'Markus Olsson 1475670580 +0200' ) - expect(identity.name).toBe('Markus Olsson') - expect(identity.email).toBe('markus@github.com') - expect(identity.date).toEqual(new Date('2016-10-05T12:29:40.000Z')) + assert.equal(identity.name, 'Markus Olsson') + assert.equal(identity.email, 'markus@github.com') + assert.deepStrictEqual( + identity.date, + new Date('2016-10-05T12:29:40.000Z') + ) }) it('parses timezone information', () => { const identity1 = CommitIdentity.parseIdentity( 'Markus Olsson 1475670580 +0130' ) - expect(identity1.tzOffset).toBe(90) + assert.equal(identity1.tzOffset, 90) const identity2 = CommitIdentity.parseIdentity( 'Markus Olsson 1475670580 -0245' ) - expect(identity2.tzOffset).toBe(-165) + assert.equal(identity2.tzOffset, -165) }) it("parses even if the email address isn't a normal email", () => { const identity = CommitIdentity.parseIdentity( 'Markus Olsson 1475670580 +0200' ) - expect(identity.name).toBe('Markus Olsson') - expect(identity.email).toBe('Markus Olsson') + assert.equal(identity.name, 'Markus Olsson') + assert.equal(identity.email, 'Markus Olsson') }) it('parses even if the email address is broken', () => { @@ -36,8 +41,8 @@ describe('CommitIdentity', () => { const identity = CommitIdentity.parseIdentity( 'Markus Olsson Olsson> 1475670580 +0200' ) - expect(identity.name).toBe('Markus Olsson') - expect(identity.email).toBe('Markus >Olsson') + assert.equal(identity.name, 'Markus Olsson') + assert.equal(identity.email, 'Markus >Olsson') }) }) }) diff --git a/app/test/unit/create-branch-test.ts b/app/test/unit/create-branch-test.ts index b1252fac909..e493ef8a260 100644 --- a/app/test/unit/create-branch-test.ts +++ b/app/test/unit/create-branch-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { getStartPoint } from '../../src/lib/create-branch' import { TipState, IValidBranch, IDetachedHead } from '../../src/models/tip' import { @@ -54,15 +56,15 @@ describe('create-branch/getStartPoint', () => { } it('returns current HEAD when HEAD requested', () => { - expect(action(StartPoint.Head)).toBe(StartPoint.Head) + assert.equal(action(StartPoint.Head), StartPoint.Head) }) it('chooses current branch when current branch requested', () => { - expect(action(StartPoint.CurrentBranch)).toBe(StartPoint.CurrentBranch) + assert.equal(action(StartPoint.CurrentBranch), StartPoint.CurrentBranch) }) it('chooses default branch when default branch requested', () => { - expect(action(StartPoint.DefaultBranch)).toBe(StartPoint.DefaultBranch) + assert.equal(action(StartPoint.DefaultBranch), StartPoint.DefaultBranch) }) }) @@ -80,15 +82,15 @@ describe('create-branch/getStartPoint', () => { } it('returns current HEAD when HEAD requested', () => { - expect(action(StartPoint.Head)).toBe(StartPoint.Head) + assert.equal(action(StartPoint.Head), StartPoint.Head) }) it('chooses current branch when current branch requested', () => { - expect(action(StartPoint.CurrentBranch)).toBe(StartPoint.CurrentBranch) + assert.equal(action(StartPoint.CurrentBranch), StartPoint.CurrentBranch) }) it('chooses default branch when default branch requested', () => { - expect(action(StartPoint.DefaultBranch)).toBe(StartPoint.DefaultBranch) + assert.equal(action(StartPoint.DefaultBranch), StartPoint.DefaultBranch) }) }) @@ -106,15 +108,15 @@ describe('create-branch/getStartPoint', () => { } it('returns current HEAD when HEAD requested', () => { - expect(action(StartPoint.Head)).toBe(StartPoint.Head) + assert.equal(action(StartPoint.Head), StartPoint.Head) }) it('returns current HEAD when current branch requested', () => { - expect(action(StartPoint.CurrentBranch)).toBe(StartPoint.Head) + assert.equal(action(StartPoint.CurrentBranch), StartPoint.Head) }) it('returns current HEAD when default branch requested', () => { - expect(action(StartPoint.DefaultBranch)).toBe(StartPoint.Head) + assert.equal(action(StartPoint.DefaultBranch), StartPoint.Head) }) }) }) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 485d8e9388b..6c6cd8d5687 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { readdir, readFile } from 'fs/promises' import { EOL } from 'os' import { join } from 'path' @@ -16,11 +18,11 @@ describe('DesktopFileTransport', () => { const d = await createTempDirectory('desktop-logs') const t = new DesktopFileTransport({ logDirectory: d }) - expect(await readdir(d)).toBeArrayOfSize(0) + assert((await readdir(d)).length === 0) await info(t, 'heyo') const files = await readdir(d) - expect(files).toBeArrayOfSize(1) - expect(await readFile(join(d, files[0]), 'utf8')).toEqual(`heyo${EOL}`) + assert.equal(files.length, 1) + assert.equal(await readFile(join(d, files[0]), 'utf8'), `heyo${EOL}`) t.close() }) @@ -32,7 +34,7 @@ describe('DesktopFileTransport', () => { const t = new DesktopFileTransport({ logDirectory: d }) try { - expect(await readdir(d)).toBeArrayOfSize(0) + assert.equal((await readdir(d)).length, 0) globalDate.prototype.toISOString = () => '2022-03-10T10:00:00.000Z' await info(t, 'heyo') @@ -40,7 +42,7 @@ describe('DesktopFileTransport', () => { globalDate.prototype.toISOString = () => '2022-03-11T11:00:00.000Z' await info(t, 'heyo') - expect(await readdir(d)).toBeArrayOfSize(2) + assert.equal((await readdir(d)).length, 2) t.close() } finally { @@ -48,7 +50,7 @@ describe('DesktopFileTransport', () => { } }) - it.only('retains a maximum of 14 log files', async () => { + it('retains a maximum of 14 log files', async () => { const originalToISOString = Date.prototype.toISOString const globalDate = global.Date as any const d = await createTempDirectory('desktop-logs') @@ -78,17 +80,17 @@ describe('DesktopFileTransport', () => { ] try { - expect(await readdir(d)).toBeArrayOfSize(0) + assert.equal((await readdir(d)).length, 0) for (const date of dates) { globalDate.prototype.toISOString = () => date await info(t, 'heyo') } const retainedFiles = await readdir(d) - expect(retainedFiles).toBeArrayOfSize(14) + assert.equal(retainedFiles.length, 14) // Retains the newest files (ISO date is lexicographically sortable) - expect(retainedFiles.sort()).toEqual([ + assert.deepStrictEqual(retainedFiles.sort(), [ '2022-03-07.desktop.development.log', '2022-03-08.desktop.development.log', '2022-03-09.desktop.development.log', diff --git a/app/test/unit/diff-parser-test.ts b/app/test/unit/diff-parser-test.ts index e6c6540c388..e3507966b4b 100644 --- a/app/test/unit/diff-parser-test.ts +++ b/app/test/unit/diff-parser-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { DiffParser } from '../../src/lib/diff-parser' import { DiffLineType } from '../../src/models/diff' @@ -53,60 +55,60 @@ index e1d4871..3bd3ee0 100644 const parser = new DiffParser() const diff = parser.parse(reinstateSpacesAtTheStartOfBlankLines(diffText)) - expect(diff.hunks).toHaveLength(3) + assert.equal((diff.hunks).length, 3) let hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(7) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 7) let lines = hunk.lines - expect(lines).toHaveLength(8) + assert.equal((lines).length, 8) let i = 0 - expect(lines[i].text).toBe( + assert.equal(lines[i].text, '@@ -18,6 +18,7 @@ export function parseRawDiff(lines: ReadonlyArray): Diff {' ) - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) i++ - expect(lines[i].text).toBe(' ') - expect(lines[i].type).toBe(DiffLineType.Context) - expect(lines[i].oldLineNumber).toBe(18) - expect(lines[i].newLineNumber).toBe(18) + assert.equal(lines[i].text, ' ') + assert.equal(lines[i].type, DiffLineType.Context) + assert.equal(lines[i].oldLineNumber, 18) + assert.equal(lines[i].newLineNumber, 18) i++ - expect(lines[i].text).toBe(' let numberOfUnifiedDiffLines = 0') - expect(lines[i].type).toBe(DiffLineType.Context) - expect(lines[i].oldLineNumber).toBe(19) - expect(lines[i].newLineNumber).toBe(19) + assert.equal(lines[i].text, ' let numberOfUnifiedDiffLines = 0') + assert.equal(lines[i].type, DiffLineType.Context) + assert.equal(lines[i].oldLineNumber, 19) + assert.equal(lines[i].newLineNumber, 19) i++ - expect(lines[i].text).toBe(' ') - expect(lines[i].type).toBe(DiffLineType.Context) - expect(lines[i].oldLineNumber).toBe(20) - expect(lines[i].newLineNumber).toBe(20) + assert.equal(lines[i].text, ' ') + assert.equal(lines[i].type, DiffLineType.Context) + assert.equal(lines[i].oldLineNumber, 20) + assert.equal(lines[i].newLineNumber, 20) i++ - expect(lines[i].text).toBe('+') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(21) + assert.equal(lines[i].text, '+') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 21) i++ - expect(lines[i].text).toBe(' while (prefixFound) {') - expect(lines[i].type).toBe(DiffLineType.Context) - expect(lines[i].oldLineNumber).toBe(21) - expect(lines[i].newLineNumber).toBe(22) + assert.equal(lines[i].text, ' while (prefixFound) {') + assert.equal(lines[i].type, DiffLineType.Context) + assert.equal(lines[i].oldLineNumber, 21) + assert.equal(lines[i].newLineNumber, 22) i++ hunk = diff.hunks[1] - expect(hunk.unifiedDiffStart).toBe(8) - expect(hunk.unifiedDiffEnd).toBe(20) + assert.equal(hunk.unifiedDiffStart, 8) + assert.equal(hunk.unifiedDiffEnd, 20) lines = hunk.lines - expect(lines).toHaveLength(13) + assert.equal((lines).length, 13) }) it('parses new files', () => { @@ -121,26 +123,26 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(1) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 1) const lines = hunk.lines - expect(lines).toHaveLength(2) + assert.equal((lines).length, 2) let i = 0 - expect(lines[i].text).toBe('@@ -0,0 +1 @@') - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() + assert.equal(lines[i].text, '@@ -0,0 +1 @@') + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) i++ - expect(lines[i].text).toBe('+asdfasdf') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(1) + assert.equal(lines[i].text, '+asdfasdf') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 1) i++ }) @@ -156,32 +158,32 @@ index 24219cc..bf711a5 100644 const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(2) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - expect(lines).toHaveLength(3) + assert.equal((lines).length, 3) let i = 0 - expect(lines[i].text).toBe('@@ -1 +1 @@') - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() + assert.equal(lines[i].text, '@@ -1 +1 @@') + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) i++ - expect(lines[i].text).toBe('-foo @@') - expect(lines[i].type).toBe(DiffLineType.Delete) - expect(lines[i].oldLineNumber).toBe(1) - expect(lines[i].newLineNumber).toBeNull() + assert.equal(lines[i].text, '-foo @@') + assert.equal(lines[i].type, DiffLineType.Delete) + assert.equal(lines[i].oldLineNumber, 1) + assert(lines[i].newLineNumber === null) i++ - expect(lines[i].text).toBe('+@@ foo') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(1) + assert.equal(lines[i].text, '+@@ foo') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 1) i++ }) @@ -198,28 +200,28 @@ index 0000000..faf7da1 const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(1) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 1) const lines = hunk.lines - expect(lines).toHaveLength(2) + assert.equal((lines).length, 2) let i = 0 - expect(lines[i].text).toBe('@@ -0,0 +1 @@') - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() - expect(lines[i].noTrailingNewLine).toBe(false) + assert.equal(lines[i].text, '@@ -0,0 +1 @@') + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) + assert.equal(lines[i].noTrailingNewLine, false) i++ - expect(lines[i].text).toBe('+asdasdasd') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(1) - expect(lines[i].noTrailingNewLine).toBe(true) + assert.equal(lines[i].text, '+asdasdasd') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 1) + assert.equal(lines[i].noTrailingNewLine, true) i++ }) @@ -235,37 +237,37 @@ index 1910281..257cc56 100644 ` const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(2) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - expect(lines).toHaveLength(3) + assert.equal((lines).length, 3) let i = 0 - expect(lines[i].text).toBe('@@ -1 +1 @@') - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() - expect(lines[i].noTrailingNewLine).toBe(false) + assert.equal(lines[i].text, '@@ -1 +1 @@') + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) + assert.equal(lines[i].noTrailingNewLine, false) i++ - expect(lines[i].text).toBe('-foo') - expect(lines[i].type).toBe(DiffLineType.Delete) - expect(lines[i].oldLineNumber).toBe(1) - expect(lines[i].newLineNumber).toBeNull() - expect(lines[i].originalLineNumber).toBe(1) - expect(lines[i].noTrailingNewLine).toBe(true) + assert.equal(lines[i].text, '-foo') + assert.equal(lines[i].type, DiffLineType.Delete) + assert.equal(lines[i].oldLineNumber, 1) + assert(lines[i].newLineNumber === null) + assert.equal(lines[i].originalLineNumber, 1) + assert.equal(lines[i].noTrailingNewLine, true) i++ - expect(lines[i].text).toBe('+foo') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(1) - expect(lines[i].originalLineNumber).toBe(2) - expect(lines[i].noTrailingNewLine).toBe(false) + assert.equal(lines[i].text, '+foo') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 1) + assert.equal(lines[i].originalLineNumber, 2) + assert.equal(lines[i].noTrailingNewLine, false) i++ }) @@ -286,37 +288,37 @@ index 1910281..ba0e162 100644 ` const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.unifiedDiffStart).toBe(0) - expect(hunk.unifiedDiffEnd).toBe(2) + assert.equal(hunk.unifiedDiffStart, 0) + assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - expect(lines).toHaveLength(3) + assert.equal((lines).length, 3) let i = 0 - expect(lines[i].text).toBe('@@ -1 +1 @@') - expect(lines[i].type).toBe(DiffLineType.Hunk) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBeNull() - expect(lines[i].noTrailingNewLine).toBe(false) + assert.equal(lines[i].text, '@@ -1 +1 @@') + assert.equal(lines[i].type, DiffLineType.Hunk) + assert(lines[i].oldLineNumber === null) + assert(lines[i].newLineNumber === null) + assert.equal(lines[i].noTrailingNewLine, false) i++ - expect(lines[i].text).toBe('-foo') - expect(lines[i].type).toBe(DiffLineType.Delete) - expect(lines[i].oldLineNumber).toBe(1) - expect(lines[i].newLineNumber).toBeNull() - expect(lines[i].originalLineNumber).toBe(1) - expect(lines[i].noTrailingNewLine).toBe(true) + assert.equal(lines[i].text, '-foo') + assert.equal(lines[i].type, DiffLineType.Delete) + assert.equal(lines[i].oldLineNumber, 1) + assert(lines[i].newLineNumber === null) + assert.equal(lines[i].originalLineNumber, 1) + assert.equal(lines[i].noTrailingNewLine, true) i++ - expect(lines[i].text).toBe('+bar') - expect(lines[i].type).toBe(DiffLineType.Add) - expect(lines[i].oldLineNumber).toBeNull() - expect(lines[i].newLineNumber).toBe(1) - expect(lines[i].originalLineNumber).toBe(2) - expect(lines[i].noTrailingNewLine).toBe(true) + assert.equal(lines[i].text, '+bar') + assert.equal(lines[i].type, DiffLineType.Add) + assert(lines[i].oldLineNumber === null) + assert.equal(lines[i].newLineNumber, 1) + assert.equal(lines[i].originalLineNumber, 2) + assert.equal(lines[i].noTrailingNewLine, true) i++ }) @@ -328,8 +330,8 @@ Binary files /dev/null and b/IMG_2306.CR2 differ ` const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(0) - expect(diff.isBinary).toBe(true) + assert.equal((diff.hunks).length, 0) + assert.equal(diff.isBinary, true) }) it('parses diff of empty file', () => { @@ -342,7 +344,7 @@ index 0000000..e69de29 const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(0) + assert.equal((diff.hunks).length, 0) }) it('parses hunk headers with omitted line counts from new file', () => { @@ -357,13 +359,13 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.header.oldStartLine).toBe(0) - expect(hunk.header.oldLineCount).toBe(0) - expect(hunk.header.newStartLine).toBe(1) - expect(hunk.header.newLineCount).toBe(1) + assert.equal(hunk.header.oldStartLine, 0) + assert.equal(hunk.header.oldLineCount, 0) + assert.equal(hunk.header.newStartLine, 1) + assert.equal(hunk.header.newLineCount, 1) }) it('parses hunk headers with omitted line counts from old file', () => { @@ -378,12 +380,12 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - expect(diff.hunks).toHaveLength(1) + assert.equal((diff.hunks).length, 1) const hunk = diff.hunks[0] - expect(hunk.header.oldStartLine).toBe(1) - expect(hunk.header.oldLineCount).toBe(1) - expect(hunk.header.newStartLine).toBe(0) - expect(hunk.header.newLineCount).toBe(0) + assert.equal(hunk.header.oldStartLine, 1) + assert.equal(hunk.header.oldLineCount, 1) + assert.equal(hunk.header.newStartLine, 0) + assert.equal(hunk.header.newLineCount, 0) }) }) diff --git a/app/test/unit/email-test.ts b/app/test/unit/email-test.ts index aa6895eea9b..e6f57d1c7c7 100644 --- a/app/test/unit/email-test.ts +++ b/app/test/unit/email-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { lookupPreferredEmail, isAttributableEmailFor, @@ -23,7 +25,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe( + assert.equal(lookupPreferredEmail(account), '1234+shiftkey@users.noreply.github.com' ) }) @@ -40,7 +42,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe( + assert.equal(lookupPreferredEmail(account), '1234+shiftkey@users.noreply.github.example.com' ) }) @@ -78,7 +80,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe('my-primary-email@example.com') + assert.equal(lookupPreferredEmail(account), 'my-primary-email@example.com') }) it('returns the primary if it has null visibility', () => { @@ -114,7 +116,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe('my-primary-email@example.com') + assert.equal(lookupPreferredEmail(account), 'my-primary-email@example.com') }) it('returns the noreply if there is no public address', () => { @@ -150,7 +152,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe( + assert.equal(lookupPreferredEmail(account), 'shiftkey@users.noreply.github.com' ) }) @@ -188,7 +190,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe( + assert.equal(lookupPreferredEmail(account), 'shiftkey@users.noreply.github.example.com' ) }) @@ -220,7 +222,7 @@ describe('emails', () => { 'free' ) - expect(lookupPreferredEmail(account)).toBe('shiftkey@example.com') + assert.equal(lookupPreferredEmail(account), 'shiftkey@example.com') }) }) @@ -259,38 +261,38 @@ describe('emails', () => { 'free' ) - expect(isAttributableEmailFor(account, 'personal@gmail.com')).toBeTrue() - expect(isAttributableEmailFor(account, 'company@github.com')).toBeTrue() - expect( + assert.equal(isAttributableEmailFor(account, 'personal@gmail.com'), true) + assert.equal(isAttributableEmailFor(account, 'company@github.com'), true) + assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com') - ).toBeTrue() - expect( + , true) + assert.equal( isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - ).toBeTrue() + , true) }) it('considers stealth emails when account has no emails', () => { const endpoint = getDotComAPIEndpoint() const account = new Account('niik', endpoint, '', [], '', 123, '', 'free') - expect( + assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com') - ).toBeTrue() - expect( + , true) + assert.equal( isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - ).toBeTrue() + , true) }) it('considers stealth emails for GitHub Enterprise', () => { const endpoint = getDotComAPIEndpoint() const account = new Account('niik', endpoint, '', [], '', 123, '', 'free') - expect( + assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com') - ).toBeTrue() - expect( + , true) + assert.equal( isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - ).toBeTrue() + , true) }) it('considers email adresses in a case-insensitive manner', () => { @@ -312,13 +314,13 @@ describe('emails', () => { 'free' ) - expect(isAttributableEmailFor(account, 'niik@github.com')).toBeTrue() - expect( + assert.equal(isAttributableEmailFor(account, 'niik@github.com'), true) + assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com') - ).toBeTrue() - expect( + , true) + assert.equal( isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - ).toBeTrue() + , true) }) }) }) diff --git a/app/test/unit/endpoint-capabilities-test.ts b/app/test/unit/endpoint-capabilities-test.ts index b9d1db03e26..d2804f66b03 100644 --- a/app/test/unit/endpoint-capabilities-test.ts +++ b/app/test/unit/endpoint-capabilities-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { endpointSatisfies, VersionConstraint, @@ -9,18 +11,18 @@ import { forceUnwrap } from '../../src/lib/fatal-error' describe('endpoint-capabilities', () => { describe('endpointSatisfies', () => { it('recognizes github.com', () => { - expect(testDotCom(true)).toBeTrue() - expect(testDotCom(false)).toBeFalse() + assert.equal(testDotCom(true), true) + assert.equal(testDotCom(false), false) }) it('recognizes GHES', () => { - expect(testGHES(false)).toBeFalse() - expect(testGHES(true)).toBeTrue() + assert.equal(testGHES(false), false) + assert.equal(testGHES(true), true) }) it('recognizes GHAE', () => { - expect(testGHEDotCom(false)).toBeFalse() - expect(testGHEDotCom(true)).toBeTrue() + assert.equal(testGHEDotCom(false), false) + assert.equal(testGHEDotCom(true), true) }) // If we can't determine the actual version of a GitHub Enterprise Server @@ -28,26 +30,26 @@ describe('endpoint-capabilities', () => { // of GHES. This is defined in the `assumedGHESVersion` constant in // endpoint-capabilities.ts and needs to be updated periodically. it('assumes GHES versions', () => { - expect(testGHES('>= 3.1.1')).toBeFalse() - expect(testGHES('>= 3.1.0')).toBeTrue() + assert.equal(testGHES('>= 3.1.1'), false) + assert.equal(testGHES('>= 3.1.0'), true) }) it('parses semver ranges', () => { - expect(testGHES('>= 1', '1.0.0')).toBeTrue() - expect(testGHES('> 1.0.0', '1.0.0')).toBeFalse() - expect(testGHES('> 0.9.9', '1.0.0')).toBeTrue() + assert.equal(testGHES('>= 1', '1.0.0'), true) + assert.equal(testGHES('> 1.0.0', '1.0.0'), false) + assert.equal(testGHES('> 0.9.9', '1.0.0'), true) }) it('deals with common cases (smoketest)', () => { - expect( + assert.equal( testEndpoint('https://api.github.com', { dotcom: true, ghe: false, es: '>= 3.0.0', }) - ).toBeTrue() + , true) - expect( + assert.equal( testEndpoint( 'https://ghe.io', { @@ -57,7 +59,7 @@ describe('endpoint-capabilities', () => { }, '3.1.0' ) - ).toBeTrue() + , true) }) }) }) diff --git a/app/test/unit/enterprise-validate-url-test.ts b/app/test/unit/enterprise-validate-url-test.ts index 57c81310826..e78aed92676 100644 --- a/app/test/unit/enterprise-validate-url-test.ts +++ b/app/test/unit/enterprise-validate-url-test.ts @@ -1,27 +1,29 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { validateURL } from '../../src/ui/lib/enterprise-validate-url' describe('validateURL', () => { it('passes through a valid url', () => { const url = 'https://ghe.io:9000' const result = validateURL(url) - expect(result).toBe(url) + assert.equal(result, url) }) it('prepends https if no protocol is provided', () => { const url = validateURL('ghe.io') - expect(url).toBe('https://ghe.io') + assert.equal(url, 'https://ghe.io') }) it('throws if given an invalid protocol', () => { - expect(() => validateURL('ftp://ghe.io')).toThrow() + assert.throws(() => validateURL('ftp://ghe.io')) }) it('throws if given whitespace', () => { - expect(() => validateURL(' ')).toThrow() + assert.throws(() => validateURL(' ')) }) it('handles whitespace alongside valid text', () => { const url = validateURL('ghe.io ') - expect(url).toBe('https://ghe.io') + assert.equal(url, 'https://ghe.io') }) }) diff --git a/app/test/unit/enum-test.ts b/app/test/unit/enum-test.ts index e4c208d9c3b..e04d7fb234e 100644 --- a/app/test/unit/enum-test.ts +++ b/app/test/unit/enum-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseEnumValue } from '../../src/lib/enum' enum TestEnum { @@ -7,14 +9,14 @@ enum TestEnum { describe('parseEnumValue', () => { it('parses an enum type from a string', () => { - expect(parseEnumValue(TestEnum, 'foo')).toBe(TestEnum.Foo) - expect(parseEnumValue(TestEnum, TestEnum.Foo)).toBe(TestEnum.Foo) - expect(parseEnumValue(TestEnum, 'bar is the thing')).toBe(TestEnum.Bar) - expect(parseEnumValue(TestEnum, TestEnum.Bar)).toBe(TestEnum.Bar) + assert.equal(parseEnumValue(TestEnum, 'foo'), TestEnum.Foo) + assert.equal(parseEnumValue(TestEnum, TestEnum.Foo), TestEnum.Foo) + assert.equal(parseEnumValue(TestEnum, 'bar is the thing'), TestEnum.Bar) + assert.equal(parseEnumValue(TestEnum, TestEnum.Bar), TestEnum.Bar) }) it("returns undefined when enum value doesn't exist", () => { - expect(parseEnumValue(TestEnum, 'baz')).toBe(undefined) + assert.equal(parseEnumValue(TestEnum, 'baz'), undefined) }) it('ignores inherited values', () => { @@ -26,8 +28,8 @@ describe('parseEnumValue', () => { const child = Object.create(parent) - expect('foo' in child).toBeTrue() - expect(child.foo).toBe('bar') - expect(parseEnumValue(child, 'bar')).toBe(undefined) + assert.equal('foo' in child, true) + assert.equal(child.foo, 'bar') + assert.equal(parseEnumValue(child, 'bar'), undefined) }) }) diff --git a/app/test/unit/fatal-error-test.ts b/app/test/unit/fatal-error-test.ts index fa92a6f5fda..2c8dc78550c 100644 --- a/app/test/unit/fatal-error-test.ts +++ b/app/test/unit/fatal-error-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { forceUnwrap } from '../../src/lib/fatal-error' describe('forceUnwrap', () => { @@ -7,7 +9,7 @@ describe('forceUnwrap', () => { forceUnwrap(message, null) } catch (e) { const error = e as Error - expect(error.message).toBe(message) + assert.equal(error.message, message) } }) @@ -17,16 +19,16 @@ describe('forceUnwrap', () => { forceUnwrap(message, undefined) } catch (e) { const error = e as Error - expect(error.message).toBe(message) + assert.equal(error.message, message) } }) it('passes for false', () => { - expect(forceUnwrap('false is an expected value', false)).toBe(false) + assert.equal(forceUnwrap('false is an expected value', false), false) }) it('passes for a hash', () => { const a = { b: 4 } - expect(forceUnwrap('hash is an expected value', a)).toBe(a) + assert.equal(forceUnwrap('hash is an expected value', a), a) }) }) diff --git a/app/test/unit/find-account-test.ts b/app/test/unit/find-account-test.ts index a5d9bc5bc45..b3715f236d2 100644 --- a/app/test/unit/find-account-test.ts +++ b/app/test/unit/find-account-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Account } from '../../src/models/account' import { findAccountForRemoteURL } from '../../src/lib/find-account' import { getDotComAPIEndpoint, getEnterpriseAPIURL } from '../../src/lib/api' @@ -59,7 +61,7 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).toBeNull() + assert(account === null) }) it('gives no account for non-existent GitHub owner/name repository', async () => { @@ -68,7 +70,7 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).toBeNull() + assert(account === null) }) it('finds the anonymous account for public GitHub owner/name repository', async () => { @@ -77,8 +79,8 @@ describe('findAccountForRemoteURL', () => { [], mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!).toEqual(Account.anonymous()) + assert(account !== null) + assert.deepStrictEqual(account, Account.anonymous()) }) it('finds the anonymous account for public repository on GitHub endpoint', async () => { @@ -87,8 +89,8 @@ describe('findAccountForRemoteURL', () => { [], mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!).toEqual(Account.anonymous()) + assert(account !== null) + assert.deepStrictEqual(account, Account.anonymous()) }) it('finds the account for GitHub owner/name repository', async () => { @@ -97,8 +99,8 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!.login).toBe('joan') + assert(account !== null) + assert.deepStrictEqual(account.login, 'joan') }) it('finds the account for GitHub endpoint', async () => { @@ -107,8 +109,8 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!.login).toBe('joan') + assert(account !== null) + assert.deepStrictEqual(account.login, 'joan') }) it('finds the account for GitHub Enterprise endpoint', async () => { @@ -117,8 +119,8 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!.login).toBe('joel') + assert(account !== null) + assert.deepStrictEqual(account.login, 'joel') }) it('finds the account for private GitHub owner/name repository', async () => { @@ -127,8 +129,8 @@ describe('findAccountForRemoteURL', () => { accounts, mockCanAccessRepository ) - expect(account).not.toBeNull() - expect(account!.login).toBe('joan') + assert(account !== null) + assert.deepStrictEqual(account.login, 'joan') }) it('cannot see the private GitHub owner/name repository', async () => { @@ -137,6 +139,6 @@ describe('findAccountForRemoteURL', () => { [], mockCanAccessRepository ) - expect(account).toBeNull() + assert(account === null) }) }) diff --git a/app/test/unit/find-forked-remotes-to-prune-test.ts b/app/test/unit/find-forked-remotes-to-prune-test.ts index 875bff6688f..fb0bd8248d9 100644 --- a/app/test/unit/find-forked-remotes-to-prune-test.ts +++ b/app/test/unit/find-forked-remotes-to-prune-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { findForkedRemotesToPrune } from '../../src/lib/stores/helpers/find-forked-remotes-to-prune' import { Branch, BranchType } from '../../src/models/branch' import { CommitIdentity } from '../../src/models/commit-identity' @@ -81,9 +83,9 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], []) const names = getNamesFromRemotes(remotesToPrune) - expect(names).not.toBeEmpty() - expect(names).not.toContain(OriginRemote) - expect(names).not.toContain(NonGitHubDesktopRemote) + assert.notEqual(names.length, 0, 'Expected names to be empty') + assert.equal(names.includes(OriginRemote), false) + assert.equal(names.includes(NonGitHubDesktopRemote), false) }) it('never prunes remotes with local branches', () => { @@ -96,9 +98,9 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], allBranches) - expect(getNamesFromRemotes(remotesToPrune)).not.toContain( + assert.equal(getNamesFromRemotes(remotesToPrune).includes( GitHubDesktopRemoteWithLocalBranch - ) + ), false) }) it('never prunes remotes with pull requests', () => { @@ -112,16 +114,16 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, openPRs, []) - expect(getNamesFromRemotes(remotesToPrune)).not.toContain( + assert.equal(getNamesFromRemotes(remotesToPrune).includes( GitHubDesktopRemoteWithPullRequest - ) + ), false) }) it('prunes remotes without pull requests or local branches', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], []) const remoteNames = getNamesFromRemotes(remotesToPrune) - expect(remoteNames).toContain(GitHubDesktopRemoteWithPullRequest) - expect(remoteNames).toContain(GitHubDesktopRemoteWithLocalBranch) + assert(remoteNames.includes(GitHubDesktopRemoteWithPullRequest)) + assert(remoteNames.includes(GitHubDesktopRemoteWithLocalBranch)) }) }) diff --git a/app/test/unit/find-upstream-remote-test.ts b/app/test/unit/find-upstream-remote-test.ts index 8c56a802b56..8648c3d61a8 100644 --- a/app/test/unit/find-upstream-remote-test.ts +++ b/app/test/unit/find-upstream-remote-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { findUpstreamRemote, UpstreamRemoteName, @@ -17,9 +19,9 @@ describe('findUpstreamRemote', () => { }, ] const upstream = findUpstreamRemote(parent, remotes) - expect(upstream).not.toBeNull() - expect(upstream!.name).toBe(UpstreamRemoteName) - expect(upstream!.url).toBe( + assert(upstream !== null) + assert.equal(upstream!.name, UpstreamRemoteName) + assert.equal(upstream!.url, 'https://github.com/Somsubhra/github-release-stats.git' ) }) diff --git a/app/test/unit/format-commit-message-test.ts b/app/test/unit/format-commit-message-test.ts index eefa05a36f0..39151845860 100644 --- a/app/test/unit/format-commit-message-test.ts +++ b/app/test/unit/format-commit-message-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatCommitMessage } from '../../src/lib/format-commit-message' import { setupEmptyRepository } from '../helpers/repositories' @@ -5,33 +7,33 @@ describe('formatCommitMessage', () => { it('always adds trailing newline', async () => { const repo = await setupEmptyRepository() - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'test', description: null }) - ).toBe('test\n') - expect( + , 'test\n') + assert.equal( await formatCommitMessage(repo, { summary: 'test', description: 'test' }) - ).toBe('test\n\ntest\n') + , 'test\n\ntest\n') }) it('omits description when null', async () => { const repo = await setupEmptyRepository() - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'test', description: null }) - ).toBe('test\n') + , 'test\n') }) it('omits description when empty string', async () => { const repo = await setupEmptyRepository() - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'test', description: '' }) - ).toBe('test\n') + , 'test\n') }) it('adds two newlines between summary and description', async () => { const repo = await setupEmptyRepository() - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'foo', description: 'bar' }) - ).toBe('foo\n\nbar\n') + , 'foo\n\nbar\n') }) it('appends trailers to a summary-only message', async () => { @@ -40,13 +42,13 @@ describe('formatCommitMessage', () => { { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, ] - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'foo', description: null, trailers, }) - ).toBe( + , 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -59,13 +61,13 @@ describe('formatCommitMessage', () => { { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, ] - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'foo', description: 'bar', trailers, }) - ).toBe( + , 'foo\n\nbar\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -79,13 +81,13 @@ describe('formatCommitMessage', () => { { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, ] - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'foo', description: 'Co-Authored-By: Markus Olsson ', trailers, }) - ).toBe( + , 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -99,14 +101,14 @@ describe('formatCommitMessage', () => { { token: 'Signed-Off-By', value: 'nerdneha ' }, ] - expect( + assert.equal( await formatCommitMessage(repo, { summary: 'foo', // note the lack of space after : description: 'Co-Authored-By:Markus Olsson ', trailers, }) - ).toBe( + , 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -124,9 +126,9 @@ describe('formatCommitMessage', () => { const description = 'hello\n---\nworld\n\nCo-Authored-By: Markus Olsson ' - expect( + assert.equal( await formatCommitMessage(repo, { summary, description, trailers }) - ).toBe( + , 'foo\n\nhello\n---\nworld\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' diff --git a/app/test/unit/format-duration-test.ts b/app/test/unit/format-duration-test.ts index 9495003cb91..d86d623af64 100644 --- a/app/test/unit/format-duration-test.ts +++ b/app/test/unit/format-duration-test.ts @@ -1,18 +1,20 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatPreciseDuration } from '../../src/lib/format-duration' describe('formatPreciseDuration', () => { it('returns 0s for ms less than 1000', () => { - expect(formatPreciseDuration(1)).toBe('0s') + assert.equal(formatPreciseDuration(1), '0s') }) it('return 0[unit] after encountering first whole unit', () => { - expect(formatPreciseDuration(86400000)).toBe('1d 0h 0m 0s') - expect(formatPreciseDuration(3600000)).toBe('1h 0m 0s') - expect(formatPreciseDuration(60000)).toBe('1m 0s') - expect(formatPreciseDuration(1000)).toBe('1s') + assert.equal(formatPreciseDuration(86400000), '1d 0h 0m 0s') + assert.equal(formatPreciseDuration(3600000), '1h 0m 0s') + assert.equal(formatPreciseDuration(60000), '1m 0s') + assert.equal(formatPreciseDuration(1000), '1s') }) it('treats negative values as absolute numbers', () => { - expect(formatPreciseDuration(-1000)).toBe('1s') + assert.equal(formatPreciseDuration(-1000), '1s') }) }) diff --git a/app/test/unit/format-test.ts b/app/test/unit/format-test.ts index 47a8e8f3729..0fb01c70d17 100644 --- a/app/test/unit/format-test.ts +++ b/app/test/unit/format-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatRebaseValue } from '../../src/lib/rebase' describe('format', () => { @@ -7,7 +9,7 @@ describe('format', () => { const result = formatRebaseValue(value) - expect(result).toEqual(0) + assert.equal(result, 0) }) it('clamps a positive value', () => { @@ -15,7 +17,7 @@ describe('format', () => { const result = formatRebaseValue(value) - expect(result).toEqual(1) + assert.equal(result, 1) }) it('formats to two significant figures', () => { @@ -23,7 +25,7 @@ describe('format', () => { const result = formatRebaseValue(value) - expect(result).toEqual(0.11) + assert.equal(result, 0.11) }) it('handles infinity', () => { @@ -31,8 +33,8 @@ describe('format', () => { const result = formatRebaseValue(value) - expect(result).toBeGreaterThanOrEqual(0) - expect(result).toBeLessThanOrEqual(1) + assert(result >= 0) + assert(result <= 1) }) }) }) diff --git a/app/test/unit/fuzzy-find-test.ts b/app/test/unit/fuzzy-find-test.ts index 661fd85a357..66aa12ef543 100644 --- a/app/test/unit/fuzzy-find-test.ts +++ b/app/test/unit/fuzzy-find-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { match } from '../../src/lib/fuzzy-find' import { getText } from '../../src/ui/lib/filter-list' describe('fuzzy find', () => { @@ -19,27 +21,27 @@ describe('fuzzy find', () => { it('should find matching item when searching by pull request number', () => { const results = match('4653', items, getText) - expect(results).toHaveLength(1) - expect(results[0].item['text'].join('')).toContain('4653') + assert.equal((results).length, 1) + assert(results[0].item['text'].join('').includes('4653')) }) it('should find matching item when searching by author', () => { const results = match('damaneice', items, getText) - expect(results).toHaveLength(1) - expect(results[0].item['text'].join('')).toContain('damaneice') + assert.equal((results).length, 1) + assert(results[0].item['text'].join('').includes('damaneice')) }) it('should find matching item when by title', () => { const results = match('awesome feature', items, getText) - expect(results).toHaveLength(1) - expect(results[0].item['text'].join('')).toContain('awesome feature') + assert.equal((results).length, 1) + assert(results[0].item['text'].join('').includes('awesome feature')) }) it('should find nothing', () => { const results = match('$%^', items, getText) - expect(results).toHaveLength(0) + assert.equal((results).length, 0) }) }) diff --git a/app/test/unit/git-store-cache-test.ts b/app/test/unit/git-store-cache-test.ts index 1d074f67001..6b567325bc0 100644 --- a/app/test/unit/git-store-cache-test.ts +++ b/app/test/unit/git-store-cache-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../src/models/repository' import { GitStoreCache } from '../../src/lib/stores/git-store-cache' import { shell } from '../helpers/test-app-shell' @@ -12,7 +14,7 @@ describe('GitStoreCache', () => { const first = cache.get(repository) const second = cache.get(repository) - expect(first).toBe(second) + assert.equal(first, second) }) it('returns different instance of GitStore after removing', () => { @@ -23,6 +25,6 @@ describe('GitStoreCache', () => { cache.remove(repository) const second = cache.get(repository) - expect(first).not.toBe(second) + assert.notEqual(first, second) }) }) diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index 3c68e31b30b..f30d1f2271f 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' import { exec } from 'dugite' @@ -31,9 +33,9 @@ describe('GitStore', () => { const commits = await gitStore.loadCommitBatch('HEAD', 0) - expect(commits).not.toBeNull() - expect(commits).toHaveLength(100) - expect(commits![0]).toEqual('708a46eac512c7b2486da2247f116d11a100b611') + assert(commits !== null) + assert.equal(commits.length, 100) + assert.equal(commits![0], '708a46eac512c7b2486da2247f116d11a100b611') }) }) @@ -62,9 +64,9 @@ describe('GitStore', () => { let status = await getStatusOrThrow(repo) let files = status.workingDirectory.files - expect(files).toHaveLength(2) - expect(files[0].path).toEqual('README.md') - expect(files[0].status.kind).toEqual(AppFileStatusKind.Modified) + assert.equal(files.length, 2) + assert.equal(files[0].path, 'README.md') + assert.equal(files[0].status.kind, AppFileStatusKind.Modified) // discard the LICENSE.md file await gitStore.discardChanges([files[1]]) @@ -72,7 +74,7 @@ describe('GitStore', () => { status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) }) it('can discard a renamed file', async () => { @@ -99,7 +101,7 @@ describe('GitStore', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal(files.length, 0) }) describe('undo first commit', () => { @@ -109,6 +111,7 @@ describe('GitStore', () => { const commitMessage = 'added file' beforeEach(async () => { + debugger repository = await setupEmptyRepository() const file = 'README.md' @@ -120,20 +123,20 @@ describe('GitStore', () => { await exec(['commit', '-m', commitMessage], repository.path) firstCommit = await getCommit(repository, 'master') - expect(firstCommit).not.toBeNull() - expect(firstCommit!.parentSHAs).toHaveLength(0) + assert(firstCommit !== null) + assert.equal(firstCommit!.parentSHAs.length, 0) }) it('reports the repository is unborn', async () => { const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() - expect(gitStore.tip.kind).toEqual(TipState.Valid) + assert.equal(gitStore.tip.kind, TipState.Valid) await gitStore.undoCommit(firstCommit!) const after = await getStatusOrThrow(repository) - expect(after.currentTip).toBeUndefined() + assert(after.currentTip === undefined) }) it('pre-fills the commit message', async () => { @@ -142,8 +145,8 @@ describe('GitStore', () => { await gitStore.undoCommit(firstCommit!) const newCommitMessage = gitStore.commitMessage - expect(newCommitMessage).not.toBeNull() - expect(newCommitMessage!.summary).toEqual(commitMessage) + assert(newCommitMessage !== null) + assert.equal(newCommitMessage!.summary, commitMessage) }) it('clears the undo commit dialog', async () => { @@ -154,16 +157,16 @@ describe('GitStore', () => { const tip = gitStore.tip as IValidBranch await gitStore.loadLocalCommits(tip.branch) - expect(gitStore.localCommitSHAs).toHaveLength(1) + assert.equal(gitStore.localCommitSHAs.length, 1) await gitStore.undoCommit(firstCommit!) await gitStore.loadStatus() - expect(gitStore.tip.kind).toEqual(TipState.Unborn) + assert.equal(gitStore.tip.kind, TipState.Unborn) await gitStore.loadLocalCommits(null) - expect(gitStore.localCommitSHAs).toHaveLength(0) + assert.equal(gitStore.localCommitSHAs.length, 0) }) it('has no staged files', async () => { @@ -174,7 +177,7 @@ describe('GitStore', () => { const tip = gitStore.tip as IValidBranch await gitStore.loadLocalCommits(tip.branch) - expect(gitStore.localCommitSHAs.length).toEqual(1) + assert.equal(gitStore.localCommitSHAs.length, 1) await gitStore.undoCommit(firstCommit!) @@ -190,7 +193,7 @@ describe('GitStore', () => { ], repository.path ) - expect(result.stdout.length).toEqual(0) + assert.equal(result.stdout.length, 0) }) }) @@ -207,13 +210,13 @@ describe('GitStore', () => { let status = await getStatusOrThrow(repo!) let files = status.workingDirectory.files - expect(files.length).toEqual(1) + assert.equal(files.length, 1) await gitStore.discardChanges([files[0]]) status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files.length).toEqual(0) + assert.equal(files.length, 0) }) }) @@ -268,22 +271,22 @@ describe('GitStore', () => { it('has a remote defined', async () => { const remotes = await getRemotes(repository) - expect(remotes).toHaveLength(1) + assert.equal(remotes.length, 1) }) it('will merge a local and remote branch when tracking branch set', async () => { const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() - expect(gitStore.allBranches).toHaveLength(2) + assert.equal(gitStore.allBranches.length, 2) const defaultBranch = gitStore.allBranches.find(b => b.name === 'master') - expect(defaultBranch!.upstream).toBe('origin/master') + assert.equal(defaultBranch!.upstream, 'origin/master') const remoteBranch = gitStore.allBranches.find( b => b.name === 'origin/some-other-branch' ) - expect(remoteBranch!.type).toBe(BranchType.Remote) + assert.equal(remoteBranch!.type, BranchType.Remote) }) it('the tracking branch is not cleared when the remote branch is removed', async () => { @@ -296,7 +299,7 @@ describe('GitStore', () => { const currentBranchBefore = gitStore.allBranches.find( b => b.name === 'some-other-branch' ) - expect(currentBranchBefore!.upstream).toBe('origin/some-other-branch') + assert.equal(currentBranchBefore!.upstream, 'origin/some-other-branch') // delete the ref in the upstream branch await exec(['branch', '-D', 'some-other-branch'], upstream.path) @@ -310,7 +313,7 @@ describe('GitStore', () => { ) // ensure the tracking information is unchanged - expect(currentBranchAfter!.upstream).toBe('origin/some-other-branch') + assert.equal(currentBranchAfter!.upstream, 'origin/some-other-branch') }) }) }) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index c24659b8ea0..996d946756b 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { exec } from 'dugite' import { setupTwoCommitRepo, @@ -45,7 +47,7 @@ describe('git/apply', () => { patch = result.stdout }) it('returns true', async () => { - expect(await checkPatch(repository, patch)).toBe(true) + assert.equal(await checkPatch(repository, patch), true) }) }) describe('on a related repo with conflicts', () => { @@ -64,7 +66,7 @@ describe('git/apply', () => { }) }) it('returns false', async () => { - expect(await checkPatch(repository, patch)).toBe(false) + assert.equal(await checkPatch(repository, patch), false) }) }) }) @@ -100,7 +102,7 @@ describe('git/apply', () => { const diff = await getDiff(filePath) - expect(diff.text).toEqual(previousDiff.text) + assert.equal(diff.text, previousDiff.text) }) it('discards all file changes when a full selection is passed', async () => { @@ -115,8 +117,8 @@ describe('git/apply', () => { const diff = await getDiff(filePath) // Check that the file has no local changes. - expect(diff.text).toEqual('') - expect(diff.hunks).toEqual([]) + assert.equal(diff.text, '') + assert(diff.hunks.length === 0) }) it('re-adds a single removed line', async () => { @@ -142,10 +144,11 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)).toEqual(` -"@@ -7,0 +7,1 @@ -+ Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor" -`) + assert.equal( + getDifference(previousContents, fileContents), + `@@ -7,0 +7,1 @@ ++ Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor` + ) }) it('re-adds a removed hunk', async () => { @@ -172,13 +175,14 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)).toEqual(` -"@@ -7,0 +7,4 @@ + assert.equal( + getDifference(previousContents, fileContents), + `@@ -7,0 +7,4 @@ + Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor + nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in + eleifend mi. -+" -`) ++` + ) }) it('removes an added line', async () => { @@ -204,10 +208,11 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)).toEqual(` -"@@ -21,1 +21,0 @@ -- nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in" -`) + assert.equal( + getDifference(previousContents, fileContents), + `@@ -21,1 +21,0 @@ +- nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in` + ) }) it('removes an added hunk', async () => { @@ -222,8 +227,6 @@ describe('git/apply', () => { true ) - console.log('diff', hunkRange) - const previousContents = await FSE.readFile( Path.join(repository.path, filePath), 'utf8' @@ -241,13 +244,14 @@ describe('git/apply', () => { 'utf8' ) - expect(getDifference(previousContents, fileContents)).toEqual(` -"@@ -20,4 +20,0 @@ + assert.equal( + getDifference(previousContents, fileContents), + `@@ -20,4 +20,0 @@ - Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor - nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in - eleifend mi. --" -`) +-` + ) }) }) }) diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index d6e7553f1dc..cb1177b77d4 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { shell } from '../../helpers/test-app-shell' import { setupEmptyRepository, @@ -35,9 +37,9 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Unborn) + assert.equal(tip.kind, TipState.Unborn) const unborn = tip as IUnbornRepository - expect(unborn.ref).toEqual('master') + assert.equal(unborn.ref, 'master') }) it('returns correct ref if checkout occurs', async () => { @@ -49,9 +51,9 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Unborn) + assert.equal(tip.kind, TipState.Unborn) const unborn = tip as IUnbornRepository - expect(unborn.ref).toEqual('not-master') + assert.equal(unborn.ref, 'not-master') }) it('returns detached for arbitrary checkout', async () => { @@ -62,9 +64,10 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Detached) + assert.equal(tip.kind, TipState.Detached) const detached = tip as IDetachedHead - expect(detached.currentSha).toEqual( + assert.equal( + detached.currentSha, '2acb028231d408aaa865f9538b1c89de5a2b9da8' ) }) @@ -77,10 +80,11 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Valid) + assert.equal(tip.kind, TipState.Valid) const onBranch = tip as IValidBranch - expect(onBranch.branch.name).toEqual('commit-with-long-description') - expect(onBranch.branch.tip.sha).toEqual( + assert.equal(onBranch.branch.name, 'commit-with-long-description') + assert.equal( + onBranch.branch.tip.sha, 'dfa96676b65e1c0ed43ca25492252a5e384c8efd' ) }) @@ -93,9 +97,9 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Valid) + assert.equal(tip.kind, TipState.Valid) const valid = tip as IValidBranch - expect(valid.branch.upstreamRemoteName).toEqual('bassoon') + assert.equal(valid.branch.upstreamRemoteName, 'bassoon') }) }) @@ -108,12 +112,12 @@ describe('git/branch', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toEqual(TipState.Valid) + assert.equal(tip.kind, TipState.Valid) const valid = tip as IValidBranch - expect(valid.branch.upstreamRemoteName).toEqual('bassoon') - expect(valid.branch.upstream).toEqual('bassoon/master') - expect(valid.branch.upstreamWithoutRemote).toEqual('master') + assert.equal(valid.branch.upstreamRemoteName, 'bassoon') + assert.equal(valid.branch.upstream, 'bassoon/master') + assert.equal(valid.branch.upstreamWithoutRemote, 'master') }) }) @@ -127,20 +131,20 @@ describe('git/branch', () => { it('finds one branch name', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD') - expect(branches).not.toBeNull() - expect(branches).toHaveLength(1) - expect(branches![0]).toEqual('master') + assert(branches !== null) + assert.equal(branches.length, 1) + assert.equal(branches![0], 'master') }) it('finds no branch names', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD^') - expect(branches).not.toBeNull() - expect(branches).toHaveLength(0) + assert(branches !== null) + assert.equal(branches.length, 0) }) it('returns null on a malformed committish', async () => { const branches = await getBranchesPointedAt(repository, 'MERGE_HEAD') - expect(branches).toBeNull() + assert(branches === null) }) }) @@ -152,10 +156,10 @@ describe('git/branch', () => { }) it('finds multiple branch names', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD') - expect(branches).not.toBeNull() - expect(branches).toHaveLength(2) - expect(branches).toContain('other-branch') - expect(branches).toContain('master') + assert(branches !== null) + assert.equal(branches.length, 2) + assert(branches.includes('other-branch')) + assert(branches.includes('master')) }) }) }) @@ -176,12 +180,12 @@ describe('git/branch', () => { const ref = `refs/heads/${name}` - expect(branch).not.toBeNull() - expect(await getBranches(repository, ref)).toBeArrayOfSize(1) + assert(branch !== null) + assert.equal((await getBranches(repository, ref)).length, 1) await deleteLocalBranch(repository, branch.name) - expect(await getBranches(repository, ref)).toBeArrayOfSize(0) + assert.equal((await getBranches(repository, ref)).length, 0) }) }) @@ -198,24 +202,24 @@ describe('git/branch', () => { const branch = await createBranch(mockRemote, name, null) const localRef = `refs/heads/${name}` - expect(branch).not.toBeNull() + assert(branch !== null) const mockLocal = await setupLocalForkOfRepository(mockRemote) const remoteRef = `refs/remotes/origin/${name}` const [remoteBranch] = await getBranches(mockLocal, remoteRef) - expect(remoteBranch).not.toBeUndefined() + assert(remoteBranch !== undefined) await checkoutBranch(mockLocal, remoteBranch, null) await git(['checkout', '-'], mockLocal.path, 'checkoutPrevious') - expect(await getBranches(mockLocal, localRef)).toBeArrayOfSize(1) - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(1) + assert.equal((await getBranches(mockLocal, localRef)).length, 1) + assert.equal((await getBranches(mockRemote, localRef)).length, 1) const [localBranch] = await getBranches(mockLocal, localRef) - expect(localBranch).not.toBeUndefined() - expect(localBranch.upstreamRemoteName).not.toBeNull() - expect(localBranch.upstreamWithoutRemote).not.toBeNull() + assert(localBranch !== undefined) + assert(localBranch.upstreamRemoteName !== null) + assert(localBranch.upstreamWithoutRemote !== null) await deleteRemoteBranch( mockLocal, @@ -223,9 +227,9 @@ describe('git/branch', () => { localBranch.upstreamWithoutRemote! ) - expect(await getBranches(mockLocal, localRef)).toBeArrayOfSize(1) - expect(await getBranches(mockLocal, remoteRef)).toBeArrayOfSize(0) - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(0) + assert.equal((await getBranches(mockLocal, localRef)).length, 1) + assert.equal((await getBranches(mockLocal, remoteRef)).length, 0) + assert.equal((await getBranches(mockRemote, localRef)).length, 0) }) it('handles attempted delete of removed remote branch', async () => { @@ -233,30 +237,30 @@ describe('git/branch', () => { const branch = await createBranch(mockRemote, name, null) const localRef = `refs/heads/${name}` - expect(branch).not.toBeNull() - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(1) + assert(branch !== null) + assert.equal((await getBranches(mockRemote, localRef)).length, 1) const mockLocal = await setupLocalForkOfRepository(mockRemote) const remoteRef = `refs/remotes/origin/${name}` const [remoteBranch] = await getBranches(mockLocal, remoteRef) - expect(remoteBranch).not.toBeUndefined() + assert(remoteBranch !== undefined) await checkoutBranch(mockLocal, remoteBranch, null) await git(['checkout', '-'], mockLocal.path, 'checkoutPrevious') - expect(await getBranches(mockLocal, localRef)).toBeArrayOfSize(1) - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(1) + assert.equal((await getBranches(mockLocal, localRef)).length, 1) + assert.equal((await getBranches(mockRemote, localRef)).length, 1) const [upstreamBranch] = await getBranches(mockRemote, localRef) - expect(upstreamBranch).not.toBeUndefined() + assert(upstreamBranch !== undefined) await deleteLocalBranch(mockRemote, upstreamBranch.name) - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(0) + assert.equal((await getBranches(mockRemote, localRef)).length, 0) const [localBranch] = await getBranches(mockLocal, localRef) - expect(localBranch).not.toBeUndefined() - expect(localBranch.upstreamRemoteName).not.toBeNull() - expect(localBranch.upstreamWithoutRemote).not.toBeNull() + assert(localBranch !== undefined) + assert(localBranch.upstreamRemoteName !== null) + assert(localBranch.upstreamWithoutRemote !== null) await deleteRemoteBranch( mockLocal, @@ -264,8 +268,8 @@ describe('git/branch', () => { localBranch.upstreamWithoutRemote! ) - expect(await getBranches(mockLocal, remoteRef)).toBeArrayOfSize(0) - expect(await getBranches(mockRemote, localRef)).toBeArrayOfSize(0) + assert.equal((await getBranches(mockLocal, remoteRef)).length, 0) + assert.equal((await getBranches(mockRemote, localRef)).length, 0) }) }) }) diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 6b24f1fc359..88fb908a6e9 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { shell } from '../../helpers/test-app-shell' import { setupEmptyRepository, @@ -35,10 +37,10 @@ describe('git/checkout', () => { await checkoutBranch(repository, branch, null) } catch (error) { errorRaised = true - expect(error.message).toBe('fatal: invalid reference: ..\n') + assert.equal(error.message, 'fatal: invalid reference: ..\n') } - expect(errorRaised).toBe(true) + assert.equal(errorRaised, true) }) it('can checkout a valid branch name in an existing repository', async () => { @@ -60,10 +62,10 @@ describe('git/checkout', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toBe(TipState.Valid) + assert.equal(tip.kind, TipState.Valid) const validBranch = tip as IValidBranch - expect(validBranch.branch.name).toBe('commit-with-long-description') + assert.equal(validBranch.branch.name, 'commit-with-long-description') }) it('can checkout a branch when it exists on multiple remotes', async () => { @@ -95,12 +97,12 @@ describe('git/checkout', () => { await store.loadStatus() const tip = store.tip - expect(tip.kind).toBe(TipState.Valid) + assert.equal(tip.kind, TipState.Valid) const validBranch = tip as IValidBranch - expect(validBranch.branch.name).toBe(expectedBranch) - expect(validBranch.branch.type).toBe(BranchType.Local) - expect(validBranch.branch.upstreamRemoteName).toBe('first-remote') + assert.equal(validBranch.branch.name, expectedBranch) + assert.equal(validBranch.branch.type, BranchType.Local) + assert.equal(validBranch.branch.upstreamRemoteName, 'first-remote') }) it('will fail when an existing branch matches the remote branch', async () => { @@ -126,10 +128,10 @@ describe('git/checkout', () => { await checkoutBranch(repository, remoteBranch, null) } catch (error) { errorRaised = true - expect(error.message).toBe('A branch with that name already exists.') + assert.equal(error.message, 'A branch with that name already exists.') } - expect(errorRaised).toBe(true) + assert.equal(errorRaised, true) }) describe('with submodules', () => { @@ -154,7 +156,7 @@ describe('git/checkout', () => { const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal((status.workingDirectory.files).length, 0) }) it('updates a changed submodule reference', async () => { @@ -174,7 +176,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, devBranch, null) const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal((status.workingDirectory.files).length, 0) }) }) }) diff --git a/app/test/unit/git/cherry-pick-test.ts b/app/test/unit/git/cherry-pick-test.ts index 4d7041c8903..863c5946b0d 100644 --- a/app/test/unit/git/cherry-pick-test.ts +++ b/app/test/unit/git/cherry-pick-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { exec } from 'dugite' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -64,9 +66,9 @@ describe('git/cherry-pick', () => { ) const commits = await getCommits(repository, targetBranch.ref, 3) - expect(commits.length).toBe(2) - expect(commits[0].summary).toBe(cherryPickedCommit!.summary) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commits.length, 2) + assert.equal(commits[0].summary, cherryPickedCommit!.summary) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picked a commit with empty message', async () => { @@ -85,15 +87,15 @@ describe('git/cherry-pick', () => { repository, featureBranch.tip.sha ) - expect(emptyMessageCommit?.summary).toBe('') + assert.equal(emptyMessageCommit?.summary, '') const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) - expect(commits.length).toBe(2) - expect(commits[0]!.summary).toBe('') - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commits.length, 2) + assert.equal(commits[0]!.summary, '') + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picks a redundant commit', async () => { @@ -101,8 +103,8 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) - expect(commits.length).toBe(2) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commits.length, 2) + assert.equal(result, CherryPickResult.CompletedWithoutError) featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) result = await cherryPick(repository, [featureTip]) @@ -112,8 +114,8 @@ describe('git/cherry-pick', () => { targetBranch.ref, 5 ) - expect(commitsAfterRedundant.length).toBe(3) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commitsAfterRedundant.length, 3) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picks an empty commit', async () => { @@ -131,8 +133,8 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) - expect(commits.length).toBe(2) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commits.length, 2) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picks an empty commit inside a range', async () => { @@ -166,8 +168,8 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, commitsInRange!) const commits = await getCommits(repository, targetBranch.ref, 5) - expect(commits.length).toBe(4) // original commit + 4 cherry picked - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(commits.length, 4) // original commit + 4 cherry picked + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picked multiple commits without conflicts', async () => { @@ -183,14 +185,14 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, commitsInRange!) const commits = await getCommits(repository, targetBranch.ref, 5) - expect(commits.length).toBe(5) - expect(commits[1].summary).toBe('Cherry-picked Feature! Number Three') - expect(commits[2].summary).toBe('Cherry-picked Feature! Number Two') + assert.equal(commits.length, 5) + assert.equal(commits[1].summary, 'Cherry-picked Feature! Number Three') + assert.equal(commits[2].summary, 'Cherry-picked Feature! Number Two') }) it('fails to cherry-pick array of no commits', async () => { result = await cherryPick(repository, []) - expect(result).toBe(CherryPickResult.UnableToStart) + assert.equal(result, CherryPickResult.UnableToStart) }) it('fails to cherry-pick when working tree is not clean', async () => { @@ -212,11 +214,15 @@ describe('git/cherry-pick', () => { ) result = await cherryPick(repository, [featureTip]) } catch (error) { - expect(error.toString()).toContain( - 'The following untracked working tree files would be overwritten by merge' + assert( + error + .toString() + .includes( + 'The following untracked working tree files would be overwritten by merge' + ) ) } - expect(result).toBe(null) + assert.equal(result, null) }) it('successfully cherry-picks a merge commit', async () => { @@ -237,18 +243,18 @@ describe('git/cherry-pick', () => { await makeCommit(repository, mergeCommit) const mergeBranch = await getBranchOrError(repository, mergeBranchName) await switchTo(repository, featureBranchName) - expect(await merge(repository, mergeBranch.ref)).toBe(MergeResult.Success) + assert.equal(await merge(repository, mergeBranch.ref), MergeResult.Success) // top commit is a merge commit const commits = await getCommits(repository, featureBranch.ref, 7) - expect(commits[0].summary).toContain('Merge') + assert(commits[0].summary.includes('Merge')) featureBranch = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully cherry-picks a merge commit after a conflict', async () => { @@ -286,11 +292,11 @@ describe('git/cherry-pick', () => { await makeCommit(repository, mergeCommit) const mergeBranch = await getBranchOrError(repository, mergeBranchName) await switchTo(repository, featureBranchName) - expect(await merge(repository, mergeBranch.ref)).toBe(MergeResult.Success) + assert.equal(await merge(repository, mergeBranch.ref), MergeResult.Success) // top commit is a merge commit const commits = await getCommits(repository, featureBranch.ref, 7) - expect(commits[0].summary).toContain('Merge') + assert(commits[0].summary.includes('Merge')) featureBranch = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) @@ -298,7 +304,7 @@ describe('git/cherry-pick', () => { const commitRange = revRangeInclusive(firstSha, featureBranch.tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) result = await cherryPick(repository, commitsInRange!) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) // resolve conflicts by writing files to disk await FSE.writeFile( @@ -311,7 +317,7 @@ describe('git/cherry-pick', () => { result = await continueCherryPick(repository, files) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) describe('cherry-picking with conflicts', () => { @@ -338,13 +344,13 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) const status = await getStatusOrThrow(repository) const conflictedFiles = status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted ) - expect(conflictedFiles).toHaveLength(1) + assert.equal(conflictedFiles.length, 1) }) it('successfully continues cherry-picking with conflicts after resolving them by overwriting', async () => { @@ -353,7 +359,7 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) const { files } = statusAfterCherryPick.workingDirectory @@ -361,7 +367,7 @@ describe('git/cherry-pick', () => { // git diff --check warns if conflict markers exist and will exit with // non-zero status if conflicts found const diffCheckBefore = await exec(['diff', '--check'], repository.path) - expect(diffCheckBefore.exitCode).toBeGreaterThan(0) + assert(diffCheckBefore.exitCode > 0) // resolve conflicts by writing files to disk await FSE.writeFile( @@ -371,11 +377,11 @@ describe('git/cherry-pick', () => { // diff --check to verify no conflicts exist (exitCode should be 0) const diffCheckAfter = await exec(['diff', '--check'], repository.path) - expect(diffCheckAfter.exitCode).toEqual(0) + assert.equal(diffCheckAfter.exitCode, 0) result = await continueCherryPick(repository, files) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully continues cherry-picking with conflicts after resolving them manually', async () => { @@ -384,7 +390,7 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) const { files } = statusAfterCherryPick.workingDirectory @@ -392,7 +398,7 @@ describe('git/cherry-pick', () => { // git diff --check warns if conflict markers exist and will exit with // non-zero status if conflicts found const diffCheckBefore = await exec(['diff', '--check'], repository.path) - expect(diffCheckBefore.exitCode).toBeGreaterThan(0) + assert(diffCheckBefore.exitCode > 0) const manualResolutions = new Map() @@ -404,7 +410,7 @@ describe('git/cherry-pick', () => { result = await continueCherryPick(repository, files, manualResolutions) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully continues cherry-picking with conflicts after resolving them manually and no changes to commit', async () => { @@ -413,7 +419,7 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) const { files } = statusAfterCherryPick.workingDirectory @@ -421,7 +427,7 @@ describe('git/cherry-pick', () => { // git diff --check warns if conflict markers exist and will exit with // non-zero status if conflicts found const diffCheckBefore = await exec(['diff', '--check'], repository.path) - expect(diffCheckBefore.exitCode).toBeGreaterThan(0) + assert(diffCheckBefore.exitCode > 0) const manualResolutions = new Map() @@ -433,7 +439,7 @@ describe('git/cherry-pick', () => { result = await continueCherryPick(repository, files, manualResolutions) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) }) it('successfully detects cherry-picking with outstanding files not staged', async () => { @@ -442,16 +448,16 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) result = await continueCherryPick(repository, []) - expect(result).toBe(CherryPickResult.OutstandingFilesNotStaged) + assert.equal(result, CherryPickResult.OutstandingFilesNotStaged) const status = await getStatusOrThrow(repository) const conflictedFiles = status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted ) - expect(conflictedFiles).toHaveLength(1) + assert.equal(conflictedFiles.length, 1) }) it('successfully continues cherry-picking with additional changes to untracked files', async () => { @@ -460,7 +466,7 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) // resolve conflicts by writing files to disk await FSE.writeFile( @@ -478,15 +484,15 @@ describe('git/cherry-pick', () => { const { files } = statusAfterCherryPick.workingDirectory // THING.MD and UNTRACKED_FILE.md should be in working directory - expect(files.length).toBe(2) + assert.equal(files.length, 2) result = await continueCherryPick(repository, files) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) // Only UNTRACKED_FILE.md should be in working directory // THING.md committed with cherry pick const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files[0].path).toBe('UNTRACKED_FILE.md') + assert.equal(status.workingDirectory.files[0].path, 'UNTRACKED_FILE.md') }) it('successfully aborts cherry-pick after conflict', async () => { @@ -495,17 +501,17 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) result = await cherryPick(repository, [featureTip]) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) // files from cherry pick exist in conflicted state const statusAfterConflict = await getStatusOrThrow(repository) - expect(statusAfterConflict.workingDirectory.files).toHaveLength(1) + assert.equal(statusAfterConflict.workingDirectory.files.length, 1) await abortCherryPick(repository) // file from cherry pick removed after abort const statusAfterAbort = await getStatusOrThrow(repository) - expect(statusAfterAbort.workingDirectory.files).toHaveLength(0) + assert.equal(statusAfterAbort.workingDirectory.files.length, 0) }) }) @@ -523,7 +529,7 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, [featureTip], p => progress.push(p)) // commit summary set up in before each is "Cherry-picked Feature" - expect(progress).toEqual([ + assert.deepStrictEqual(progress, [ { currentCommitSummary: featureTip.summary, kind: 'multiCommitOperation', @@ -550,8 +556,8 @@ describe('git/cherry-pick', () => { progress.push(p) ) - expect(result).toBe(CherryPickResult.CompletedWithoutError) - expect(progress).toHaveLength(4) + assert.equal(result, CherryPickResult.CompletedWithoutError) + assert.equal(progress.length, 4) }) it('successfully parses progress for multiple commits including a conflict', async () => { @@ -582,15 +588,15 @@ describe('git/cherry-pick', () => { result = await cherryPick(repository, commitsInRange!, p => progress.push(p) ) - expect(result).toBe(CherryPickResult.ConflictsEncountered) + assert.equal(result, CherryPickResult.ConflictsEncountered) // First commit and second cherry picked and rest are waiting on conflict // resolution. - expect(progress).toHaveLength(2) + assert.equal(progress.length, 2) // snapshot prepares the progress for the commit after what has // already happened. const snapshot = await getCherryPickSnapshot(repository) - expect(snapshot?.progress.position).toEqual(progress[1].position + 1) + assert.equal(snapshot?.progress.position, progress[1].position + 1) // resolve conflicts and continue const statusAfterConflictedCherryPick = await getStatusOrThrow(repository) @@ -602,17 +608,20 @@ describe('git/cherry-pick', () => { result = await continueCherryPick(repository, files, new Map(), p => progress.push(p) ) - expect(result).toBe(CherryPickResult.CompletedWithoutError) + assert.equal(result, CherryPickResult.CompletedWithoutError) // After 3rd commit resolved, 3rd and 4th were cherry picked - expect(progress).toHaveLength(4) - expect(progress[0].currentCommitSummary).toEqual('Cherry-picked Feature!') - expect(progress[1].currentCommitSummary).toEqual( + assert.equal(progress.length, 4) + assert.equal(progress[0].currentCommitSummary, 'Cherry-picked Feature!') + assert.equal( + progress[1].currentCommitSummary, 'Cherry-picked Feature! Number Two' ) - expect(progress[2].currentCommitSummary).toEqual( + assert.equal( + progress[2].currentCommitSummary, 'Cherry-picked Feature! Number Three' ) - expect(progress[3].currentCommitSummary).toEqual( + assert.equal( + progress[3].currentCommitSummary, 'Cherry-picked Feature! Number Four' ) }) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index bdcd6b5c628..5785c0ee64b 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -41,7 +43,7 @@ async function getTextDiff( file: WorkingDirectoryFileChange ): Promise { const diff = await getWorkingDirectoryDiff(repo, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) return diff as ITextDiff } @@ -59,19 +61,19 @@ describe('git/commit', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - expect(files.length).toEqual(1) + assert.equal(files.length, 1) const sha = await createCommit(repository, 'Special commit', files) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) status = await getStatusOrThrow(repository) files = status.workingDirectory.files - expect(files.length).toEqual(0) + assert.equal(files.length, 0) const commits = await getCommits(repository, 'HEAD', 100) - expect(commits.length).toEqual(6) - expect(commits[0].summary).toEqual('Special commit') - expect(commits[0].sha.substring(0, 7)).toEqual(sha) + assert.equal(commits.length, 6) + assert.equal(commits[0].summary, 'Special commit') + assert.equal(commits[0].sha.substring(0, 7), sha) }) it('commit does not strip commentary by default', async () => { @@ -79,20 +81,20 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files.length).toEqual(1) + assert.equal(files.length, 1) const message = `Special commit # this is a comment` const sha = await createCommit(repository, message, files) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) const commit = await getCommit(repository, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.summary).toEqual('Special commit') - expect(commit!.body).toEqual('# this is a comment\n') - expect(commit!.shortSha).toEqual(sha) + assert(commit !== null) + assert.equal(commit!.summary, 'Special commit') + assert.equal(commit!.body, '# this is a comment\n') + assert.equal(commit!.shortSha, sha) }) it('can commit for empty repository', async () => { @@ -104,7 +106,7 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files.length).toEqual(2) + assert.equal(files.length, 2) const allChanges = [ files[0].withIncludeAll(true), @@ -116,17 +118,17 @@ describe('git/commit', () => { 'added two files\n\nthis is a description', allChanges ) - expect(sha).toEqual('(root-commit)') + assert.equal(sha, '(root-commit)') const statusAfter = await getStatusOrThrow(repo) - expect(statusAfter.workingDirectory.files.length).toEqual(0) + assert.equal(statusAfter.workingDirectory.files.length, 0) const history = await getCommits(repo, 'HEAD', 2) - expect(history.length).toEqual(1) - expect(history[0].summary).toEqual('added two files') - expect(history[0].body).toEqual('this is a description\n') + assert.equal(history.length, 1) + assert.equal(history[0].summary, 'added two files') + assert.equal(history[0].body, 'this is a description\n') }) it('can commit renames', async () => { @@ -141,16 +143,16 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files.length).toEqual(1) + assert.equal(files.length, 1) const sha = await createCommit(repo, 'renamed a file', [ files[0].withIncludeAll(true), ]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) const statusAfter = await getStatusOrThrow(repo) - expect(statusAfter.workingDirectory.files.length).toEqual(0) + assert.equal(statusAfter.workingDirectory.files.length, 0) }) }) @@ -178,29 +180,29 @@ describe('git/commit', () => { // commit just this change, ignore everything else const sha = await createCommit(repository, 'title', [file]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) // verify that the HEAD of the repository has moved const newTip = (await getCommits(repository, 'HEAD', 1))[0] - expect(newTip.sha).not.toEqual(previousTip.sha) - expect(newTip.summary).toEqual('title') - expect(newTip.shortSha).toEqual(sha) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.summary, 'title') + assert.equal(newTip.shortSha, sha) // verify that the contents of this new commit are just the new file const changesetData = await getChangedFiles(repository, newTip.sha) - expect(changesetData.files.length).toEqual(1) - expect(changesetData.files[0].path).toEqual(newFileName) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, newFileName) // verify that changes remain for this new file const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files.length).toEqual(4) + assert.equal(status.workingDirectory.files.length, 4) // verify that the file is now tracked const fileChange = status!.workingDirectory.files.find( f => f.path === newFileName ) - expect(fileChange).not.toBeUndefined() - expect(fileChange!.status.kind).toEqual(AppFileStatusKind.Modified) + assert(fileChange !== undefined) + assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) }) it('can commit second hunk from modified file', async () => { @@ -231,28 +233,28 @@ describe('git/commit', () => { // commit just this change, ignore everything else const sha = await createCommit(repository, 'title', [updatedFile]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) // verify that the HEAD of the repository has moved const newTip = (await getCommits(repository, 'HEAD', 1))[0] - expect(newTip.sha).not.toEqual(previousTip.sha) - expect(newTip.summary).toEqual('title') + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.summary, 'title') // verify that the contents of this new commit are just the modified file const changesetData = await getChangedFiles(repository, newTip.sha) - expect(changesetData.files.length).toEqual(1) - expect(changesetData.files[0].path).toEqual(modifiedFile) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, modifiedFile) // verify that changes remain for this modified file const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files.length).toEqual(4) + assert.equal(status.workingDirectory.files.length, 4) // verify that the file is still marked as modified const fileChange = status.workingDirectory.files.find( f => f.path === modifiedFile ) - expect(fileChange).not.toBeUndefined() - expect(fileChange!.status.kind).toEqual(AppFileStatusKind.Modified) + assert(fileChange !== undefined) + assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) }) it('can commit single delete from modified file', async () => { @@ -285,18 +287,18 @@ describe('git/commit', () => { // commit just this change, ignore everything else const sha = await createCommit(repository, 'title', [file]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) // verify that the HEAD of the repository has moved const newTip = (await getCommits(repository, 'HEAD', 1))[0] - expect(newTip.sha).not.toEqual(previousTip.sha) - expect(newTip.summary).toEqual('title') - expect(newTip.shortSha).toEqual(sha) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.summary, 'title') + assert.equal(newTip.shortSha, sha) // verify that the contents of this new commit are just the modified file const changesetData = await getChangedFiles(repository, newTip.sha) - expect(changesetData.files.length).toEqual(1) - expect(changesetData.files[0].path).toEqual(fileName) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, fileName) }) it('can commit multiple hunks from modified file', async () => { @@ -331,29 +333,29 @@ describe('git/commit', () => { // commit just this change, ignore everything else const sha = await createCommit(repository, 'title', [updatedFile]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) // verify that the HEAD of the repository has moved const newTip = (await getCommits(repository, 'HEAD', 1))[0] - expect(newTip.sha).not.toEqual(previousTip.sha) - expect(newTip.summary).toEqual('title') - expect(newTip.shortSha).toEqual(sha) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.summary, 'title') + assert.equal(newTip.shortSha, sha) // verify that the contents of this new commit are just the modified file const changesetData = await getChangedFiles(repository, newTip.sha) - expect(changesetData.files.length).toEqual(1) - expect(changesetData.files[0].path).toEqual(modifiedFile) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, modifiedFile) // verify that changes remain for this modified file const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files.length).toEqual(4) + assert.equal(status.workingDirectory.files.length, 4) // verify that the file is still marked as modified const fileChange = status.workingDirectory.files.find( f => f.path === modifiedFile ) - expect(fileChange).not.toBeUndefined() - expect(fileChange!.status.kind).toEqual(AppFileStatusKind.Modified) + assert(fileChange !== undefined) + assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) }) it('can commit some lines from deleted file', async () => { @@ -373,29 +375,29 @@ describe('git/commit', () => { // commit just this change, ignore everything else const sha = await createCommit(repository, 'title', [file]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) // verify that the HEAD of the repository has moved const newTip = (await getCommits(repository, 'HEAD', 1))[0] - expect(newTip.sha).not.toEqual(previousTip.sha) - expect(newTip.summary).toEqual('title') - expect(newTip.sha.substring(0, 7)).toEqual(sha) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.summary, 'title') + assert.equal(newTip.sha.substring(0, 7), sha) // verify that the contents of this new commit are just the new file const changesetData = await getChangedFiles(repository, newTip.sha) - expect(changesetData.files.length).toEqual(1) - expect(changesetData.files[0].path).toEqual(deletedFile) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, deletedFile) // verify that changes remain for this new file const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files.length).toEqual(4) + assert.equal(status.workingDirectory.files.length, 4) // verify that the file is now tracked const fileChange = status.workingDirectory.files.find( f => f.path === deletedFile ) - expect(fileChange).not.toBeUndefined() - expect(fileChange!.status.kind).toEqual(AppFileStatusKind.Deleted) + assert(fileChange !== undefined) + assert.equal(fileChange!.status.kind, AppFileStatusKind.Deleted) }) it('can commit renames with modifications', async () => { @@ -412,17 +414,17 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files.length).toEqual(1) + assert.equal(files.length, 1) const sha = await createCommit(repo, 'renamed a file', [ files[0].withIncludeAll(true), ]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) const statusAfter = await getStatusOrThrow(repo) - expect(statusAfter.workingDirectory.files.length).toEqual(0) - expect(statusAfter.currentTip!.substring(0, 7)).toEqual(sha) + assert.equal(statusAfter.workingDirectory.files.length, 0) + assert.equal(statusAfter.currentTip!.substring(0, 7), sha) }) // The scenario here is that the user has staged a rename (probably using git mv) @@ -442,9 +444,9 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files.length).toEqual(1) - expect(files[0].path).toContain('bar') - expect(files[0].status.kind).toEqual(AppFileStatusKind.Renamed) + assert.equal(files.length, 1) + assert(files[0].path.includes('bar')) + assert.equal(files[0].status.kind, AppFileStatusKind.Renamed) const selection = files[0].selection .withSelectNone() @@ -455,20 +457,20 @@ describe('git/commit', () => { const sha = await createCommit(repo, 'renamed a file', [ partiallySelectedFile, ]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) const statusAfter = await getStatusOrThrow(repo) - expect(statusAfter.workingDirectory.files.length).toEqual(1) + assert.equal(statusAfter.workingDirectory.files.length, 1) const diff = await getTextDiff( repo, statusAfter.workingDirectory.files[0] ) - expect(diff.hunks.length).toEqual(1) - expect(diff.hunks[0].lines.length).toEqual(4) - expect(diff.hunks[0].lines[3].text).toEqual('+line3') + assert.equal(diff.hunks.length, 1) + assert.equal(diff.hunks[0].lines.length, 4) + assert.equal(diff.hunks[0].lines[3].text, '+line3') }) }) @@ -480,23 +482,24 @@ describe('git/commit', () => { const inMerge = await FSE.pathExists( path.join(repo.path, '.git', 'MERGE_HEAD') ) - expect(inMerge).toEqual(true) + assert.equal(inMerge, true) await FSE.writeFile(filePath, 'b1b2') const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files.length).toEqual(1) - expect(files[0].path).toEqual('foo') + assert.equal(files.length, 1) + assert.equal(files[0].path, 'foo') - expect(files[0].status).toEqual({ + assert.deepStrictEqual(files[0].status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.BothModified, them: GitStatusEntry.UpdatedButUnmerged, us: GitStatusEntry.UpdatedButUnmerged, + submoduleStatus: undefined, }, conflictMarkerCount: 0, }) @@ -504,11 +507,11 @@ describe('git/commit', () => { const selection = files[0].selection.withSelectAll() const selectedFile = files[0].withSelection(selection) const sha = await createCommit(repo, 'Merge commit!', [selectedFile]) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) const commits = await getCommits(repo, 'HEAD', 5) - expect(commits[0].parentSHAs.length).toEqual(2) - expect(commits[0]!.shortSha).toEqual(sha) + assert.equal(commits[0].parentSHAs.length, 2) + assert.equal(commits[0]!.shortSha, sha) }) }) @@ -526,8 +529,8 @@ describe('git/commit', () => { ) const sha = await createMergeCommit(repository, trackedFiles) const newStatus = await getStatusOrThrow(repository) - expect(sha).toHaveLength(7) - expect(newStatus.workingDirectory.files).toHaveLength(0) + assert.equal(sha.length, 7) + assert.equal(newStatus.workingDirectory.files.length, 0) }) }) }) @@ -550,12 +553,13 @@ describe('git/commit', () => { trackedFiles, manualResolutions ) - expect( - await FSE.pathExists(path.join(repository.path, 'bar')) - ).toBeTrue() + assert.equal( + await FSE.pathExists(path.join(repository.path, 'bar')), + true + ) const newStatus = await getStatusOrThrow(repository) - expect(sha).toHaveLength(7) - expect(newStatus.workingDirectory.files).toHaveLength(1) + assert.equal(sha.length, 7) + assert.equal(newStatus.workingDirectory.files.length, 1) }) it('deletes files chosen to be removed and commits', async () => { @@ -571,12 +575,13 @@ describe('git/commit', () => { trackedFiles, manualResolutions ) - expect( - await FSE.pathExists(path.join(repository.path, 'bar')) - ).toBeFalse() + assert.equal( + await FSE.pathExists(path.join(repository.path, 'bar')), + false + ) const newStatus = await getStatusOrThrow(repository) - expect(sha).toHaveLength(7) - expect(newStatus.workingDirectory.files).toHaveLength(1) + assert.equal(sha.length, 7) + assert.equal(newStatus.workingDirectory.files.length, 1) }) it('checks out our content for file added in both branches', async () => { @@ -592,12 +597,13 @@ describe('git/commit', () => { trackedFiles, manualResolutions ) - expect( - await FSE.readFile(path.join(repository.path, 'baz'), 'utf8') - ).toEqual('b2') + assert.equal( + await FSE.readFile(path.join(repository.path, 'baz'), 'utf8'), + 'b2' + ) const newStatus = await getStatusOrThrow(repository) - expect(sha).toHaveLength(7) - expect(newStatus.workingDirectory.files).toHaveLength(1) + assert.equal(sha.length, 7) + assert.equal(newStatus.workingDirectory.files.length, 1) }) it('checks out their content for file added in both branches', async () => { @@ -613,12 +619,13 @@ describe('git/commit', () => { trackedFiles, manualResolutions ) - expect( - await FSE.readFile(path.join(repository.path, 'baz'), 'utf8') - ).toEqual('b1') + assert.equal( + await FSE.readFile(path.join(repository.path, 'baz'), 'utf8'), + 'b1' + ) const newStatus = await getStatusOrThrow(repository) - expect(sha).toHaveLength(7) - expect(newStatus.workingDirectory.files).toHaveLength(1) + assert.equal(sha.length, 7) + assert.equal(newStatus.workingDirectory.files.length, 1) }) describe('binary file conflicts', () => { @@ -653,13 +660,14 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.status.kind).toBe(AppFileStatusKind.Conflicted) - expect( - isConflictedFile(file.status) && isManualConflict(file.status) - ).toBe(true) + assert.equal(file.status.kind, AppFileStatusKind.Conflicted) + assert.equal( + isConflictedFile(file.status) && isManualConflict(file.status), + true + ) const trackedFiles = files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -675,8 +683,8 @@ describe('git/commit', () => { 'utf8' ) - expect(fileContents).not.toEqual(fileContentsOurs) - expect(fileContents).toEqual(fileContentsTheirs) + assert.notEqual(fileContents, fileContentsOurs) + assert.equal(fileContents, fileContentsTheirs) }) it('chooses `our` version of a file and commits', async () => { @@ -686,13 +694,14 @@ describe('git/commit', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.status.kind).toBe(AppFileStatusKind.Conflicted) - expect( - isConflictedFile(file.status) && isManualConflict(file.status) - ).toBe(true) + assert.equal(file.status.kind, AppFileStatusKind.Conflicted) + assert.equal( + isConflictedFile(file.status) && isManualConflict(file.status), + true + ) const trackedFiles = files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -708,7 +717,7 @@ describe('git/commit', () => { 'utf8' ) - expect(fileContents).toEqual(fileContentsOurs) + assert.equal(fileContents, fileContentsOurs) }) }) }) @@ -725,9 +734,10 @@ describe('git/commit', () => { }) it('throws an error', async () => { const status = await getStatusOrThrow(repository) - await expect( - createMergeCommit(repository, status.workingDirectory.files) - ).rejects.toThrow(/There are no changes to commit./) + await assert.rejects( + createMergeCommit(repository, status.workingDirectory.files), + /There are no changes to commit./ + ) }) }) }) @@ -752,22 +762,22 @@ describe('git/commit', () => { status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files.length).toEqual(1) - expect(files[0].path).toContain('second') - expect(files[0].status.kind).toEqual(AppFileStatusKind.New) + assert.equal(files.length, 1) + assert(files[0].path.includes('second')) + assert.equal(files[0].status.kind, AppFileStatusKind.New) const toCommit = status.workingDirectory.withIncludeAllFiles(true) const sha = await createCommit(repo, 'commit everything', toCommit.files) - expect(sha).toEqual('(root-commit)') + assert.equal(sha, '(root-commit)') status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal(files.length, 0) const commit = await getCommit(repo, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.summary).toEqual('commit everything') + assert(commit !== null) + assert.equal(commit!.summary, 'commit everything') }) it('can commit when a delete is staged and the untracked file exists', async () => { @@ -789,23 +799,23 @@ describe('git/commit', () => { status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files.length).toEqual(1) - expect(files[0].path).toContain('first') - expect(files[0].status.kind).toEqual(AppFileStatusKind.Untracked) + assert.equal(files.length, 1) + assert(files[0].path.includes('first')) + assert.equal(files[0].status.kind, AppFileStatusKind.Untracked) const toCommit = status!.workingDirectory.withIncludeAllFiles(true) const sha = await createCommit(repo, 'commit again!', toCommit.files) - expect(sha).toHaveLength(7) + assert.equal(sha.length, 7) status = await getStatusOrThrow(repo) files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal(files.length, 0) const commit = await getCommit(repo, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.summary).toEqual('commit again!') - expect(commit!.shortSha).toEqual(sha) + assert(commit !== null) + assert.equal(commit!.summary, 'commit again!') + assert.equal(commit!.shortSha, sha) }) it('file is deleted in index', async () => { @@ -829,21 +839,25 @@ describe('git/commit', () => { // Make sure that file is marked as deleted const beforeCommit = await getStatusOrThrow(repo) const files = beforeCommit.workingDirectory.files - expect(files.length).toBe(2) - expect(files[1].status.kind).toBe(AppFileStatusKind.Deleted) + assert.equal(files.length, 2) + assert.equal(files[1].status.kind, AppFileStatusKind.Deleted) // Commit changes await createCommit(repo!, 'FAIL commit', files) const afterCommit = await getStatusOrThrow(repo) - expect(beforeCommit.currentTip).not.toBe(afterCommit.currentTip) + assert.notEqual(beforeCommit.currentTip, afterCommit.currentTip) // Verify the file was delete in repo const changesetData = await getChangedFiles(repo, afterCommit.currentTip!) - expect(changesetData.files.length).toBe(2) - expect(changesetData.files[0].status.kind).toBe( + assert.equal(changesetData.files.length, 2) + assert.equal( + changesetData.files[0].status.kind, AppFileStatusKind.Modified ) - expect(changesetData.files[1].status.kind).toBe(AppFileStatusKind.Deleted) + assert.equal( + changesetData.files[1].status.kind, + AppFileStatusKind.Deleted + ) }) }) }) diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index 1372f4bfdef..516663ae799 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { exec } from 'dugite' import * as Path from 'path' @@ -26,12 +28,12 @@ describe('git/config', () => { describe('config', () => { it('looks up config values', async () => { const bare = await getConfigValue(repository, 'core.bare') - expect(bare).toBe('false') + assert.equal(bare, 'false') }) it('returns null for undefined values', async () => { const value = await getConfigValue(repository, 'core.the-meaning-of-life') - expect(value).toBeNull() + assert(value === null) }) }) @@ -44,7 +46,7 @@ describe('git/config', () => { { successExitCodes: new Set([1]) } ).then(x => x.stdout) - expect(withoutEnvOutput).toBeEmpty() + assert.equal(withoutEnvOutput.length, 0, 'Expected withoutEnvOutput to be empty') const withEnvOutput = await git( ['config', 'desktop.test'], repository.path, @@ -52,7 +54,7 @@ describe('git/config', () => { { env: { GIT_CONFIG_PARAMETERS: "'desktop.test=1'" } } ).then(x => x.stdout) - expect(withEnvOutput).toEqual('1\n') + assert.equal(withEnvOutput, '1\n') }) it('takes precedence over GIT_CONFIG_*', async () => { @@ -65,7 +67,7 @@ describe('git/config', () => { }, }).then(x => x.stdout) - expect(output).toEqual('foobar\n') + assert.equal(output, 'foobar\n') }) }) @@ -85,7 +87,7 @@ describe('git/config', () => { it('gets the config path', async () => { const path = await getGlobalConfigPath(env) - expect(path).toBe(await realpath(expectedConfigPath)) + assert.equal(path, await realpath(expectedConfigPath)) }) }) @@ -100,7 +102,7 @@ describe('git/config', () => { it('will replace all entries for a global value', async () => { await setGlobalConfigValue(key, 'the correct value', env) const value = await getGlobalConfigValue(key, env) - expect(value).toBe('the correct value') + assert.equal(value, 'the correct value') }) }) @@ -110,49 +112,49 @@ describe('git/config', () => { it('treats "false" as false', async () => { await setGlobalConfigValue(key, 'false', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeFalse() + assert.equal(value, false) }) it('treats "off" as false', async () => { await setGlobalConfigValue(key, 'off', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeFalse() + assert.equal(value, false) }) it('treats "no" as false', async () => { await setGlobalConfigValue(key, 'no', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeFalse() + assert.equal(value, false) }) it('treats "0" as false', async () => { await setGlobalConfigValue(key, '0', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeFalse() + assert.equal(value, false) }) it('treats "true" as true', async () => { await setGlobalConfigValue(key, 'true', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeTrue() + assert.equal(value, true) }) it('treats "yes" as true', async () => { await setGlobalConfigValue(key, 'yes', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeTrue() + assert.equal(value, true) }) it('treats "on" as true', async () => { await setGlobalConfigValue(key, 'on', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeTrue() + assert.equal(value, true) }) it('treats "1" as true', async () => { await setGlobalConfigValue(key, '1', env) const value = await getGlobalBooleanConfigValue(key, env) - expect(value).toBeTrue() + assert.equal(value, true) }) }) }) diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts index 176a892515e..b181e60194a 100644 --- a/app/test/unit/git/core-test.ts +++ b/app/test/unit/git/core-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { GitError } from 'dugite' import { Repository } from '../../../src/models/repository' import { @@ -26,12 +28,12 @@ describe('git/core', () => { const result = await git(args, repository.path, 'test', { expectedErrors: new Set([GitError.BadRevision]), }) - expect(result.gitError).toBe(GitError.BadRevision) + assert.equal(result.gitError, GitError.BadRevision) } catch (e) { threw = true } - expect(threw).toBe(false) + assert.equal(threw, false) }) it('throws for errors that were not expected', async () => { @@ -46,7 +48,7 @@ describe('git/core', () => { threw = true } - expect(threw).toBe(true) + assert.equal(threw, true) }) }) @@ -59,12 +61,12 @@ describe('git/core', () => { const result = await git(args, repository.path, 'test', { successExitCodes: new Set([128]), }) - expect(result.exitCode).toBe(128) + assert.equal(result.exitCode, 128) } catch (e) { threw = true } - expect(threw).toBe(false) + assert.equal(threw, false) }) it('throws for exit codes that were not expected', async () => { @@ -79,7 +81,7 @@ describe('git/core', () => { threw = true } - expect(threw).toBe(true) + assert.equal(threw, true) }) }) @@ -95,12 +97,12 @@ describe('git/core', () => { expectedErrors: new Set([GitError.ConfigLockFileAlreadyExists]), }) - expect(result.exitCode).toBe(255) - expect(result.gitError).toBe(GitError.ConfigLockFileAlreadyExists) + assert.equal(result.exitCode, 255) + assert.equal(result.gitError, GitError.ConfigLockFileAlreadyExists) const parsedPath = parseConfigLockFilePathFromError(result) - expect(parsedPath).not.toBeNull() + assert(parsedPath !== null) const absolutePath = resolve(result.path, parsedPath!) - expect(absolutePath).toBe(configLockFilePath) + assert.equal(absolutePath, configLockFilePath) }) it('normalizes paths', () => { @@ -116,29 +118,29 @@ describe('git/core', () => { } if (__WIN32__) { - expect( + assert.equal( parseConfigLockFilePathFromError( createGitResult( 'error: could not lock config file C:/Users/markus/.gitconfig: File exists' ) ) - ).toBe('C:\\Users\\markus\\.gitconfig.lock') + , 'C:\\Users\\markus\\.gitconfig.lock') - expect( + assert.equal( parseConfigLockFilePathFromError( createGitResult( 'error: could not lock config file C:\\Users\\markus\\.gitconfig: File exists' ) ) - ).toBe('C:\\Users\\markus\\.gitconfig.lock') + , 'C:\\Users\\markus\\.gitconfig.lock') } else { - expect( + assert.equal( parseConfigLockFilePathFromError( createGitResult( 'error: could not lock config file /Users/markus/.gitconfig: File exists' ) ) - ).toBe('/Users/markus/.gitconfig.lock') + , '/Users/markus/.gitconfig.lock') } }) }) diff --git a/app/test/unit/git/create-tail-stream-test.ts b/app/test/unit/git/create-tail-stream-test.ts index b41dd6fb8e8..a0a1e8137a1 100644 --- a/app/test/unit/git/create-tail-stream-test.ts +++ b/app/test/unit/git/create-tail-stream-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Readable } from 'stream' import { createTailStream } from '../../../src/lib/git/create-tail-stream' @@ -8,17 +10,19 @@ describe('createTailStream', () => { .pipe(createTailStream(maxLength, { encoding: 'utf8' })) .toArray() - expect(await write(3, 'hello')).toEqual(['llo']) - expect(await write(5, 'hello')).toEqual(['hello']) - expect(await write(10, 'hello', 'world')).toEqual(['helloworld']) - expect(await write(8, 'hello', 'world')).toEqual(['lloworld']) - expect( - await write(10, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9') - ).toEqual(['0123456789']) - expect( - await write(8, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9') - ).toEqual(['23456789']) + assert.deepStrictEqual(await write(3, 'hello'), ['llo']) + assert.deepStrictEqual(await write(5, 'hello'), ['hello']) + assert.deepStrictEqual(await write(10, 'hello', 'world'), ['helloworld']) + assert.deepStrictEqual(await write(8, 'hello', 'world'), ['lloworld']) + assert.deepStrictEqual( + await write(10, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'), + ['0123456789'] + ) + assert.deepStrictEqual( + await write(8, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'), + ['23456789'] + ) - expect(await write(8, ...'helloworld')).toEqual(['lloworld']) + assert.deepStrictEqual(await write(8, ...'helloworld'), ['lloworld']) }) }) diff --git a/app/test/unit/git/create-terminal-stream-test.ts b/app/test/unit/git/create-terminal-stream-test.ts index c5ff6c95da5..2df1ca9f1a8 100644 --- a/app/test/unit/git/create-terminal-stream-test.ts +++ b/app/test/unit/git/create-terminal-stream-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { createReadStream } from 'fs' import { Readable } from 'stream' import { createTerminalStream } from '../../../src/lib/create-terminal-stream' @@ -20,7 +22,7 @@ describe('terminal-stream', () => { `Resolving deltas: 100% (8517403/8517403), done.\n` + `Updating files: 100% (86676/86676), done.\n` - expect(actual).toEqual(expected) + assert.equal(actual, expected) }) it('can handle all kinds of chunk sizes', async () => { @@ -48,7 +50,7 @@ describe('terminal-stream', () => { const actual = await outputPromise const expected = Buffer.concat(buffers).toString() - expect(actual).toEqual(expected) + assert.equal(actual, expected) }) it('can handle empty buffers', async () => { @@ -64,6 +66,6 @@ describe('terminal-stream', () => { const actual = await outputPromise const expected = '' - expect(actual).toEqual(expected) + assert.equal(actual, expected) }) }) diff --git a/app/test/unit/git/credential-test.ts b/app/test/unit/git/credential-test.ts index 5a3d99cbe18..aac1d9e011a 100644 --- a/app/test/unit/git/credential-test.ts +++ b/app/test/unit/git/credential-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatCredential, parseCredential, @@ -6,25 +8,27 @@ import { describe('git/credential', () => { describe('parseCredential', () => { it('expands arrays into numeric entries', async () => { - expect([ - ...parseCredential('wwwauth[]=foo\nwwwauth[]=bar').entries(), - ]).toEqual([ - ['wwwauth[0]', 'foo'], - ['wwwauth[1]', 'bar'], - ]) + assert.deepStrictEqual( + [...parseCredential('wwwauth[]=foo\nwwwauth[]=bar').entries()], + [ + ['wwwauth[0]', 'foo'], + ['wwwauth[1]', 'bar'], + ] + ) }) }) describe('formatCredential', () => { it('transforms numbered array entries into unnumbered', async () => { - expect( + assert.deepStrictEqual( formatCredential( new Map([ ['wwwauth[0]', 'foo'], ['wwwauth[1]', 'bar'], ]) - ) - ).toBe('wwwauth[]=foo\nwwwauth[]=bar\n') + ), + 'wwwauth[]=foo\nwwwauth[]=bar\n' + ) }) }) }) diff --git a/app/test/unit/git/description-test.ts b/app/test/unit/git/description-test.ts index 297fb7243cb..83567325185 100644 --- a/app/test/unit/git/description-test.ts +++ b/app/test/unit/git/description-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -9,7 +11,7 @@ describe('git/description', () => { it('returns empty for an initialized repository', async () => { const repo = await setupEmptyRepository() const actual = await getGitDescription(repo.path) - expect(actual).toBe('') + assert.equal(actual, '') }) it('returns empty when path is missing', async () => { @@ -18,7 +20,7 @@ describe('git/description', () => { await FSE.unlink(path) const actual = await getGitDescription(repo.path) - expect(actual).toBe('') + assert.equal(actual, '') }) it('reads the custom text', async () => { @@ -28,7 +30,7 @@ describe('git/description', () => { await FSE.writeFile(path, expected) const actual = await getGitDescription(repo.path) - expect(actual).toBe(expected) + assert.equal(actual, expected) }) }) }) diff --git a/app/test/unit/git/diff-check-test.ts b/app/test/unit/git/diff-check-test.ts index ba45db80476..84b7d0ed93f 100644 --- a/app/test/unit/git/diff-check-test.ts +++ b/app/test/unit/git/diff-check-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { setupConflictedRepo, @@ -16,7 +18,8 @@ describe('getFilesWithConflictMarkers', () => { }) it('finds one conflicted file', async () => { - expect(await getFilesWithConflictMarkers(repository.path)).toEqual( + assert.deepStrictEqual( + await getFilesWithConflictMarkers(repository.path), new Map([['foo', 3]]) ) }) @@ -27,7 +30,8 @@ describe('getFilesWithConflictMarkers', () => { repository = await setupConflictedRepoWithMultipleFiles() }) it('finds multiple conflicted files', async () => { - expect(await getFilesWithConflictMarkers(repository.path)).toEqual( + assert.deepStrictEqual( + await getFilesWithConflictMarkers(repository.path), new Map([ ['baz', 3], ['cat', 3], @@ -42,10 +46,8 @@ describe('getFilesWithConflictMarkers', () => { repository = await setupEmptyRepository() }) - it('finds one conflicted file', async () => { - expect(await getFilesWithConflictMarkers(repository.path)).toEqual( - new Map() - ) + it('finds no conflicted files', async () => { + assert((await getFilesWithConflictMarkers(repository.path)).size === 0) }) }) }) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 1eb8e6eec88..669bb391d2e 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -40,7 +42,7 @@ async function getTextDiff( file: WorkingDirectoryFileChange ): Promise { const diff = await getWorkingDirectoryDiff(repo, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) return diff as ITextDiff } @@ -64,8 +66,8 @@ describe('git/diff', () => { ) const current = await getWorkingDirectoryImage(repository, file) - expect(current.mediaType).toBe('image/png') - expect(current.contents).toMatch(/A2HkbLsBYSgAAAABJRU5ErkJggg==$/) + assert.equal(current.mediaType, 'image/png') + assert(/A2HkbLsBYSgAAAABJRU5ErkJggg==$/.test(current.contents)) }) it('retrieves valid images for modified file', async () => { @@ -78,8 +80,8 @@ describe('git/diff', () => { diffSelection ) const current = await getWorkingDirectoryImage(repository, file) - expect(current.mediaType).toBe('image/jpg') - expect(current.contents).toMatch(/gdTTb6MClWJ3BU8T8PTtXoB88kFL\/9k=$/) + assert.equal(current.mediaType, 'image/jpg') + assert(/gdTTb6MClWJ3BU8T8PTtXoB88kFL\/9k=$/.test(current.contents)) }) }) @@ -95,9 +97,11 @@ describe('git/diff', () => { ) const current = await getBlobImage(repository, file.path, 'HEAD') - expect(current.mediaType).toBe('image/jpg') - expect(current.contents).toMatch( - /zcabBFNf6G8U1y7QpBYtbOWQivIsDU8T4kYKKTQFg7v\/9k=/ + assert.equal(current.mediaType, 'image/jpg') + assert( + /zcabBFNf6G8U1y7QpBYtbOWQivIsDU8T4kYKKTQFg7v\/9k=/.test( + current.contents + ) ) }) @@ -112,9 +116,11 @@ describe('git/diff', () => { ) const previous = await getBlobImage(repository, file.path, 'HEAD') - expect(previous.mediaType).toBe('image/gif') - expect(previous.contents).toMatch( - /pSQ0J85QG55rqWbgLdEmOWQJ1MjFS3WWA2slfZxeEAtp3AykkAAA7$/ + assert.equal(previous.mediaType, 'image/gif') + assert( + /pSQ0J85QG55rqWbgLdEmOWQJ1MjFS3WWA2slfZxeEAtp3AykkAAA7$/.test( + previous.contents + ) ) }) }) @@ -131,11 +137,11 @@ describe('git/diff', () => { ) const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toEqual(DiffType.Image) + assert.equal(diff.kind, DiffType.Image) const imageDiff = diff as IImageDiff - expect(imageDiff.previous).not.toBeUndefined() - expect(imageDiff.current).not.toBeUndefined() + assert(imageDiff.previous !== undefined) + assert(imageDiff.current !== undefined) }) it('changes for text are not set', async () => { @@ -152,7 +158,7 @@ describe('git/diff', () => { ) const diff = await getTextDiff(repository, file) - expect(diff.hunks.length).toBeGreaterThan(0) + assert(diff.hunks.length > 0) }) }) @@ -175,15 +181,13 @@ describe('git/diff', () => { const hunk = diff.hunks[0] - expect(hunk.lines[0].text).toContain('@@ -0,0 +1,33 @@') + assert(hunk.lines[0].text.includes('@@ -0,0 +1,33 @@')) - expect(hunk.lines[1].text).toContain('+Lorem ipsum dolor sit amet,') - expect(hunk.lines[2].text).toContain( - '+ullamcorper sit amet tellus eget, ' - ) + assert(hunk.lines[1].text.includes('+Lorem ipsum dolor sit amet,')) + assert(hunk.lines[2].text.includes('+ullamcorper sit amet tellus eget, ')) - expect(hunk.lines[33].text).toContain( - '+ urna, ac porta justo leo sed magna.' + assert( + hunk.lines[33].text.includes('+ urna, ac porta justo leo sed magna.') ) }) @@ -199,20 +203,20 @@ describe('git/diff', () => { const diff = await getTextDiff(repository, file) const first = diff.hunks[0] - expect(first.lines[0].text).toContain('@@ -4,10 +4,6 @@') + assert(first.lines[0].text.includes('@@ -4,10 +4,6 @@')) - expect(first.lines[4].text).toContain('-Aliquam leo ipsum') - expect(first.lines[5].text).toContain('-nisl eget hendrerit') - expect(first.lines[6].text).toContain('-eleifend mi.') - expect(first.lines[7].text).toContain('-') + assert(first.lines[4].text.includes('-Aliquam leo ipsum')) + assert(first.lines[5].text.includes('-nisl eget hendrerit')) + assert(first.lines[6].text.includes('-eleifend mi.')) + assert(first.lines[7].text.includes('-')) const second = diff.hunks[1] - expect(second.lines[0].text).toContain('@@ -21,6 +17,10 @@') + assert(second.lines[0].text.includes('@@ -21,6 +17,10 @@')) - expect(second.lines[4].text).toContain('+Aliquam leo ipsum') - expect(second.lines[5].text).toContain('+nisl eget hendrerit') - expect(second.lines[6].text).toContain('+eleifend mi.') - expect(second.lines[7].text).toContain('+') + assert(second.lines[4].text.includes('+Aliquam leo ipsum')) + assert(second.lines[5].text.includes('+nisl eget hendrerit')) + assert(second.lines[6].text.includes('+eleifend mi.')) + assert(second.lines[7].text.includes('+')) }) it('counts lines for staged file', async () => { @@ -227,24 +231,28 @@ describe('git/diff', () => { const diff = await getTextDiff(repository, file) const first = diff.hunks[0] - expect(first.lines[0].text).toContain('@@ -2,7 +2,7 @@ ') + assert(first.lines[0].text.includes('@@ -2,7 +2,7 @@ ')) - expect(first.lines[4].text).toContain( - '-tortor placerat facilisis. Ut sed ex tortor. Duis consectetur at ex vel mattis.' + assert( + first.lines[4].text.includes( + '-tortor placerat facilisis. Ut sed ex tortor. Duis consectetur at ex vel mattis.' + ) ) - expect(first.lines[5].text).toContain('+tortor placerat facilisis.') + assert(first.lines[5].text.includes('+tortor placerat facilisis.')) const second = diff.hunks[1] - expect(second.lines[0].text).toContain('@@ -17,9 +17,7 @@ ') + assert(second.lines[0].text.includes('@@ -17,9 +17,7 @@ ')) - expect(second.lines[4].text).toContain('-vel sagittis nisl rutrum. ') - expect(second.lines[5].text).toContain( - '-tempor a ligula. Proin pretium ipsum ' + assert(second.lines[4].text.includes('-vel sagittis nisl rutrum. ')) + assert( + second.lines[5].text.includes('-tempor a ligula. Proin pretium ipsum ') ) - expect(second.lines[6].text).toContain( - '-elementum neque id tellus gravida rhoncus.' + assert( + second.lines[6].text.includes( + '-elementum neque id tellus gravida rhoncus.' + ) ) - expect(second.lines[7].text).toContain('+vel sagittis nisl rutrum.') + assert(second.lines[7].text.includes('+vel sagittis nisl rutrum.')) }) it('displays a binary diff for a docx file', async () => { @@ -254,11 +262,11 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getWorkingDirectoryDiff(repo, files[0]) - expect(diff.kind).toBe(DiffType.Binary) + assert.equal(diff.kind, DiffType.Binary) }) it('is empty for a renamed file', async () => { @@ -273,11 +281,11 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getTextDiff(repo, files[0]) - expect(diff.hunks).toHaveLength(0) + assert.equal(diff.hunks.length, 0) }) // A renamed file in the working directory is just two staged files @@ -298,16 +306,16 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getTextDiff(repo, files[0]) - expect(diff.hunks).toHaveLength(1) + assert.equal(diff.hunks.length, 1) const first = diff.hunks[0] - expect(first.lines).toHaveLength(3) - expect(first.lines[1].text).toBe('-foo') - expect(first.lines[2].text).toBe('+bar') + assert.equal(first.lines.length, 3) + assert.equal(first.lines[1].text, '-foo') + assert.equal(first.lines[2].text, '+bar') }) it('handles unborn repository with mixed state', async () => { @@ -325,15 +333,15 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getTextDiff(repo, files[0]) - expect(diff.hunks).toHaveLength(1) + assert.equal(diff.hunks.length, 1) const first = diff.hunks[0] - expect(first.lines).toHaveLength(2) - expect(first.lines[1].text).toBe('+WRITING OVER THE TOP') + assert.equal(first.lines.length, 2) + assert.equal(first.lines[1].text, '+WRITING OVER THE TOP') }) }) @@ -364,13 +372,13 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getTextDiff(repo, files[0]) - expect(diff.lineEndingsChange).not.toBeUndefined() - expect(diff.lineEndingsChange!.from).toBe('LF') - expect(diff.lineEndingsChange!.to).toBe('CRLF') + assert(diff.lineEndingsChange !== undefined) + assert.equal(diff.lineEndingsChange!.from, 'LF') + assert.equal(diff.lineEndingsChange!.to, 'CRLF') }) }) @@ -384,10 +392,10 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const diff = await getTextDiff(repo, files[0]) - expect(diff.text).toBe(`@@ -0,0 +1 @@\n+${testString}`) + assert.equal(diff.text, `@@ -0,0 +1 @@\n+${testString}`) }) }) @@ -398,7 +406,7 @@ describe('git/diff', () => { repo = await setupEmptyRepository() }) it('throws since HEAD doesnt exist', async () => { - await expect(getBinaryPaths(repo, 'HEAD', [])).rejects.toThrow() + await assert.rejects(getBinaryPaths(repo, 'HEAD', [])) }) }) @@ -424,7 +432,7 @@ describe('git/diff', () => { }) }) it('includes plain text files using binary driver', async () => { - expect( + assert.deepStrictEqual( await getBinaryPaths(repo, 'MERGE_HEAD', [ { kind: 'entry', @@ -432,8 +440,9 @@ describe('git/diff', () => { statusCode: 'UU', submoduleStatusCode: '????', }, - ]) - ).toEqual(['foo.bin']) + ]), + ['foo.bin'] + ) }) }) @@ -444,7 +453,7 @@ describe('git/diff', () => { repo = new Repository(testRepoPath, -1, null, false) }) it('returns an empty array', async () => { - expect(await getBinaryPaths(repo, 'HEAD', [])).toHaveLength(0) + assert.equal((await getBinaryPaths(repo, 'HEAD', [])).length, 0) }) }) describe('in repo with image changes', () => { @@ -456,7 +465,7 @@ describe('git/diff', () => { repo = new Repository(testRepoPath, -1, null, false) }) it('returns all changed image files', async () => { - expect(await getBinaryPaths(repo, 'HEAD', [])).toEqual([ + assert.deepStrictEqual(await getBinaryPaths(repo, 'HEAD', []), [ 'modified-image.jpg', 'new-animated-image.gif', 'new-image.png', @@ -474,7 +483,7 @@ describe('git/diff', () => { await exec(['merge', 'master'], repo.path) }) it('returns all conflicted image files', async () => { - expect(await getBinaryPaths(repo, 'MERGE_HEAD', [])).toEqual([ + assert.deepStrictEqual(await getBinaryPaths(repo, 'MERGE_HEAD', []), [ 'my-cool-image.png', ]) }) @@ -489,7 +498,7 @@ describe('git/diff', () => { const status = await getStatusOrThrow(repository) const file = status.workingDirectory.files[0] const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toBe(DiffType.Submodule) + assert.equal(diff.kind, DiffType.Submodule) return diff as ISubmoduleDiff } @@ -505,9 +514,9 @@ describe('git/diff', () => { await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') const diff = await getSubmoduleDiff() - expect(diff.fullPath).toBe(submodulePath) + assert.equal(diff.fullPath, submodulePath) // Even on Windows, the path separator is '/' for this specific attribute - expect(diff.path).toBe('foo/submodule') + assert.equal(diff.path, 'foo/submodule') }) it('can get the diff for a submodule with only modified changes', async () => { @@ -515,11 +524,11 @@ describe('git/diff', () => { await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') const diff = await getSubmoduleDiff() - expect(diff.oldSHA).toBeNull() - expect(diff.newSHA).toBeNull() - expect(diff.status.commitChanged).toBe(false) - expect(diff.status.modifiedChanges).toBe(true) - expect(diff.status.untrackedChanges).toBe(false) + assert(diff.oldSHA === null) + assert(diff.newSHA === null) + assert.equal(diff.status.commitChanged, false) + assert.equal(diff.status.modifiedChanges, true) + assert.equal(diff.status.untrackedChanges, false) }) it('can get the diff for a submodule with only untracked changes', async () => { @@ -527,11 +536,11 @@ describe('git/diff', () => { await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'hello\n') const diff = await getSubmoduleDiff() - expect(diff.oldSHA).toBeNull() - expect(diff.newSHA).toBeNull() - expect(diff.status.commitChanged).toBe(false) - expect(diff.status.modifiedChanges).toBe(false) - expect(diff.status.untrackedChanges).toBe(true) + assert(diff.oldSHA === null) + assert(diff.newSHA === null) + assert.equal(diff.status.commitChanged, false) + assert.equal(diff.status.modifiedChanges, false) + assert.equal(diff.status.untrackedChanges, true) }) it('can get the diff for a submodule a commit change', async () => { @@ -540,11 +549,11 @@ describe('git/diff', () => { await exec(['commit', '-a', '-m', 'test'], submodulePath) const diff = await getSubmoduleDiff() - expect(diff.oldSHA).not.toBeNull() - expect(diff.newSHA).not.toBeNull() - expect(diff.status.commitChanged).toBe(true) - expect(diff.status.modifiedChanges).toBe(false) - expect(diff.status.untrackedChanges).toBe(false) + assert(diff.oldSHA !== null) + assert(diff.newSHA !== null) + assert.equal(diff.status.commitChanged, true) + assert.equal(diff.status.modifiedChanges, false) + assert.equal(diff.status.untrackedChanges, false) }) it('can get the diff for a submodule a all kinds of changes', async () => { @@ -554,11 +563,11 @@ describe('git/diff', () => { await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'new!!\n') const diff = await getSubmoduleDiff() - expect(diff.oldSHA).not.toBeNull() - expect(diff.newSHA).not.toBeNull() - expect(diff.status.commitChanged).toBe(true) - expect(diff.status.modifiedChanges).toBe(true) - expect(diff.status.untrackedChanges).toBe(true) + assert(diff.oldSHA !== null) + assert(diff.newSHA !== null) + assert.equal(diff.status.commitChanged, true) + assert.equal(diff.status.modifiedChanges, true) + assert.equal(diff.status.untrackedChanges, true) }) }) @@ -603,13 +612,13 @@ describe('git/diff', () => { 'irrelevantToTest' ) - expect(changesetData).not.toBeNull() + assert(changesetData !== null) if (changesetData === null) { return } - expect(changesetData.files).toHaveLength(1) - expect(changesetData.files[0].path).toBe('feature.md') + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, 'feature.md') }) it('returns null for unrelated histories', async () => { @@ -629,7 +638,7 @@ describe('git/diff', () => { 'irrelevantToTest' ) - expect(changesetData).toBeNull() + assert(changesetData === null) }) }) @@ -683,14 +692,14 @@ describe('git/diff', () => { false, 'irrelevantToTest' ) - expect(diff.kind).toBe(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) if (diff.kind !== DiffType.Text) { return } - expect(diff.text).not.toContain('bar') - expect(diff.text).toContain('feature') + assert.equal(diff.text.includes('bar'), false) + assert(diff.text.includes('feature')) }) }) }) diff --git a/app/test/unit/git/environment-test.ts b/app/test/unit/git/environment-test.ts index f3f812ab1e2..73d675da8c6 100644 --- a/app/test/unit/git/environment-test.ts +++ b/app/test/unit/git/environment-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { envForProxy } from '../../../src/lib/git/environment' describe('git/environmnent', () => { @@ -18,91 +20,99 @@ describe('git/environmnent', () => { describe('envForProxy', () => { it('sets the correct environment variable based on protocol', async () => { - expect( - await envForProxy('https://github.com/', {}, defaultResolver) - ).toEqual({ - https_proxy: httpsProxyUrl, - }) + assert.deepStrictEqual( + await envForProxy('https://github.com/', {}, defaultResolver), + { https_proxy: httpsProxyUrl } + ) - expect( - await envForProxy('http://github.com/', {}, defaultResolver) - ).toEqual({ - http_proxy: httpProxyUrl, - }) + assert.deepStrictEqual( + await envForProxy('http://github.com/', {}, defaultResolver), + { http_proxy: httpProxyUrl } + ) }) it('fails gracefully if resolver throws', async () => { - expect( - await envForProxy('https://github.com/', {}, throwingResolver) - ).toEqual(undefined) + assert.equal( + await envForProxy('https://github.com/', {}, throwingResolver), + undefined + ) }) it("it doesn't set any variables if resolver returns undefined", async () => { - expect( - await envForProxy('https://github.com/', {}, nullResolver) - ).toEqual(undefined) + assert.equal( + await envForProxy('https://github.com/', {}, nullResolver), + undefined + ) }) it('sets the correct environment variable based on protocol', async () => { - expect( - await envForProxy('https://github.com/', {}, defaultResolver) - ).toEqual({ - https_proxy: httpsProxyUrl, - }) + assert.deepStrictEqual( + await envForProxy('https://github.com/', {}, defaultResolver), + { + https_proxy: httpsProxyUrl, + } + ) - expect( - await envForProxy('http://github.com/', {}, defaultResolver) - ).toEqual({ - http_proxy: httpProxyUrl, - }) + assert.deepStrictEqual( + await envForProxy('http://github.com/', {}, defaultResolver), + { + http_proxy: httpProxyUrl, + } + ) }) it('ignores unknown protocols', async () => { - expect( - await envForProxy('ftp://github.com/', {}, defaultResolver) - ).toEqual(undefined) + assert.equal( + await envForProxy('ftp://github.com/', {}, defaultResolver), + undefined + ) }) it('does not override existing environment variables', async () => { - expect( + assert.equal( await envForProxy( 'https://github.com/', { https_proxy: 'foo' }, defaultResolver - ) - ).toEqual(undefined) + ), + undefined + ) - expect( + assert.equal( await envForProxy( 'https://github.com/', { HTTPS_PROXY: 'foo' }, defaultResolver - ) - ).toEqual(undefined) + ), + undefined + ) - expect( + assert.equal( await envForProxy( 'http://github.com/', { http_proxy: 'foo' }, defaultResolver - ) - ).toEqual(undefined) + ), + undefined + ) - expect( + assert.equal( await envForProxy( 'https://github.com/', { ALL_PROXY: 'foo' }, defaultResolver - ) - ).toEqual(undefined) + ), + undefined + ) - expect( + assert.equal( await envForProxy( 'https://github.com/', { all_proxy: 'foo' }, defaultResolver - ) - ).toEqual(undefined) + ), + undefined + ) }) }) }) diff --git a/app/test/unit/git/fetch-test.ts b/app/test/unit/git/fetch-test.ts index fb0e01b2525..3bb0921b1d6 100644 --- a/app/test/unit/git/fetch-test.ts +++ b/app/test/unit/git/fetch-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { setupFixtureRepository } from '../../helpers/repositories' import { @@ -39,7 +41,7 @@ describe('git/fetch', () => { resultBranches, branchBehind.upstream! ) - expect(branchBehindUpstream.tip.sha).toBe(branchBehind.tip.sha) + assert.equal(branchBehindUpstream.tip.sha, branchBehind.tip.sha) // The branch ahead is still ahead const branchAhead = branchWithName(resultBranches, 'branch-ahead') @@ -47,7 +49,7 @@ describe('git/fetch', () => { resultBranches, branchAhead.upstream! ) - expect(branchAheadUpstream.tip.sha).not.toBe(branchAhead.tip.sha) + assert.notEqual(branchAheadUpstream.tip.sha, branchAhead.tip.sha) // The branch ahead and behind is still ahead and behind const branchAheadAndBehind = branchWithName( @@ -58,14 +60,14 @@ describe('git/fetch', () => { resultBranches, branchAheadAndBehind.upstream! ) - expect(branchAheadAndBehindUpstream.tip.sha).not.toBe( + assert.notEqual(branchAheadAndBehindUpstream.tip.sha, branchAheadAndBehind.tip.sha ) // The main branch hasn't been updated, since it's the current branch const mainBranch = branchWithName(resultBranches, 'main') const mainUpstream = branchWithName(resultBranches, mainBranch.upstream!) - expect(mainUpstream.tip.sha).not.toBe(mainBranch.tip.sha) + assert.notEqual(mainUpstream.tip.sha, mainBranch.tip.sha) // The up-to-date branch is still matching its upstream const upToDateBranch = branchWithName(resultBranches, 'branch-up-to-date') @@ -73,7 +75,7 @@ describe('git/fetch', () => { resultBranches, upToDateBranch.upstream! ) - expect(upToDateBranchUpstream.tip.sha).toBe(upToDateBranch.tip.sha) + assert.equal(upToDateBranchUpstream.tip.sha, upToDateBranch.tip.sha) }) // We want to avoid messing with the FETCH_HEAD file. Normally, it shouldn't @@ -91,7 +93,7 @@ describe('git/fetch', () => { const currentFetchHead = await FSE.readFile(fetchHeadPath, 'utf-8') - expect(currentFetchHead).toBe(previousFetchHead) + assert.equal(currentFetchHead, previousFetchHead) }) }) }) diff --git a/app/test/unit/git/for-each-ref-test.ts b/app/test/unit/git/for-each-ref-test.ts index 9ea92a780fe..d0f348e3fd0 100644 --- a/app/test/unit/git/for-each-ref-test.ts +++ b/app/test/unit/git/for-each-ref-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { setupFixtureRepository, @@ -24,38 +26,38 @@ describe('git/for-each-ref', () => { b => b.type === BranchType.Local ) - expect(branches).toHaveLength(3) + assert.equal((branches).length, 3) const commitWithBody = branches[0] - expect(commitWithBody.name).toBe('commit-with-long-description') - expect(commitWithBody.upstream).toBeNull() - expect(commitWithBody.tip.sha).toBe( + assert.equal(commitWithBody.name, 'commit-with-long-description') + assert(commitWithBody.upstream === null) + assert.equal(commitWithBody.tip.sha, 'dfa96676b65e1c0ed43ca25492252a5e384c8efd' ) const commitNoBody = branches[1] - expect(commitNoBody.name).toBe('commit-with-no-body') - expect(commitNoBody.upstream).toBeNull() - expect(commitNoBody.tip.sha).toBe( + assert.equal(commitNoBody.name, 'commit-with-no-body') + assert(commitNoBody.upstream === null) + assert.equal(commitNoBody.tip.sha, '49ec1e05f39eef8d1ab6200331a028fb3dd96828' ) const master = branches[2] - expect(master.name).toBe('master') - expect(master.upstream).toBeNull() - expect(master.tip.sha).toBe('b9ccfc3307240b86447bca2bd6c51a4bb4ade493') + assert.equal(master.name, 'master') + assert(master.upstream === null) + assert.equal(master.tip.sha, 'b9ccfc3307240b86447bca2bd6c51a4bb4ade493') }) it('should return empty list for empty repo', async () => { const repo = await setupEmptyRepository() const branches = await getBranches(repo) - expect(branches).toHaveLength(0) + assert.equal((branches).length, 0) }) it('should return empty list for directory without a .git directory', async () => { const repo = setupEmptyDirectory() const status = await getBranches(repo) - expect(status).toHaveLength(0) + assert.equal((status).length, 0) }) }) @@ -71,18 +73,18 @@ describe('git/for-each-ref', () => { const branches = await getBranchesDifferingFromUpstream(repository) const branchRefs = branches.map(branch => branch.ref) - expect(branchRefs).toHaveLength(3) + assert.equal((branchRefs).length, 3) // All branches that are behind and/or ahead must be included - expect(branchRefs).toContain('refs/heads/branch-behind') - expect(branchRefs).toContain('refs/heads/branch-ahead') - expect(branchRefs).toContain('refs/heads/branch-ahead-and-behind') + assert(branchRefs.includes('refs/heads/branch-behind')) + assert(branchRefs.includes('refs/heads/branch-ahead')) + assert(branchRefs.includes('refs/heads/branch-ahead-and-behind')) // `main` is the current branch, and shouldn't be included - expect(branchRefs).not.toContain('refs/heads/main') + assert.equal(branchRefs.includes('refs/heads/main'), false) // Branches that are up to date shouldn't be included - expect(branchRefs).not.toContain('refs/heads/branch-up-to-date') + assert.equal(branchRefs.includes('refs/heads/branch-up-to-date'), false) }) }) }) diff --git a/app/test/unit/git/format-patch-test.ts b/app/test/unit/git/format-patch-test.ts index 244a82fd04f..dbfd11eb460 100644 --- a/app/test/unit/git/format-patch-test.ts +++ b/app/test/unit/git/format-patch-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { setupTwoCommitRepo, setupFixtureRepository, @@ -21,18 +23,18 @@ describe('formatPatch', () => { }) it('returns a string for a single commit range', async () => { const patch = await formatPatch(repository, 'HEAD~', 'HEAD') - expect(patch).toBeString() - expect(patch).not.toBeEmpty() + assert.equal(typeof patch, 'string') + assert.notEqual(patch.length, 0, 'Expected patch to be empty') }) it('returns a string for a multi commit range', async () => { const patch = await formatPatch(repository, 'HEAD~2', 'HEAD') - expect(patch).toBeString() - expect(patch).not.toBeEmpty() + assert.equal(typeof patch, 'string') + assert.notEqual(patch.length, 0, 'Expected patch to be empty') }) it('returns empty string for no range', async () => { const patch = await formatPatch(repository, 'HEAD', 'HEAD') - expect(patch).toBeString() - expect(patch).toBeEmpty() + assert.equal(typeof patch, 'string') + assert.equal(patch.length, 0, 'Expected patch to be empty') }) describe('applied in a related repo', () => { let clonedRepository: Repository @@ -47,7 +49,7 @@ describe('formatPatch', () => { const result = await exec(['apply'], clonedRepository.path, { stdin: patch, }) - expect(result).toBeTruthy() + assert(result) }) }) }) @@ -64,7 +66,7 @@ describe('formatPatch', () => { firstCommit = stdout.trim() }) it('can create a series of commits from start to HEAD', async () => { - expect(await formatPatch(repository, firstCommit, 'HEAD')).toBeString() + assert.equal(typeof await formatPatch(repository, firstCommit, 'HEAD'), 'string') }) }) }) diff --git a/app/test/unit/git/git-attributes-test.ts b/app/test/unit/git/git-attributes-test.ts index efff8662bab..8286badd01f 100644 --- a/app/test/unit/git/git-attributes-test.ts +++ b/app/test/unit/git/git-attributes-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -11,7 +13,7 @@ describe('git/git-attributes', () => { await writeGitAttributes(repo.path) const expectedPath = Path.join(repo.path, '.gitattributes') const contents = await FSE.readFile(expectedPath, 'utf8') - expect(contents).toContain('* text=auto') + assert(contents.includes('* text=auto')) }) }) }) diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts index 0c8ed1966d4..7988513a5fd 100644 --- a/app/test/unit/git/gitignore-test.ts +++ b/app/test/unit/git/gitignore-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' import { exec } from 'dugite' @@ -20,7 +22,7 @@ describe('gitignore', () => { const gitignore = await readGitIgnoreAtRoot(repo) - expect(gitignore).toBeNull() + assert(gitignore === null) }) it('reads contents from disk', async () => { @@ -34,10 +36,10 @@ describe('gitignore', () => { const gitignore = await readGitIgnoreAtRoot(repo) - expect(gitignore).toBe(expected) + assert.equal(gitignore, expected) }) - it.only('when autocrlf=true and safecrlf=true, appends CRLF to file', async () => { + it('when autocrlf=true and safecrlf=true, appends CRLF to file', async () => { const repo = await setupEmptyRepository() await setupLocalConfig(repo, [ @@ -54,10 +56,10 @@ describe('gitignore', () => { ['commit', '-m', 'create the ignore file'], path ) - expect(commit.exitCode).toBe(0) + assert.equal(commit.exitCode, 0) const contents = await readGitIgnoreAtRoot(repo) - expect(contents!.endsWith('\r\n')).toBeTrue() + assert.equal(contents!.endsWith('\r\n'), true) }) it('when autocrlf=input, appends LF to file', async () => { @@ -79,10 +81,10 @@ describe('gitignore', () => { ['commit', '-m', 'create the ignore file'], path ) - expect(commit.exitCode).toBe(0) + assert.equal(commit.exitCode, 0) const contents = await readGitIgnoreAtRoot(repo) - expect(contents!.endsWith('\n')).toBeTrue() + assert.equal(contents!.endsWith('\n'), true) }) }) @@ -94,7 +96,7 @@ describe('gitignore', () => { const exists = await FSE.pathExists(`${repo.path}/.gitignore`) - expect(exists).toBe(true) + assert.equal(exists, true) }) it('deletes gitignore file when no entries provided', async () => { @@ -108,7 +110,7 @@ describe('gitignore', () => { await saveGitIgnore(repo, '') const exists = await FSE.pathExists(ignoreFile) - expect(exists).toBe(false) + assert.equal(exists, false) }) it('applies rule correctly to repository', async () => { @@ -129,7 +131,7 @@ describe('gitignore', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal(files.length, 0) }) it('escapes string with special git characters', async () => { @@ -137,7 +139,7 @@ describe('gitignore', () => { const escapedFilePath = '\\[never\\]\\\\!gonna\\*give\\#you\\?_.up' const result = escapeGitSpecialCharacters(unescapedFilePath) - expect(result).toBe(escapedFilePath) + assert.equal(result, escapedFilePath) }) }) @@ -157,7 +159,7 @@ describe('gitignore', () => { const gitignore = await FSE.readFile(ignoreFile) const expected = 'node_modules\nyarn-error.log\n' - expect(gitignore.toString('utf8')).toBe(expected) + assert.equal(gitignore.toString('utf8'), expected) }) it('appends multiple rules', async () => { @@ -175,7 +177,7 @@ describe('gitignore', () => { const gitignore = await FSE.readFile(ignoreFile) const expected = 'node_modules\nyarn-error.log\n.eslintcache\ndist/\n' - expect(gitignore.toString('utf8')).toBe(expected) + assert.equal(gitignore.toString('utf8'), expected) }) it('appends one file containing special characters', async () => { @@ -195,7 +197,7 @@ describe('gitignore', () => { const expected = 'node_modules\n' + '\\[never\\]\\!gonna\\*give\\#you\\?_.up\n' - expect(gitignore.toString('utf8')).toBe(expected) + assert.equal(gitignore.toString('utf8'), expected) }) }) }) diff --git a/app/test/unit/git/lfs-test.ts b/app/test/unit/git/lfs-test.ts index 535c25ba166..0911769afff 100644 --- a/app/test/unit/git/lfs-test.ts +++ b/app/test/unit/git/lfs-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as Path from 'path' import { writeFile } from 'fs-extra' @@ -20,7 +22,7 @@ describe('git-lfs', () => { const repository = new Repository(path, -1, null, false) const usingLFS = await isUsingLFS(repository) - expect(usingLFS).toBe(false) + assert.equal(usingLFS, false) }) it('returns true if LFS is tracking a path', async () => { @@ -30,7 +32,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.psd'], repository.path) const usingLFS = await isUsingLFS(repository) - expect(usingLFS).toBe(true) + assert.equal(usingLFS, true) }) }) @@ -43,7 +45,7 @@ describe('git-lfs', () => { await writeFile(readme, 'Hello world!') const found = await isTrackedByLFS(repository, file) - expect(found).toBe(false) + assert.equal(found, false) }) it('returns true after tracking file in Git LFS', async () => { @@ -56,7 +58,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.md'], repository.path) const found = await isTrackedByLFS(repository, file) - expect(found).toBe(true) + assert.equal(found, true) }) it('returns true after tracking file with character issues in Git LFS', async () => { @@ -70,7 +72,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.md'], repository.path) const found = await isTrackedByLFS(repository, file) - expect(found).toBe(true) + assert.equal(found, true) }) }) @@ -83,8 +85,8 @@ describe('git-lfs', () => { const notFound = await filesNotTrackedByLFS(repository, [videoFile]) - expect(notFound).toHaveLength(1) - expect(notFound).toContain(videoFile) + assert.equal((notFound).length, 1) + assert(notFound.includes(videoFile)) }) it('skips files that are tracked by Git LFS', async () => { @@ -95,7 +97,7 @@ describe('git-lfs', () => { const notFound = await filesNotTrackedByLFS(repository, [photoFile]) - expect(notFound).toHaveLength(0) + assert.equal((notFound).length, 0) }) it('skips files in a subfolder that are tracked', async () => { @@ -107,7 +109,7 @@ describe('git-lfs', () => { photoFileInDirectory, ]) - expect(notFound).toHaveLength(0) + assert.equal((notFound).length, 0) }) it('skips files in a subfolder where the rule only covers the subdirectory', async () => { @@ -119,7 +121,7 @@ describe('git-lfs', () => { photoFileInDirectory, ]) - expect(notFound).toHaveLength(0) + assert.equal((notFound).length, 0) }) }) }) diff --git a/app/test/unit/git/log-test.ts b/app/test/unit/git/log-test.ts index 36582195e00..19e966ac2aa 100644 --- a/app/test/unit/git/log-test.ts +++ b/app/test/unit/git/log-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { getChangedFiles, getCommits } from '../../../src/lib/git' import { setupFixtureRepository } from '../../helpers/repositories' @@ -15,19 +17,19 @@ describe('git/log', () => { describe('getCommits', () => { it('loads history', async () => { const commits = await getCommits(repository, 'HEAD', 100) - expect(commits).toHaveLength(5) + assert.equal(commits.length, 5) const firstCommit = commits[commits.length - 1] - expect(firstCommit.summary).toBe('first') - expect(firstCommit.sha).toBe('7cd6640e5b6ca8dbfd0b33d0281ebe702127079c') - expect(firstCommit.shortSha).toBe('7cd6640') + assert.equal(firstCommit.summary, 'first') + assert.equal(firstCommit.sha, '7cd6640e5b6ca8dbfd0b33d0281ebe702127079c') + assert.equal(firstCommit.shortSha, '7cd6640') }) it('handles repository with HEAD file on disk', async () => { const path = await setupFixtureRepository('repository-with-HEAD-file') const repo = new Repository(path, 1, null, false) const commits = await getCommits(repo, 'HEAD', 100) - expect(commits).toHaveLength(2) + assert.equal(commits.length, 2) }) it('handles repository with signed commit and log.showSignature set', async () => { @@ -41,18 +43,18 @@ describe('git/log', () => { const commits = await getCommits(repository, 'HEAD', 100) - expect(commits).toHaveLength(1) - expect(commits[0].sha).toBe('415e4987158c49c383ce7114e0ef00ebf4b070c1') - expect(commits[0].shortSha).toBe('415e498') + assert.equal(commits.length, 1) + assert.equal(commits[0].sha, '415e4987158c49c383ce7114e0ef00ebf4b070c1') + assert.equal(commits[0].shortSha, '415e498') }) it('parses tags', async () => { const commits = await getCommits(repository, 'HEAD', 100) - expect(commits).toBeArrayOfSize(5) + assert.equal(commits.length, 5) - expect(commits[0].tags).toEqual(['important']) - expect(commits[1].tags).toEqual(['tentative', 'less-important']) - expect(commits[2].tags).toBeArrayOfSize(0) + assert.deepStrictEqual(commits[0].tags, ['important']) + assert.deepStrictEqual(commits[1].tags, ['tentative', 'less-important']) + assert.equal(commits[2].tags.length, 0) }) }) @@ -62,9 +64,9 @@ describe('git/log', () => { repository, '7cd6640e5b6ca8dbfd0b33d0281ebe702127079c' ) - expect(changesetData.files).toHaveLength(1) - expect(changesetData.files[0].path).toBe('README.md') - expect(changesetData.files[0].status.kind).toBe(AppFileStatusKind.New) + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, 'README.md') + assert.equal(changesetData.files[0].status.kind, AppFileStatusKind.New) }) it('detects renames', async () => { @@ -74,25 +76,25 @@ describe('git/log', () => { repository = new Repository(testRepoPath, -1, null, false) const first = await getChangedFiles(repository, '55bdecb') - expect(first.files).toHaveLength(1) + assert.equal(first.files.length, 1) - expect(first.files[0].path).toBe('NEWER.md') - expect(first.files[0].status).toEqual({ + assert.equal(first.files[0].path, 'NEWER.md') + assert.deepStrictEqual(first.files[0].status, { kind: AppFileStatusKind.Renamed, oldPath: 'NEW.md', - renameIncludesModifications: true, submoduleStatus: undefined, + renameIncludesModifications: true, }) const second = await getChangedFiles(repository, 'c898ca8') - expect(second.files).toHaveLength(1) + assert.equal(second.files.length, 1) - expect(second.files[0].path).toBe('NEW.md') - expect(second.files[0].status).toEqual({ + assert.equal(second.files[0].path, 'NEW.md') + assert.deepStrictEqual(second.files[0].status, { kind: AppFileStatusKind.Renamed, oldPath: 'OLD.md', - renameIncludesModifications: false, submoduleStatus: undefined, + renameIncludesModifications: false, }) }) @@ -106,18 +108,18 @@ describe('git/log', () => { await setupLocalConfig(repository, [['diff.renames', 'copies']]) const changesetData = await getChangedFiles(repository, 'a500bf415') - expect(changesetData.files).toHaveLength(2) + assert.equal(changesetData.files.length, 2) - expect(changesetData.files[0].path).toBe('duplicate-with-edits.md') - expect(changesetData.files[0].status).toEqual({ + assert.equal(changesetData.files[0].path, 'duplicate-with-edits.md') + assert.deepStrictEqual(changesetData.files[0].status, { kind: AppFileStatusKind.Copied, oldPath: 'initial.md', renameIncludesModifications: false, submoduleStatus: undefined, }) - expect(changesetData.files[1].path).toBe('duplicate.md') - expect(changesetData.files[1].status).toEqual({ + assert.equal(changesetData.files[1].path, 'duplicate.md') + assert.deepStrictEqual(changesetData.files[1].status, { kind: AppFileStatusKind.Copied, oldPath: 'initial.md', renameIncludesModifications: false, @@ -127,9 +129,10 @@ describe('git/log', () => { it('handles commit when HEAD exists on disk', async () => { const changesetData = await getChangedFiles(repository, 'HEAD') - expect(changesetData.files).toHaveLength(1) - expect(changesetData.files[0].path).toBe('README.md') - expect(changesetData.files[0].status.kind).toBe( + assert.equal(changesetData.files.length, 1) + assert.equal(changesetData.files[0].path, 'README.md') + assert.equal( + changesetData.files[0].status.kind, AppFileStatusKind.Modified ) }) @@ -140,8 +143,8 @@ describe('git/log', () => { repository = new Repository(repoPath, -1, null, false) const changesetData = await getChangedFiles(repository, 'HEAD') - expect(changesetData.files).toHaveLength(2) - expect(changesetData.files[1].path).toBe('foo/submodule') - expect(changesetData.files[1].status.submoduleStatus).not.toBeUndefined() + assert.equal(changesetData.files.length, 2) + assert.equal(changesetData.files[1].path, 'foo/submodule') + assert(changesetData.files[1].status.submoduleStatus !== undefined) }) }) diff --git a/app/test/unit/git/merge-test.ts b/app/test/unit/git/merge-test.ts index e5d5615a431..ec9d34547f7 100644 --- a/app/test/unit/git/merge-test.ts +++ b/app/test/unit/git/merge-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { abortMerge, getMergeBase, @@ -22,7 +24,7 @@ describe('git/merge', () => { repository = new Repository(path, -1, null, false) }) it('returns MergeResult.Success', async () => { - expect(await merge(repository, 'dev')).toBe(MergeResult.Success) + assert.equal(await merge(repository, 'dev'), MergeResult.Success) }) }) describe('and is a noop', () => { @@ -33,7 +35,7 @@ describe('git/merge', () => { await merge(repository, 'dev') }) it('returns MergeResult.AlreadyUpToDate', async () => { - expect(await merge(repository, 'dev')).toBe(MergeResult.AlreadyUpToDate) + assert.equal(await merge(repository, 'dev'), MergeResult.AlreadyUpToDate) }) }) }) @@ -55,7 +57,7 @@ describe('git/merge', () => { } const ref = await getMergeBase(repository, first.tip.sha, second.tip.sha) - expect(ref).toEqual('df0d73dc92ff496c6a61f10843d527b7461703f4') + assert.equal(ref, 'df0d73dc92ff496c6a61f10843d527b7461703f4') }) it('returns null when the branches do not have a common ancestor', async () => { @@ -91,7 +93,7 @@ describe('git/merge', () => { } const ref = await getMergeBase(repository, first.tip.sha, second.tip.sha) - expect(ref).toBeNull() + assert(ref === null) }) it('returns null when a ref cannot be found', async () => { @@ -108,7 +110,7 @@ describe('git/merge', () => { 'master', 'origin/some-unknown-branch' ) - expect(ref).toBeNull() + assert(ref === null) }) }) describe('abortMerge', () => { @@ -119,7 +121,7 @@ describe('git/merge', () => { repository = await setupEmptyRepository() }) it('throws an error', async () => { - await expect(subject()).rejects.toThrow( + await assert.rejects(subject(), /There is no merge in progress, so there is nothing to abort/ ) }) @@ -129,7 +131,7 @@ describe('git/merge', () => { repository = await setupConflictedRepo() }) it('aborts the merge', async () => { - await expect(subject()).resolves.not.toThrow() + await assert.doesNotReject(subject()) }) }) }) diff --git a/app/test/unit/git/pull/ahead-and-behind-test.ts b/app/test/unit/git/pull/ahead-and-behind-test.ts index 79389fbadc1..30b9d2d622c 100644 --- a/app/test/unit/git/pull/ahead-and-behind-test.ts +++ b/app/test/unit/git/pull/ahead-and-behind-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { fetch, pull, @@ -73,23 +75,20 @@ describe('git/pull', () => { }) it('creates a merge commit', async () => { - expect(newTip.sha).not.toBe(previousTip.sha) - expect(newTip.parentSHAs).toHaveLength(2) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.parentSHAs.length, 2) }) it('is different from remote branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).not.toBe(newTip.sha) + assert.notEqual(remoteCommit.sha, newTip.sha) }) it('is ahead of tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 2, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 2, behind: 0 }) }) }) @@ -108,18 +107,15 @@ describe('git/pull', () => { }) it('creates a merge commit', async () => { - expect(newTip.sha).not.toBe(previousTip.sha) - expect(newTip.parentSHAs).toHaveLength(2) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.parentSHAs.length, 2) }) it('is ahead of tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 2, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 2, behind: 0 }) }) }) @@ -138,18 +134,15 @@ describe('git/pull', () => { }) it('does not create a merge commit', async () => { - expect(newTip.sha).not.toBe(previousTip.sha) - expect(newTip.parentSHAs).toHaveLength(1) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.parentSHAs.length, 1) }) it('is ahead of tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 1, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 1, behind: 0 }) }) }) @@ -162,7 +155,7 @@ describe('git/pull', () => { }) it(`throws an error as the user blocks merge commits on pull`, async () => { - await expect(pull(repository, remote)).rejects.toThrow() + await assert.rejects(pull(repository, remote)) }) }) }) diff --git a/app/test/unit/git/pull/only-ahead-test.ts b/app/test/unit/git/pull/only-ahead-test.ts index 363d4e0c0cd..d21f9b8718f 100644 --- a/app/test/unit/git/pull/only-ahead-test.ts +++ b/app/test/unit/git/pull/only-ahead-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { fetch, pull, @@ -56,12 +58,12 @@ describe('git/pull', () => { }) it('does not create new commit', async () => { - expect(newTip.sha).toBe(previousTip.sha) + assert.equal(newTip.sha, previousTip.sha) }) it('is different from tracking branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).not.toBe(newTip.sha) + assert.notEqual(remoteCommit.sha, newTip.sha) }) it('remains ahead of tracking branch', async () => { @@ -69,10 +71,7 @@ describe('git/pull', () => { const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 1, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 1, behind: 0 }) }) }) @@ -91,22 +90,19 @@ describe('git/pull', () => { }) it('does not create new commit', async () => { - expect(newTip.sha).toBe(previousTip.sha) + assert.equal(newTip.sha, previousTip.sha) }) it('is different to tracking branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).not.toBe(newTip.sha) + assert.notEqual(remoteCommit.sha, newTip.sha) }) it('is ahead of tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 1, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 1, behind: 0 }) }) }) @@ -125,12 +121,12 @@ describe('git/pull', () => { }) it('does not create new commit', async () => { - expect(newTip.sha).toBe(previousTip.sha) + assert.equal(newTip.sha, previousTip.sha) }) it('is different from tracking branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).not.toBe(newTip.sha) + assert.notEqual(remoteCommit.sha, newTip.sha) }) it('is ahead of tracking branch', async () => { @@ -138,10 +134,7 @@ describe('git/pull', () => { const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 1, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 1, behind: 0 }) }) }) }) diff --git a/app/test/unit/git/pull/only-behind-test.ts b/app/test/unit/git/pull/only-behind-test.ts index cf9b66a48cd..57291daad3b 100644 --- a/app/test/unit/git/pull/only-behind-test.ts +++ b/app/test/unit/git/pull/only-behind-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { fetch, pull, @@ -73,23 +75,20 @@ describe('git/pull', () => { }) it('creates a merge commit', async () => { - expect(newTip.sha).not.toBe(previousTip.sha) - expect(newTip.parentSHAs).toHaveLength(2) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.parentSHAs.length, 2) }) it('is different from remote branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).not.toBe(newTip.sha) + assert.notEqual(remoteCommit.sha, newTip.sha) }) it('is now ahead of tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 1, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 1, behind: 0 }) }) }) @@ -110,23 +109,20 @@ describe('git/pull', () => { it('does not create a merge commit', async () => { const newTip = await getTipOrError(repository) - expect(newTip.sha).not.toBe(previousTip.sha) - expect(newTip.parentSHAs).toHaveLength(1) + assert.notEqual(newTip.sha, previousTip.sha) + assert.equal(newTip.parentSHAs.length, 1) }) it('is same as remote branch', async () => { const remoteCommit = await getRefOrError(repository, remoteBranch) - expect(remoteCommit.sha).toBe(newTip.sha) + assert.equal(remoteCommit.sha, newTip.sha) }) it('is not behind tracking branch', async () => { const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) - expect(aheadBehind).toEqual({ - ahead: 0, - behind: 0, - }) + assert.deepStrictEqual(aheadBehind, { ahead: 0, behind: 0 }) }) }) }) diff --git a/app/test/unit/git/rebase/detect-conflict-test.ts b/app/test/unit/git/rebase/detect-conflict-test.ts index daa1204b55a..98ba0bafcec 100644 --- a/app/test/unit/git/rebase/detect-conflict-test.ts +++ b/app/test/unit/git/rebase/detect-conflict-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { exec } from 'dugite' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -49,11 +51,11 @@ describe('git/rebase', () => { }) it('returns a value indicating conflicts were encountered', async () => { - expect(result).toBe(RebaseResult.ConflictsEncountered) + assert.equal(result, RebaseResult.ConflictsEncountered) }) it('status detects REBASE_HEAD', async () => { - expect(status.rebaseInternalState).toEqual({ + assert.deepStrictEqual(status.rebaseInternalState, { originalBranchTip, baseBranchTip, targetBranch: 'this-is-a-feature', @@ -61,15 +63,16 @@ describe('git/rebase', () => { }) it('has conflicted files in working directory', async () => { - expect( + assert.equal( status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted - ) - ).toHaveLength(2) + ).length, + 2 + ) }) it('is a detached HEAD state', async () => { - expect(status.currentBranch).toBeUndefined() + assert(status.currentBranch === undefined) }) }) @@ -97,15 +100,15 @@ describe('git/rebase', () => { }) it('REBASE_HEAD is no longer found', async () => { - expect(status.rebaseInternalState).toBeNull() + assert(status.rebaseInternalState === null) }) it('no longer has working directory changes', async () => { - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal(status.workingDirectory.files.length, 0) }) it('returns to the feature branch', async () => { - expect(status.currentBranch).toBe(featureBranchName) + assert.equal(status.currentBranch, featureBranchName) }) }) @@ -141,11 +144,11 @@ describe('git/rebase', () => { }) it('indicates that the rebase was not complete', async () => { - expect(result).toBe(RebaseResult.OutstandingFilesNotStaged) + assert.equal(result, RebaseResult.OutstandingFilesNotStaged) }) it('REBASE_HEAD is still found', async () => { - expect(status.rebaseInternalState).toEqual({ + assert.deepStrictEqual(status.rebaseInternalState, { originalBranchTip, baseBranchTip, targetBranch: 'this-is-a-feature', @@ -153,11 +156,12 @@ describe('git/rebase', () => { }) it('still has conflicted files in working directory', async () => { - expect( + assert.equal( status!.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted - ) - ).toHaveLength(2) + ).length, + 2 + ) }) }) @@ -188,7 +192,7 @@ describe('git/rebase', () => { const diffCheckBefore = await exec(['diff', '--check'], repository.path) - expect(diffCheckBefore.exitCode).toBeGreaterThan(0) + assert(diffCheckBefore.exitCode > 0) // resolve conflicts by writing files to disk await FSE.writeFile( @@ -203,7 +207,7 @@ describe('git/rebase', () => { const diffCheckAfter = await exec(['diff', '--check'], repository.path) - expect(diffCheckAfter.exitCode).toEqual(0) + assert.equal(diffCheckAfter.exitCode, 0) result = await continueRebase(repository, files) @@ -211,23 +215,23 @@ describe('git/rebase', () => { }) it('returns success', () => { - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) }) it('REBASE_HEAD is no longer found', () => { - expect(status.rebaseInternalState).toBeNull() + assert(status.rebaseInternalState === null) }) it('no longer has working directory changes', () => { - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal(status.workingDirectory.files.length, 0) }) it('returns to the feature branch', () => { - expect(status.currentBranch).toBe(featureBranchName) + assert.equal(status.currentBranch, featureBranchName) }) it('branch is now a different ref', () => { - expect(status.currentTip).not.toBe(beforeRebaseTip.sha) + assert.notEqual(status.currentTip, beforeRebaseTip.sha) }) }) @@ -293,25 +297,25 @@ describe('git/rebase', () => { }) it('returns success', () => { - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) }) it('keeps untracked working directory file out of rebase', () => { - expect(status.workingDirectory.files).toHaveLength(1) + assert.equal(status.workingDirectory.files.length, 1) }) it('has modified but unconflicted file in commit contents', () => { - expect( - filesInRebasedCommit.find(f => f.path === 'THIRD.md') - ).not.toBeUndefined() + assert( + filesInRebasedCommit.find(f => f.path === 'THIRD.md') !== undefined + ) }) it('returns to the feature branch', () => { - expect(status.currentBranch).toBe(featureBranchName) + assert.equal(status.currentBranch, featureBranchName) }) it('branch is now a different ref', () => { - expect(status.currentTip).not.toBe(beforeRebaseTip.sha) + assert.notEqual(status.currentTip, beforeRebaseTip.sha) }) }) @@ -362,7 +366,7 @@ describe('git/rebase', () => { }) it('returns error code indicating that required files were missing', () => { - expect(result).toBe(RebaseResult.OutstandingFilesNotStaged) + assert.equal(result, RebaseResult.OutstandingFilesNotStaged) }) }) }) diff --git a/app/test/unit/git/rebase/progress-test.ts b/app/test/unit/git/rebase/progress-test.ts index 76133bc1be1..4190a0d92f3 100644 --- a/app/test/unit/git/rebase/progress-test.ts +++ b/app/test/unit/git/rebase/progress-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { IStatusResult, continueRebase, @@ -28,7 +30,7 @@ describe('git/rebase', () => { const repository = setupEmptyDirectory() const progress = await getRebaseSnapshot(repository) - expect(progress).toEqual(null) + assert.equal(progress, null) }) }) @@ -63,11 +65,11 @@ describe('git/rebase', () => { }) it('returns a value indicating conflicts were encountered', () => { - expect(result).toBe(RebaseResult.ConflictsEncountered) + assert.equal(result, RebaseResult.ConflictsEncountered) }) it('reported step-by-step progress before encountering conflicts', () => { - expect(progress).toEqual([ + assert.deepStrictEqual(progress, [ { currentCommitSummary: 'Feature Branch!', kind: 'multiCommitOperation', @@ -79,19 +81,19 @@ describe('git/rebase', () => { }) it('status detects REBASE_HEAD', () => { - expect(snapshot).not.toEqual(null) + assert.notEqual(snapshot, null) const s = snapshot! - expect(s.commits.length).toEqual(1) - expect(s.commits[0].summary).toEqual('Feature Branch!') + assert.equal(s.commits.length, 1) + assert.equal(s.commits[0].summary, 'Feature Branch!') - expect(s.progress.position).toEqual(1) - expect(s.progress.totalCommitCount).toEqual(1) - expect(s.progress.currentCommitSummary).toEqual('Feature Branch!') - expect(s.progress.value).toEqual(1) + assert.equal(s.progress.position, 1) + assert.equal(s.progress.totalCommitCount, 1) + assert.equal(s.progress.currentCommitSummary, 'Feature Branch!') + assert.equal(s.progress.value, 1) }) it('is a detached HEAD state', () => { - expect(status.currentBranch).toBeUndefined() + assert(status.currentBranch === undefined) }) }) @@ -123,11 +125,11 @@ describe('git/rebase', () => { }) it('returns a value indicating conflicts were encountered', () => { - expect(result).toBe(RebaseResult.ConflictsEncountered) + assert.equal(result, RebaseResult.ConflictsEncountered) }) it('reported step-by-step progress before encountering conflicts', () => { - expect(progress).toEqual([ + assert.deepStrictEqual(progress, [ { currentCommitSummary: 'Feature Branch First Commit!', kind: 'multiCommitOperation', @@ -146,8 +148,8 @@ describe('git/rebase', () => { result = await resolveAndContinue(repository!, strategy, progressCb) } - expect(progress.length).toEqual(10) - expect(progress[9]).toEqual({ + assert.equal(progress.length, 10) + assert.deepStrictEqual(progress[9], { currentCommitSummary: 'Feature Branch Tenth Commit!', kind: 'multiCommitOperation', position: 10, @@ -157,21 +159,22 @@ describe('git/rebase', () => { }) it('status detects REBASE_HEAD', () => { - expect(snapshot).not.toEqual(null) + assert.notEqual(snapshot, null) const s = snapshot! - expect(s.commits.length).toEqual(10) - expect(s.commits[0].summary).toEqual('Feature Branch First Commit!') + assert.equal(s.commits.length, 10) + assert.equal(s.commits[0].summary, 'Feature Branch First Commit!') - expect(s.progress.position).toEqual(1) - expect(s.progress.totalCommitCount).toEqual(10) - expect(s.progress.currentCommitSummary).toEqual( + assert.equal(s.progress.position, 1) + assert.equal(s.progress.totalCommitCount, 10) + assert.equal( + s.progress.currentCommitSummary, 'Feature Branch First Commit!' ) - expect(s.progress.value).toEqual(0.1) + assert.equal(s.progress.value, 0.1) }) it('is a detached HEAD state', () => { - expect(status.currentBranch).toBeUndefined() + assert(status.currentBranch === undefined) }) }) }) diff --git a/app/test/unit/git/ref-test.ts b/app/test/unit/git/ref-test.ts index 711679cf212..439c4fe2b44 100644 --- a/app/test/unit/git/ref-test.ts +++ b/app/test/unit/git/ref-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { formatAsLocalRef, getSymbolicRef } from '../../../src/lib/git/refs' import { setupEmptyRepository } from '../../helpers/repositories' @@ -5,17 +7,17 @@ describe('git/refs', () => { describe('formatAsLocalRef', () => { it('formats the common branch syntax', () => { const result = formatAsLocalRef('master') - expect(result).toBe('refs/heads/master') + assert.equal(result, 'refs/heads/master') }) it('formats an explicit heads/ prefix', () => { const result = formatAsLocalRef('heads/something-important') - expect(result).toBe('refs/heads/something-important') + assert.equal(result, 'refs/heads/something-important') }) it('formats when a remote name is included', () => { const result = formatAsLocalRef('heads/Microsoft/master') - expect(result).toBe('refs/heads/Microsoft/master') + assert.equal(result, 'refs/heads/Microsoft/master') }) }) @@ -23,13 +25,13 @@ describe('git/refs', () => { it('resolves a valid symbolic ref', async () => { const repo = await setupEmptyRepository() const ref = await getSymbolicRef(repo, 'HEAD') - expect(ref).toBe('refs/heads/master') + assert.equal(ref, 'refs/heads/master') }) it('does not resolve a missing ref', async () => { const repo = await setupEmptyRepository() const ref = await getSymbolicRef(repo, 'FOO') - expect(ref).toBeNull() + assert(ref === null) }) }) }) diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts index 121dedeabdb..e9dd216e4fc 100644 --- a/app/test/unit/git/reflog-test.ts +++ b/app/test/unit/git/reflog-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { getBranches, @@ -37,8 +39,8 @@ describe('git/reflog', () => { await createAndCheckout(repository, 'branch-2') const branches = await getRecentBranches(repository, 10) - expect(branches).toContain('branch-1') - expect(branches).toContain('branch-2') + assert(branches.includes('branch-1')) + assert(branches.includes('branch-2')) }) it('works after renaming a branch', async () => { @@ -53,9 +55,9 @@ describe('git/reflog', () => { await renameBranch(repository, currentBranch!, 'branch-2-test') const branches = await getRecentBranches(repository, 10) - expect(branches).not.toContain('branch-2') - expect(branches).toContain('branch-1') - expect(branches).toContain('branch-2-test') + assert.equal(branches.includes('branch-2'), false) + assert(branches.includes('branch-1')) + assert(branches.includes('branch-2-test')) }) it('returns a limited number of branches', async () => { @@ -65,9 +67,9 @@ describe('git/reflog', () => { await createAndCheckout(repository, 'branch-4') const branches = await getRecentBranches(repository, 2) - expect(branches).toHaveLength(2) - expect(branches).toContain('branch-4') - expect(branches).toContain('branch-3') + assert.equal((branches).length, 2) + assert(branches.includes('branch-4')) + assert(branches.includes('branch-3')) }) }) @@ -80,7 +82,7 @@ describe('git/reflog', () => { repository, new Date(offsetFromNow(1, 'day')) ) - expect(branches.size).toBe(0) + assert.equal(branches.size, 0) }) it('returns all branches checked out after a specific date', async () => { @@ -92,7 +94,7 @@ describe('git/reflog', () => { repository, new Date(offsetFromNow(-1, 'hour')) ) - expect(branches.size).toBe(2) + assert.equal(branches.size, 2) }) it('returns empty when current branch is orphaned', async () => { @@ -100,13 +102,13 @@ describe('git/reflog', () => { ['checkout', '--orphan', 'orphan-branch'], repository.path ) - expect(result.exitCode).toBe(0) + assert.equal(result.exitCode, 0) const branches = await getBranchCheckouts( repository, new Date(offsetFromNow(-1, 'hour')) ) - expect(branches.size).toBe(0) + assert.equal(branches.size, 0) }) }) }) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 694b112dcb1..3dd89cfc0c9 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { getRemotes, @@ -33,14 +35,14 @@ describe('git/remote', () => { // https://github.com/git/git/blob/9005149a4a77e2d3409c6127bf4fd1a0893c3495/builtin/remote.c#L1223-L1226 setConfigValue(repository, 'remote.bassoon.partialclonefilter', 'foo') - expect(result[0].name).toEqual('bassoon') - expect(result[0].url.endsWith(nwo)).toEqual(true) + assert.equal(result[0].name, 'bassoon') + assert.equal(result[0].url.endsWith(nwo), true) - expect(result[1].name).toEqual('origin') - expect(result[1].url.endsWith(nwo)).toEqual(true) + assert.equal(result[1].name, 'origin') + assert.equal(result[1].url.endsWith(nwo), true) - expect(result[2].name).toEqual('spaces-in-path') - expect(result[2].url).toEqual('/path/with spaces/foo') + assert.equal(result[2].name, 'spaces-in-path') + assert.equal(result[2].url, '/path/with spaces/foo') }) it('returns remotes sorted alphabetically', async () => { @@ -56,19 +58,19 @@ describe('git/remote', () => { await exec(['remote', 'add', 'D', url], repository.path) const result = await getRemotes(repository) - expect(result).toHaveLength(5) + assert.equal((result).length, 5) - expect(result[0].name).toEqual('A') - expect(result[1].name).toEqual('D') - expect(result[2].name).toEqual('L') - expect(result[3].name).toEqual('T') - expect(result[4].name).toEqual('X') + assert.equal(result[0].name, 'A') + assert.equal(result[1].name, 'D') + assert.equal(result[2].name, 'L') + assert.equal(result[3].name, 'T') + assert.equal(result[4].name, 'X') }) it('returns empty array for directory without a .git directory', async () => { const repository = setupEmptyDirectory() const remotes = await getRemotes(repository) - expect(remotes).toHaveLength(0) + assert.equal((remotes).length, 0) }) it('returns promisor remote', async () => { @@ -84,19 +86,19 @@ describe('git/remote', () => { // Shows that the new remote does have a filter const rawGetRemote = await exec(['remote', '-v'], repository.path) const needle = url + ' (fetch) [blob:none]' - expect(rawGetRemote.stdout).toContain(needle) + assert(rawGetRemote.stdout.includes(needle)) // Shows that the `getRemote` returns that remote const result = await getRemotes(repository) - expect(result).toHaveLength(1) - expect(result[0].name).toEqual('hasBlobFilter') + assert.equal((result).length, 1) + assert.equal(result[0].name, 'hasBlobFilter') }) }) describe('findDefaultRemote', () => { it('returns null for empty array', async () => { const result = await findDefaultRemote([]) - expect(result).toBeNull() + assert(result === null) }) it('returns origin when multiple remotes found', async () => { @@ -108,7 +110,7 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - expect(result!.name).toEqual('origin') + assert.equal(result!.name, 'origin') }) it('returns something when origin removed', async () => { @@ -121,7 +123,7 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - expect(result!.name).toEqual('bassoon') + assert.equal(result!.name, 'bassoon') }) it('returns null for new repository', async () => { @@ -130,7 +132,7 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - expect(result).toBeNull() + assert(result === null) }) }) @@ -146,14 +148,14 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - expect(result!.name).toEqual('origin') + assert.equal(result!.name, 'origin') }) }) describe('removeRemote', () => { it('silently fails when remote not defined', async () => { const repository = await setupEmptyRepository() - await expect(removeRemote(repository, 'origin')).resolves.not.toThrow() + await assert.doesNotReject(removeRemote(repository, 'origin')) }) }) @@ -168,18 +170,18 @@ describe('git/remote', () => { await addRemote(repository, remoteName, remoteUrl) }) it('can set the url for an existing remote', async () => { - expect(await setRemoteURL(repository, remoteName, newUrl)).toBeTrue() + assert.equal(await setRemoteURL(repository, remoteName, newUrl), true) const remotes = await getRemotes(repository) - expect(remotes).toHaveLength(1) - expect(remotes[0].url).toEqual(newUrl) + assert.equal((remotes).length, 1) + assert.equal(remotes[0].url, newUrl) }) it('returns false for unknown remote name', async () => { - await expect(setRemoteURL(repository, 'none', newUrl)).rejects.toThrow() + await assert.rejects(setRemoteURL(repository, 'none', newUrl)) const remotes = await getRemotes(repository) - expect(remotes).toHaveLength(1) - expect(remotes[0].url).toEqual(remoteUrl) + assert.equal((remotes).length, 1) + assert.equal(remotes[0].url, remoteUrl) }) }) }) diff --git a/app/test/unit/git/reorder-test.ts b/app/test/unit/git/reorder-test.ts index 3b752ec6604..a78032312c1 100644 --- a/app/test/unit/git/reorder-test.ts +++ b/app/test/unit/git/reorder-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' import { @@ -36,13 +38,13 @@ describe('git/reorder', () => { initialCommit.sha ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) - expect(log.length).toBe(3) - expect(log[2].summary).toBe('initialize') - expect(log[1].summary).toBe('second') - expect(log[0].summary).toBe('first') + assert.equal(log.length, 3) + assert.equal(log[2].summary, 'initialize') + assert.equal(log[1].summary, 'second') + assert.equal(log[0].summary, 'first') }) it('moves first and fourth commits after the second one respecting their order in the log', async () => { @@ -58,13 +60,13 @@ describe('git/reorder', () => { initialCommit.sha ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) - expect(log.length).toBe(5) + assert.equal(log.length, 5) const summaries = log.map(c => c.summary) - expect(summaries).toEqual([ + assert.deepStrictEqual(summaries, [ 'third', 'fourth', 'first', @@ -86,11 +88,11 @@ describe('git/reorder', () => { initialCommit.sha ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) const summaries = log.map(c => c.summary) - expect(summaries).toEqual([ + assert.deepStrictEqual(summaries, [ 'first', 'last', 'third', @@ -105,13 +107,13 @@ describe('git/reorder', () => { const result = await reorder(repository, [firstCommit], initialCommit, null) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) - expect(log.length).toBe(3) + assert.equal(log.length, 3) const summaries = log.map(c => c.summary) - expect(summaries).toEqual(['second', 'initialize', 'first']) + assert.deepStrictEqual(summaries, ['second', 'initialize', 'first']) }) it('handles reordering a conflicting commit', async () => { @@ -133,7 +135,7 @@ describe('git/reorder', () => { initialCommit.sha ) - expect(result).toBe(RebaseResult.ConflictsEncountered) + assert.equal(result, RebaseResult.ConflictsEncountered) let status = await getStatusOrThrow(repository) let { files } = status.workingDirectory @@ -161,7 +163,7 @@ describe('git/reorder', () => { // This will now conflict with the 'third' commit since it is going to now // apply the 'second' commit which now modifies the same lines in the // 'second.md' that the previous commit does. - expect(continueResult).toBe(RebaseResult.ConflictsEncountered) + assert.equal(continueResult, RebaseResult.ConflictsEncountered) status = await getStatusOrThrow(repository) files = status.workingDirectory.files @@ -183,11 +185,11 @@ describe('git/reorder', () => { undefined, `cat "${secondMessagePath}" >` ) - expect(continueResult).toBe(RebaseResult.CompletedWithoutError) + assert.equal(continueResult, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) const summaries = log.map(c => c.summary) - expect(summaries).toEqual([ + assert.deepStrictEqual(summaries, [ 'second - fixed', 'third - fixed', 'first', @@ -206,13 +208,13 @@ describe('git/reorder', () => { 'INVALID INVALID' ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase will not start - As it won't be able retrieve a commits to build a // todo and then interactive rebase would fail for bad revision. Added logic // to short circuit to prevent unnecessary attempt at an interactive rebase. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing).toBeNull() + assert(isRebaseStillOngoing === null) }) it('returns error on invalid base commit', async () => { @@ -227,12 +229,12 @@ describe('git/reorder', () => { initialCommit.sha ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase should not start - if we did attempt this, it could result in // dropping commits. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing).toBeNull() + assert(isRebaseStillOngoing === null) }) it('returns error when no commits are reordered', async () => { @@ -241,13 +243,13 @@ describe('git/reorder', () => { const result = await reorder(repository, [], first, initialCommit.sha) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase should not start - technically there would be no harm in this // rebase as it would just replay history, but we should not use reorder to // replay history. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing).toBeNull() + assert(isRebaseStillOngoing === null) }) }) diff --git a/app/test/unit/git/reset-test.ts b/app/test/unit/git/reset-test.ts index 22c7ca2c549..5cdb872eb4f 100644 --- a/app/test/unit/git/reset-test.ts +++ b/app/test/unit/git/reset-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import { Repository } from '../../../src/models/repository' @@ -27,7 +29,7 @@ describe('git/reset', () => { await reset(repository, GitResetMode.Hard, 'HEAD') const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal((status.workingDirectory.files).length, 0) }) }) @@ -50,7 +52,7 @@ describe('git/reset', () => { await exec(['checkout-index', '-f', '-u', '-q', '--', fileName], repoPath) const status = await getStatusOrThrow(repository) - expect(status.workingDirectory.files).toHaveLength(0) + assert.equal((status.workingDirectory.files).length, 0) }) }) }) diff --git a/app/test/unit/git/rev-parse-test.ts b/app/test/unit/git/rev-parse-test.ts index 85adb2dabac..91196d3ee82 100644 --- a/app/test/unit/git/rev-parse-test.ts +++ b/app/test/unit/git/rev-parse-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' import * as os from 'os' @@ -23,7 +25,7 @@ describe('git/rev-parse', () => { describe('getRepositoryType', () => { it('should return an absolute path when run inside a working directory', async () => { - expect(await getRepositoryType(repository.path)).toMatchObject({ + assert.deepEqual(await getRepositoryType(repository.path), { kind: 'regular', topLevelWorkingDirectory: repository.path, }) @@ -31,7 +33,7 @@ describe('git/rev-parse', () => { const subdirPath = path.join(repository.path, 'subdir') await FSE.mkdir(subdirPath) - expect(await getRepositoryType(subdirPath)).toMatchObject({ + assert.deepEqual(await getRepositoryType(subdirPath), { kind: 'regular', topLevelWorkingDirectory: repository.path, }) @@ -39,7 +41,7 @@ describe('git/rev-parse', () => { it('should return missing when not run inside a working directory', async () => { const result = await getRepositoryType(os.tmpdir()) - expect(result).toMatchObject({ kind: 'missing' }) + assert.deepEqual(result, { kind: 'missing' }) }) it('should return correct path for submodules', async () => { @@ -68,13 +70,13 @@ describe('git/rev-parse', () => { '' ) - expect(await getRepositoryType(firstRepoPath)).toMatchObject({ + assert.deepEqual(await getRepositoryType(firstRepoPath), { kind: 'regular', topLevelWorkingDirectory: firstRepoPath, }) const subModulePath = path.join(firstRepoPath, 'repo2') - expect(await getRepositoryType(subModulePath)).toMatchObject({ + assert.deepEqual(await getRepositoryType(subModulePath), { kind: 'regular', topLevelWorkingDirectory: subModulePath, }) @@ -82,7 +84,7 @@ describe('git/rev-parse', () => { it('returns regular for default initialized repository', async () => { const repository = await setupEmptyRepository() - expect(await getRepositoryType(repository.path)).toMatchObject({ + assert.deepEqual(await getRepositoryType(repository.path), { kind: 'regular', topLevelWorkingDirectory: repository.path, }) @@ -91,14 +93,14 @@ describe('git/rev-parse', () => { it('returns bare for initialized bare repository', async () => { const path = mkdirSync('no-repository-here') await exec(['init', '--bare'], path) - expect(await getRepositoryType(path)).toMatchObject({ + assert.deepEqual(await getRepositoryType(path), { kind: 'bare', }) }) it('returns missing for empty directory', async () => { const p = mkdirSync('no-actual-repository-here') - expect(await getRepositoryType(p)).toMatchObject({ + assert.deepEqual(await getRepositoryType(p), { kind: 'missing', }) }) @@ -107,7 +109,7 @@ describe('git/rev-parse', () => { const rootPath = mkdirSync('no-actual-repository-here') const missingPath = path.join(rootPath, 'missing-folder') - expect(await getRepositoryType(missingPath)).toMatchObject({ + assert.deepEqual(await getRepositoryType(missingPath), { kind: 'missing', }) }) @@ -132,9 +134,7 @@ directory=` process.env['HOME'] = testHomeDirectory process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = '1' - expect(await getRepositoryType(repository.path)).toMatchObject({ - kind: 'unsafe', - }) + assert((await getRepositoryType(repository.path)).kind === 'unsafe') process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = undefined process.env['HOME'] = previousHomeValue diff --git a/app/test/unit/git/squash-test.ts b/app/test/unit/git/squash-test.ts index abf902a44f1..c745a2ba452 100644 --- a/app/test/unit/git/squash-test.ts +++ b/app/test/unit/git/squash-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' import { @@ -38,13 +40,13 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) const squashed = log[0] - expect(squashed.summary).toBe('Test Summary') - expect(squashed.body).toBe('Test Body\n') - expect(log.length).toBe(2) + assert.equal(squashed.summary, 'Test Summary') + assert.equal(squashed.body, 'Test Body\n') + assert.equal(log.length, 2) // verify squashed commit contains changes from squashed commits const squashedChangesetData = await getChangedFiles( @@ -54,8 +56,8 @@ describe('git/cherry-pick', () => { const squashedFilePaths = squashedChangesetData.files .map(f => f.path) .join(' ') - expect(squashedFilePaths).toContain('first.md') - expect(squashedFilePaths).toContain('second.md') + assert(squashedFilePaths.includes('first.md')) + assert(squashedFilePaths.includes('second.md')) }) it('returns error when squashOnto is in the toSquash array', async () => { @@ -70,7 +72,7 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) }) it('squashes multiple commit onto one (non-conflicting)', async () => { @@ -87,13 +89,13 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) const squashed = log[0] - expect(squashed.summary).toBe('Test Summary') - expect(squashed.body).toBe('Test Body\n') - expect(log.length).toBe(2) + assert.equal(squashed.summary, 'Test Summary') + assert.equal(squashed.body, 'Test Body\n') + assert.equal(log.length, 2) // verify squashed commit contains changes from squashed commits const squashedChangesetData = await getChangedFiles( @@ -103,10 +105,10 @@ describe('git/cherry-pick', () => { const squashedFilePaths = squashedChangesetData.files .map(f => f.path) .join(' ') - expect(squashedFilePaths).toContain('first.md') - expect(squashedFilePaths).toContain('second.md') - expect(squashedFilePaths).toContain('third.md') - expect(squashedFilePaths).toContain('fourth.md') + assert(squashedFilePaths.includes('first.md')) + assert(squashedFilePaths.includes('second.md')) + assert(squashedFilePaths.includes('third.md')) + assert(squashedFilePaths.includes('fourth.md')) }) it('squashes using the root of the branch if last retained commit is null', async () => { @@ -114,7 +116,7 @@ describe('git/cherry-pick', () => { const secondCommit = await makeSquashCommit(repository, 'second') let log = await getCommits(repository, 'HEAD', 5) - expect(log.length).toBe(3) + assert.equal(log.length, 3) const result = await squash( repository, @@ -124,13 +126,13 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) log = await getCommits(repository, 'HEAD', 5) const squashed = log[0] - expect(squashed.summary).toBe('Test Summary') - expect(squashed.body).toBe('Test Body\n') - expect(log.length).toBe(1) + assert.equal(squashed.summary, 'Test Summary') + assert.equal(squashed.body, 'Test Body\n') + assert.equal(log.length, 1) // verify squashed commit contains changes from squashed commits const squashedChangesetData = await getChangedFiles( @@ -140,9 +142,9 @@ describe('git/cherry-pick', () => { const squashedFilePaths = squashedChangesetData.files .map(f => f.path) .join(' ') - expect(squashedFilePaths).toContain('initialize') - expect(squashedFilePaths).toContain('first.md') - expect(squashedFilePaths).toContain('second.md') + assert(squashedFilePaths.includes('initialize')) + assert(squashedFilePaths.includes('first.md')) + assert(squashedFilePaths.includes('second.md')) }) it('squashes multiple commit non-sequential commits (reorders, non-conflicting)', async () => { @@ -170,7 +172,7 @@ describe('git/cherry-pick', () => { '' ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) // From oldest to newest, log should look like: // - initial commit - log[2] @@ -178,10 +180,10 @@ describe('git/cherry-pick', () => { // - 'fourth' commit - log[0] const log = await getCommits(repository, 'HEAD', 5) const squashed = log[1] - expect(squashed.summary).toBe('first') - expect(squashed.body).toBe('third\n\nfifth\n') - expect(log[0].summary).toBe('fourth') - expect(log.length).toBe(4) + assert.equal(squashed.summary, 'first') + assert.equal(squashed.body, 'third\n\nfifth\n') + assert.equal(log[0].summary, 'fourth') + assert.equal(log.length, 4) // verify squashed commit contains changes from squashed commits const squashedChangesetData = await getChangedFiles( @@ -191,11 +193,11 @@ describe('git/cherry-pick', () => { const squashedFilePaths = squashedChangesetData.files .map(f => f.path) .join(' ') - expect(squashedFilePaths).toContain('first.md') - expect(squashedFilePaths).toContain('third.md') - expect(squashedFilePaths).toContain('fifth.md') - expect(squashedFilePaths).not.toContain('second.md') - expect(squashedFilePaths).not.toContain('fourth.md') + assert(squashedFilePaths.includes('first.md')) + assert(squashedFilePaths.includes('third.md')) + assert(squashedFilePaths.includes('fifth.md')) + assert.equal(squashedFilePaths.includes('second.md'), false) + assert.equal(squashedFilePaths.includes('fourth.md'), false) }) it('handles squashing a conflicting commit', async () => { @@ -218,7 +220,7 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.ConflictsEncountered) + assert.equal(result, RebaseResult.ConflictsEncountered) let status = await getStatusOrThrow(repository) let { files } = status.workingDirectory @@ -246,7 +248,7 @@ describe('git/cherry-pick', () => { // This will now conflict with the 'second' commit since it is going to now // apply the second commit which now modifies the same lines in the // 'second.md' that the squashed first commit does. - expect(continueResult).toBe(RebaseResult.ConflictsEncountered) + assert.equal(continueResult, RebaseResult.ConflictsEncountered) status = await getStatusOrThrow(repository) files = status.workingDirectory.files @@ -268,13 +270,13 @@ describe('git/cherry-pick', () => { // continues. `cat "${messagePath}" >` ) - expect(continueResult).toBe(RebaseResult.CompletedWithoutError) + assert.equal(continueResult, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) - expect(log.length).toBe(3) + assert.equal(log.length, 3) const squashed = log[1] - expect(squashed.summary).toBe('Test Summary') - expect(squashed.body).toBe('Test Body\n') + assert.equal(squashed.summary, 'Test Summary') + assert.equal(squashed.body, 'Test Body\n') // verify squashed commit contains changes from squashed commits const squashedChangesetData = await getChangedFiles( @@ -284,8 +286,8 @@ describe('git/cherry-pick', () => { const squashedFilePaths = squashedChangesetData.files .map(f => f.path) .join(' ') - expect(squashedFilePaths).toContain('first.md') - expect(squashedFilePaths).toContain('second.md') + assert(squashedFilePaths.includes('first.md')) + assert(squashedFilePaths.includes('second.md')) }) it('squashes with default merged commit message/description if commit message not provided', async () => { @@ -299,13 +301,13 @@ describe('git/cherry-pick', () => { initialCommit.sha, '' ) - expect(result).toBe(RebaseResult.CompletedWithoutError) + assert.equal(result, RebaseResult.CompletedWithoutError) const log = await getCommits(repository, 'HEAD', 5) const squashed = log[0] - expect(squashed.summary).toBe('first') - expect(squashed.body).toBe('second\n') - expect(log.length).toBe(2) + assert.equal(squashed.summary, 'first') + assert.equal(squashed.body, 'second\n') + assert.equal(log.length, 2) }) it('returns error on invalid lastRetainedCommitRef', async () => { @@ -320,13 +322,13 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase will not start - As it won't be able retrieve a commits to build a // todo and then interactive rebase would fail for bad revision. Added logic // to short circuit to prevent unnecessary attempt at an interactive rebase. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing !== null).toBeFalse() + assert.equal(isRebaseStillOngoing !== null, false) }) it('returns error on invalid commit to squashOnto', async () => { @@ -342,12 +344,12 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase should not start - if we did attempt this, it could result in // dropping commits. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing !== null).toBeFalse() + assert.equal(isRebaseStillOngoing !== null, false) }) it('returns error on empty toSquash', async () => { @@ -362,13 +364,13 @@ describe('git/cherry-pick', () => { 'Test Summary\n\nTest Body' ) - expect(result).toBe(RebaseResult.Error) + assert.equal(result, RebaseResult.Error) // Rebase should not start - technically there would be no harm in this // rebase as it would just replay history, but we should not use squash to // replay history. const isRebaseStillOngoing = await getRebaseInternalState(repository) - expect(isRebaseStillOngoing !== null).toBeFalse() + assert.equal(isRebaseStillOngoing !== null, false) }) }) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index 6f6fab3bf3b..f9ad08531da 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as path from 'path' import { Repository } from '../../../src/models/repository' @@ -37,13 +39,13 @@ describe('git/stash', () => { const stash = await getStashes(repo) - expect(stash.desktopEntries).toHaveLength(0) + assert.equal((stash.desktopEntries).length, 0) }) it('returns an empty list when no stash entries have been created', async () => { const stash = await getStashes(repository) - expect(stash.desktopEntries).toHaveLength(0) + assert.equal((stash.desktopEntries).length, 0) }) it('returns all stash entries created by Desktop', async () => { @@ -53,9 +55,9 @@ describe('git/stash', () => { const stash = await getStashes(repository) const entries = stash.desktopEntries - expect(entries).toHaveLength(1) - expect(entries[0].branchName).toBe('master') - expect(entries[0].name).toBe('refs/stash@{0}') + assert.equal((entries).length, 1) + assert.equal(entries[0].branchName, 'master') + assert.equal(entries[0].name, 'refs/stash@{0}') }) }) @@ -79,8 +81,8 @@ describe('git/stash', () => { const stash = await getStashes(repository) const entries = stash.desktopEntries - expect(entries).toHaveLength(1) - expect(entries[0].branchName).toBe('master') + assert.equal((entries).length, 1) + assert.equal(entries[0].branchName, 'master') }) it('stashes untracked files and removes them from the working directory', async () => { @@ -90,8 +92,8 @@ describe('git/stash', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - expect(files).toHaveLength(1) - expect(files[0].status.kind).toBe(AppFileStatusKind.Untracked) + assert.equal((files).length, 1) + assert.equal(files[0].status.kind, AppFileStatusKind.Untracked) const untrackedFiles = status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Untracked @@ -102,7 +104,7 @@ describe('git/stash', () => { status = await getStatusOrThrow(repository) files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal((files).length, 0) }) }) @@ -126,7 +128,7 @@ describe('git/stash', () => { 'master' ) - expect(entry).toBeNull() + assert(entry === null) }) it('returns last entry made for branch', async () => { @@ -143,8 +145,8 @@ describe('git/stash', () => { branchName ) - expect(actual).not.toBeNull() - expect(actual!.stashSha).toBe(lastEntry.stashSha) + assert(actual !== null) + assert.equal(actual!.stashSha, lastEntry.stashSha) }) }) @@ -154,7 +156,7 @@ describe('git/stash', () => { const message = createDesktopStashMessage(branchName) - expect(message).toBe('!!GitHub_Desktop') + assert.equal(message, '!!GitHub_Desktop') }) }) @@ -176,7 +178,7 @@ describe('git/stash', () => { let stash = await getStashes(repository) let entries = stash.desktopEntries - expect(entries.length).toBe(2) + assert.equal(entries.length, 2) const stashToDelete = entries[1] await dropDesktopStashEntry(repository, stashToDelete.stashSha) @@ -185,8 +187,8 @@ describe('git/stash', () => { // the output from git into easy to use objects stash = await getStashes(repository) entries = stash.desktopEntries - expect(entries.length).toBe(1) - expect(entries[0].stashSha).not.toEqual(stashToDelete) + assert.equal(entries.length, 1) + assert.notEqual(entries[0].stashSha, stashToDelete) }) it('does not fail when attempting to delete when stash is empty', async () => { @@ -206,7 +208,7 @@ describe('git/stash', () => { didFail = true } - expect(didFail).toBe(false) + assert.equal(didFail, false) }) it("does not fail when attempting to delete stash entry that doesn't exist", async () => { @@ -229,7 +231,7 @@ describe('git/stash', () => { didFail = true } - expect(didFail).toBe(false) + assert.equal(didFail, false) }) }) @@ -249,18 +251,18 @@ describe('git/stash', () => { await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash - expect(desktopEntries.length).toBe(1) + assert.equal(desktopEntries.length, 1) let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal((files).length, 0) const entryToApply = desktopEntries[0] await popStashEntry(repository, entryToApply.stashSha) status = await getStatusOrThrow(repository) files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal((files).length, 1) }) }) @@ -269,7 +271,7 @@ describe('git/stash', () => { await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash - expect(desktopEntries.length).toBe(1) + assert.equal(desktopEntries.length, 1) const readme = path.join(repository.path, 'README.md') await FSE.appendFile(readme, generateString()) @@ -277,17 +279,17 @@ describe('git/stash', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal((files).length, 0) const entryToApply = desktopEntries[0] await popStashEntry(repository, entryToApply.stashSha) status = await getStatusOrThrow(repository) files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal((files).length, 1) const stashAfter = await getStashes(repository) - expect(stashAfter.desktopEntries).not.toContain(entryToApply) + assert.equal(stashAfter.desktopEntries.includes(entryToApply), false) }) }) @@ -296,15 +298,15 @@ describe('git/stash', () => { await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash - expect(desktopEntries.length).toBe(1) + assert.equal(desktopEntries.length, 1) const readme = path.join(repository.path, 'README.md') await FSE.writeFile(readme, generateString()) const entryToApply = desktopEntries[0] - await expect( + await assert.rejects( popStashEntry(repository, entryToApply.stashSha) - ).rejects.toThrow() + ) }) }) }) diff --git a/app/test/unit/git/status-test.ts b/app/test/unit/git/status-test.ts index 119d8fa168b..62744ef9a2a 100644 --- a/app/test/unit/git/status-test.ts +++ b/app/test/unit/git/status-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' import { exec } from 'dugite' @@ -37,44 +39,48 @@ describe('git/status', () => { it('parses conflicted files with markers', async () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(5) + assert.equal(files.length, 5) const conflictedFiles = files.filter( f => f.status.kind === AppFileStatusKind.Conflicted ) - expect(conflictedFiles).toHaveLength(4) + assert.equal(conflictedFiles.length, 4) const fooFile = files.find(f => f.path === 'foo')! - expect(fooFile.status).toEqual({ + assert.deepStrictEqual(fooFile.status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.BothModified, them: GitStatusEntry.UpdatedButUnmerged, us: GitStatusEntry.UpdatedButUnmerged, + submoduleStatus: undefined, }, conflictMarkerCount: 3, }) - const bazFile = files.find(f => f.path === 'baz')! - expect(bazFile.status).toEqual({ + const bazFile = files.find(f => f.path === 'baz') + assert(bazFile) + assert.deepStrictEqual(bazFile.status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.BothAdded, them: GitStatusEntry.Added, us: GitStatusEntry.Added, + submoduleStatus: undefined, }, conflictMarkerCount: 3, }) const catFile = files.find(f => f.path === 'cat')! - expect(catFile.status).toEqual({ + assert.deepStrictEqual(catFile.status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.BothAdded, them: GitStatusEntry.Added, us: GitStatusEntry.Added, + submoduleStatus: undefined, }, conflictMarkerCount: 3, }) @@ -83,19 +89,23 @@ describe('git/status', () => { it('parses conflicted files without markers', async () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(5) - expect( + assert.equal(files.length, 5) + assert.equal( files.filter(f => f.status.kind === AppFileStatusKind.Conflicted) - ).toHaveLength(4) + .length, + 4 + ) - const barFile = files.find(f => f.path === 'bar')! - expect(barFile.status).toEqual({ + const barFile = files.find(f => f.path === 'bar') + assert(barFile) + assert.deepStrictEqual(barFile.status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.DeletedByThem, us: GitStatusEntry.UpdatedButUnmerged, them: GitStatusEntry.Deleted, + submoduleStatus: undefined, }, }) }) @@ -120,12 +130,12 @@ describe('git/status', () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const conflictedFiles = files.filter( f => f.status.kind === AppFileStatusKind.Conflicted ) - expect(conflictedFiles).toHaveLength(1) + assert.equal(conflictedFiles.length, 1) }) it('parses resolved files', async () => { @@ -133,21 +143,25 @@ describe('git/status', () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(5) + assert.equal(files.length, 5) // all files are now considered conflicted - expect( + assert.equal( files.filter(f => f.status.kind === AppFileStatusKind.Conflicted) - ).toHaveLength(4) + .length, + 4 + ) const file = files.find(f => f.path === 'foo') - expect(file!.status).toEqual({ + assert(file) + assert.deepStrictEqual(file.status, { kind: AppFileStatusKind.Conflicted, entry: { kind: 'conflicted', action: UnmergedEntrySummary.BothModified, them: GitStatusEntry.UpdatedButUnmerged, us: GitStatusEntry.UpdatedButUnmerged, + submoduleStatus: undefined, }, conflictMarkerCount: 0, }) @@ -170,13 +184,14 @@ describe('git/status', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.status.kind).toBe(AppFileStatusKind.Conflicted) - expect( - isConflictedFile(file.status) && isManualConflict(file.status) - ).toBe(true) + assert.equal(file.status.kind, AppFileStatusKind.Conflicted) + assert.equal( + isConflictedFile(file.status) && isManualConflict(file.status), + true + ) }) it('parses conflicted image file on merge after removing', async () => { @@ -189,13 +204,14 @@ describe('git/status', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.status.kind).toBe(AppFileStatusKind.Conflicted) - expect( - isConflictedFile(file.status) && isManualConflict(file.status) - ).toBe(true) + assert.equal(file.status.kind, AppFileStatusKind.Conflicted) + assert.equal( + isConflictedFile(file.status) && isManualConflict(file.status), + true + ) }) }) @@ -213,17 +229,17 @@ describe('git/status', () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.path).toBe('README.md') - expect(file.status.kind).toBe(AppFileStatusKind.Modified) + assert.equal(file.path, 'README.md') + assert.equal(file.status.kind, AppFileStatusKind.Modified) }) it('returns an empty array when there are no changes', async () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(0) + assert.equal(files.length, 0) }) it('reflects renames', async () => { @@ -238,9 +254,9 @@ describe('git/status', () => { const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files - expect(files).toHaveLength(1) - expect(files[0].path).toBe('bar') - expect(files[0].status).toEqual({ + assert.equal(files.length, 1) + assert.equal(files[0].path, 'bar') + assert.deepStrictEqual(files[0].status, { kind: AppFileStatusKind.Renamed, oldPath: 'foo', renameIncludesModifications: false, @@ -264,24 +280,24 @@ describe('git/status', () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(2) + assert.equal(files.length, 2) - expect(files[0].status.kind).toBe(AppFileStatusKind.Modified) - expect(files[0].path).toBe('CONTRIBUTING.md') + assert.equal(files[0].status.kind, AppFileStatusKind.Modified) + assert.equal(files[0].path, 'CONTRIBUTING.md') - expect(files[1].path).toBe('docs/OVERVIEW.md') - expect(files[1].status).toEqual({ + assert.equal(files[1].path, 'docs/OVERVIEW.md') + assert.deepStrictEqual(files[1].status, { kind: AppFileStatusKind.Copied, oldPath: 'CONTRIBUTING.md', - renameIncludesModifications: false, submoduleStatus: undefined, + renameIncludesModifications: false, }) }) it('returns null for directory without a .git directory', async () => { repository = setupEmptyDirectory() const status = await getStatus(repository) - expect(status).toBeNull() + assert(status === null) }) }) describe('with submodules', () => { @@ -297,18 +313,21 @@ describe('git/status', () => { }) => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - expect(files).toHaveLength(1) + assert.equal(files.length, 1) const file = files[0] - expect(file.path).toBe('foo/submodule') - expect(file.status.kind).toBe(AppFileStatusKind.Modified) - expect(file.status.submoduleStatus?.modifiedChanges).toBe( + assert.equal(file.path, 'foo/submodule') + assert.equal(file.status.kind, AppFileStatusKind.Modified) + assert.equal( + file.status.submoduleStatus?.modifiedChanges, changes.modifiedChanges ) - expect(file.status.submoduleStatus?.untrackedChanges).toBe( + assert.equal( + file.status.submoduleStatus?.untrackedChanges, changes.untrackedChanges ) - expect(file.status.submoduleStatus?.commitChanged).toBe( + assert.equal( + file.status.submoduleStatus?.commitChanged, changes.commitChanged ) } diff --git a/app/test/unit/git/submodule-test.ts b/app/test/unit/git/submodule-test.ts index b6edc76dbc8..12fadce539f 100644 --- a/app/test/unit/git/submodule-test.ts +++ b/app/test/unit/git/submodule-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import { readFile, writeFile } from 'fs-extra' @@ -15,10 +17,10 @@ describe('git/submodule', () => { const testRepoPath = await setupFixtureRepository('submodule-basic-setup') const repository = new Repository(testRepoPath, -1, null, false) const result = await listSubmodules(repository) - expect(result).toHaveLength(1) - expect(result[0].sha).toBe('c59617b65080863c4ca72c1f191fa1b423b92223') - expect(result[0].path).toBe('foo/submodule') - expect(result[0].describe).toBe('first-tag~2') + assert.equal((result).length, 1) + assert.equal(result[0].sha, 'c59617b65080863c4ca72c1f191fa1b423b92223') + assert.equal(result[0].path, 'foo/submodule') + assert.equal(result[0].describe, 'first-tag~2') }) it('returns the expected tag', async () => { @@ -40,10 +42,10 @@ describe('git/submodule', () => { await checkoutBranch(submoduleRepository, branches[0], null) const result = await listSubmodules(repository) - expect(result).toHaveLength(1) - expect(result[0].sha).toBe('14425bb2a4ee361af7f789a81b971f8466ae521d') - expect(result[0].path).toBe('foo/submodule') - expect(result[0].describe).toBe('heads/feature-branch') + assert.equal((result).length, 1) + assert.equal(result[0].sha, '14425bb2a4ee361af7f789a81b971f8466ae521d') + assert.equal(result[0].path, 'foo/submodule') + assert.equal(result[0].describe, 'heads/feature-branch') }) }) @@ -67,12 +69,12 @@ describe('git/submodule', () => { await checkoutBranch(submoduleRepository, branches[0], null) let result = await listSubmodules(repository) - expect(result[0].describe).toBe('heads/feature-branch') + assert.equal(result[0].describe, 'heads/feature-branch') await resetSubmodulePaths(repository, ['foo/submodule']) result = await listSubmodules(repository) - expect(result[0].describe).toBe('first-tag~2') + assert.equal(result[0].describe, 'first-tag~2') }) it('eliminate submodule dirty state', async () => { @@ -87,7 +89,7 @@ describe('git/submodule', () => { await resetSubmodulePaths(repository, ['foo/submodule']) const result = await readFile(filePath, { encoding: 'utf8' }) - expect(result).toBe('# submodule-test-case') + assert.equal(result, '# submodule-test-case') }) }) }) diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 70176d5702f..6450b6b1fef 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' import { Repository } from '../../../src/models/repository' @@ -37,16 +39,16 @@ describe('git/tag', () => { await createTag(repository, 'my-new-tag', 'HEAD') const commit = await getCommit(repository, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.tags).toEqual(['my-new-tag']) + assert(commit !== null) + assert.deepStrictEqual(commit.tags, ['my-new-tag']) }) it('creates a tag with the a comma in it', async () => { await createTag(repository, 'my-new-tag,has-a-comma', 'HEAD') const commit = await getCommit(repository, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.tags).toEqual(['my-new-tag,has-a-comma']) + assert(commit !== null) + assert.deepStrictEqual(commit.tags, ['my-new-tag,has-a-comma']) }) it('creates multiple tags', async () => { @@ -54,8 +56,8 @@ describe('git/tag', () => { await createTag(repository, 'another-tag', 'HEAD') const commit = await getCommit(repository, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.tags).toEqual(['my-new-tag', 'another-tag']) + assert(commit !== null) + assert.deepStrictEqual(commit.tags, ['my-new-tag', 'another-tag']) }) it('creates a tag on a specified commit', async () => { @@ -66,14 +68,15 @@ describe('git/tag', () => { const commit = await getCommit(repository, commitSha) - expect(commit).not.toBeNull() - expect(commit!.tags).toEqual(['my-new-tag']) + assert(commit !== null) + assert.deepStrictEqual(commit.tags, ['my-new-tag']) }) it('fails when creating a tag with a name that already exists', async () => { await createTag(repository, 'my-new-tag', 'HEAD') - await expect(createTag(repository, 'my-new-tag', 'HEAD')).rejects.toThrow( + await assert.rejects( + createTag(repository, 'my-new-tag', 'HEAD'), /already exists/i ) }) @@ -85,14 +88,14 @@ describe('git/tag', () => { await deleteTag(repository, 'my-new-tag') const commit = await getCommit(repository, 'HEAD') - expect(commit).not.toBeNull() - expect(commit!.tags).toEqual([]) + assert(commit !== null) + assert(commit.tags.length === 0) }) }) describe('getAllTags', () => { - it('returns an empty array when the repository has no tags', async () => { - expect(await getAllTags(repository)).toEqual(new Map()) + it('returns an empty map when the repository has no tags', async () => { + assert((await getAllTags(repository)).size === 0) }) it('returns all the created tags', async () => { @@ -100,7 +103,8 @@ describe('git/tag', () => { await createTag(repository, 'my-new-tag', commit!.sha) await createTag(repository, 'another-tag', commit!.sha) - expect(await getAllTags(repository)).toEqual( + assert.deepStrictEqual( + await getAllTags(repository), new Map([ ['my-new-tag', commit!.sha], ['another-tag', commit!.sha], @@ -123,15 +127,17 @@ describe('git/tag', () => { }) it('returns an empty array when there are no tags to get pushed', async () => { - expect( - await fetchTagsToPush(repository, originRemote, 'master') - ).toBeArrayOfSize(0) + assert.equal( + (await fetchTagsToPush(repository, originRemote, 'master')).length, + 0 + ) }) it("returns local tags that haven't been pushed", async () => { await createTag(repository, 'my-new-tag', 'HEAD') - expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual( + assert.deepStrictEqual( + await fetchTagsToPush(repository, originRemote, 'master'), ['my-new-tag'] ) }) @@ -141,7 +147,8 @@ describe('git/tag', () => { await push(repository, originRemote, 'master', null, ['my-new-tag']) - expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual( + assert.deepStrictEqual( + await fetchTagsToPush(repository, originRemote, 'master'), [] ) }) @@ -161,7 +168,8 @@ describe('git/tag', () => { const commitSha = await createCommit(repository, 'a commit', files) await createTag(repository, 'my-new-tag', commitSha) - expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual( + assert.deepStrictEqual( + await fetchTagsToPush(repository, originRemote, 'master'), [] ) }) @@ -179,7 +187,8 @@ describe('git/tag', () => { await createTag(repository, 'my-new-tag', 'HEAD') - expect(await fetchTagsToPush(repository, originRemote, 'master')).toEqual( + assert.deepStrictEqual( + await fetchTagsToPush(repository, originRemote, 'master'), ['my-new-tag'] ) }) diff --git a/app/test/unit/group-branches-test.ts b/app/test/unit/group-branches-test.ts index 0c4f2be58cd..6f16400118c 100644 --- a/app/test/unit/group-branches-test.ts +++ b/app/test/unit/group-branches-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { groupBranches } from '../../src/ui/branches' import { Branch, BranchType } from '../../src/models/branch' import { CommitIdentity } from '../../src/models/commit-identity' @@ -44,18 +46,18 @@ describe('Branches grouping', () => { allBranches, recentBranches ) - expect(groups).toHaveLength(3) + assert.equal((groups).length, 3) - expect(groups[0].identifier).toBe('default') + assert.equal(groups[0].identifier, 'default') let items = groups[0].items - expect(items[0].branch).toBe(defaultBranch) + assert.equal(items[0].branch, defaultBranch) - expect(groups[1].identifier).toBe('recent') + assert.equal(groups[1].identifier, 'recent') items = groups[1].items - expect(items[0].branch).toBe(recentBranches[0]) + assert.equal(items[0].branch, recentBranches[0]) - expect(groups[2].identifier).toBe('other') + assert.equal(groups[2].identifier, 'other') items = groups[2].items - expect(items[0].branch).toBe(otherBranch) + assert.equal(items[0].branch, otherBranch) }) }) diff --git a/app/test/unit/http-test.ts b/app/test/unit/http-test.ts index 1b3156ec4e8..fed02f59d9d 100644 --- a/app/test/unit/http-test.ts +++ b/app/test/unit/http-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { getAbsoluteUrl } from '../../src/lib/http' import { getDotComAPIEndpoint } from '../../src/lib/api' @@ -7,12 +9,12 @@ describe('getAbsoluteUrl', () => { it('handles leading slashes', () => { const result = getAbsoluteUrl(dotcomEndpoint, '/user/repos') - expect(result).toBe('https://api.github.com/user/repos') + assert.equal(result, 'https://api.github.com/user/repos') }) it('handles missing leading slash', () => { const result = getAbsoluteUrl(dotcomEndpoint, 'user/repos') - expect(result).toBe('https://api.github.com/user/repos') + assert.equal(result, 'https://api.github.com/user/repos') }) it("doesn't mangle encoded query parameters", () => { @@ -20,7 +22,7 @@ describe('getAbsoluteUrl', () => { getDotComAPIEndpoint(), '/issues?since=2019-05-10T16%3A00%3A00Z' ) - expect(result).toBe( + assert.equal(result, 'https://api.github.com/issues?since=2019-05-10T16%3A00%3A00Z' ) }) @@ -31,12 +33,12 @@ describe('getAbsoluteUrl', () => { it('handles leading slash', () => { const result = getAbsoluteUrl(enterpriseEndpoint, '/user/repos') - expect(result).toBe(`${enterpriseEndpoint}/user/repos`) + assert.equal(result, `${enterpriseEndpoint}/user/repos`) }) it('handles missing leading slash', () => { const result = getAbsoluteUrl(enterpriseEndpoint, 'user/repos') - expect(result).toBe(`${enterpriseEndpoint}/user/repos`) + assert.equal(result, `${enterpriseEndpoint}/user/repos`) }) it('handles next page resource which already contains prefix', () => { @@ -44,7 +46,7 @@ describe('getAbsoluteUrl', () => { enterpriseEndpoint, '/api/v3/user/repos?page=2' ) - expect(result).toBe(`${enterpriseEndpoint}/user/repos?page=2`) + assert.equal(result, `${enterpriseEndpoint}/user/repos?page=2`) }) it("doesn't mangle encoded query parameters", () => { @@ -52,7 +54,7 @@ describe('getAbsoluteUrl', () => { enterpriseEndpoint, '/issues?since=2019-05-10T16%3A00%3A00Z' ) - expect(result).toBe( + assert.equal(result, `${enterpriseEndpoint}/issues?since=2019-05-10T16%3A00%3A00Z` ) }) diff --git a/app/test/unit/identifier-rules-test.ts b/app/test/unit/identifier-rules-test.ts index 010a4eb66c5..4259d0b8f01 100644 --- a/app/test/unit/identifier-rules-test.ts +++ b/app/test/unit/identifier-rules-test.ts @@ -1,47 +1,49 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { gitAuthorNameIsValid } from '../../src/ui/lib/identifier-rules' describe('Identifier rules', () => { describe('gitAuthorNameIsValid', () => { it('returns any value that is a disallowed character', () => { - expect(gitAuthorNameIsValid('.')).toBeFalse() - expect(gitAuthorNameIsValid(',')).toBeFalse() - expect(gitAuthorNameIsValid(':')).toBeFalse() - expect(gitAuthorNameIsValid(';')).toBeFalse() - expect(gitAuthorNameIsValid('<')).toBeFalse() - expect(gitAuthorNameIsValid('>')).toBeFalse() - expect(gitAuthorNameIsValid('"')).toBeFalse() - expect(gitAuthorNameIsValid('\\')).toBeFalse() - expect(gitAuthorNameIsValid("'")).toBeFalse() - expect(gitAuthorNameIsValid(' ')).toBeFalse() + assert.equal(gitAuthorNameIsValid('.'), false) + assert.equal(gitAuthorNameIsValid(','), false) + assert.equal(gitAuthorNameIsValid(':'), false) + assert.equal(gitAuthorNameIsValid(';'), false) + assert.equal(gitAuthorNameIsValid('<'), false) + assert.equal(gitAuthorNameIsValid('>'), false) + assert.equal(gitAuthorNameIsValid('"'), false) + assert.equal(gitAuthorNameIsValid('\\'), false) + assert.equal(gitAuthorNameIsValid("'"), false) + assert.equal(gitAuthorNameIsValid(' '), false) }) it('returns true for empty strings', () => { - expect(gitAuthorNameIsValid('')).toBeTrue() + assert.equal(gitAuthorNameIsValid(''), true) }) it('returns false when name consists only of ascii character codes 0-32 inclusive', () => { for (let i = 0; i <= 32; i++) { const char = String.fromCharCode(i) - expect(gitAuthorNameIsValid(char)).toBeFalse() + assert.equal(gitAuthorNameIsValid(char), false) } }) it('returns false when name consists solely of disallowed characters', () => { - expect(gitAuthorNameIsValid('.;:<>')).toBeFalse() + assert.equal(gitAuthorNameIsValid('.;:<>'), false) }) it('returns true if the value consists of allowed characters', () => { - expect(gitAuthorNameIsValid('this is great')).toBeTrue() + assert.equal(gitAuthorNameIsValid('this is great'), true) }) it('returns true if the value contains allowed characters with disallowed characters', () => { const allowed = `;hi. there;${String.fromCharCode(31)}` - expect(gitAuthorNameIsValid(allowed)).toBeTrue() + assert.equal(gitAuthorNameIsValid(allowed), true) }) it('returns true if the value contains ASCII characters whose code point is greater than 32', () => { const allowed = String.fromCharCode(33) - expect(gitAuthorNameIsValid(allowed)).toBeTrue() + assert.equal(gitAuthorNameIsValid(allowed), true) }) }) }) diff --git a/app/test/unit/list-selection-test.ts b/app/test/unit/list-selection-test.ts index 20afbbb3d8e..feb1e28a1ae 100644 --- a/app/test/unit/list-selection-test.ts +++ b/app/test/unit/list-selection-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { findNextSelectableRow } from '../../src/ui/lib/list/selection' describe('list-selection', () => { @@ -9,7 +11,7 @@ describe('list-selection', () => { direction: 'down', row: -1, }) - expect(selectedRow).toBe(0) + assert.equal(selectedRow, 0) }) it('returns first selectable row when header is first', () => { @@ -27,7 +29,7 @@ describe('list-selection', () => { } } ) - expect(selectedRow).toBe(1) + assert.equal(selectedRow, 1) }) it('returns first row when selecting down from last row', () => { @@ -36,7 +38,7 @@ describe('list-selection', () => { direction: 'down', row: lastRow, }) - expect(selectedRow).toBe(0) + assert.equal(selectedRow, 0) }) it('returns last row when selecting up from top row', () => { @@ -44,7 +46,7 @@ describe('list-selection', () => { direction: 'up', row: 0, }) - expect(selectedRow).toBe(4) + assert.equal(selectedRow, 4) }) }) }) diff --git a/app/test/unit/local-storage-test.ts b/app/test/unit/local-storage-test.ts index 3ec1a38d26a..d51ad719dba 100644 --- a/app/test/unit/local-storage-test.ts +++ b/app/test/unit/local-storage-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { setBoolean, getBoolean, @@ -17,13 +19,13 @@ describe('local storage', () => { it('round-trips a true value', () => { const expected = true setBoolean(booleanKey, expected) - expect(getBoolean(booleanKey)).toEqual(expected) + assert.equal(getBoolean(booleanKey), expected) }) it('round-trips a false value', () => { const expected = false setBoolean(booleanKey, expected) - expect(getBoolean(booleanKey)).toEqual(expected) + assert.equal(getBoolean(booleanKey), expected) }) }) @@ -33,7 +35,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - expect(actual).toEqual(defaultValue) + assert.equal(actual, defaultValue) }) it('returns default value when malformed string encountered', () => { @@ -42,7 +44,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - expect(actual).toEqual(defaultValue) + assert.equal(actual, defaultValue) }) it('returns false if found and ignores default value', () => { @@ -50,7 +52,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, true) - expect(actual).toEqual(false) + assert.equal(actual, false) }) it(`can parse the string 'true' if found`, () => { @@ -58,7 +60,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey) - expect(actual).toEqual(true) + assert.equal(actual, true) }) it(`can parse the string 'false' if found`, () => { @@ -67,7 +69,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - expect(actual).toEqual(false) + assert.equal(actual, false) }) }) @@ -77,7 +79,7 @@ describe('local storage', () => { setNumber(numberKey, expected) - expect(getNumber(numberKey)).toEqual(expected) + assert.equal(getNumber(numberKey), expected) }) it('round-trip zero and ignore default value', () => { @@ -86,7 +88,7 @@ describe('local storage', () => { setNumber(numberKey, expected) - expect(getNumber(numberKey, defaultNumber)).toEqual(expected) + assert.equal(getNumber(numberKey, defaultNumber), expected) }) }) @@ -94,7 +96,7 @@ describe('local storage', () => { it('returns default value when no key found', () => { const defaultValue = 3456 const actual = getNumber(numberKey, defaultValue) - expect(actual).toEqual(defaultValue) + assert.equal(actual, defaultValue) }) it('returns default value when malformed string encountered', () => { @@ -103,7 +105,7 @@ describe('local storage', () => { const actual = getNumber(numberKey, defaultValue) - expect(actual).toEqual(defaultValue) + assert.equal(actual, defaultValue) }) it('returns zero if found and ignores default value', () => { @@ -112,7 +114,7 @@ describe('local storage', () => { const actual = getNumber(numberKey, defaultValue) - expect(actual).toEqual(0) + assert.equal(actual, 0) }) }) }) diff --git a/app/test/unit/main-process/menu-test.ts b/app/test/unit/main-process/menu-test.ts index 2855c9b9506..f84d4522937 100644 --- a/app/test/unit/main-process/menu-test.ts +++ b/app/test/unit/main-process/menu-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { ensureItemIds } from '../../../src/main-process/menu' describe('main-process menu', () => { @@ -9,7 +11,7 @@ describe('main-process menu', () => { ensureItemIds(template) - expect(template[0].id).toBe('foo') + assert.equal(template[0].id, 'foo') }) it('assigns ids to items which lack it', () => { @@ -19,7 +21,7 @@ describe('main-process menu', () => { ensureItemIds(template) - expect(template[0].id).toBe('@.File') + assert.equal(template[0].id, '@.File') }) it('assigns ids recursively', () => { @@ -40,19 +42,19 @@ describe('main-process menu', () => { ensureItemIds(template) - expect(template[0].id).toBe('foo') + assert.equal(template[0].id, 'foo') const firstSubmenu = template[0] .submenu! as Electron.MenuItemConstructorOptions[] - expect(firstSubmenu[0].id).toBe('foo.Open') - expect(firstSubmenu[1].id).toBe('foo.Close') - expect(firstSubmenu[2].id).toBe('foo.More') + assert.equal(firstSubmenu[0].id, 'foo.Open') + assert.equal(firstSubmenu[1].id, 'foo.Close') + assert.equal(firstSubmenu[2].id, 'foo.More') const secondSubmenu = firstSubmenu[2] .submenu! as Electron.MenuItemConstructorOptions[] - expect(secondSubmenu[0].id).toBe('foo.More.Even more') + assert.equal(secondSubmenu[0].id, 'foo.More.Even more') }) it('handles duplicate generated ids', () => { @@ -63,8 +65,8 @@ describe('main-process menu', () => { ensureItemIds(template) - expect(template[0].id).toBe('@.foo') - expect(template[1].id).toBe('@.foo1') + assert.equal(template[0].id, '@.foo') + assert.equal(template[1].id, '@.foo1') }) }) }) diff --git a/app/test/unit/main-process/spell-checker-menu-test.ts b/app/test/unit/main-process/spell-checker-menu-test.ts index 6db4fc513d7..ecf3ff2a393 100644 --- a/app/test/unit/main-process/spell-checker-menu-test.ts +++ b/app/test/unit/main-process/spell-checker-menu-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { SpellcheckEnglishLabel, getSpellCheckLanguageMenuItemOptions, @@ -13,7 +15,7 @@ describe('spell-checker-menu', () => { getAvailableSpellcheckerLanguages() ) - expect(spellcheckerMenuItem).toBeNull() + assert(spellcheckerMenuItem === null) }) it('returns null menu item options when spellchecker language is english, user language is not english and user language is not supported', () => { @@ -23,7 +25,7 @@ describe('spell-checker-menu', () => { getAvailableSpellcheckerLanguages() ) - expect(spellcheckerMenuItem).toBeNull() + assert(spellcheckerMenuItem === null) }) it('returns set system language label when spellchecker language is english, user language is not english and user language is supported', () => { @@ -33,7 +35,7 @@ describe('spell-checker-menu', () => { getAvailableSpellcheckerLanguages() ) - expect(spellcheckerMenuItem?.label).toBe(SpellcheckSystemLabel) + assert.equal(spellcheckerMenuItem?.label, SpellcheckSystemLabel) }) it('returns set to english label when spellchecker language is no english', () => { @@ -43,6 +45,6 @@ describe('spell-checker-menu', () => { getAvailableSpellcheckerLanguages() ) - expect(spellcheckerMenuItem?.label).toBe(SpellcheckEnglishLabel) + assert.equal(spellcheckerMenuItem?.label, SpellcheckEnglishLabel) }) }) diff --git a/app/test/unit/name-of-test.ts b/app/test/unit/name-of-test.ts index 42ca2429fce..0dfca9d84ec 100644 --- a/app/test/unit/name-of-test.ts +++ b/app/test/unit/name-of-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Repository, nameOf } from '../../src/models/repository' import { gitHubRepoFixture } from '../helpers/github-repo-builder' @@ -9,7 +11,7 @@ describe('nameOf', () => { const name = nameOf(repo) - expect(name).toBe('path') + assert.equal(name, 'path') }) it('Returns the name of the repo', () => { @@ -18,6 +20,6 @@ describe('nameOf', () => { const name = nameOf(repo) - expect(name).toBe('desktop/name') + assert.equal(name, 'desktop/name') }) }) diff --git a/app/test/unit/octicon-test.ts b/app/test/unit/octicon-test.ts index b87e6d895f2..bce697fea03 100644 --- a/app/test/unit/octicon-test.ts +++ b/app/test/unit/octicon-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { iconForRepository } from '../../src/ui/octicons' import * as octicons from '../../src/ui/octicons/octicons.generated' import { CloningRepository } from '../../src/models/cloning-repository' @@ -11,13 +13,13 @@ describe('octicon/iconForRepository', () => { 'https://github.com/desktop/desktop' ) const icon = iconForRepository(repository) - expect(icon).toEqual(octicons.desktopDownload) + assert.equal(icon, octicons.desktopDownload) }) it('shows computer icon for non-GitHub repository', () => { const repository = new Repository('C:/some/path/to/repo', 1, null, false) const icon = iconForRepository(repository) - expect(icon).toEqual(octicons.deviceDesktop) + assert.equal(icon, octicons.deviceDesktop) }) it('shows repo icon for public GitHub repository', () => { @@ -33,7 +35,7 @@ describe('octicon/iconForRepository', () => { false ) const icon = iconForRepository(repository) - expect(icon).toEqual(octicons.repo) + assert.equal(icon, octicons.repo) }) it('shows lock icon for private GitHub repository', () => { @@ -49,7 +51,7 @@ describe('octicon/iconForRepository', () => { false ) const icon = iconForRepository(repository) - expect(icon).toEqual(octicons.lock) + assert.equal(icon, octicons.lock) }) it('shows fork icon for forked GitHub repository', () => { @@ -66,6 +68,6 @@ describe('octicon/iconForRepository', () => { false ) const icon = iconForRepository(repository) - expect(icon).toEqual(octicons.repoForked) + assert.equal(icon, octicons.repoForked) }) }) diff --git a/app/test/unit/parse-app-url-test.ts b/app/test/unit/parse-app-url-test.ts index b297658002f..ba74597b690 100644 --- a/app/test/unit/parse-app-url-test.ts +++ b/app/test/unit/parse-app-url-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseAppURL, IOpenRepositoryFromURLAction, @@ -6,7 +8,7 @@ import { describe('parseAppURL', () => { it('returns unknown by default', () => { - expect(parseAppURL('').name).toBe('unknown') + assert.equal(parseAppURL('').name, 'unknown') }) describe('oauth', () => { @@ -14,10 +16,10 @@ describe('parseAppURL', () => { const result = parseAppURL( 'x-github-client://oauth?code=18142422&state=e4cd2dea-1567-46aa-8eb2-c7f56e943187' ) - expect(result.name).toBe('oauth') + assert.equal(result.name, 'oauth') const openRepo = result as IOAuthAction - expect(openRepo.code).toBe('18142422') + assert.equal(openRepo.code, '18142422') }) }) @@ -26,45 +28,45 @@ describe('parseAppURL', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/desktop/desktop' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('https://github.com/desktop/desktop') + assert.equal(openRepo.url, 'https://github.com/desktop/desktop') }) it('returns unknown when no remote defined', () => { const result = parseAppURL('github-mac://openRepo/') - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('adds branch name if set', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/desktop/desktop?branch=cancel-2fa-flow' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('https://github.com/desktop/desktop') - expect(openRepo.branch).toBe('cancel-2fa-flow') + assert.equal(openRepo.url, 'https://github.com/desktop/desktop') + assert.equal(openRepo.branch, 'cancel-2fa-flow') }) it('adds pull request ID if found', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/octokit/octokit.net?branch=pr%2F1569&pr=1569' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('https://github.com/octokit/octokit.net') - expect(openRepo.branch).toBe('pr/1569') - expect(openRepo.pr).toBe('1569') + assert.equal(openRepo.url, 'https://github.com/octokit/octokit.net') + assert.equal(openRepo.branch, 'pr/1569') + assert.equal(openRepo.pr, '1569') }) it('returns unknown for unexpected pull request input', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/octokit/octokit.net?branch=bar&pr=foo' ) - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('returns unknown for invalid branch name', () => { @@ -72,19 +74,19 @@ describe('parseAppURL', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/octokit/octokit.net?branch=%3C%3E' ) - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('adds file path if found', () => { const result = parseAppURL( 'github-mac://openRepo/https://github.com/octokit/octokit.net?branch=master&filepath=Octokit.Reactive%2FOctokit.Reactive.csproj' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('https://github.com/octokit/octokit.net') - expect(openRepo.branch).toBe('master') - expect(openRepo.filepath).toBe('Octokit.Reactive/Octokit.Reactive.csproj') + assert.equal(openRepo.url, 'https://github.com/octokit/octokit.net') + assert.equal(openRepo.branch, 'master') + assert.equal(openRepo.filepath, 'Octokit.Reactive/Octokit.Reactive.csproj') }) }) @@ -93,45 +95,45 @@ describe('parseAppURL', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/desktop/desktop' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('git@github.com/desktop/desktop') + assert.equal(openRepo.url, 'git@github.com/desktop/desktop') }) it('returns unknown when no remote defined', () => { const result = parseAppURL('github-mac://openRepo/') - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('adds branch name if set', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/desktop/desktop?branch=cancel-2fa-flow' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('git@github.com/desktop/desktop') - expect(openRepo.branch).toBe('cancel-2fa-flow') + assert.equal(openRepo.url, 'git@github.com/desktop/desktop') + assert.equal(openRepo.branch, 'cancel-2fa-flow') }) it('adds pull request ID if found', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/octokit/octokit.net?branch=pr%2F1569&pr=1569' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('git@github.com/octokit/octokit.net') - expect(openRepo.branch).toBe('pr/1569') - expect(openRepo.pr).toBe('1569') + assert.equal(openRepo.url, 'git@github.com/octokit/octokit.net') + assert.equal(openRepo.branch, 'pr/1569') + assert.equal(openRepo.pr, '1569') }) it('returns unknown for unexpected pull request input', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/octokit/octokit.net?branch=bar&pr=foo' ) - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('returns unknown for invalid branch name', () => { @@ -139,19 +141,19 @@ describe('parseAppURL', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/octokit/octokit.net?branch=%3C%3E' ) - expect(result.name).toBe('unknown') + assert.equal(result.name, 'unknown') }) it('adds file path if found', () => { const result = parseAppURL( 'github-mac://openRepo/git@github.com/octokit/octokit.net?branch=master&filepath=Octokit.Reactive%2FOctokit.Reactive.csproj' ) - expect(result.name).toBe('open-repository-from-url') + assert.equal(result.name, 'open-repository-from-url') const openRepo = result as IOpenRepositoryFromURLAction - expect(openRepo.url).toBe('git@github.com/octokit/octokit.net') - expect(openRepo.branch).toBe('master') - expect(openRepo.filepath).toBe('Octokit.Reactive/Octokit.Reactive.csproj') + assert.equal(openRepo.url, 'git@github.com/octokit/octokit.net') + assert.equal(openRepo.branch, 'master') + assert.equal(openRepo.filepath, 'Octokit.Reactive/Octokit.Reactive.csproj') }) }) }) diff --git a/app/test/unit/parse-files-to-be-overwritten-test.ts b/app/test/unit/parse-files-to-be-overwritten-test.ts index f5ab0a1077a..d023a2f8dd7 100644 --- a/app/test/unit/parse-files-to-be-overwritten-test.ts +++ b/app/test/unit/parse-files-to-be-overwritten-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { setupEmptyRepository } from '../helpers/repositories' import { writeFile } from 'fs-extra' import { join } from 'path' @@ -25,8 +27,8 @@ describe('parseFilesToBeOverwritten', () => { expectedErrors: new Set([DugiteError.MergeWithLocalChanges]), }) - expect(result.gitError).toBe(DugiteError.MergeWithLocalChanges) - expect(parseFilesToBeOverwritten(result.stderr)).toEqual(['a', 'b']) + assert.equal(result.gitError, DugiteError.MergeWithLocalChanges) + assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), ['a', 'b']) }) it("isn't able to parse files from pull rebase error", async () => { @@ -47,8 +49,8 @@ describe('parseFilesToBeOverwritten', () => { expectedErrors: new Set([DugiteError.RebaseWithLocalChanges]), }) - expect(result.gitError).toBe(DugiteError.RebaseWithLocalChanges) - expect(parseFilesToBeOverwritten(result.stderr)).toEqual([]) + assert.equal(result.gitError, DugiteError.RebaseWithLocalChanges) + assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), []) }) it('parses files from merge error', async () => { @@ -68,8 +70,8 @@ describe('parseFilesToBeOverwritten', () => { expectedErrors: new Set([DugiteError.MergeWithLocalChanges]), }) - expect(result.gitError).toBe(DugiteError.MergeWithLocalChanges) - expect(parseFilesToBeOverwritten(result.stderr)).toEqual(['a', 'b']) + assert.equal(result.gitError, DugiteError.MergeWithLocalChanges) + assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), ['a', 'b']) }) it('parses files from checkout error', async () => { @@ -95,7 +97,7 @@ describe('parseFilesToBeOverwritten', () => { expectedErrors: new Set([DugiteError.LocalChangesOverwritten]), }) - expect(result.gitError).toBe(DugiteError.LocalChangesOverwritten) - expect(parseFilesToBeOverwritten(result.stderr)).toEqual(['a', 'b']) + assert.equal(result.gitError, DugiteError.LocalChangesOverwritten) + assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), ['a', 'b']) }) }) diff --git a/app/test/unit/parse-pac-string-test.ts b/app/test/unit/parse-pac-string-test.ts index 8816be66d4f..66a79d89e0f 100644 --- a/app/test/unit/parse-pac-string-test.ts +++ b/app/test/unit/parse-pac-string-test.ts @@ -1,58 +1,64 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parsePACString } from '../../src/lib/parse-pac-string' describe('parsePACString', () => { it('returns no url for DIRECT', () => { - expect(parsePACString('DIRECT')).toBeNull() + assert(parsePACString('DIRECT') === null) }) it('parses Chromium PAC strings', () => { - expect(parsePACString('PROXY myproxy:80;DIRECT')).toEqual([ + assert.deepStrictEqual(parsePACString('PROXY myproxy:80;DIRECT'), [ 'http://myproxy:80', ]) - expect(parsePACString('PROXY myproxy:80')).toEqual(['http://myproxy:80']) - expect(parsePACString('PROXY myproxy:80; HTTPS secureproxy:443')).toEqual([ + assert.deepStrictEqual(parsePACString('PROXY myproxy:80'), [ 'http://myproxy:80', - 'https://secureproxy:443', ]) + assert.deepStrictEqual( + parsePACString('PROXY myproxy:80; HTTPS secureproxy:443'), + ['http://myproxy:80', 'https://secureproxy:443'] + ) - expect( + assert.deepStrictEqual( parsePACString( 'PROXY a:1;HTTP b:2;HTTPS c:3;SOCKS d:4;SOCKS4 e:5;SOCKS5 f:5;DIRECT' - ) - ).toEqual([ - 'http://a:1', - 'http://b:2', - 'https://c:3', - 'socks4://d:4', - 'socks4://e:5', - 'socks5://f:5', - ]) + ), + [ + 'http://a:1', + 'http://b:2', + 'https://c:3', + 'socks4://d:4', + 'socks4://e:5', + 'socks5://f:5', + ] + ) }) // not strictly necessary as Chromium doesn't add space inbetween it('parses PAC strings with white space between specs', () => { - expect( + assert.deepStrictEqual( parsePACString( 'PROXY a:1; HTTP b:2 ;\tHTTPS c:3\t;\tSOCKS d:4 ; SOCKS4 e:5 ; SOCKS5 f:5 ; DIRECT' - ) - ).toEqual([ - 'http://a:1', - 'http://b:2', - 'https://c:3', - 'socks4://d:4', - 'socks4://e:5', - 'socks5://f:5', - ]) + ), + [ + 'http://a:1', + 'http://b:2', + 'https://c:3', + 'socks4://d:4', + 'socks4://e:5', + 'socks5://f:5', + ] + ) }) it("skips protocols cURL doesn't understand", () => { const urls = parsePACString('QUIC qhost:1;PROXY phost:2;DIRECT') - expect(urls).toEqual(['http://phost:2']) + assert.deepStrictEqual(urls, ['http://phost:2']) }) it('skips invalid specs', () => { const urls = parsePACString('PROXY;HTTPS;DIRECT') - expect(urls).toBeNull() + assert(urls === null) }) }) diff --git a/app/test/unit/patch-formatter-test.ts b/app/test/unit/patch-formatter-test.ts index d687aa20509..ed5ba717674 100644 --- a/app/test/unit/patch-formatter-test.ts +++ b/app/test/unit/patch-formatter-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as Path from 'path' import * as FSE from 'fs-extra' @@ -26,7 +28,7 @@ async function parseDiff(diff: string): Promise { kind: AppFileStatusKind.Modified, }) const output = await convertDiff(repository, fileChange, rawDiff, 'HEAD') - expect(output.kind).toEqual(DiffType.Text) + assert.equal(output.kind, DiffType.Text) return output as ITextDiff } @@ -53,7 +55,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) const textDiff = diff as ITextDiff const second = textDiff.hunks[1] @@ -74,9 +76,9 @@ describe('patch formatting', () => { const patch = formatPatch(updatedFile, textDiff) - expect(patch).toContain('--- a/modified-file.md\n') - expect(patch).toContain('+++ b/modified-file.md\n') - expect(patch).toContain('@@ -4,10 +4,6 @@') + assert(patch.includes('--- a/modified-file.md\n')) + assert(patch.includes('+++ b/modified-file.md\n')) + assert(patch.includes('@@ -4,10 +4,6 @@')) }) it('creates right patch when second hunk is selected', async () => { @@ -92,7 +94,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) const textDiff = diff as ITextDiff const first = textDiff.hunks[0] @@ -113,9 +115,9 @@ describe('patch formatting', () => { const patch = formatPatch(updatedFile, textDiff) - expect(patch).toContain('--- a/modified-file.md\n') - expect(patch).toContain('+++ b/modified-file.md\n') - expect(patch).toContain('@@ -21,6 +17,10 @@') + assert(patch.includes('--- a/modified-file.md\n')) + assert(patch.includes('+++ b/modified-file.md\n')) + assert(patch.includes('@@ -21,6 +17,10 @@')) }) it('creates right patch when first and third hunk is selected', async () => { @@ -132,7 +134,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) const textDiff = diff as ITextDiff const second = textDiff.hunks[1] @@ -152,9 +154,9 @@ describe('patch formatting', () => { const patch = formatPatch(updatedFile, textDiff) - expect(patch).toContain('--- a/modified-file.md\n') - expect(patch).toContain('+++ b/modified-file.md\n') - expect(patch).toContain('@@ -31,3 +31,8 @@') + assert(patch.includes('--- a/modified-file.md\n')) + assert(patch.includes('+++ b/modified-file.md\n')) + assert(patch.includes('@@ -31,3 +31,8 @@')) }) it(`creates the right patch when an addition is selected but preceding deletions aren't`, async () => { @@ -172,7 +174,7 @@ describe('patch formatting', () => { const diff = await getWorkingDirectoryDiff(repository, file) - expect(diff.kind).toEqual(DiffType.Text) + assert.equal(diff.kind, DiffType.Text) const textDiff = diff as ITextDiff @@ -232,7 +234,7 @@ describe('patch formatting', () => { urna, ac porta justo leo sed magna. +line 1 ` - expect(patch).toBe(expectedPatch) + assert.equal(patch, expectedPatch) }) it("doesn't include unselected added lines as context", async () => { @@ -260,13 +262,16 @@ describe('patch formatting', () => { ) const patch = formatPatch(file, diff) - expect(patch).toBe(`--- a/file.md + assert.equal( + patch, + `--- a/file.md +++ b/file.md @@ -10,2 +10,3 @@ context +added line 2 context -`) +` + ) }) it('rewrites hunk header when necessary', async () => { @@ -291,8 +296,8 @@ describe('patch formatting', () => { ) const patch = formatPatch(file, diff) - expect(patch).toContain('@@ -0,0 +1 @@') - expect(patch).toContain('+added line 2') + assert(patch.includes('@@ -0,0 +1 @@')) + assert(patch.includes('+added line 2')) }) it('includes empty context lines', async () => { @@ -317,9 +322,9 @@ describe('patch formatting', () => { ) const patch = formatPatch(file, diff) - expect(patch).toContain('@@ -1 +1,2 @@') - expect(patch).toContain(' ') - expect(patch).toContain('+added line 2') + assert(patch.includes('@@ -1 +1,2 @@')) + assert(patch.includes(' ')) + assert(patch.includes('+added line 2')) }) it('creates the right patch when a `No newline` marker is involved', async () => { @@ -351,8 +356,8 @@ describe('patch formatting', () => { const patch = formatPatch(file, diff) - expect(patch).toContain('\\ No newline at end of file') - expect(patch).toContain('+it could be') + assert(patch.includes('\\ No newline at end of file')) + assert(patch.includes('+it could be')) }) }) }) diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 8c325147958..485eb3bf77c 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { encodePathAsUrl, resolveWithin } from '../../src/lib/path' import { resolve, basename, join } from 'path' import { promises } from 'fs' @@ -12,16 +14,16 @@ describe('path', () => { const dirName = 'C:/Users/shiftkey\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'folder/file.html') - expect( + assert.equal( uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/') - ).toBeTrue() + , true) }) it('encodes spaces and hashes', () => { const dirName = 'C:/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'index.html') - expect(uri.startsWith('file:///C:/Users/The%20Kong%20%232/')).toBeTrue() + assert.equal(uri.startsWith('file:///C:/Users/The%20Kong%20%232/'), true) }) } @@ -30,7 +32,7 @@ describe('path', () => { const dirName = '/Users/The Kong #2/AppData/Local/GitHubDesktop/app-1.0.4/resources/app' const uri = encodePathAsUrl(dirName, 'index.html') - expect(uri.startsWith('file:///Users/The%20Kong%20%232/')).toBeTrue() + assert.equal(uri.startsWith('file:///Users/The%20Kong%20%232/'), true) }) } }) @@ -39,23 +41,23 @@ describe('path', () => { const root = process.cwd() it('fails for paths outside of the root', async () => { - expect(await resolveWithin(root, join('..'))).toBeNull() - expect(await resolveWithin(root, join('..', '..'))).toBeNull() + assert(await resolveWithin(root, join('..')) === null) + assert(await resolveWithin(root, join('..', '..')) === null) }) it('succeeds for paths that traverse out, and then back into, the root', async () => { - expect(await resolveWithin(root, join('..', basename(root)))).toEqual( + assert.equal(await resolveWithin(root, join('..', basename(root))), root ) }) it('fails for paths containing null bytes', async () => { - expect(await resolveWithin(root, 'foo\0bar')).toBeNull() + assert(await resolveWithin(root, 'foo\0bar') === null) }) it('succeeds for absolute relative paths as long as they stay within the root', async () => { const parent = resolve(root, '..') - expect(await resolveWithin(parent, root)).toEqual(root) + assert.equal(await resolveWithin(parent, root), root) }) if (!__WIN32__) { @@ -66,7 +68,7 @@ describe('path', () => { try { await symlink(resolve(tempDir, '..', '..'), symlinkPath) - expect(await resolveWithin(tempDir, symlinkName)).toBeNull() + assert(await resolveWithin(tempDir, symlinkName) === null) } finally { await unlink(symlinkPath) await rmdir(tempDir) @@ -85,7 +87,7 @@ describe('path', () => { basename(resolve(tempDir, '..')), basename(tempDir) ) - expect(await resolveWithin(tempDir, throughSymlinkPath)).toBe( + assert.equal(await resolveWithin(tempDir, throughSymlinkPath), resolve(tempDir, throughSymlinkPath) ) } finally { diff --git a/app/test/unit/path-text-test.ts b/app/test/unit/path-text-test.ts index feb03a37b78..f8a7420d974 100644 --- a/app/test/unit/path-text-test.ts +++ b/app/test/unit/path-text-test.ts @@ -1,76 +1,78 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { truncateMid, truncatePath, extract } from '../../src/ui/lib/path-text' describe('PathText', () => { describe('truncateMid', () => { it("doesn't truncate if the string already fits", () => { - expect(truncateMid('foo', 3)).toBe('foo') - expect(truncateMid('foo', 10)).toBe('foo') + assert.equal(truncateMid('foo', 3), 'foo') + assert.equal(truncateMid('foo', 10), 'foo') }) it('returns an empty string if length is zero or less', () => { - expect(truncateMid('foo', 0)).toBe('') - expect(truncateMid('foo', -10)).toBe('') + assert.equal(truncateMid('foo', 0), '') + assert.equal(truncateMid('foo', -10), '') }) it('returns an ellipsis if length is one', () => { - expect(truncateMid('foo', 1)).toBe('…') + assert.equal(truncateMid('foo', 1), '…') }) it('truncates to the exact length given', () => { - expect(truncateMid('foo bar', 6)).toBe('fo…bar') - expect(truncateMid('foo bar', 5)).toBe('fo…ar') - expect(truncateMid('foo bar', 3)).toBe('f…r') + assert.equal(truncateMid('foo bar', 6), 'fo…bar') + assert.equal(truncateMid('foo bar', 5), 'fo…ar') + assert.equal(truncateMid('foo bar', 3), 'f…r') }) }) describe('truncatePath', () => { it("doesn't truncate if the string already fits", () => { - expect(truncatePath('foo', 3)).toBe('foo') - expect(truncatePath('foo', 10)).toBe('foo') + assert.equal(truncatePath('foo', 3), 'foo') + assert.equal(truncatePath('foo', 10), 'foo') }) it('returns an empty string if length is zero or less', () => { - expect(truncatePath('foo', 0)).toBe('') - expect(truncatePath('foo', -10)).toBe('') + assert.equal(truncatePath('foo', 0), '') + assert.equal(truncatePath('foo', -10), '') }) it('returns an ellipsis if length is one', () => { - expect(truncatePath('foo', 1)).toBe('…') + assert.equal(truncatePath('foo', 1), '…') }) it('truncates to the exact length given', () => { - expect(truncatePath('foo bar', 6)).toBe('fo…bar') - expect(truncatePath('foo bar', 5)).toBe('fo…ar') - expect(truncatePath('foo bar', 3)).toBe('f…r') + assert.equal(truncatePath('foo bar', 6), 'fo…bar') + assert.equal(truncatePath('foo bar', 5), 'fo…ar') + assert.equal(truncatePath('foo bar', 3), 'f…r') if (__WIN32__) { - expect(truncatePath('foo\\foo bar', 6)).toBe('fo…bar') - expect(truncatePath('foo\\foo bar', 9)).toBe('…\\foo bar') + assert.equal(truncatePath('foo\\foo bar', 6), 'fo…bar') + assert.equal(truncatePath('foo\\foo bar', 9), '…\\foo bar') } else { - expect(truncatePath('foo/foo bar', 6)).toBe('fo…bar') - expect(truncatePath('foo/foo bar', 9)).toBe('…/foo bar') + assert.equal(truncatePath('foo/foo bar', 6), 'fo…bar') + assert.equal(truncatePath('foo/foo bar', 9), '…/foo bar') } }) it('favors truncation of directory components over file names', () => { if (__WIN32__) { - expect(truncatePath('alfa\\bravo\\charlie\\delta.txt', 25)).toBe( + assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 25), 'alfa\\bravo\\cha…\\delta.txt' ) - expect(truncatePath('alfa\\bravo\\charlie\\delta.txt', 22)).toBe( + assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 22), 'alfa\\bravo\\…\\delta.txt' ) - expect(truncatePath('alfa\\bravo\\charlie\\delta.txt', 17)).toBe( + assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 17), 'alfa\\b…\\delta.txt' ) } else { - expect(truncatePath('alfa/bravo/charlie/delta.txt', 25)).toBe( + assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 25), 'alfa/bravo/cha…/delta.txt' ) - expect(truncatePath('alfa/bravo/charlie/delta.txt', 22)).toBe( + assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 22), 'alfa/bravo/…/delta.txt' ) - expect(truncatePath('alfa/bravo/charlie/delta.txt', 17)).toBe( + assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 17), 'alfa/b…/delta.txt' ) } @@ -82,8 +84,8 @@ describe('PathText', () => { const { normalizedFileName, normalizedDirectory } = extract( __WIN32__ ? 'some\\submodule\\path\\' : 'some/submodule/path/' ) - expect(normalizedFileName).toBe('path') - expect(normalizedDirectory).toBe( + assert.equal(normalizedFileName, 'path') + assert.equal(normalizedDirectory, __WIN32__ ? 'some\\submodule\\' : 'some/submodule/' ) }) @@ -92,8 +94,8 @@ describe('PathText', () => { const { normalizedFileName, normalizedDirectory } = extract( __WIN32__ ? 'some\\submodule\\path' : 'some/submodule/path' ) - expect(normalizedFileName).toBe('path') - expect(normalizedDirectory).toBe( + assert.equal(normalizedFileName, 'path') + assert.equal(normalizedDirectory, __WIN32__ ? 'some\\submodule\\' : 'some/submodule/' ) }) @@ -102,8 +104,8 @@ describe('PathText', () => { const { normalizedFileName, normalizedDirectory } = extract( __WIN32__ ? 'some\\repository\\path.tsx' : 'some/repository/path.tsx' ) - expect(normalizedFileName).toBe('path.tsx') - expect(normalizedDirectory).toBe( + assert.equal(normalizedFileName, 'path.tsx') + assert.equal(normalizedDirectory, __WIN32__ ? 'some\\repository\\' : 'some/repository/' ) }) diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts index e9ce1de6d2d..beeafe02e35 100644 --- a/app/test/unit/popup-manager-test.ts +++ b/app/test/unit/popup-manager-test.ts @@ -1,167 +1,151 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { PopupManager } from '../../src/lib/popup-manager' import { Account } from '../../src/models/account' import { Popup, PopupType } from '../../src/models/popup' -let mockId = 0 -jest.mock('../../src/lib/uuid', () => { - return { uuid: () => mockId++ } -}) - describe('PopupManager', () => { - let popupManager = new PopupManager() - - beforeEach(() => { - popupManager = new PopupManager() - mockId = 0 - }) - describe('currentPopup', () => { it('returns null when no popups added', () => { - const currentPopup = popupManager.currentPopup - expect(currentPopup).toBeNull() + const popupManager = new PopupManager() + assert(popupManager.currentPopup === null) }) it('returns last added non-error popup', () => { - const popupAbout: Popup = { type: PopupType.About } - const popupSignIn: Popup = { type: PopupType.SignIn } - popupManager.addPopup(popupAbout) - popupManager.addPopup(popupSignIn) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) + popupManager.addPopup({ type: PopupType.SignIn }) const currentPopup = popupManager.currentPopup - expect(currentPopup).not.toBeNull() - expect(currentPopup?.type).toBe(PopupType.SignIn) + assert(currentPopup !== null) + assert.equal(currentPopup?.type, PopupType.SignIn) }) it('returns last added error popup', () => { - const popupAbout: Popup = { type: PopupType.About } - const popupSignIn: Popup = { type: PopupType.SignIn } - popupManager.addPopup(popupAbout) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) popupManager.addErrorPopup(new Error('an error')) - popupManager.addPopup(popupSignIn) + popupManager.addPopup({ type: PopupType.SignIn }) const currentPopup = popupManager.currentPopup - expect(currentPopup).not.toBeNull() - expect(currentPopup?.type).toBe(PopupType.Error) + assert(currentPopup !== null) + assert.equal(currentPopup?.type, PopupType.Error) }) }) describe('isAPopupOpen', () => { it('returns false when no popups added', () => { + const popupManager = new PopupManager() const isAPopupOpen = popupManager.isAPopupOpen - expect(isAPopupOpen).toBeFalse() + assert.equal(isAPopupOpen, false) }) it('returns last added popup', () => { - const popupAbout: Popup = { type: PopupType.About } - popupManager.addPopup(popupAbout) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) const isAPopupOpen = popupManager.isAPopupOpen - expect(isAPopupOpen).toBeTrue() + assert.equal(isAPopupOpen, true) }) }) describe('getPopupsOfType', () => { it('returns popups of a given type', () => { - const popupAbout: Popup = { type: PopupType.About } - const popupSignIn: Popup = { type: PopupType.SignIn } - popupManager.addPopup(popupAbout) - popupManager.addPopup(popupSignIn) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) + popupManager.addPopup({ type: PopupType.SignIn }) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) - expect(aboutPopups).toBeArrayOfSize(1) - expect(aboutPopups.at(0)?.type).toBe(PopupType.About) + assert.equal(aboutPopups.length, 1) + assert.equal(aboutPopups.at(0)?.type, PopupType.About) }) it('returns empty array if none exist of given type', () => { - const popupAbout: Popup = { type: PopupType.About } - popupManager.addPopup(popupAbout) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(signInPopups).toBeArrayOfSize(0) + assert.equal(signInPopups.length, 0) }) }) describe('areTherePopupsOfType', () => { it('returns true if popup of type exists', () => { - const popupAbout: Popup = { type: PopupType.About } - popupManager.addPopup(popupAbout) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) const areThereAboutPopups = popupManager.areTherePopupsOfType( PopupType.About ) - expect(areThereAboutPopups).toBeTrue() + assert.equal(areThereAboutPopups, true) }) it('returns false if there are no popups of that type', () => { - const popupAbout: Popup = { type: PopupType.About } - popupManager.addPopup(popupAbout) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) const areThereSignInPopups = popupManager.areTherePopupsOfType( PopupType.SignIn ) - expect(areThereSignInPopups).toBeFalse() + assert.equal(areThereSignInPopups, false) }) }) describe('addPopup', () => { it('adds a popup to the stack', () => { - const popup: Popup = { type: PopupType.About } - popupManager.addPopup(popup) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) const popupsOfType = popupManager.getPopupsOfType(PopupType.About) const currentPopup = popupManager.currentPopup - expect(popupsOfType).toBeArrayOfSize(1) - expect(currentPopup).not.toBeNull() - expect(currentPopup?.type).toBe(PopupType.About) - expect(currentPopup?.id).toBe(0) + assert.equal(popupsOfType.length, 1) + assert(currentPopup !== null) + assert.equal(currentPopup.type, PopupType.About) + assert(currentPopup.id?.length === 36) }) it('does not add multiple popups of the same kind to the stack', () => { + const popupManager = new PopupManager() const popup: Popup = { type: PopupType.About } popupManager.addPopup(popup) popupManager.addPopup(popup) const popupsOfType = popupManager.getPopupsOfType(PopupType.About) - expect(popupsOfType).toBeArrayOfSize(1) + assert.equal(popupsOfType.length, 1) }) it('adds multiple popups of different types', () => { - const popupAbout: Popup = { type: PopupType.About } - const popupSignIn: Popup = { type: PopupType.SignIn } - popupManager.addPopup(popupAbout) - popupManager.addPopup(popupSignIn) + const popupManager = new PopupManager() + popupManager.addPopup({ type: PopupType.About }) + popupManager.addPopup({ type: PopupType.SignIn }) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) const signInPoups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(aboutPopups).toBeArrayOfSize(1) - expect(signInPoups).toBeArrayOfSize(1) + assert.equal(aboutPopups.length, 1) + assert.equal(signInPoups.length, 1) - expect(aboutPopups.at(0)?.type).toBe(PopupType.About) - expect(signInPoups.at(0)?.type).toBe(PopupType.SignIn) + assert.equal(aboutPopups.at(0)?.type, PopupType.About) + assert.equal(signInPoups.at(0)?.type, PopupType.SignIn) }) it('trims oldest popup when limit is reached', () => { - popupManager = new PopupManager(2) - const popupAbout: Popup = { type: PopupType.About } - const popupSignIn: Popup = { type: PopupType.SignIn } - const popupTermsAndConditions: Popup = { - type: PopupType.TermsAndConditions, - } - popupManager.addPopup(popupAbout) - popupManager.addPopup(popupSignIn) - popupManager.addPopup(popupTermsAndConditions) + const popupManager = new PopupManager(2) + popupManager.addPopup({ type: PopupType.About }) + popupManager.addPopup({ type: PopupType.SignIn }) + popupManager.addPopup({ type: PopupType.TermsAndConditions }) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) const signInPoups = popupManager.getPopupsOfType(PopupType.SignIn) const termsAndConditionsPoups = popupManager.getPopupsOfType( PopupType.TermsAndConditions ) - expect(aboutPopups).toBeArrayOfSize(0) - expect(signInPoups).toBeArrayOfSize(1) - expect(termsAndConditionsPoups).toBeArrayOfSize(1) + assert.equal(aboutPopups.length, 0) + assert.equal(signInPoups.length, 1) + assert.equal(termsAndConditionsPoups.length, 1) - expect(signInPoups.at(0)?.type).toBe(PopupType.SignIn) - expect(termsAndConditionsPoups.at(0)?.type).toBe( + assert.equal(signInPoups.at(0)?.type, PopupType.SignIn) + assert.equal( + termsAndConditionsPoups.at(0)?.type, PopupType.TermsAndConditions ) }) @@ -169,34 +153,36 @@ describe('PopupManager', () => { describe('addErrorPopup', () => { it('adds a popup of type error to the stack', () => { + const popupManager = new PopupManager() popupManager.addErrorPopup(new Error('an error')) const popupsOfType = popupManager.getPopupsOfType(PopupType.Error) const currentPopup = popupManager.currentPopup - expect(popupsOfType).toBeArrayOfSize(1) - expect(currentPopup).not.toBeNull() - expect(currentPopup?.type).toBe(PopupType.Error) - expect(currentPopup?.id).toBe(0) + assert.equal(popupsOfType.length, 1) + assert(currentPopup !== null) + assert.equal(currentPopup?.type, PopupType.Error) + assert(currentPopup.id?.length === 36) }) it('adds multiple popups of type error to the stack', () => { + const popupManager = new PopupManager() popupManager.addErrorPopup(new Error('an error')) popupManager.addErrorPopup(new Error('an error')) const popupsOfType = popupManager.getPopupsOfType(PopupType.Error) - expect(popupsOfType).toBeArrayOfSize(2) + assert.equal(popupsOfType.length, 2) }) it('trims oldest popup when limit is reached', () => { const limit = 2 - popupManager = new PopupManager(limit) + const popupManager = new PopupManager(limit) popupManager.addErrorPopup(new Error('an error')) popupManager.addErrorPopup(new Error('an error')) popupManager.addErrorPopup(new Error('an error')) popupManager.addErrorPopup(new Error('an error')) const errorPopups = popupManager.getPopupsOfType(PopupType.Error) - expect(errorPopups).toBeArrayOfSize(limit) + assert.equal(errorPopups.length, limit) }) }) @@ -217,6 +203,7 @@ describe('PopupManager', () => { account: mockAccount, } + const popupManager = new PopupManager() const tutorialPopup = popupManager.addPopup(popupTutorial) // Just so update spreader notation will work @@ -236,81 +223,77 @@ describe('PopupManager', () => { const result = popupManager.getPopupsOfType( PopupType.CreateTutorialRepository ) - expect(result).toBeArrayOfSize(1) + assert.equal(result.length, 1) const resultingPopup = result.at(0) // Would fail first expect if not if (resultingPopup === undefined) { return } - expect(resultingPopup.type).toBe(PopupType.CreateTutorialRepository) + assert.equal(resultingPopup.type, PopupType.CreateTutorialRepository) if (resultingPopup.type !== PopupType.CreateTutorialRepository) { return } - expect(resultingPopup.progress).toBeDefined() - expect(resultingPopup.progress?.kind).toBe('generic') - expect(resultingPopup.progress?.value).toBe(5) + assert.notEqual(resultingPopup.progress, undefined) + assert.equal(resultingPopup.progress?.kind, 'generic') + assert.equal(resultingPopup.progress?.value, 5) }) }) describe('removePopup', () => { it('deletes popup when give a popup with an id', () => { + const popupManager = new PopupManager() const popupAbout: Popup = popupManager.addPopup({ type: PopupType.About }) - popupManager.addPopup({ - type: PopupType.SignIn, - }) + popupManager.addPopup({ type: PopupType.SignIn }) popupManager.removePopup(popupAbout) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) - expect(aboutPopups).toBeArrayOfSize(0) + assert.equal(aboutPopups.length, 0) const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(signInPopups).toBeArrayOfSize(1) + assert.equal(signInPopups.length, 1) }) it('does not remove popups by type', () => { + const popupManager = new PopupManager() popupManager.addPopup({ type: PopupType.About }) - popupManager.addPopup({ - type: PopupType.SignIn, - }) + popupManager.addPopup({ type: PopupType.SignIn }) popupManager.removePopup({ type: PopupType.About }) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) - expect(aboutPopups).toBeArrayOfSize(1) + assert.equal(aboutPopups.length, 1) const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(signInPopups).toBeArrayOfSize(1) + assert.equal(signInPopups.length, 1) }) }) describe('removePopupByType', () => { it('removes the popups of a given type', () => { + const popupManager = new PopupManager() popupManager.addPopup({ type: PopupType.About }) - popupManager.addPopup({ - type: PopupType.SignIn, - }) + popupManager.addPopup({ type: PopupType.SignIn }) popupManager.removePopupByType(PopupType.About) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) - expect(aboutPopups).toBeArrayOfSize(0) + assert.equal(aboutPopups.length, 0) const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(signInPopups).toBeArrayOfSize(1) + assert.equal(signInPopups.length, 1) }) }) describe('removePopupById', () => { it('removes the popup by its id', () => { + const popupManager = new PopupManager() const popupAbout: Popup = popupManager.addPopup({ type: PopupType.About }) - popupManager.addPopup({ - type: PopupType.SignIn, - }) + popupManager.addPopup({ type: PopupType.SignIn }) - expect(popupAbout.id).toBeDefined() + assert.notEqual(popupAbout.id, undefined) if (popupAbout.id === undefined) { return } @@ -318,10 +301,10 @@ describe('PopupManager', () => { popupManager.removePopupById(popupAbout.id) const aboutPopups = popupManager.getPopupsOfType(PopupType.About) - expect(aboutPopups).toBeArrayOfSize(0) + assert.equal(aboutPopups.length, 0) const signInPopups = popupManager.getPopupsOfType(PopupType.SignIn) - expect(signInPopups).toBeArrayOfSize(1) + assert.equal(signInPopups.length, 1) }) }) }) diff --git a/app/test/unit/progress/clone-test.ts b/app/test/unit/progress/clone-test.ts index cb80b6bde40..c6eaa772f3f 100644 --- a/app/test/unit/progress/clone-test.ts +++ b/app/test/unit/progress/clone-test.ts @@ -1,3 +1,5 @@ +import { describe, it, afterEach } from 'node:test' +import assert from 'node:assert' import { CloneProgressParser } from '../../../src/lib/progress' describe('CloneProgressParser', () => { @@ -9,61 +11,61 @@ describe('CloneProgressParser', () => { }) it('understands receiving object', () => { - expect( + assert( parser.parse( 'Receiving objects: 17% (4808/28282), 3.30 MiB | 1.29 MiB/s' ) - ).not.toBeNull() + !== null) }) it('understands resolving deltas', () => { - expect( + assert( parser.parse('Resolving deltas: 89% (18063/20263)') - ).not.toBeNull() + !== null) }) it('understands checking out files', () => { - expect(parser.parse('Checking out files: 100% (579/579)')).not.toBeNull() + assert(parser.parse('Checking out files: 100% (579/579)') !== null) }) it('understands remote compression', () => { - expect( + assert( parser.parse('remote: Compressing objects: 45% (10/22)') - ).not.toBeNull() + !== null) }) it('understands relative weights', () => { const compressing = parser.parse( 'remote: Compressing objects: 45% (10/22)' ) - expect(compressing.kind).toBe('progress') - expect(compressing.percent).toEqual((10 / 22) * 0.1) + assert.equal(compressing.kind, 'progress') + assert.equal(compressing.percent, (10 / 22) * 0.1) const receiving = parser.parse( 'Receiving objects: 17% (4808/28282), 3.30 MiB | 1.29 MiB/s' ) - expect(receiving.kind).toBe('progress') - expect(receiving.percent).toEqual(0.1 + (4808 / 28282) * 0.6) + assert.equal(receiving.kind, 'progress') + assert.equal(receiving.percent, 0.1 + (4808 / 28282) * 0.6) const resolving = parser.parse('Resolving deltas: 89% (18063/20263)') - expect(resolving.kind).toBe('progress') - expect(resolving.percent).toEqual(0.7 + (18063 / 20263) * 0.1) + assert.equal(resolving.kind, 'progress') + assert.equal(resolving.percent, 0.7 + (18063 / 20263) * 0.1) const checkingOut = parser.parse('Checking out files: 100% (579/579)') - expect(checkingOut.kind).toBe('progress') - expect(checkingOut.percent).toEqual(0.8 + (579 / 579) * 0.2) + assert.equal(checkingOut.kind, 'progress') + assert.equal(checkingOut.percent, 0.8 + (579 / 579) * 0.2) }) it('ignores wrong order', () => { const finalProgress = parser.parse('Checking out files: 100% (579/579)') const earlyProgress = parser.parse('Receiving objects: 1% (283/28282)') - expect(earlyProgress.kind).toBe('context') - expect(finalProgress.kind).toBe('progress') + assert.equal(earlyProgress.kind, 'context') + assert.equal(finalProgress.kind, 'progress') }) it("ignores lines it doesn't understand", () => { - expect(parser.parse('Counting objects: 28282, done.').kind).toBe( + assert.equal(parser.parse('Counting objects: 28282, done.').kind, 'context' ) }) diff --git a/app/test/unit/progress/git-test.ts b/app/test/unit/progress/git-test.ts index e87421ae5be..06bdb8de3f3 100644 --- a/app/test/unit/progress/git-test.ts +++ b/app/test/unit/progress/git-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { GitProgressParser, IGitProgress, @@ -7,7 +9,7 @@ import { parse } from '../../../src/lib/progress/git' describe('GitProgressParser', () => { it('requires at least one step', () => { - expect(() => new GitProgressParser([])).toThrow() + assert.throws(() => new GitProgressParser([])) }) it('parses progress with one step', () => { @@ -15,9 +17,10 @@ describe('GitProgressParser', () => { { title: 'remote: Compressing objects', weight: 1 }, ]) - expect( - parser.parse('remote: Compressing objects: 72% (16/22)').percent - ).toEqual(16 / 22) + assert.equal( + parser.parse('remote: Compressing objects: 72% (16/22)').percent, + 16 / 22 + ) }) it('parses progress with several steps', () => { @@ -30,15 +33,15 @@ describe('GitProgressParser', () => { result = parser.parse('remote: Compressing objects: 72% (16/22)') - expect(result.kind).toBe('progress') - expect((result as IGitProgress).percent).toBe(16 / 22 / 2) + assert.equal(result.kind, 'progress') + assert.equal((result as IGitProgress).percent, 16 / 22 / 2) result = parser.parse( 'Receiving objects: 99% (166741/167587), 267.24 MiB | 2.40 MiB/s' ) - expect(result.kind).toBe('progress') - expect((result as IGitProgress).percent).toBe(0.5 + 166741 / 167587 / 2) + assert.equal(result.kind, 'progress') + assert.equal((result as IGitProgress).percent, 0.5 + 166741 / 167587 / 2) }) it('enforces ordering of steps', () => { @@ -51,25 +54,25 @@ describe('GitProgressParser', () => { result = parser.parse('remote: Compressing objects: 72% (16/22)') - expect(result.kind).toBe('progress') - expect((result as IGitProgress).percent).toBe(16 / 22 / 2) + assert.equal(result.kind, 'progress') + assert.equal((result as IGitProgress).percent, 16 / 22 / 2) result = parser.parse( 'Receiving objects: 99% (166741/167587), 267.24 MiB | 2.40 MiB/s' ) - expect(result.kind).toBe('progress') - expect((result as IGitProgress).percent).toBe(0.5 + 166741 / 167587 / 2) + assert.equal(result.kind, 'progress') + assert.equal((result as IGitProgress).percent, 0.5 + 166741 / 167587 / 2) result = parser.parse('remote: Compressing objects: 72% (16/22)') - expect(result.kind).toBe('context') + assert.equal(result.kind, 'context') }) it('parses progress with no total', () => { const result = parse('remote: Counting objects: 167587') - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'remote: Counting objects', text: 'remote: Counting objects: 167587', value: 167587, @@ -82,7 +85,7 @@ describe('GitProgressParser', () => { it('parses final progress with no total', () => { const result = parse('remote: Counting objects: 167587, done.') - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'remote: Counting objects', text: 'remote: Counting objects: 167587, done.', value: 167587, @@ -95,7 +98,7 @@ describe('GitProgressParser', () => { it('parses progress with total', () => { const result = parse('remote: Compressing objects: 72% (16/22)') - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'remote: Compressing objects', text: 'remote: Compressing objects: 72% (16/22)', value: 16, @@ -108,7 +111,7 @@ describe('GitProgressParser', () => { it('parses final with total', () => { const result = parse('remote: Compressing objects: 100% (22/22), done.') - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'remote: Compressing objects', text: 'remote: Compressing objects: 100% (22/22), done.', value: 22, @@ -123,7 +126,7 @@ describe('GitProgressParser', () => { 'Receiving objects: 99% (166741/167587), 267.24 MiB | 2.40 MiB/s' ) - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'Receiving objects', text: 'Receiving objects: 99% (166741/167587), 267.24 MiB | 2.40 MiB/s', value: 166741, @@ -138,7 +141,7 @@ describe('GitProgressParser', () => { 'Receiving objects: 100% (167587/167587), 279.67 MiB | 2.43 MiB/s, done.' ) - expect(result).toEqual({ + assert.deepStrictEqual(result, { title: 'Receiving objects', text: 'Receiving objects: 100% (167587/167587), 279.67 MiB | 2.43 MiB/s, done.', value: 167587, @@ -152,6 +155,6 @@ describe('GitProgressParser', () => { const result = parse( 'remote: Total 167587 (delta 19), reused 11 (delta 11), pack-reused 167554 ' ) - expect(result).toBeNull() + assert(result === null) }) }) diff --git a/app/test/unit/progress/lfs-test.ts b/app/test/unit/progress/lfs-test.ts index c5ab99ea394..980d80fa22f 100644 --- a/app/test/unit/progress/lfs-test.ts +++ b/app/test/unit/progress/lfs-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { GitLFSProgressParser } from '../../../src/lib/progress/lfs' describe('GitLFSProgressParser', () => { @@ -10,12 +12,12 @@ describe('GitLFSProgressParser', () => { it('understands valid lines', () => { const result = parser.parse('download 1/2 5/300 my cool image.jpg') - expect(result.kind).toBe('progress') + assert.equal(result.kind, 'progress') }) it("ignores lines it doesn't understand", () => { const result = parser.parse('All this happened, more or less.') - expect(result.kind).toBe('context') + assert.equal(result.kind, 'context') }) }) }) diff --git a/app/test/unit/promise-test.ts b/app/test/unit/promise-test.ts index 510f082f0b4..7fbb4dc4d6e 100644 --- a/app/test/unit/promise-test.ts +++ b/app/test/unit/promise-test.ts @@ -1,21 +1,24 @@ +import { describe, it, mock, beforeEach, afterEach } from 'node:test' +import assert from 'node:assert' import { timeout, sleep } from '../../src/lib/promise' -jest.useFakeTimers() - describe('timeout', () => { + beforeEach(() => mock.timers.enable()) + afterEach(() => mock.timers.reset()) + it('falls back to the fallback value if promise takes too long', async () => { const promise = timeout( sleep(1000).then(() => 'foo'), 500, 'bar' ) - jest.advanceTimersByTime(500) - expect(await promise).toBe('bar') + mock.timers.tick(500) + assert.equal(await promise, 'bar') }) it('returns the promise result if it finishes in time', async () => { const promise = timeout(Promise.resolve('foo'), 500, 'bar') - jest.advanceTimersByTime(500) - expect(await promise).toBe('foo') + mock.timers.tick(500) + assert.equal(await promise, 'foo') }) }) diff --git a/app/test/unit/promise-with-timeout-test.ts b/app/test/unit/promise-with-timeout-test.ts index 0d004226366..f5cabb0b092 100644 --- a/app/test/unit/promise-with-timeout-test.ts +++ b/app/test/unit/promise-with-timeout-test.ts @@ -1,10 +1,13 @@ +import { describe, it, beforeEach, afterEach, mock } from 'node:test' +import assert from 'node:assert' import { promiseWithMinimumTimeout } from '../../src/lib/promise' -jest.useFakeTimers() - describe('promiseWithMinimumTimeout', () => { + beforeEach(() => mock.timers.enable()) + afterEach(() => mock.timers.reset()) + it('handles promise finishing before timeout', async () => { - const resolveMock = jest.fn().mockImplementation(resolve => resolve(42)) + const resolveMock = mock.fn((resolve: (n: any) => void) => resolve(42)) const fastPromise = new Promise(resolve => { window.setTimeout(() => resolveMock(resolve), 100) @@ -13,15 +16,15 @@ describe('promiseWithMinimumTimeout', () => { const promise = promiseWithMinimumTimeout(() => fastPromise, 500) // promise completes - jest.advanceTimersByTime(250) - expect(resolveMock.mock.calls).toHaveLength(1) + mock.timers.tick(250) + assert.equal(resolveMock.mock.calls.length, 1) // timeout completes - jest.advanceTimersByTime(250) + mock.timers.tick(250) const result = await promise - expect(result).toBe(42) + assert.equal(result, 42) }) it('handles promise and timeout finishing together', async () => { @@ -34,15 +37,15 @@ describe('promiseWithMinimumTimeout', () => { const promise = promiseWithMinimumTimeout(() => mediumPromise, 500) // both complete - jest.advanceTimersByTime(500) + mock.timers.tick(500) const result = await promise - expect(result).toBe(42) + assert.equal(result, 42) }) it('handles promise finishing after timeout', async () => { - const resolveMock = jest.fn().mockImplementation(resolve => resolve(42)) + const resolveMock = mock.fn((resolve: (n: any) => void) => resolve(42)) const slowPromise = new Promise(resolve => { window.setTimeout(() => resolveMock(resolve), 1000) @@ -51,21 +54,21 @@ describe('promiseWithMinimumTimeout', () => { const promise = promiseWithMinimumTimeout(() => slowPromise, 500) // timeout completes - jest.advanceTimersByTime(500) - expect(resolveMock.mock.calls).toHaveLength(0) + mock.timers.tick(500) + assert.equal(resolveMock.mock.calls.length, 0) // promise completes - jest.advanceTimersByTime(500) - expect(resolveMock.mock.calls).toHaveLength(1) + mock.timers.tick(500) + assert.equal(resolveMock.mock.calls.length, 1) const result = await promise - expect(result).toBe(42) + assert.equal(result, 42) }) it('handles actions returning null', async () => { const promise = promiseWithMinimumTimeout(() => Promise.resolve(null), 500) - jest.advanceTimersByTime(500) - expect(await promise).toBe(null) + mock.timers.tick(500) + assert.equal(await promise, null) }) }) diff --git a/app/test/unit/release-notes-test.ts b/app/test/unit/release-notes-test.ts index 51018f1a0cc..8cbe04ecf8d 100644 --- a/app/test/unit/release-notes-test.ts +++ b/app/test/unit/release-notes-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseReleaseEntries, getReleaseSummary, @@ -10,27 +12,27 @@ describe('release-notes', () => { const result = parseReleaseEntries(values) - expect(result).toHaveLength(1) - expect(result[0].kind).toBe('fixed') - expect(result[0].message).toBe('something else') + assert.equal((result).length, 1) + assert.equal(result[0].kind, 'fixed') + assert.equal(result[0].message, 'something else') }) it('formats uppercased fixed message', () => { const values = ['[Fixed] and another thing'] const result = parseReleaseEntries(values) - expect(result).toHaveLength(1) - expect(result[0].kind).toBe('fixed') - expect(result[0].message).toBe('and another thing') + assert.equal((result).length, 1) + assert.equal(result[0].kind, 'fixed') + assert.equal(result[0].message, 'and another thing') }) it('uses [Other] for unrecognized category', () => { const values = ['[Foo] we did a thing!'] const result = parseReleaseEntries(values) - expect(result).toHaveLength(1) - expect(result[0].kind).toBe('other') - expect(result[0].message).toBe('we did a thing!') + assert.equal((result).length, 1) + assert.equal(result[0].kind, 'other') + assert.equal(result[0].message, 'we did a thing!') }) }) @@ -65,13 +67,13 @@ describe('release-notes', () => { } const result = getReleaseSummary(oneOhEleveRelease) - expect(result.latestVersion).toBe('1.0.11') + assert.equal(result.latestVersion, '1.0.11') // the generated date here is local time, so it might either be the 5th or 6th // let's just test it's showing the right month and year instead - expect(result.datePublished).toContain('December') - expect(result.datePublished).toContain('2017') - expect(result.bugfixes).toHaveLength(8) - expect(result.enhancements).toHaveLength(12) + assert(result.datePublished.includes('December')) + assert(result.datePublished.includes('2017')) + assert.equal((result.bugfixes).length, 8) + assert.equal((result.enhancements).length, 12) }) it('can render 1.0.10 layout', () => { @@ -110,13 +112,13 @@ describe('release-notes', () => { } const result = getReleaseSummary(oneOhTenRelease) - expect(result.latestVersion).toBe('1.0.10') + assert.equal(result.latestVersion, '1.0.10') // the generated date here is local time, so it might either be the 5th or 6th // let's just test it's showing the right month and year instead - expect(result.datePublished).toContain('December') - expect(result.datePublished).toContain('2017') - expect(result.bugfixes).toHaveLength(10) - expect(result.enhancements).toHaveLength(16) + assert(result.datePublished.includes('December')) + assert(result.datePublished.includes('2017')) + assert.equal((result.bugfixes).length, 10) + assert.equal((result.enhancements).length, 16) }) it('can render 1.0.9 layout', () => { @@ -137,13 +139,13 @@ describe('release-notes', () => { } const result = getReleaseSummary(oneOhNineRelease) - expect(result.latestVersion).toBe('1.0.9') + assert.equal(result.latestVersion, '1.0.9') // the generated date here is local time, so it might either be the 5th or 6th // let's just test it's showing the right month and year instead - expect(result.datePublished).toContain('November') - expect(result.datePublished).toContain('2017') - expect(result.bugfixes).toHaveLength(4) - expect(result.enhancements).toHaveLength(4) + assert(result.datePublished.includes('November')) + assert(result.datePublished.includes('2017')) + assert.equal((result.bugfixes).length, 4) + assert.equal((result.enhancements).length, 4) }) }) }) diff --git a/app/test/unit/remote-parsing-test.ts b/app/test/unit/remote-parsing-test.ts index 5dc34428a55..c6b89b99671 100644 --- a/app/test/unit/remote-parsing-test.ts +++ b/app/test/unit/remote-parsing-test.ts @@ -1,169 +1,171 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseRemote } from '../../src/lib/remote-parsing' describe('URL remote parsing', () => { it('parses HTTPS URLs with a trailing git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses HTTPS URLs with a trailing -git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo-git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo-git') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo-git') }) it('parses HTTPS URLs with a trailing -git and .git suffixes', () => { const remote = parseRemote('https://github.com/hubot/repo-git.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo-git') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo-git') }) it('parses HTTPS URLs without a trailing git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses HTTPS URLs with a trailing slash', () => { const remote = parseRemote('https://github.com/hubot/repo/') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses HTTPS URLs which include a username', () => { const remote = parseRemote('https://monalisa@github.com/hubot/repo.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs', () => { const remote = parseRemote('git@github.com:hubot/repo.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs with custom username', () => { const remote = parseRemote('niik@niik.ghe.com:hubot/repo.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('niik.ghe.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'niik.ghe.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs without the git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs without the git suffix but with -git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo-git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo-git') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo-git') }) it('parses SSH URLs with the .git suffix and -git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo-git.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo-git') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo-git') }) it('parses SSH URLs with a trailing slash', () => { const remote = parseRemote('git@github.com:hubot/repo/') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses git URLs', () => { const remote = parseRemote('git:github.com/hubot/repo.git') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses git URLs without the git suffix', () => { const remote = parseRemote('git:github.com/hubot/repo') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses git URLs with a trailing slash', () => { const remote = parseRemote('git:github.com/hubot/repo/') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs with the ssh prefix', () => { const remote = parseRemote('ssh://git@github.com/hubot/repo') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('parses SSH URLs with the ssh prefix and trailing slash', () => { const remote = parseRemote('ssh://git@github.com/hubot/repo/') - expect(remote).not.toBeNull() - expect(remote!.hostname).toBe('github.com') - expect(remote!.owner).toBe('hubot') - expect(remote!.name).toBe('repo') + assert(remote !== null) + assert.equal(remote!.hostname, 'github.com') + assert.equal(remote!.owner, 'hubot') + assert.equal(remote!.name, 'repo') }) it('does not parse invalid HTTP URLs when missing repo name', () => { const remote = parseRemote('https://github.com/someuser//') - expect(remote).toBeNull() + assert(remote === null) }) it('does not parse invalid SSH URLs when missing repo name ', () => { const remote = parseRemote('git@github.com:hubot/') - expect(remote).toBeNull() + assert(remote === null) }) it('does not parse invalid git URLs when missing repo name', () => { const remote = parseRemote('git:github.com/hubot/') - expect(remote).toBeNull() + assert(remote === null) }) it('does not parse invalid HTTP URLs when missing repo owner', () => { const remote = parseRemote('https://github.com//somerepo') - expect(remote).toBeNull() + assert(remote === null) }) it('does not parse invalid SSH URLs when missing repo owner', () => { const remote = parseRemote('git@github.com:/somerepo') - expect(remote).toBeNull() + assert(remote === null) }) it('does not parse invalid git URLs when missing repo owner', () => { const remote = parseRemote('git:github.com/hubot/') - expect(remote).toBeNull() + assert(remote === null) }) }) diff --git a/app/test/unit/remove-remote-prefix-test.ts b/app/test/unit/remove-remote-prefix-test.ts index e057db431c7..a3d9b4c0e89 100644 --- a/app/test/unit/remove-remote-prefix-test.ts +++ b/app/test/unit/remove-remote-prefix-test.ts @@ -1,18 +1,20 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { removeRemotePrefix } from '../../src/lib/remove-remote-prefix' describe('removeRemotePrefix', () => { it('removes the remote prefix', () => { const name = removeRemotePrefix('origin/test') - expect(name).toBe('test') + assert.equal(name, 'test') }) it(`removes only the remote prefix and not any subsequent /'s`, () => { const name = removeRemotePrefix('origin/test/name') - expect(name).toBe('test/name') + assert.equal(name, 'test/name') }) it('returns null if there is no remote prefix', () => { const name = removeRemotePrefix('name') - expect(name).toBeNull() + assert(name === null) }) }) diff --git a/app/test/unit/repo-rules-test.ts b/app/test/unit/repo-rules-test.ts index 6a9f6a84855..24feb69e17c 100644 --- a/app/test/unit/repo-rules-test.ts +++ b/app/test/unit/repo-rules-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { APIRepoRuleMetadataOperator, APIRepoRuleType, @@ -137,9 +139,9 @@ function validateMetadataRules( bypassesExpected: number, failuresExpected: number ): void { - expect(rules.status).toBe(status) - expect(rules.bypassed.length).toBe(bypassesExpected) - expect(rules.failed.length).toBe(failuresExpected) + assert.equal(rules.status, status) + assert.equal(rules.bypassed.length, bypassesExpected) + assert.equal(rules.failed.length, failuresExpected) } const repo = new Repository('repo1', 1, null, false) @@ -149,30 +151,30 @@ describe('await parseRepoRules', () => { // the creation rule references ruleset ID 1, which has a bypass of 'never' const rules = [creationRule] const result = await parseRepoRules(rules, rulesets, repo) - expect(result.creationRestricted).toBe(true) + assert.equal(result.creationRestricted, true) }) it('can bypass when bypass is "always"', async () => { // the creationBypass rule references ruleset ID 2, which has a bypass of 'always' const rules = [creationBypassAlwaysRule] const result = await parseRepoRules(rules, rulesets, repo) - expect(result.creationRestricted).toBe('bypass') + assert.equal(result.creationRestricted, 'bypass') }) it('cannot bypass when at least one bypass mode is "never" or "pull_requests_only"', async () => { const rules = [creationRule, creationBypassAlwaysRule] const result = await parseRepoRules(rules, rulesets, repo) - expect(result.creationRestricted).toBe(true) + assert.equal(result.creationRestricted, true) const rules2 = [creationRule, creationBypassPullRequestsOnlyRule] const result2 = await parseRepoRules(rules2, rulesets, repo) - expect(result2.creationRestricted).toBe(true) + assert.equal(result2.creationRestricted, true) }) it('is not enforced when no rules are provided', async () => { const rules: IAPIRepoRule[] = [] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - expect(repoRulesInfo.creationRestricted).toBe(false) + assert.equal(repoRulesInfo.creationRestricted, false) }) }) @@ -181,7 +183,7 @@ describe('repo metadata rules', () => { it('shows no rules and passes everything when no rules are provided', async () => { const rules: IAPIRepoRule[] = [] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - expect(repoRulesInfo.commitMessagePatterns.hasRules).toBe(false) + assert.equal(repoRulesInfo.commitMessagePatterns.hasRules, false) const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('abc') @@ -191,12 +193,12 @@ describe('repo metadata rules', () => { it('has correct matching logic for StartsWith rule', async () => { const rules = [commitMessagePatternStartsWithRule] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - expect(repoRulesInfo.commitMessagePatterns.hasRules).toBe(true) + assert.equal(repoRulesInfo.commitMessagePatterns.hasRules, true) const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('def') validateMetadataRules(failedRules, 'fail', 0, 1) - expect(failedRules.failed[0].description).toBe('must start with "abc"') + assert.equal(failedRules.failed[0].description, 'must start with "abc"') }) it('has correct bypass logic for StartsWith rule', async () => { @@ -206,7 +208,7 @@ describe('repo metadata rules', () => { const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('def') validateMetadataRules(failedRules, 'bypass', 1, 0) - expect(failedRules.bypassed[0].description).toBe('must start with "abc"') + assert.equal(failedRules.bypassed[0].description, 'must start with "abc"') }) it('has correct logic when bypassed rule is included with non-bypassed rule', async () => { @@ -219,8 +221,8 @@ describe('repo metadata rules', () => { const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('def') validateMetadataRules(failedRules, 'fail', 1, 1) - expect(failedRules.bypassed[0].description).toBe('must start with "abc"') - expect(failedRules.failed[0].description).toBe('must start with "abc"') + assert.equal(failedRules.bypassed[0].description, 'must start with "abc"') + assert.equal(failedRules.failed[0].description, 'must start with "abc"') }) it('escapes special characters and otherwise handles regex properly', async () => { @@ -230,14 +232,14 @@ describe('repo metadata rules', () => { // if the . in the pattern is interpreted as a regex special character, this will pass const rules1 = repoRulesInfo.commitMessagePatterns.getFailedRules('aabbcc') - expect(rules1.status).toBe('fail') + assert.equal(rules1.status, 'fail') const rules2 = repoRulesInfo.commitMessagePatterns.getFailedRules('dd') - expect(rules2.status).toBe('fail') + assert.equal(rules2.status, 'fail') const passedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('(a.b.c.)|(d+)\\d') - expect(passedRules.status).toBe('pass') + assert.equal(passedRules.status, 'pass') }) }) @@ -249,7 +251,7 @@ describe('repo metadata rules', () => { const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('end') validateMetadataRules(failedRules, 'fail', 0, 1) - expect(failedRules.failed[0].description).toBe('must not end with "end"') + assert.equal(failedRules.failed[0].description, 'must not end with "end"') const passedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('abc') @@ -265,7 +267,7 @@ describe('repo metadata rules', () => { const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('fooconbar') validateMetadataRules(failedRules, 'fail', 0, 1) - expect(failedRules.failed[0].description).toBe('must not contain "con"') + assert.equal(failedRules.failed[0].description, 'must not contain "con"') const passedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('foobar') @@ -288,24 +290,24 @@ describe('repo metadata rules', () => { const results2 = repoRulesInfo.commitMessagePatterns.getFailedRules('afbgch') validateMetadataRules(results2, 'fail', 0, 1) - expect(results2.failed[0].description).toBe( + assert.equal(results2.failed[0].description, 'must match the regular expression "^\\A(d|e)oo\\d$"' ) const results3 = repoRulesInfo.commitMessagePatterns.getFailedRules('eoo4') validateMetadataRules(results3, 'fail', 0, 1) - expect(results3.failed[0].description).toBe( + assert.equal(results3.failed[0].description, 'must match the regular expression "(a.b.c.)|(d+)"' ) const results4 = repoRulesInfo.commitMessagePatterns.getFailedRules('fgsa') validateMetadataRules(results4, 'fail', 0, 2) - expect(results4.failed[0].description).toBe( + assert.equal(results4.failed[0].description, 'must match the regular expression "(a.b.c.)|(d+)"' ) - expect(results4.failed[1].description).toBe( + assert.equal(results4.failed[1].description, 'must match the regular expression "^\\A(d|e)oo\\d$"' ) }) @@ -321,7 +323,7 @@ describe('repo metadata rules', () => { const results2 = repoRulesInfo.commitMessagePatterns.getFailedRules('asdf\nbar') validateMetadataRules(results2, 'fail', 0, 1) - expect(results2.failed[0].description).toBe( + assert.equal(results2.failed[0].description, 'must match the regular expression "(?m)^foo"' ) }) diff --git a/app/test/unit/repositories-clone-grouping-test.ts b/app/test/unit/repositories-clone-grouping-test.ts index a559d696d63..27aa58783dc 100644 --- a/app/test/unit/repositories-clone-grouping-test.ts +++ b/app/test/unit/repositories-clone-grouping-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { groupRepositories, YourRepositoriesIdentifier, @@ -94,25 +96,25 @@ describe('clone repository grouping', () => { ] const grouped = groupRepositories(repositories, 'shiftkey') - expect(grouped).toHaveLength(3) + assert.equal((grouped).length, 3) - expect(grouped[0].identifier).toBe(YourRepositoriesIdentifier) - expect(grouped[0].items).toHaveLength(1) + assert.equal(grouped[0].identifier, YourRepositoriesIdentifier) + assert.equal((grouped[0].items).length, 1) let item = grouped[0].items[0] - expect(item.name).toBe('some-repo') + assert.equal(item.name, 'some-repo') - expect(grouped[1].identifier).toBe('desktop') - expect(grouped[1].items).toHaveLength(1) + assert.equal(grouped[1].identifier, 'desktop') + assert.equal((grouped[1].items).length, 1) item = grouped[1].items[0] - expect(item.name).toBe('desktop') + assert.equal(item.name, 'desktop') item = grouped[2].items[0] - expect(grouped[2].identifier).toBe('octokit') - expect(grouped[2].items).toHaveLength(1) + assert.equal(grouped[2].identifier, 'octokit') + assert.equal((grouped[2].items).length, 1) item = grouped[2].items[0] - expect(item.name).toBe('octokit.net') + assert.equal(item.name, 'octokit.net') }) }) diff --git a/app/test/unit/repositories-database-test.ts b/app/test/unit/repositories-database-test.ts index 138f4809a74..351e84e8631 100644 --- a/app/test/unit/repositories-database-test.ts +++ b/app/test/unit/repositories-database-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { RepositoriesDatabase, IDatabaseGitHubRepository, @@ -31,10 +33,10 @@ describe('RepositoriesDatabase', () => { await db.open() const original = await db.gitHubRepositories.get(originalId) - expect(original).not.toBeUndefined() + assert(original !== undefined) const dupe = await db.gitHubRepositories.get(duplicateId) - expect(dupe).toBeUndefined() + assert(dupe === undefined) await db.delete() }) @@ -86,29 +88,29 @@ describe('RepositoriesDatabase', () => { const repoAId = await db.gitHubRepositories.add(originalRepoA) const repoBId = await db.gitHubRepositories.add(originalRepoB) - expect(await db.gitHubRepositories.count()).toEqual(2) - expect(await db.owners.count()).toEqual(2) + assert.equal(await db.gitHubRepositories.count(), 2) + assert.equal(await db.owners.count(), 2) db.close() db = new RepositoriesDatabase(dbName, 9) await db.open() - expect(await db.gitHubRepositories.count()).toEqual(2) - expect(await db.owners.count()).toEqual(1) + assert.equal(await db.gitHubRepositories.count(), 2) + assert.equal(await db.owners.count(), 1) const migratedRepoA = await db.gitHubRepositories.get(repoAId) - expect(migratedRepoA).toEqual(originalRepoA) + assert.deepStrictEqual(migratedRepoA, originalRepoA) const migratedRepoB = await db.gitHubRepositories.get(repoBId) - expect(migratedRepoB).not.toEqual(originalRepoB) + assert.notDeepStrictEqual(migratedRepoB, originalRepoB) const migratedOwner = await db.owners.toCollection().first() - expect(migratedOwner).not.toBeUndefined() - expect(migratedRepoA?.ownerID).toEqual(migratedOwner?.id) - expect(migratedOwner?.endpoint).toEqual(endpoint) - expect(migratedOwner?.key).toEqual(getOwnerKey(endpoint, 'DeskTop')) + assert(migratedOwner !== undefined) + assert.deepStrictEqual(migratedRepoA?.ownerID, migratedOwner?.id) + assert.deepStrictEqual(migratedOwner?.endpoint, endpoint) + assert.deepStrictEqual(migratedOwner?.key, getOwnerKey(endpoint, 'DeskTop')) await db.delete() }) diff --git a/app/test/unit/repositories-list-grouping-test.ts b/app/test/unit/repositories-list-grouping-test.ts index 6d37b09cb2e..61e52a76b31 100644 --- a/app/test/unit/repositories-list-grouping-test.ts +++ b/app/test/unit/repositories-list-grouping-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { groupRepositories } from '../../src/ui/repositories-list/group-repositories' import { Repository, ILocalRepositoryState } from '../../src/models/repository' import { CloningRepository } from '../../src/models/cloning-repository' @@ -28,26 +30,26 @@ describe('repository list grouping', () => { it('groups repositories by owners/Enterprise/Other', () => { const grouped = groupRepositories(repositories, cache, []) - expect(grouped).toHaveLength(3) + assert.equal((grouped).length, 3) - expect(grouped[0].identifier.kind).toBe('dotcom') - expect((grouped[0].identifier as any).owner.login).toBe('me') - expect(grouped[0].items).toHaveLength(1) + assert.equal(grouped[0].identifier.kind, 'dotcom') + assert.equal((grouped[0].identifier as any).owner.login, 'me') + assert.equal((grouped[0].items).length, 1) let item = grouped[0].items[0] - expect(item.repository.path).toBe('repo2') + assert.equal(item.repository.path, 'repo2') - expect(grouped[1].identifier.kind).toBe('enterprise') - expect(grouped[1].items).toHaveLength(1) + assert.equal(grouped[1].identifier.kind, 'enterprise') + assert.equal((grouped[1].items).length, 1) item = grouped[1].items[0] - expect(item.repository.path).toBe('repo3') + assert.equal(item.repository.path, 'repo3') - expect(grouped[2].identifier.kind).toBe('other') - expect(grouped[2].items).toHaveLength(1) + assert.equal(grouped[2].identifier.kind, 'other') + assert.equal((grouped[2].items).length, 1) item = grouped[2].items[0] - expect(item.repository.path).toBe('repo1') + assert.equal(item.repository.path, 'repo1') }) it('sorts repositories alphabetically within each group', () => { @@ -72,23 +74,23 @@ describe('repository list grouping', () => { cache, [] ) - expect(grouped).toHaveLength(2) + assert.equal((grouped).length, 2) - expect(grouped[0].identifier.kind).toBe('dotcom') - expect((grouped[0].identifier as any).owner.login).toBe('me') - expect(grouped[0].items).toHaveLength(2) + assert.equal(grouped[0].identifier.kind, 'dotcom') + assert.equal((grouped[0].identifier as any).owner.login, 'me') + assert.equal((grouped[0].items).length, 2) let items = grouped[0].items - expect(items[0].repository.path).toBe('b') - expect(items[1].repository.path).toBe('d') + assert.equal(items[0].repository.path, 'b') + assert.equal(items[1].repository.path, 'd') - expect(grouped[1].identifier.kind).toBe('other') - expect(grouped[1].items).toHaveLength(3) + assert.equal(grouped[1].identifier.kind, 'other') + assert.equal((grouped[1].items).length, 3) items = grouped[1].items - expect(items[0].repository.path).toBe('a') - expect(items[1].repository.path).toBe('c') - expect(items[2].repository.path).toBe('z') + assert.equal(items[0].repository.path, 'a') + assert.equal(items[1].repository.path, 'c') + assert.equal(items[2].repository.path, 'z') }) it('only disambiguates Enterprise repositories', () => { @@ -126,29 +128,29 @@ describe('repository list grouping', () => { ) const grouped = groupRepositories([repoA, repoB, repoC, repoD], cache, []) - expect(grouped).toHaveLength(3) + assert.equal((grouped).length, 3) - expect(grouped[0].identifier.kind).toBe('dotcom') - expect((grouped[0].identifier as any).owner.login).toBe('user1') - expect(grouped[0].items).toHaveLength(1) + assert.equal(grouped[0].identifier.kind, 'dotcom') + assert.equal((grouped[0].identifier as any).owner.login, 'user1') + assert.equal((grouped[0].items).length, 1) - expect(grouped[1].identifier.kind).toBe('dotcom') - expect((grouped[1].identifier as any).owner.login).toBe('user2') - expect(grouped[1].items).toHaveLength(1) + assert.equal(grouped[1].identifier.kind, 'dotcom') + assert.equal((grouped[1].identifier as any).owner.login, 'user2') + assert.equal((grouped[1].items).length, 1) - expect(grouped[2].identifier.kind).toBe('enterprise') - expect(grouped[2].items).toHaveLength(2) + assert.equal(grouped[2].identifier.kind, 'enterprise') + assert.equal((grouped[2].items).length, 2) - expect(grouped[0].items[0].text[0]).toBe('repo') - expect(grouped[0].items[0].needsDisambiguation).toBe(false) + assert.equal(grouped[0].items[0].text[0], 'repo') + assert.equal(grouped[0].items[0].needsDisambiguation, false) - expect(grouped[1].items[0].text[0]).toBe('repo') - expect(grouped[1].items[0].needsDisambiguation).toBe(false) + assert.equal(grouped[1].items[0].text[0], 'repo') + assert.equal(grouped[1].items[0].needsDisambiguation, false) - expect(grouped[2].items[0].text[0]).toBe('enterprise-repo') - expect(grouped[2].items[0].needsDisambiguation).toBe(true) + assert.equal(grouped[2].items[0].text[0], 'enterprise-repo') + assert.equal(grouped[2].items[0].needsDisambiguation, true) - expect(grouped[2].items[1].text[0]).toBe('enterprise-repo') - expect(grouped[2].items[1].needsDisambiguation).toBe(true) + assert.equal(grouped[2].items[1].text[0], 'enterprise-repo') + assert.equal(grouped[2].items[1].needsDisambiguation, true) }) }) diff --git a/app/test/unit/repositories-store-test.ts b/app/test/unit/repositories-store-test.ts index ab56d51a396..4b1688f6490 100644 --- a/app/test/unit/repositories-store-test.ts +++ b/app/test/unit/repositories-store-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { RepositoriesStore } from '../../src/lib/stores/repositories-store' import { TestRepositoriesDatabase } from '../helpers/databases' import { IAPIFullRepository, getDotComAPIEndpoint } from '../../src/lib/api' @@ -19,7 +21,7 @@ describe('RepositoriesStore', () => { await repositoriesStore.addRepository(repoPath) const repositories = await repositoriesStore.getAll() - expect(repositories[0].path).toBe(repoPath) + assert.equal(repositories[0].path, repoPath) }) }) @@ -29,7 +31,7 @@ describe('RepositoriesStore', () => { await repositoriesStore.addRepository('/some/other/path') const repositories = await repositoriesStore.getAll() - expect(repositories).toHaveLength(2) + assert.equal((repositories).length, 2) }) }) @@ -70,9 +72,9 @@ describe('RepositoriesStore', () => { const repositories = await repositoriesStore.getAll() const repo = repositories[0] assertIsRepositoryWithGitHubRepository(repo) - expect(repo.gitHubRepository.isPrivate).toBe(true) - expect(repo.gitHubRepository.fork).toBe(false) - expect(repo.gitHubRepository.htmlURL).toBe( + assert.equal(repo.gitHubRepository.isPrivate, true) + assert.equal(repo.gitHubRepository.fork, false) + assert.equal(repo.gitHubRepository.htmlURL, 'https://github.com/my-user/my-repo' ) }) @@ -88,7 +90,7 @@ describe('RepositoriesStore', () => { await repositoriesStore.upsertGitHubRepository(endpoint, apiRepo) ) - expect(firstRepo.gitHubRepository.dbID).toBe( + assert.equal(firstRepo.gitHubRepository.dbID, secondRepo.gitHubRepository.dbID ) }) diff --git a/app/test/unit/repository-matching-test.ts b/app/test/unit/repository-matching-test.ts index 2c6f5f500db..ff6f724d67c 100644 --- a/app/test/unit/repository-matching-test.ts +++ b/app/test/unit/repository-matching-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { matchGitHubRepository, urlMatchesRemote, @@ -26,8 +28,8 @@ describe('repository-matching', () => { accounts, 'https://github.com/someuser/somerepo.git' )! - expect(repo.name).toEqual('somerepo') - expect(repo.owner).toEqual('someuser') + assert.equal(repo.name, 'somerepo') + assert.equal(repo.owner, 'someuser') }) it('matches HTTPS URLs without the git extension', () => { @@ -47,8 +49,8 @@ describe('repository-matching', () => { accounts, 'https://github.com/someuser/somerepo' )! - expect(repo.name).toBe('somerepo') - expect(repo.owner).toBe('someuser') + assert.equal(repo.name, 'somerepo') + assert.equal(repo.owner, 'someuser') }) it('matches git URLs', () => { @@ -68,8 +70,8 @@ describe('repository-matching', () => { accounts, 'git:github.com/someuser/somerepo.git' )! - expect(repo.name).toBe('somerepo') - expect(repo.owner).toBe('someuser') + assert.equal(repo.name, 'somerepo') + assert.equal(repo.owner, 'someuser') }) it('matches SSH URLs', () => { @@ -89,8 +91,8 @@ describe('repository-matching', () => { accounts, 'git@github.com:someuser/somerepo.git' )! - expect(repo.name).toBe('somerepo') - expect(repo.owner).toBe('someuser') + assert.equal(repo.name, 'somerepo') + assert.equal(repo.owner, 'someuser') }) it(`doesn't match if there aren't any users with that endpoint`, () => { @@ -110,7 +112,7 @@ describe('repository-matching', () => { accounts, 'https://github.com/someuser/somerepo.git' ) - expect(repo).toBeNull() + assert(repo === null) }) }) @@ -126,37 +128,37 @@ describe('repository-matching', () => { } it('does not match null', () => { - expect(urlMatchesRemote(null, remoteWithSuffix)).toBe(false) + assert.equal(urlMatchesRemote(null, remoteWithSuffix), false) }) it('matches cloneURL from API', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - expect(urlMatchesRemote(cloneURL, remoteWithSuffix)).toBe(true) + assert.equal(urlMatchesRemote(cloneURL, remoteWithSuffix), true) }) it('matches cloneURL from API with different casing', () => { const cloneURL = 'https://GITHUB.COM/SHIFTKEY/DESKTOP.git' - expect(urlMatchesRemote(cloneURL, remoteWithSuffix)).toBe(true) + assert.equal(urlMatchesRemote(cloneURL, remoteWithSuffix), true) }) it('matches cloneURL from API without suffix', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - expect(urlMatchesRemote(cloneURL, remote)).toBe(true) + assert.equal(urlMatchesRemote(cloneURL, remote), true) }) it('matches htmlURL from API', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - expect(urlMatchesRemote(htmlURL, remoteWithSuffix)).toBe(true) + assert.equal(urlMatchesRemote(htmlURL, remoteWithSuffix), true) }) it('matches htmlURL from API with different casing', () => { const htmlURL = 'https://GITHUB.COM/SHIFTKEY/DESKTOP' - expect(urlMatchesRemote(htmlURL, remoteWithSuffix)).toBe(true) + assert.equal(urlMatchesRemote(htmlURL, remoteWithSuffix), true) }) it('matches htmlURL from API without suffix', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - expect(urlMatchesRemote(htmlURL, remote)).toBe(true) + assert.equal(urlMatchesRemote(htmlURL, remote), true) }) }) @@ -166,17 +168,17 @@ describe('repository-matching', () => { url: 'git@github.com:shiftkey/desktop.git', } it('does not match null', () => { - expect(urlMatchesRemote(null, remote)).toBe(false) + assert.equal(urlMatchesRemote(null, remote), false) }) it('matches cloneURL from API', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - expect(urlMatchesRemote(cloneURL, remote)).toBe(true) + assert.equal(urlMatchesRemote(cloneURL, remote), true) }) it('matches htmlURL from API', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - expect(urlMatchesRemote(htmlURL, remote)).toBe(true) + assert.equal(urlMatchesRemote(htmlURL, remote), true) }) }) }) @@ -210,36 +212,36 @@ describe('repository-matching', () => { } it('returns true for exact match', () => { - expect( + assert.equal( urlMatchesCloneURL( 'https://github.com/shiftkey/desktop.git', repository ) - ).toBe(true) + , true) }) it(`returns true when URL doesn't have a .git suffix`, () => { - expect( + assert.equal( urlMatchesCloneURL('https://github.com/shiftkey/desktop', repository) - ).toBe(true) + , true) }) it(`returns false when URL belongs to a different owner`, () => { - expect( + assert.equal( urlMatchesCloneURL( 'https://github.com/outofambit/desktop.git', repository ) - ).toBe(false) + , false) }) it(`returns false if GitHub repository does't have a cloneURL set`, () => { - expect( + assert.equal( urlMatchesCloneURL( 'https://github.com/shiftkey/desktop', repositoryWithoutCloneURL ) - ).toBe(false) + , false) }) }) }) diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index e46bea7c982..f95d3d11c44 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cache' import { Repository } from '../../src/models/repository' import { PullRequest } from '../../src/models/pull-request' @@ -52,8 +54,8 @@ describe('RepositoryStateCache', () => { }) const { branchesState } = cache.get(repository) - expect(branchesState.isLoadingPullRequests).toBe(true) - expect(branchesState.openPullRequests).toHaveLength(1) + assert.equal(branchesState.isLoadingPullRequests, true) + assert.equal((branchesState.openPullRequests).length, 1) }) it('can update changes state for a repository', () => { @@ -82,10 +84,10 @@ describe('RepositoryStateCache', () => { }) const { changesState } = cache.get(repository) - expect(changesState.workingDirectory.includeAll).toBe(true) - expect(changesState.workingDirectory.files).toHaveLength(1) - expect(changesState.showCoAuthoredBy).toBe(true) - expect(changesState.commitMessage!.summary).toBe(summary) + assert.equal(changesState.workingDirectory.includeAll, true) + assert.equal((changesState.workingDirectory.files).length, 1) + assert.equal(changesState.showCoAuthoredBy, true) + assert.equal(changesState.commitMessage!.summary, summary) }) it('can update compare state for a repository', () => { @@ -107,8 +109,8 @@ describe('RepositoryStateCache', () => { }) const { compareState } = cache.get(repository) - expect(compareState.formState.kind).toBe(HistoryTabMode.History) - expect(compareState.filterText).toBe(filterText) - expect(compareState.commitSHAs).toHaveLength(1) + assert.equal(compareState.formState.kind, HistoryTabMode.History) + assert.equal(compareState.filterText, filterText) + assert.equal((compareState.commitSHAs).length, 1) }) }) diff --git a/app/test/unit/repository-test.ts b/app/test/unit/repository-test.ts index 8e98502b765..dca9c7be4f4 100644 --- a/app/test/unit/repository-test.ts +++ b/app/test/unit/repository-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Repository } from '../../src/models/repository' describe('Repository', () => { @@ -5,13 +7,13 @@ describe('Repository', () => { it('uses the last path component as the name', async () => { const repoPath = '/some/cool/path' const repository = new Repository(repoPath, -1, null, false) - expect(repository.name).toBe('path') + assert.equal(repository.name, 'path') }) it('handles repository at root of the drive', async () => { const repoPath = 'T:\\' const repository = new Repository(repoPath, -1, null, false) - expect(repository.name).toBe('T:\\') + assert.equal(repository.name, 'T:\\') }) }) }) diff --git a/app/test/unit/round-test.ts b/app/test/unit/round-test.ts index 3f380eb6721..ad8e51227f8 100644 --- a/app/test/unit/round-test.ts +++ b/app/test/unit/round-test.ts @@ -1,28 +1,30 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { round } from '../../src/ui/lib/round' describe('round', () => { it('rounds to the desired number decimals', () => { - expect(round(1.23456789, 0)).toBe(1) - expect(round(1.23456789, 1)).toBe(1.2) - expect(round(1.23456789, 2)).toBe(1.23) - expect(round(1.23456789, 3)).toBe(1.235) - expect(round(1.23456789, 4)).toBe(1.2346) - expect(round(1.23456789, 5)).toBe(1.23457) - expect(round(1.23456789, 6)).toBe(1.234568) + assert.equal(round(1.23456789, 0), 1) + assert.equal(round(1.23456789, 1), 1.2) + assert.equal(round(1.23456789, 2), 1.23) + assert.equal(round(1.23456789, 3), 1.235) + assert.equal(round(1.23456789, 4), 1.2346) + assert.equal(round(1.23456789, 5), 1.23457) + assert.equal(round(1.23456789, 6), 1.234568) }) it("doesn't attempt to round NaN", () => { - expect(round(NaN, 1)).toBeNaN() + assert.ok(Number.isNaN(round(NaN, 1))) }) it("doesn't attempt to round infinity", () => { - expect(round(Infinity, 1)).not.toBeFinite() - expect(round(-Infinity, 1)).not.toBeFinite() + assert.equal(Number.isFinite(round(Infinity, 1)), false) + assert.equal(Number.isFinite(round(-Infinity, 1)), false) }) it("doesn't attempt to round to less than zero decimals", () => { - expect(round(1.23456789, 0)).toBe(1) - expect(round(1.23456789, -1)).toBe(1) - expect(round(1.23456789, -2)).toBe(1) + assert.equal(round(1.23456789, 0), 1) + assert.equal(round(1.23456789, -1), 1) + assert.equal(round(1.23456789, -2), 1) }) }) diff --git a/app/test/unit/sanitize-ref-name-test.ts b/app/test/unit/sanitize-ref-name-test.ts index ebeb86bed2f..767f2ed0593 100644 --- a/app/test/unit/sanitize-ref-name-test.ts +++ b/app/test/unit/sanitize-ref-name-test.ts @@ -1,57 +1,59 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { sanitizedRefName } from '../../src/lib/sanitize-ref-name' describe('sanitizedBranchName', () => { it('leaves a good branch name alone', () => { const branchName = 'this-is/fine' const result = sanitizedRefName(branchName) - expect(result).toBe('this-is/fine') + assert.equal(result, 'this-is/fine') }) it('replaces invalid characters with dashes', () => { const branchName = '.this..is\\not fine:yo?|is-it' const result = sanitizedRefName(branchName) - expect(result).toBe('this-is-not-fine-yo-is-it') + assert.equal(result, 'this-is-not-fine-yo-is-it') }) it('does not allow branch name to end in slash', () => { const branchName = 'hello/' const result = sanitizedRefName(branchName) - expect(result).toBe('hello-') + assert.equal(result, 'hello-') }) it('does not allow name to start with plus', () => { const branchName = '++but-can-still-keep-the-rest' const result = sanitizedRefName(branchName) - expect(result).toBe('but-can-still-keep-the-rest') + assert.equal(result, 'but-can-still-keep-the-rest') }) it('does not allow name to start with minus', () => { const branchName = '--but-can-still-keep-the-rest' const result = sanitizedRefName(branchName) - expect(result).toBe('but-can-still-keep-the-rest') + assert.equal(result, 'but-can-still-keep-the-rest') }) it('does not allow name to end in `.lock`', () => { const branchName = 'foo.lock.lock' const result = sanitizedRefName(branchName) - expect(result).toBe('foo.lock-') + assert.equal(result, 'foo.lock-') }) it('replaces newlines with dash', () => { const branchName = 'hello\r\nworld' const result = sanitizedRefName(branchName) - expect(result).toBe('hello-world') + assert.equal(result, 'hello-world') }) it('removes starting dot', () => { const branchName = '.first.dot.is.not.ok' const result = sanitizedRefName(branchName) - expect(result).toBe('first.dot.is.not.ok') + assert.equal(result, 'first.dot.is.not.ok') }) it('allows double dashes after first character', () => { const branchName = 'branch--name' const result = sanitizedRefName(branchName) - expect(result).toBe(branchName) + assert.equal(result, branchName) }) }) diff --git a/app/test/unit/sanitized-repository-name-test.ts b/app/test/unit/sanitized-repository-name-test.ts index 0ba89be6789..91ea762af32 100644 --- a/app/test/unit/sanitized-repository-name-test.ts +++ b/app/test/unit/sanitized-repository-name-test.ts @@ -1,63 +1,65 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { sanitizedRepositoryName } from '../../src/ui/add-repository/sanitized-repository-name' describe('sanitizedRepositoryName', () => { it('leaves a good repo name alone', () => { const repoName = 'this-is-fine' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('this-is-fine') + assert.equal(result, 'this-is-fine') }) it('replaces invalid characters with dashes', () => { const repoName = '.this..is\\not fine:yo?|is-it' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('.this..is-not-fine-yo--is-it') + assert.equal(result, '.this..is-not-fine-yo--is-it') }) it('replaces space with dashes', () => { const repoName = 'repo space name' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('repo-space-name') + assert.equal(result, 'repo-space-name') }) it('replaces ending slash with dashes', () => { const repoName = 'hello/' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('hello-') + assert.equal(result, 'hello-') }) it('does not allow name to start with plus, replaces it with dashes', () => { const repoName = '++but-can-still-keep-the-rest' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('--but-can-still-keep-the-rest') + assert.equal(result, '--but-can-still-keep-the-rest') }) it('allow name to start with minus', () => { const repoName = '--but-can-still-keep-the-rest' const result = sanitizedRepositoryName(repoName) - expect(result).toBe(repoName) + assert.equal(result, repoName) }) it('replaces slash in newlines with dash', () => { const repoName = 'hello\\r\\nworld' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('hello-r-nworld') + assert.equal(result, 'hello-r-nworld') }) it('allow name to have dots', () => { const repoName = '.first.dot.is.ok' const result = sanitizedRepositoryName(repoName) - expect(result).toBe(repoName) + assert.equal(result, repoName) }) it('allows double dashes', () => { const repoName = 'repo--name' const result = sanitizedRepositoryName(repoName) - expect(result).toBe(repoName) + assert.equal(result, repoName) }) it('replaces one emoji with one dash', () => { const repoName = 'hello🐓world-repo' const result = sanitizedRepositoryName(repoName) - expect(result).toBe('hello-world-repo') + assert.equal(result, 'hello-world-repo') }) }) diff --git a/app/test/unit/script/version-test.ts b/app/test/unit/script/version-test.ts index c7e25a02929..d5a84813aa5 100644 --- a/app/test/unit/script/version-test.ts +++ b/app/test/unit/script/version-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { getNextVersionNumber } from '../../../../script/draft-release/version' describe('getNextVersionNumber', () => { @@ -5,17 +7,17 @@ describe('getNextVersionNumber', () => { const channel = 'production' it('increments the patch number', () => { - expect(getNextVersionNumber('1.0.1', channel)).toBe('1.0.2') + assert.equal(getNextVersionNumber('1.0.1', channel), '1.0.2') }) describe("doesn't care for", () => { it('beta versions', () => { - expect(() => getNextVersionNumber('1.0.1-beta1', channel)).toThrow( + assert.throws(() => getNextVersionNumber('1.0.1-beta1', channel), /Unable to draft production release using beta version '1\.0\.1-beta1'/ ) }) it('test versions', () => { - expect(() => getNextVersionNumber('1.0.1-test42', channel)).toThrow( + assert.throws(() => getNextVersionNumber('1.0.1-test42', channel), /Unable to draft production release using test version '1\.0\.1-test42'/ ) }) @@ -27,10 +29,10 @@ describe('getNextVersionNumber', () => { describe('when a beta version is used', () => { it('the beta tag is incremented', () => { - expect(getNextVersionNumber('1.1.2-beta3', channel)).toBe('1.1.2-beta4') + assert.equal(getNextVersionNumber('1.1.2-beta3', channel), '1.1.2-beta4') }) it('handles multiple digits', () => { - expect(getNextVersionNumber('1.1.2-beta99', channel)).toBe( + assert.equal(getNextVersionNumber('1.1.2-beta99', channel), '1.1.2-beta100' ) }) @@ -38,13 +40,13 @@ describe('getNextVersionNumber', () => { describe('when a production version is used', () => { it('increments the patch and returns the first beta', () => { - expect(getNextVersionNumber('1.0.1', channel)).toBe('1.0.2-beta1') + assert.equal(getNextVersionNumber('1.0.1', channel), '1.0.2-beta1') }) }) describe("doesn't care for", () => { it('test versions', () => { - expect(() => getNextVersionNumber('1.0.1-test1', channel)).toThrow( + assert.throws(() => getNextVersionNumber('1.0.1-test1', channel), /Unable to draft beta release using test version '1\.0\.1-test1'/ ) }) diff --git a/app/test/unit/section-list-selection-test.ts b/app/test/unit/section-list-selection-test.ts index 5f88d42dcf7..87d8034ae57 100644 --- a/app/test/unit/section-list-selection-test.ts +++ b/app/test/unit/section-list-selection-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { InvalidRowIndexPath, rowIndexPathEquals, @@ -13,7 +15,7 @@ describe('section-list-selection', () => { direction: 'down', row: InvalidRowIndexPath, }) - expect(selectedRow?.row).toBe(0) + assert.equal(selectedRow?.row, 0) }) it('returns first selectable row when header is first', () => { @@ -31,7 +33,7 @@ describe('section-list-selection', () => { } } ) - expect(selectedRow?.row).toBe(1) + assert.equal(selectedRow?.row, 1) }) it('returns first row when selecting down from last row', () => { @@ -43,7 +45,7 @@ describe('section-list-selection', () => { row: lastRow, }, }) - expect(selectedRow?.row).toBe(0) + assert.equal(selectedRow?.row, 0) }) it('returns last row when selecting up from top row', () => { @@ -54,9 +56,9 @@ describe('section-list-selection', () => { row: 0, }, }) - expect( + assert.equal( rowIndexPathEquals(selectedRow!, { section: 2, row: 7 }) - ).toBeTrue() + , true) }) it('returns first row of next section when selecting down from last row of a section', () => { @@ -67,9 +69,9 @@ describe('section-list-selection', () => { row: 4, }, }) - expect( + assert.equal( rowIndexPathEquals(selectedRow!, { section: 1, row: 0 }) - ).toBeTrue() + , true) }) it('returns last row of previous section when selecting up from first row of a section', () => { @@ -80,9 +82,9 @@ describe('section-list-selection', () => { row: 0, }, }) - expect( + assert.equal( rowIndexPathEquals(selectedRow!, { section: 1, row: 2 }) - ).toBeTrue() + , true) }) }) }) diff --git a/app/test/unit/squashed-commit-description-test.ts b/app/test/unit/squashed-commit-description-test.ts index 691cccb44e4..2f3283f16b7 100644 --- a/app/test/unit/squashed-commit-description-test.ts +++ b/app/test/unit/squashed-commit-description-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { ITrailer } from '../../src/lib/git' import { Commit } from '../../src/models/commit' import { CommitIdentity } from '../../src/models/commit-identity' @@ -16,7 +18,7 @@ describe('getSquashedCommitDescription', () => { const squashOnto = buildTestCommit('ontoSummary', 'ontoDesc', []) const desc = getSquashedCommitDescription(commits, squashOnto) - expect(desc).toBe('ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') + assert.equal(desc, 'ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') }) it('builds squashed commit descriptions that do not include coauthors', async () => { @@ -32,7 +34,7 @@ describe('getSquashedCommitDescription', () => { ) const desc = getSquashedCommitDescription(commits, squashOnto) - expect(desc).toBe('ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') + assert.equal(desc, 'ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') }) it('builds squashed commit descriptions with whitespace trimmed', async () => { @@ -48,7 +50,7 @@ describe('getSquashedCommitDescription', () => { ) const desc = getSquashedCommitDescription(commits, squashOnto) - expect(desc).toBe('ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') + assert.equal(desc, 'ontoDesc\n\nsummary1\n\ndesc1\n\nsummary2\n\ndesc2') }) }) diff --git a/app/test/unit/squirrel-error-parser-test.ts b/app/test/unit/squirrel-error-parser-test.ts index 8b8c710b761..b630dc97f0e 100644 --- a/app/test/unit/squirrel-error-parser-test.ts +++ b/app/test/unit/squirrel-error-parser-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseError } from '../../src/lib/squirrel-error-parser' describe('parseError', () => { @@ -8,7 +10,7 @@ describe('parseError', () => { const output = parseError(input) - expect(output).not.toBeNull() + assert(output !== null) }) it('parses a Squirrel network error', () => { @@ -75,7 +77,7 @@ describe('parseError', () => { const output = parseError(input) - expect(output).not.toBeNull() + assert(output !== null) }) it('parses a timeout error', () => { @@ -146,7 +148,7 @@ describe('parseError', () => { const output = parseError(input) - expect(output).not.toBeNull() + assert(output !== null) }) it('passes through an empty error', () => { @@ -154,6 +156,6 @@ describe('parseError', () => { const output = parseError(input) - expect(output).toBeNull() + assert(output === null) }) }) diff --git a/app/test/unit/ssh-test.ts b/app/test/unit/ssh-test.ts index 5d5104af7b7..575a300ef91 100644 --- a/app/test/unit/ssh-test.ts +++ b/app/test/unit/ssh-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { parseAddSSHHostPrompt } from '../../src/lib/ssh/ssh' describe('SSH', () => { @@ -9,7 +11,7 @@ Are you sure you want to continue connecting (yes/no/[fingerprint])? ` const info = parseAddSSHHostPrompt(prompt) - expect(info).toEqual({ + assert.deepStrictEqual(info, { host: 'github.com', ip: '140.82.121.3', fingerprint: 'SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8', @@ -25,7 +27,7 @@ Are you sure you want to continue connecting (yes/no/[fingerprint])? ` const info = parseAddSSHHostPrompt(prompt) - expect(info).toEqual({ + assert.deepStrictEqual(info, { host: 'my-domain.com', ip: '1.2.3.4', fingerprint: 'ThisIsAFakeFingerprintForTestingPurposes', @@ -41,7 +43,7 @@ Are you sure you want to continue connecting (yes/no/[fingerprint])? ` const info = parseAddSSHHostPrompt(prompt) - expect(info).toEqual({ + assert.deepStrictEqual(info, { host: 'my-domain.com', ip: '1.2.3.4', fingerprint: 'ThisIsAFakeFingerprintForTestingPurposes', @@ -57,7 +59,7 @@ Are you sure you want to continue connecting (yes/no)? ` const info = parseAddSSHHostPrompt(prompt) - expect(info).toEqual({ + assert.deepStrictEqual(info, { host: 'my-domain.com', ip: '1.2.3.4', fingerprint: 'ThisIsAFakeFingerprintForTestingPurposes', diff --git a/app/test/unit/stats-store-test.ts b/app/test/unit/stats-store-test.ts index 778e265c02d..2ca988862aa 100644 --- a/app/test/unit/stats-store-test.ts +++ b/app/test/unit/stats-store-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { TestStatsDatabase } from '../helpers/databases' import { StatsStore } from '../../src/lib/stats' @@ -17,19 +19,19 @@ describe('StatsStore', () => { new StatsStore(statsDb, activityMonitor, fakePost) - expect(activityMonitor.subscriptionCount).toBe(1) + assert.equal(activityMonitor.subscriptionCount, 1) activityMonitor.fakeMouseActivity() - expect(activityMonitor.subscriptionCount).toBe(0) + assert.equal(activityMonitor.subscriptionCount, 0) // Use a read-write transaction to ensure that the write operation // from the StatsStore has completed before we try reading the table. await statsDb.transaction('rw!', statsDb.dailyMeasures, async () => { const statsEntry = await statsDb.dailyMeasures.limit(1).first() - expect(statsEntry).not.toBeUndefined() - expect(statsEntry!.active).toBe(true) + assert(statsEntry !== undefined) + assert.equal(statsEntry!.active, true) }) }) @@ -39,11 +41,11 @@ describe('StatsStore', () => { const store = new StatsStore(statsDb, activityMonitor, fakePost) - expect(activityMonitor.subscriptionCount).toBe(1) + assert.equal(activityMonitor.subscriptionCount, 1) activityMonitor.fakeMouseActivity() - expect(activityMonitor.subscriptionCount).toBe(0) + assert.equal(activityMonitor.subscriptionCount, 0) // HACK: The stats store is hard coded to bail out of the // reporting method if running in a test-environment so @@ -51,6 +53,6 @@ describe('StatsStore', () => { // the instance member that we know for sure gets called // after stats submission await store.clearDailyStats() - expect(activityMonitor.subscriptionCount).toBe(1) + assert.equal(activityMonitor.subscriptionCount, 1) }) }) diff --git a/app/test/unit/status-parser-test.ts b/app/test/unit/status-parser-test.ts index 2fafb12d43e..a157cb2c40c 100644 --- a/app/test/unit/status-parser-test.ts +++ b/app/test/unit/status-parser-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { IStatusEntry, IStatusHeader, @@ -16,19 +18,19 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - expect(entries).toHaveLength(3) + assert.equal((entries).length, 3) let i = 0 - expect(entries[i].statusCode).toBe('.D') - expect(entries[i].path).toBe('deleted') + assert.equal(entries[i].statusCode, '.D') + assert.equal(entries[i].path, 'deleted') i++ - expect(entries[i].statusCode).toBe('.M') - expect(entries[i].path).toBe('modified') + assert.equal(entries[i].statusCode, '.M') + assert.equal(entries[i].path, 'modified') i++ - expect(entries[i].statusCode).toBe('??') - expect(entries[i].path).toBe('untracked') + assert.equal(entries[i].statusCode, '??') + assert.equal(entries[i].path, 'untracked') }) it('parses renames', () => { @@ -39,18 +41,18 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - expect(entries).toHaveLength(2) + assert.equal((entries).length, 2) let i = 0 - expect(entries[i].statusCode).toBe('R.') - expect(entries[i].path).toBe('new') - expect(entries[i].oldPath).toBe('old') + assert.equal(entries[i].statusCode, 'R.') + assert.equal(entries[i].path, 'new') + assert.equal(entries[i].oldPath, 'old') i++ - expect(entries[i].statusCode).toBe('RM') - expect(entries[i].path).toBe('to') - expect(entries[i].oldPath).toBe('from') + assert.equal(entries[i].statusCode, 'RM') + assert.equal(entries[i].path, 'to') + assert.equal(entries[i].oldPath, 'from') }) it('ignores ignored files', () => { @@ -61,7 +63,7 @@ describe('parsePorcelainStatus', () => { ['! foo'].join('\0') + '\0' ) as ReadonlyArray - expect(entries).toHaveLength(0) + assert.equal((entries).length, 0) }) it('parses status headers', () => { @@ -77,16 +79,16 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - expect(entries).toHaveLength(4) + assert.equal((entries).length, 4) let i = 0 - expect(entries[i++].value).toBe( + assert.equal(entries[i++].value, 'branch.oid 2de0487c2d3e977f5f560b746833f9d7f9a054fd' ) - expect(entries[i++].value).toBe('branch.head master') - expect(entries[i++].value).toBe('branch.upstream origin/master') - expect(entries[i++].value).toBe('branch.ab +1 -0') + assert.equal(entries[i++].value, 'branch.head master') + assert.equal(entries[i++].value, 'branch.upstream origin/master') + assert.equal(entries[i++].value, 'branch.ab +1 -0') }) it('parses a path which includes a newline', () => { @@ -94,13 +96,13 @@ describe('parsePorcelainStatus', () => { /.DS_Store` const entries = parse(x) as ReadonlyArray - expect(entries).toHaveLength(1) + assert.equal((entries).length, 1) const expectedPath = `ProjectSID/Images.xcassets/iPhone 67/Status Center/Report X68 Y461 /.DS_Store` - expect(entries[0].path).toBe(expectedPath) - expect(entries[0].statusCode).toBe('D.') + assert.equal(entries[0].path, expectedPath) + assert.equal(entries[0].statusCode, 'D.') }) it('parses a typechange', () => { @@ -108,17 +110,17 @@ describe('parsePorcelainStatus', () => { '1 .T N... 120000 120000 100755 6165716e8b408ad09b51d1a37aa1ef50e7f84376 6165716e8b408ad09b51d1a37aa1ef50e7f84376 pdf_linux-x64/lib/libQt5Core.so.5' const entries = parse(x) as ReadonlyArray - expect(entries).toHaveLength(1) + assert.equal((entries).length, 1) - expect(entries[0].path).toBe('pdf_linux-x64/lib/libQt5Core.so.5') - expect(entries[0].statusCode).toBe('.T') + assert.equal(entries[0].path, 'pdf_linux-x64/lib/libQt5Core.so.5') + assert.equal(entries[0].statusCode, '.T') }) it('parses submodule changes', () => { const x = `1 .M SCMU 100644 100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 submodule/submodule` const entries = parse(x) as ReadonlyArray - expect(entries).toHaveLength(1) - expect(entries[0].path).toBe('submodule/submodule') - expect(entries[0].submoduleStatusCode).toBe('SCMU') + assert.equal((entries).length, 1) + assert.equal(entries[0].path, 'submodule/submodule') + assert.equal(entries[0].submoduleStatusCode, 'SCMU') }) }) diff --git a/app/test/unit/stores/updates/update-changed-files-test.ts b/app/test/unit/stores/updates/update-changed-files-test.ts index 81ec03736e4..b98ac1935cd 100644 --- a/app/test/unit/stores/updates/update-changed-files-test.ts +++ b/app/test/unit/stores/updates/update-changed-files-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { updateChangedFiles } from '../../../../src/lib/stores/updates/changes-state' import { WorkingDirectoryStatus, @@ -75,7 +77,7 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) - expect(partialFile!.selection.getSelectionType()).toBe( + assert.equal(partialFile!.selection.getSelectionType(), DiffSelectionType.None ) }) @@ -95,7 +97,7 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) - expect(partialFile!.selection.getSelectionType()).toBe( + assert.equal(partialFile!.selection.getSelectionType(), DiffSelectionType.Partial ) }) @@ -112,7 +114,7 @@ describe('updateChangedFiles', () => { const { workingDirectory } = updateChangedFiles(prevState, status, false) - expect(workingDirectory).not.toBe(oldWorkingDirectory) + assert.notEqual(workingDirectory, oldWorkingDirectory) }) }) @@ -125,14 +127,14 @@ describe('updateChangedFiles', () => { }) const { selection } = updateChangedFiles(prevState, status, false) - expect(selection.kind).toBe(ChangesSelectionKind.WorkingDirectory) + assert.equal(selection.kind, ChangesSelectionKind.WorkingDirectory) const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - expect(selectedFileIDs).toHaveLength(1) + assert.equal((selectedFileIDs).length, 1) // NOTE: `updateChangedFiles` sorts the paths and `app/package.json` will // appear in list before `README.md` - expect(selectedFileIDs[0]).toBe(files[1].id) + assert.equal(selectedFileIDs[0], files[1].id) }) it('remembers previous selection if file is found in status', () => { @@ -150,12 +152,12 @@ describe('updateChangedFiles', () => { }) const { selection } = updateChangedFiles(prevState, status, false) - expect(selection.kind).toBe(ChangesSelectionKind.WorkingDirectory) + assert.equal(selection.kind, ChangesSelectionKind.WorkingDirectory) const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - expect(selectedFileIDs).toHaveLength(1) - expect(selectedFileIDs[0]).toBe(firstFile) + assert.equal((selectedFileIDs).length, 1) + assert.equal(selectedFileIDs[0], firstFile) }) it('clears selection if no files found in status', () => { @@ -171,11 +173,11 @@ describe('updateChangedFiles', () => { const status = createStatus({}) const { selection } = updateChangedFiles(prevState, status, false) - expect(selection.kind).toBe(ChangesSelectionKind.WorkingDirectory) + assert.equal(selection.kind, ChangesSelectionKind.WorkingDirectory) const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - expect(selectedFileIDs).toHaveLength(0) + assert.equal((selectedFileIDs).length, 0) }) }) @@ -196,11 +198,11 @@ describe('updateChangedFiles', () => { const status = createStatus({ workingDirectory }) const { selection } = updateChangedFiles(prevState, status, false) - expect(selection.kind).toBe(ChangesSelectionKind.WorkingDirectory) + assert.equal(selection.kind, ChangesSelectionKind.WorkingDirectory) const workingDirectorySelection = selection as ChangesWorkingDirectorySelection - expect(workingDirectorySelection.diff).toBeNull() + assert(workingDirectorySelection.diff === null) }) it('returns same diff if selected file from previous state is found', () => { @@ -223,10 +225,10 @@ describe('updateChangedFiles', () => { const status = createStatus({ workingDirectory }) const { selection } = updateChangedFiles(prevState, status, false) - expect(selection.kind).toBe(ChangesSelectionKind.WorkingDirectory) + assert.equal(selection.kind, ChangesSelectionKind.WorkingDirectory) const workingDirectorySelection = selection as ChangesWorkingDirectorySelection - expect(workingDirectorySelection.diff).toBe(diff) + assert.equal(workingDirectorySelection.diff, diff) }) }) }) diff --git a/app/test/unit/stores/updates/update-conflict-state-test.ts b/app/test/unit/stores/updates/update-conflict-state-test.ts index 7815f1c1640..4293e017382 100644 --- a/app/test/unit/stores/updates/update-conflict-state-test.ts +++ b/app/test/unit/stores/updates/update-conflict-state-test.ts @@ -1,17 +1,14 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { updateConflictState } from '../../../../src/lib/stores/updates/changes-state' import { createState, createStatus, } from '../../../helpers/changes-state-helper' import { ManualConflictResolution } from '../../../../src/models/manual-conflict-resolution' -import { IStatsStore } from '../../../../src/lib/stats' +import { TestStatsStore } from '../../../helpers/test-stats-store' describe('updateConflictState', () => { - let statsStore: IStatsStore - beforeEach(() => { - statsStore = { increment: jest.fn() } - }) - const manualResolutions = new Map([ ['foo', ManualConflictResolution.theirs], ]) @@ -27,8 +24,12 @@ describe('updateConflictState', () => { }, }) const status = createStatus({ mergeHeadFound: false }) - const conflictState = updateConflictState(prevState, status, statsStore) - expect(conflictState).toBeNull() + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) + assert(conflictState === null) }) it('preserves manual resolutions between updates in the same merge', () => { @@ -47,9 +48,13 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - const conflictState = updateConflictState(prevState, status, statsStore) + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) - expect(conflictState).toEqual({ + assert.deepStrictEqual(conflictState, { kind: 'merge', currentBranch: 'master', currentTip: 'first-sha', @@ -72,8 +77,12 @@ describe('updateConflictState', () => { currentTip: undefined, }) - const conflictState = updateConflictState(prevState, status, statsStore) - expect(conflictState).toBeNull() + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) + assert(conflictState === null) }) it('returns a value when status has MERGE_HEAD set and in conflicted state', () => { @@ -87,9 +96,13 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - const conflictState = updateConflictState(prevState, status, statsStore) + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) - expect(conflictState).toEqual({ + assert.deepStrictEqual(conflictState, { kind: 'merge', currentBranch: 'master', currentTip: 'first-sha', @@ -113,11 +126,11 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).toHaveBeenCalledWith( 'mergeAbortedAfterConflictsCount' - ) + ) **/ }) it('increments abort counter when conflict resolved and tip has not changed', () => { @@ -135,11 +148,11 @@ describe('updateConflictState', () => { currentTip: 'old-sha', }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).toHaveBeenCalledWith( 'mergeAbortedAfterConflictsCount' - ) + ) **/ }) it('increments success counter when conflict resolved and tip has changed', () => { @@ -157,11 +170,11 @@ describe('updateConflictState', () => { currentTip: 'new-sha', }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).toHaveBeenCalledWith( 'mergeSuccessAfterConflictsCount' - ) + ) **/ }) }) @@ -178,8 +191,12 @@ describe('updateConflictState', () => { }, }) const status = createStatus({ rebaseInternalState: null }) - const conflictState = updateConflictState(prevState, status, statsStore) - expect(conflictState).toBeNull() + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) + assert(conflictState === null) }) it('returns a value when status has REBASE_HEAD set and conflict present', () => { @@ -197,9 +214,13 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - const conflictState = updateConflictState(prevState, status, statsStore) + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) - expect(conflictState).toEqual({ + assert.deepStrictEqual(conflictState, { kind: 'rebase', currentTip: 'first-sha', manualResolutions: new Map(), @@ -231,9 +252,13 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - const conflictState = updateConflictState(prevState, status, statsStore) + const conflictState = updateConflictState( + prevState, + status, + new TestStatsStore() + ) - expect(conflictState).toEqual({ + assert.deepStrictEqual(conflictState, { kind: 'rebase', currentTip: 'first-sha', manualResolutions, @@ -264,11 +289,11 @@ describe('updateConflictState', () => { doConflictedFilesExist: true, }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).toHaveBeenCalledWith( 'rebaseAbortedAfterConflictsCount' - ) + ) **/ }) it('increments abort counter when conflict resolved but tip has not changed', () => { @@ -288,11 +313,11 @@ describe('updateConflictState', () => { currentTip: 'old-sha', }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).toHaveBeenCalledWith( 'rebaseAbortedAfterConflictsCount' - ) + ) **/ }) it('does not increment aborted counter when conflict resolved and tip has changed', () => { @@ -312,11 +337,11 @@ describe('updateConflictState', () => { currentTip: 'new-sha', }) - updateConflictState(prevState, status, statsStore) + updateConflictState(prevState, status, new TestStatsStore()) - expect(statsStore.increment).not.toHaveBeenCalledWith( + /** unknown: expect(statsStore.increment).not.toHaveBeenCalledWith( 'rebaseAbortedAfterConflictsCount' - ) + ) **/ }) }) }) diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts index 1795b5dcb7b..80299c1c4f8 100644 --- a/app/test/unit/stores/updates/update-remote-url-test.ts +++ b/app/test/unit/stores/updates/update-remote-url-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { GitStore, RepositoriesStore } from '../../../../src/lib/stores' import { TestRepositoriesDatabase } from '../../../helpers/databases' import { @@ -62,16 +64,16 @@ describe('Update remote url', () => { const updatedUrl = 'https://github.com/my-user/my-updated-repo' const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) - expect(originalUrl).not.toBe(updatedUrl) - expect(gitStore.currentRemote!.url).toBe(updatedUrl) + assert.notEqual(originalUrl, updatedUrl) + assert.equal(gitStore.currentRemote!.url, updatedUrl) }) it("doesn't update the repository's remote url when the github url is the same", async () => { const { gitHubRepository, gitStore } = await createRepository(apiRepository) const originalUrl = gitStore.currentRemote!.url - expect(originalUrl).not.toBeEmpty() + assert.notEqual(originalUrl.length, 0, 'Expected originalUrl to be empty') await updateRemoteUrl(gitStore, gitHubRepository, apiRepository) - expect(gitStore.currentRemote!.url).toBe(originalUrl) + assert.equal(gitStore.currentRemote!.url, originalUrl) }) it("doesn't update repository's remote url if protocols don't match", async () => { @@ -87,7 +89,7 @@ describe('Update remote url', () => { const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) - expect(gitStore.currentRemote!.url).toBe(originalUrl) + assert.equal(gitStore.currentRemote!.url, originalUrl) }) it("doesn't update the repository's remote url if it differs from the default from the github API", async () => { @@ -101,6 +103,6 @@ describe('Update remote url', () => { const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) - expect(gitStore.currentRemote!.url).toBe(originalUrl) + assert.equal(gitStore.currentRemote!.url, originalUrl) }) }) diff --git a/app/test/unit/text-diff-expansion-test.ts b/app/test/unit/text-diff-expansion-test.ts index 351a89f1538..7b91e625591 100644 --- a/app/test/unit/text-diff-expansion-test.ts +++ b/app/test/unit/text-diff-expansion-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import * as path from 'path' import * as os from 'os' import * as FSE from 'fs-extra' @@ -80,20 +82,20 @@ describe('text-diff-expansion', () => { const { textDiff } = await prepareDiff(100, [30]) const lastHunk = textDiff.hunks[textDiff.hunks.length - 1] - expect(lastHunk.lines).toHaveLength(1) + assert.equal((lastHunk.lines).length, 1) const firstLine = lastHunk.lines[0] - expect(firstLine.type).toBe(DiffLineType.Hunk) - expect(firstLine.text).toBe('') - expect(firstLine.newLineNumber).toBe(null) - expect(firstLine.oldLineNumber).toBe(null) + assert.equal(firstLine.type, DiffLineType.Hunk) + assert.equal(firstLine.text, '') + assert.equal(firstLine.newLineNumber, null) + assert.equal(firstLine.oldLineNumber, null) }) it('does not add a dummy hunk to the bottom when last hunk reaches bottom', async () => { const { textDiff } = await prepareDiff(100, [99]) const lastHunk = textDiff.hunks.at(-1) - expect(lastHunk).not.toBeUndefined() - expect(lastHunk!.lines).toHaveLength(6) + assert(lastHunk !== undefined) + assert.equal((lastHunk!.lines).length, 6) }) it('expands the initial hunk without reaching the top', async () => { @@ -106,13 +108,13 @@ describe('text-diff-expansion', () => { ) const firstHunk = expandedDiff!.hunks[0] - expect(firstHunk.header.oldStartLine).toBe(8) - expect(firstHunk.header.oldLineCount).toBe(26) - expect(firstHunk.header.newStartLine).toBe(8) - expect(firstHunk.header.newLineCount).toBe(27) + assert.equal(firstHunk.header.oldStartLine, 8) + assert.equal(firstHunk.header.oldLineCount, 26) + assert.equal(firstHunk.header.newStartLine, 8) + assert.equal(firstHunk.header.newLineCount, 27) // Check the first line is still the header info - expect(firstHunk.lines[0].type).toBe(DiffLineType.Hunk) + assert.equal(firstHunk.lines[0].type, DiffLineType.Hunk) }) it('expands the initial hunk reaching the top', async () => { @@ -125,13 +127,13 @@ describe('text-diff-expansion', () => { ) const firstHunk = expandedDiff!.hunks[0] - expect(firstHunk.header.oldStartLine).toBe(1) - expect(firstHunk.header.oldLineCount).toBe(18) - expect(firstHunk.header.newStartLine).toBe(1) - expect(firstHunk.header.newLineCount).toBe(19) + assert.equal(firstHunk.header.oldStartLine, 1) + assert.equal(firstHunk.header.oldLineCount, 18) + assert.equal(firstHunk.header.newStartLine, 1) + assert.equal(firstHunk.header.newLineCount, 19) // Check the first line is still the header info - expect(firstHunk.lines[0].type).toBe(DiffLineType.Hunk) + assert.equal(firstHunk.lines[0].type, DiffLineType.Hunk) }) // The last hunk is a dummy hunk to expand the bottom of the diff @@ -145,10 +147,10 @@ describe('text-diff-expansion', () => { ) const secondToLastHunk = expandedDiff!.hunks[expandedDiff!.hunks.length - 2] - expect(secondToLastHunk.header.oldStartLine).toBe(13) - expect(secondToLastHunk.header.oldLineCount).toBe(26) - expect(secondToLastHunk.header.newStartLine).toBe(13) - expect(secondToLastHunk.header.newLineCount).toBe(27) + assert.equal(secondToLastHunk.header.oldStartLine, 13) + assert.equal(secondToLastHunk.header.oldLineCount, 26) + assert.equal(secondToLastHunk.header.newStartLine, 13) + assert.equal(secondToLastHunk.header.newLineCount, 27) }) it('expands the second-to-last hunk reaching the bottom', async () => { @@ -161,10 +163,10 @@ describe('text-diff-expansion', () => { ) const lastHunk = expandedDiff!.hunks[expandedDiff!.hunks.length - 1] - expect(lastHunk.header.oldStartLine).toBe(88) - expect(lastHunk.header.oldLineCount).toBe(13) - expect(lastHunk.header.newStartLine).toBe(88) - expect(lastHunk.header.newLineCount).toBe(14) + assert.equal(lastHunk.header.oldStartLine, 88) + assert.equal(lastHunk.header.oldLineCount, 13) + assert.equal(lastHunk.header.newStartLine, 88) + assert.equal(lastHunk.header.newLineCount, 14) }) it('merges hunks when the gap between them is shorter than the expansion size', async () => { @@ -180,16 +182,16 @@ describe('text-diff-expansion', () => { // - First around line 10 // - Second around line 20 // - Third is the dummy hunk at the end - expect(textDiff.hunks).toHaveLength(3) + assert.equal((textDiff.hunks).length, 3) // After expanding the hunk, the first two hunks are merged - expect(expandedDiff!.hunks).toHaveLength(2) + assert.equal((expandedDiff!.hunks).length, 2) const firstHunk = expandedDiff!.hunks[0] - expect(firstHunk.header.oldStartLine).toBe(8) - expect(firstHunk.header.oldLineCount).toBe(16) - expect(firstHunk.header.newStartLine).toBe(8) - expect(firstHunk.header.newLineCount).toBe(18) + assert.equal(firstHunk.header.oldStartLine, 8) + assert.equal(firstHunk.header.oldLineCount, 16) + assert.equal(firstHunk.header.newStartLine, 8) + assert.equal(firstHunk.header.newLineCount, 18) }) it('expands the whole file', async () => { @@ -199,10 +201,10 @@ describe('text-diff-expansion', () => { ) const expandedDiff = expandWholeTextDiff(textDiff, newContentLines) - expect(expandedDiff!.hunks).toHaveLength(1) + assert.equal((expandedDiff!.hunks).length, 1) const firstHunk = expandedDiff!.hunks[0] - expect(firstHunk.lines).toHaveLength(40 + 1) // +1 for the header + assert.equal((firstHunk.lines).length, 40 + 1) // +1 for the header let expectedNewLine = 1 let expectedOldLine = 1 @@ -210,15 +212,15 @@ describe('text-diff-expansion', () => { // Make sure line numbers are consecutive as expected for (const line of firstHunk.lines) { if (line.type === DiffLineType.Add) { - expect(line.newLineNumber).toBe(expectedNewLine) + assert.equal(line.newLineNumber, expectedNewLine) expectedNewLine++ } else if (line.type === DiffLineType.Delete) { - expect(line.oldLineNumber).toBe(expectedOldLine) + assert.equal(line.oldLineNumber, expectedOldLine) expectedOldLine++ } else if (line.type === DiffLineType.Context) { - expect(line.newLineNumber).toBe(expectedNewLine) + assert.equal(line.newLineNumber, expectedNewLine) expectedNewLine++ - expect(line.oldLineNumber).toBe(expectedOldLine) + assert.equal(line.oldLineNumber, expectedOldLine) expectedOldLine++ } } diff --git a/app/test/unit/text-token-parser-test.ts b/app/test/unit/text-token-parser-test.ts index 95f01450eb1..d0f68513d9b 100644 --- a/app/test/unit/text-token-parser-test.ts +++ b/app/test/unit/text-token-parser-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { Emoji } from '../../src/lib/emoji' import { Tokenizer, @@ -24,22 +26,22 @@ describe('Tokenizer', () => { const text = 'this is a string without anything interesting' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe(text) + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, text) }) it('returns emoji between two string elements', () => { const text = "let's :shipit: this thing" const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(3) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe("let's ") - expect(results[1].kind).toBe(TokenType.Emoji) - expect(results[1].text).toBe(':shipit:') - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(' this thing') + assert.equal((results).length, 3) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, "let's ") + assert.equal(results[1].kind, TokenType.Emoji) + assert.equal(results[1].text, ':shipit:') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, ' this thing') }) }) @@ -66,33 +68,33 @@ describe('Tokenizer', () => { const text = 'releasing the thing :shipit:' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(2) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('releasing the thing ') + assert.equal((results).length, 2) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'releasing the thing ') - expect(results[1].kind).toBe(TokenType.Emoji) + assert.equal(results[1].kind, TokenType.Emoji) const match = results[1] as EmojiMatch - expect(match.text).toBe(':shipit:') - expect(match.path).toBe('/some/path.png') + assert.equal(match.text, ':shipit:') + assert.equal(match.path, '/some/path.png') }) it('skips emoji when no match exists', () => { const text = 'releasing the thing :unknown:' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('releasing the thing :unknown:') + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'releasing the thing :unknown:') }) it('does not render link when email address found', () => { const text = 'the email address support@github.com should be ignored' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe( + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'the email address support@github.com should be ignored' ) }) @@ -103,16 +105,16 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(2) + assert.equal((results).length, 2) - expect(results[0].kind).toBe(TokenType.Link) + assert.equal(results[0].kind, TokenType.Link) const mention = results[0] as HyperlinkMatch - expect(mention.text).toBe('@shiftkey') - expect(mention.url).toBe(expectedUri) + assert.equal(mention.text, '@shiftkey') + assert.equal(mention.url, expectedUri) - expect(results[1].kind).toBe(TokenType.Text) - expect(results[1].text).toBe(' was here') + assert.equal(results[1].kind, TokenType.Text) + assert.equal(results[1].text, ' was here') }) it('renders mention when token found', () => { @@ -121,16 +123,16 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(2) + assert.equal((results).length, 2) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('fixed based on suggestion from ') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'fixed based on suggestion from ') - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const mention = results[1] as HyperlinkMatch - expect(mention.text).toBe('@shiftkey') - expect(mention.url).toBe(expectedUri) + assert.equal(mention.text, '@shiftkey') + assert.equal(mention.url, expectedUri) }) it('ignores http prefix when no text after', () => { @@ -138,10 +140,10 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) + assert.equal((results).length, 1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('fix double http:// in avatar URLs') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'fix double http:// in avatar URLs') }) it('ignores https prefix when no text after', () => { @@ -149,10 +151,10 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) + assert.equal((results).length, 1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('fix double https:// in avatar URLs') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'fix double https:// in avatar URLs') }) it('renders link when an issue reference is found', () => { @@ -162,19 +164,19 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(3) + assert.equal((results).length, 3) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('Merge pull request ') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'Merge pull request ') - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const mention = results[1] as HyperlinkMatch - expect(mention.text).toBe('#955') - expect(mention.url).toBe(expectedUri) + assert.equal(mention.text, '#955') + assert.equal(mention.url, expectedUri) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(' from desktop/computering-icons-for-all') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, ' from desktop/computering-icons-for-all') }) it('renders link when squash and merge', () => { @@ -184,19 +186,19 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(3) + assert.equal((results).length, 3) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('Update README.md (') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'Update README.md (') - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const mention = results[1] as HyperlinkMatch - expect(mention.text).toBe('#5203') - expect(mention.url).toBe(expectedUri) + assert.equal(mention.text, '#5203') + assert.equal(mention.url, expectedUri) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(')') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, ')') }) it('renders link and author mention when parsing release notes', () => { @@ -206,30 +208,30 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(5) + assert.equal((results).length, 5) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe( + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, `'Clone repository' menu item label is obscured on Windows - ` ) - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const issueLink = results[1] as HyperlinkMatch - expect(issueLink.text).toBe('#5348') - expect(issueLink.url).toBe(expectedUri) + assert.equal(issueLink.text, '#5348') + assert.equal(issueLink.url, expectedUri) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe('. Thanks ') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, '. Thanks ') - expect(results[3].kind).toBe(TokenType.Link) + assert.equal(results[3].kind, TokenType.Link) const userLink = results[3] as HyperlinkMatch - expect(userLink.text).toBe('@Daniel-McCarthy') - expect(userLink.url).toBe('https://github.com/Daniel-McCarthy') + assert.equal(userLink.text, '@Daniel-McCarthy') + assert.equal(userLink.url, 'https://github.com/Daniel-McCarthy') - expect(results[4].kind).toBe(TokenType.Text) - expect(results[4].text).toBe(`!`) + assert.equal(results[4].kind, TokenType.Text) + assert.equal(results[4].text, `!`) }) it('renders multiple issue links and mentions', () => { @@ -244,64 +246,64 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(13) + assert.equal((results).length, 13) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('Assorted changelog typos - ') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'Assorted changelog typos - ') - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const firstIssueLink = results[1] as HyperlinkMatch - expect(firstIssueLink.text).toBe('#3174') - expect(firstIssueLink.url).toBe(firstExpectedUrl) + assert.equal(firstIssueLink.text, '#3174') + assert.equal(firstIssueLink.url, firstExpectedUrl) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(' ') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, ' ') - expect(results[3].kind).toBe(TokenType.Link) + assert.equal(results[3].kind, TokenType.Link) const secondIssueLink = results[3] as HyperlinkMatch - expect(secondIssueLink.text).toBe('#3184') - expect(secondIssueLink.url).toBe(secondExpectedUrl) + assert.equal(secondIssueLink.text, '#3184') + assert.equal(secondIssueLink.url, secondExpectedUrl) - expect(results[4].kind).toBe(TokenType.Text) - expect(results[4].text).toBe(' ') + assert.equal(results[4].kind, TokenType.Text) + assert.equal(results[4].text, ' ') - expect(results[5].kind).toBe(TokenType.Link) + assert.equal(results[5].kind, TokenType.Link) const thirdIssueLink = results[5] as HyperlinkMatch - expect(thirdIssueLink.text).toBe('#3207') - expect(thirdIssueLink.url).toBe(thirdExpectedUrl) + assert.equal(thirdIssueLink.text, '#3207') + assert.equal(thirdIssueLink.url, thirdExpectedUrl) - expect(results[6].kind).toBe(TokenType.Text) - expect(results[6].text).toBe('. Thanks ') + assert.equal(results[6].kind, TokenType.Text) + assert.equal(results[6].text, '. Thanks ') - expect(results[7].kind).toBe(TokenType.Link) + assert.equal(results[7].kind, TokenType.Link) const firstUserLink = results[7] as HyperlinkMatch - expect(firstUserLink.text).toBe('@strafe') - expect(firstUserLink.url).toBe('https://github.com/strafe') + assert.equal(firstUserLink.text, '@strafe') + assert.equal(firstUserLink.url, 'https://github.com/strafe') - expect(results[8].kind).toBe(TokenType.Text) - expect(results[8].text).toBe(', ') + assert.equal(results[8].kind, TokenType.Text) + assert.equal(results[8].text, ', ') - expect(results[9].kind).toBe(TokenType.Link) + assert.equal(results[9].kind, TokenType.Link) const secondUserLink = results[9] as HyperlinkMatch - expect(secondUserLink.text).toBe('@alanaasmaa') - expect(secondUserLink.url).toBe('https://github.com/alanaasmaa') + assert.equal(secondUserLink.text, '@alanaasmaa') + assert.equal(secondUserLink.url, 'https://github.com/alanaasmaa') - expect(results[10].kind).toBe(TokenType.Text) - expect(results[10].text).toBe(' and ') + assert.equal(results[10].kind, TokenType.Text) + assert.equal(results[10].text, ' and ') - expect(results[11].kind).toBe(TokenType.Link) + assert.equal(results[11].kind, TokenType.Link) const thirdUserLink = results[11] as HyperlinkMatch - expect(thirdUserLink.text).toBe('@jt2k') - expect(thirdUserLink.url).toBe('https://github.com/jt2k') + assert.equal(thirdUserLink.text, '@jt2k') + assert.equal(thirdUserLink.url, 'https://github.com/jt2k') - expect(results[12].kind).toBe(TokenType.Text) - expect(results[12].text).toBe(`!`) + assert.equal(results[12].kind, TokenType.Text) + assert.equal(results[12].text, `!`) }) it('renders multiple issue links and mentions even with commas', () => { @@ -316,64 +318,64 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(13) + assert.equal((results).length, 13) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('Assorted changelog typos - ') + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'Assorted changelog typos - ') - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const firstIssueLink = results[1] as HyperlinkMatch - expect(firstIssueLink.text).toBe('#3174') - expect(firstIssueLink.url).toBe(firstExpectedUrl) + assert.equal(firstIssueLink.text, '#3174') + assert.equal(firstIssueLink.url, firstExpectedUrl) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(', ') + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, ', ') - expect(results[3].kind).toBe(TokenType.Link) + assert.equal(results[3].kind, TokenType.Link) const secondIssueLink = results[3] as HyperlinkMatch - expect(secondIssueLink.text).toBe('#3184') - expect(secondIssueLink.url).toBe(secondExpectedUrl) + assert.equal(secondIssueLink.text, '#3184') + assert.equal(secondIssueLink.url, secondExpectedUrl) - expect(results[4].kind).toBe(TokenType.Text) - expect(results[4].text).toBe(' & ') + assert.equal(results[4].kind, TokenType.Text) + assert.equal(results[4].text, ' & ') - expect(results[5].kind).toBe(TokenType.Link) + assert.equal(results[5].kind, TokenType.Link) const thirdIssueLink = results[5] as HyperlinkMatch - expect(thirdIssueLink.text).toBe('#3207') - expect(thirdIssueLink.url).toBe(thirdExpectedUrl) + assert.equal(thirdIssueLink.text, '#3207') + assert.equal(thirdIssueLink.url, thirdExpectedUrl) - expect(results[6].kind).toBe(TokenType.Text) - expect(results[6].text).toBe('. Thanks ') + assert.equal(results[6].kind, TokenType.Text) + assert.equal(results[6].text, '. Thanks ') - expect(results[7].kind).toBe(TokenType.Link) + assert.equal(results[7].kind, TokenType.Link) const firstUserLink = results[7] as HyperlinkMatch - expect(firstUserLink.text).toBe('@strafe') - expect(firstUserLink.url).toBe('https://github.com/strafe') + assert.equal(firstUserLink.text, '@strafe') + assert.equal(firstUserLink.url, 'https://github.com/strafe') - expect(results[8].kind).toBe(TokenType.Text) - expect(results[8].text).toBe(', ') + assert.equal(results[8].kind, TokenType.Text) + assert.equal(results[8].text, ', ') - expect(results[9].kind).toBe(TokenType.Link) + assert.equal(results[9].kind, TokenType.Link) const secondUserLink = results[9] as HyperlinkMatch - expect(secondUserLink.text).toBe('@alanaasmaa') - expect(secondUserLink.url).toBe('https://github.com/alanaasmaa') + assert.equal(secondUserLink.text, '@alanaasmaa') + assert.equal(secondUserLink.url, 'https://github.com/alanaasmaa') - expect(results[10].kind).toBe(TokenType.Text) - expect(results[10].text).toBe(', and ') + assert.equal(results[10].kind, TokenType.Text) + assert.equal(results[10].text, ', and ') - expect(results[11].kind).toBe(TokenType.Link) + assert.equal(results[11].kind, TokenType.Link) const thirdUserLink = results[11] as HyperlinkMatch - expect(thirdUserLink.text).toBe('@jt2k') - expect(thirdUserLink.url).toBe('https://github.com/jt2k') + assert.equal(thirdUserLink.text, '@jt2k') + assert.equal(thirdUserLink.url, 'https://github.com/jt2k') - expect(results[12].kind).toBe(TokenType.Text) - expect(results[12].text).toBe(`!`) + assert.equal(results[12].kind, TokenType.Text) + assert.equal(results[12].text, `!`) }) it('converts full URL to issue shorthand', () => { @@ -406,21 +408,21 @@ Signed-off-by: Johannes Schindelin ` const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(3) + assert.equal((results).length, 3) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe(expectedBefore) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, expectedBefore) - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const issue = results[1] as HyperlinkMatch - expect(issue.text).toBe('#1034') - expect(issue.url).toBe( + assert.equal(issue.text, '#1034') + assert.equal(issue.url, 'https://github.com/shiftkey/some-repo/issues/1034' ) - expect(results[2].kind).toBe(TokenType.Text) - expect(results[2].text).toBe(expectedAfter) + assert.equal(results[2].kind, TokenType.Text) + assert.equal(results[2].text, expectedAfter) }) }) @@ -429,33 +431,33 @@ Signed-off-by: Johannes Schindelin ` const text = 'releasing the thing :shipit:' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(2) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe('releasing the thing ') + assert.equal((results).length, 2) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, 'releasing the thing ') - expect(results[1].kind).toBe(TokenType.Emoji) + assert.equal(results[1].kind, TokenType.Emoji) const match = results[1] as EmojiMatch - expect(match.text).toBe(':shipit:') - expect(match.path).toBe('/some/path.png') + assert.equal(match.text, ':shipit:') + assert.equal(match.path, '/some/path.png') }) it('skips emoji when no match exists', () => { const text = 'releasing the thing :unknown:' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe(text) + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, text) }) it('does not render link for mention', () => { const text = 'fixed based on suggestion from @shiftkey' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe(text) + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, text) }) it('does not render link for issue reference', () => { @@ -463,9 +465,9 @@ Signed-off-by: Johannes Schindelin ` 'Merge pull request #955 from desktop/computering-icons-for-all' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - expect(results).toHaveLength(1) - expect(results[0].kind).toBe(TokenType.Text) - expect(results[0].text).toBe(text) + assert.equal((results).length, 1) + assert.equal(results[0].kind, TokenType.Text) + assert.equal(results[0].text, text) }) it('renders plain link for full URL', () => { @@ -486,15 +488,15 @@ Signed-off-by: Johannes Schindelin ` // other tests are looking at the newline formatting here // let's just verify the URL conversion works - expect(results).toHaveLength(3) + assert.equal((results).length, 3) - expect(results[1].kind).toBe(TokenType.Link) + assert.equal(results[1].kind, TokenType.Link) const mention = results[1] as HyperlinkMatch - expect(mention.text).toBe( + assert.equal(mention.text, 'https://github.com/shiftkey/some-repo/issues/1034' ) - expect(mention.url).toBe( + assert.equal(mention.url, 'https://github.com/shiftkey/some-repo/issues/1034' ) }) diff --git a/app/test/unit/truncate-with-ellipsis-test.ts b/app/test/unit/truncate-with-ellipsis-test.ts index 19ab6c1d73a..7fbf04b6a2b 100644 --- a/app/test/unit/truncate-with-ellipsis-test.ts +++ b/app/test/unit/truncate-with-ellipsis-test.ts @@ -1,39 +1,41 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { truncateWithEllipsis } from '../../src/lib/truncate-with-ellipsis' describe('truncateWithEllipsis', () => { it('does not truncate a string that fits', () => { const str = 'short' const result = truncateWithEllipsis(str, 25) - expect(result).toEqual(str) + assert.equal(result, str) }) it('does not truncate a max length string', () => { const str = 'this-is-max-length-string' const result = truncateWithEllipsis(str, str.length) - expect(result).toEqual(str) + assert.equal(result, str) }) it('truncates a string that does not fit', () => { const str = 'this-string-exceeds-max-length' const result = truncateWithEllipsis(str, 25) - expect(result).toEqual('this-string-exceeds-max-l…') + assert.equal(result, 'this-string-exceeds-max-l…') }) it('does not truncate a unicode string that fits', () => { const str = '🌝🌛🌜🌚🌕🌖🌗🌘🌑🌒🌓🌔☀\uFE0F' const result = truncateWithEllipsis(str, 25) - expect(result).toEqual(str) + assert.equal(result, str) }) it('does not truncate a max length unicode string', () => { const str = '🌝🌛🌜🌚🌕🌖🌗🌘🌑🌒🌓🌔☀\uFE0F🌤⛅\uFE0F🌥☁\uFE0F🌦🌧⛈🌩🌨' const result = truncateWithEllipsis(str, 22) - expect(result).toEqual(str) + assert.equal(result, str) }) it('truncates a unicode string that does not fit', () => { const str = '🌝🌛🌜🌚🌕🌖🌗🌘🌑🌒🌓🌔☀\uFE0F🌤⛅\uFE0F🌥☁\uFE0F🌦🌧⛈🌩🌨' const result = truncateWithEllipsis(str, 13) - expect(result).toEqual('🌝🌛🌜🌚🌕🌖🌗🌘🌑🌒🌓🌔☀\uFE0F…') + assert.equal(result, '🌝🌛🌜🌚🌕🌖🌗🌘🌑🌒🌓🌔☀\uFE0F…') }) }) diff --git a/app/test/unit/unique-coauthors-as-authors-test.ts b/app/test/unit/unique-coauthors-as-authors-test.ts index 1f4eb7bba00..dbc4ab76461 100644 --- a/app/test/unit/unique-coauthors-as-authors-test.ts +++ b/app/test/unit/unique-coauthors-as-authors-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { ITrailer } from '../../src/lib/git' import { getUniqueCoauthorsAsAuthors } from '../../src/lib/unique-coauthors-as-authors' import { Commit } from '../../src/models/commit' @@ -16,7 +18,7 @@ describe('getUniqueCoauthorsAsAuthors', () => { ] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(0) + assert.equal(coAuthors.length, 0) }) it('gets coauthor from commit with coauthor', async () => { @@ -26,10 +28,10 @@ describe('getUniqueCoauthorsAsAuthors', () => { const commits: Commit[] = [buildTestCommit(trailers)] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(1) + assert.equal(coAuthors.length, 1) const coAuthor = coAuthors[0] - expect(coAuthor.email).toBe(email) - expect(coAuthor.name).toBe(name) + assert.equal(coAuthor.email, email) + assert.equal(coAuthor.name, name) }) it('does not return duplicate authors', async () => { @@ -44,10 +46,10 @@ describe('getUniqueCoauthorsAsAuthors', () => { ] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(1) + assert.equal(coAuthors.length, 1) const coAuthor = coAuthors[0] - expect(coAuthor.email).toBe(email) - expect(coAuthor.name).toBe(name) + assert.equal(coAuthor.email, email) + assert.equal(coAuthor.name, name) }) it('does not return duplicate authors when name is different and email is the same', async () => { @@ -63,7 +65,7 @@ describe('getUniqueCoauthorsAsAuthors', () => { ] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(2) + assert.equal(coAuthors.length, 2) }) it('does not return duplicate authors when email is different and name is the same', async () => { @@ -80,7 +82,7 @@ describe('getUniqueCoauthorsAsAuthors', () => { ] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(2) + assert.equal(coAuthors.length, 2) }) it('can get multiple coauthors on multiple commits', async () => { @@ -99,10 +101,10 @@ describe('getUniqueCoauthorsAsAuthors', () => { ] const coAuthors = getUniqueCoauthorsAsAuthors(commits) - expect(coAuthors).toBeArrayOfSize(2) + assert.equal(coAuthors.length, 2) const coAuthorEmails = coAuthors.map(c => c.email) - expect(coAuthorEmails).toContain(first_email) - expect(coAuthorEmails).toContain(second_email) + assert(coAuthorEmails.includes(first_email)) + assert(coAuthorEmails.includes(second_email)) }) }) diff --git a/app/test/unit/welcome-test.ts b/app/test/unit/welcome-test.ts index 38140c94d6f..e9be0535f96 100644 --- a/app/test/unit/welcome-test.ts +++ b/app/test/unit/welcome-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import { hasShownWelcomeFlow, markWelcomeFlowComplete, @@ -12,22 +14,22 @@ describe('Welcome', () => { }) it('defaults to false when no value found', () => { - expect(hasShownWelcomeFlow()).toBe(false) + assert.equal(hasShownWelcomeFlow(), false) }) it('returns false for some non-numeric value', () => { localStorage.setItem(key, 'a') - expect(hasShownWelcomeFlow()).toBe(false) + assert.equal(hasShownWelcomeFlow(), false) }) it('returns false when zero found', () => { localStorage.setItem(key, '0') - expect(hasShownWelcomeFlow()).toBe(false) + assert.equal(hasShownWelcomeFlow(), false) }) it('returns true when one found', () => { localStorage.setItem(key, '1') - expect(hasShownWelcomeFlow()).toBe(true) + assert.equal(hasShownWelcomeFlow(), true) }) }) @@ -35,7 +37,7 @@ describe('Welcome', () => { it('sets localStorage to 1', () => { markWelcomeFlowComplete() const value = localStorage.getItem(key) - expect(value).toBe('1') + assert.equal(value, '1') }) }) }) diff --git a/app/test/unit/wrap-rich-text-commit-message-test.ts b/app/test/unit/wrap-rich-text-commit-message-test.ts index c91b3eaf083..6fa04dd3eaf 100644 --- a/app/test/unit/wrap-rich-text-commit-message-test.ts +++ b/app/test/unit/wrap-rich-text-commit-message-test.ts @@ -1,3 +1,5 @@ +import { describe, it } from 'node:test' +import assert from 'node:assert' import { wrapRichTextCommitMessage } from '../../src/lib/wrap-rich-text-commit-message' import { TokenType, @@ -31,11 +33,11 @@ describe('wrapRichTextCommitMessage', () => { 'weshouldnothardwrapthislongsummarywhichisexactly72charactersyeswetotally' const { summary, body } = wrap(summaryText) - expect(summary.length).toBe(1) - expect(body.length).toBe(0) + assert.equal(summary.length, 1) + assert.equal(body.length, 0) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe(summaryText) + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, summaryText) }) it('hard wraps text longer than 72 chars', async () => { @@ -43,18 +45,18 @@ describe('wrapRichTextCommitMessage', () => { 'weshouldabsolutelyhardwrapthislongsummarywhichexceeds72charactersyeswetotallyshould' const { summary, body } = wrap(summaryText) - expect(summary.length).toBe(2) - expect(body.length).toBe(2) + assert.equal(summary.length, 2) + assert.equal(body.length, 2) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe(summaryText.substring(0, 72)) - expect(summary[1].kind).toBe(TokenType.Text) - expect(summary[1].text).toBe('…') + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, summaryText.substring(0, 72)) + assert.equal(summary[1].kind, TokenType.Text) + assert.equal(summary[1].text, '…') - expect(body[0].kind).toBe(TokenType.Text) - expect(body[0].text).toBe('…') - expect(body[1].kind).toBe(TokenType.Text) - expect(body[1].text).toBe(summaryText.substring(72)) + assert.equal(body[0].kind, TokenType.Text) + assert.equal(body[0].text, '…') + assert.equal(body[1].kind, TokenType.Text) + assert.equal(body[1].text, summaryText.substring(72)) }) it('hard wraps text longer than 72 chars and joins it with the body', async () => { @@ -63,18 +65,18 @@ describe('wrapRichTextCommitMessage', () => { const bodyText = 'oh hi' const { summary, body } = wrap(summaryText, bodyText) - expect(summary.length).toBe(2) - expect(body.length).toBe(4) + assert.equal(summary.length, 2) + assert.equal(body.length, 4) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe(summaryText.substring(0, 72)) - expect(summary[1].kind).toBe(TokenType.Text) - expect(summary[1].text).toBe('…') + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, summaryText.substring(0, 72)) + assert.equal(summary[1].kind, TokenType.Text) + assert.equal(summary[1].text, '…') - expect(body[0].text).toBe('…') - expect(body[1].text).toBe(summaryText.substring(72)) - expect(body[2].text).toBe('\n\n') - expect(body[3].text).toBe(bodyText) + assert.equal(body[0].text, '…') + assert.equal(body[1].text, summaryText.substring(72)) + assert.equal(body[2].text, '\n\n') + assert.equal(body[3].text, bodyText) }) it('handles summaries which are exactly 72 chars after link shortening', async () => { @@ -82,15 +84,15 @@ describe('wrapRichTextCommitMessage', () => { 'This issue summary should be exactly 72 chars including the issue no: https://github.com/niik/commit-summary-wrap-tests/issues/1' const { summary, body } = wrap(summaryText) - expect(summary.length).toBe(2) - expect(body.length).toBe(0) + assert.equal(summary.length, 2) + assert.equal(body.length, 0) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe( + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, 'This issue summary should be exactly 72 chars including the issue no: ' ) - expect(summary[1].kind).toBe(TokenType.Link) - expect(summary[1].text).toBe('#1') + assert.equal(summary[1].kind, TokenType.Link) + assert.equal(summary[1].text, '#1') }) it('takes issue link shortening into consideration', async () => { @@ -98,16 +100,16 @@ describe('wrapRichTextCommitMessage', () => { 'This issue link should be shortened to well under 72 characters: https://github.com/niik/commit-summary-wrap-tests/issues/1' const { summary, body } = wrap(summaryText, '') - expect(summary.length).toBe(2) - expect(body.length).toBe(0) + assert.equal(summary.length, 2) + assert.equal(body.length, 0) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe( + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, 'This issue link should be shortened to well under 72 characters: ' ) - expect(summary[1].kind).toBe(TokenType.Link) - expect(summary[1].text).toBe('#1') - expect((summary[1] as HyperlinkMatch).url).toBe( + assert.equal(summary[1].kind, TokenType.Link) + assert.equal(summary[1].text, '#1') + assert.equal((summary[1] as HyperlinkMatch).url, 'https://github.com/niik/commit-summary-wrap-tests/issues/1' ) }) @@ -117,11 +119,11 @@ describe('wrapRichTextCommitMessage', () => { 'Multiple links are fine https://github.com/niik/commit-summary-wrap-tests/issues/1 https://github.com/niik/commit-summary-wrap-tests/issues/2 https://github.com/niik/commit-summary-wrap-tests/issues/3 https://github.com/niik/commit-summary-wrap-tests/issues/4' const { summary, body } = wrap(summaryText, '') - expect(summary.length).toBe(8) - expect(body.length).toBe(0) + assert.equal(summary.length, 8) + assert.equal(body.length, 0) const flattened = summary.map(x => x.text).join('') - expect(flattened).toBe('Multiple links are fine #1 #2 #3 #4') + assert.equal(flattened, 'Multiple links are fine #1 #2 #3 #4') }) it('wraps links properly', async () => { @@ -129,29 +131,29 @@ describe('wrapRichTextCommitMessage', () => { 'Link should be truncated but open our release notes https://desktop.github.com/release-notes/' const { summary, body } = wrap(summaryText, '') - expect(summary.length).toBe(3) - expect(body.length).toBe(2) + assert.equal(summary.length, 3) + assert.equal(body.length, 2) - expect(summary[0].kind).toBe(TokenType.Text) - expect(summary[0].text).toBe( + assert.equal(summary[0].kind, TokenType.Text) + assert.equal(summary[0].text, 'Link should be truncated but open our release notes ' ) - expect(summary[1].kind).toBe(TokenType.Link) - expect(summary[1].text).toBe('https://desktop.gith') - expect((summary[1] as HyperlinkMatch).url).toBe( + assert.equal(summary[1].kind, TokenType.Link) + assert.equal(summary[1].text, 'https://desktop.gith') + assert.equal((summary[1] as HyperlinkMatch).url, 'https://desktop.github.com/release-notes/' ) - expect(summary[2].kind).toBe(TokenType.Text) - expect(summary[2].text).toBe('…') + assert.equal(summary[2].kind, TokenType.Text) + assert.equal(summary[2].text, '…') - expect(body[0].kind).toBe(TokenType.Text) - expect(body[0].text).toBe('…') + assert.equal(body[0].kind, TokenType.Text) + assert.equal(body[0].text, '…') - expect(body[1].kind).toBe(TokenType.Link) - expect(body[1].text).toBe('ub.com/release-notes/') - expect((body[1] as HyperlinkMatch).url).toBe( + assert.equal(body[1].kind, TokenType.Link) + assert.equal(body[1].text, 'ub.com/release-notes/') + assert.equal((body[1] as HyperlinkMatch).url, 'https://desktop.github.com/release-notes/' ) }) diff --git a/app/test/unit/write-default-readme-test.ts b/app/test/unit/write-default-readme-test.ts index 0d8a3387edd..de4166b5631 100644 --- a/app/test/unit/write-default-readme-test.ts +++ b/app/test/unit/write-default-readme-test.ts @@ -1,3 +1,5 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' import * as FSE from 'fs-extra' import * as path from 'path' import { mkdirSync } from '../helpers/temp' @@ -18,7 +20,7 @@ describe('repository setup', () => { await writeDefaultReadme(directory, 'some-repository') const text = await FSE.readFile(file, 'utf8') - expect(text).toBe('# some-repository\n') + assert.equal(text, '# some-repository\n') }) it('writes a README with description when provided', async () => { @@ -29,7 +31,7 @@ describe('repository setup', () => { ) const text = await FSE.readFile(file, 'utf8') - expect(text).toBe('# some-repository\ndescription goes here\n') + assert.equal(text, '# some-repository\ndescription goes here\n') }) }) }) diff --git a/package.json b/package.json index 932e4c8f988..d61de067db0 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,8 @@ "cli": "ts-node app/src/cli/main.ts", "check:eslint": "tsc -P eslint-rules/", "test:eslint": "jest eslint-rules/tests/*.test.js", - "test:unit": "cross-env ELECTRON_RUN_AS_NODE=1 NODE_OPTIONS='--max_old_space_size=4096' ./node_modules/.bin/electron ./node_modules/jest/bin/jest --detectOpenHandles --silent --testLocationInResults --config ./app/jest.unit.config.js", "test:script": "jest --silent --config ./script/jest.config.js", - "test": "yarn test:unit --runInBand && yarn test:script", + "test": "node script/test.mjs", "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts", "test:review": "ts-node -P script/tsconfig.json script/test-review.ts", "postinstall": "ts-node -P script/tsconfig.json script/post-install.ts", @@ -69,19 +68,21 @@ "css-loader": "^7.1.2", "eslint": "^8.55.0", "eslint-config-prettier": "^6.11.0", - "eslint-plugin-jsdoc": "^43.0.1", + "eslint-plugin-jsdoc": "^50.6.2", "eslint-plugin-json": "^2.1.1", "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-react": "^7.33.2", - "fake-indexeddb": "^5.0.1", + "fake-indexeddb": "^6.0.0", "front-matter": "^2.3.0", "fs-extra": "^9.0.1", "glob": "^7.1.2", + "global-jsdom": "^26.0.0", "html-webpack-plugin": "^5.6.0", "jest": "^29.7.0", "jest-diff": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jest-extended": "^4.0.2", + "jsdom": "^26.0.0", "klaw-sync": "^3.0.0", "legal-eagle": "0.16.0", "mini-css-extract-plugin": "^2.9.1", @@ -97,7 +98,7 @@ "ts-jest": "^29.1.1", "ts-loader": "^9", "ts-node": "^7.0.0", - "typescript": "^5.6.3", + "typescript": "^5.8.2", "webpack": "^5.94.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-dev-middleware": "^5.3.4", @@ -127,7 +128,7 @@ "@types/memoize-one": "^3.1.1", "@types/minimist": "^1.2.5", "@types/mri": "^1.1.0", - "@types/node": "22.7.4", + "@types/node": "22.10.9", "@types/parse-dds": "^1.0.3", "@types/plist": "^3.0.2", "@types/prettier": "^2.0.1", @@ -161,6 +162,7 @@ "eslint-plugin-github": "^5.1.5", "markdownlint-cli": "^0.32.2", "reserved-words": "^0.1.2", - "tsconfig-paths": "^3.9.0" + "tsconfig-paths": "^3.9.0", + "tsx": "^4.19.3" } } diff --git a/script/test.mjs b/script/test.mjs new file mode 100644 index 00000000000..4d9da8dea56 --- /dev/null +++ b/script/test.mjs @@ -0,0 +1,42 @@ +import { spawn } from 'child_process' +import { join, resolve } from 'path' +import { readdir, readFile } from 'fs/promises' +import { parseEnv } from 'util' + +function reporter(r) { + return ['--test-reporter', r, '--test-reporter-destination', 'stdout'] +} + +const files = + process.argv.length > 2 + ? process.argv.slice(2) + : await readdir('app/test/unit', { recursive: true }).then(x => + x + .filter(f => f.endsWith('-test.ts')) + .map(f => join('app', 'test', 'unit', f)) + ) + +// I would _looooove_ to use the `--env-file` option, but it doesn't override +// existing environment variables and we need to override some of them. +Object.entries( + parseEnv(await readFile(join(import.meta.dirname, '..', '.test.env'), 'utf8')) +).forEach(([k, v]) => { + process.env[k] = v +}) + +const args = [ + '--disable-warning=ExperimentalWarning', + '--experimental-test-module-mocks', + ...['--import', 'tsx'], + ...['--import', './app/test/__mocks__/electron.mjs'], + ...['--import', './app/test/globals.ts'], + '--test', + ...reporter('spec'), + ...(process.env.GITHUB_ACTIONS ? reporter('node-test-github-reporter') : []), + ...files, +] + +spawn('node', args, { + stdio: 'inherit', + cwd: resolve(import.meta.dirname, '..'), +}).on('exit', process.exit) diff --git a/yarn.lock b/yarn.lock index 8dd75730fdf..16e2cf5cc4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,6 +15,17 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" +"@asamuzakjp/css-color@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.1.1.tgz#41a612834dafd9353b89855b37baa8a03fb67bf2" + integrity sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA== + dependencies: + "@csstools/css-calc" "^2.1.2" + "@csstools/css-color-parser" "^3.0.8" + "@csstools/css-parser-algorithms" "^3.0.4" + "@csstools/css-tokenizer" "^3.0.3" + lru-cache "^10.4.3" + "@azure/abort-controller@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249" @@ -585,6 +596,34 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@csstools/color-helpers@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8" + integrity sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA== + +"@csstools/css-calc@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.2.tgz#bffd55f002dab119b76d4023f95cd943e6c8c11e" + integrity sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw== + +"@csstools/css-color-parser@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz#5fe9322920851450bf5e065c2b0e731b9e165394" + integrity sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ== + dependencies: + "@csstools/color-helpers" "^5.0.2" + "@csstools/css-calc" "^2.1.2" + +"@csstools/css-parser-algorithms@^3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356" + integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A== + +"@csstools/css-tokenizer@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2" + integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw== + "@discoveryjs/json-ext@0.5.7": version "0.5.7" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" @@ -648,14 +687,139 @@ minimatch "^3.0.4" plist "^3.0.4" -"@es-joy/jsdoccomment@~0.37.1": - version "0.37.1" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd" - integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg== - dependencies: - comment-parser "1.3.1" - esquery "^1.5.0" - jsdoc-type-pratt-parser "~4.0.0" +"@es-joy/jsdoccomment@~0.49.0": + version "0.49.0" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz#e5ec1eda837c802eca67d3b29e577197f14ba1db" + integrity sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q== + dependencies: + comment-parser "1.4.1" + esquery "^1.6.0" + jsdoc-type-pratt-parser "~4.1.0" + +"@esbuild/aix-ppc64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz#c33cf6bbee34975626b01b80451cbb72b4c6c91d" + integrity sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ== + +"@esbuild/android-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz#ea766015c7d2655164f22100d33d7f0308a28d6d" + integrity sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA== + +"@esbuild/android-arm@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.1.tgz#e84d2bf2fe2e6177a0facda3a575b2139fd3cb9c" + integrity sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q== + +"@esbuild/android-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.1.tgz#58337bee3bc6d78d10425e5500bd11370cfdfbed" + integrity sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw== + +"@esbuild/darwin-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz#a46805c1c585d451aa83be72500bd6e8495dd591" + integrity sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ== + +"@esbuild/darwin-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz#0643e003bb238c63fc93ddbee7d26a003be3cd98" + integrity sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA== + +"@esbuild/freebsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz#cff18da5469c09986b93e87979de5d6872fe8f8e" + integrity sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A== + +"@esbuild/freebsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz#362fc09c2de14987621c1878af19203c46365dde" + integrity sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww== + +"@esbuild/linux-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz#aa90d5b02efc97a271e124e6d1cea490634f7498" + integrity sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ== + +"@esbuild/linux-arm@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz#dfcefcbac60a20918b19569b4b657844d39db35a" + integrity sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ== + +"@esbuild/linux-ia32@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz#6f9527077ccb7953ed2af02e013d4bac69f13754" + integrity sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ== + +"@esbuild/linux-loong64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz#287d2412a5456e5860c2839d42a4b51284d1697c" + integrity sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg== + +"@esbuild/linux-mips64el@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz#530574b9e1bc5d20f7a4f44c5f045e26f3783d57" + integrity sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg== + +"@esbuild/linux-ppc64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz#5d7e6b283a0b321ea42c6bc0abeb9eb99c1f5589" + integrity sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg== + +"@esbuild/linux-riscv64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz#14fa0cd073c26b4ee2465d18cd1e18eea7859fa8" + integrity sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ== + +"@esbuild/linux-s390x@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz#e677b4b9d1b384098752266ccaa0d52a420dc1aa" + integrity sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ== + +"@esbuild/linux-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz#f1c796b78fff5ce393658313e8c58613198d9954" + integrity sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA== + +"@esbuild/netbsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz#0d280b7dfe3973f111b02d5fe9f3063b92796d29" + integrity sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g== + +"@esbuild/netbsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz#be663893931a4bb3f3a009c5cc24fa9681cc71c0" + integrity sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA== + +"@esbuild/openbsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz#d9021b884233673a05dc1cc26de0bf325d824217" + integrity sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg== + +"@esbuild/openbsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz#9f1dc1786ed2e2938c404b06bcc48be9a13250de" + integrity sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw== + +"@esbuild/sunos-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz#89aac24a4b4115959b3f790192cf130396696c27" + integrity sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg== + +"@esbuild/win32-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz#354358647a6ea98ea6d243bf48bdd7a434999582" + integrity sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ== + +"@esbuild/win32-ia32@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz#8cea7340f2647eba951a041dc95651e3908cd4cb" + integrity sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A== + +"@esbuild/win32-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz#7d79922cb2d88f9048f06393dbf62d2e4accb584" + integrity sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -1421,12 +1585,12 @@ dependencies: undici-types "~6.19.2" -"@types/node@22.7.4": - version "22.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" - integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== +"@types/node@22.10.9": + version "22.10.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.9.tgz#b62b5e8485b9b412262466209280405525320108" + integrity sha512-Ir6hwgsKyNESl/gLOcEz3krR4CBGgliDqBQ2ma4wIhEx0w+xnoeTq3tdrNw15kU3SxogDjOgv9sqdtLW8mIHaw== dependencies: - undici-types "~6.19.2" + undici-types "~6.20.0" "@types/node@^20.9.0": version "20.12.12" @@ -2121,6 +2285,11 @@ agent-base@^7.0.2, agent-base@^7.1.0: dependencies: debug "^4.3.4" +agent-base@^7.1.2: + version "7.1.3" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" + integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== + airbnb-browser-shims@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/airbnb-browser-shims/-/airbnb-browser-shims-3.0.0.tgz#7978e65fa106f7436a6ae2cad9ad871982e13c7d" @@ -2686,6 +2855,14 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" +call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6" + integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -2920,10 +3097,10 @@ commander@~9.4.0: resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c" integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw== -comment-parser@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b" - integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA== +comment-parser@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc" + integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg== compare-version@^0.1.2: version "0.1.2" @@ -3035,6 +3212,14 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +cssstyle@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.3.0.tgz#83db22d1aec8eb7e5ecd812b4d14a17fb3dd243d" + integrity sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ== + dependencies: + "@asamuzakjp/css-color" "^3.1.1" + rrweb-cssom "^0.8.0" + csstype@^3.0.2: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" @@ -3059,6 +3244,14 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" +data-urls@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde" + integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg== + dependencies: + whatwg-mimetype "^4.0.0" + whatwg-url "^14.0.0" + debounce@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" @@ -3085,6 +3278,13 @@ debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.6: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== + dependencies: + ms "^2.1.3" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -3095,6 +3295,11 @@ decimal.js@^10.4.2: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== +decimal.js@^10.4.3: + version "10.5.0" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22" + integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw== + decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -3288,6 +3493,15 @@ dot-case@^3.0.4: no-case "^3.0.4" tslib "^2.0.3" +dunder-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" + integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A== + dependencies: + call-bind-apply-helpers "^1.0.1" + es-errors "^1.3.0" + gopd "^1.2.0" + duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" @@ -3406,7 +3620,7 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.4.0: +entities@^4.4.0, entities@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -3564,6 +3778,16 @@ es-abstract@^1.5.1, es-abstract@^1.7.0: is-callable "^1.1.3" is-regex "^1.0.4" +es-define-property@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" + integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g== + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-iterator-helpers@^1.0.12: version "1.0.15" resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40" @@ -3589,6 +3813,18 @@ es-module-lexer@^1.2.1: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78" integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw== +es-module-lexer@^1.5.3: + version "1.6.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21" + integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ== + +es-object-atoms@^1.0.0, es-object-atoms@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1" + integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA== + dependencies: + es-errors "^1.3.0" + es-set-tostringtag@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" @@ -3598,6 +3834,16 @@ es-set-tostringtag@^2.0.1: has "^1.0.3" has-tostringtag "^1.0.0" +es-set-tostringtag@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d" + integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA== + dependencies: + es-errors "^1.3.0" + get-intrinsic "^1.2.6" + has-tostringtag "^1.0.2" + hasown "^2.0.2" + es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -3638,6 +3884,37 @@ es6-shim@^0.35.3: resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26" integrity sha1-m/tzY/7//4emzbbNk+QF7DxLbyY= +esbuild@~0.25.0: + version "0.25.1" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.1.tgz#a16b8d070b6ad4871935277bda6ccfe852e3fa2f" + integrity sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ== + optionalDependencies: + "@esbuild/aix-ppc64" "0.25.1" + "@esbuild/android-arm" "0.25.1" + "@esbuild/android-arm64" "0.25.1" + "@esbuild/android-x64" "0.25.1" + "@esbuild/darwin-arm64" "0.25.1" + "@esbuild/darwin-x64" "0.25.1" + "@esbuild/freebsd-arm64" "0.25.1" + "@esbuild/freebsd-x64" "0.25.1" + "@esbuild/linux-arm" "0.25.1" + "@esbuild/linux-arm64" "0.25.1" + "@esbuild/linux-ia32" "0.25.1" + "@esbuild/linux-loong64" "0.25.1" + "@esbuild/linux-mips64el" "0.25.1" + "@esbuild/linux-ppc64" "0.25.1" + "@esbuild/linux-riscv64" "0.25.1" + "@esbuild/linux-s390x" "0.25.1" + "@esbuild/linux-x64" "0.25.1" + "@esbuild/netbsd-arm64" "0.25.1" + "@esbuild/netbsd-x64" "0.25.1" + "@esbuild/openbsd-arm64" "0.25.1" + "@esbuild/openbsd-x64" "0.25.1" + "@esbuild/sunos-x64" "0.25.1" + "@esbuild/win32-arm64" "0.25.1" + "@esbuild/win32-ia32" "0.25.1" + "@esbuild/win32-x64" "0.25.1" + escalade@^3.1.1, escalade@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" @@ -3773,19 +4050,22 @@ eslint-plugin-import@^2.25.2: resolve "^1.22.0" tsconfig-paths "^3.14.1" -eslint-plugin-jsdoc@^43.0.1: - version "43.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.1.1.tgz#fc72ba21597cc99b1a0dc988aebb9bb57d0ec492" - integrity sha512-J2kjjsJ5vBXSyNzqJhceeSGTAgVgZHcPSJKo3vD4tNjUdfky98rR2VfZUDsS1GKL6isyVa8GWvr+Az7Vyg2HXA== +eslint-plugin-jsdoc@^50.6.2: + version "50.6.9" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.9.tgz#b4afc06110958b9c525456b6c4348bf14e21c298" + integrity sha512-7/nHu3FWD4QRG8tCVqcv+BfFtctUtEDWc29oeDXB4bwmDM2/r1ndl14AG/2DUntdqH7qmpvdemJKwb3R97/QEw== dependencies: - "@es-joy/jsdoccomment" "~0.37.1" + "@es-joy/jsdoccomment" "~0.49.0" are-docs-informative "^0.0.2" - comment-parser "1.3.1" - debug "^4.3.4" + comment-parser "1.4.1" + debug "^4.3.6" escape-string-regexp "^4.0.0" - esquery "^1.5.0" - semver "^7.5.0" - spdx-expression-parse "^3.0.1" + espree "^10.1.0" + esquery "^1.6.0" + parse-imports "^2.1.1" + semver "^7.6.3" + spdx-expression-parse "^4.0.0" + synckit "^0.9.1" eslint-plugin-json@^2.1.1: version "2.1.2" @@ -3939,7 +4219,7 @@ eslint@^8.55.0: strip-ansi "^6.0.1" text-table "^0.2.0" -espree@^10.0.1: +espree@^10.0.1, espree@^10.1.0: version "10.3.0" resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a" integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg== @@ -3962,13 +4242,20 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.4.2, esquery@^1.5.0: +esquery@^1.4.2: version "1.5.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" +esquery@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" + integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== + dependencies: + estraverse "^5.1.0" + esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" @@ -4048,10 +4335,10 @@ extract-zip@^2.0.0, extract-zip@^2.0.1: optionalDependencies: "@types/yauzl" "^2.9.1" -fake-indexeddb@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-5.0.1.tgz#1111a2b6981eaaad03027d816a8536a940d36cee" - integrity sha512-vxybH29Owtc6khV/Usy47B1g+eKwyhFiX8nwpCC4td320jvwrKQDH6vNtcJZgUzVxmfsSIlHzLKQzT76JMCO7A== +fake-indexeddb@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-6.0.0.tgz#3173d5ad141436dace95f8de6e9ecdc3d9787d5d" + integrity sha512-YEboHE5VfopUclOck7LncgIqskAqnv4q0EWbYCaxKKjAvO93c+TJIaBuGy8CBFdbg9nKdpN3AuPRwVBJ4k7NrQ== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -4225,6 +4512,16 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c" + integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + es-set-tostringtag "^2.1.0" + mime-types "^2.1.12" + front-matter@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.3.0.tgz#7203af896ce357ee04e2aa45169ea91ed7f67504" @@ -4288,7 +4585,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^2.3.2: +fsevents@^2.3.2, fsevents@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== @@ -4380,6 +4677,22 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: has-proto "^1.0.1" has-symbols "^1.0.3" +get-intrinsic@^1.2.6: + version "1.3.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01" + integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ== + dependencies: + call-bind-apply-helpers "^1.0.2" + es-define-property "^1.0.1" + es-errors "^1.3.0" + es-object-atoms "^1.1.1" + function-bind "^1.1.2" + get-proto "^1.0.1" + gopd "^1.2.0" + has-symbols "^1.1.0" + hasown "^2.0.2" + math-intrinsics "^1.1.0" + get-package-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-package-info/-/get-package-info-1.0.0.tgz#6432796563e28113cd9474dbbd00052985a4999c" @@ -4395,6 +4708,14 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== +get-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" + integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g== + dependencies: + dunder-proto "^1.0.1" + es-object-atoms "^1.0.0" + get-stdin@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" @@ -4425,6 +4746,13 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-tsconfig@^4.7.5: + version "4.10.0" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.0.tgz#403a682b373a823612475a4c2928c7326fc0f6bb" + integrity sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A== + dependencies: + resolve-pkg-maps "^1.0.0" + glob-parent@^5.1.2, glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -4515,6 +4843,11 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" +global-jsdom@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/global-jsdom/-/global-jsdom-26.0.0.tgz#fcddd40f81ff11531e5ce87e1a377af016018e98" + integrity sha512-BqXpTNZFjP40N+s4k8Bk9HS8GFVPJB/+TKtwcShM84wLv6C5dH9o1dydI3pL6potanhfDiIAVDbaaGj/uSdRSA== + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -4570,6 +4903,11 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" +gopd@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" + integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== + got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" @@ -4673,6 +5011,11 @@ has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +has-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" + integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== + has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -4680,6 +5023,13 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + has@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" @@ -4701,6 +5051,13 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" +hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -4718,6 +5075,13 @@ html-encoding-sniffer@^3.0.0: dependencies: whatwg-encoding "^2.0.0" +html-encoding-sniffer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448" + integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ== + dependencies: + whatwg-encoding "^3.1.1" + html-entities@^2.1.0: version "2.5.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" @@ -4776,7 +5140,7 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-proxy-agent@^7.0.0: +http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== @@ -4808,6 +5172,14 @@ https-proxy-agent@^7.0.0: agent-base "^7.0.2" debug "4" +https-proxy-agent@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" + integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== + dependencies: + agent-base "^7.1.2" + debug "4" + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -5704,10 +6076,10 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdoc-type-pratt-parser@~4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114" - integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ== +jsdoc-type-pratt-parser@~4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz#ff6b4a3f339c34a6c188cbf50a16087858d22113" + integrity sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg== jsdom@^20.0.0: version "20.0.3" @@ -5741,6 +6113,33 @@ jsdom@^20.0.0: ws "^8.11.0" xml-name-validator "^4.0.0" +jsdom@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-26.0.0.tgz#446dd1ad8cfc50df7e714e58f1f972c1763b354c" + integrity sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw== + dependencies: + cssstyle "^4.2.1" + data-urls "^5.0.0" + decimal.js "^10.4.3" + form-data "^4.0.1" + html-encoding-sniffer "^4.0.0" + http-proxy-agent "^7.0.2" + https-proxy-agent "^7.0.6" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.16" + parse5 "^7.2.1" + rrweb-cssom "^0.8.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^5.0.0" + w3c-xmlserializer "^5.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^3.1.1" + whatwg-mimetype "^4.0.0" + whatwg-url "^14.1.0" + ws "^8.18.0" + xml-name-validator "^5.0.0" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -6078,6 +6477,11 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lru-cache@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" + integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== + lru-cache@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.0.tgz#15d93a196f189034d7166caf9fe55e7384c98a21" @@ -6172,6 +6576,11 @@ matchmedia-polyfill@^0.3.1: resolved "https://registry.yarnpkg.com/matchmedia-polyfill/-/matchmedia-polyfill-0.3.1.tgz#83e754b3b4a297179fcdb71c3aefa0980bff7b18" integrity sha512-3zLYw2mf078kXzJv/At7FzWC4O5BAtiy+D4sRevC/lewLlhMtVHDS35eWhlP+fQzI/UUiBVu+ez0rsJJzW88iQ== +math-intrinsics@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" + integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g== + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -6309,7 +6718,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -6390,6 +6799,11 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" +nwsapi@^2.2.16: + version "2.2.19" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.19.tgz#586660f7c24c34691907002309a8dc28064c9c0b" + integrity sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA== + nwsapi@^2.2.2: version "2.2.7" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" @@ -6658,6 +7072,14 @@ parse-dds@^1.2.1: resolved "https://registry.yarnpkg.com/parse-dds/-/parse-dds-1.2.1.tgz#b16533e00c4db91178b3460271361df4cb328164" integrity sha512-oE88N8mzUi9d26tAaKVc0clxi6AjeTSWpLwgtcEVjXTYY1MW58w8FctmM9gGgvFd6YGu1/eFFYVeDVnlMsKBtA== +parse-imports@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/parse-imports/-/parse-imports-2.2.1.tgz#0a6e8b5316beb5c9905f50eb2bbb8c64a4805642" + integrity sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ== + dependencies: + es-module-lexer "^1.5.3" + slashes "^3.0.12" + parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -6682,6 +7104,13 @@ parse5@^7.0.0, parse5@^7.1.1: dependencies: entities "^4.4.0" +parse5@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" + integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ== + dependencies: + entities "^4.5.0" + pascal-case@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" @@ -6928,7 +7357,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== @@ -7149,6 +7578,11 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + resolve.exports@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" @@ -7230,6 +7664,11 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +rrweb-cssom@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2" + integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw== + run-con@~1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/run-con/-/run-con-1.2.11.tgz#0014ed430bad034a60568dfe7de2235f32e3f3c4" @@ -7350,7 +7789,7 @@ semver@^7.3.7, semver@^7.5.3, semver@^7.5.4: dependencies: lru-cache "^6.0.0" -semver@^7.5.0, semver@^7.6.0, semver@^7.6.3: +semver@^7.6.0, semver@^7.6.3: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -7450,6 +7889,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slashes@^3.0.12: + version "3.0.12" + resolved "https://registry.yarnpkg.com/slashes/-/slashes-3.0.12.tgz#3d664c877ad542dc1509eaf2c50f38d483a6435a" + integrity sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA== + slide@~1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" @@ -7498,10 +7942,10 @@ spdx-exceptions@^2.1.0: resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== -spdx-expression-parse@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== +spdx-expression-parse@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794" + integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" @@ -7869,6 +8313,18 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +tldts-core@^6.1.85: + version "6.1.85" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.85.tgz#6f6b795468c0b5f7660a11c7306ff2766ceaea7e" + integrity sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA== + +tldts@^6.1.32: + version "6.1.85" + resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.85.tgz#c7636ad5ec2f02591264360da51c6b584ef6f7bb" + integrity sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w== + dependencies: + tldts-core "^6.1.85" + tmp-promise@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.0.5.tgz#3208d7fa44758f86a2a4c4060f3c33fea30e8038" @@ -7935,6 +8391,13 @@ tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" +tough-cookie@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7" + integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A== + dependencies: + tldts "^6.1.32" + tr46@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" @@ -7942,6 +8405,13 @@ tr46@^3.0.0: dependencies: punycode "^2.1.1" +tr46@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.0.tgz#4a077922360ae807e172075ce5beb79b36e4a101" + integrity sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw== + dependencies: + punycode "^2.3.1" + trim-repeated@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" @@ -8039,6 +8509,16 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" +tsx@^4.19.3: + version "4.19.3" + resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.19.3.tgz#2bdbcb87089374d933596f8645615142ed727666" + integrity sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ== + dependencies: + esbuild "~0.25.0" + get-tsconfig "^4.7.5" + optionalDependencies: + fsevents "~2.3.3" + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -8114,10 +8594,10 @@ typescript-eslint@^8.14.0: "@typescript-eslint/parser" "8.21.0" "@typescript-eslint/utils" "8.21.0" -typescript@^5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== +typescript@^5.8.2: + version "5.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4" + integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -8159,6 +8639,11 @@ undici-types@~6.19.2: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== +undici-types@~6.20.0: + version "6.20.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" + integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -8272,6 +8757,13 @@ w3c-xmlserializer@^4.0.0: dependencies: xml-name-validator "^4.0.0" +w3c-xmlserializer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c" + integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA== + dependencies: + xml-name-validator "^5.0.0" + walker@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" @@ -8380,6 +8872,13 @@ whatwg-encoding@^2.0.0: dependencies: iconv-lite "0.6.3" +whatwg-encoding@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5" + integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ== + dependencies: + iconv-lite "0.6.3" + whatwg-fetch@^0.11.1: version "0.11.1" resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.1.tgz#6d3ded245fdd97cd728e0e2587b54b733949e663" @@ -8390,6 +8889,11 @@ whatwg-mimetype@^3.0.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== +whatwg-mimetype@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" + integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg== + whatwg-url@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" @@ -8398,6 +8902,14 @@ whatwg-url@^11.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" +whatwg-url@^14.0.0, whatwg-url@^14.1.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.2.0.tgz#4ee02d5d725155dae004f6ae95c73e7ef5d95663" + integrity sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw== + dependencies: + tr46 "^5.1.0" + webidl-conversions "^7.0.0" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -8534,11 +9046,21 @@ ws@^8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== +ws@^8.18.0: + version "8.18.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb" + integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w== + xml-name-validator@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== +xml-name-validator@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673" + integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg== + xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" From 073d03ee1e85293545f11e47d89742f075a01910 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 13:40:54 +0100 Subject: [PATCH 0246/1338] Get rid of jest-diff Had to bump the lib in script/tsconfig.json or else it wouldn't take the types in @types/diff because it didn't know about Intl.Segmenter --- app/test/unit/git/apply-test.ts | 42 ++++++++++++++++----------------- package.json | 3 ++- script/tsconfig.json | 5 ++-- yarn.lock | 41 ++++++++++---------------------- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index 996d946756b..11e4452e5ff 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -25,9 +25,9 @@ import { ITextDiff, } from '../../../src/models/diff' import { findInteractiveDiffRange } from '../../../src/ui/diff/diff-explorer' -import { diffStringsUnified } from 'jest-diff' import * as FSE from 'fs-extra' import * as Path from 'path' +import { structuredPatch } from 'diff' describe('git/apply', () => { describe('checkPatch()', () => { @@ -147,7 +147,7 @@ describe('git/apply', () => { assert.equal( getDifference(previousContents, fileContents), `@@ -7,0 +7,1 @@ -+ Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor` ++Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor` ) }) @@ -178,9 +178,9 @@ describe('git/apply', () => { assert.equal( getDifference(previousContents, fileContents), `@@ -7,0 +7,4 @@ -+ Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor -+ nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in -+ eleifend mi. ++Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor ++nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in ++eleifend mi. +` ) }) @@ -211,7 +211,7 @@ describe('git/apply', () => { assert.equal( getDifference(previousContents, fileContents), `@@ -21,1 +21,0 @@ -- nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in` +-nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in` ) }) @@ -247,33 +247,31 @@ describe('git/apply', () => { assert.equal( getDifference(previousContents, fileContents), `@@ -20,4 +20,0 @@ -- Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor -- nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in -- eleifend mi. +-Aliquam leo ipsum, laoreet sed libero at, mollis pulvinar arcu. Nullam porttitor +-nisl eget hendrerit vestibulum. Curabitur ornare id neque ac tristique. Cras in +-eleifend mi. -` ) }) }) }) -const noColor = (str: string) => str - /** * Returns a diff-style string with the line differences between two strings. */ function getDifference(before: string, after: string) { - return diffStringsUnified( + return structuredPatch( + 'before', + 'after', before.replace(/\r\n/g, '\n'), after.replace(/\r\n/g, '\n'), - { - omitAnnotationLines: true, - contextLines: 0, - expand: false, - aColor: noColor, - bColor: noColor, - changeColor: noColor, - commonColor: noColor, - patchColor: noColor, - } + undefined, + undefined, + { context: 0 } ) + .hunks.flatMap(hunk => [ + `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`, + ...hunk.lines, + ]) + .join('\n') } diff --git a/package.json b/package.json index d61de067db0..591ddf94086 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@primer/octicons": "^19.0.0", + "@types/diff": "^7.0.2", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/experimental-utils": "^5.62.0", "@typescript-eslint/parser": "^6.13.2", @@ -79,7 +80,6 @@ "global-jsdom": "^26.0.0", "html-webpack-plugin": "^5.6.0", "jest": "^29.7.0", - "jest-diff": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jest-extended": "^4.0.2", "jsdom": "^26.0.0", @@ -156,6 +156,7 @@ "@types/webpack": "^5.28.5", "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", + "diff": "^7.0.0", "electron": "34.0.1", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", diff --git a/script/tsconfig.json b/script/tsconfig.json index e58a5f45a9f..7e43139b300 100644 --- a/script/tsconfig.json +++ b/script/tsconfig.json @@ -5,7 +5,7 @@ "esModuleInterop": true, "resolveJsonModule": true, "importHelpers": true, - "target": "ES2021", + "target": "ES2022", "allowUnreachableCode": false, "allowUnusedLabels": false, "noImplicitReturns": true, @@ -13,7 +13,8 @@ "noUnusedLocals": true, "sourceMap": false, "noEmit": true, - "strict": true + "strict": true, + "lib": ["ES2022"] }, "compileOnSave": false } diff --git a/yarn.lock b/yarn.lock index 16e2cf5cc4b..ab33826963d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1360,6 +1360,11 @@ resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03" integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg== +"@types/diff@^7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@types/diff/-/diff-7.0.2.tgz#d638edebf3c97aa4962b6f1164a7921ab3de9f83" + integrity sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q== + "@types/dompurify@^2.3.1": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" @@ -3412,6 +3417,11 @@ diff@^3.1.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== +diff@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-7.0.0.tgz#3fb34d387cd76d803f6eebea67b921dab0182a9a" + integrity sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw== + dir-compare@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" @@ -7990,7 +8000,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm: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== @@ -8008,15 +8018,6 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.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== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -8131,7 +8132,7 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -"strip-ansi-cjs@npm: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== @@ -8145,13 +8146,6 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -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== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -8996,16 +8990,7 @@ worker-farm@^1.3.1: errno "^0.1.4" xtend "^4.0.1" -"wrap-ansi-cjs@npm: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@^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== From c228f7dc0165969403c5e88540d82c047ead850b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 13:41:34 +0100 Subject: [PATCH 0247/1338] Remove jest-extended --- app/test/setup-test-framework.ts | 8 -------- package.json | 1 - yarn.lock | 12 ++---------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 app/test/setup-test-framework.ts diff --git a/app/test/setup-test-framework.ts b/app/test/setup-test-framework.ts deleted file mode 100644 index b27d73108f0..00000000000 --- a/app/test/setup-test-framework.ts +++ /dev/null @@ -1,8 +0,0 @@ -// set test timeout to 10s -jest.setTimeout(10000) - -import * as matchers from 'jest-extended' -expect.extend(matchers) - -delete process.env['LOCAL_GIT_DIRECTORY'] -delete process.env['GIT_EXEC_PATH'] diff --git a/package.json b/package.json index 591ddf94086..216ccd92042 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "html-webpack-plugin": "^5.6.0", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", - "jest-extended": "^4.0.2", "jsdom": "^26.0.0", "klaw-sync": "^3.0.0", "legal-eagle": "0.16.0", diff --git a/yarn.lock b/yarn.lock index ab33826963d..5e04be48790 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5745,7 +5745,7 @@ jest-config@^29.7.0: slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^29.0.0, jest-diff@^29.7.0: +jest-diff@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a" integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== @@ -5799,15 +5799,7 @@ jest-environment-node@^29.7.0: jest-mock "^29.7.0" jest-util "^29.7.0" -jest-extended@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/jest-extended/-/jest-extended-4.0.2.tgz#d23b52e687cedf66694e6b2d77f65e211e99e021" - integrity sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog== - dependencies: - jest-diff "^29.0.0" - jest-get-type "^29.0.0" - -jest-get-type@^29.0.0, jest-get-type@^29.6.3: +jest-get-type@^29.6.3: version "29.6.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== From 6758581d3e46fe62ad6b7b7ea775980180b00a23 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:04:56 +0100 Subject: [PATCH 0248/1338] Support running eslint-rules and script tests through node test runner --- eslint-rules/tests/insecure-random.test.js | 45 +- .../react-no-unbound-dispatcher-props.test.js | 35 +- .../react-proper-lifecycle-methods.test.js | 519 +++++++++--------- .../react-readonly-props-and-state.test.js | 101 ++-- package.json | 5 +- script/changelog/test/parser-test.ts | 24 +- script/test.mjs | 29 +- 7 files changed, 399 insertions(+), 359 deletions(-) diff --git a/eslint-rules/tests/insecure-random.test.js b/eslint-rules/tests/insecure-random.test.js index 12dd02f450e..8a8f08d6fce 100644 --- a/eslint-rules/tests/insecure-random.test.js +++ b/eslint-rules/tests/insecure-random.test.js @@ -1,3 +1,4 @@ +const { describe, it } = require('node:test') // @ts-check const RuleTester = require('eslint').RuleTester @@ -8,32 +9,36 @@ const parserOptions = { sourceType: 'module', } -const ruleTester = new RuleTester({ parserOptions }) -ruleTester.run('react-no-unbound-dispatcher-props', rule, { - valid: [ - 'const b = crypto.randomBytes();', - 'const b = window.crypto.getRandomValues();', - ], - invalid: [ - { - code: 'const b = Math.random();', - errors: [{ messageId: 'mathRandomInsecure' }], - }, - { - code: ` +describe('insecure-random', () => { + it('should complain about Math.random()', () => { + const ruleTester = new RuleTester({ parserOptions }) + ruleTester.run('react-no-unbound-dispatcher-props', rule, { + valid: [ + 'const b = crypto.randomBytes();', + 'const b = window.crypto.getRandomValues();', + ], + invalid: [ + { + code: 'const b = Math.random();', + errors: [{ messageId: 'mathRandomInsecure' }], + }, + { + code: ` const crypto = require('crypto'); const b = crypto.pseudoRandomBytes();`, - errors: [{ messageId: 'pseudoRandomBytesInsecure' }], - }, - { - code: ` + errors: [{ messageId: 'pseudoRandomBytesInsecure' }], + }, + { + code: ` const { pseudoRandomBytes } = require('crypto'); const b = pseudoRandomBytes(); `, - errors: [{ messageId: 'pseudoRandomBytesInsecure' }], - }, - ], + errors: [{ messageId: 'pseudoRandomBytesInsecure' }], + }, + ], + }) + }) }) diff --git a/eslint-rules/tests/react-no-unbound-dispatcher-props.test.js b/eslint-rules/tests/react-no-unbound-dispatcher-props.test.js index 10928d95305..9f472251f41 100644 --- a/eslint-rules/tests/react-no-unbound-dispatcher-props.test.js +++ b/eslint-rules/tests/react-no-unbound-dispatcher-props.test.js @@ -1,3 +1,4 @@ +const { describe, it } = require('node:test') // @ts-check const RuleTester = require('eslint').RuleTester @@ -15,22 +16,26 @@ const parserOptions = { // Tests // ------------------------------------------------------------------------------ -const ruleTester = new RuleTester({ parserOptions }) -ruleTester.run('react-no-unbound-dispatcher-props', rule, { - valid: [ - ' { this.props.dispatcher.resetSidebarWidth }} />', - ], - invalid: [ - { - code: '', - errors: [ +describe('react-no-unbound-dispatcher-props', () => { + it('should complain about unbound dispatcher props', () => { + const ruleTester = new RuleTester({ parserOptions }) + ruleTester.run('react-no-unbound-dispatcher-props', rule, { + valid: [ + ' { this.props.dispatcher.resetSidebarWidth }} />', + ], + invalid: [ { - messageId: 'unboundMethod', - data: { - text: 'this.props.dispatcher.resetSidebarWidth', - }, + code: '', + errors: [ + { + messageId: 'unboundMethod', + data: { + text: 'this.props.dispatcher.resetSidebarWidth', + }, + }, + ], }, ], - }, - ], + }) + }) }) diff --git a/eslint-rules/tests/react-proper-lifecycle-methods.test.js b/eslint-rules/tests/react-proper-lifecycle-methods.test.js index 11aeaac2ae6..48d031c878e 100644 --- a/eslint-rules/tests/react-proper-lifecycle-methods.test.js +++ b/eslint-rules/tests/react-proper-lifecycle-methods.test.js @@ -1,5 +1,5 @@ // @ts-check - +const { describe, it } = require('node:test') const { ESLintUtils } = require('@typescript-eslint/experimental-utils') const RuleTester = ESLintUtils.RuleTester @@ -16,12 +16,15 @@ const ruleTester = new RuleTester({ sourceType: 'module', }, }) -ruleTester.run('react-proper-lifecycle-methods', rule, { - valid: [ - // component without lifecycle methods passes without errors - { - filename: 'app/src/component-no-state.tsx', - code: ` + +describe('react-proper-lifecycle-methods', () => { + it('should complain about incorrect lifecycle methods', () => { + ruleTester.run('react-proper-lifecycle-methods', rule, { + valid: [ + // component without lifecycle methods passes without errors + { + filename: 'app/src/component-no-state.tsx', + code: ` import * as React from 'react' interface ICloningRepositoryProps {} @@ -32,10 +35,10 @@ export class CloningRepositoryView extends React.Component { } } `, - }, - { - filename: 'app/src/component-lifecycle-events-with-type-literal.tsx', - code: ` + }, + { + filename: 'app/src/component-lifecycle-events-with-type-literal.tsx', + code: ` import * as React from 'react' interface IWindowControlState {} @@ -150,26 +153,26 @@ export class WindowControls extends React.Component { } } `, - }, - // a regular class with the same method name is ignored - { - filename: 'app/src/ui/other.tsx', - code: ` + }, + // a regular class with the same method name is ignored + { + filename: 'app/src/ui/other.tsx', + code: ` class Something { public componentWillUpdate(foo: string) { } } `, - }, - ], - invalid: [ - // - // shouldComponentUpdate expects the first parameter to be nextProps and match the component's prop type - // - { - filename: 'app/src/component.tsx', - code: ` + }, + ], + invalid: [ + // + // shouldComponentUpdate expects the first parameter to be nextProps and match the component's prop type + // + { + filename: 'app/src/component.tsx', + code: ` import * as React from 'react' interface ICloningRepositoryProps {} @@ -182,31 +185,31 @@ export class CloningRepositoryView extends React.Component { + it("should complain about props and state that aren't readonly", () => { + ruleTester.run('react-readonly-props-and-state', rule, { + valid: [ + { + filename: 'app/src/ui/component.tsx', + code: ` interface IBranchListItemProps { readonly name: string } `, - }, - { - filename: 'app/src/ui/component.tsx', - code: ` + }, + { + filename: 'app/src/ui/component.tsx', + code: ` interface IBranchListItemState { readonly name: string } `, - }, - { - filename: 'app/src/ui/component.tsx', - code: ` + }, + { + filename: 'app/src/ui/component.tsx', + code: ` interface ISomeOtherThing { name: string } `, - }, - { - filename: 'app/src/ui/component.tsx', - code: ` + }, + { + filename: 'app/src/ui/component.tsx', + code: ` interface ISomeState { readonly name: ReadonlyArray } `, - }, - { - filename: 'app/src/ui/diff/helper.ts', - code: ` + }, + { + filename: 'app/src/ui/diff/helper.ts', + code: ` interface IState { diffLineIndex: number previousHunkOldEndLine: number | null }`, - }, - ], - invalid: [ - { - filename: 'app/src/ui/component.tsx', - code: ` + }, + ], + invalid: [ + { + filename: 'app/src/ui/component.tsx', + code: ` interface IBranchListItemProps { name: string } `, - errors: [ - { - messageId: 'signaturesShouldBeReadonly', + errors: [ + { + messageId: 'signaturesShouldBeReadonly', + }, + ], }, - ], - }, - { - filename: 'app/src/ui/component.tsx', - code: ` + { + filename: 'app/src/ui/component.tsx', + code: ` interface IBranchListItemProps { readonly items: Array } `, - errors: [ - { - messageId: 'arraySignaturesShouldBeReadonly', + errors: [ + { + messageId: 'arraySignaturesShouldBeReadonly', + }, + ], }, - ], - }, - { - filename: 'app/src/ui/component.tsx', - code: ` + { + filename: 'app/src/ui/component.tsx', + code: ` interface IBranchListItemProps { readonly items: string[] } `, - errors: [ - { - messageId: 'arraySignaturesShouldBeReadonly', + errors: [ + { + messageId: 'arraySignaturesShouldBeReadonly', + }, + ], }, ], - }, - ], + }) + }) }) diff --git a/package.json b/package.json index 216ccd92042..f31aa97e34b 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ "scripts": { "cli": "ts-node app/src/cli/main.ts", "check:eslint": "tsc -P eslint-rules/", - "test:eslint": "jest eslint-rules/tests/*.test.js", - "test:script": "jest --silent --config ./script/jest.config.js", + "test:eslint": "node script/test.mjs eslint-rules", + "test:script": "node script/test.mjs script", "test": "node script/test.mjs", + "test:unit": "node script/test.mjs", "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts", "test:review": "ts-node -P script/tsconfig.json script/test-review.ts", "postinstall": "ts-node -P script/tsconfig.json script/post-install.ts", diff --git a/script/changelog/test/parser-test.ts b/script/changelog/test/parser-test.ts index 04a26d0cd9b..0648dc75acb 100644 --- a/script/changelog/test/parser-test.ts +++ b/script/changelog/test/parser-test.ts @@ -1,4 +1,6 @@ +import { describe, it } from 'node:test' import { findIssueRef, findReleaseNote } from '../parser' +import assert from 'node:assert' describe('changelog/parser', () => { describe('findIssueRef', () => { @@ -10,7 +12,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin tu tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor quam vel augue.` - expect(findIssueRef(body)).toBe(' #2314') + assert.equal(findIssueRef(body), ' #2314') }) it('detects multiple fixed issues in PR body', () => { @@ -22,7 +24,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin tu tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor quam vel augue.` - expect(findIssueRef(body)).toBe(' #2314 #1234') + assert.equal(findIssueRef(body), ' #2314 #1234') }) it('handles colon after fixed message', () => { @@ -35,7 +37,7 @@ Nam malesuada augue vel velit vehicula suscipit. Nunc posuere, velit at sodales malesuada, quam tellus rutrum orci, et tincidunt sem nunc non velit. Cras placerat, massa vel tristique iaculis, urna nisl tristique nibh, eget luctus nisl quam in metus.` - expect(findIssueRef(body)).toBe(' #2314') + assert.equal(findIssueRef(body), ' #2314') }) it('handles closes syntax', () => { @@ -46,12 +48,12 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin tu tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor quam vel augue.` - expect(findIssueRef(body)).toBe(' #2314') + assert.equal(findIssueRef(body), ' #2314') }) it('handles resolves syntax', () => { const body = `This resolves #2314 and is totally wild` - expect(findIssueRef(body)).toBe(' #2314') + assert.equal(findIssueRef(body), ' #2314') }) }) @@ -65,7 +67,8 @@ quam vel augue. Notes: [Fixed] Fix lorem impsum dolor sit amet ` - expect(findReleaseNote(body)).toBe( + assert.equal( + findReleaseNote(body), '[Fixed] Fix lorem impsum dolor sit amet' ) }) @@ -79,7 +82,8 @@ quam vel augue. Notes: [Fixed] Fix lorem impsum dolor sit amet. ` - expect(findReleaseNote(body)).toBe( + assert.equal( + findReleaseNote(body), '[Fixed] Fix lorem impsum dolor sit amet' ) }) @@ -94,7 +98,7 @@ Notes: ignore this notes Notes: These are valid notes ` - expect(findReleaseNote(body)).toBe('These are valid notes') + assert.equal(findReleaseNote(body), 'These are valid notes') }) it('detected no release notes wanted for the PR', () => { @@ -106,7 +110,7 @@ quam vel augue. Notes: no-notes ` - expect(findReleaseNote(body)).toBeNull() + assert.equal(findReleaseNote(body), null) }) it('detected no release notes were added to the PR', () => { @@ -115,7 +119,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin tu tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor quam vel augue.` - expect(findReleaseNote(body)).toBeUndefined() + assert.equal(findReleaseNote(body), undefined) }) }) }) diff --git a/script/test.mjs b/script/test.mjs index 4d9da8dea56..fa6b7247772 100644 --- a/script/test.mjs +++ b/script/test.mjs @@ -1,20 +1,35 @@ import { spawn } from 'child_process' import { join, resolve } from 'path' -import { readdir, readFile } from 'fs/promises' +import { readdir, readFile, stat } from 'fs/promises' import { parseEnv } from 'util' function reporter(r) { return ['--test-reporter', r, '--test-reporter-destination', 'stdout'] } +async function findTestFilesIn(paths) { + const files = [] + for (const path of paths) { + const entry = await stat(path) + if (entry.isFile()) { + files.push(path) + continue + } + + for (const file of await readdir(path, { recursive: true }).then(x => + x.filter(f => /-test\.(ts|js|mts|mjs)$/.test(f)).map(f => join(path, f)) + )) { + files.push(file) + } + } + return files +} + +const projectRoot = join(import.meta.dirname, '..') const files = process.argv.length > 2 - ? process.argv.slice(2) - : await readdir('app/test/unit', { recursive: true }).then(x => - x - .filter(f => f.endsWith('-test.ts')) - .map(f => join('app', 'test', 'unit', f)) - ) + ? await findTestFilesIn(process.argv.slice(2)) + : await findTestFilesIn([join(projectRoot, 'app', 'test', 'unit')]) // I would _looooove_ to use the `--env-file` option, but it doesn't override // existing environment variables and we need to override some of them. From 5f4c072d5edb98b04994e5b546bfb8ad447c4104 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:11:56 +0100 Subject: [PATCH 0249/1338] Get rid of jest --- .vscode/launch.json | 41 - app/jest.unit.config.js | 16 - app/src/lib/__mocks__/window-state.ts | 1 - package.json | 4 - script/jest-actions-reporter.js | 67 - script/jest.config.js | 9 - script/tsconfig.json | 4 +- yarn.lock | 1863 +------------------------ 8 files changed, 49 insertions(+), 1956 deletions(-) delete mode 100644 app/jest.unit.config.js delete mode 100644 app/src/lib/__mocks__/window-state.ts delete mode 100644 script/jest-actions-reporter.js delete mode 100644 script/jest.config.js diff --git a/.vscode/launch.json b/.vscode/launch.json index 73e101c4ea1..6b699e41012 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,47 +1,6 @@ { "version": "0.2.0", "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Jest All", - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", - "program": "${workspaceFolder}/node_modules/jest/bin/jest", - "args": [ - "--silent", - "--config", - "${workspaceFolder}/app/jest.unit.config.js" - ], - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "env": { - "ELECTRON_RUN_AS_NODE": "1" - }, - "windows": { - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" - } - }, - { - "type": "node", - "request": "launch", - "name": "Jest Current", - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", - "program": "${workspaceFolder}/node_modules/jest/bin/jest", - "args": [ - "--silent", - "--config", - "${workspaceFolder}/app/jest.unit.config.js", - "${relativeFile}" - ], - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "env": { - "ELECTRON_RUN_AS_NODE": "1" - }, - "windows": { - "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" - } - }, { "type": "node", "request": "launch", diff --git a/app/jest.unit.config.js b/app/jest.unit.config.js deleted file mode 100644 index f7d69ec2c99..00000000000 --- a/app/jest.unit.config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - roots: ['/src/', '/test/'], - transform: { - '^.+\\.tsx?$': 'ts-jest', - '\\.m?jsx?$': '/test/esm-transformer.js', - }, - resolver: `/test/resolver.js`, - testMatch: ['**/unit/**/*-test.ts{,x}'], - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], - setupFiles: ['/test/globals.ts', '/test/unit-test-env.ts'], - setupFilesAfterEnv: ['/test/setup-test-framework.ts'], - reporters: ['default', '../script/jest-actions-reporter.js'], - // For now, @github Node modules required to be transformed by jest-esm-transformer - transformIgnorePatterns: ['node_modules/(?!(@github))'], - testEnvironment: 'jsdom', -} diff --git a/app/src/lib/__mocks__/window-state.ts b/app/src/lib/__mocks__/window-state.ts deleted file mode 100644 index 3c1ca1f8bb8..00000000000 --- a/app/src/lib/__mocks__/window-state.ts +++ /dev/null @@ -1 +0,0 @@ -export const getWindowState = jest.fn() diff --git a/package.json b/package.json index f31aa97e34b..6026e893a45 100644 --- a/package.json +++ b/package.json @@ -80,8 +80,6 @@ "glob": "^7.1.2", "global-jsdom": "^26.0.0", "html-webpack-plugin": "^5.6.0", - "jest": "^29.7.0", - "jest-environment-jsdom": "^29.7.0", "jsdom": "^26.0.0", "klaw-sync": "^3.0.0", "legal-eagle": "0.16.0", @@ -95,7 +93,6 @@ "semver": "^7.6.3", "style-loader": "^3.3.1", "to-camel-case": "^1.0.0", - "ts-jest": "^29.1.1", "ts-loader": "^9", "ts-node": "^7.0.0", "typescript": "^5.8.2", @@ -120,7 +117,6 @@ "@types/fs-extra": "^7.0.0", "@types/fuzzaldrin-plus": "^0.0.1", "@types/glob": "^5.0.35", - "@types/jest": "^29.5.10", "@types/klaw-sync": "^6.0.0", "@types/legal-eagle": "^0.15.0", "@types/lodash": "^4.14.178", diff --git a/script/jest-actions-reporter.js b/script/jest-actions-reporter.js deleted file mode 100644 index 3a9f661abed..00000000000 --- a/script/jest-actions-reporter.js +++ /dev/null @@ -1,67 +0,0 @@ -const { resolve, relative } = require('path') - -/* eslint-disable @typescript-eslint/explicit-member-accessibility */ -class JestActionsReporter { - constructor(globalConfig, options) { - this._globalConfig = globalConfig - this._options = options - } - - onRunComplete(contexts, results) { - if (process.env.GITHUB_ACTIONS !== 'true') { - return - } - - const { rootDir } = this._globalConfig - const repoRoot = resolve(rootDir, '..') - - for (const { testResults, testFilePath } of results.testResults) { - for (const { failureMessages, location } of testResults) { - if (location === null) { - continue - } - - const path = relative(repoRoot, testFilePath) - - for (const msg of failureMessages) { - const { line, column } = - tryGetFailureLocation(msg, testFilePath) || location - - const escapedMessage = `${msg}`.replace(/\r?\n/g, '%0A') - process.stdout.write( - `::error file=${path},line=${line},col=${column}::${escapedMessage}\n` - ) - } - } - } - } -} - -function tryGetFailureLocation(message, testPath) { - for (const line of message.split(/\r?\n/g)) { - if (!/^\s+at\s/.test(line)) { - continue - } - - const ix = line.indexOf(testPath) - - if (ix < 0) { - continue - } - - const locationRe = /:(\d+):(\d+)/ - const remainder = line.substr(ix + testPath.length) - const match = locationRe.exec(remainder) - - if (match) { - return { - line: parseInt(match[1], 10), - column: parseInt(match[2], 10), - } - } - } - - return undefined -} - -module.exports = JestActionsReporter diff --git a/script/jest.config.js b/script/jest.config.js deleted file mode 100644 index 053652a6b5a..00000000000 --- a/script/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - roots: ['/changelog/', '/draft-release/'], - transform: { - '^.+\\.tsx?$': 'ts-jest', - }, - testMatch: ['**/*-test.ts'], - moduleFileExtensions: ['ts', 'js', 'jsx', 'json', 'node'], - reporters: ['default', '/jest-actions-reporter.js'], -} diff --git a/script/tsconfig.json b/script/tsconfig.json index 7e43139b300..8c87bb834f1 100644 --- a/script/tsconfig.json +++ b/script/tsconfig.json @@ -5,7 +5,7 @@ "esModuleInterop": true, "resolveJsonModule": true, "importHelpers": true, - "target": "ES2022", + "target": "ES2021", "allowUnreachableCode": false, "allowUnusedLabels": false, "noImplicitReturns": true, @@ -14,7 +14,7 @@ "sourceMap": false, "noEmit": true, "strict": true, - "lib": ["ES2022"] + "types": ["node"] }, "compileOnSave": false } diff --git a/yarn.lock b/yarn.lock index 5e04be48790..1e44e28134f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -159,29 +159,7 @@ events "^3.0.0" tslib "^2.2.0" -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/code-frame@^7.12.13": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== - dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" - -"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.7": +"@babel/code-frame@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== @@ -203,27 +181,6 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== -"@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7" - integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.5" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.5" - "@babel/parser" "^7.23.5" - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.5" - "@babel/types" "^7.23.5" - convert-source-map "^2.0.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.3" - semver "^6.3.1" - "@babel/core@^7.25.2": version "7.25.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" @@ -245,7 +202,7 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.23.5", "@babel/generator@^7.25.0", "@babel/generator@^7.25.4": +"@babel/generator@^7.25.0", "@babel/generator@^7.25.4": version "7.25.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.5.tgz#b31cf05b3fe8c32d206b6dad03bb0aacbde73450" integrity sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w== @@ -255,17 +212,7 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/generator@^7.7.2": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" - integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== - dependencies: - "@babel/types" "^7.23.5" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.25.2": +"@babel/helper-compilation-targets@^7.25.2": version "7.25.2" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== @@ -284,7 +231,7 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.2": +"@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.2": version "7.25.2" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== @@ -294,12 +241,7 @@ "@babel/helper-validator-identifier" "^7.24.7" "@babel/traverse" "^7.25.2" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.8": +"@babel/helper-plugin-utils@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== @@ -312,7 +254,7 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-string-parser@^7.23.4", "@babel/helper-string-parser@^7.24.8": +"@babel/helper-string-parser@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== @@ -322,12 +264,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== - -"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.7": +"@babel/helper-validator-identifier@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== @@ -342,7 +279,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== -"@babel/helpers@^7.23.5", "@babel/helpers@^7.25.0": +"@babel/helpers@^7.25.0": version "7.27.0" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.0.tgz#53d156098defa8243eab0f32fa17589075a1b808" integrity sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg== @@ -350,25 +287,7 @@ "@babel/template" "^7.27.0" "@babel/types" "^7.27.0" -"@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.23.4", "@babel/highlight@^7.24.7": +"@babel/highlight@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== @@ -378,17 +297,7 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== - -"@babel/parser@^7.14.7", "@babel/parser@^7.20.7": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" - integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== - -"@babel/parser@^7.23.5", "@babel/parser@^7.25.0", "@babel/parser@^7.25.4": +"@babel/parser@^7.25.0", "@babel/parser@^7.25.4": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a" integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA== @@ -402,104 +311,6 @@ dependencies: "@babel/types" "^7.27.0" -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-import-meta@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.7.2": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" - integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f" - integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-modules-commonjs@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c" @@ -516,7 +327,7 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.25.0": +"@babel/template@^7.25.0": version "7.25.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== @@ -534,16 +345,7 @@ "@babel/parser" "^7.27.0" "@babel/types" "^7.27.0" -"@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/traverse@^7.23.5", "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2": +"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e" integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg== @@ -556,25 +358,7 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.20.7": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" - integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== - dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - -"@babel/types@^7.23.5", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4": +"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f" integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ== @@ -591,11 +375,6 @@ "@babel/helper-string-parser" "^7.25.9" "@babel/helper-validator-identifier" "^7.25.9" -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== - "@csstools/color-helpers@^5.0.2": version "5.0.2" resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8" @@ -931,215 +710,7 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" - integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - get-package-type "^0.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== - -"@jest/console@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc" - integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - slash "^3.0.0" - -"@jest/core@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f" - integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg== - dependencies: - "@jest/console" "^29.7.0" - "@jest/reporters" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - ci-info "^3.2.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-changed-files "^29.7.0" - jest-config "^29.7.0" - jest-haste-map "^29.7.0" - jest-message-util "^29.7.0" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-resolve-dependencies "^29.7.0" - jest-runner "^29.7.0" - jest-runtime "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - jest-watcher "^29.7.0" - micromatch "^4.0.4" - pretty-format "^29.7.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7" - integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw== - dependencies: - "@jest/fake-timers" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-mock "^29.7.0" - -"@jest/expect-utils@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6" - integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA== - dependencies: - jest-get-type "^29.6.3" - -"@jest/expect@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2" - integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ== - dependencies: - expect "^29.7.0" - jest-snapshot "^29.7.0" - -"@jest/fake-timers@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565" - integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ== - dependencies: - "@jest/types" "^29.6.3" - "@sinonjs/fake-timers" "^10.0.2" - "@types/node" "*" - jest-message-util "^29.7.0" - jest-mock "^29.7.0" - jest-util "^29.7.0" - -"@jest/globals@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d" - integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/expect" "^29.7.0" - "@jest/types" "^29.6.3" - jest-mock "^29.7.0" - -"@jest/reporters@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7" - integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@jridgewell/trace-mapping" "^0.3.18" - "@types/node" "*" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^6.0.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.1.3" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - jest-worker "^29.7.0" - slash "^3.0.0" - string-length "^4.0.1" - strip-ansi "^6.0.0" - v8-to-istanbul "^9.0.1" - -"@jest/schemas@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03" - integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA== - dependencies: - "@sinclair/typebox" "^0.27.8" - -"@jest/source-map@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4" - integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw== - dependencies: - "@jridgewell/trace-mapping" "^0.3.18" - callsites "^3.0.0" - graceful-fs "^4.2.9" - -"@jest/test-result@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c" - integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA== - dependencies: - "@jest/console" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce" - integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw== - dependencies: - "@jest/test-result" "^29.7.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - slash "^3.0.0" - -"@jest/transform@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c" - integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^29.6.3" - "@jridgewell/trace-mapping" "^0.3.18" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^2.0.0" - fast-json-stable-stringify "^2.1.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-regex-util "^29.6.3" - jest-util "^29.7.0" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - write-file-atomic "^4.0.2" - -"@jest/types@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59" - integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw== - dependencies: - "@jest/schemas" "^29.6.3" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5": +"@jridgewell/gen-mapping@^0.3.5": version "0.3.5" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== @@ -1171,15 +742,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18": - version "0.3.20" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" - integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" - -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -1237,30 +800,11 @@ dependencies: object-assign "^4.1.1" -"@sinclair/typebox@^0.27.8": - version "0.27.8" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" - integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== - "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== -"@sinonjs/commons@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" - integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^10.0.2": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" - integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== - dependencies: - "@sinonjs/commons" "^3.0.0" - "@szmarczak/http-timer@^4.0.5": version "4.0.6" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" @@ -1268,44 +812,6 @@ dependencies: defer-to-connect "^2.0.0" -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@types/babel__core@^7.1.14": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017" - integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA== - dependencies: - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.16" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7" - integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w== - dependencies: - "@babel/types" "^7.3.0" - "@types/body-parser@*": version "1.16.8" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3" @@ -1451,13 +957,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.3": - version "4.1.9" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4" - integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ== - dependencies: - "@types/node" "*" - "@types/html-minifier-terser@^6.0.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" @@ -1468,47 +967,6 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" - integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== - -"@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== - -"@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jest@^29.5.10": - version "29.5.10" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.10.tgz#a10fc5bab9e426081c12b2ef73d24d4f0c9b7f50" - integrity sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ== - dependencies: - expect "^29.0.0" - pretty-format "^29.0.0" - -"@types/jsdom@^20.0.0": - version "20.0.1" - resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" - integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== - dependencies: - "@types/node" "*" - "@types/tough-cookie" "*" - parse5 "^7.0.0" - "@types/json-schema@*", "@types/json-schema@^7.0.8": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" @@ -1749,11 +1207,6 @@ dependencies: "@types/node" "*" -"@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== - "@types/strip-ansi@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae" @@ -1783,11 +1236,6 @@ resolved "https://registry.yarnpkg.com/@types/to-camel-case/-/to-camel-case-1.0.0.tgz#927ef0a7294d90b1835466c29b64b8ad2a32d8b5" integrity sha512-LXJOP0xvOUB4dKu+t7EVhSsM2NauLSZSOGkBS7Wqz3lWHIseCJnMDG+HrZHLFZQ39Fq3jr4RErJyQzfsoOlXSA== -"@types/tough-cookie@*": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304" - integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA== - "@types/triple-beam@^1.3.2": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8" @@ -1850,18 +1298,6 @@ tapable "^2.2.0" webpack "^5" -"@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== - -"@types/yargs@^17.0.8": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" - integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== - dependencies: - "@types/yargs-parser" "*" - "@types/yauzl@^2.9.1": version "2.9.1" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" @@ -2226,19 +1662,6 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -acorn-globals@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" - integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== - dependencies: - acorn "^8.1.0" - acorn-walk "^8.0.2" - 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" @@ -2256,32 +1679,20 @@ acorn-walk@^8.0.0: dependencies: acorn "^8.11.0" -acorn-walk@^8.0.2: - version "8.3.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f" - integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA== - acorn@^8.0.4, acorn@^8.11.0, acorn@^8.7.1, acorn@^8.8.2: version "8.12.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== -acorn@^8.1.0, acorn@^8.8.1, acorn@^8.9.0: - version "8.11.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" - integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== - acorn@^8.14.0: version "8.14.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" +acorn@^8.9.0: + version "8.11.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" + integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== agent-base@^7.0.2, agent-base@^7.1.0: version "7.1.1" @@ -2380,13 +1791,6 @@ ajv@^8.0.0, ajv@^8.8.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" - ansi-html-community@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" @@ -2434,17 +1838,12 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - ansi-styles@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -anymatch@^3.0.3, anymatch@~3.1.1: +anymatch@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== @@ -2676,66 +2075,6 @@ axobject-query@^3.1.1: dependencies: dequal "^2.0.3" -babel-jest@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5" - integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg== - dependencies: - "@jest/transform" "^29.7.0" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.6.3" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-plugin-istanbul@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626" - integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.1.14" - "@types/babel__traverse" "^7.0.6" - -babel-preset-current-node-syntax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" - integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" - -babel-preset-jest@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c" - integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA== - dependencies: - babel-plugin-jest-hoist "^29.6.3" - babel-preset-current-node-syntax "^1.0.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -2803,20 +2142,6 @@ browserslist@^4.21.10, browserslist@^4.23.1: node-releases "^2.0.18" update-browserslist-db "^1.1.0" -bs-logger@0.x: - version "0.2.6" - resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" - integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== - dependencies: - fast-json-stable-stringify "2.x" - -bser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" - integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= - dependencies: - node-int64 "^0.4.0" - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -2898,16 +2223,6 @@ camel-case@^4.1.2: pascal-case "^3.1.2" tslib "^2.0.3" -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - caniuse-lite@^1.0.30001646: version "1.0.30001653" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56" @@ -2924,7 +2239,7 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2954,11 +2269,6 @@ chalk@^5.3.0: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== -char-regex@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - "chokidar@>=2.0.0 <4.0.0": version "3.4.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" @@ -2984,16 +2294,6 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= -ci-info@^3.2.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" - integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== - -cjs-module-lexer@^1.0.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" - integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== - classlist-polyfill@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz#935bc2dfd9458a876b279617514638bcaa964a2e" @@ -3006,15 +2306,6 @@ clean-css@^5.2.2: dependencies: source-map "~0.6.0" -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -3036,11 +2327,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" - integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -3127,19 +2413,6 @@ convert-source-map@^2.0.0: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== -create-jest@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320" - integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q== - dependencies: - "@jest/types" "^29.6.3" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-config "^29.7.0" - jest-util "^29.7.0" - prompts "^2.0.1" - cross-env@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" @@ -3156,7 +2429,7 @@ cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0: is-wsl "^2.2.0" which "^2.0.2" -cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2: version "7.0.6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== @@ -3200,23 +2473,6 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" - integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - cssstyle@^4.2.1: version "4.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.3.0.tgz#83db22d1aec8eb7e5ecd812b4d14a17fb3dd243d" @@ -3240,15 +2496,6 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -data-urls@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" - integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== - dependencies: - abab "^2.0.6" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - data-urls@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde" @@ -3295,11 +2542,6 @@ debuglog@^1.0.1: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decimal.js@^10.4.2: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== - decimal.js@^10.4.3: version "10.5.0" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22" @@ -3312,11 +2554,6 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -dedent@^1.0.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff" - integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg== - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -3327,11 +2564,6 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - defer-to-connect@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" @@ -3389,11 +2621,6 @@ dequal@^2.0.3: resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3407,11 +2634,6 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -diff-sequences@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" - integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== - diff@^3.1.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -3472,13 +2694,6 @@ domelementtype@^2.0.1, domelementtype@^2.2.0: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domexception@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" - integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== - dependencies: - webidl-conversions "^7.0.0" - domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" @@ -3582,11 +2797,6 @@ element-closest@^2.0.2: resolved "https://registry.yarnpkg.com/element-closest/-/element-closest-2.0.2.tgz#72a740a107453382e28df9ce5dbb5a8df0f966ec" integrity sha1-cqdAoQdFM4LijfnOXbtajfD5Zuw= -emittery@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" - integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -3630,7 +2840,7 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.4.0, entities@^4.5.0: +entities@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -3659,13 +2869,6 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" @@ -3925,7 +3128,7 @@ esbuild@~0.25.0: "@esbuild/win32-ia32" "0.25.1" "@esbuild/win32-x64" "0.25.1" -escalade@^3.1.1, escalade@^3.1.2: +escalade@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== @@ -3935,27 +3138,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escodegen@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17" - integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionalDependencies: - source-map "~0.6.1" - eslint-config-prettier@>=8.0.0: version "8.5.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" @@ -4247,7 +3434,7 @@ espree@^9.6.0, espree@^9.6.1: acorn-jsx "^5.3.2" eslint-visitor-keys "^3.4.1" -esprima@^4.0.0, esprima@^4.0.1: +esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -4303,37 +3490,6 @@ events@^3.0.0, events@^3.2.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expect@^29.0.0, expect@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc" - integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw== - dependencies: - "@jest/expect-utils" "^29.7.0" - jest-get-type "^29.6.3" - jest-matcher-utils "^29.7.0" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - extract-zip@^2.0.0, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -4382,7 +3538,7 @@ fast-glob@^3.3.2: merge2 "^1.3.0" micromatch "^4.0.8" -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: +fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -4406,13 +3562,6 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= - dependencies: - bser "^2.0.0" - fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -4455,14 +3604,6 @@ find-up@^2.0.0: dependencies: locate-path "^2.0.0" -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" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -4513,15 +3654,6 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c" @@ -4595,16 +3727,16 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^2.3.2, fsevents@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - fsevents@~2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== +fsevents@~2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4663,11 +3795,6 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" @@ -4713,11 +3840,6 @@ get-package-info@^1.0.0: lodash.get "^4.0.0" read-pkg-up "^2.0.0" -get-package-type@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" - integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== - get-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" @@ -4743,11 +3865,6 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -4818,7 +3935,7 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4, glob@^7.1.6: +glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4940,7 +4057,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -5078,13 +4195,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -html-encoding-sniffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" - integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== - dependencies: - whatwg-encoding "^2.0.0" - html-encoding-sniffer@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448" @@ -5097,7 +4207,7 @@ html-entities@^2.1.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== -html-escaper@^2.0.0, html-escaper@^2.0.2: +html-escaper@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== @@ -5141,15 +4251,6 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" @@ -5166,14 +4267,6 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" -https-proxy-agent@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - https-proxy-agent@^7.0.0: version "7.0.5" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2" @@ -5190,11 +4283,6 @@ https-proxy-agent@^7.0.6: agent-base "^7.1.2" debug "4" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - iconv-lite@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" @@ -5235,14 +4323,6 @@ import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -5407,11 +4487,6 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-generator-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" - integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== - is-generator-function@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" @@ -5497,11 +4572,6 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" -is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - is-string@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" @@ -5587,64 +4657,6 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - -istanbul-lib-coverage@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756" - integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg== - -istanbul-lib-instrument@^5.0.4: - version "5.2.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" - integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - -istanbul-lib-instrument@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf" - integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^7.5.4" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.1.3: - version "3.1.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a" - integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - iterator.prototype@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" @@ -5665,358 +4677,6 @@ jackspeak@^4.0.1: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jest-changed-files@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a" - integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w== - dependencies: - execa "^5.0.0" - jest-util "^29.7.0" - p-limit "^3.1.0" - -jest-circus@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a" - integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/expect" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^1.0.0" - is-generator-fn "^2.0.0" - jest-each "^29.7.0" - jest-matcher-utils "^29.7.0" - jest-message-util "^29.7.0" - jest-runtime "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - p-limit "^3.1.0" - pretty-format "^29.7.0" - pure-rand "^6.0.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-cli@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995" - integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg== - dependencies: - "@jest/core" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - chalk "^4.0.0" - create-jest "^29.7.0" - exit "^0.1.2" - import-local "^3.0.2" - jest-config "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - yargs "^17.3.1" - -jest-config@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f" - integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ== - dependencies: - "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^29.7.0" - "@jest/types" "^29.6.3" - babel-jest "^29.7.0" - chalk "^4.0.0" - ci-info "^3.2.0" - deepmerge "^4.2.2" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-circus "^29.7.0" - jest-environment-node "^29.7.0" - jest-get-type "^29.6.3" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-runner "^29.7.0" - jest-util "^29.7.0" - jest-validate "^29.7.0" - micromatch "^4.0.4" - parse-json "^5.2.0" - pretty-format "^29.7.0" - slash "^3.0.0" - strip-json-comments "^3.1.1" - -jest-diff@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a" - integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.6.3" - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-docblock@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a" - integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g== - dependencies: - detect-newline "^3.0.0" - -jest-each@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1" - integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ== - dependencies: - "@jest/types" "^29.6.3" - chalk "^4.0.0" - jest-get-type "^29.6.3" - jest-util "^29.7.0" - pretty-format "^29.7.0" - -jest-environment-jsdom@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz#d206fa3551933c3fd519e5dfdb58a0f5139a837f" - integrity sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/fake-timers" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/jsdom" "^20.0.0" - "@types/node" "*" - jest-mock "^29.7.0" - jest-util "^29.7.0" - jsdom "^20.0.0" - -jest-environment-node@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376" - integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/fake-timers" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-mock "^29.7.0" - jest-util "^29.7.0" - -jest-get-type@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" - integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== - -jest-haste-map@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104" - integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA== - dependencies: - "@jest/types" "^29.6.3" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^29.6.3" - jest-util "^29.7.0" - jest-worker "^29.7.0" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.2" - -jest-leak-detector@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728" - integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw== - dependencies: - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-matcher-utils@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12" - integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g== - dependencies: - chalk "^4.0.0" - jest-diff "^29.7.0" - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-message-util@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3" - integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.6.3" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.7.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-mock@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347" - integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - jest-util "^29.7.0" - -jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== - -jest-regex-util@^29.6.3: - version "29.6.3" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52" - integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg== - -jest-resolve-dependencies@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428" - integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA== - dependencies: - jest-regex-util "^29.6.3" - jest-snapshot "^29.7.0" - -jest-resolve@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30" - integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA== - dependencies: - chalk "^4.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-pnp-resolver "^1.2.2" - jest-util "^29.7.0" - jest-validate "^29.7.0" - resolve "^1.20.0" - resolve.exports "^2.0.0" - slash "^3.0.0" - -jest-runner@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e" - integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ== - dependencies: - "@jest/console" "^29.7.0" - "@jest/environment" "^29.7.0" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.13.1" - graceful-fs "^4.2.9" - jest-docblock "^29.7.0" - jest-environment-node "^29.7.0" - jest-haste-map "^29.7.0" - jest-leak-detector "^29.7.0" - jest-message-util "^29.7.0" - jest-resolve "^29.7.0" - jest-runtime "^29.7.0" - jest-util "^29.7.0" - jest-watcher "^29.7.0" - jest-worker "^29.7.0" - p-limit "^3.1.0" - source-map-support "0.5.13" - -jest-runtime@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817" - integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ== - dependencies: - "@jest/environment" "^29.7.0" - "@jest/fake-timers" "^29.7.0" - "@jest/globals" "^29.7.0" - "@jest/source-map" "^29.6.3" - "@jest/test-result" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - cjs-module-lexer "^1.0.0" - collect-v8-coverage "^1.0.0" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-haste-map "^29.7.0" - jest-message-util "^29.7.0" - jest-mock "^29.7.0" - jest-regex-util "^29.6.3" - jest-resolve "^29.7.0" - jest-snapshot "^29.7.0" - jest-util "^29.7.0" - slash "^3.0.0" - strip-bom "^4.0.0" - -jest-snapshot@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5" - integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw== - dependencies: - "@babel/core" "^7.11.6" - "@babel/generator" "^7.7.2" - "@babel/plugin-syntax-jsx" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/types" "^7.3.3" - "@jest/expect-utils" "^29.7.0" - "@jest/transform" "^29.7.0" - "@jest/types" "^29.6.3" - babel-preset-current-node-syntax "^1.0.0" - chalk "^4.0.0" - expect "^29.7.0" - graceful-fs "^4.2.9" - jest-diff "^29.7.0" - jest-get-type "^29.6.3" - jest-matcher-utils "^29.7.0" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - natural-compare "^1.4.0" - pretty-format "^29.7.0" - semver "^7.5.3" - -jest-util@^29.0.0, jest-util@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc" - integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-validate@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c" - integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw== - dependencies: - "@jest/types" "^29.6.3" - camelcase "^6.2.0" - chalk "^4.0.0" - jest-get-type "^29.6.3" - leven "^3.1.0" - pretty-format "^29.7.0" - -jest-watcher@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2" - integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g== - dependencies: - "@jest/test-result" "^29.7.0" - "@jest/types" "^29.6.3" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - emittery "^0.13.1" - jest-util "^29.7.0" - string-length "^4.0.1" - jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -6026,26 +4686,6 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a" - integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw== - dependencies: - "@types/node" "*" - jest-util "^29.7.0" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613" - integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw== - dependencies: - "@jest/core" "^29.7.0" - "@jest/types" "^29.6.3" - import-local "^3.0.2" - jest-cli "^29.7.0" - js-message@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15" @@ -6063,7 +4703,7 @@ js-queue@2.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0, js-yaml@^3.13.1: +js-yaml@^3.10.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -6083,38 +4723,6 @@ jsdoc-type-pratt-parser@~4.1.0: resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz#ff6b4a3f339c34a6c188cbf50a16087858d22113" integrity sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg== -jsdom@^20.0.0: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== - dependencies: - abab "^2.0.6" - acorn "^8.8.1" - acorn-globals "^7.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.2" - decimal.js "^10.4.2" - domexception "^4.0.0" - escodegen "^2.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" - parse5 "^7.1.1" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - ws "^8.11.0" - xml-name-validator "^4.0.0" - jsdom@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-26.0.0.tgz#446dd1ad8cfc50df7e714e58f1f972c1763b354c" @@ -6157,7 +4765,7 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: +json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -6289,11 +4897,6 @@ klaw-sync@^3.0.0: dependencies: graceful-fs "^4.1.11" -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== - language-subtag-registry@~0.3.2: version "0.3.22" resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d" @@ -6314,11 +4917,6 @@ legal-eagle@0.16.0: read-installed "4.0.3" underscore "~1.6.0" -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -6327,11 +4925,6 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - linkify-it@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" @@ -6371,13 +4964,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -6420,11 +5006,6 @@ lodash.kebabcase@4.1.1: resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== -lodash.memoize@4.x: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -6503,30 +5084,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" - integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== - dependencies: - semver "^6.0.0" - -make-error@1.x: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - make-error@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96" integrity sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= -makeerror@1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" - integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== - dependencies: - tmpl "1.0.5" - markdown-it@13.0.1: version "13.0.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430" @@ -6625,11 +5187,6 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31: dependencies: mime-db "1.52.0" -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -6748,11 +5305,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - node-ipc@^9.1.0: version "9.1.1" resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69" @@ -6787,13 +5339,6 @@ normalize-url@^6.0.1: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - nth-check@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" @@ -6806,11 +5351,6 @@ nwsapi@^2.2.16: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.19.tgz#586660f7c24c34691907002309a8dc28064c9c0b" integrity sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA== -nwsapi@^2.2.2: - version "2.2.7" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== - object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -6945,13 +5485,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" @@ -6984,14 +5517,7 @@ p-limit@^1.1.0: resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" integrity sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw= -p-limit@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -7005,13 +5531,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -7019,11 +5538,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" - integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== - package-json-from-dist@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" @@ -7089,23 +5603,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@^7.0.0, parse5@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== - dependencies: - entities "^4.4.0" - parse5@^7.2.1: version "7.2.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" @@ -7136,7 +5633,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== @@ -7186,7 +5683,7 @@ picomatch@^2.0.4, picomatch@^2.2.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== -picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -7196,18 +5693,6 @@ pify@^2.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= -pirates@^4.0.4: - version "4.0.6" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" - integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - plist@^3.0.0, plist@^3.0.4, plist@^3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" @@ -7301,15 +5786,6 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -pretty-format@^29.0.0, pretty-format@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812" - integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ== - dependencies: - "@jest/schemas" "^29.6.3" - ansi-styles "^5.0.0" - react-is "^18.0.0" - progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" @@ -7324,14 +5800,6 @@ promise.prototype.finally@^3.1.0: es-abstract "^1.9.0" function-bind "^1.1.1" -prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== - dependencies: - kleur "^3.0.3" - sisteransi "^1.0.5" - prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" @@ -7346,11 +5814,6 @@ prr@~0.0.0: resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" integrity sha1-GoS4WQgyVQFBGFPQCB7j+obikmo= -psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -7359,21 +5822,11 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1: +punycode@^2.1.0, punycode@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -pure-rand@^6.0.0: - version "6.0.4" - resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7" - integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA== - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -7415,11 +5868,6 @@ react-is@^16.13.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - read-installed@4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067" @@ -7538,21 +5986,11 @@ renderkid@^3.0.0: lodash "^4.17.21" strip-ansi "^6.0.1" -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - require-from-string@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - reserved-words@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" @@ -7563,33 +6001,16 @@ resolve-alpn@^1.0.0: resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - resolve-pkg-maps@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== -resolve.exports@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" - integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== - resolve@^1.1.6: version "1.5.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" @@ -7767,7 +6188,7 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -7784,7 +6205,7 @@ semver@^7.1.3, semver@^7.3.2, semver@^7.3.4: dependencies: lru-cache "^6.0.0" -semver@^7.3.7, semver@^7.5.3, semver@^7.5.4: +semver@^7.3.7, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -7857,11 +6278,6 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - signal-exit@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" @@ -7876,11 +6292,6 @@ sirv@^2.0.3: mrmime "^2.0.0" totalist "^3.0.0" -sisteransi@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== - slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -7911,14 +6322,6 @@ source-map-js@^1.2.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== -source-map-support@0.5.13: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-support@^0.5.6, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -7927,7 +6330,7 @@ source-map-support@^0.5.6, source-map-support@~0.5.20: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -7977,22 +6380,7 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -stack-utils@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" - integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== - dependencies: - escape-string-regexp "^2.0.0" - -string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== - dependencies: - char-regex "^1.0.2" - strip-ansi "^6.0.0" - -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3: +"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== @@ -8001,7 +6389,7 @@ string-length@^4.0.1: 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.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== @@ -8150,16 +6538,6 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-json-comments@^3.1.1, strip-json-comments@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -8285,15 +6663,6 @@ terser@^5.10.0, terser@^5.26.0: commander "^2.20.0" source-map-support "~0.5.20" -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -8326,11 +6695,6 @@ tmp@0.0.33: dependencies: os-tmpdir "~1.0.2" -tmpl@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== - to-camel-case@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46" @@ -8367,16 +6731,6 @@ totalist@^3.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8" integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ== -tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - tough-cookie@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7" @@ -8384,13 +6738,6 @@ tough-cookie@^5.0.0: dependencies: tldts "^6.1.32" -tr46@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" - integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== - dependencies: - punycode "^2.1.1" - tr46@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.0.tgz#4a077922360ae807e172075ce5beb79b36e4a101" @@ -8415,20 +6762,6 @@ ts-api-utils@^2.0.0: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.0.tgz#b9d7d5f7ec9f736f4d0f09758b8607979044a900" integrity sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ== -ts-jest@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b" - integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA== - dependencies: - bs-logger "0.x" - fast-json-stable-stringify "2.x" - jest-util "^29.0.0" - json5 "^2.2.3" - lodash.memoize "4.x" - make-error "1.x" - semver "^7.5.3" - yargs-parser "^21.0.1" - ts-loader@^9: version "9.2.6" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.6.tgz#9937c4dd0a1e3dbbb5e433f8102a6601c6615d74" @@ -8512,16 +6845,6 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -type-detect@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -8635,11 +6958,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - universalify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" @@ -8665,14 +6983,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -8688,15 +6998,6 @@ utila@~0.4: resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== -v8-to-istanbul@^9.0.1: - version "9.2.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad" - integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA== - dependencies: - "@jridgewell/trace-mapping" "^0.3.12" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^2.0.0" - validate-npm-package-license@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" @@ -8736,13 +7037,6 @@ vscode-uri@^2.1.2: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c" integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== -w3c-xmlserializer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" - integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== - dependencies: - xml-name-validator "^4.0.0" - w3c-xmlserializer@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c" @@ -8750,13 +7044,6 @@ w3c-xmlserializer@^5.0.0: dependencies: xml-name-validator "^5.0.0" -walker@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" - integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== - dependencies: - makeerror "1.0.12" - watchpack@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" @@ -8851,13 +7138,6 @@ webpack@^5, webpack@^5.94.0: watchpack "^2.4.1" webpack-sources "^3.2.3" -whatwg-encoding@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" - integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== - dependencies: - iconv-lite "0.6.3" - whatwg-encoding@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5" @@ -8870,24 +7150,11 @@ whatwg-fetch@^0.11.1: resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.1.tgz#6d3ded245fdd97cd728e0e2587b54b733949e663" integrity sha1-bT3tJF/dl81yjg4lh7VLczlJ5mM= -whatwg-mimetype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" - integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== - whatwg-mimetype@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg== -whatwg-url@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" - integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - whatwg-url@^14.0.0, whatwg-url@^14.1.0: version "14.2.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.2.0.tgz#4ee02d5d725155dae004f6ae95c73e7ef5d95663" @@ -8982,7 +7249,7 @@ worker-farm@^1.3.1: errno "^0.1.4" xtend "^4.0.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm: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== @@ -9005,34 +7272,16 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" - integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - ws@^7.3.1: version "7.5.10" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== -ws@^8.11.0: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" - integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== - ws@^8.18.0: version "8.18.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb" integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w== -xml-name-validator@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" - integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== - xml-name-validator@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673" @@ -9053,11 +7302,6 @@ xtend@^4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" @@ -9068,24 +7312,11 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^21.0.1, yargs-parser@^21.1.1: +yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.3.1: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From a043a9ffffce42488047c04420d9274cbb1fb959 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:44:41 +0100 Subject: [PATCH 0250/1338] Add node types back in --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 173066fb0f9..c5ea305bdc0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,8 @@ "strict": true, "outDir": "./out", "useUnknownInCatchVariables": false, - "lib": ["ES2023"] + "lib": ["ES2023"], + "types": ["node"] }, "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"], "exclude": [ From c3781d9984fd5655e705583dc4a896db1bd5c36d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:47:01 +0100 Subject: [PATCH 0251/1338] Get rid of old electron mock --- app/test/__mocks__/electron.ts | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 app/test/__mocks__/electron.ts diff --git a/app/test/__mocks__/electron.ts b/app/test/__mocks__/electron.ts deleted file mode 100644 index 0bf5d8857ac..00000000000 --- a/app/test/__mocks__/electron.ts +++ /dev/null @@ -1,32 +0,0 @@ -export const shell = { - moveItemToTrash: jest.fn(), -} - -export const remote = { - app: { - on: jest.fn(), - }, - getCurrentWebContents: jest.fn().mockImplementation(() => ({ - on: jest.fn().mockImplementation(() => true), - })), - getCurrentWindow: jest.fn().mockImplementation(() => ({ - isFullScreen: jest.fn().mockImplementation(() => true), - webContents: { - zoomFactor: jest.fn().mockImplementation(_ => null), - }, - })), - autoUpdater: { - on: jest.fn(), - }, - nativeTheme: { - addListener: jest.fn(), - removeAllListeners: jest.fn(), - shouldUseDarkColors: jest.fn().mockImplementation(() => true), - }, -} - -export const ipcRenderer = { - on: jest.fn(), - send: jest.fn(), - invoke: jest.fn(), -} From 35aa811eb6b0ebddf853cad8d3ed47bedc5409b7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:47:10 +0100 Subject: [PATCH 0252/1338] Add required libraries --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index c5ea305bdc0..2fbed057219 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,7 @@ "strict": true, "outDir": "./out", "useUnknownInCatchVariables": false, - "lib": ["ES2023"], + "lib": ["ES2023", "DOM", "DOM.Iterable"], "types": ["node"] }, "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"], From ca05c7d39128a701dbde2aefe68fe5c59745bc4e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 14:55:51 +0100 Subject: [PATCH 0253/1338] Prettify --- app/test/unit/accounts-store-test.ts | 3 +- app/test/unit/diff-parser-test.ts | 37 +++++------ app/test/unit/email-test.ts | 62 ++++++++++++------- app/test/unit/endpoint-capabilities-test.ts | 10 +-- .../unit/find-forked-remotes-to-prune-test.ts | 18 ++++-- app/test/unit/find-upstream-remote-test.ts | 3 +- app/test/unit/format-commit-message-test.ts | 40 ++++++------ app/test/unit/fuzzy-find-test.ts | 8 +-- app/test/unit/git/checkout-test.ts | 4 +- app/test/unit/git/config-test.ts | 6 +- app/test/unit/git/core-test.ts | 15 +++-- app/test/unit/git/fetch-test.ts | 3 +- app/test/unit/git/for-each-ref-test.ts | 14 +++-- app/test/unit/git/format-patch-test.ts | 5 +- app/test/unit/git/lfs-test.ts | 8 +-- app/test/unit/git/merge-test.ts | 8 ++- app/test/unit/git/reflog-test.ts | 2 +- app/test/unit/git/remote-test.ts | 10 +-- app/test/unit/git/reset-test.ts | 4 +- app/test/unit/git/stash-test.ts | 24 ++++--- app/test/unit/git/submodule-test.ts | 4 +- app/test/unit/group-branches-test.ts | 2 +- app/test/unit/http-test.ts | 6 +- .../main-process/spell-checker-menu-test.ts | 4 +- app/test/unit/parse-app-url-test.ts | 10 ++- app/test/unit/path-test.ts | 25 ++++---- app/test/unit/path-text-test.ts | 27 +++++--- app/test/unit/progress/clone-test.ts | 15 ++--- app/test/unit/release-notes-test.ts | 18 +++--- app/test/unit/repo-rules-test.ts | 15 +++-- .../unit/repositories-clone-grouping-test.ts | 8 +-- .../unit/repositories-list-grouping-test.ts | 22 +++---- app/test/unit/repositories-store-test.ts | 8 ++- app/test/unit/repository-matching-test.ts | 20 +++--- app/test/unit/repository-state-cache-test.ts | 6 +- app/test/unit/script/version-test.ts | 17 +++-- app/test/unit/section-list-selection-test.ts | 15 +++-- app/test/unit/status-parser-test.ts | 17 ++--- .../updates/update-changed-files-test.ts | 12 ++-- app/test/unit/text-diff-expansion-test.ts | 12 ++-- app/test/unit/text-token-parser-test.ts | 55 ++++++++-------- .../wrap-rich-text-commit-message-test.ts | 18 ++++-- 42 files changed, 358 insertions(+), 262 deletions(-) diff --git a/app/test/unit/accounts-store-test.ts b/app/test/unit/accounts-store-test.ts index eddbabe1fd8..53a9a5b1114 100644 --- a/app/test/unit/accounts-store-test.ts +++ b/app/test/unit/accounts-store-test.ts @@ -108,7 +108,8 @@ describe('AccountsStore', () => { const persistedUsers = JSON.parse(dataStore.getItem('users')) assert.equal(persistedUsers[0].login, 'joan') - assert.equal(persistedUsers[0].endpoint, + assert.equal( + persistedUsers[0].endpoint, 'https://my-company-repos.com/api/v3' ) }) diff --git a/app/test/unit/diff-parser-test.ts b/app/test/unit/diff-parser-test.ts index e3507966b4b..a85fb250848 100644 --- a/app/test/unit/diff-parser-test.ts +++ b/app/test/unit/diff-parser-test.ts @@ -55,17 +55,18 @@ index e1d4871..3bd3ee0 100644 const parser = new DiffParser() const diff = parser.parse(reinstateSpacesAtTheStartOfBlankLines(diffText)) - assert.equal((diff.hunks).length, 3) + assert.equal(diff.hunks.length, 3) let hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 7) let lines = hunk.lines - assert.equal((lines).length, 8) + assert.equal(lines.length, 8) let i = 0 - assert.equal(lines[i].text, + assert.equal( + lines[i].text, '@@ -18,6 +18,7 @@ export function parseRawDiff(lines: ReadonlyArray): Diff {' ) assert.equal(lines[i].type, DiffLineType.Hunk) @@ -108,7 +109,7 @@ index e1d4871..3bd3ee0 100644 assert.equal(hunk.unifiedDiffEnd, 20) lines = hunk.lines - assert.equal((lines).length, 13) + assert.equal(lines.length, 13) }) it('parses new files', () => { @@ -123,14 +124,14 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 1) const lines = hunk.lines - assert.equal((lines).length, 2) + assert.equal(lines.length, 2) let i = 0 assert.equal(lines[i].text, '@@ -0,0 +1 @@') @@ -158,14 +159,14 @@ index 24219cc..bf711a5 100644 const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - assert.equal((lines).length, 3) + assert.equal(lines.length, 3) let i = 0 assert.equal(lines[i].text, '@@ -1 +1 @@') @@ -200,14 +201,14 @@ index 0000000..faf7da1 const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 1) const lines = hunk.lines - assert.equal((lines).length, 2) + assert.equal(lines.length, 2) let i = 0 assert.equal(lines[i].text, '@@ -0,0 +1 @@') @@ -237,14 +238,14 @@ index 1910281..257cc56 100644 ` const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - assert.equal((lines).length, 3) + assert.equal(lines.length, 3) let i = 0 assert.equal(lines[i].text, '@@ -1 +1 @@') @@ -288,14 +289,14 @@ index 1910281..ba0e162 100644 ` const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.unifiedDiffStart, 0) assert.equal(hunk.unifiedDiffEnd, 2) const lines = hunk.lines - assert.equal((lines).length, 3) + assert.equal(lines.length, 3) let i = 0 assert.equal(lines[i].text, '@@ -1 +1 @@') @@ -330,7 +331,7 @@ Binary files /dev/null and b/IMG_2306.CR2 differ ` const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 0) + assert.equal(diff.hunks.length, 0) assert.equal(diff.isBinary, true) }) @@ -344,7 +345,7 @@ index 0000000..e69de29 const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 0) + assert.equal(diff.hunks.length, 0) }) it('parses hunk headers with omitted line counts from new file', () => { @@ -359,7 +360,7 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.header.oldStartLine, 0) @@ -380,7 +381,7 @@ index 0000000..f13588b const parser = new DiffParser() const diff = parser.parse(diffText) - assert.equal((diff.hunks).length, 1) + assert.equal(diff.hunks.length, 1) const hunk = diff.hunks[0] assert.equal(hunk.header.oldStartLine, 1) diff --git a/app/test/unit/email-test.ts b/app/test/unit/email-test.ts index e6f57d1c7c7..057981a33e9 100644 --- a/app/test/unit/email-test.ts +++ b/app/test/unit/email-test.ts @@ -25,7 +25,8 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), + assert.equal( + lookupPreferredEmail(account), '1234+shiftkey@users.noreply.github.com' ) }) @@ -42,7 +43,8 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), + assert.equal( + lookupPreferredEmail(account), '1234+shiftkey@users.noreply.github.example.com' ) }) @@ -80,7 +82,10 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), 'my-primary-email@example.com') + assert.equal( + lookupPreferredEmail(account), + 'my-primary-email@example.com' + ) }) it('returns the primary if it has null visibility', () => { @@ -116,7 +121,10 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), 'my-primary-email@example.com') + assert.equal( + lookupPreferredEmail(account), + 'my-primary-email@example.com' + ) }) it('returns the noreply if there is no public address', () => { @@ -152,7 +160,8 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), + assert.equal( + lookupPreferredEmail(account), 'shiftkey@users.noreply.github.com' ) }) @@ -190,7 +199,8 @@ describe('emails', () => { 'free' ) - assert.equal(lookupPreferredEmail(account), + assert.equal( + lookupPreferredEmail(account), 'shiftkey@users.noreply.github.example.com' ) }) @@ -264,11 +274,13 @@ describe('emails', () => { assert.equal(isAttributableEmailFor(account, 'personal@gmail.com'), true) assert.equal(isAttributableEmailFor(account, 'company@github.com'), true) assert.equal( - isAttributableEmailFor(account, 'niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, 'niik@users.noreply.github.com'), + true + ) assert.equal( - isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, '123+niik@users.noreply.github.com'), + true + ) }) it('considers stealth emails when account has no emails', () => { @@ -276,11 +288,13 @@ describe('emails', () => { const account = new Account('niik', endpoint, '', [], '', 123, '', 'free') assert.equal( - isAttributableEmailFor(account, 'niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, 'niik@users.noreply.github.com'), + true + ) assert.equal( - isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, '123+niik@users.noreply.github.com'), + true + ) }) it('considers stealth emails for GitHub Enterprise', () => { @@ -288,11 +302,13 @@ describe('emails', () => { const account = new Account('niik', endpoint, '', [], '', 123, '', 'free') assert.equal( - isAttributableEmailFor(account, 'niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, 'niik@users.noreply.github.com'), + true + ) assert.equal( - isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, '123+niik@users.noreply.github.com'), + true + ) }) it('considers email adresses in a case-insensitive manner', () => { @@ -316,11 +332,13 @@ describe('emails', () => { assert.equal(isAttributableEmailFor(account, 'niik@github.com'), true) assert.equal( - isAttributableEmailFor(account, 'niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, 'niik@users.noreply.github.com'), + true + ) assert.equal( - isAttributableEmailFor(account, '123+niik@users.noreply.github.com') - , true) + isAttributableEmailFor(account, '123+niik@users.noreply.github.com'), + true + ) }) }) }) diff --git a/app/test/unit/endpoint-capabilities-test.ts b/app/test/unit/endpoint-capabilities-test.ts index d2804f66b03..aa6fc1fb0b0 100644 --- a/app/test/unit/endpoint-capabilities-test.ts +++ b/app/test/unit/endpoint-capabilities-test.ts @@ -46,8 +46,9 @@ describe('endpoint-capabilities', () => { dotcom: true, ghe: false, es: '>= 3.0.0', - }) - , true) + }), + true + ) assert.equal( testEndpoint( @@ -58,8 +59,9 @@ describe('endpoint-capabilities', () => { es: '>= 3.1.0', }, '3.1.0' - ) - , true) + ), + true + ) }) }) }) diff --git a/app/test/unit/find-forked-remotes-to-prune-test.ts b/app/test/unit/find-forked-remotes-to-prune-test.ts index fb0bd8248d9..bb468692922 100644 --- a/app/test/unit/find-forked-remotes-to-prune-test.ts +++ b/app/test/unit/find-forked-remotes-to-prune-test.ts @@ -98,9 +98,12 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], allBranches) - assert.equal(getNamesFromRemotes(remotesToPrune).includes( - GitHubDesktopRemoteWithLocalBranch - ), false) + assert.equal( + getNamesFromRemotes(remotesToPrune).includes( + GitHubDesktopRemoteWithLocalBranch + ), + false + ) }) it('never prunes remotes with pull requests', () => { @@ -114,9 +117,12 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, openPRs, []) - assert.equal(getNamesFromRemotes(remotesToPrune).includes( - GitHubDesktopRemoteWithPullRequest - ), false) + assert.equal( + getNamesFromRemotes(remotesToPrune).includes( + GitHubDesktopRemoteWithPullRequest + ), + false + ) }) it('prunes remotes without pull requests or local branches', () => { diff --git a/app/test/unit/find-upstream-remote-test.ts b/app/test/unit/find-upstream-remote-test.ts index 8648c3d61a8..1cb0b77d31a 100644 --- a/app/test/unit/find-upstream-remote-test.ts +++ b/app/test/unit/find-upstream-remote-test.ts @@ -21,7 +21,8 @@ describe('findUpstreamRemote', () => { const upstream = findUpstreamRemote(parent, remotes) assert(upstream !== null) assert.equal(upstream!.name, UpstreamRemoteName) - assert.equal(upstream!.url, + assert.equal( + upstream!.url, 'https://github.com/Somsubhra/github-release-stats.git' ) }) diff --git a/app/test/unit/format-commit-message-test.ts b/app/test/unit/format-commit-message-test.ts index 39151845860..35d5ade7572 100644 --- a/app/test/unit/format-commit-message-test.ts +++ b/app/test/unit/format-commit-message-test.ts @@ -8,32 +8,37 @@ describe('formatCommitMessage', () => { const repo = await setupEmptyRepository() assert.equal( - await formatCommitMessage(repo, { summary: 'test', description: null }) - , 'test\n') + await formatCommitMessage(repo, { summary: 'test', description: null }), + 'test\n' + ) assert.equal( - await formatCommitMessage(repo, { summary: 'test', description: 'test' }) - , 'test\n\ntest\n') + await formatCommitMessage(repo, { summary: 'test', description: 'test' }), + 'test\n\ntest\n' + ) }) it('omits description when null', async () => { const repo = await setupEmptyRepository() assert.equal( - await formatCommitMessage(repo, { summary: 'test', description: null }) - , 'test\n') + await formatCommitMessage(repo, { summary: 'test', description: null }), + 'test\n' + ) }) it('omits description when empty string', async () => { const repo = await setupEmptyRepository() assert.equal( - await formatCommitMessage(repo, { summary: 'test', description: '' }) - , 'test\n') + await formatCommitMessage(repo, { summary: 'test', description: '' }), + 'test\n' + ) }) it('adds two newlines between summary and description', async () => { const repo = await setupEmptyRepository() assert.equal( - await formatCommitMessage(repo, { summary: 'foo', description: 'bar' }) - , 'foo\n\nbar\n') + await formatCommitMessage(repo, { summary: 'foo', description: 'bar' }), + 'foo\n\nbar\n' + ) }) it('appends trailers to a summary-only message', async () => { @@ -47,8 +52,7 @@ describe('formatCommitMessage', () => { summary: 'foo', description: null, trailers, - }) - , + }), 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -66,8 +70,7 @@ describe('formatCommitMessage', () => { summary: 'foo', description: 'bar', trailers, - }) - , + }), 'foo\n\nbar\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -86,8 +89,7 @@ describe('formatCommitMessage', () => { summary: 'foo', description: 'Co-Authored-By: Markus Olsson ', trailers, - }) - , + }), 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -107,8 +109,7 @@ describe('formatCommitMessage', () => { // note the lack of space after : description: 'Co-Authored-By:Markus Olsson ', trailers, - }) - , + }), 'foo\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' @@ -127,8 +128,7 @@ describe('formatCommitMessage', () => { 'hello\n---\nworld\n\nCo-Authored-By: Markus Olsson ' assert.equal( - await formatCommitMessage(repo, { summary, description, trailers }) - , + await formatCommitMessage(repo, { summary, description, trailers }), 'foo\n\nhello\n---\nworld\n\n' + 'Co-Authored-By: Markus Olsson \n' + 'Signed-Off-By: nerdneha \n' diff --git a/app/test/unit/fuzzy-find-test.ts b/app/test/unit/fuzzy-find-test.ts index 66aa12ef543..3c9d549d3aa 100644 --- a/app/test/unit/fuzzy-find-test.ts +++ b/app/test/unit/fuzzy-find-test.ts @@ -21,27 +21,27 @@ describe('fuzzy find', () => { it('should find matching item when searching by pull request number', () => { const results = match('4653', items, getText) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert(results[0].item['text'].join('').includes('4653')) }) it('should find matching item when searching by author', () => { const results = match('damaneice', items, getText) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert(results[0].item['text'].join('').includes('damaneice')) }) it('should find matching item when by title', () => { const results = match('awesome feature', items, getText) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert(results[0].item['text'].join('').includes('awesome feature')) }) it('should find nothing', () => { const results = match('$%^', items, getText) - assert.equal((results).length, 0) + assert.equal(results.length, 0) }) }) diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 88fb908a6e9..05e2785dfbf 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -156,7 +156,7 @@ describe('git/checkout', () => { const status = await getStatusOrThrow(repository) - assert.equal((status.workingDirectory.files).length, 0) + assert.equal(status.workingDirectory.files.length, 0) }) it('updates a changed submodule reference', async () => { @@ -176,7 +176,7 @@ describe('git/checkout', () => { await checkoutBranch(repository, devBranch, null) const status = await getStatusOrThrow(repository) - assert.equal((status.workingDirectory.files).length, 0) + assert.equal(status.workingDirectory.files.length, 0) }) }) }) diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index 516663ae799..43c901b3d7b 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -46,7 +46,11 @@ describe('git/config', () => { { successExitCodes: new Set([1]) } ).then(x => x.stdout) - assert.equal(withoutEnvOutput.length, 0, 'Expected withoutEnvOutput to be empty') + assert.equal( + withoutEnvOutput.length, + 0, + 'Expected withoutEnvOutput to be empty' + ) const withEnvOutput = await git( ['config', 'desktop.test'], repository.path, diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts index b181e60194a..69bdb8581c9 100644 --- a/app/test/unit/git/core-test.ts +++ b/app/test/unit/git/core-test.ts @@ -123,24 +123,27 @@ describe('git/core', () => { createGitResult( 'error: could not lock config file C:/Users/markus/.gitconfig: File exists' ) - ) - , 'C:\\Users\\markus\\.gitconfig.lock') + ), + 'C:\\Users\\markus\\.gitconfig.lock' + ) assert.equal( parseConfigLockFilePathFromError( createGitResult( 'error: could not lock config file C:\\Users\\markus\\.gitconfig: File exists' ) - ) - , 'C:\\Users\\markus\\.gitconfig.lock') + ), + 'C:\\Users\\markus\\.gitconfig.lock' + ) } else { assert.equal( parseConfigLockFilePathFromError( createGitResult( 'error: could not lock config file /Users/markus/.gitconfig: File exists' ) - ) - , '/Users/markus/.gitconfig.lock') + ), + '/Users/markus/.gitconfig.lock' + ) } }) }) diff --git a/app/test/unit/git/fetch-test.ts b/app/test/unit/git/fetch-test.ts index 3bb0921b1d6..1401daa727a 100644 --- a/app/test/unit/git/fetch-test.ts +++ b/app/test/unit/git/fetch-test.ts @@ -60,7 +60,8 @@ describe('git/fetch', () => { resultBranches, branchAheadAndBehind.upstream! ) - assert.notEqual(branchAheadAndBehindUpstream.tip.sha, + assert.notEqual( + branchAheadAndBehindUpstream.tip.sha, branchAheadAndBehind.tip.sha ) diff --git a/app/test/unit/git/for-each-ref-test.ts b/app/test/unit/git/for-each-ref-test.ts index d0f348e3fd0..fec0514d79f 100644 --- a/app/test/unit/git/for-each-ref-test.ts +++ b/app/test/unit/git/for-each-ref-test.ts @@ -26,19 +26,21 @@ describe('git/for-each-ref', () => { b => b.type === BranchType.Local ) - assert.equal((branches).length, 3) + assert.equal(branches.length, 3) const commitWithBody = branches[0] assert.equal(commitWithBody.name, 'commit-with-long-description') assert(commitWithBody.upstream === null) - assert.equal(commitWithBody.tip.sha, + assert.equal( + commitWithBody.tip.sha, 'dfa96676b65e1c0ed43ca25492252a5e384c8efd' ) const commitNoBody = branches[1] assert.equal(commitNoBody.name, 'commit-with-no-body') assert(commitNoBody.upstream === null) - assert.equal(commitNoBody.tip.sha, + assert.equal( + commitNoBody.tip.sha, '49ec1e05f39eef8d1ab6200331a028fb3dd96828' ) @@ -51,13 +53,13 @@ describe('git/for-each-ref', () => { it('should return empty list for empty repo', async () => { const repo = await setupEmptyRepository() const branches = await getBranches(repo) - assert.equal((branches).length, 0) + assert.equal(branches.length, 0) }) it('should return empty list for directory without a .git directory', async () => { const repo = setupEmptyDirectory() const status = await getBranches(repo) - assert.equal((status).length, 0) + assert.equal(status.length, 0) }) }) @@ -73,7 +75,7 @@ describe('git/for-each-ref', () => { const branches = await getBranchesDifferingFromUpstream(repository) const branchRefs = branches.map(branch => branch.ref) - assert.equal((branchRefs).length, 3) + assert.equal(branchRefs.length, 3) // All branches that are behind and/or ahead must be included assert(branchRefs.includes('refs/heads/branch-behind')) diff --git a/app/test/unit/git/format-patch-test.ts b/app/test/unit/git/format-patch-test.ts index dbfd11eb460..4e50bc34f3d 100644 --- a/app/test/unit/git/format-patch-test.ts +++ b/app/test/unit/git/format-patch-test.ts @@ -66,7 +66,10 @@ describe('formatPatch', () => { firstCommit = stdout.trim() }) it('can create a series of commits from start to HEAD', async () => { - assert.equal(typeof await formatPatch(repository, firstCommit, 'HEAD'), 'string') + assert.equal( + typeof (await formatPatch(repository, firstCommit, 'HEAD')), + 'string' + ) }) }) }) diff --git a/app/test/unit/git/lfs-test.ts b/app/test/unit/git/lfs-test.ts index 0911769afff..897d9939f08 100644 --- a/app/test/unit/git/lfs-test.ts +++ b/app/test/unit/git/lfs-test.ts @@ -85,7 +85,7 @@ describe('git-lfs', () => { const notFound = await filesNotTrackedByLFS(repository, [videoFile]) - assert.equal((notFound).length, 1) + assert.equal(notFound.length, 1) assert(notFound.includes(videoFile)) }) @@ -97,7 +97,7 @@ describe('git-lfs', () => { const notFound = await filesNotTrackedByLFS(repository, [photoFile]) - assert.equal((notFound).length, 0) + assert.equal(notFound.length, 0) }) it('skips files in a subfolder that are tracked', async () => { @@ -109,7 +109,7 @@ describe('git-lfs', () => { photoFileInDirectory, ]) - assert.equal((notFound).length, 0) + assert.equal(notFound.length, 0) }) it('skips files in a subfolder where the rule only covers the subdirectory', async () => { @@ -121,7 +121,7 @@ describe('git-lfs', () => { photoFileInDirectory, ]) - assert.equal((notFound).length, 0) + assert.equal(notFound.length, 0) }) }) }) diff --git a/app/test/unit/git/merge-test.ts b/app/test/unit/git/merge-test.ts index ec9d34547f7..e96c33cb619 100644 --- a/app/test/unit/git/merge-test.ts +++ b/app/test/unit/git/merge-test.ts @@ -35,7 +35,10 @@ describe('git/merge', () => { await merge(repository, 'dev') }) it('returns MergeResult.AlreadyUpToDate', async () => { - assert.equal(await merge(repository, 'dev'), MergeResult.AlreadyUpToDate) + assert.equal( + await merge(repository, 'dev'), + MergeResult.AlreadyUpToDate + ) }) }) }) @@ -121,7 +124,8 @@ describe('git/merge', () => { repository = await setupEmptyRepository() }) it('throws an error', async () => { - await assert.rejects(subject(), + await assert.rejects( + subject(), /There is no merge in progress, so there is nothing to abort/ ) }) diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts index e9dd216e4fc..cf9250fb45c 100644 --- a/app/test/unit/git/reflog-test.ts +++ b/app/test/unit/git/reflog-test.ts @@ -67,7 +67,7 @@ describe('git/reflog', () => { await createAndCheckout(repository, 'branch-4') const branches = await getRecentBranches(repository, 2) - assert.equal((branches).length, 2) + assert.equal(branches.length, 2) assert(branches.includes('branch-4')) assert(branches.includes('branch-3')) }) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 3dd89cfc0c9..05ec3f372cc 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -58,7 +58,7 @@ describe('git/remote', () => { await exec(['remote', 'add', 'D', url], repository.path) const result = await getRemotes(repository) - assert.equal((result).length, 5) + assert.equal(result.length, 5) assert.equal(result[0].name, 'A') assert.equal(result[1].name, 'D') @@ -70,7 +70,7 @@ describe('git/remote', () => { it('returns empty array for directory without a .git directory', async () => { const repository = setupEmptyDirectory() const remotes = await getRemotes(repository) - assert.equal((remotes).length, 0) + assert.equal(remotes.length, 0) }) it('returns promisor remote', async () => { @@ -90,7 +90,7 @@ describe('git/remote', () => { // Shows that the `getRemote` returns that remote const result = await getRemotes(repository) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].name, 'hasBlobFilter') }) }) @@ -173,14 +173,14 @@ describe('git/remote', () => { assert.equal(await setRemoteURL(repository, remoteName, newUrl), true) const remotes = await getRemotes(repository) - assert.equal((remotes).length, 1) + assert.equal(remotes.length, 1) assert.equal(remotes[0].url, newUrl) }) it('returns false for unknown remote name', async () => { await assert.rejects(setRemoteURL(repository, 'none', newUrl)) const remotes = await getRemotes(repository) - assert.equal((remotes).length, 1) + assert.equal(remotes.length, 1) assert.equal(remotes[0].url, remoteUrl) }) }) diff --git a/app/test/unit/git/reset-test.ts b/app/test/unit/git/reset-test.ts index 5cdb872eb4f..442c4ac3954 100644 --- a/app/test/unit/git/reset-test.ts +++ b/app/test/unit/git/reset-test.ts @@ -29,7 +29,7 @@ describe('git/reset', () => { await reset(repository, GitResetMode.Hard, 'HEAD') const status = await getStatusOrThrow(repository) - assert.equal((status.workingDirectory.files).length, 0) + assert.equal(status.workingDirectory.files.length, 0) }) }) @@ -52,7 +52,7 @@ describe('git/reset', () => { await exec(['checkout-index', '-f', '-u', '-q', '--', fileName], repoPath) const status = await getStatusOrThrow(repository) - assert.equal((status.workingDirectory.files).length, 0) + assert.equal(status.workingDirectory.files.length, 0) }) }) }) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index f9ad08531da..f80f29a9bcb 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -39,13 +39,13 @@ describe('git/stash', () => { const stash = await getStashes(repo) - assert.equal((stash.desktopEntries).length, 0) + assert.equal(stash.desktopEntries.length, 0) }) it('returns an empty list when no stash entries have been created', async () => { const stash = await getStashes(repository) - assert.equal((stash.desktopEntries).length, 0) + assert.equal(stash.desktopEntries.length, 0) }) it('returns all stash entries created by Desktop', async () => { @@ -55,7 +55,7 @@ describe('git/stash', () => { const stash = await getStashes(repository) const entries = stash.desktopEntries - assert.equal((entries).length, 1) + assert.equal(entries.length, 1) assert.equal(entries[0].branchName, 'master') assert.equal(entries[0].name, 'refs/stash@{0}') }) @@ -81,7 +81,7 @@ describe('git/stash', () => { const stash = await getStashes(repository) const entries = stash.desktopEntries - assert.equal((entries).length, 1) + assert.equal(entries.length, 1) assert.equal(entries[0].branchName, 'master') }) @@ -92,7 +92,7 @@ describe('git/stash', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - assert.equal((files).length, 1) + assert.equal(files.length, 1) assert.equal(files[0].status.kind, AppFileStatusKind.Untracked) const untrackedFiles = status.workingDirectory.files.filter( @@ -104,7 +104,7 @@ describe('git/stash', () => { status = await getStatusOrThrow(repository) files = status.workingDirectory.files - assert.equal((files).length, 0) + assert.equal(files.length, 0) }) }) @@ -255,14 +255,14 @@ describe('git/stash', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - assert.equal((files).length, 0) + assert.equal(files.length, 0) const entryToApply = desktopEntries[0] await popStashEntry(repository, entryToApply.stashSha) status = await getStatusOrThrow(repository) files = status.workingDirectory.files - assert.equal((files).length, 1) + assert.equal(files.length, 1) }) }) @@ -279,14 +279,14 @@ describe('git/stash', () => { let status = await getStatusOrThrow(repository) let files = status.workingDirectory.files - assert.equal((files).length, 0) + assert.equal(files.length, 0) const entryToApply = desktopEntries[0] await popStashEntry(repository, entryToApply.stashSha) status = await getStatusOrThrow(repository) files = status.workingDirectory.files - assert.equal((files).length, 1) + assert.equal(files.length, 1) const stashAfter = await getStashes(repository) assert.equal(stashAfter.desktopEntries.includes(entryToApply), false) @@ -304,9 +304,7 @@ describe('git/stash', () => { await FSE.writeFile(readme, generateString()) const entryToApply = desktopEntries[0] - await assert.rejects( - popStashEntry(repository, entryToApply.stashSha) - ) + await assert.rejects(popStashEntry(repository, entryToApply.stashSha)) }) }) }) diff --git a/app/test/unit/git/submodule-test.ts b/app/test/unit/git/submodule-test.ts index 12fadce539f..f6d774390fc 100644 --- a/app/test/unit/git/submodule-test.ts +++ b/app/test/unit/git/submodule-test.ts @@ -17,7 +17,7 @@ describe('git/submodule', () => { const testRepoPath = await setupFixtureRepository('submodule-basic-setup') const repository = new Repository(testRepoPath, -1, null, false) const result = await listSubmodules(repository) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].sha, 'c59617b65080863c4ca72c1f191fa1b423b92223') assert.equal(result[0].path, 'foo/submodule') assert.equal(result[0].describe, 'first-tag~2') @@ -42,7 +42,7 @@ describe('git/submodule', () => { await checkoutBranch(submoduleRepository, branches[0], null) const result = await listSubmodules(repository) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].sha, '14425bb2a4ee361af7f789a81b971f8466ae521d') assert.equal(result[0].path, 'foo/submodule') assert.equal(result[0].describe, 'heads/feature-branch') diff --git a/app/test/unit/group-branches-test.ts b/app/test/unit/group-branches-test.ts index 6f16400118c..6d3c34f55c3 100644 --- a/app/test/unit/group-branches-test.ts +++ b/app/test/unit/group-branches-test.ts @@ -46,7 +46,7 @@ describe('Branches grouping', () => { allBranches, recentBranches ) - assert.equal((groups).length, 3) + assert.equal(groups.length, 3) assert.equal(groups[0].identifier, 'default') let items = groups[0].items diff --git a/app/test/unit/http-test.ts b/app/test/unit/http-test.ts index fed02f59d9d..99c05b717c9 100644 --- a/app/test/unit/http-test.ts +++ b/app/test/unit/http-test.ts @@ -22,7 +22,8 @@ describe('getAbsoluteUrl', () => { getDotComAPIEndpoint(), '/issues?since=2019-05-10T16%3A00%3A00Z' ) - assert.equal(result, + assert.equal( + result, 'https://api.github.com/issues?since=2019-05-10T16%3A00%3A00Z' ) }) @@ -54,7 +55,8 @@ describe('getAbsoluteUrl', () => { enterpriseEndpoint, '/issues?since=2019-05-10T16%3A00%3A00Z' ) - assert.equal(result, + assert.equal( + result, `${enterpriseEndpoint}/issues?since=2019-05-10T16%3A00%3A00Z` ) }) diff --git a/app/test/unit/main-process/spell-checker-menu-test.ts b/app/test/unit/main-process/spell-checker-menu-test.ts index ecf3ff2a393..1f2f987784c 100644 --- a/app/test/unit/main-process/spell-checker-menu-test.ts +++ b/app/test/unit/main-process/spell-checker-menu-test.ts @@ -1,5 +1,5 @@ -import { describe, it } from 'node:test' -import assert from 'node:assert' +import { describe, it } from 'node:test' +import assert from 'node:assert' import { SpellcheckEnglishLabel, getSpellCheckLanguageMenuItemOptions, diff --git a/app/test/unit/parse-app-url-test.ts b/app/test/unit/parse-app-url-test.ts index ba74597b690..6af8fa65fa9 100644 --- a/app/test/unit/parse-app-url-test.ts +++ b/app/test/unit/parse-app-url-test.ts @@ -86,7 +86,10 @@ describe('parseAppURL', () => { const openRepo = result as IOpenRepositoryFromURLAction assert.equal(openRepo.url, 'https://github.com/octokit/octokit.net') assert.equal(openRepo.branch, 'master') - assert.equal(openRepo.filepath, 'Octokit.Reactive/Octokit.Reactive.csproj') + assert.equal( + openRepo.filepath, + 'Octokit.Reactive/Octokit.Reactive.csproj' + ) }) }) @@ -153,7 +156,10 @@ describe('parseAppURL', () => { const openRepo = result as IOpenRepositoryFromURLAction assert.equal(openRepo.url, 'git@github.com/octokit/octokit.net') assert.equal(openRepo.branch, 'master') - assert.equal(openRepo.filepath, 'Octokit.Reactive/Octokit.Reactive.csproj') + assert.equal( + openRepo.filepath, + 'Octokit.Reactive/Octokit.Reactive.csproj' + ) }) }) }) diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 485eb3bf77c..9af9a312cd3 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -15,15 +15,19 @@ describe('path', () => { 'C:/Users/shiftkey\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'folder/file.html') assert.equal( - uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/') - , true) + uri.startsWith('file:///C:/Users/shiftkey/AppData/Local/'), + true + ) }) it('encodes spaces and hashes', () => { const dirName = 'C:/Users/The Kong #2\\AppData\\Local\\GitHubDesktop\\app-1.0.4\\resources\\app' const uri = encodePathAsUrl(dirName, 'index.html') - assert.equal(uri.startsWith('file:///C:/Users/The%20Kong%20%232/'), true) + assert.equal( + uri.startsWith('file:///C:/Users/The%20Kong%20%232/'), + true + ) }) } @@ -41,18 +45,16 @@ describe('path', () => { const root = process.cwd() it('fails for paths outside of the root', async () => { - assert(await resolveWithin(root, join('..')) === null) - assert(await resolveWithin(root, join('..', '..')) === null) + assert((await resolveWithin(root, join('..'))) === null) + assert((await resolveWithin(root, join('..', '..'))) === null) }) it('succeeds for paths that traverse out, and then back into, the root', async () => { - assert.equal(await resolveWithin(root, join('..', basename(root))), - root - ) + assert.equal(await resolveWithin(root, join('..', basename(root))), root) }) it('fails for paths containing null bytes', async () => { - assert(await resolveWithin(root, 'foo\0bar') === null) + assert((await resolveWithin(root, 'foo\0bar')) === null) }) it('succeeds for absolute relative paths as long as they stay within the root', async () => { @@ -68,7 +70,7 @@ describe('path', () => { try { await symlink(resolve(tempDir, '..', '..'), symlinkPath) - assert(await resolveWithin(tempDir, symlinkName) === null) + assert((await resolveWithin(tempDir, symlinkName)) === null) } finally { await unlink(symlinkPath) await rmdir(tempDir) @@ -87,7 +89,8 @@ describe('path', () => { basename(resolve(tempDir, '..')), basename(tempDir) ) - assert.equal(await resolveWithin(tempDir, throughSymlinkPath), + assert.equal( + await resolveWithin(tempDir, throughSymlinkPath), resolve(tempDir, throughSymlinkPath) ) } finally { diff --git a/app/test/unit/path-text-test.ts b/app/test/unit/path-text-test.ts index f8a7420d974..c154c5bbd9c 100644 --- a/app/test/unit/path-text-test.ts +++ b/app/test/unit/path-text-test.ts @@ -56,23 +56,29 @@ describe('PathText', () => { it('favors truncation of directory components over file names', () => { if (__WIN32__) { - assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 25), + assert.equal( + truncatePath('alfa\\bravo\\charlie\\delta.txt', 25), 'alfa\\bravo\\cha…\\delta.txt' ) - assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 22), + assert.equal( + truncatePath('alfa\\bravo\\charlie\\delta.txt', 22), 'alfa\\bravo\\…\\delta.txt' ) - assert.equal(truncatePath('alfa\\bravo\\charlie\\delta.txt', 17), + assert.equal( + truncatePath('alfa\\bravo\\charlie\\delta.txt', 17), 'alfa\\b…\\delta.txt' ) } else { - assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 25), + assert.equal( + truncatePath('alfa/bravo/charlie/delta.txt', 25), 'alfa/bravo/cha…/delta.txt' ) - assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 22), + assert.equal( + truncatePath('alfa/bravo/charlie/delta.txt', 22), 'alfa/bravo/…/delta.txt' ) - assert.equal(truncatePath('alfa/bravo/charlie/delta.txt', 17), + assert.equal( + truncatePath('alfa/bravo/charlie/delta.txt', 17), 'alfa/b…/delta.txt' ) } @@ -85,7 +91,8 @@ describe('PathText', () => { __WIN32__ ? 'some\\submodule\\path\\' : 'some/submodule/path/' ) assert.equal(normalizedFileName, 'path') - assert.equal(normalizedDirectory, + assert.equal( + normalizedDirectory, __WIN32__ ? 'some\\submodule\\' : 'some/submodule/' ) }) @@ -95,7 +102,8 @@ describe('PathText', () => { __WIN32__ ? 'some\\submodule\\path' : 'some/submodule/path' ) assert.equal(normalizedFileName, 'path') - assert.equal(normalizedDirectory, + assert.equal( + normalizedDirectory, __WIN32__ ? 'some\\submodule\\' : 'some/submodule/' ) }) @@ -105,7 +113,8 @@ describe('PathText', () => { __WIN32__ ? 'some\\repository\\path.tsx' : 'some/repository/path.tsx' ) assert.equal(normalizedFileName, 'path.tsx') - assert.equal(normalizedDirectory, + assert.equal( + normalizedDirectory, __WIN32__ ? 'some\\repository\\' : 'some/repository/' ) }) diff --git a/app/test/unit/progress/clone-test.ts b/app/test/unit/progress/clone-test.ts index c6eaa772f3f..4548dc68fc8 100644 --- a/app/test/unit/progress/clone-test.ts +++ b/app/test/unit/progress/clone-test.ts @@ -14,14 +14,12 @@ describe('CloneProgressParser', () => { assert( parser.parse( 'Receiving objects: 17% (4808/28282), 3.30 MiB | 1.29 MiB/s' - ) - !== null) + ) !== null + ) }) it('understands resolving deltas', () => { - assert( - parser.parse('Resolving deltas: 89% (18063/20263)') - !== null) + assert(parser.parse('Resolving deltas: 89% (18063/20263)') !== null) }) it('understands checking out files', () => { @@ -29,9 +27,7 @@ describe('CloneProgressParser', () => { }) it('understands remote compression', () => { - assert( - parser.parse('remote: Compressing objects: 45% (10/22)') - !== null) + assert(parser.parse('remote: Compressing objects: 45% (10/22)') !== null) }) it('understands relative weights', () => { @@ -65,7 +61,8 @@ describe('CloneProgressParser', () => { }) it("ignores lines it doesn't understand", () => { - assert.equal(parser.parse('Counting objects: 28282, done.').kind, + assert.equal( + parser.parse('Counting objects: 28282, done.').kind, 'context' ) }) diff --git a/app/test/unit/release-notes-test.ts b/app/test/unit/release-notes-test.ts index 8cbe04ecf8d..8a3aac5862d 100644 --- a/app/test/unit/release-notes-test.ts +++ b/app/test/unit/release-notes-test.ts @@ -12,7 +12,7 @@ describe('release-notes', () => { const result = parseReleaseEntries(values) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].kind, 'fixed') assert.equal(result[0].message, 'something else') }) @@ -21,7 +21,7 @@ describe('release-notes', () => { const result = parseReleaseEntries(values) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].kind, 'fixed') assert.equal(result[0].message, 'and another thing') }) @@ -30,7 +30,7 @@ describe('release-notes', () => { const result = parseReleaseEntries(values) - assert.equal((result).length, 1) + assert.equal(result.length, 1) assert.equal(result[0].kind, 'other') assert.equal(result[0].message, 'we did a thing!') }) @@ -72,8 +72,8 @@ describe('release-notes', () => { // let's just test it's showing the right month and year instead assert(result.datePublished.includes('December')) assert(result.datePublished.includes('2017')) - assert.equal((result.bugfixes).length, 8) - assert.equal((result.enhancements).length, 12) + assert.equal(result.bugfixes.length, 8) + assert.equal(result.enhancements.length, 12) }) it('can render 1.0.10 layout', () => { @@ -117,8 +117,8 @@ describe('release-notes', () => { // let's just test it's showing the right month and year instead assert(result.datePublished.includes('December')) assert(result.datePublished.includes('2017')) - assert.equal((result.bugfixes).length, 10) - assert.equal((result.enhancements).length, 16) + assert.equal(result.bugfixes.length, 10) + assert.equal(result.enhancements.length, 16) }) it('can render 1.0.9 layout', () => { @@ -144,8 +144,8 @@ describe('release-notes', () => { // let's just test it's showing the right month and year instead assert(result.datePublished.includes('November')) assert(result.datePublished.includes('2017')) - assert.equal((result.bugfixes).length, 4) - assert.equal((result.enhancements).length, 4) + assert.equal(result.bugfixes.length, 4) + assert.equal(result.enhancements.length, 4) }) }) }) diff --git a/app/test/unit/repo-rules-test.ts b/app/test/unit/repo-rules-test.ts index 24feb69e17c..780a9643c38 100644 --- a/app/test/unit/repo-rules-test.ts +++ b/app/test/unit/repo-rules-test.ts @@ -290,24 +290,28 @@ describe('repo metadata rules', () => { const results2 = repoRulesInfo.commitMessagePatterns.getFailedRules('afbgch') validateMetadataRules(results2, 'fail', 0, 1) - assert.equal(results2.failed[0].description, + assert.equal( + results2.failed[0].description, 'must match the regular expression "^\\A(d|e)oo\\d$"' ) const results3 = repoRulesInfo.commitMessagePatterns.getFailedRules('eoo4') validateMetadataRules(results3, 'fail', 0, 1) - assert.equal(results3.failed[0].description, + assert.equal( + results3.failed[0].description, 'must match the regular expression "(a.b.c.)|(d+)"' ) const results4 = repoRulesInfo.commitMessagePatterns.getFailedRules('fgsa') validateMetadataRules(results4, 'fail', 0, 2) - assert.equal(results4.failed[0].description, + assert.equal( + results4.failed[0].description, 'must match the regular expression "(a.b.c.)|(d+)"' ) - assert.equal(results4.failed[1].description, + assert.equal( + results4.failed[1].description, 'must match the regular expression "^\\A(d|e)oo\\d$"' ) }) @@ -323,7 +327,8 @@ describe('repo metadata rules', () => { const results2 = repoRulesInfo.commitMessagePatterns.getFailedRules('asdf\nbar') validateMetadataRules(results2, 'fail', 0, 1) - assert.equal(results2.failed[0].description, + assert.equal( + results2.failed[0].description, 'must match the regular expression "(?m)^foo"' ) }) diff --git a/app/test/unit/repositories-clone-grouping-test.ts b/app/test/unit/repositories-clone-grouping-test.ts index 27aa58783dc..3247fc95901 100644 --- a/app/test/unit/repositories-clone-grouping-test.ts +++ b/app/test/unit/repositories-clone-grouping-test.ts @@ -96,23 +96,23 @@ describe('clone repository grouping', () => { ] const grouped = groupRepositories(repositories, 'shiftkey') - assert.equal((grouped).length, 3) + assert.equal(grouped.length, 3) assert.equal(grouped[0].identifier, YourRepositoriesIdentifier) - assert.equal((grouped[0].items).length, 1) + assert.equal(grouped[0].items.length, 1) let item = grouped[0].items[0] assert.equal(item.name, 'some-repo') assert.equal(grouped[1].identifier, 'desktop') - assert.equal((grouped[1].items).length, 1) + assert.equal(grouped[1].items.length, 1) item = grouped[1].items[0] assert.equal(item.name, 'desktop') item = grouped[2].items[0] assert.equal(grouped[2].identifier, 'octokit') - assert.equal((grouped[2].items).length, 1) + assert.equal(grouped[2].items.length, 1) item = grouped[2].items[0] assert.equal(item.name, 'octokit.net') diff --git a/app/test/unit/repositories-list-grouping-test.ts b/app/test/unit/repositories-list-grouping-test.ts index 61e52a76b31..fb2f2c8168b 100644 --- a/app/test/unit/repositories-list-grouping-test.ts +++ b/app/test/unit/repositories-list-grouping-test.ts @@ -30,23 +30,23 @@ describe('repository list grouping', () => { it('groups repositories by owners/Enterprise/Other', () => { const grouped = groupRepositories(repositories, cache, []) - assert.equal((grouped).length, 3) + assert.equal(grouped.length, 3) assert.equal(grouped[0].identifier.kind, 'dotcom') assert.equal((grouped[0].identifier as any).owner.login, 'me') - assert.equal((grouped[0].items).length, 1) + assert.equal(grouped[0].items.length, 1) let item = grouped[0].items[0] assert.equal(item.repository.path, 'repo2') assert.equal(grouped[1].identifier.kind, 'enterprise') - assert.equal((grouped[1].items).length, 1) + assert.equal(grouped[1].items.length, 1) item = grouped[1].items[0] assert.equal(item.repository.path, 'repo3') assert.equal(grouped[2].identifier.kind, 'other') - assert.equal((grouped[2].items).length, 1) + assert.equal(grouped[2].items.length, 1) item = grouped[2].items[0] assert.equal(item.repository.path, 'repo1') @@ -74,18 +74,18 @@ describe('repository list grouping', () => { cache, [] ) - assert.equal((grouped).length, 2) + assert.equal(grouped.length, 2) assert.equal(grouped[0].identifier.kind, 'dotcom') assert.equal((grouped[0].identifier as any).owner.login, 'me') - assert.equal((grouped[0].items).length, 2) + assert.equal(grouped[0].items.length, 2) let items = grouped[0].items assert.equal(items[0].repository.path, 'b') assert.equal(items[1].repository.path, 'd') assert.equal(grouped[1].identifier.kind, 'other') - assert.equal((grouped[1].items).length, 3) + assert.equal(grouped[1].items.length, 3) items = grouped[1].items assert.equal(items[0].repository.path, 'a') @@ -128,18 +128,18 @@ describe('repository list grouping', () => { ) const grouped = groupRepositories([repoA, repoB, repoC, repoD], cache, []) - assert.equal((grouped).length, 3) + assert.equal(grouped.length, 3) assert.equal(grouped[0].identifier.kind, 'dotcom') assert.equal((grouped[0].identifier as any).owner.login, 'user1') - assert.equal((grouped[0].items).length, 1) + assert.equal(grouped[0].items.length, 1) assert.equal(grouped[1].identifier.kind, 'dotcom') assert.equal((grouped[1].identifier as any).owner.login, 'user2') - assert.equal((grouped[1].items).length, 1) + assert.equal(grouped[1].items.length, 1) assert.equal(grouped[2].identifier.kind, 'enterprise') - assert.equal((grouped[2].items).length, 2) + assert.equal(grouped[2].items.length, 2) assert.equal(grouped[0].items[0].text[0], 'repo') assert.equal(grouped[0].items[0].needsDisambiguation, false) diff --git a/app/test/unit/repositories-store-test.ts b/app/test/unit/repositories-store-test.ts index 4b1688f6490..fb718121ee4 100644 --- a/app/test/unit/repositories-store-test.ts +++ b/app/test/unit/repositories-store-test.ts @@ -31,7 +31,7 @@ describe('RepositoriesStore', () => { await repositoriesStore.addRepository('/some/other/path') const repositories = await repositoriesStore.getAll() - assert.equal((repositories).length, 2) + assert.equal(repositories.length, 2) }) }) @@ -74,7 +74,8 @@ describe('RepositoriesStore', () => { assertIsRepositoryWithGitHubRepository(repo) assert.equal(repo.gitHubRepository.isPrivate, true) assert.equal(repo.gitHubRepository.fork, false) - assert.equal(repo.gitHubRepository.htmlURL, + assert.equal( + repo.gitHubRepository.htmlURL, 'https://github.com/my-user/my-repo' ) }) @@ -90,7 +91,8 @@ describe('RepositoriesStore', () => { await repositoriesStore.upsertGitHubRepository(endpoint, apiRepo) ) - assert.equal(firstRepo.gitHubRepository.dbID, + assert.equal( + firstRepo.gitHubRepository.dbID, secondRepo.gitHubRepository.dbID ) }) diff --git a/app/test/unit/repository-matching-test.ts b/app/test/unit/repository-matching-test.ts index ff6f724d67c..b91237ca265 100644 --- a/app/test/unit/repository-matching-test.ts +++ b/app/test/unit/repository-matching-test.ts @@ -216,14 +216,16 @@ describe('repository-matching', () => { urlMatchesCloneURL( 'https://github.com/shiftkey/desktop.git', repository - ) - , true) + ), + true + ) }) it(`returns true when URL doesn't have a .git suffix`, () => { assert.equal( - urlMatchesCloneURL('https://github.com/shiftkey/desktop', repository) - , true) + urlMatchesCloneURL('https://github.com/shiftkey/desktop', repository), + true + ) }) it(`returns false when URL belongs to a different owner`, () => { @@ -231,8 +233,9 @@ describe('repository-matching', () => { urlMatchesCloneURL( 'https://github.com/outofambit/desktop.git', repository - ) - , false) + ), + false + ) }) it(`returns false if GitHub repository does't have a cloneURL set`, () => { @@ -240,8 +243,9 @@ describe('repository-matching', () => { urlMatchesCloneURL( 'https://github.com/shiftkey/desktop', repositoryWithoutCloneURL - ) - , false) + ), + false + ) }) }) }) diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index f95d3d11c44..f81b2c5f56b 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -55,7 +55,7 @@ describe('RepositoryStateCache', () => { const { branchesState } = cache.get(repository) assert.equal(branchesState.isLoadingPullRequests, true) - assert.equal((branchesState.openPullRequests).length, 1) + assert.equal(branchesState.openPullRequests.length, 1) }) it('can update changes state for a repository', () => { @@ -85,7 +85,7 @@ describe('RepositoryStateCache', () => { const { changesState } = cache.get(repository) assert.equal(changesState.workingDirectory.includeAll, true) - assert.equal((changesState.workingDirectory.files).length, 1) + assert.equal(changesState.workingDirectory.files.length, 1) assert.equal(changesState.showCoAuthoredBy, true) assert.equal(changesState.commitMessage!.summary, summary) }) @@ -111,6 +111,6 @@ describe('RepositoryStateCache', () => { const { compareState } = cache.get(repository) assert.equal(compareState.formState.kind, HistoryTabMode.History) assert.equal(compareState.filterText, filterText) - assert.equal((compareState.commitSHAs).length, 1) + assert.equal(compareState.commitSHAs.length, 1) }) }) diff --git a/app/test/unit/script/version-test.ts b/app/test/unit/script/version-test.ts index d5a84813aa5..cc06768eb5d 100644 --- a/app/test/unit/script/version-test.ts +++ b/app/test/unit/script/version-test.ts @@ -12,12 +12,14 @@ describe('getNextVersionNumber', () => { describe("doesn't care for", () => { it('beta versions', () => { - assert.throws(() => getNextVersionNumber('1.0.1-beta1', channel), + assert.throws( + () => getNextVersionNumber('1.0.1-beta1', channel), /Unable to draft production release using beta version '1\.0\.1-beta1'/ ) }) it('test versions', () => { - assert.throws(() => getNextVersionNumber('1.0.1-test42', channel), + assert.throws( + () => getNextVersionNumber('1.0.1-test42', channel), /Unable to draft production release using test version '1\.0\.1-test42'/ ) }) @@ -29,10 +31,14 @@ describe('getNextVersionNumber', () => { describe('when a beta version is used', () => { it('the beta tag is incremented', () => { - assert.equal(getNextVersionNumber('1.1.2-beta3', channel), '1.1.2-beta4') + assert.equal( + getNextVersionNumber('1.1.2-beta3', channel), + '1.1.2-beta4' + ) }) it('handles multiple digits', () => { - assert.equal(getNextVersionNumber('1.1.2-beta99', channel), + assert.equal( + getNextVersionNumber('1.1.2-beta99', channel), '1.1.2-beta100' ) }) @@ -46,7 +52,8 @@ describe('getNextVersionNumber', () => { describe("doesn't care for", () => { it('test versions', () => { - assert.throws(() => getNextVersionNumber('1.0.1-test1', channel), + assert.throws( + () => getNextVersionNumber('1.0.1-test1', channel), /Unable to draft beta release using test version '1\.0\.1-test1'/ ) }) diff --git a/app/test/unit/section-list-selection-test.ts b/app/test/unit/section-list-selection-test.ts index 87d8034ae57..f8de090b398 100644 --- a/app/test/unit/section-list-selection-test.ts +++ b/app/test/unit/section-list-selection-test.ts @@ -57,8 +57,9 @@ describe('section-list-selection', () => { }, }) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 2, row: 7 }) - , true) + rowIndexPathEquals(selectedRow!, { section: 2, row: 7 }), + true + ) }) it('returns first row of next section when selecting down from last row of a section', () => { @@ -70,8 +71,9 @@ describe('section-list-selection', () => { }, }) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 1, row: 0 }) - , true) + rowIndexPathEquals(selectedRow!, { section: 1, row: 0 }), + true + ) }) it('returns last row of previous section when selecting up from first row of a section', () => { @@ -83,8 +85,9 @@ describe('section-list-selection', () => { }, }) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 1, row: 2 }) - , true) + rowIndexPathEquals(selectedRow!, { section: 1, row: 2 }), + true + ) }) }) }) diff --git a/app/test/unit/status-parser-test.ts b/app/test/unit/status-parser-test.ts index a157cb2c40c..3da7f2644ed 100644 --- a/app/test/unit/status-parser-test.ts +++ b/app/test/unit/status-parser-test.ts @@ -18,7 +18,7 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - assert.equal((entries).length, 3) + assert.equal(entries.length, 3) let i = 0 assert.equal(entries[i].statusCode, '.D') @@ -41,7 +41,7 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - assert.equal((entries).length, 2) + assert.equal(entries.length, 2) let i = 0 @@ -63,7 +63,7 @@ describe('parsePorcelainStatus', () => { ['! foo'].join('\0') + '\0' ) as ReadonlyArray - assert.equal((entries).length, 0) + assert.equal(entries.length, 0) }) it('parses status headers', () => { @@ -79,11 +79,12 @@ describe('parsePorcelainStatus', () => { ].join('\0') + '\0' ) as ReadonlyArray - assert.equal((entries).length, 4) + assert.equal(entries.length, 4) let i = 0 - assert.equal(entries[i++].value, + assert.equal( + entries[i++].value, 'branch.oid 2de0487c2d3e977f5f560b746833f9d7f9a054fd' ) assert.equal(entries[i++].value, 'branch.head master') @@ -96,7 +97,7 @@ describe('parsePorcelainStatus', () => { /.DS_Store` const entries = parse(x) as ReadonlyArray - assert.equal((entries).length, 1) + assert.equal(entries.length, 1) const expectedPath = `ProjectSID/Images.xcassets/iPhone 67/Status Center/Report X68 Y461 /.DS_Store` @@ -110,7 +111,7 @@ describe('parsePorcelainStatus', () => { '1 .T N... 120000 120000 100755 6165716e8b408ad09b51d1a37aa1ef50e7f84376 6165716e8b408ad09b51d1a37aa1ef50e7f84376 pdf_linux-x64/lib/libQt5Core.so.5' const entries = parse(x) as ReadonlyArray - assert.equal((entries).length, 1) + assert.equal(entries.length, 1) assert.equal(entries[0].path, 'pdf_linux-x64/lib/libQt5Core.so.5') assert.equal(entries[0].statusCode, '.T') @@ -119,7 +120,7 @@ describe('parsePorcelainStatus', () => { it('parses submodule changes', () => { const x = `1 .M SCMU 100644 100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 submodule/submodule` const entries = parse(x) as ReadonlyArray - assert.equal((entries).length, 1) + assert.equal(entries.length, 1) assert.equal(entries[0].path, 'submodule/submodule') assert.equal(entries[0].submoduleStatusCode, 'SCMU') }) diff --git a/app/test/unit/stores/updates/update-changed-files-test.ts b/app/test/unit/stores/updates/update-changed-files-test.ts index b98ac1935cd..76180b16d12 100644 --- a/app/test/unit/stores/updates/update-changed-files-test.ts +++ b/app/test/unit/stores/updates/update-changed-files-test.ts @@ -77,7 +77,8 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) - assert.equal(partialFile!.selection.getSelectionType(), + assert.equal( + partialFile!.selection.getSelectionType(), DiffSelectionType.None ) }) @@ -97,7 +98,8 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) - assert.equal(partialFile!.selection.getSelectionType(), + assert.equal( + partialFile!.selection.getSelectionType(), DiffSelectionType.Partial ) }) @@ -131,7 +133,7 @@ describe('updateChangedFiles', () => { const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - assert.equal((selectedFileIDs).length, 1) + assert.equal(selectedFileIDs.length, 1) // NOTE: `updateChangedFiles` sorts the paths and `app/package.json` will // appear in list before `README.md` assert.equal(selectedFileIDs[0], files[1].id) @@ -156,7 +158,7 @@ describe('updateChangedFiles', () => { const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - assert.equal((selectedFileIDs).length, 1) + assert.equal(selectedFileIDs.length, 1) assert.equal(selectedFileIDs[0], firstFile) }) @@ -177,7 +179,7 @@ describe('updateChangedFiles', () => { const workingDirectorySelection = selection as ChangesWorkingDirectorySelection const { selectedFileIDs } = workingDirectorySelection - assert.equal((selectedFileIDs).length, 0) + assert.equal(selectedFileIDs.length, 0) }) }) diff --git a/app/test/unit/text-diff-expansion-test.ts b/app/test/unit/text-diff-expansion-test.ts index 7b91e625591..50735210e1c 100644 --- a/app/test/unit/text-diff-expansion-test.ts +++ b/app/test/unit/text-diff-expansion-test.ts @@ -82,7 +82,7 @@ describe('text-diff-expansion', () => { const { textDiff } = await prepareDiff(100, [30]) const lastHunk = textDiff.hunks[textDiff.hunks.length - 1] - assert.equal((lastHunk.lines).length, 1) + assert.equal(lastHunk.lines.length, 1) const firstLine = lastHunk.lines[0] assert.equal(firstLine.type, DiffLineType.Hunk) @@ -95,7 +95,7 @@ describe('text-diff-expansion', () => { const { textDiff } = await prepareDiff(100, [99]) const lastHunk = textDiff.hunks.at(-1) assert(lastHunk !== undefined) - assert.equal((lastHunk!.lines).length, 6) + assert.equal(lastHunk!.lines.length, 6) }) it('expands the initial hunk without reaching the top', async () => { @@ -182,10 +182,10 @@ describe('text-diff-expansion', () => { // - First around line 10 // - Second around line 20 // - Third is the dummy hunk at the end - assert.equal((textDiff.hunks).length, 3) + assert.equal(textDiff.hunks.length, 3) // After expanding the hunk, the first two hunks are merged - assert.equal((expandedDiff!.hunks).length, 2) + assert.equal(expandedDiff!.hunks.length, 2) const firstHunk = expandedDiff!.hunks[0] assert.equal(firstHunk.header.oldStartLine, 8) @@ -201,10 +201,10 @@ describe('text-diff-expansion', () => { ) const expandedDiff = expandWholeTextDiff(textDiff, newContentLines) - assert.equal((expandedDiff!.hunks).length, 1) + assert.equal(expandedDiff!.hunks.length, 1) const firstHunk = expandedDiff!.hunks[0] - assert.equal((firstHunk.lines).length, 40 + 1) // +1 for the header + assert.equal(firstHunk.lines.length, 40 + 1) // +1 for the header let expectedNewLine = 1 let expectedOldLine = 1 diff --git a/app/test/unit/text-token-parser-test.ts b/app/test/unit/text-token-parser-test.ts index d0f68513d9b..321899f953a 100644 --- a/app/test/unit/text-token-parser-test.ts +++ b/app/test/unit/text-token-parser-test.ts @@ -26,7 +26,7 @@ describe('Tokenizer', () => { const text = 'this is a string without anything interesting' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, text) }) @@ -35,7 +35,7 @@ describe('Tokenizer', () => { const text = "let's :shipit: this thing" const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 3) + assert.equal(results.length, 3) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, "let's ") assert.equal(results[1].kind, TokenType.Emoji) @@ -68,7 +68,7 @@ describe('Tokenizer', () => { const text = 'releasing the thing :shipit:' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 2) + assert.equal(results.length, 2) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'releasing the thing ') @@ -83,7 +83,7 @@ describe('Tokenizer', () => { const text = 'releasing the thing :unknown:' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'releasing the thing :unknown:') }) @@ -92,9 +92,10 @@ describe('Tokenizer', () => { const text = 'the email address support@github.com should be ignored' const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) - assert.equal(results[0].text, + assert.equal( + results[0].text, 'the email address support@github.com should be ignored' ) }) @@ -105,7 +106,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 2) + assert.equal(results.length, 2) assert.equal(results[0].kind, TokenType.Link) const mention = results[0] as HyperlinkMatch @@ -123,7 +124,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 2) + assert.equal(results.length, 2) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'fixed based on suggestion from ') @@ -140,7 +141,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'fix double http:// in avatar URLs') @@ -151,7 +152,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'fix double https:// in avatar URLs') @@ -164,7 +165,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 3) + assert.equal(results.length, 3) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'Merge pull request ') @@ -186,7 +187,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 3) + assert.equal(results.length, 3) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'Update README.md (') @@ -208,10 +209,11 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 5) + assert.equal(results.length, 5) assert.equal(results[0].kind, TokenType.Text) - assert.equal(results[0].text, + assert.equal( + results[0].text, `'Clone repository' menu item label is obscured on Windows - ` ) @@ -246,7 +248,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 13) + assert.equal(results.length, 13) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'Assorted changelog typos - ') @@ -318,7 +320,7 @@ describe('Tokenizer', () => { const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 13) + assert.equal(results.length, 13) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'Assorted changelog typos - ') @@ -408,7 +410,7 @@ Signed-off-by: Johannes Schindelin ` const tokenizer = new Tokenizer(emoji, repository) const results = tokenizer.tokenize(text) - assert.equal((results).length, 3) + assert.equal(results.length, 3) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, expectedBefore) @@ -417,7 +419,8 @@ Signed-off-by: Johannes Schindelin ` const issue = results[1] as HyperlinkMatch assert.equal(issue.text, '#1034') - assert.equal(issue.url, + assert.equal( + issue.url, 'https://github.com/shiftkey/some-repo/issues/1034' ) @@ -431,7 +434,7 @@ Signed-off-by: Johannes Schindelin ` const text = 'releasing the thing :shipit:' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 2) + assert.equal(results.length, 2) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, 'releasing the thing ') @@ -446,7 +449,7 @@ Signed-off-by: Johannes Schindelin ` const text = 'releasing the thing :unknown:' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, text) }) @@ -455,7 +458,7 @@ Signed-off-by: Johannes Schindelin ` const text = 'fixed based on suggestion from @shiftkey' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, text) }) @@ -465,7 +468,7 @@ Signed-off-by: Johannes Schindelin ` 'Merge pull request #955 from desktop/computering-icons-for-all' const tokenizer = new Tokenizer(emoji) const results = tokenizer.tokenize(text) - assert.equal((results).length, 1) + assert.equal(results.length, 1) assert.equal(results[0].kind, TokenType.Text) assert.equal(results[0].text, text) }) @@ -488,15 +491,17 @@ Signed-off-by: Johannes Schindelin ` // other tests are looking at the newline formatting here // let's just verify the URL conversion works - assert.equal((results).length, 3) + assert.equal(results.length, 3) assert.equal(results[1].kind, TokenType.Link) const mention = results[1] as HyperlinkMatch - assert.equal(mention.text, + assert.equal( + mention.text, 'https://github.com/shiftkey/some-repo/issues/1034' ) - assert.equal(mention.url, + assert.equal( + mention.url, 'https://github.com/shiftkey/some-repo/issues/1034' ) }) diff --git a/app/test/unit/wrap-rich-text-commit-message-test.ts b/app/test/unit/wrap-rich-text-commit-message-test.ts index 6fa04dd3eaf..6bf9c3b85c3 100644 --- a/app/test/unit/wrap-rich-text-commit-message-test.ts +++ b/app/test/unit/wrap-rich-text-commit-message-test.ts @@ -88,7 +88,8 @@ describe('wrapRichTextCommitMessage', () => { assert.equal(body.length, 0) assert.equal(summary[0].kind, TokenType.Text) - assert.equal(summary[0].text, + assert.equal( + summary[0].text, 'This issue summary should be exactly 72 chars including the issue no: ' ) assert.equal(summary[1].kind, TokenType.Link) @@ -104,12 +105,14 @@ describe('wrapRichTextCommitMessage', () => { assert.equal(body.length, 0) assert.equal(summary[0].kind, TokenType.Text) - assert.equal(summary[0].text, + assert.equal( + summary[0].text, 'This issue link should be shortened to well under 72 characters: ' ) assert.equal(summary[1].kind, TokenType.Link) assert.equal(summary[1].text, '#1') - assert.equal((summary[1] as HyperlinkMatch).url, + assert.equal( + (summary[1] as HyperlinkMatch).url, 'https://github.com/niik/commit-summary-wrap-tests/issues/1' ) }) @@ -135,13 +138,15 @@ describe('wrapRichTextCommitMessage', () => { assert.equal(body.length, 2) assert.equal(summary[0].kind, TokenType.Text) - assert.equal(summary[0].text, + assert.equal( + summary[0].text, 'Link should be truncated but open our release notes ' ) assert.equal(summary[1].kind, TokenType.Link) assert.equal(summary[1].text, 'https://desktop.gith') - assert.equal((summary[1] as HyperlinkMatch).url, + assert.equal( + (summary[1] as HyperlinkMatch).url, 'https://desktop.github.com/release-notes/' ) @@ -153,7 +158,8 @@ describe('wrapRichTextCommitMessage', () => { assert.equal(body[1].kind, TokenType.Link) assert.equal(body[1].text, 'ub.com/release-notes/') - assert.equal((body[1] as HyperlinkMatch).url, + assert.equal( + (body[1] as HyperlinkMatch).url, 'https://desktop.github.com/release-notes/' ) }) From 50b7c4f808874c7d3897e3873f2f652c9bfdb69c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:19:11 +0100 Subject: [PATCH 0254/1338] Get rid of ! --- app/test/globals.ts | 4 +- app/test/unit/api-test.ts | 2 +- app/test/unit/desktop-file-transport-test.ts | 4 +- app/test/unit/find-upstream-remote-test.ts | 4 +- app/test/unit/git-store-test.ts | 32 +++--- app/test/unit/git/apply-test.ts | 11 +- app/test/unit/git/branch-test.ts | 10 +- app/test/unit/git/cherry-pick-test.ts | 25 +++-- app/test/unit/git/commit-test.ts | 32 +++--- app/test/unit/git/core-test.ts | 2 +- app/test/unit/git/diff-test.ts | 4 +- app/test/unit/git/fetch-test.ts | 20 +++- app/test/unit/git/gitignore-test.ts | 6 +- .../unit/git/rebase/detect-conflict-test.ts | 9 +- app/test/unit/git/rebase/progress-test.ts | 8 +- app/test/unit/git/reflog-test.ts | 3 +- app/test/unit/git/remote-test.ts | 9 +- app/test/unit/git/reorder-test.ts | 4 +- app/test/unit/git/squash-test.ts | 4 +- app/test/unit/git/stash-test.ts | 2 +- app/test/unit/git/status-test.ts | 6 +- app/test/unit/git/tag-test.ts | 23 ++-- app/test/unit/main-process/menu-test.ts | 4 +- app/test/unit/remote-parsing-test.ts | 102 +++++++++--------- app/test/unit/repository-matching-test.ts | 12 ++- app/test/unit/repository-state-cache-test.ts | 2 +- app/test/unit/section-list-selection-test.ts | 9 +- app/test/unit/stats-store-test.ts | 2 +- .../updates/update-changed-files-test.ts | 6 +- .../stores/updates/update-remote-url-test.ts | 20 ++-- app/test/unit/text-diff-expansion-test.ts | 32 ++++-- 31 files changed, 246 insertions(+), 167 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index 1c4c58d42d7..7690d04c09a 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -15,7 +15,7 @@ import { readFileSync } from 'fs' // These constants are defined by Webpack at build time, but since tests aren't // built with Webpack we need to make sure these exist at runtime. -const g: any = global +const g: any = globalThis g['__WIN32__'] = process.platform === 'win32' g['__DARWIN__'] = process.platform === 'darwin' g['__LINUX__'] = process.platform === 'linux' @@ -53,7 +53,7 @@ g.ResizeObserver = class ResizeObserver { // structuredClone doesn't exist in JSDOM, see: // https://github.com/jsdom/jsdom/issues/3363 -global.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x)) +globalThis.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x)) // The following types are part of the WebWorker support in Node.js and are a // common source of hangs in tests due to libraries creating them but not diff --git a/app/test/unit/api-test.ts b/app/test/unit/api-test.ts index 25f3824cd76..54484b80e2a 100644 --- a/app/test/unit/api-test.ts +++ b/app/test/unit/api-test.ts @@ -24,7 +24,7 @@ function assertNext(current: IPageInfo, expected: IPageInfo) { ) assert(nextPath !== null) - const { pathname, query } = URL.parse(nextPath!, true) + const { pathname, query } = URL.parse(nextPath, true) assert.equal(pathname, '/items') diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 6c6cd8d5687..e5c95c43e7a 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -29,7 +29,7 @@ describe('DesktopFileTransport', () => { it('creates a file for each day', async () => { const originalToISOString = Date.prototype.toISOString - const globalDate = global.Date as any + const globalDate = globalThis.Date as any const d = await createTempDirectory('desktop-logs') const t = new DesktopFileTransport({ logDirectory: d }) @@ -52,7 +52,7 @@ describe('DesktopFileTransport', () => { it('retains a maximum of 14 log files', async () => { const originalToISOString = Date.prototype.toISOString - const globalDate = global.Date as any + const globalDate = globalThis.Date as any const d = await createTempDirectory('desktop-logs') const t = new DesktopFileTransport({ logDirectory: d }) diff --git a/app/test/unit/find-upstream-remote-test.ts b/app/test/unit/find-upstream-remote-test.ts index 1cb0b77d31a..9c8c49fdd25 100644 --- a/app/test/unit/find-upstream-remote-test.ts +++ b/app/test/unit/find-upstream-remote-test.ts @@ -20,9 +20,9 @@ describe('findUpstreamRemote', () => { ] const upstream = findUpstreamRemote(parent, remotes) assert(upstream !== null) - assert.equal(upstream!.name, UpstreamRemoteName) + assert.equal(upstream.name, UpstreamRemoteName) assert.equal( - upstream!.url, + upstream.url, 'https://github.com/Somsubhra/github-release-stats.git' ) }) diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index f30d1f2271f..8b1f2f6018b 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -35,7 +35,7 @@ describe('GitStore', () => { assert(commits !== null) assert.equal(commits.length, 100) - assert.equal(commits![0], '708a46eac512c7b2486da2247f116d11a100b611') + assert.equal(commits[0], '708a46eac512c7b2486da2247f116d11a100b611') }) }) @@ -124,7 +124,7 @@ describe('GitStore', () => { firstCommit = await getCommit(repository, 'master') assert(firstCommit !== null) - assert.equal(firstCommit!.parentSHAs.length, 0) + assert.equal(firstCommit.parentSHAs.length, 0) }) it('reports the repository is unborn', async () => { @@ -133,7 +133,8 @@ describe('GitStore', () => { await gitStore.loadStatus() assert.equal(gitStore.tip.kind, TipState.Valid) - await gitStore.undoCommit(firstCommit!) + assert(firstCommit !== null) + await gitStore.undoCommit(firstCommit) const after = await getStatusOrThrow(repository) assert(after.currentTip === undefined) @@ -142,11 +143,12 @@ describe('GitStore', () => { it('pre-fills the commit message', async () => { const gitStore = new GitStore(repository, shell, new TestStatsStore()) - await gitStore.undoCommit(firstCommit!) + assert(firstCommit !== null) + await gitStore.undoCommit(firstCommit) const newCommitMessage = gitStore.commitMessage assert(newCommitMessage !== null) - assert.equal(newCommitMessage!.summary, commitMessage) + assert.equal(newCommitMessage.summary, commitMessage) }) it('clears the undo commit dialog', async () => { @@ -159,7 +161,8 @@ describe('GitStore', () => { assert.equal(gitStore.localCommitSHAs.length, 1) - await gitStore.undoCommit(firstCommit!) + assert(firstCommit !== null) + await gitStore.undoCommit(firstCommit) await gitStore.loadStatus() assert.equal(gitStore.tip.kind, TipState.Unborn) @@ -179,7 +182,8 @@ describe('GitStore', () => { assert.equal(gitStore.localCommitSHAs.length, 1) - await gitStore.undoCommit(firstCommit!) + assert(firstCommit !== null) + await gitStore.undoCommit(firstCommit) // compare the index state to some other tree-ish // 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the magic empty tree @@ -208,7 +212,7 @@ describe('GitStore', () => { await FSE.writeFile(filePath, 'SOME WORDS GO HERE\n') - let status = await getStatusOrThrow(repo!) + let status = await getStatusOrThrow(repo) let files = status.workingDirectory.files assert.equal(files.length, 1) @@ -281,12 +285,14 @@ describe('GitStore', () => { assert.equal(gitStore.allBranches.length, 2) const defaultBranch = gitStore.allBranches.find(b => b.name === 'master') - assert.equal(defaultBranch!.upstream, 'origin/master') + assert(defaultBranch !== undefined) + assert.equal(defaultBranch.upstream, 'origin/master') const remoteBranch = gitStore.allBranches.find( b => b.name === 'origin/some-other-branch' ) - assert.equal(remoteBranch!.type, BranchType.Remote) + assert(remoteBranch !== undefined) + assert.equal(remoteBranch.type, BranchType.Remote) }) it('the tracking branch is not cleared when the remote branch is removed', async () => { @@ -299,7 +305,8 @@ describe('GitStore', () => { const currentBranchBefore = gitStore.allBranches.find( b => b.name === 'some-other-branch' ) - assert.equal(currentBranchBefore!.upstream, 'origin/some-other-branch') + assert(currentBranchBefore !== undefined) + assert.equal(currentBranchBefore.upstream, 'origin/some-other-branch') // delete the ref in the upstream branch await exec(['branch', '-D', 'some-other-branch'], upstream.path) @@ -313,7 +320,8 @@ describe('GitStore', () => { ) // ensure the tracking information is unchanged - assert.equal(currentBranchAfter!.upstream, 'origin/some-other-branch') + assert(currentBranchAfter !== undefined) + assert.equal(currentBranchAfter.upstream, 'origin/some-other-branch') }) }) }) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index 11e4452e5ff..f3189008fbe 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -155,11 +155,13 @@ describe('git/apply', () => { const filePath = 'modified-file.md' const diff = await getDiff(filePath) const hunkRange = findInteractiveDiffRange(diff.hunks, 4) + assert(hunkRange !== null) + const selection = DiffSelection.fromInitialSelection( DiffSelectionType.None ).withRangeSelection( - hunkRange!.from, - hunkRange!.to - hunkRange!.from + 1, + hunkRange.from, + hunkRange.to - hunkRange.from + 1, true ) @@ -219,11 +221,12 @@ describe('git/apply', () => { const filePath = 'modified-file.md' const diff = await getDiff(filePath) const hunkRange = findInteractiveDiffRange(diff.hunks, 16) + assert(hunkRange !== null) const selection = DiffSelection.fromInitialSelection( DiffSelectionType.None ).withRangeSelection( - hunkRange!.from, - hunkRange!.to - hunkRange!.from + 1, + hunkRange.from, + hunkRange.to - hunkRange.from + 1, true ) diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index cb1177b77d4..ef19c28eeec 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -133,7 +133,7 @@ describe('git/branch', () => { const branches = await getBranchesPointedAt(repository, 'HEAD') assert(branches !== null) assert.equal(branches.length, 1) - assert.equal(branches![0], 'master') + assert.equal(branches[0], 'master') }) it('finds no branch names', async () => { @@ -223,8 +223,8 @@ describe('git/branch', () => { await deleteRemoteBranch( mockLocal, - { name: localBranch.upstreamRemoteName!, url: '' }, - localBranch.upstreamWithoutRemote! + { name: localBranch.upstreamRemoteName, url: '' }, + localBranch.upstreamWithoutRemote ) assert.equal((await getBranches(mockLocal, localRef)).length, 1) @@ -264,8 +264,8 @@ describe('git/branch', () => { await deleteRemoteBranch( mockLocal, - { name: localBranch.upstreamRemoteName!, url: '' }, - localBranch.upstreamWithoutRemote! + { name: localBranch.upstreamRemoteName, url: '' }, + localBranch.upstreamWithoutRemote ) assert.equal((await getBranches(mockLocal, remoteRef)).length, 0) diff --git a/app/test/unit/git/cherry-pick-test.ts b/app/test/unit/git/cherry-pick-test.ts index 863c5946b0d..dc0393851dc 100644 --- a/app/test/unit/git/cherry-pick-test.ts +++ b/app/test/unit/git/cherry-pick-test.ts @@ -66,8 +66,10 @@ describe('git/cherry-pick', () => { ) const commits = await getCommits(repository, targetBranch.ref, 3) + assert(cherryPickedCommit !== null) + assert.equal(commits.length, 2) - assert.equal(commits[0].summary, cherryPickedCommit!.summary) + assert.equal(commits[0].summary, cherryPickedCommit.summary) assert.equal(result, CherryPickResult.CompletedWithoutError) }) @@ -165,7 +167,8 @@ describe('git/cherry-pick', () => { // cherry picking 3 (on added in setup, empty, featureBranchCommitTwo) const commitRange = revRangeInclusive(firstCommitSha, featureBranch.tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) - result = await cherryPick(repository, commitsInRange!) + assert(commitsInRange !== null) + result = await cherryPick(repository, commitsInRange) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 4) // original commit + 4 cherry picked @@ -182,7 +185,9 @@ describe('git/cherry-pick', () => { const commitRange = revRangeInclusive(firstCommitSha, featureBranch.tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) - result = await cherryPick(repository, commitsInRange!) + assert(commitsInRange !== null) + + result = await cherryPick(repository, commitsInRange) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 5) @@ -303,7 +308,8 @@ describe('git/cherry-pick', () => { const commitRange = revRangeInclusive(firstSha, featureBranch.tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) - result = await cherryPick(repository, commitsInRange!) + assert(commitsInRange !== null) + result = await cherryPick(repository, commitsInRange) assert.equal(result, CherryPickResult.ConflictsEncountered) // resolve conflicts by writing files to disk @@ -552,7 +558,8 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) const commitsInRange = await getCommitsInRange(repository, commitRange) - result = await cherryPick(repository, commitsInRange!, p => + assert(commitsInRange !== null) + result = await cherryPick(repository, commitsInRange, p => progress.push(p) ) @@ -585,7 +592,8 @@ describe('git/cherry-pick', () => { featureBranch.tip.sha ) const commitsInRange = await getCommitsInRange(repository, commitRange) - result = await cherryPick(repository, commitsInRange!, p => + assert(commitsInRange !== null) + result = await cherryPick(repository, commitsInRange, p => progress.push(p) ) assert.equal(result, CherryPickResult.ConflictsEncountered) @@ -629,8 +637,9 @@ describe('git/cherry-pick', () => { }) async function getCommitOneLine(repository: Repository, commitSha: string) { - const { sha, summary } = (await getCommit(repository, commitSha))! - return { sha, summary } + const commit = await getCommit(repository, commitSha) + assert(commit !== null) + return { sha: commit.sha, summary: commit.summary } } async function addThreeMoreCommitsOntoFeatureBranch(repository: Repository) { diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 5785c0ee64b..14efdcd69eb 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -92,9 +92,9 @@ describe('git/commit', () => { const commit = await getCommit(repository, 'HEAD') assert(commit !== null) - assert.equal(commit!.summary, 'Special commit') - assert.equal(commit!.body, '# this is a comment\n') - assert.equal(commit!.shortSha, sha) + assert.equal(commit.summary, 'Special commit') + assert.equal(commit.body, '# this is a comment\n') + assert.equal(commit.shortSha, sha) }) it('can commit for empty repository', async () => { @@ -198,11 +198,11 @@ describe('git/commit', () => { assert.equal(status.workingDirectory.files.length, 4) // verify that the file is now tracked - const fileChange = status!.workingDirectory.files.find( + const fileChange = status.workingDirectory.files.find( f => f.path === newFileName ) assert(fileChange !== undefined) - assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) + assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) it('can commit second hunk from modified file', async () => { @@ -254,7 +254,7 @@ describe('git/commit', () => { f => f.path === modifiedFile ) assert(fileChange !== undefined) - assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) + assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) it('can commit single delete from modified file', async () => { @@ -355,7 +355,7 @@ describe('git/commit', () => { f => f.path === modifiedFile ) assert(fileChange !== undefined) - assert.equal(fileChange!.status.kind, AppFileStatusKind.Modified) + assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) it('can commit some lines from deleted file', async () => { @@ -397,7 +397,7 @@ describe('git/commit', () => { f => f.path === deletedFile ) assert(fileChange !== undefined) - assert.equal(fileChange!.status.kind, AppFileStatusKind.Deleted) + assert.equal(fileChange.status.kind, AppFileStatusKind.Deleted) }) it('can commit renames with modifications', async () => { @@ -422,9 +422,10 @@ describe('git/commit', () => { assert.equal(sha.length, 7) const statusAfter = await getStatusOrThrow(repo) + assert(statusAfter.currentTip !== undefined) assert.equal(statusAfter.workingDirectory.files.length, 0) - assert.equal(statusAfter.currentTip!.substring(0, 7), sha) + assert.equal(statusAfter.currentTip.substring(0, 7), sha) }) // The scenario here is that the user has staged a rename (probably using git mv) @@ -777,7 +778,7 @@ describe('git/commit', () => { const commit = await getCommit(repo, 'HEAD') assert(commit !== null) - assert.equal(commit!.summary, 'commit everything') + assert.equal(commit.summary, 'commit everything') }) it('can commit when a delete is staged and the untracked file exists', async () => { @@ -803,7 +804,7 @@ describe('git/commit', () => { assert(files[0].path.includes('first')) assert.equal(files[0].status.kind, AppFileStatusKind.Untracked) - const toCommit = status!.workingDirectory.withIncludeAllFiles(true) + const toCommit = status.workingDirectory.withIncludeAllFiles(true) const sha = await createCommit(repo, 'commit again!', toCommit.files) assert.equal(sha.length, 7) @@ -814,8 +815,8 @@ describe('git/commit', () => { const commit = await getCommit(repo, 'HEAD') assert(commit !== null) - assert.equal(commit!.summary, 'commit again!') - assert.equal(commit!.shortSha, sha) + assert.equal(commit.summary, 'commit again!') + assert.equal(commit.shortSha, sha) }) it('file is deleted in index', async () => { @@ -843,12 +844,13 @@ describe('git/commit', () => { assert.equal(files[1].status.kind, AppFileStatusKind.Deleted) // Commit changes - await createCommit(repo!, 'FAIL commit', files) + await createCommit(repo, 'FAIL commit', files) const afterCommit = await getStatusOrThrow(repo) + assert(afterCommit.currentTip !== undefined) assert.notEqual(beforeCommit.currentTip, afterCommit.currentTip) // Verify the file was delete in repo - const changesetData = await getChangedFiles(repo, afterCommit.currentTip!) + const changesetData = await getChangedFiles(repo, afterCommit.currentTip) assert.equal(changesetData.files.length, 2) assert.equal( changesetData.files[0].status.kind, diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts index 69bdb8581c9..5df46e3298e 100644 --- a/app/test/unit/git/core-test.ts +++ b/app/test/unit/git/core-test.ts @@ -101,7 +101,7 @@ describe('git/core', () => { assert.equal(result.gitError, GitError.ConfigLockFileAlreadyExists) const parsedPath = parseConfigLockFilePathFromError(result) assert(parsedPath !== null) - const absolutePath = resolve(result.path, parsedPath!) + const absolutePath = resolve(result.path, parsedPath) assert.equal(absolutePath, configLockFilePath) }) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 669bb391d2e..be454c32dfe 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -377,8 +377,8 @@ describe('git/diff', () => { const diff = await getTextDiff(repo, files[0]) assert(diff.lineEndingsChange !== undefined) - assert.equal(diff.lineEndingsChange!.from, 'LF') - assert.equal(diff.lineEndingsChange!.to, 'CRLF') + assert.equal(diff.lineEndingsChange.from, 'LF') + assert.equal(diff.lineEndingsChange.to, 'CRLF') }) }) diff --git a/app/test/unit/git/fetch-test.ts b/app/test/unit/git/fetch-test.ts index 1401daa727a..6e36dc32c02 100644 --- a/app/test/unit/git/fetch-test.ts +++ b/app/test/unit/git/fetch-test.ts @@ -37,18 +37,23 @@ describe('git/fetch', () => { // Only the branch behind was updated to match its upstream const branchBehind = branchWithName(resultBranches, 'branch-behind') + assert(branchBehind.upstream !== null) + const branchBehindUpstream = branchWithName( resultBranches, - branchBehind.upstream! + branchBehind.upstream ) assert.equal(branchBehindUpstream.tip.sha, branchBehind.tip.sha) // The branch ahead is still ahead const branchAhead = branchWithName(resultBranches, 'branch-ahead') + assert(branchAhead.upstream !== null) + const branchAheadUpstream = branchWithName( resultBranches, - branchAhead.upstream! + branchAhead.upstream ) + assert.notEqual(branchAheadUpstream.tip.sha, branchAhead.tip.sha) // The branch ahead and behind is still ahead and behind @@ -56,9 +61,11 @@ describe('git/fetch', () => { resultBranches, 'branch-ahead-and-behind' ) + assert(branchAheadAndBehind.upstream !== null) + const branchAheadAndBehindUpstream = branchWithName( resultBranches, - branchAheadAndBehind.upstream! + branchAheadAndBehind.upstream ) assert.notEqual( branchAheadAndBehindUpstream.tip.sha, @@ -67,14 +74,17 @@ describe('git/fetch', () => { // The main branch hasn't been updated, since it's the current branch const mainBranch = branchWithName(resultBranches, 'main') - const mainUpstream = branchWithName(resultBranches, mainBranch.upstream!) + assert(mainBranch.upstream !== null) + + const mainUpstream = branchWithName(resultBranches, mainBranch.upstream) assert.notEqual(mainUpstream.tip.sha, mainBranch.tip.sha) // The up-to-date branch is still matching its upstream const upToDateBranch = branchWithName(resultBranches, 'branch-up-to-date') + assert(upToDateBranch.upstream !== null) const upToDateBranchUpstream = branchWithName( resultBranches, - upToDateBranch.upstream! + upToDateBranch.upstream ) assert.equal(upToDateBranchUpstream.tip.sha, upToDateBranch.tip.sha) }) diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts index 7988513a5fd..3e2c94839ed 100644 --- a/app/test/unit/git/gitignore-test.ts +++ b/app/test/unit/git/gitignore-test.ts @@ -59,7 +59,8 @@ describe('gitignore', () => { assert.equal(commit.exitCode, 0) const contents = await readGitIgnoreAtRoot(repo) - assert.equal(contents!.endsWith('\r\n'), true) + assert(contents !== null) + assert.equal(contents.endsWith('\r\n'), true) }) it('when autocrlf=input, appends LF to file', async () => { @@ -84,7 +85,8 @@ describe('gitignore', () => { assert.equal(commit.exitCode, 0) const contents = await readGitIgnoreAtRoot(repo) - assert.equal(contents!.endsWith('\n'), true) + assert(contents !== null) + assert.equal(contents.endsWith('\n'), true) }) }) diff --git a/app/test/unit/git/rebase/detect-conflict-test.ts b/app/test/unit/git/rebase/detect-conflict-test.ts index 98ba0bafcec..f41d38072ec 100644 --- a/app/test/unit/git/rebase/detect-conflict-test.ts +++ b/app/test/unit/git/rebase/detect-conflict-test.ts @@ -157,7 +157,7 @@ describe('git/rebase', () => { it('still has conflicted files in working directory', async () => { assert.equal( - status!.workingDirectory.files.filter( + status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted ).length, 2 @@ -288,10 +288,9 @@ describe('git/rebase', () => { status = await getStatusOrThrow(repository) - const changesetData = await getChangedFiles( - repository, - status.currentTip! - ) + assert(status.currentTip !== undefined) + + const changesetData = await getChangedFiles(repository, status.currentTip) filesInRebasedCommit = changesetData.files }) diff --git a/app/test/unit/git/rebase/progress-test.ts b/app/test/unit/git/rebase/progress-test.ts index 4190a0d92f3..cfc12f9237d 100644 --- a/app/test/unit/git/rebase/progress-test.ts +++ b/app/test/unit/git/rebase/progress-test.ts @@ -81,8 +81,8 @@ describe('git/rebase', () => { }) it('status detects REBASE_HEAD', () => { - assert.notEqual(snapshot, null) - const s = snapshot! + assert(snapshot !== null) + const s = snapshot assert.equal(s.commits.length, 1) assert.equal(s.commits[0].summary, 'Feature Branch!') @@ -159,8 +159,8 @@ describe('git/rebase', () => { }) it('status detects REBASE_HEAD', () => { - assert.notEqual(snapshot, null) - const s = snapshot! + assert(snapshot !== null) + const s = snapshot assert.equal(s.commits.length, 10) assert.equal(s.commits[0].summary, 'Feature Branch First Commit!') diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts index cf9250fb45c..a12ed40a10a 100644 --- a/app/test/unit/git/reflog-test.ts +++ b/app/test/unit/git/reflog-test.ts @@ -52,7 +52,8 @@ describe('git/reflog', () => { branch => branch.name === 'branch-2' ) - await renameBranch(repository, currentBranch!, 'branch-2-test') + assert(currentBranch !== undefined) + await renameBranch(repository, currentBranch, 'branch-2-test') const branches = await getRecentBranches(repository, 10) assert.equal(branches.includes('branch-2'), false) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 05ec3f372cc..67cb5856fde 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -110,7 +110,8 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - assert.equal(result!.name, 'origin') + assert(result !== null) + assert.equal(result.name, 'origin') }) it('returns something when origin removed', async () => { @@ -123,7 +124,8 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - assert.equal(result!.name, 'bassoon') + assert(result !== null) + assert.equal(result.name, 'bassoon') }) it('returns null for new repository', async () => { @@ -148,7 +150,8 @@ describe('git/remote', () => { const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) - assert.equal(result!.name, 'origin') + assert(result !== null) + assert.equal(result.name, 'origin') }) }) diff --git a/app/test/unit/git/reorder-test.ts b/app/test/unit/git/reorder-test.ts index a78032312c1..3fe9a959f98 100644 --- a/app/test/unit/git/reorder-test.ts +++ b/app/test/unit/git/reorder-test.ts @@ -270,5 +270,7 @@ async function makeSampleCommit( } await makeCommit(repository, commitTree) - return (await getCommit(repository, 'HEAD'))! + const commit = await getCommit(repository, 'HEAD') + assert(commit !== null, `Couldn't find HEAD after committing!`) + return commit } diff --git a/app/test/unit/git/squash-test.ts b/app/test/unit/git/squash-test.ts index c745a2ba452..99fad27a669 100644 --- a/app/test/unit/git/squash-test.ts +++ b/app/test/unit/git/squash-test.ts @@ -391,5 +391,7 @@ async function makeSquashCommit( } await makeCommit(repository, commitTree) - return (await getCommit(repository, 'HEAD'))! + const commit = await getCommit(repository, 'HEAD') + assert(commit !== null, `Couldn't find HEAD after committing!`) + return commit } diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index f80f29a9bcb..17e77e11d03 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -146,7 +146,7 @@ describe('git/stash', () => { ) assert(actual !== null) - assert.equal(actual!.stashSha, lastEntry.stashSha) + assert.equal(actual.stashSha, lastEntry.stashSha) }) }) diff --git a/app/test/unit/git/status-test.ts b/app/test/unit/git/status-test.ts index 62744ef9a2a..b6b4c612517 100644 --- a/app/test/unit/git/status-test.ts +++ b/app/test/unit/git/status-test.ts @@ -45,7 +45,8 @@ describe('git/status', () => { ) assert.equal(conflictedFiles.length, 4) - const fooFile = files.find(f => f.path === 'foo')! + const fooFile = files.find(f => f.path === 'foo') + assert(fooFile) assert.deepStrictEqual(fooFile.status, { kind: AppFileStatusKind.Conflicted, entry: { @@ -72,7 +73,8 @@ describe('git/status', () => { conflictMarkerCount: 3, }) - const catFile = files.find(f => f.path === 'cat')! + const catFile = files.find(f => f.path === 'cat') + assert(catFile) assert.deepStrictEqual(catFile.status, { kind: AppFileStatusKind.Conflicted, entry: { diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 6450b6b1fef..964205bf4e5 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -24,7 +24,7 @@ import { import { IRemote } from '../../../src/models/remote' import { findDefaultRemote } from '../../../src/lib/stores/helpers/find-default-remote' import { getStatusOrThrow } from '../../helpers/status' -import { assertNonNullable } from '../../../src/lib/fatal-error' +import { assertNonNullable, forceUnwrap } from '../../../src/lib/fatal-error' describe('git/tag', () => { let repository: Repository @@ -100,14 +100,16 @@ describe('git/tag', () => { it('returns all the created tags', async () => { const commit = await getCommit(repository, 'HEAD') - await createTag(repository, 'my-new-tag', commit!.sha) - await createTag(repository, 'another-tag', commit!.sha) + assert(commit !== null) + + await createTag(repository, 'my-new-tag', commit.sha) + await createTag(repository, 'another-tag', commit.sha) assert.deepStrictEqual( await getAllTags(repository), new Map([ - ['my-new-tag', commit!.sha], - ['another-tag', commit!.sha], + ['my-new-tag', commit.sha], + ['another-tag', commit.sha], ]) ) }) @@ -123,7 +125,10 @@ describe('git/tag', () => { repository = await setupLocalForkOfRepository(remoteRepository) const remotes = await getRemotes(repository) - originRemote = findDefaultRemote(remotes)! + originRemote = forceUnwrap( + "couldn't find origin remote", + findDefaultRemote(remotes) + ) }) it('returns an empty array when there are no tags to get pushed', async () => { @@ -157,14 +162,16 @@ describe('git/tag', () => { // Create a tag on a local branch that's not pushed to the remote. const branchName = 'new-branch' await createBranch(repository, branchName, 'master') - const [branch] = await getBranches(repository, `refs/heads/${branchName}`) + const branch = ( + await getBranches(repository, `refs/heads/${branchName}`) + ).at(0) assertNonNullable(branch, `Could not create branch ${branchName}`) await FSE.writeFile(path.join(repository.path, 'README.md'), 'Hi world\n') const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files - await checkoutBranch(repository, branch!, null) + await checkoutBranch(repository, branch, null) const commitSha = await createCommit(repository, 'a commit', files) await createTag(repository, 'my-new-tag', commitSha) diff --git a/app/test/unit/main-process/menu-test.ts b/app/test/unit/main-process/menu-test.ts index f84d4522937..700e743e8a4 100644 --- a/app/test/unit/main-process/menu-test.ts +++ b/app/test/unit/main-process/menu-test.ts @@ -45,14 +45,14 @@ describe('main-process menu', () => { assert.equal(template[0].id, 'foo') const firstSubmenu = template[0] - .submenu! as Electron.MenuItemConstructorOptions[] + .submenu as Electron.MenuItemConstructorOptions[] assert.equal(firstSubmenu[0].id, 'foo.Open') assert.equal(firstSubmenu[1].id, 'foo.Close') assert.equal(firstSubmenu[2].id, 'foo.More') const secondSubmenu = firstSubmenu[2] - .submenu! as Electron.MenuItemConstructorOptions[] + .submenu as Electron.MenuItemConstructorOptions[] assert.equal(secondSubmenu[0].id, 'foo.More.Even more') }) diff --git a/app/test/unit/remote-parsing-test.ts b/app/test/unit/remote-parsing-test.ts index c6b89b99671..f1af307cc21 100644 --- a/app/test/unit/remote-parsing-test.ts +++ b/app/test/unit/remote-parsing-test.ts @@ -6,137 +6,137 @@ describe('URL remote parsing', () => { it('parses HTTPS URLs with a trailing git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses HTTPS URLs with a trailing -git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo-git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo-git') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo-git') }) it('parses HTTPS URLs with a trailing -git and .git suffixes', () => { const remote = parseRemote('https://github.com/hubot/repo-git.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo-git') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo-git') }) it('parses HTTPS URLs without a trailing git suffix', () => { const remote = parseRemote('https://github.com/hubot/repo') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses HTTPS URLs with a trailing slash', () => { const remote = parseRemote('https://github.com/hubot/repo/') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses HTTPS URLs which include a username', () => { const remote = parseRemote('https://monalisa@github.com/hubot/repo.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs', () => { const remote = parseRemote('git@github.com:hubot/repo.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs with custom username', () => { const remote = parseRemote('niik@niik.ghe.com:hubot/repo.git') assert(remote !== null) - assert.equal(remote!.hostname, 'niik.ghe.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'niik.ghe.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs without the git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs without the git suffix but with -git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo-git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo-git') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo-git') }) it('parses SSH URLs with the .git suffix and -git suffix', () => { const remote = parseRemote('git@github.com:hubot/repo-git.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo-git') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo-git') }) it('parses SSH URLs with a trailing slash', () => { const remote = parseRemote('git@github.com:hubot/repo/') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses git URLs', () => { const remote = parseRemote('git:github.com/hubot/repo.git') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses git URLs without the git suffix', () => { const remote = parseRemote('git:github.com/hubot/repo') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses git URLs with a trailing slash', () => { const remote = parseRemote('git:github.com/hubot/repo/') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs with the ssh prefix', () => { const remote = parseRemote('ssh://git@github.com/hubot/repo') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('parses SSH URLs with the ssh prefix and trailing slash', () => { const remote = parseRemote('ssh://git@github.com/hubot/repo/') assert(remote !== null) - assert.equal(remote!.hostname, 'github.com') - assert.equal(remote!.owner, 'hubot') - assert.equal(remote!.name, 'repo') + assert.equal(remote.hostname, 'github.com') + assert.equal(remote.owner, 'hubot') + assert.equal(remote.name, 'repo') }) it('does not parse invalid HTTP URLs when missing repo name', () => { diff --git a/app/test/unit/repository-matching-test.ts b/app/test/unit/repository-matching-test.ts index b91237ca265..d2ffffc1f5d 100644 --- a/app/test/unit/repository-matching-test.ts +++ b/app/test/unit/repository-matching-test.ts @@ -27,7 +27,8 @@ describe('repository-matching', () => { const repo = matchGitHubRepository( accounts, 'https://github.com/someuser/somerepo.git' - )! + ) + assert(repo !== null) assert.equal(repo.name, 'somerepo') assert.equal(repo.owner, 'someuser') }) @@ -48,7 +49,8 @@ describe('repository-matching', () => { const repo = matchGitHubRepository( accounts, 'https://github.com/someuser/somerepo' - )! + ) + assert(repo !== null) assert.equal(repo.name, 'somerepo') assert.equal(repo.owner, 'someuser') }) @@ -69,7 +71,8 @@ describe('repository-matching', () => { const repo = matchGitHubRepository( accounts, 'git:github.com/someuser/somerepo.git' - )! + ) + assert(repo !== null) assert.equal(repo.name, 'somerepo') assert.equal(repo.owner, 'someuser') }) @@ -90,7 +93,8 @@ describe('repository-matching', () => { const repo = matchGitHubRepository( accounts, 'git@github.com:someuser/somerepo.git' - )! + ) + assert(repo !== null) assert.equal(repo.name, 'somerepo') assert.equal(repo.owner, 'someuser') }) diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index f81b2c5f56b..f816c79242f 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -87,7 +87,7 @@ describe('RepositoryStateCache', () => { assert.equal(changesState.workingDirectory.includeAll, true) assert.equal(changesState.workingDirectory.files.length, 1) assert.equal(changesState.showCoAuthoredBy, true) - assert.equal(changesState.commitMessage!.summary, summary) + assert.equal(changesState.commitMessage.summary, summary) }) it('can update compare state for a repository', () => { diff --git a/app/test/unit/section-list-selection-test.ts b/app/test/unit/section-list-selection-test.ts index f8de090b398..7eb1c21eeff 100644 --- a/app/test/unit/section-list-selection-test.ts +++ b/app/test/unit/section-list-selection-test.ts @@ -56,8 +56,9 @@ describe('section-list-selection', () => { row: 0, }, }) + assert(selectedRow !== null) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 2, row: 7 }), + rowIndexPathEquals(selectedRow, { section: 2, row: 7 }), true ) }) @@ -70,8 +71,9 @@ describe('section-list-selection', () => { row: 4, }, }) + assert(selectedRow !== null) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 1, row: 0 }), + rowIndexPathEquals(selectedRow, { section: 1, row: 0 }), true ) }) @@ -84,8 +86,9 @@ describe('section-list-selection', () => { row: 0, }, }) + assert(selectedRow !== null) assert.equal( - rowIndexPathEquals(selectedRow!, { section: 1, row: 2 }), + rowIndexPathEquals(selectedRow, { section: 1, row: 2 }), true ) }) diff --git a/app/test/unit/stats-store-test.ts b/app/test/unit/stats-store-test.ts index 2ca988862aa..a1d82d2b98d 100644 --- a/app/test/unit/stats-store-test.ts +++ b/app/test/unit/stats-store-test.ts @@ -31,7 +31,7 @@ describe('StatsStore', () => { const statsEntry = await statsDb.dailyMeasures.limit(1).first() assert(statsEntry !== undefined) - assert.equal(statsEntry!.active, true) + assert.equal(statsEntry.active, true) }) }) diff --git a/app/test/unit/stores/updates/update-changed-files-test.ts b/app/test/unit/stores/updates/update-changed-files-test.ts index 76180b16d12..74ab8cc5b44 100644 --- a/app/test/unit/stores/updates/update-changed-files-test.ts +++ b/app/test/unit/stores/updates/update-changed-files-test.ts @@ -77,8 +77,9 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) + assert(partialFile !== null) assert.equal( - partialFile!.selection.getSelectionType(), + partialFile.selection.getSelectionType(), DiffSelectionType.None ) }) @@ -98,8 +99,9 @@ describe('updateChangedFiles', () => { partiallySelectedFile.id ) + assert(partialFile !== null) assert.equal( - partialFile!.selection.getSelectionType(), + partialFile.selection.getSelectionType(), DiffSelectionType.Partial ) }) diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts index 80299c1c4f8..ad26470d02c 100644 --- a/app/test/unit/stores/updates/update-remote-url-test.ts +++ b/app/test/unit/stores/updates/update-remote-url-test.ts @@ -53,27 +53,31 @@ describe('Update remote url', () => { await addRemote(repository, 'origin', remoteUrl || apiRepo.clone_url) gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadRemotes() - const gitHubRepository = repository.gitHubRepository! + const { gitHubRepository } = repository return { gitHubRepository, gitStore } } it("updates the repository's remote url when the github url changes", async () => { const { gitHubRepository, gitStore } = await createRepository(apiRepository) - const originalUrl = gitStore.currentRemote!.url + assert(gitStore.currentRemote !== null) + + const originalUrl = gitStore.currentRemote.url const updatedUrl = 'https://github.com/my-user/my-updated-repo' const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) assert.notEqual(originalUrl, updatedUrl) - assert.equal(gitStore.currentRemote!.url, updatedUrl) + assert.equal(gitStore.currentRemote.url, updatedUrl) }) it("doesn't update the repository's remote url when the github url is the same", async () => { const { gitHubRepository, gitStore } = await createRepository(apiRepository) - const originalUrl = gitStore.currentRemote!.url + assert(gitStore.currentRemote !== null) + const originalUrl = gitStore.currentRemote.url assert.notEqual(originalUrl.length, 0, 'Expected originalUrl to be empty') await updateRemoteUrl(gitStore, gitHubRepository, apiRepository) - assert.equal(gitStore.currentRemote!.url, originalUrl) + assert(gitStore.currentRemote !== null) + assert.equal(gitStore.currentRemote.url, originalUrl) }) it("doesn't update repository's remote url if protocols don't match", async () => { @@ -89,7 +93,8 @@ describe('Update remote url', () => { const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) - assert.equal(gitStore.currentRemote!.url, originalUrl) + assert(gitStore.currentRemote !== null) + assert.equal(gitStore.currentRemote.url, originalUrl) }) it("doesn't update the repository's remote url if it differs from the default from the github API", async () => { @@ -103,6 +108,7 @@ describe('Update remote url', () => { const updatedApiRepository = { ...apiRepository, clone_url: updatedUrl } await updateRemoteUrl(gitStore, gitHubRepository, updatedApiRepository) - assert.equal(gitStore.currentRemote!.url, originalUrl) + assert(gitStore.currentRemote !== null) + assert.equal(gitStore.currentRemote.url, originalUrl) }) }) diff --git a/app/test/unit/text-diff-expansion-test.ts b/app/test/unit/text-diff-expansion-test.ts index 50735210e1c..8fbf592136d 100644 --- a/app/test/unit/text-diff-expansion-test.ts +++ b/app/test/unit/text-diff-expansion-test.ts @@ -95,7 +95,7 @@ describe('text-diff-expansion', () => { const { textDiff } = await prepareDiff(100, [99]) const lastHunk = textDiff.hunks.at(-1) assert(lastHunk !== undefined) - assert.equal(lastHunk!.lines.length, 6) + assert.equal(lastHunk.lines.length, 6) }) it('expands the initial hunk without reaching the top', async () => { @@ -107,7 +107,9 @@ describe('text-diff-expansion', () => { newContentLines ) - const firstHunk = expandedDiff!.hunks[0] + assert(expandedDiff !== undefined) + + const firstHunk = expandedDiff.hunks[0] assert.equal(firstHunk.header.oldStartLine, 8) assert.equal(firstHunk.header.oldLineCount, 26) assert.equal(firstHunk.header.newStartLine, 8) @@ -126,7 +128,9 @@ describe('text-diff-expansion', () => { newContentLines ) - const firstHunk = expandedDiff!.hunks[0] + assert(expandedDiff !== undefined) + + const firstHunk = expandedDiff.hunks[0] assert.equal(firstHunk.header.oldStartLine, 1) assert.equal(firstHunk.header.oldLineCount, 18) assert.equal(firstHunk.header.newStartLine, 1) @@ -146,7 +150,11 @@ describe('text-diff-expansion', () => { newContentLines ) - const secondToLastHunk = expandedDiff!.hunks[expandedDiff!.hunks.length - 2] + assert(expandedDiff !== undefined) + + const secondToLastHunk = expandedDiff.hunks.at(-2) + assert(secondToLastHunk !== undefined) + assert.equal(secondToLastHunk.header.oldStartLine, 13) assert.equal(secondToLastHunk.header.oldLineCount, 26) assert.equal(secondToLastHunk.header.newStartLine, 13) @@ -161,8 +169,11 @@ describe('text-diff-expansion', () => { 'down', newContentLines ) + assert(expandedDiff !== undefined) + + const lastHunk = expandedDiff.hunks.at(-1) + assert(lastHunk !== undefined) - const lastHunk = expandedDiff!.hunks[expandedDiff!.hunks.length - 1] assert.equal(lastHunk.header.oldStartLine, 88) assert.equal(lastHunk.header.oldLineCount, 13) assert.equal(lastHunk.header.newStartLine, 88) @@ -184,10 +195,12 @@ describe('text-diff-expansion', () => { // - Third is the dummy hunk at the end assert.equal(textDiff.hunks.length, 3) + assert(expandedDiff !== undefined) + // After expanding the hunk, the first two hunks are merged - assert.equal(expandedDiff!.hunks.length, 2) + assert.equal(expandedDiff.hunks.length, 2) - const firstHunk = expandedDiff!.hunks[0] + const firstHunk = expandedDiff.hunks[0] assert.equal(firstHunk.header.oldStartLine, 8) assert.equal(firstHunk.header.oldLineCount, 16) assert.equal(firstHunk.header.newStartLine, 8) @@ -201,9 +214,10 @@ describe('text-diff-expansion', () => { ) const expandedDiff = expandWholeTextDiff(textDiff, newContentLines) - assert.equal(expandedDiff!.hunks.length, 1) + assert(expandedDiff !== undefined) + assert.equal(expandedDiff.hunks.length, 1) - const firstHunk = expandedDiff!.hunks[0] + const firstHunk = expandedDiff.hunks[0] assert.equal(firstHunk.lines.length, 40 + 1) // +1 for the header let expectedNewLine = 1 From c3a41796ac2b025a10b487d964fec9109523e5dc Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:20:00 +0100 Subject: [PATCH 0255/1338] Fix lint --- app/src/lib/api.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 6816720b3d1..2ce5de84b7c 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -506,7 +506,7 @@ export interface IAPIRepoRule { * The parameters that apply to the rule if it is a metadata rule. * Other rule types may have parameters, but they are not used in * this app so they are ignored. Do not attempt to use this field - * unless you know {@link type} matches a metadata rule type. + * unless you know `type` matches a metadata rule type. */ readonly parameters?: IAPIRepoRuleMetadataParameters } @@ -558,7 +558,7 @@ export interface IAPIRepoRuleMetadataParameters { /** * Whether the operator is negated. For example, if `true` - * and {@link operator} is `starts_with`, then the rule + * and `operator` is `starts_with`, then the rule * will be negated to 'does not start with'. */ negate: boolean @@ -566,13 +566,13 @@ export interface IAPIRepoRuleMetadataParameters { /** * The pattern to match against. If the operator is 'regex', then * this is a regex string match. Otherwise, it is a raw string match - * of the type specified by {@link operator} with no additional parsing. + * of the type specified by `operator` with no additional parsing. */ pattern: string /** * The type of match to use for the pattern. For example, `starts_with` - * means {@link pattern} must be at the start of the string. + * means `pattern` must be at the start of the string. */ operator: APIRepoRuleMetadataOperator } From 00b712c733ef9438c3f9513ba2103dc9bd47e6f9 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:20:21 +0100 Subject: [PATCH 0256/1338] Fix lint --- app/src/ui/changes/commit-message-avatar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/commit-message-avatar.tsx b/app/src/ui/changes/commit-message-avatar.tsx index 02d2e12d55d..65824c195ee 100644 --- a/app/src/ui/changes/commit-message-avatar.tsx +++ b/app/src/ui/changes/commit-message-avatar.tsx @@ -54,7 +54,7 @@ interface ICommitMessageAvatarProps { /** * List of validations that failed for repo rules. Only used if - * {@link warningType} is 'disallowedEmail'. + * `warningType` is 'disallowedEmail'. */ readonly emailRuleFailures?: RepoRulesMetadataFailures From 2cfe4861e18e84bbffd72c542fd58e1cd3f7ca48 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:23:26 +0100 Subject: [PATCH 0257/1338] Add test reported for when running in actions --- package.json | 1 + yarn.lock | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/package.json b/package.json index 6026e893a45..45e4fd1c333 100644 --- a/package.json +++ b/package.json @@ -158,6 +158,7 @@ "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", "markdownlint-cli": "^0.32.2", + "node-test-github-reporter": "^1.2.0", "reserved-words": "^0.1.2", "tsconfig-paths": "^3.9.0", "tsx": "^4.19.3" diff --git a/yarn.lock b/yarn.lock index 1e44e28134f..035d7806c97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,34 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== +"@actions/core@^1.10.0": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.11.1.tgz#ae683aac5112438021588030efb53b1adb86f172" + integrity sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A== + dependencies: + "@actions/exec" "^1.1.1" + "@actions/http-client" "^2.0.1" + +"@actions/exec@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.1.tgz#2e43f28c54022537172819a7cf886c844221a611" + integrity sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w== + dependencies: + "@actions/io" "^1.0.1" + +"@actions/http-client@^2.0.1": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.3.tgz#31fc0b25c0e665754ed39a9f19a8611fc6dab674" + integrity sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA== + dependencies: + tunnel "^0.0.6" + undici "^5.25.4" + +"@actions/io@^1.0.1": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.3.tgz#4cdb6254da7962b07473ff5c335f3da485d94d71" + integrity sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q== + "@ampproject/remapping@^2.2.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" @@ -667,6 +695,11 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.18.0.tgz#3356f85d18ed3627ab107790b53caf7e1e3d1e84" integrity sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA== +"@fastify/busboy@^2.0.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d" + integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA== + "@github/browserslist-config@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@github/browserslist-config/-/browserslist-config-1.0.0.tgz#952fe6da3e6b8ed6a368f3a1a08a9d2ef84e8d04" @@ -2869,6 +2902,13 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" +error-stack-parser@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== + dependencies: + stackframe "^1.3.4" + es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" @@ -3138,6 +3178,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -5319,6 +5364,21 @@ node-releases@^2.0.18: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== +node-test-github-reporter@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/node-test-github-reporter/-/node-test-github-reporter-1.2.0.tgz#316914021ae66fc944c216080971da4d388e5283" + integrity sha512-rnCQctMTPAqJrOhaHaj60IMS5qB5B2rusCGv7RIbY6FsTKjaRmS4OBKCVQb3kYdMNqj0Fw9btDOZkCi3OFHx/g== + dependencies: + "@actions/core" "^1.10.0" + error-stack-parser "^2.1.4" + node-test-parser "^2.2.1" + stack-utils "^2.0.6" + +node-test-parser@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/node-test-parser/-/node-test-parser-2.2.2.tgz#486f0d0c08e31e6b341eadf6a9f574e8c53d8259" + integrity sha512-Cbe0pabtJaZOrjvCguHe9kZLDrHZpRr+4+JO29hNf143qFUhGn6Xn5HxwQmh4vmyyLFlF2YmnJGIwfEX+aQ7mw== + normalize-package-data@^2.0.0, normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" @@ -6380,6 +6440,18 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +stack-utils@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== + dependencies: + escape-string-regexp "^2.0.0" + +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== + "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" @@ -6838,6 +6910,11 @@ tsx@^4.19.3: optionalDependencies: fsevents "~2.3.3" +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -6953,6 +7030,13 @@ undici-types@~6.20.0: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici@^5.25.4: + version "5.29.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3" + integrity sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg== + dependencies: + "@fastify/busboy" "^2.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" From baaa3a99551da39c3011a96fc2dd9388d24255f7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:50:32 +0100 Subject: [PATCH 0258/1338] Run tests on Windows/x64 and macOS/arm64 --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f10d52bb576..80585c2a8f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,15 +114,14 @@ jobs: npm_config_arch: ${{ matrix.arch }} TARGET_ARCH: ${{ matrix.arch }} - name: Prepare testing environment - if: matrix.arch == 'x64' run: yarn test:setup env: npm_config_arch: ${{ matrix.arch }} - name: Run unit tests - if: matrix.arch == 'x64' + if: | + (runner.os == 'Windows' && matrix.arch == 'x64') || (runner.os == 'macOS' && matrix.arch == 'arm64') run: yarn test:unit - name: Run script tests - if: matrix.arch == 'x64' run: yarn test:script - name: Install Azure Code Signing Client if: ${{ runner.os == 'Windows' && inputs.sign }} From e0d8cb6d55d1ed1e349682b78c1f308e326aacc0 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 16:08:27 +0100 Subject: [PATCH 0259/1338] Remove unnecessary stuff --- vendor/desktop-notifications/README.md | 30 - vendor/desktop-notifications/jest.json | 4 - .../sample-app/index.html | 29 - .../desktop-notifications/sample-app/main.ts | 68 - .../sample-app/package.json | 25 - .../sample-app/preload.ts | 1 - .../sample-app/renderer.ts | 75 - .../sample-app/tsconfig.json | 22 - .../sample-app/webpack.main.config.js | 27 - .../sample-app/yarn.lock | 3141 ----------------- 10 files changed, 3422 deletions(-) delete mode 100644 vendor/desktop-notifications/jest.json delete mode 100644 vendor/desktop-notifications/sample-app/index.html delete mode 100644 vendor/desktop-notifications/sample-app/main.ts delete mode 100644 vendor/desktop-notifications/sample-app/package.json delete mode 100644 vendor/desktop-notifications/sample-app/preload.ts delete mode 100644 vendor/desktop-notifications/sample-app/renderer.ts delete mode 100644 vendor/desktop-notifications/sample-app/tsconfig.json delete mode 100644 vendor/desktop-notifications/sample-app/webpack.main.config.js delete mode 100644 vendor/desktop-notifications/sample-app/yarn.lock diff --git a/vendor/desktop-notifications/README.md b/vendor/desktop-notifications/README.md index 9d4e1f7d231..957a13d66ba 100644 --- a/vendor/desktop-notifications/README.md +++ b/vendor/desktop-notifications/README.md @@ -11,14 +11,6 @@ **Note:** This is currently in preview, with support for features that GitHub Desktop uses. -## Install - -```shellsession -$ npm install --save desktop-notifications -# or -$ yarn add desktop-notifications -``` - ## But Why? The current set of options for interacting with notifications, especially on @@ -46,28 +38,6 @@ After exploring all these options, we decided to write our own library to do the stuff we require using no dependencies at all and having all the features we need. -## Building and running the sample app - -In order to get the sample app up and running you need to: - -1. Build `desktop-notifications`. -2. Build the sample app. -3. (macOS only) Sign the Electron binary, so that macOS will allow the sample - app to display notifications. -4. Start the sample app. - -These are the commands to make that happen: - -``` -$ yarn install -$ yarn build -$ cd sample-app -$ yarn install -$ yarn build -$ /usr/bin/codesign --deep --force --sign - --timestamp\=none node_modules/electron/dist/Electron.app/Contents/MacOS/Electron # macOS only -$ yarn start -``` - ## Documentation See the documentation under the diff --git a/vendor/desktop-notifications/jest.json b/vendor/desktop-notifications/jest.json deleted file mode 100644 index 3b48fa9cb5d..00000000000 --- a/vendor/desktop-notifications/jest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "testMatch": ["**/dist/**/*-test.js"], - "testTimeout": 50000 -} diff --git a/vendor/desktop-notifications/sample-app/index.html b/vendor/desktop-notifications/sample-app/index.html deleted file mode 100644 index 7afd792e6d9..00000000000 --- a/vendor/desktop-notifications/sample-app/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Desktop Notifications - - -

Desktop Notifications

-

This is a sample app to test the package desktop-notifications.

- - - - - Notifications Settings - - - - diff --git a/vendor/desktop-notifications/sample-app/main.ts b/vendor/desktop-notifications/sample-app/main.ts deleted file mode 100644 index 87167bd8b6c..00000000000 --- a/vendor/desktop-notifications/sample-app/main.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { app, BrowserWindow, ipcMain } from 'electron' -import path from 'path' -import * as url from 'url' -import { - getNotificationsPermission, - initializeNotifications, - showNotification, - onNotificationEvent, - requestNotificationsPermission, - getNotificationSettingsUrl, - terminateNotifications, -} from 'desktop-notifications' - -const createWindow = () => { - const win = new BrowserWindow({ - width: 800, - height: 600, - webPreferences: { - preload: path.join(__dirname, 'preload.js'), - nodeIntegration: true, - contextIsolation: false, - }, - }) - - win.loadURL( - url.format({ - pathname: path.join(__dirname, '../index.html'), - protocol: 'file:', - slashes: true, - }) - ) - win.webContents.openDevTools() - win.on('closed', () => { - terminateNotifications() - }) - return win -} - -app.setAppUserModelId('com.squirrel.GitHubDesktop.GitHubDesktop') - -app.whenReady().then(() => { - const window = createWindow() - - initializeNotifications({ - toastActivatorClsid: '{27D44D0C-A542-5B90-BCDB-AC3126048BA2}', - }) - - onNotificationEvent((event, id, userInfo) => { - console.log(`[MAIN] Notification event: ${event} ${id}`, userInfo) - window.webContents.send('notification-event', event, id, userInfo) - }) - - ipcMain.handle( - 'show-notification', - (_, title: string, body: string, userInfo: Record) => { - return showNotification(title, body, userInfo) - } - ) - - ipcMain.handle('get-notifications-permission', getNotificationsPermission) - - ipcMain.handle( - 'request-notifications-permission', - requestNotificationsPermission - ) - - ipcMain.handle('get-notification-settings-url', getNotificationSettingsUrl) -}) diff --git a/vendor/desktop-notifications/sample-app/package.json b/vendor/desktop-notifications/sample-app/package.json deleted file mode 100644 index b5f736634ee..00000000000 --- a/vendor/desktop-notifications/sample-app/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "desktop-notifications-sample-app", - "version": "1.0.0", - "description": "Sample app for desktop-notifications package", - "main": "./dist/main.js", - "license": "MIT", - "devDependencies": { - "awesome-node-loader": "^1.1.1", - "electron": "^18.0.1", - "ts-loader": "^9.2.8", - "typescript": "^4.6.3", - "webpack": "^5.71.0", - "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.7.4" - }, - "scripts": { - "build": "tsc", - "start": "cross-env NODE_ENV=development webpack --config webpack.main.config.js --mode development && electron ." - }, - "dependencies": { - "cross-env": "^7.0.3", - "desktop-notifications": "../", - "quick-lru": "^3.0.0" - } -} diff --git a/vendor/desktop-notifications/sample-app/preload.ts b/vendor/desktop-notifications/sample-app/preload.ts deleted file mode 100644 index b95eb0b4a36..00000000000 --- a/vendor/desktop-notifications/sample-app/preload.ts +++ /dev/null @@ -1 +0,0 @@ -global.exports = {} diff --git a/vendor/desktop-notifications/sample-app/renderer.ts b/vendor/desktop-notifications/sample-app/renderer.ts deleted file mode 100644 index d0b46723f04..00000000000 --- a/vendor/desktop-notifications/sample-app/renderer.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { ipcRenderer } from 'electron' -import QuickLRU from 'quick-lru' - -const notificationCallbacks = new QuickLRU void>({ - maxSize: 200, -}) - -ipcRenderer.on('notification-event', (event, id, userInfo) => { - console.log(`[RENDERER] Notification event: ${event} ${id}`, userInfo) - - const callback = notificationCallbacks.get(id) - callback?.() - notificationCallbacks.delete(id) -}) - -setupClickEventListener('showNotificationButton', showNotification) -setupClickEventListener('checkPermissionsButton', checkNotificationsPermission) -setupClickEventListener( - 'requestPermissionsButton', - requestNotificationsPermission -) -updateNotificationsSettingsLink() - -function setupClickEventListener(id: string, onclick: () => void) { - const element = document.getElementById(id) - if (element === null) { - throw new Error(`Could not find notification with id ${id}`) - } - element.addEventListener('click', onclick) -} - -async function updateNotificationsSettingsLink() { - const notificationsSettingsLink = document.getElementById( - 'notificationsSettingsLink' - ) as HTMLLinkElement - notificationsSettingsLink.href = await ipcRenderer.invoke( - 'get-notification-settings-url' - ) -} - -async function showNotification() { - const notificationID = await ipcRenderer.invoke( - 'show-notification', - 'Test notification', - 'This notification is a test. Hello! 👋', - { - myDict: { foo: 'bar' }, - myString: 'Hello world!', - myBool: true, - myArray: ['one', 2, 'three'], - type: 'pr-review-submit-fake', - myNumber: 42, - } - ) - - console.log('Shown notification with ID:', notificationID) - - notificationCallbacks.set(notificationID, () => { - console.log(`[RENDERER] Notification clicked: ${notificationID}`) - }) -} - -async function checkNotificationsPermission() { - console.log( - 'checkPermissions', - await ipcRenderer.invoke('get-notifications-permission') - ) -} - -async function requestNotificationsPermission() { - console.log( - 'requestPermissions', - await ipcRenderer.invoke('request-notifications-permission') - ) -} diff --git a/vendor/desktop-notifications/sample-app/tsconfig.json b/vendor/desktop-notifications/sample-app/tsconfig.json deleted file mode 100644 index 53c469aba7c..00000000000 --- a/vendor/desktop-notifications/sample-app/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "moduleResolution": "node", - "target": "es2020", - "esModuleInterop": true, - "resolveJsonModule": true, - "allowUnreachableCode": false, - "allowUnusedLabels": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "noUnusedLocals": true, - "sourceMap": true, - "jsx": "react", - "strict": true, - "outDir": "./dist", - "useUnknownInCatchVariables": false - }, - "include": ["**/*.ts", "**/*.tsx", "**/*.d.tsx"], - "exclude": ["node_modules", "dist", "out"], - "compileOnSave": false -} diff --git a/vendor/desktop-notifications/sample-app/webpack.main.config.js b/vendor/desktop-notifications/sample-app/webpack.main.config.js deleted file mode 100644 index 65ad95b6059..00000000000 --- a/vendor/desktop-notifications/sample-app/webpack.main.config.js +++ /dev/null @@ -1,27 +0,0 @@ -const path = require('path') - -module.exports = { - resolve: { - extensions: ['.tsx', '.ts', '.js'], - }, - devtool: 'source-map', - entry: './main.ts', - target: 'electron-main', - module: { - rules: [ - { - test: /\.(js|ts|tsx)$/, - exclude: /node_modules/, - loader: 'ts-loader', - }, - { - test: /\.node$/, - loader: 'awesome-node-loader', - }, - ], - }, - output: { - path: path.resolve(__dirname, './dist'), - filename: '[name].js', - }, -} diff --git a/vendor/desktop-notifications/sample-app/yarn.lock b/vendor/desktop-notifications/sample-app/yarn.lock deleted file mode 100644 index 35c0ea30e43..00000000000 --- a/vendor/desktop-notifications/sample-app/yarn.lock +++ /dev/null @@ -1,3141 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@electron/get@^1.13.0": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^9.6.0" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" - -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@^3.0.3": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== - -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== - dependencies: - defer-to-connect "^1.0.1" - -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/eslint-scope@^3.7.3": - version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" - integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" - integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@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== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/http-proxy@^1.17.8": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== - dependencies: - "@types/node" "*" - -"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@types/node@*": - version "17.0.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" - integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== - -"@types/node@^16.11.26": - version "16.11.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" - integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/retry@^0.12.0": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" - integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" - -"@types/ws@^8.2.2": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== - dependencies: - "@types/node" "*" - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== - -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - -acorn@^8.4.1, acorn@^8.5.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -async@^2.6.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -awesome-node-loader@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/awesome-node-loader/-/awesome-node-loader-1.1.1.tgz#a402b7f09f72cd1c7b1a65e75180236f2f5438d9" - integrity sha1-pAK38J9yzRx7GmXnUYAjby9UONk= - dependencies: - loader-utils "^1.1.0" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" - type-is "~1.6.18" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^3.0.2, 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== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.14.5: - version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" - integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== - dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" - -call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -caniuse-lite@^1.0.30001317: - version "1.0.30001325" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz#2b4ad19b77aa36f61f2eaf72e636d7481d55e606" - integrity sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ== - -chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= - dependencies: - mimic-response "^1.0.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colorette@^2.0.10, colorette@^2.0.14: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concat-stream@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cross-env@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" - integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== - dependencies: - cross-spawn "^7.0.1" - -cross-spawn@^7.0.1, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -debug@2.6.9, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4.1.0, debug@^4.1.1: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= - dependencies: - mimic-response "^1.0.0" - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -desktop-notifications@../: - version "0.2.4" - dependencies: - node-addon-api "^5.0.0" - prebuild-install "^7.0.1" - uuid "^8.3.2" - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-libc@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" - integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= - dependencies: - buffer-indexof "^1.0.0" - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.4.84: - version "1.4.103" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a" - integrity sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg== - -electron@^18.0.1: - version "18.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-18.0.1.tgz#70653ecee008bea8a4240da78d0f5a426bb24d50" - integrity sha512-8y3nxmK+v/tiuaR8yd4K83ApHxgomMIPAEl3J+2Jfv/D5G6M3KnvxNlNiNoTXI8uOegfmoqiDm5/2xlWFLzfLQ== - dependencies: - "@electron/get" "^1.13.0" - "@types/node" "^16.11.26" - extract-zip "^1.0.3" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -encodeurl@^1.0.2, encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enhanced-resolve@^5.0.0, enhanced-resolve@^5.9.2: - version "5.9.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" - integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.19.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.4.2" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.9.7" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" - setprototypeof "1.2.0" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extract-zip@^1.0.3: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -follow-redirects@^1.0.0: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-monkey@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== - -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - dependencies: - boolean "^3.0.1" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - -globalthis@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== - dependencies: - define-properties "^1.1.3" - -globby@^11.0.1: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" - -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== - -http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= - -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.6" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd" - integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA== - -http-proxy-middleware@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a" - integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -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== - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@^1.3.4, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - -ip@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== - -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== - dependencies: - has "^1.0.3" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-regex@^1.0.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= - -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== - dependencies: - json-buffer "3.0.0" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== - -loader-utils@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -lodash@^4.17.10, lodash@^4.17.14: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -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" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@^3.0.4: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== - -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -mkdirp@^0.5.4, mkdirp@^0.5.5: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -node-abi@^3.3.0: - version "3.22.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362" - integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w== - dependencies: - semver "^7.3.5" - -node-addon-api@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" - integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== - -node-forge@^1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - -node-releases@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" - integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open@^8.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-retry@^4.5.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" - integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== - dependencies: - "@types/retry" "^0.12.0" - retry "^0.13.1" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - -prebuild-install@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.0.tgz#991b6ac16c81591ba40a6d5de93fb33673ac1370" - integrity sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-lru@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-3.0.0.tgz#2f96145481567e5bc442c6c4a66e86158405c696" - integrity sha512-WLzHLB/msD8Q/5jNh4LviurG896aIEJRS1M3gHz91nSmaXn8q+/q4yOQvNMIETl9f5pAu3igqexB62ARWOUoOg== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== - dependencies: - bytes "3.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - unpipe "1.0.0" - -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -regexp.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.9.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== - dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= - dependencies: - lowercase-keys "^1.0.0" - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - -selfsigned@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" - integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== - dependencies: - node-forge "^1" - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.4: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.5: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "1.8.1" - mime "1.6.0" - ms "2.1.3" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.2" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -signal-exit@^3.0.0, signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -sockjs@^0.3.21: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0, source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2 || 3 || 4": - 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_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.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== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -terser-webpack-plugin@^5.1.3: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== - dependencies: - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" - -terser@^5.7.2: - version "5.14.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" - integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - -ts-loader@^9.2.8: - version "9.2.8" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.8.tgz#e89aa32fa829c5cad0a1d023d6b3adecd51d5a48" - integrity sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw== - dependencies: - chalk "^4.1.0" - enhanced-resolve "^5.0.0" - micromatch "^4.0.0" - semver "^7.3.4" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - -typescript@^4.6.3: - version "4.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" - integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - dependencies: - prepend-http "^2.0.0" - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - -webpack-cli@^4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" - colorette "^2.0.14" - commander "^7.0.0" - execa "^5.0.0" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - webpack-merge "^5.7.3" - -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" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -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.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - portfinder "^1.0.28" - schema-utils "^4.0.0" - selfsigned "^2.0.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - spdy "^4.0.2" - strip-ansi "^7.0.0" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - 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.71.0: - version "5.71.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.71.0.tgz#b01fcf379570b8c5ee06ca06c829ca168c951884" - integrity sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.2" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" From 7e8d78773da4d3fc5f29d1bd51185944e9341735 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 13:01:53 +0100 Subject: [PATCH 0260/1338] Add desktop-trampoline to the repo --- .gitignore | 1 + vendor/desktop-trampoline/LICENSE | 19 + vendor/desktop-trampoline/README.md | 139 + vendor/desktop-trampoline/binding.gyp | 84 + vendor/desktop-trampoline/docs/releases.md | 25 + vendor/desktop-trampoline/include/socket.h | 40 + vendor/desktop-trampoline/index.d.ts | 8 + vendor/desktop-trampoline/index.js | 48 + vendor/desktop-trampoline/package.json | 52 + .../src/desktop-trampoline.c | 160 + vendor/desktop-trampoline/src/socket.c | 91 + vendor/desktop-trampoline/src/ssh-wrapper.c | 37 + .../test/desktop-trampoline.test.js | 153 + .../test/ssh-wrapper.test.js | 42 + vendor/desktop-trampoline/yarn.lock | 4614 +++++++++++++++++ 15 files changed, 5513 insertions(+) create mode 100644 vendor/desktop-trampoline/LICENSE create mode 100644 vendor/desktop-trampoline/README.md create mode 100644 vendor/desktop-trampoline/binding.gyp create mode 100644 vendor/desktop-trampoline/docs/releases.md create mode 100644 vendor/desktop-trampoline/include/socket.h create mode 100644 vendor/desktop-trampoline/index.d.ts create mode 100644 vendor/desktop-trampoline/index.js create mode 100644 vendor/desktop-trampoline/package.json create mode 100644 vendor/desktop-trampoline/src/desktop-trampoline.c create mode 100644 vendor/desktop-trampoline/src/socket.c create mode 100644 vendor/desktop-trampoline/src/ssh-wrapper.c create mode 100644 vendor/desktop-trampoline/test/desktop-trampoline.test.js create mode 100644 vendor/desktop-trampoline/test/ssh-wrapper.test.js create mode 100644 vendor/desktop-trampoline/yarn.lock diff --git a/.gitignore b/.gitignore index 110817983d9..3608eb085d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ yarn-error.log app/node_modules/ vendor/windows-argv-parser/build/ vendor/desktop-notifications/build/ +vendor/desktop-trampoline/build/ .DS_Store .awcache .idea/ diff --git a/vendor/desktop-trampoline/LICENSE b/vendor/desktop-trampoline/LICENSE new file mode 100644 index 00000000000..68afe6febb3 --- /dev/null +++ b/vendor/desktop-trampoline/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) GitHub, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/desktop-trampoline/README.md b/vendor/desktop-trampoline/README.md new file mode 100644 index 00000000000..e084154af7d --- /dev/null +++ b/vendor/desktop-trampoline/README.md @@ -0,0 +1,139 @@ +# Desktop Trampoline + +A cross-platform no-dependency C executable trampoline which lets GitHub Desktop +intercede in order to provide Git with any additional info it needs (like +credentials through `GIT_ASKPASS` or `SSH_ASKPASS`). + +The intention is to support the same platforms that +[Electron supports](https://www.electronjs.org/docs/tutorial/support#supported-platforms). + +## Building + +This project is written as a Node project with the C-portions being compiled by +node-gyp. Installing dependencies and building requires Node.js, and yarn. With +those prerequisites the initial setup should be as easy as running `yarn` and +subsequent builds can be done using `yarn build`. There are some tests available +by running `yarn test`. + +## Purpose + +When doing any Git operation that requires authentication in Desktop, the +application needs a way to provide those credentials to Git. There are several +options available: + +- rely on the user's `credential.helper` config setting +- implement our own + [credential storage](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage) + that supports the full credential surface +- implement a program that handles the Git AskPass protocol + +The first option is unsatisfactory because it can be challenging to setup +correctly, or may be changed under us. + +The second option is excessive - the account details are already managed in +GitHub Desktop, and we only need to provide the credentials to Git when +required. + +The third option is what we have currently settled on. An added benefit of this +is it can be configured to ignore any fallback options when authenticating - +reducing the potential for problems integrating with an existing Git setup. + +## What's a Trampoline? + +There are many different descriptions for "trampoline" in computing but in this +situation the trampoline is a component to pass inputs and outputs between +programs that are otherwise challenging to integrate. + +On one side, we have Git, which has a number of ways it can authenticate the +user against a HTTPS remote. + +On the other side, we have GitHub Desktop - an Electron app that is primarily +running as a GUI. Electron also supports +[environment variables](https://electronjs.org/docs/api/environment-variables) +that allow us to run it like a command-line program. + +To set an AskPass program for Git, we set the `GIT_ASKPASS` environment variable +to our executable on disk. This is done by Desktop whenever it needs to spawn a +Git operation that might require authentication. + +The equivalent Bash shell code looks like this: + +```sh + # environment variable + GIT_ASKPASS="C:/some/path/to/desktop-askpass-trampoline.exe" \ + # ensure Git doesn't block the process waiting for the user to provide input + GIT_TERMINAL_PROMPT=0 \ + git \ + # unset the credential.helper defined in config + -c credential.helper= \ + clone https://github.com/shiftkey/my-private-repo.git +``` + +Desktop also sets these environment variables when spawning Git, as it's the +only way to pass information down to the authentication process: + +- `DESKTOP_USERNAME` - the account associated with the current repository +- `DESKTOP_ENDPOINT` - the endpoint associated with the account + +With this trampoline, all this info can be passed from GitHub Desktop to Git, +and then back to GitHub Desktop via a TCP socket when Git requires us the user +credentials, so Desktop can act based on that username and endpoint. + +## Why Need An Executable? + +This was originally written as a batch file, which looked like this: + +```sh +@echo off +setlocal + +set ELECTRON_RUN_AS_NODE=1 +set ELECTRON_NO_ATTACH_CONSOLE=1 + +"%DESKTOP_PATH%" "%DESKTOP_ASKPASS_SCRIPT%" %* + +endlocal +``` + +While this is much more succinct than this C version, it has some technical +limitations that we cannot work around: + +- batch files on Windows are launched using `cmd /c {path}` and there are a + number of known limitations with Unicode characters in file paths +- the Golang runtime - which Git LFS is built upon - also has problems launching + batch files with spaces - + [golang/go#17149](https://github.com/golang/go/issues/17149) + +Because some of our Desktop users don't have control over the account name on +their machine - think students on a machine managed by their university IT +staff, for example. We need to support these users in Desktop. + +There are also some things missing from this script that are not easy to +implement in batch files, such as adding logging to help diagnose environmental +issues. + +Thankfully if you set an executable for your `GIT_ASKPASS` environment variable, +it avoids all these problems as Windows can just execute the program. + +## Why Need A TCP Server? + +The main reason for using a TCP server is that it provides a generic and very +powerful mechanism for GitHub Desktop to interoperate with Git and handle any +other protocol Git would require in order to supply any kind of info. + +Thanks to this, with only one generic trampoline that forwards everything via +that TCP socket, the implementation for every possible protocol like +`GIT_ASKPASS` can live within the GitHub Desktop codebase instead of having +multiple trampoline executables. + +## SSH Wrapper + +Along with the trampoline, an SSH wrapper is provided for macOS. The reason for +this is macOS before Monterey include an "old" version of OpenSSH that will +ignore the `SSH_ASKPASS` variable unless it's unable to write to a tty. + +This SSH wrapper achieves exactly that: just runs whatever `ssh` exists in the +path in a way that will use `SSH_ASKPASS` when necessary. + +More recent versions of OpenSSH (starting with 8.3) don't require this wrapper, +since they added support for a new `SSH_ASKPASS_REQUIRE` environment variable. diff --git a/vendor/desktop-trampoline/binding.gyp b/vendor/desktop-trampoline/binding.gyp new file mode 100644 index 00000000000..94e7cb4fa1e --- /dev/null +++ b/vendor/desktop-trampoline/binding.gyp @@ -0,0 +1,84 @@ + { + 'target_defaults': { + 'defines': [ + "NAPI_VERSION=<(napi_build_version)", + ], + 'include_dirs': [ + ' +#else +#include +#include +#include +#include +#endif + +// There are some types missing to make everything Just Work™ in all platforms +#ifdef WINDOWS +#define ssize_t long +#else +#define SOCKET int +#define INVALID_SOCKET -1 +#endif + +/** Initializes anything required before working with sockets. */ +int initializeNetwork(void); + +/** Frees resources initialized by `initializeNetwork`. */ +void terminateNetwork(void); + +/** Creates a TCP socket and returns its handler. */ +SOCKET openSocket(void); + +/** Closes an open socket. */ +void closeSocket(SOCKET socket); + +/** Connects to a given port using a socket. */ +int connectSocket(SOCKET socket, unsigned short port); + +/** Writes data into a socket. */ +int writeSocket(SOCKET socket, const void *buffer, size_t length); + +/** Reads data from a socket. */ +int readSocket(SOCKET socket, void *buffer, size_t length); + +/** Prints socket-related errors to stderr. */ +void printSocketError(char *fmt, ...); diff --git a/vendor/desktop-trampoline/index.d.ts b/vendor/desktop-trampoline/index.d.ts new file mode 100644 index 00000000000..6ce67684fdc --- /dev/null +++ b/vendor/desktop-trampoline/index.d.ts @@ -0,0 +1,8 @@ +export function getDesktopAskpassTrampolinePath(): string +export function getDesktopAskpassTrampolineFilename(): string + +export function getDesktopCredentialHelperTrampolinePath(): string +export function getDesktopCredentialHelperTrampolineFilename(): string + +export function getSSHWrapperPath(): string +export function getSSHWrapperFilename(): string diff --git a/vendor/desktop-trampoline/index.js b/vendor/desktop-trampoline/index.js new file mode 100644 index 00000000000..be164b08177 --- /dev/null +++ b/vendor/desktop-trampoline/index.js @@ -0,0 +1,48 @@ +const Path = require('path') + +function getDesktopAskpassTrampolinePath() { + return Path.join( + __dirname, + 'build', + 'Release', + getDesktopAskpassTrampolineFilename() + ) +} + +function getDesktopAskpassTrampolineFilename() { + return process.platform === 'win32' + ? 'desktop-askpass-trampoline.exe' + : 'desktop-askpass-trampoline' +} + +function getDesktopCredentialHelperTrampolinePath() { + return Path.join( + __dirname, + 'build', + 'Release', + getDesktopCredentialHelperTrampolineFilename() + ) +} + +function getDesktopCredentialHelperTrampolineFilename() { + return process.platform === 'win32' + ? 'desktop-credential-helper-trampoline.exe' + : 'desktop-credential-helper-trampoline' +} + +function getSSHWrapperPath() { + return Path.join(__dirname, 'build', 'Release', getSSHWrapperFilename()) +} + +function getSSHWrapperFilename() { + return process.platform === 'win32' ? 'ssh-wrapper.exe' : 'ssh-wrapper' +} + +module.exports = { + getDesktopAskpassTrampolinePath, + getDesktopAskpassTrampolineFilename, + getDesktopCredentialHelperTrampolinePath, + getDesktopCredentialHelperTrampolineFilename, + getSSHWrapperPath, + getSSHWrapperFilename, +} diff --git a/vendor/desktop-trampoline/package.json b/vendor/desktop-trampoline/package.json new file mode 100644 index 00000000000..07169e2e9f2 --- /dev/null +++ b/vendor/desktop-trampoline/package.json @@ -0,0 +1,52 @@ +{ + "name": "desktop-trampoline", + "version": "0.9.11", + "main": "index.js", + "keywords": [], + "author": "", + "license": "MIT", + "bin": { + "desktop-trampoline": "build/Release/desktop-trampoline" + }, + "types": "./index.d.ts", + "scripts": { + "build": "node-gyp rebuild", + "install": "prebuild-install || node-gyp rebuild", + "test": "jest", + "lint": "prettier -c **/*.js **/*.md", + "lint:fix": "prettier --write **/*.js **/*.md", + "prebuild-napi-x64": "prebuild -t 3 -r napi -a x64 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", + "prebuild-napi-ia32": "prebuild -t 3 -r napi -a ia32 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", + "prebuild-napi-arm64": "prebuild -t 3 -r napi -a arm64 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", + "prebuild-all": "yarn prebuild-napi-x64 && yarn prebuild-napi-ia32 && yarn prebuild-napi-arm64", + "upload": "node ./script/upload.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/desktop/desktop-trampoline.git" + }, + "bugs": { + "url": "https://github.com/desktop/desktop-trampoline/issues" + }, + "homepage": "https://github.com/desktop/desktop-trampoline#readme", + "dependencies": { + "node-addon-api": "^4.3.0", + "prebuild-install": "^7.1.2" + }, + "devDependencies": { + "jest": "^27.5.0", + "node-gyp": "^10.1.0", + "prebuild": "^13.0.1", + "prettier": "^2.5.1", + "split2": "^4.1.0" + }, + "binary": { + "napi_versions": [ + 3 + ] + }, + "config": { + "runtime": "napi", + "target": 3 + } +} diff --git a/vendor/desktop-trampoline/src/desktop-trampoline.c b/vendor/desktop-trampoline/src/desktop-trampoline.c new file mode 100644 index 00000000000..0c59c00ac77 --- /dev/null +++ b/vendor/desktop-trampoline/src/desktop-trampoline.c @@ -0,0 +1,160 @@ +#include +#include +#include +#include +#include + +#include "socket.h" + +#define BUFFER_LENGTH 4096 +#define MAXIMUM_NUMBER_LENGTH 33 + +#ifdef CREDENTIAL_HELPER + #define DESKTOP_TRAMPOLINE_IDENTIFIER "CREDENTIALHELPER" +#else + #define DESKTOP_TRAMPOLINE_IDENTIFIER "ASKPASS" +#endif + + +#define WRITE_STRING_OR_EXIT(dataName, dataString) \ +if (writeSocket(socket, dataString, strlen(dataString) + 1) != 0) { \ + printSocketError("ERROR: Couldn't send " dataName); \ + return 1; \ +} + +// This is a list of valid environment variables that GitHub Desktop might +// send or expect to receive. +#define NUMBER_OF_VALID_ENV_VARS 1 +static const char *sValidEnvVars[NUMBER_OF_VALID_ENV_VARS] = { + "DESKTOP_TRAMPOLINE_TOKEN", +}; + +/** Returns 1 if a given env variable is valid, 0 otherwise. */ +int isValidEnvVar(char *env) { + for (int idx = 0; idx < NUMBER_OF_VALID_ENV_VARS; idx++) { + const char *candidate = sValidEnvVars[idx]; + + // Make sure that not only the passed env var string starts with the + // candidate contesnts, but also that there is a '=' character right after: + // Valid: "DESKTOP_USERNAME=sergiou87" + // Not valid: "DESKTOP_USERNAME_SOMETHING=sergiou87" + if (strncmp(env, candidate, strlen(candidate)) == 0 + && strlen(env) > strlen(candidate) + && env[strlen(candidate)] == '=') { + return 1; + } + } + + return 0; +} + +int runTrampolineClient(SOCKET *outSocket, int argc, char **argv, char **envp) { + char *desktopPortString; + + desktopPortString = getenv("DESKTOP_PORT"); + + if (desktopPortString == NULL) { + fprintf(stderr, "ERROR: Missing DESKTOP_PORT environment variable\n"); + return 1; + } + + unsigned short desktopPort = atoi(desktopPortString); + + SOCKET socket = openSocket(); + + if (socket == INVALID_SOCKET) { + printSocketError("ERROR: Couldn't create TCP socket"); + return 1; + } + + *outSocket = socket; + + if (connectSocket(socket, desktopPort) != 0) { + printSocketError("ERROR: Couldn't connect to 127.0.0.1:%d - Please make " + "sure you don't have an antivirus or firewall blocking " + "this connection.", desktopPort); + return 1; + } + + // Send the number of arguments (except the program name) + char argcString[MAXIMUM_NUMBER_LENGTH]; + snprintf(argcString, MAXIMUM_NUMBER_LENGTH, "%d", argc - 1); + WRITE_STRING_OR_EXIT("number of arguments", argcString); + + // Send each argument separated by \0 + for (int idx = 1; idx < argc; idx++) { + WRITE_STRING_OR_EXIT("argument", argv[idx]); + } + + // Get the number of environment variables + char *validEnvVars[NUMBER_OF_VALID_ENV_VARS + 1]; + validEnvVars[0] = "DESKTOP_TRAMPOLINE_IDENTIFIER=" DESKTOP_TRAMPOLINE_IDENTIFIER; + int envc = 1; + for (char **env = envp; *env != 0; env++) { + if (isValidEnvVar(*env)) { + validEnvVars[envc] = *env; + envc++; + } + } + + // Send the number of environment variables + char envcString[MAXIMUM_NUMBER_LENGTH]; + snprintf(envcString, MAXIMUM_NUMBER_LENGTH, "%d", envc); + WRITE_STRING_OR_EXIT("number of environment variables", envcString); + + // Send the environment variables + for (int idx = 0; idx < envc; idx++) { + WRITE_STRING_OR_EXIT("environment variable", validEnvVars[idx]); + } + + char stdinBuffer[BUFFER_LENGTH + 1]; + int stdinBytes = 0; + + #ifdef CREDENTIAL_HELPER + stdinBytes = fread(stdinBuffer, sizeof(char), BUFFER_LENGTH, stdin); + #endif + + stdinBuffer[stdinBytes] = '\0'; + WRITE_STRING_OR_EXIT("stdin", stdinBuffer); + + char buffer[BUFFER_LENGTH + 1]; + size_t totalBytesRead = 0; + ssize_t bytesRead = 0; + + // Read output from server + do { + bytesRead = readSocket(socket, buffer + totalBytesRead, BUFFER_LENGTH - totalBytesRead); + + if (bytesRead == -1) { + printSocketError("ERROR: Error reading from socket"); + return 1; + } + + totalBytesRead += bytesRead; + } while (bytesRead > 0); + + buffer[totalBytesRead] = '\0'; + + // Write that output to stdout + fprintf(stdout, "%s", buffer); + + return 0; +} + +int main(int argc, char **argv, char **envp) { + if (initializeNetwork() != 0) { + return 1; + } + + SOCKET socket = INVALID_SOCKET; + int result = runTrampolineClient(&socket, argc, argv, envp); + + if (socket != INVALID_SOCKET) + { + closeSocket(socket); + } + + terminateNetwork(); + + return result; +} diff --git a/vendor/desktop-trampoline/src/socket.c b/vendor/desktop-trampoline/src/socket.c new file mode 100644 index 00000000000..ac088ddb01e --- /dev/null +++ b/vendor/desktop-trampoline/src/socket.c @@ -0,0 +1,91 @@ +#include "socket.h" + +#include +#include +#include +#include +#include + +#ifdef WINDOWS + +#define MAX_WSA_ERROR_DESCRIPTION_LENGTH 4096 + +void getWSALastErrorDescription(wchar_t *buffer, int bufferLength) { + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, WSAGetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)buffer, bufferLength - 1, NULL); +} + +#endif + +int initializeNetwork(void) { +#ifdef WINDOWS + // Initialize Winsock + WSADATA wsaData; + int result = WSAStartup(MAKEWORD(2,2), &wsaData); + if (result != NO_ERROR) { + wchar_t errorDescription[MAX_WSA_ERROR_DESCRIPTION_LENGTH]; + getWSALastErrorDescription(errorDescription, MAX_WSA_ERROR_DESCRIPTION_LENGTH); + + fprintf(stderr, "ERROR: WSAStartup failed (%d). Error %ld: %ls\n", + result, WSAGetLastError(), errorDescription); + return 1; + } +#endif + + return 0; +} + +void terminateNetwork(void) { +#ifdef WINDOWS + WSACleanup(); +#endif +} + +SOCKET openSocket(void) { + return socket(AF_INET, SOCK_STREAM, 0); +} + +void closeSocket(SOCKET socket) { +#ifdef WINDOWS + closesocket(socket); +#else + close(socket); +#endif +} + +int connectSocket(SOCKET socket, unsigned short port) { + struct sockaddr_in remote = {0}; + remote.sin_addr.s_addr = inet_addr("127.0.0.1"); + remote.sin_family = AF_INET; + remote.sin_port = htons(port); + + return connect(socket, (struct sockaddr *)&remote, sizeof(struct sockaddr_in)); +} + +int writeSocket(SOCKET socket, const void *buffer, size_t length) { + return (send(socket, buffer, length, 0) < (ssize_t)length ? -1 : 0); +} + +int readSocket(SOCKET socket, void *buffer, size_t length) { + return recv(socket, buffer, length, 0); +} + +void printSocketError(char *fmt, ...) { + char formatted_string[4096]; + + va_list argptr; + va_start(argptr, fmt); + vsprintf(formatted_string, fmt, argptr); + va_end(argptr); + +#ifdef WINDOWS + wchar_t errorDescription[MAX_WSA_ERROR_DESCRIPTION_LENGTH]; + getWSALastErrorDescription(errorDescription, MAX_WSA_ERROR_DESCRIPTION_LENGTH); + + fprintf(stderr, "%s (%ld): %ls\n", formatted_string, WSAGetLastError(), errorDescription); +#else + fprintf(stderr, "%s (%d): %s\n", formatted_string, errno, strerror(errno)); +#endif +} diff --git a/vendor/desktop-trampoline/src/ssh-wrapper.c b/vendor/desktop-trampoline/src/ssh-wrapper.c new file mode 100644 index 00000000000..e5f7aebcf6b --- /dev/null +++ b/vendor/desktop-trampoline/src/ssh-wrapper.c @@ -0,0 +1,37 @@ +#ifdef WINDOWS + +int main(int argc, char **argv) { + // Not needed on Windows, this will just create a dummy executable + return -1; +} + +#else + +#include +#include + +/** + * This is a wrapper for the ssh command. It is used to make sure ssh runs without + * a tty on macOS, allowing GitHub Desktop to intercept different prompts from + * ssh (e.g. passphrase, adding a host to the list of known hosts...). + * This is not necessary on more recent versions of OpenSSH (starting with v8.3) + * which include support for the SSH_ASKPASS_REQUIRE environment variable. + */ +int main(int argc, char **argv) { + pid_t child = fork(); + + if (child < 0) { + fprintf(stderr, "Failed to fork\n"); + return -1; + } + + if (child != 0) { + // This is the parent process. Just exit. + return 0; + } + + setsid(); + return execvp("ssh", argv); +} + +#endif diff --git a/vendor/desktop-trampoline/test/desktop-trampoline.test.js b/vendor/desktop-trampoline/test/desktop-trampoline.test.js new file mode 100644 index 00000000000..db362cd04e7 --- /dev/null +++ b/vendor/desktop-trampoline/test/desktop-trampoline.test.js @@ -0,0 +1,153 @@ +const { stat, access } = require('fs').promises +const { constants } = require('fs') +const { execFile } = require('child_process') +const { promisify } = require('util') +const { + getDesktopAskpassTrampolinePath, + getDesktopCredentialHelperTrampolinePath, +} = require('../index') +const split2 = require('split2') +const { createServer } = require('net') + +const askPassTrampolinePath = getDesktopAskpassTrampolinePath() +const helperTrampolinePath = getDesktopCredentialHelperTrampolinePath() +const run = promisify(execFile) + +describe('desktop-trampoline', () => { + it('exists and is a regular file', async () => + expect((await stat(askPassTrampolinePath)).isFile()).toBe(true)) + + it('can be executed by current process', () => + access(askPassTrampolinePath, constants.X_OK)) + + it('fails when required environment variables are missing', () => + expect(run(askPassTrampolinePath, ['Username'])).rejects.toThrow()) + + const captureSession = () => { + const output = [] + let resolveOutput = null + + const outputPromise = new Promise(resolve => { + resolveOutput = resolve + }) + + const server = createServer(socket => { + let timeoutId = null + socket.pipe(split2(/\0/)).on('data', data => { + output.push(data.toString('utf8')) + + // Hack: consider the session finished after 100ms of inactivity. + // In a real-world scenario, you'd have to parse the data to know when + // the session is finished. + if (timeoutId !== null) { + clearTimeout(timeoutId) + timeoutId = null + } + timeoutId = setTimeout(() => { + resolveOutput(output) + socket.end() + server.close() + }, 100) + }) + }) + + const serverPortPromise = new Promise((resolve, reject) => { + server.on('error', e => reject(e)) + server.listen(0, '127.0.0.1', () => { + resolve(server.address().port) + }) + }) + + return [serverPortPromise, outputPromise] + } + + it('forwards arguments and valid environment variables correctly', async () => { + const [portPromise, outputPromise] = captureSession() + const port = await portPromise + + const env = { + DESKTOP_TRAMPOLINE_TOKEN: '123456', + DESKTOP_PORT: port, + INVALID_VARIABLE: 'foo bar', + } + const opts = { env } + + await run(askPassTrampolinePath, ['baz'], opts) + + const output = await outputPromise + const outputArguments = output.slice(1, 2) + expect(outputArguments).toStrictEqual(['baz']) + // output[2] is the number of env variables + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + expect(outputEnv).toHaveLength(2) + expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_TOKEN=123456') + expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS') + }) + + it('forwards stdin when running in credential-helper mode', async () => { + const [portPromise, outputPromise] = captureSession() + const port = await portPromise + + const cp = run(helperTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port }, + }) + cp.child.stdin.end('oh hai\n') + + await cp + + const output = await outputPromise + expect(output.at(-1)).toBe('oh hai\n') + }) + + it("doesn't forward stdin when running in askpass mode", async () => { + const [portPromise, outputPromise] = captureSession() + const port = await portPromise + + const cp = run(askPassTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port }, + }) + cp.child.stdin.end('oh hai\n') + + await cp + + const output = await outputPromise + expect(output.at(-1)).toBe('') + }) + + it('askpass handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { + const [portPromise, outputPromise] = captureSession() + const port = await portPromise + + const cp = run(askPassTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port, DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, + }) + cp.child.stdin.end('oh hai\n') + + await cp + + const output = await outputPromise + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS') + }) + + it('credential handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { + const [portPromise, outputPromise] = captureSession() + const port = await portPromise + + const cp = run(helperTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port, DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, + }) + cp.child.stdin.end('oh hai\n') + + await cp + + const output = await outputPromise + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + expect(outputEnv).toContain( + 'DESKTOP_TRAMPOLINE_IDENTIFIER=CREDENTIALHELPER' + ) + }) +}) diff --git a/vendor/desktop-trampoline/test/ssh-wrapper.test.js b/vendor/desktop-trampoline/test/ssh-wrapper.test.js new file mode 100644 index 00000000000..6187527e307 --- /dev/null +++ b/vendor/desktop-trampoline/test/ssh-wrapper.test.js @@ -0,0 +1,42 @@ +const { stat, access } = require('fs').promises +const { constants } = require('fs') +const { execFile } = require('child_process') +const { promisify } = require('util') +const { getSSHWrapperPath } = require('../index') + +const sshWrapperPath = getSSHWrapperPath() +const run = promisify(execFile) + +describe('ssh-wrapper', () => { + it('exists and is a regular file', async () => + expect((await stat(sshWrapperPath)).isFile()).toBe(true)) + + // On Windows, the binary generated is just useless, so no point to test it. + // Also, this won't be used on Linux (for now at least), so don't bother to + // run the tests there. + if (process.platform !== 'darwin') { + return + } + + it('can be executed by current process', () => + access(sshWrapperPath, constants.X_OK)) + + it('attempts to use ssh-askpass program', async () => { + // Try to connect to github.com with a non-existent known_hosts file to force + // ssh to prompt the user and use askpass. + const result = await run( + sshWrapperPath, + ['-o', 'UserKnownHostsFile=/path/to/fake/known_hosts', 'git@github.com'], + { + env: { + SSH_ASKPASS: '/path/to/fake/ssh-askpass', + DISPLAY: '.', + }, + } + ) + + expect(result.stderr).toMatch( + /ssh_askpass: exec\(\/path\/to\/fake\/ssh-askpass\): No such file or directory/ + ) + }) +}) diff --git a/vendor/desktop-trampoline/yarn.lock b/vendor/desktop-trampoline/yarn.lock new file mode 100644 index 00000000000..4fb8eae48fa --- /dev/null +++ b/vendor/desktop-trampoline/yarn.lock @@ -0,0 +1,4614 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@ampproject/remapping@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23" + integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g== + dependencies: + "@jridgewell/trace-mapping" "^0.3.0" + +"@babel/code-frame@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/compat-data@^7.16.4": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" + integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== + +"@babel/core@^7.1.0": + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651" + integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.11.6" + "@babel/helper-module-transforms" "^7.11.0" + "@babel/helpers" "^7.10.4" + "@babel/parser" "^7.11.5" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.11.5" + "@babel/types" "^7.11.5" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/core@^7.12.3", "@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.17.0" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.17.0" + "@babel/parser" "^7.17.0" + "@babel/template" "^7.16.7" + "@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" + +"@babel/generator@^7.11.5", "@babel/generator@^7.11.6": + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620" + integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA== + dependencies: + "@babel/types" "^7.11.5" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@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.17.0" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-compilation-targets@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" + integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== + dependencies: + "@babel/compat-data" "^7.16.4" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.17.5" + semver "^6.3.0" + +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-function-name@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== + dependencies: + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/helper-get-function-arity@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" + integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-member-expression-to-functions@^7.10.4": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" + integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-module-imports@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620" + integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-module-transforms@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" + integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-replace-supers" "^7.10.4" + "@babel/helper-simple-access" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/template" "^7.10.4" + "@babel/types" "^7.11.0" + lodash "^4.17.19" + +"@babel/helper-module-transforms@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" + integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== + dependencies: + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/helper-optimise-call-expression@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" + integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== + dependencies: + "@babel/types" "^7.10.4" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + +"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + +"@babel/helper-replace-supers@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf" + integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.10.4" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-simple-access@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461" + integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw== + dependencies: + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-simple-access@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" + integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== + +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== + +"@babel/helpers@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044" + integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA== + dependencies: + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" + +"@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.17.0" + "@babel/types" "^7.17.0" + +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" + integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== + +"@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-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" + integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-typescript@^7.7.2": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" + integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== + dependencies: + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/template@^7.10.4", "@babel/template@^7.3.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" + integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/template@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" + integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.11.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + +"@babel/traverse@^7.16.7", "@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.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.17.0" + "@babel/types" "^7.17.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" + integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + +"@babel/types@^7.16.7", "@babel/types@^7.17.0": + 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" + +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.0.tgz#82289a589ad5803555b50b64178128b7a8e45282" + integrity sha512-WUzX5neFb0IOQOy/7A2VhiGdxJKk85Xns2Oq29JaHmtnSel+BsjwyQZxzAs2Xxfd2i452fwdDG9ox/IWi81bdQ== + dependencies: + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^27.5.0" + jest-util "^27.5.0" + slash "^3.0.0" + +"@jest/core@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.0.tgz#27b383f497ff1671cc30fd5e22eba9d9b10c3031" + integrity sha512-DcUTkZyon+dRozTEjy38Bgt3PIU51GdUJuz3uHKg5maGtmCaYqPUGiM3Xddqi7eIMC7E3fTGIlHqH9i0pTOy6Q== + dependencies: + "@jest/console" "^27.5.0" + "@jest/reporters" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.8.1" + exit "^0.1.2" + graceful-fs "^4.2.9" + jest-changed-files "^27.5.0" + jest-config "^27.5.0" + jest-haste-map "^27.5.0" + jest-message-util "^27.5.0" + jest-regex-util "^27.5.0" + jest-resolve "^27.5.0" + jest-resolve-dependencies "^27.5.0" + jest-runner "^27.5.0" + jest-runtime "^27.5.0" + jest-snapshot "^27.5.0" + jest-util "^27.5.0" + jest-validate "^27.5.0" + jest-watcher "^27.5.0" + micromatch "^4.0.4" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.0.tgz#a473bc76261aad7dfa3a1d8e35155953a5ba3436" + integrity sha512-lg0JFsMaLKgpwzs0knOg21Z4OQwaJoBLutnmYzip4tyLTXP21VYWtYGpLXgx42fw/Mw05m1WDXWKgwR6WnsiTw== + dependencies: + "@jest/fake-timers" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + jest-mock "^27.5.0" + +"@jest/fake-timers@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.0.tgz#f9e07b4c723a535f7c532cfb403394fa40d88c8a" + integrity sha512-e3WrlpqSHq3HAQ03JFjTn8YCrsyg640/sr1rjkM2rNv8z1ufjudpv4xq6DvvTJYB6FuUrfg0g+7bSKPet5QfCQ== + dependencies: + "@jest/types" "^27.5.0" + "@sinonjs/fake-timers" "^8.0.1" + "@types/node" "*" + jest-message-util "^27.5.0" + jest-mock "^27.5.0" + jest-util "^27.5.0" + +"@jest/globals@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.0.tgz#16271323f79e3b0fe0842e9588241d202a6c2aff" + integrity sha512-wWpMnTiR65Q4JD7fr2BqN+ZDbi99mmILnEM6u7AaX4geASEIVvQsiB4RCvwZrIX5YZCsAjviJQVq9CYddLABkg== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/types" "^27.5.0" + expect "^27.5.0" + +"@jest/reporters@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.0.tgz#e7602e12656b5051bf4e784cbdd82d4ec1299e33" + integrity sha512-DG+BmVSx2uaJSTKz5z1eScgHTQ6/cZ5CCKSpmpr4sXQPwV2V5aUMOBDwXX1MnqNRhH7/Rq9K97ynnocvho5aMA== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.9" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^5.1.0" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.1.3" + jest-haste-map "^27.5.0" + jest-resolve "^27.5.0" + jest-util "^27.5.0" + jest-worker "^27.5.0" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^8.1.0" + +"@jest/source-map@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.0.tgz#f22a7e759b8807491f84719c01acf433b917c7a0" + integrity sha512-0xr7VZ+JNCRrlCyRMYhquUm8eU3kNdGDaIW4s3L625bNjk273v9ZhAm3YczIuzJzYH0pnjT+QSCiZQegWKjeow== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.9" + source-map "^0.6.0" + +"@jest/test-result@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.0.tgz#29e0ace33570c9dcbd47c67e954f77a7d7fff98e" + integrity sha512-Lxecvx5mN6WIeynIyW0dWDQm8UPGMHvTwxUPK+OsZaqBDMGaNDSZtw53VoVk7HyT6AcRblMR/pfa0XucmH4hGw== + dependencies: + "@jest/console" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.0.tgz#68beceb3de818dcb34fb3ea59be3c22c890bb6e5" + integrity sha512-WzjcDflqbpWe+SnJPCvB2gB6haGfrkzAgzY6Pb1aq+EPoVAj2mwBaKN0ROWI4H87aSslCjq2M+BUQFNJ8VpnDA== + dependencies: + "@jest/test-result" "^27.5.0" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.0" + jest-runtime "^27.5.0" + +"@jest/transform@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.0.tgz#a4941e69ac51e8aa9a255ff4855b564c228c400b" + integrity sha512-yXUy/iO3TH1itxJ9BF7LLjuXt8TtgtjAl0PBQbUaCvRa+L0yYBob6uayW9dFRX/CDQweouLhvmXh44zRiaB+yA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^27.5.0" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.0" + jest-regex-util "^27.5.0" + jest-util "^27.5.0" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^27.5.0": + version "27.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.0.tgz#6ad04a5c5355fd9f46e5cf761850e0edb3c209dd" + integrity sha512-oDHEp7gwSgA82RZ6pzUL3ugM2njP/lVB1MsxRZNOBk+CoNvh9SpH1lQixPFc/kDlV50v59csiW4HLixWmhmgPQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^16.0.0" + chalk "^4.0.0" + +"@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/sourcemap-codec@^1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186" + integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg== + +"@jridgewell/trace-mapping@^0.3.0": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde" + integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@npmcli/agent@^2.0.0": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" + integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== + dependencies: + agent-base "^7.1.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.1" + lru-cache "^10.0.1" + socks-proxy-agent "^8.0.3" + +"@npmcli/fs@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" + integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== + dependencies: + semver "^7.3.5" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@sinonjs/commons@^1.7.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" + integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^8.0.1": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" + integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/babel__core@^7.0.0": + version "7.1.10" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40" + integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__core@^7.1.14": + version "7.1.18" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8" + integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.1" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04" + integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214" + integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.0.14" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13" + integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg== + dependencies: + "@babel/types" "^7.3.0" + +"@types/babel__traverse@^7.0.4": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== + dependencies: + "@babel/types" "^7.3.0" + +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + +"@types/graceful-fs@^4.1.2": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" + integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ== + dependencies: + "@types/node" "*" + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/node@*": + version "14.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" + integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA== + +"@types/prettier@^2.1.5": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf" + integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w== + +"@types/stack-utils@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== + +"@types/yargs-parser@*": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" + integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + +"@types/yargs@^16.0.0": + version "16.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== + dependencies: + "@types/yargs-parser" "*" + +abab@^2.0.3, abab@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^7.1.1: + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== + +acorn@^8.2.4: + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== + +after@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" + integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== + dependencies: + debug "^4.3.4" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.12.3: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-escapes@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + dependencies: + type-fest "^0.11.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +ansi@^0.3.0, ansi@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +anymatch@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + +are-we-there-yet@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz#aed25dd0eae514660d49ac2b2366b175c614785a" + integrity sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +array-index@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" + integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= + dependencies: + debug "^2.2.0" + es6-symbol "^3.0.2" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + +axios@^1.6.5: + version "1.7.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +b4a@^1.6.4: + version "1.6.6" + resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba" + integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg== + +babel-jest@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.0.tgz#c653985241af3c76f59d70d65a570860c2594a50" + integrity sha512-puhCyvBTNLevhbd1oyw6t3gWBicWoUARQYKCBB/B1moif17NbyhxbsfadqZIw8zfJJD+W7Vw0Nb20pEjLxkXqQ== + dependencies: + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^27.5.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" + +babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^5.0.4" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.0.tgz#8fdf07835f2165a068de3ce95fd7749a89801b51" + integrity sha512-ztwNkHl+g1GaoQcb8f2BER4C3LMvSXuF7KVqtUioXQgScSEnkl6lLgCILUYIR+CPTwL8H3F/PNLze64HPWF9JA== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.0.tgz#4e308711c3d2ff1f45cf5d9a23646e37b621fc9f" + integrity sha512-7bfu1cJBlgK/nKfTvMlElzA3jpi6GzDWX3fntnyP2cQSzoi/KUz6ewGlcb3PSRYZGyv+uPnVHY0Im3JbsViqgA== + dependencies: + babel-plugin-jest-hoist "^27.5.0" + babel-preset-current-node-syntax "^1.0.0" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +bare-events@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.3.1.tgz#5af2ee0be9578f81e3c1aa9bc3a6a2bcf22307ce" + integrity sha512-sJnSOTVESURZ61XgEleqmP255T6zTYwHPwE4r6SssIh0U9/uDvfpdoJYpVUerJJZH2fueO+CdT8ZT+OC/7aZDA== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + dependencies: + tweetnacl "^0.14.3" + +bl@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bl@~3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" + integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== + dependencies: + readable-stream "^3.0.1" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + dependencies: + inherits "~2.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +browserslist@^4.17.5: + version "4.19.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" + integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== + dependencies: + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" + escalade "^3.1.1" + node-releases "^2.0.1" + picocolors "^1.0.0" + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + +buffer-from@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" + integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +cacache@^18.0.0: + version "18.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21" + integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^10.0.1" + minipass "^7.0.3" + minipass-collect "^2.0.1" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + p-map "^4.0.0" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.0.0" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +caniuse-lite@^1.0.30001286: + version "1.0.30001309" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz#e0ee78b9bec0704f67304b00ff3c5c0c768a9f62" + integrity sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + +cjs-module-lexer@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +cmake-js@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" + integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== + dependencies: + axios "^1.6.5" + debug "^4" + fs-extra "^11.2.0" + lodash.isplainobject "^4.0.6" + memory-stream "^1.0.0" + node-api-headers "^1.1.0" + npmlog "^6.0.2" + rc "^1.2.7" + semver "^7.5.4" + tar "^6.2.0" + url-join "^4.0.1" + which "^2.0.2" + yargs "^17.7.2" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" + dependencies: + delayed-stream "~1.0.0" + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^2.9.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +cross-spawn@^7.0.0, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +d@1, d@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" + integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== + dependencies: + es5-ext "^0.10.50" + type "^1.0.1" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + +debug@4: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +debug@^2.2.0: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@^4.1.0, debug@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + +debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +detect-libc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" + integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== + +detect-libc@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" + integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== + +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + +diff-sequences@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.0.tgz#a8ac0cb742b17d6f30a6c43e233893a2402c0729" + integrity sha512-ZsOBWnhXiH+Zn0DcBNX/tiQsqrREHs/6oQsEVy2VJJjrTblykPima11pyHMSA/7PGmD+fwclTnKVKL/qtNREDQ== + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + +duplexer2@~0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= + dependencies: + readable-stream "~1.1.9" + +each-series-async@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" + integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== + +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +electron-to-chromium@^1.4.17: + version "1.4.66" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz#d7453d363dcd7b06ed1757adcde34d724e27b367" + integrity sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg== + +emittery@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" + integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + +es5-ext@^0.10.35, es5-ext@^0.10.50: + version "0.10.53" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" + integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.3" + next-tick "~1.0.0" + +es6-iterator@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" + integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== + dependencies: + d "^1.0.1" + ext "^1.1.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +execspawn@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" + integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= + dependencies: + util-extend "^1.0.1" + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +expect@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.0.tgz#ea2fbebb483c274043098c34a53923a0aee493f0" + integrity sha512-z73GZ132cBqrapO0X6BeRjyBXqOt9YeRtnDteHJIQqp5s2pZ41Hz23VUbsVFMfkrsFLU9GwoIRS0ZzLuFK8M5w== + dependencies: + "@jest/types" "^27.5.0" + jest-get-type "^27.5.0" + jest-matcher-utils "^27.5.0" + jest-message-util "^27.5.0" + +exponential-backoff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" + integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== + +ext@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" + integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + dependencies: + type "^2.0.0" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-fifo@^1.1.0, fast-fifo@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c" + integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.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" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +follow-redirects@^1.15.6: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs-minipass@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" + integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw== + dependencies: + minipass "^7.0.3" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +fstream@^1.0.0, fstream@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" + integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + +gauge@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.2.tgz#7ab44c11181da9766333f10db8cd1e4b17fd6c46" + integrity sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^4.0.1" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + +gauge@~1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" + integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= + dependencies: + ansi "^0.3.0" + has-unicode "^2.0.0" + lodash.pad "^4.1.0" + lodash.padend "^4.1.0" + lodash.padstart "^4.1.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +gensync@^1.0.0-beta.1: + version "1.0.0-beta.1" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" + integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +ghreleases@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" + integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== + dependencies: + after "~0.8.1" + ghrepos "~2.1.0" + ghutils "~3.2.0" + lodash.uniq "^4.5.0" + simple-mime "~0.1.0" + url-template "~2.0.6" + +ghrepos@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" + integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== + dependencies: + ghutils "~3.2.0" + +ghutils@~3.2.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" + integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== + dependencies: + jsonist "~2.1.0" + xtend "~4.0.1" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + +"glob@3 || 4 || 5 || 6 || 7", glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.4: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^10.2.2, glob@^10.3.10: + version "10.4.1" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2" + integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== + dependencies: + foreground-child "^3.1.0" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + path-scurry "^1.11.1" + +glob@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +graceful-fs@^4.2.0: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-unicode@^2.0.0, has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +http-cache-semantics@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http-proxy-agent@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" + integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== + dependencies: + agent-base "^7.1.0" + debug "^4.3.4" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +https-proxy-agent@^7.0.1: + version "7.0.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" + integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== + dependencies: + agent-base "^7.0.2" + debug "4" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +hyperquest@~2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" + integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== + dependencies: + buffer-from "^0.1.1" + duplexer2 "~0.0.2" + through2 "~0.6.3" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +ip-address@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" + integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== + dependencies: + jsbn "1.1.0" + sprintf-js "^1.1.3" + +is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== + dependencies: + has "^1.0.3" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + +is-typedarray@^1.0.0, is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isexe@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" + integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-coverage@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== + +istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" + integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.2.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + +jackspeak@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab" + integrity sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + +jest-changed-files@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.0.tgz#61e8d0a7394c1ee1cec4c2893e206e62b1566066" + integrity sha512-BGWKI7E6ORqbF5usF1oA4ftbkhVZVrXr8jB0/BrU6TAn3kfOVwX2Zx6pKIXYutJ+qNEjT8Da/gGak0ajya/StA== + dependencies: + "@jest/types" "^27.5.0" + execa "^5.0.0" + throat "^6.0.1" + +jest-circus@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.0.tgz#fcff8829ceb2c8ef4b4532ace7734d156c6664b9" + integrity sha512-+NPd1OxpAHYKjbW8dgL0huFgmtZRKSUKee/UtRgZJEfAxCeA12d7sp0coh5EGDBpW4fCk1Pcia/2dG+j6BQvdw== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^0.7.0" + expect "^27.5.0" + is-generator-fn "^2.0.0" + jest-each "^27.5.0" + jest-matcher-utils "^27.5.0" + jest-message-util "^27.5.0" + jest-runtime "^27.5.0" + jest-snapshot "^27.5.0" + jest-util "^27.5.0" + pretty-format "^27.5.0" + slash "^3.0.0" + stack-utils "^2.0.3" + throat "^6.0.1" + +jest-cli@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.0.tgz#06557ad22818740fb28481089a574ba107a8b369" + integrity sha512-9ANs79Goz1ULKtG7HDm/F//4E69v8EFOLXRIHmeC/eK1xTUeQGlU6XP0Zwst386sKaKB4O60qhWY/UaTBS2MLA== + dependencies: + "@jest/core" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/types" "^27.5.0" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + import-local "^3.0.2" + jest-config "^27.5.0" + jest-util "^27.5.0" + jest-validate "^27.5.0" + prompts "^2.0.1" + yargs "^16.2.0" + +jest-config@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.0.tgz#d96ccf8e26d3f2f3ae6543686c48449c201bb621" + integrity sha512-eOIpvpXFz5WHuIYZN1QmvBLEjsSk3w+IAC/2jBpZClbprF53Bj9meBMgAbE15DSkaaJBDFmhXXd1L2eCLaWxQw== + dependencies: + "@babel/core" "^7.8.0" + "@jest/test-sequencer" "^27.5.0" + "@jest/types" "^27.5.0" + babel-jest "^27.5.0" + chalk "^4.0.0" + ci-info "^3.2.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.9" + jest-circus "^27.5.0" + jest-environment-jsdom "^27.5.0" + jest-environment-node "^27.5.0" + jest-get-type "^27.5.0" + jest-jasmine2 "^27.5.0" + jest-regex-util "^27.5.0" + jest-resolve "^27.5.0" + jest-runner "^27.5.0" + jest-util "^27.5.0" + jest-validate "^27.5.0" + micromatch "^4.0.4" + pretty-format "^27.5.0" + slash "^3.0.0" + +jest-diff@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.0.tgz#34dc608a3b9159df178dd480b6d835b5e6b92082" + integrity sha512-zztvHDCq/QcAVv+o6rts0reupSOxyrX+KLQEOMWCW2trZgcBFgp/oTK7hJCGpXvEIqKrQzyQlaPKn9W04+IMQg== + dependencies: + chalk "^4.0.0" + diff-sequences "^27.5.0" + jest-get-type "^27.5.0" + pretty-format "^27.5.0" + +jest-docblock@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.0.tgz#096fa3a8b55d019a954ef7cc205c791bf94b2352" + integrity sha512-U4MtJgdZn2x+jpPzd7NAYvDmgJAA5h9QxVAwsyuH7IymGzY8VGHhAkHcIGOmtmdC61ORLxCbEhj6fCJsaCWzXA== + dependencies: + detect-newline "^3.0.0" + +jest-each@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.0.tgz#7bd00a767df0fbec0caba3df0d2c0b3268a2ce84" + integrity sha512-2vpajSdDMZmAxjSP1f4BG9KKduwHtuaI0w66oqLUkfaGUU7Ix/W+d8BW0h3/QEJiew7hR0GSblqdFwTEEbhBdw== + dependencies: + "@jest/types" "^27.5.0" + chalk "^4.0.0" + jest-get-type "^27.5.0" + jest-util "^27.5.0" + pretty-format "^27.5.0" + +jest-environment-jsdom@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.0.tgz#6d22d9b76890e9b82c7e1062a15730efb3fb7361" + integrity sha512-sX49N8rjp6HSHeGpNgLk6mtHRd1IPAnE/u7wLQkb6Tz/1E08Q++Y8Zk/IbpVdcFywbzH1icFqEuDuHJ6o+uXXg== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/fake-timers" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + jest-mock "^27.5.0" + jest-util "^27.5.0" + jsdom "^16.6.0" + +jest-environment-node@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.0.tgz#1ab357b4715bff88d48c8b62b8379002ff955dd1" + integrity sha512-7UzisMMfGyrURhS/eUa7p7mgaqN3ajHylsjOgfcn0caNeYRZq4LHKZLfAxrPM34DWLnBZcRupEJlpQsizdSUsw== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/fake-timers" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + jest-mock "^27.5.0" + jest-util "^27.5.0" + +jest-get-type@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.0.tgz#861c24aa1b176be83c902292cb9618d580cac8a7" + integrity sha512-Vp6O8a52M/dahXRG/E0EJuWQROps2mDQ0sJYPgO8HskhdLwj9ajgngy2OAqZgV6e/RcU67WUHq6TgfvJb8flbA== + +jest-haste-map@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.0.tgz#7cc3a920caf304c89fbfceb5d5717b929873f175" + integrity sha512-0KfckSBEKV+D6e0toXmIj4zzp72EiBnvkC0L+xYxenkLhAdkp2/8tye4AgMzz7Fqb1r8SWtz7+s1UQLrxMBang== + dependencies: + "@jest/types" "^27.5.0" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.9" + jest-regex-util "^27.5.0" + jest-serializer "^27.5.0" + jest-util "^27.5.0" + jest-worker "^27.5.0" + micromatch "^4.0.4" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.3.2" + +jest-jasmine2@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.0.tgz#589d6574d1318d3fb41b3fc368344117ec417dcc" + integrity sha512-X7sT3HLNjjrBEepilxzPyNhNdyunaFBepo1L3T/fvYb9tb8Wb8qY576gwIa+SZcqYUqAA7/bT3EpZI4lAp0Qew== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/source-map" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^27.5.0" + is-generator-fn "^2.0.0" + jest-each "^27.5.0" + jest-matcher-utils "^27.5.0" + jest-message-util "^27.5.0" + jest-runtime "^27.5.0" + jest-snapshot "^27.5.0" + jest-util "^27.5.0" + pretty-format "^27.5.0" + throat "^6.0.1" + +jest-leak-detector@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.0.tgz#c98c02e64eab4da9a8b91f058d2b7473272272ee" + integrity sha512-Ak3k+DD3ao5d4/zzJrxAQ5UV5wiCrp47jH94ZD4/vXSzQgE6WBVDfg83VtculLILO7Y6/Q/7yzKSrtN9Na8luA== + dependencies: + jest-get-type "^27.5.0" + pretty-format "^27.5.0" + +jest-matcher-utils@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.0.tgz#d2fc737224fb3bfa38eaa2393ac5bc953d5c5697" + integrity sha512-5ruyzWMGb1ilCWD6ECwNdOhQBeIXAjHmHd5c3uO6quR7RIMHPRP2ucOaejz2j+0R0Ko4GanWM6SqXAeF8nYN5g== + dependencies: + chalk "^4.0.0" + jest-diff "^27.5.0" + jest-get-type "^27.5.0" + pretty-format "^27.5.0" + +jest-message-util@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.0.tgz#654a781b38a305b1fd8120053c784c67bca00a52" + integrity sha512-lfbWRhTtmZMEHPAtl0SrvNzK1F4UnVNMHOliRQT2BJ4sBFzIb0gBCHA4ebWD4o6l1fUyvDPxM01K9OIMQTAdQw== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^27.5.0" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^27.5.0" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.0.tgz#1018656fe6bcd0f58fd1edca7f420169f6707c6e" + integrity sha512-PHluG6MJGng82/sxh8OiB9fnxzNn3cazceSHCAmAKs4g5rMhc3EZCrJXv+4w61rA2WGagMUj7QLLrA1SRlFpzQ== + dependencies: + "@jest/types" "^27.5.0" + "@types/node" "*" + +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.0.tgz#26c26cf15a73edba13cb8930e261443d25ed8608" + integrity sha512-e9LqSd6HsDsqd7KS3rNyYwmQAaG9jq4U3LbnwVxN/y3nNlDzm2OFs596uo9zrUY+AV1opXq6ome78tRDUCRWfA== + +jest-resolve-dependencies@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.0.tgz#8e3b15589848995ddc9a39f49462dad5b7bc14a2" + integrity sha512-xQsy7CmrT4CJxdNUEdzZU2M/v6YmtQ/pkJM+sx7TA1siG1zfsZuo78PZvzglwRMQFr88f3Su4Om8OEBAic+SMw== + dependencies: + "@jest/types" "^27.5.0" + jest-regex-util "^27.5.0" + jest-snapshot "^27.5.0" + +jest-resolve@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.0.tgz#a8e95a68dfb4a59faa508d7b6d2c6a02dcabb712" + integrity sha512-PkDpYEGV/nFqThnIrlPtj8oTxyAV3iuuS6or7dZYyUWaHr/tyyVb5qfBmZS6FEr7ozBHgjrF1bgcgIefnlicbw== + dependencies: + "@jest/types" "^27.5.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.0" + jest-pnp-resolver "^1.2.2" + jest-util "^27.5.0" + jest-validate "^27.5.0" + resolve "^1.20.0" + resolve.exports "^1.1.0" + slash "^3.0.0" + +jest-runner@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.0.tgz#b5747a4444b4d3faae019bd201943948882d26c3" + integrity sha512-RMzXhkJLLOKKgUPY2trpyVBijaFmswMtgoCCBk2PQVRHC6yo1vLd1/jmFP39s5OXXnt7rntuzKSYvxl+QUibqQ== + dependencies: + "@jest/console" "^27.5.0" + "@jest/environment" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.8.1" + graceful-fs "^4.2.9" + jest-docblock "^27.5.0" + jest-environment-jsdom "^27.5.0" + jest-environment-node "^27.5.0" + jest-haste-map "^27.5.0" + jest-leak-detector "^27.5.0" + jest-message-util "^27.5.0" + jest-resolve "^27.5.0" + jest-runtime "^27.5.0" + jest-util "^27.5.0" + jest-worker "^27.5.0" + source-map-support "^0.5.6" + throat "^6.0.1" + +jest-runtime@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.0.tgz#2497116742b9e7cc1e5381a9ded36602b8b0c78c" + integrity sha512-T7APxCPjN3p3ePcLuypbWtD0UZHyAdvIADZ9ABI/sFZ9t/Rf2xIUd6D7RzZIX+unewJRooVGWrgDIgeUuj0OUA== + dependencies: + "@jest/environment" "^27.5.0" + "@jest/fake-timers" "^27.5.0" + "@jest/globals" "^27.5.0" + "@jest/source-map" "^27.5.0" + "@jest/test-result" "^27.5.0" + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + execa "^5.0.0" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.0" + jest-message-util "^27.5.0" + jest-mock "^27.5.0" + jest-regex-util "^27.5.0" + jest-resolve "^27.5.0" + jest-snapshot "^27.5.0" + jest-util "^27.5.0" + slash "^3.0.0" + strip-bom "^4.0.0" + +jest-serializer@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.0.tgz#439a110df27f97a40c114a429b708c2ada15a81f" + integrity sha512-aSDFqQlVXtBH+Zb5dl9mCvTSFkabixk/9P9cpngL4yJKpmEi9USxfDhONFMzJrtftPvZw3PcltUVmtFZTB93rg== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.9" + +jest-snapshot@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.0.tgz#c5c4c084f5e10036f31e7647de1a6f28c07681fc" + integrity sha512-cAJj15uqWGkro0bfcv/EgusBnqNgCpRruFQZghsMYTq4Fm2lk/VhAf8DgRr8wvhR6Ue1hkeL8tn70Cw4t8x/5A== + dependencies: + "@babel/core" "^7.7.2" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.0.0" + "@jest/transform" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^27.5.0" + graceful-fs "^4.2.9" + jest-diff "^27.5.0" + jest-get-type "^27.5.0" + jest-haste-map "^27.5.0" + jest-matcher-utils "^27.5.0" + jest-message-util "^27.5.0" + jest-util "^27.5.0" + natural-compare "^1.4.0" + pretty-format "^27.5.0" + semver "^7.3.2" + +jest-util@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.0.tgz#0b9540d91b0de65d288f235fa9899e6eeeab8d35" + integrity sha512-FUUqOx0gAzJy3ytatT1Ss372M1kmhczn8x7aE0++11oPGW1FyD/5NjYBI8w1KOXFm6IVjtaZm2szfJJL+CHs0g== + dependencies: + "@jest/types" "^27.5.0" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.0.tgz#b3df32372d2c832fa5a5e31ee2c37f94f79f7f1f" + integrity sha512-2XZzQWNrY9Ypo11mm4ZeVjvr++CQG/45XnmA2aWwx155lTwy1JGFI8LpQ2dBCSAeO21ooqg/FCIvv9WwfnPClA== + dependencies: + "@jest/types" "^27.5.0" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^27.5.0" + leven "^3.1.0" + pretty-format "^27.5.0" + +jest-watcher@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.0.tgz#ca11c3b9115c92a8fd2fd9e2def296d45206f1ca" + integrity sha512-MhIeIvEd6dnnspE0OfYrqHOAfZZdyFqx/k8U2nvVFSkLYf22qAFfyNWPVQYcwqKVNobcOhJoT0kV/nRHGbqK8A== + dependencies: + "@jest/test-result" "^27.5.0" + "@jest/types" "^27.5.0" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^27.5.0" + string-length "^4.0.1" + +jest-worker@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.0.tgz#99ee77e4d06168107c27328bd7f54e74c3a48d59" + integrity sha512-8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.0.tgz#2c04ff88754e42e9fc5240840b91f9a9a8990875" + integrity sha512-sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A== + dependencies: + "@jest/core" "^27.5.0" + import-local "^3.0.2" + jest-cli "^27.5.0" + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +jsdom@^16.6.0: + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== + dependencies: + abab "^2.0.5" + acorn "^8.2.4" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.3.0" + data-urls "^2.0.0" + decimal.js "^10.2.1" + domexception "^2.0.1" + escodegen "^2.0.0" + form-data "^3.0.0" + html-encoding-sniffer "^2.0.1" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "6.0.1" + saxes "^5.0.1" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.5.0" + ws "^7.4.6" + xml-name-validator "^3.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonist@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" + integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== + dependencies: + bl "~3.0.0" + hyperquest "~2.1.3" + json-stringify-safe "~5.0.1" + xtend "~4.0.1" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== + +lodash.pad@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" + integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= + +lodash.padend@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" + integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= + +lodash.padstart@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" + integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.17.19: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + +lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lru-cache@^10.0.1, lru-cache@^10.2.0: + version "10.2.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-fetch-happen@^13.0.0: + version "13.0.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" + integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== + dependencies: + "@npmcli/agent" "^2.0.0" + cacache "^18.0.0" + http-cache-semantics "^4.1.1" + is-lambda "^1.0.1" + minipass "^7.0.2" + minipass-fetch "^3.0.0" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + proc-log "^4.2.0" + promise-retry "^2.0.1" + ssri "^10.0.0" + +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + +memory-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2" + integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww== + dependencies: + readable-stream "^3.4.0" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@~1.38.0: + version "1.38.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad" + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.22" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd" + dependencies: + mime-db "~1.38.0" + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +minimatch@3, minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimatch@^9.0.4: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minimist@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minipass-collect@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" + integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw== + dependencies: + minipass "^7.0.3" + +minipass-fetch@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" + integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== + dependencies: + minipass "^7.0.3" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0: + version "3.1.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" + integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== + +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +"mkdirp@>=0.5 0", mkdirp@^0.5.0: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +napi-build-utils@^1.0.1, napi-build-utils@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +next-tick@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" + integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= + +node-abi@^3.3.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32" + integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw== + dependencies: + semver "^7.3.5" + +node-abi@^3.54.0: + version "3.62.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.62.0.tgz#017958ed120f89a3a14a7253da810f5d724e3f36" + integrity sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g== + dependencies: + semver "^7.3.5" + +node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + +node-api-headers@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.1.0.tgz#3f9dd7bb10b29e1c3e3db675979605a308b2373c" + integrity sha512-ucQW+SbYCUPfprvmzBsnjT034IGRB2XK8rRc78BgjNKhTdFKgAwAmgW704bKIBmcYW48it0Gkjpkd39Azrwquw== + +node-gyp@^10.0.1, node-gyp@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e" + integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^10.3.10" + graceful-fs "^4.2.6" + make-fetch-happen "^13.0.0" + nopt "^7.0.0" + proc-log "^3.0.0" + semver "^7.3.5" + tar "^6.1.2" + which "^4.0.0" + +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + +node-ninja@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" + integrity sha512-wMtWsG2QZI1Z5V7GciX9OI2DVT0PuDRIDQfe3L3rJsQ1qN1Gm3QQhoNtb4PMRi7gq4ByvEIYtPwHC7YbEf5yxw== + dependencies: + fstream "^1.0.0" + glob "3 || 4 || 5 || 6 || 7" + graceful-fs "^4.1.2" + minimatch "3" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2" + osenv "0" + path-array "^1.0.0" + request "2" + rimraf "2" + semver "2.x || 3.x || 4 || 5" + tar "^2.0.0" + which "1" + +node-releases@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== + +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ== + +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + +nopt@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== + dependencies: + abbrev "^2.0.0" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-path@^2.0.2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" + integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== + dependencies: + which "^1.2.10" + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npm-which@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" + integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= + dependencies: + commander "^2.9.0" + npm-path "^2.0.2" + which "^1.2.10" + +"npmlog@0 || 1 || 2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= + dependencies: + ansi "~0.3.1" + are-we-there-yet "~1.1.2" + gauge "~1.2.5" + +"npmlog@0 || 1 || 2 || 3 || 4": + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +npmlog@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +npmlog@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8" + integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg== + dependencies: + are-we-there-yet "^4.0.0" + console-control-strings "^1.1.0" + gauge "^5.0.0" + set-blocking "^2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +nw-gyp@^3.6.6: + version "3.6.6" + resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.6.tgz#0231d603d09665053ea48843d6888d13a4b92fb1" + integrity sha512-FeMnpFQWtEEMJ1BrSfK3T62CjuxaNl0mNHqdrxFcIF5XQdC3gaZYW4n+77lQLk8PE3Upfknkl9VRo6gDKJIHuA== + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +path-array@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" + integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= + dependencies: + array-index "^1.0.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6, path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-scurry@^1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +picomatch@^2.2.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pirates@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +prebuild-install@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056" + integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prebuild@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-13.0.1.tgz#6e554d9e1b232044d4a26115ef8c8e088ad85d25" + integrity sha512-AR+ZoFfG2qQM5iCtNNBWlueuzlBWQdeiU+fBF7ZwbW2w5p/2Ep1+3G4AtAymrMfZn0yg3DoF+xCorh5hHOJY/Q== + dependencies: + cmake-js "^7.3.0" + detect-libc "^2.0.2" + each-series-async "^1.0.1" + execspawn "^1.0.1" + ghreleases "^3.0.2" + github-from-package "0.0.0" + glob "^10.3.10" + minimist "^1.2.8" + napi-build-utils "^1.0.2" + node-abi "^3.54.0" + node-gyp "^10.0.1" + node-ninja "^1.0.2" + noop-logger "^0.1.1" + npm-which "^3.0.1" + npmlog "^7.0.1" + nw-gyp "^3.6.6" + rc "^1.2.8" + run-waterfall "^1.1.7" + tar-stream "^3.1.7" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prettier@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== + +pretty-format@^27.5.0: + version "27.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.0.tgz#71e1af7a4b587d259fa4668dcd3e94af077767cb" + integrity sha512-xEi6BRPZ+J1AIS4BAtFC/+rh5jXlXObGZjx5+OSpM95vR/PGla78bFVHMy5GdZjP9wk3AHAMHROXq/r69zXltw== + dependencies: + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^17.0.1" + +proc-log@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8" + integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A== + +proc-log@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" + integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +prompts@^2.0.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" + integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.4" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +psl@^1.1.28, psl@^1.1.33: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + +queue-tick@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" + integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== + +rc@^1.2.7, rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +"readable-stream@>=1.0.33-1 <1.1.0-0": + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^2.0.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +request@2: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve.exports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + +resolve@^1.20.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + dependencies: + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^1.3.2: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-waterfall@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" + integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== + +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +saxes@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + +"semver@2.x || 3.x || 4 || 5", semver@^5.4.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +semver@^7.5.4: + version "7.6.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" + integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== + +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-mime@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" + integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= + +sisteransi@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz#6b2da3d77364fde6292e810b496cb70440b9b89d" + integrity sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A== + dependencies: + agent-base "^7.1.1" + debug "^4.3.4" + socks "^2.7.1" + +socks@^2.7.1: + version "2.8.3" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5" + integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw== + dependencies: + ip-address "^9.0.5" + smart-buffer "^4.2.0" + +source-map-support@^0.5.6: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.5.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +split2@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + +sprintf-js@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +ssri@^10.0.0: + version "10.0.6" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" + integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== + dependencies: + minipass "^7.0.3" + +stack-utils@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + dependencies: + escape-string-regexp "^2.0.0" + +streamx@^2.15.0: + version "2.16.1" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614" + integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ== + dependencies: + fast-fifo "^1.1.0" + queue-tick "^1.0.1" + optionalDependencies: + bare-events "^2.2.0" + +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", 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== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1: + name strip-ansi-cjs + 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@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tar-stream@^3.1.7: + version "3.1.7" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b" + integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ== + dependencies: + b4a "^1.6.4" + fast-fifo "^1.2.0" + streamx "^2.15.0" + +tar@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== + dependencies: + block-stream "*" + fstream "^1.0.12" + inherits "2" + +tar@^6.1.11, tar@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +tar@^6.1.2: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + +throat@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" + integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== + +through2@~0.6.3: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + dependencies: + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" + +tmpl@1.0.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.1.2" + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tr46@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" + integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== + dependencies: + punycode "^2.1.1" + +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== + dependencies: + punycode "^2.1.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + +type@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" + integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== + +type@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" + integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== + dependencies: + unique-slug "^4.0.0" + +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== + dependencies: + imurmurhash "^0.1.4" + +universalify@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + dependencies: + punycode "^2.1.0" + +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + +url-template@~2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" + integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +util-extend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" + integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= + +uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + +v8-to-istanbul@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" + integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walker@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^8.0.0: + version "8.2.2" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd" + integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^2.0.2" + webidl-conversions "^6.1.0" + +whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== + dependencies: + lodash "^4.7.0" + tr46 "^2.1.0" + webidl-conversions "^6.1.0" + +which@1, which@^1.2.10: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +which@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a" + integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg== + dependencies: + isexe "^3.1.1" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + dependencies: + string-width "^1.0.2 || 2" + +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +word-wrap@~1.2.3: + version "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== + +"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== + 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" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^7.4.6: + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" From 90ac44f06e7281a96d5ac832d805669eb05f2708 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 13:11:39 +0100 Subject: [PATCH 0261/1338] Add tsconfig.json and clean up package.json --- vendor/desktop-trampoline/package.json | 36 +++++++------------------ vendor/desktop-trampoline/tsconfig.json | 23 ++++++++++++++++ 2 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 vendor/desktop-trampoline/tsconfig.json diff --git a/vendor/desktop-trampoline/package.json b/vendor/desktop-trampoline/package.json index 07169e2e9f2..fe39fa08f78 100644 --- a/vendor/desktop-trampoline/package.json +++ b/vendor/desktop-trampoline/package.json @@ -1,52 +1,34 @@ { "name": "desktop-trampoline", - "version": "0.9.11", - "main": "index.js", - "keywords": [], - "author": "", + "version": "0.9.12", + "main": "dist/index.js", "license": "MIT", "bin": { "desktop-trampoline": "build/Release/desktop-trampoline" }, - "types": "./index.d.ts", "scripts": { - "build": "node-gyp rebuild", - "install": "prebuild-install || node-gyp rebuild", - "test": "jest", + "build": "tsc", + "install": "node-gyp rebuild && tsc", "lint": "prettier -c **/*.js **/*.md", - "lint:fix": "prettier --write **/*.js **/*.md", - "prebuild-napi-x64": "prebuild -t 3 -r napi -a x64 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", - "prebuild-napi-ia32": "prebuild -t 3 -r napi -a ia32 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", - "prebuild-napi-arm64": "prebuild -t 3 -r napi -a arm64 --strip --include-regex \"(desktop-(askpass|credential-helper)-trampoline|ssh-wrapper)(\\.exe)?$\"", - "prebuild-all": "yarn prebuild-napi-x64 && yarn prebuild-napi-ia32 && yarn prebuild-napi-arm64", - "upload": "node ./script/upload.js" + "lint:fix": "prettier --write **/*.js **/*.md" }, - "repository": { - "type": "git", - "url": "git+https://github.com/desktop/desktop-trampoline.git" - }, - "bugs": { - "url": "https://github.com/desktop/desktop-trampoline/issues" - }, - "homepage": "https://github.com/desktop/desktop-trampoline#readme", "dependencies": { - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" + "node-addon-api": "^7.0.0" }, "devDependencies": { "jest": "^27.5.0", "node-gyp": "^10.1.0", - "prebuild": "^13.0.1", + "typescript": "^5.4.5", "prettier": "^2.5.1", "split2": "^4.1.0" }, "binary": { "napi_versions": [ - 3 + 4 ] }, "config": { "runtime": "napi", - "target": 3 + "target": 4 } } diff --git a/vendor/desktop-trampoline/tsconfig.json b/vendor/desktop-trampoline/tsconfig.json new file mode 100644 index 00000000000..2081134abde --- /dev/null +++ b/vendor/desktop-trampoline/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "moduleResolution": "node", + "target": "ES2022", + "esModuleInterop": true, + "resolveJsonModule": true, + "importHelpers": true, + "allowUnreachableCode": false, + "allowUnusedLabels": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "noUnusedLocals": true, + "sourceMap": true, + "strict": true, + "outDir": "./dist", + "useUnknownInCatchVariables": false, + "declaration": true + }, + "include": ["lib/**/*.ts"], + "exclude": ["node_modules", "build"], + "compileOnSave": false +} From 7cdab64ddb2bb0313c2921e5c4fbaf67f9fe45a9 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 13:18:23 +0100 Subject: [PATCH 0262/1338] Rewrite in TypeScript --- .../desktop-trampoline/{index.js => index.ts} | 23 ++++++------------- vendor/desktop-trampoline/tsconfig.json | 2 +- 2 files changed, 8 insertions(+), 17 deletions(-) rename vendor/desktop-trampoline/{index.js => index.ts} (54%) diff --git a/vendor/desktop-trampoline/index.js b/vendor/desktop-trampoline/index.ts similarity index 54% rename from vendor/desktop-trampoline/index.js rename to vendor/desktop-trampoline/index.ts index be164b08177..dc801adf748 100644 --- a/vendor/desktop-trampoline/index.js +++ b/vendor/desktop-trampoline/index.ts @@ -1,6 +1,6 @@ -const Path = require('path') +import * as Path from 'path' -function getDesktopAskpassTrampolinePath() { +export function getDesktopAskpassTrampolinePath(): string { return Path.join( __dirname, 'build', @@ -9,13 +9,13 @@ function getDesktopAskpassTrampolinePath() { ) } -function getDesktopAskpassTrampolineFilename() { +export function getDesktopAskpassTrampolineFilename(): string { return process.platform === 'win32' ? 'desktop-askpass-trampoline.exe' : 'desktop-askpass-trampoline' } -function getDesktopCredentialHelperTrampolinePath() { +export function getDesktopCredentialHelperTrampolinePath(): string { return Path.join( __dirname, 'build', @@ -24,25 +24,16 @@ function getDesktopCredentialHelperTrampolinePath() { ) } -function getDesktopCredentialHelperTrampolineFilename() { +export function getDesktopCredentialHelperTrampolineFilename(): string { return process.platform === 'win32' ? 'desktop-credential-helper-trampoline.exe' : 'desktop-credential-helper-trampoline' } -function getSSHWrapperPath() { +export function getSSHWrapperPath(): string { return Path.join(__dirname, 'build', 'Release', getSSHWrapperFilename()) } -function getSSHWrapperFilename() { +export function getSSHWrapperFilename(): string { return process.platform === 'win32' ? 'ssh-wrapper.exe' : 'ssh-wrapper' } - -module.exports = { - getDesktopAskpassTrampolinePath, - getDesktopAskpassTrampolineFilename, - getDesktopCredentialHelperTrampolinePath, - getDesktopCredentialHelperTrampolineFilename, - getSSHWrapperPath, - getSSHWrapperFilename, -} diff --git a/vendor/desktop-trampoline/tsconfig.json b/vendor/desktop-trampoline/tsconfig.json index 2081134abde..4a848d4fbed 100644 --- a/vendor/desktop-trampoline/tsconfig.json +++ b/vendor/desktop-trampoline/tsconfig.json @@ -17,7 +17,7 @@ "useUnknownInCatchVariables": false, "declaration": true }, - "include": ["lib/**/*.ts"], + "include": ["*.ts"], "exclude": ["node_modules", "build"], "compileOnSave": false } From 874bb2b0b91d7744ce64b971abbbcadeff0b6360 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 13:46:25 +0100 Subject: [PATCH 0263/1338] Remove releases.md from desktop-trampoline --- vendor/desktop-trampoline/docs/releases.md | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 vendor/desktop-trampoline/docs/releases.md diff --git a/vendor/desktop-trampoline/docs/releases.md b/vendor/desktop-trampoline/docs/releases.md deleted file mode 100644 index b11ec96d3e5..00000000000 --- a/vendor/desktop-trampoline/docs/releases.md +++ /dev/null @@ -1,25 +0,0 @@ -# Releases - -All releases are published using GitHub releases. Anyone with push access to the -repository can create a new release. - -### Release Process - -1. Create a branch named `releases/X.Y.Z`, where `X.Y.Z` is the version you want - to release. -1. Update the `version` field in the `package.json` with the new version you're - about to release. -1. Open a Pull Request for that branch. -1. Once the branch is approved, `git tag vX.Y.Z` the version you wish to - publish. **Important:** the version in the tag name must be preceeded by a - `v`. -1. `git push --follow-tags` to ensure all new commits (and the tag) are pushed - to the remote. Pushing the tag will start the release process. -1. Wait a few minutes for the build to finish (look for the build in - https://github.com/desktop/desktop-trampoline/actions) -1. Once the build is complete it will create a new release with all of the - assets and suggested release notes. -1. Update the changelog to whatever makes sense for this release. It should be - focused on user-facing changes. -1. Confirm all assets are uploaded for all the supported platforms. -1. Merge the Pull Request into `main` and you're done :tada: From 0476fe4f990bca0ac813fc86b445d6d402ddcd04 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 26 Mar 2025 16:29:14 +0100 Subject: [PATCH 0264/1338] Remove index.d.ts file --- vendor/desktop-trampoline/index.d.ts | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 vendor/desktop-trampoline/index.d.ts diff --git a/vendor/desktop-trampoline/index.d.ts b/vendor/desktop-trampoline/index.d.ts deleted file mode 100644 index 6ce67684fdc..00000000000 --- a/vendor/desktop-trampoline/index.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export function getDesktopAskpassTrampolinePath(): string -export function getDesktopAskpassTrampolineFilename(): string - -export function getDesktopCredentialHelperTrampolinePath(): string -export function getDesktopCredentialHelperTrampolineFilename(): string - -export function getSSHWrapperPath(): string -export function getSSHWrapperFilename(): string From 520efac937213708e54a732ea96dea7ffdd130f9 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Mar 2025 15:50:32 +0100 Subject: [PATCH 0265/1338] Run tests on Windows/x64 and macOS/arm64 --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f10d52bb576..80585c2a8f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,15 +114,14 @@ jobs: npm_config_arch: ${{ matrix.arch }} TARGET_ARCH: ${{ matrix.arch }} - name: Prepare testing environment - if: matrix.arch == 'x64' run: yarn test:setup env: npm_config_arch: ${{ matrix.arch }} - name: Run unit tests - if: matrix.arch == 'x64' + if: | + (runner.os == 'Windows' && matrix.arch == 'x64') || (runner.os == 'macOS' && matrix.arch == 'arm64') run: yarn test:unit - name: Run script tests - if: matrix.arch == 'x64' run: yarn test:script - name: Install Azure Code Signing Client if: ${{ runner.os == 'Windows' && inputs.sign }} From 8a48ef467669581834be4248e8d995b4e3b02453 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:19:55 +0100 Subject: [PATCH 0266/1338] Remove unused test review scripts --- package.json | 1 - script/review-logs.ts | 44 ------------------------------------------- script/test-review.ts | 22 ---------------------- script/test-setup.ts | 8 -------- 4 files changed, 75 deletions(-) delete mode 100644 script/review-logs.ts delete mode 100644 script/test-review.ts diff --git a/package.json b/package.json index 932e4c8f988..fee080099bc 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "test:script": "jest --silent --config ./script/jest.config.js", "test": "yarn test:unit --runInBand && yarn test:script", "test:setup": "ts-node -P script/tsconfig.json script/test-setup.ts", - "test:review": "ts-node -P script/tsconfig.json script/test-review.ts", "postinstall": "ts-node -P script/tsconfig.json script/post-install.ts", "start": "cross-env NODE_ENV=development ts-node -P script/tsconfig.json script/start.ts", "start:prod": "cross-env NODE_ENV=production ts-node -P script/tsconfig.json script/start.ts", diff --git a/script/review-logs.ts b/script/review-logs.ts deleted file mode 100644 index 61d54824f84..00000000000 --- a/script/review-logs.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* eslint-disable no-sync */ - -import * as fs from 'fs' -import * as path from 'path' -import * as os from 'os' -import { getProductName } from '../app/package-info' -import { getExecutableName } from './dist-info' - -function getUserDataPath() { - if (process.platform === 'win32') { - if (process.env.APPDATA) { - return path.join(process.env.APPDATA, getExecutableName()) - } else { - throw new Error( - `Unable to find the application data directory on Windows :(` - ) - } - } else if (process.platform === 'darwin') { - const home = os.homedir() - return path.join(home, 'Library', 'Application Support', getProductName()) - } else if (process.platform === 'linux') { - if (process.env.XDG_CONFIG_HOME) { - return path.join(process.env.XDG_CONFIG_HOME, getProductName()) - } - const home = os.homedir() - return path.join(home, '.config', getProductName()) - } else { - throw new Error( - `I dunno how to resolve the user data path for ${process.platform} ${process.arch} :(` - ) - } -} - -export function getLogFiles(): ReadonlyArray { - const directory = path.join(getUserDataPath(), 'logs') - if (!fs.existsSync(directory)) { - return [] - } - - const fileNames = fs.readdirSync(directory) - return fileNames - .filter(fileName => fileName.endsWith('.log')) - .map(fileName => path.join(directory, fileName)) -} diff --git a/script/test-review.ts b/script/test-review.ts deleted file mode 100644 index ecc82d1427b..00000000000 --- a/script/test-review.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* eslint-disable no-sync */ - -import * as fs from 'fs' -import { getLogFiles } from './review-logs' - -function reviewLogs() { - getLogFiles().forEach(file => { - console.log(`opening ${file}:`) - const text = fs.readFileSync(file, 'utf-8') - console.log(text) - }) -} - -if (process.platform === 'darwin') { - reviewLogs() -} - -if (process.platform === 'win32') { - if (process.env.APPVEYOR_TEST_RESULT !== '0') { - reviewLogs() - } -} diff --git a/script/test-setup.ts b/script/test-setup.ts index 295a5ccf019..4bc3243c718 100644 --- a/script/test-setup.ts +++ b/script/test-setup.ts @@ -1,8 +1,6 @@ /* eslint-disable no-sync */ -import * as fs from 'fs' import * as cp from 'child_process' -import { getLogFiles } from './review-logs' import { getProductName } from '../app/package-info' import { getDistPath, isPublishable } from './dist-info' import { isGitHubActions } from './build-platforms' @@ -20,9 +18,3 @@ if (isGitHubActions() && process.platform === 'darwin' && isPublishable()) { const output = cp.execSync('git config -l --show-origin', { encoding: 'utf-8' }) console.log(`Git config:\n${output}\n\n`) - -// delete existing log files -getLogFiles().forEach(file => { - console.log(`deleting ${file}`) - fs.unlinkSync(file) -}) From 2dbb737dbdae9b5742c85eb7223c3868cfc43413 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:33:56 +0100 Subject: [PATCH 0267/1338] Use Date mocking instead of hacky global modification --- app/test/unit/desktop-file-transport-test.ts | 91 +++++++++----------- 1 file changed, 41 insertions(+), 50 deletions(-) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index e5c95c43e7a..186a875a161 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -27,34 +27,29 @@ describe('DesktopFileTransport', () => { t.close() }) - it('creates a file for each day', async () => { - const originalToISOString = Date.prototype.toISOString - const globalDate = globalThis.Date as any + it('creates a file for each day', async t => { + t.mock.timers.enable({ apis: ['Date'] }) + const d = await createTempDirectory('desktop-logs') - const t = new DesktopFileTransport({ logDirectory: d }) + const transport = new DesktopFileTransport({ logDirectory: d }) - try { - assert.equal((await readdir(d)).length, 0) + assert.equal((await readdir(d)).length, 0) - globalDate.prototype.toISOString = () => '2022-03-10T10:00:00.000Z' - await info(t, 'heyo') + t.mock.timers.setTime(Date.parse('2022-03-10T10:00:00.000Z')) + await info(transport, 'heyo') - globalDate.prototype.toISOString = () => '2022-03-11T11:00:00.000Z' - await info(t, 'heyo') + t.mock.timers.setTime(Date.parse('2022-03-11T11:00:00.000Z')) + await info(transport, 'heyo') - assert.equal((await readdir(d)).length, 2) + assert.equal((await readdir(d)).length, 2) - t.close() - } finally { - globalDate.toISOString = originalToISOString - } + transport.close() }) - it('retains a maximum of 14 log files', async () => { - const originalToISOString = Date.prototype.toISOString - const globalDate = globalThis.Date as any + it('retains a maximum of 14 log files', async t => { + t.mock.timers.enable({ apis: ['Date'] }) const d = await createTempDirectory('desktop-logs') - const t = new DesktopFileTransport({ logDirectory: d }) + const transport = new DesktopFileTransport({ logDirectory: d }) const dates = [ '2022-03-01T10:00:00.000Z', @@ -79,37 +74,33 @@ describe('DesktopFileTransport', () => { '2022-03-20T10:00:00.000Z', ] - try { - assert.equal((await readdir(d)).length, 0) - for (const date of dates) { - globalDate.prototype.toISOString = () => date - await info(t, 'heyo') - } - - const retainedFiles = await readdir(d) - assert.equal(retainedFiles.length, 14) - - // Retains the newest files (ISO date is lexicographically sortable) - assert.deepStrictEqual(retainedFiles.sort(), [ - '2022-03-07.desktop.development.log', - '2022-03-08.desktop.development.log', - '2022-03-09.desktop.development.log', - '2022-03-10.desktop.development.log', - '2022-03-11.desktop.development.log', - '2022-03-12.desktop.development.log', - '2022-03-13.desktop.development.log', - '2022-03-14.desktop.development.log', - '2022-03-15.desktop.development.log', - '2022-03-16.desktop.development.log', - '2022-03-17.desktop.development.log', - '2022-03-18.desktop.development.log', - '2022-03-19.desktop.development.log', - '2022-03-20.desktop.development.log', - ]) - - t.close() - } finally { - globalDate.prototype.toISOString = originalToISOString + assert.equal((await readdir(d)).length, 0) + for (const date of dates) { + t.mock.timers.setTime(Date.parse(date)) + await info(transport, 'heyo') } + + const retainedFiles = await readdir(d) + assert.equal(retainedFiles.length, 14) + + // Retains the newest files (ISO date is lexicographically sortable) + assert.deepStrictEqual(retainedFiles.sort(), [ + '2022-03-07.desktop.development.log', + '2022-03-08.desktop.development.log', + '2022-03-09.desktop.development.log', + '2022-03-10.desktop.development.log', + '2022-03-11.desktop.development.log', + '2022-03-12.desktop.development.log', + '2022-03-13.desktop.development.log', + '2022-03-14.desktop.development.log', + '2022-03-15.desktop.development.log', + '2022-03-16.desktop.development.log', + '2022-03-17.desktop.development.log', + '2022-03-18.desktop.development.log', + '2022-03-19.desktop.development.log', + '2022-03-20.desktop.development.log', + ]) + + transport.close() }) }) From 0bde1f5cf27682a6bcd5c0d4bf6ca73e58c330ab Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:34:11 +0100 Subject: [PATCH 0268/1338] Support passing command line switches such as --test-name-pattern --- script/test.mjs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/test.mjs b/script/test.mjs index fa6b7247772..4081a1d45e0 100644 --- a/script/test.mjs +++ b/script/test.mjs @@ -25,10 +25,13 @@ async function findTestFilesIn(paths) { return files } +const fileArgs = process.argv.slice(2).filter(a => !a.startsWith('--')) +const switchArgs = process.argv.slice(2).filter(a => a.startsWith('--')) + const projectRoot = join(import.meta.dirname, '..') const files = - process.argv.length > 2 - ? await findTestFilesIn(process.argv.slice(2)) + fileArgs.length > 0 + ? await findTestFilesIn(fileArgs) : await findTestFilesIn([join(projectRoot, 'app', 'test', 'unit')]) // I would _looooove_ to use the `--env-file` option, but it doesn't override @@ -45,6 +48,7 @@ const args = [ ...['--import', 'tsx'], ...['--import', './app/test/__mocks__/electron.mjs'], ...['--import', './app/test/globals.ts'], + ...switchArgs, '--test', ...reporter('spec'), ...(process.env.GITHUB_ACTIONS ? reporter('node-test-github-reporter') : []), From bfb2c6ebc8715d1c8266280f60708e5f54b729ec Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:41:06 +0100 Subject: [PATCH 0269/1338] :art: cleanup --- script/test.mjs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/script/test.mjs b/script/test.mjs index 4081a1d45e0..cb9f7745b9c 100644 --- a/script/test.mjs +++ b/script/test.mjs @@ -36,11 +36,8 @@ const files = // I would _looooove_ to use the `--env-file` option, but it doesn't override // existing environment variables and we need to override some of them. -Object.entries( - parseEnv(await readFile(join(import.meta.dirname, '..', '.test.env'), 'utf8')) -).forEach(([k, v]) => { - process.env[k] = v -}) +const testEnv = parseEnv(await readFile(join(projectRoot, '.test.env'), 'utf8')) +Object.entries(testEnv).forEach(([k, v]) => (process.env[k] = v)) const args = [ '--disable-warning=ExperimentalWarning', From 4a02ddc65a28a90e4e6d4639d81eb25ee8c8b7de Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:46:29 +0100 Subject: [PATCH 0270/1338] Remove unused setimmediate --- app/test/globals.ts | 1 - package.json | 1 - yarn.lock | 5 ----- 3 files changed, 7 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index 7690d04c09a..1852c13af26 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -8,7 +8,6 @@ jsdom(undefined, { // shims a bunch of browser specific methods // like fetch, requestIdleCallback, etc import 'airbnb-browser-shims/browser-only' -import 'setimmediate' import { join } from 'path' import { readFileSync } from 'fs' diff --git a/package.json b/package.json index 45e4fd1c333..bae81415f23 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,6 @@ "@types/request": "^2.0.9", "@types/reserved-words": "^0.1.0", "@types/semver": "^5.5.0", - "@types/setimmediate": "^1.0.4", "@types/source-map-support": "^0.5.2", "@types/split2": "^4.2.3", "@types/strip-ansi": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 035d7806c97..d7fcef698d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1220,11 +1220,6 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@types/setimmediate@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/setimmediate/-/setimmediate-1.0.4.tgz#c863c763c284ceaf8d31ec1b29362a889864da4f" - integrity sha512-rWPw1drMVf5zInxNpgH3nn/h6KkWqwgLT2y/ciAYQ16RAsbXOXe0AmtZ/HyzwPNw+r4GMJuI7IV7YNKO7Fs/xA== - "@types/source-map-support@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@types/source-map-support/-/source-map-support-0.5.2.tgz#35e7446d470e63ec3fff4d7eceee0bc40efad239" From bd6180a6951f8dfb368e4a96a064e392e4588d85 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:50:12 +0100 Subject: [PATCH 0271/1338] Remove airbnb-browser-shims, not necessary to run suite --- app/test/globals.ts | 4 - package.json | 1 - yarn.lock | 291 +------------------------------------------- 3 files changed, 3 insertions(+), 293 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index 1852c13af26..ec41e9c31ab 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -5,10 +5,6 @@ jsdom(undefined, { url: 'http://localhost', }) -// shims a bunch of browser specific methods -// like fetch, requestIdleCallback, etc -import 'airbnb-browser-shims/browser-only' - import { join } from 'path' import { readFileSync } from 'fs' diff --git a/package.json b/package.json index bae81415f23..4c939fa21ce 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "@typescript-eslint/experimental-utils": "^5.62.0", "@typescript-eslint/parser": "^6.13.2", "@typescript-eslint/typescript-estree": "^6.13.2", - "airbnb-browser-shims": "^3.0.0", "awesome-node-loader": "^1.1.1", "chalk": "^5.3.0", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index d7fcef698d5..5aabd028b0f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1734,44 +1734,6 @@ agent-base@^7.1.2: resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== -airbnb-browser-shims@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/airbnb-browser-shims/-/airbnb-browser-shims-3.0.0.tgz#7978e65fa106f7436a6ae2cad9ad871982e13c7d" - integrity sha512-cJkz3uIj5eGhciOtfMG16BYtjaqUHmmXkVWJ308sx1XbGKnFtrtGoT6EZMDEvM4lQNTZ5qnJ7LeP2nz/hD80ZA== - dependencies: - airbnb-js-shims "^2.0.0" - classlist-polyfill "^1.2.0" - console-polyfill "^0.3.0" - element-closest "^2.0.2" - ima-babel6-polyfill "^0.12.0" - matchmedia-polyfill "^0.3.1" - raf "^3.4.0" - ric-shim "^1.0.0" - smoothscroll-polyfill "^0.3.6" - whatwg-fetch "^0.11.1" - window-location-origin "^0.1.0" - -airbnb-js-shims@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-2.1.1.tgz#a509611480db7e6d9db62fe2acfaeb473b6842ac" - integrity sha512-h8UtyB/TCdOwWoEPQJGHgsWwSnTqPrRZbhyZYjAwY9/AbjdjfkKy9L/T3fIFS6MKX8YrpWFRm6xqFSgU+2DRGw== - dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" - array.prototype.flatmap "^1.2.1" - es5-shim "^4.5.10" - es6-shim "^0.35.3" - function.prototype.name "^1.1.0" - object.entries "^1.0.4" - object.fromentries "^1.0.0" - object.getownpropertydescriptors "^2.0.3" - object.values "^1.0.4" - promise.prototype.finally "^3.1.0" - string.prototype.matchall "^3.0.0" - string.prototype.padend "^3.0.0" - string.prototype.padstart "^3.0.0" - symbol.prototype.description "^1.0.0" - ajv-formats@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" @@ -1911,14 +1873,6 @@ array-buffer-byte-length@^1.0.0: call-bind "^1.0.2" is-array-buffer "^3.0.1" -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - array-includes@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" @@ -1957,15 +1911,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array.prototype.flat@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4" - integrity sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.10.0" - function-bind "^1.1.1" - array.prototype.flat@^1.2.5: version "1.3.0" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b" @@ -1986,15 +1931,6 @@ array.prototype.flat@^1.3.1: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.1.tgz#3103cd4826ef90019c9b0a4839b2535fa6faf4e9" - integrity sha512-i18e2APdsiezkcqDyZor78Pbfjfds3S94dG6dgIV2ZASJaUf1N0dz2tGdrmwrmlZuNUgxH+wz6Z0zYVH2c5xzQ== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.10.0" - function-bind "^1.1.1" - array.prototype.flatmap@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" @@ -2322,11 +2258,6 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= -classlist-polyfill@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz#935bc2dfd9458a876b279617514638bcaa964a2e" - integrity sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4= - clean-css@^5.2.2: version "5.3.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd" @@ -2431,11 +2362,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -console-polyfill@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/console-polyfill/-/console-polyfill-0.3.0.tgz#84900902a18c47a5eba932be75fa44d23e8af861" - integrity sha512-w+JSDZS7XML43Xnwo2x5O5vxB0ID7T5BdqDtyqT6uiCAX2kZAgcWxNaGqT97tZfSHzfOcvrfsDAodKcJ3UvnXQ== - convert-source-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" @@ -2615,7 +2541,7 @@ define-data-property@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" -define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -2820,11 +2746,6 @@ electron@34.0.1: "@types/node" "^20.9.0" extract-zip "^2.0.1" -element-closest@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/element-closest/-/element-closest-2.0.2.tgz#72a740a107453382e28df9ce5dbb5a8df0f966ec" - integrity sha1-cqdAoQdFM4LijfnOXbtajfD5Zuw= - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -2904,17 +2825,6 @@ error-stack-parser@^2.1.4: dependencies: stackframe "^1.3.4" -es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.9.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" - integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA== - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" @@ -3015,17 +2925,6 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.11" -es-abstract@^1.5.1, es-abstract@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" - integrity sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q== - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - es-define-property@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" @@ -3099,15 +2998,6 @@ es-shim-unscopables@^1.0.0: dependencies: has "^1.0.3" -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" - integrity sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= - dependencies: - is-callable "^1.1.1" - is-date-object "^1.0.1" - is-symbol "^1.0.1" - es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -3117,21 +3007,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-shim@^4.5.10: - version "4.5.11" - resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.11.tgz#f7406770b0eee9ecb717e306b018728114e4e47d" - integrity sha512-7NY8JWNUZGpg+Ade2/ufJ9N6uMCiII5Oyf1H89/AuJKjYqUBU7i5bSnz0rOcIjNzQkvPJ+TfP19BTDP2FJg9pg== - es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -es6-shim@^0.35.3: - version "0.35.3" - resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26" - integrity sha1-m/tzY/7//4emzbbNk+QF7DxLbyY= - esbuild@~0.25.0: version "0.25.1" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.1.tgz#a16b8d070b6ad4871935277bda6ccfe852e3fa2f" @@ -3777,7 +3657,7 @@ fsevents@~2.3.3: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -3787,15 +3667,6 @@ function-bind@^1.1.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327" - integrity sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg== - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - is-callable "^1.1.3" - function.prototype.name@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" @@ -4158,11 +4029,6 @@ has-proto@^1.0.1: resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= - has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" @@ -4197,13 +4063,6 @@ has-tostringtag@^1.0.2: dependencies: has-symbols "^1.0.3" -has@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg= - dependencies: - function-bind "^1.0.2" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -4350,11 +4209,6 @@ ignore@^5.3.1: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== -ima-babel6-polyfill@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/ima-babel6-polyfill/-/ima-babel6-polyfill-0.12.0.tgz#18aa1e4e898b80eddd89fa696e67c75a14e26228" - integrity sha1-GKoeTomLgO3difppbmfHWhTiYig= - import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -4459,7 +4313,7 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-callable@^1.1.1, is-callable@^1.1.3: +is-callable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" integrity sha1-hut1OSgF3cM69xySoO7fdO52BLI= @@ -4580,13 +4434,6 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - dependencies: - has "^1.0.1" - is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -4624,11 +4471,6 @@ is-string@^1.0.7: dependencies: has-tostringtag "^1.0.0" -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" - integrity sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= - is-symbol@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -5175,11 +5017,6 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" -matchmedia-polyfill@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/matchmedia-polyfill/-/matchmedia-polyfill-0.3.1.tgz#83e754b3b4a297179fcdb71c3aefa0980bff7b18" - integrity sha512-3zLYw2mf078kXzJv/At7FzWC4O5BAtiy+D4sRevC/lewLlhMtVHDS35eWhlP+fQzI/UUiBVu+ez0rsJJzW88iQ== - math-intrinsics@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" @@ -5451,16 +5288,6 @@ object.assign@^4.1.3, object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f" - integrity sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - object.entries@^1.1.6: version "1.1.7" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" @@ -5470,16 +5297,6 @@ object.entries@^1.1.6: define-properties "^1.2.0" es-abstract "^1.22.1" -object.fromentries@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-1.0.0.tgz#e90ec27445ec6e37f48be9af9077d9aa8bef0d40" - integrity sha512-F7XUm84lg0uNXNzrRAC5q8KJe0yYaxgLU9hTSqWYM6Rfnh0YjP24EG3xq7ncj2Wu1AdfueNHKCOlamIonG4UHQ== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.11.0" - function-bind "^1.1.1" - has "^1.0.1" - object.fromentries@^2.0.6: version "2.0.7" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" @@ -5489,14 +5306,6 @@ object.fromentries@^2.0.6: define-properties "^1.2.0" es-abstract "^1.22.1" -object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" - object.hasown@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" @@ -5505,16 +5314,6 @@ object.hasown@^1.1.2: define-properties "^1.2.0" es-abstract "^1.22.1" -object.values@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a" - integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - object.values@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" @@ -5723,11 +5522,6 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - picocolors@^1.0.0, picocolors@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" @@ -5846,15 +5640,6 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise.prototype.finally@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e" - integrity sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.9.0" - function-bind "^1.1.1" - prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" @@ -5892,13 +5677,6 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== -raf@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575" - integrity sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw== - dependencies: - performance-now "^2.1.0" - randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -6000,13 +5778,6 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== -regexp.prototype.flags@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c" - integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA== - dependencies: - define-properties "^1.1.2" - regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -6103,11 +5874,6 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -ric-shim@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ric-shim/-/ric-shim-1.0.0.tgz#a20a8edfcbd05f304b58a1b52a846d53baccacf4" - integrity sha1-ogqO38vQXzBLWKG1KoRtU7rMrPQ= - rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -6367,11 +6133,6 @@ slide@~1.1.3: resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= -smoothscroll-polyfill@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.6.tgz#492be845195157cdc2fc529a95d89e7a71509172" - integrity sha1-SSvoRRlRV83C/FKaldieenFQkXI= - source-map-js@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" @@ -6474,17 +6235,6 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.matchall@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.0.tgz#66f4d8dd5c6c6cea4dffb55ec5f3184a8dd0dd59" - integrity sha512-/g0YW/cEfXASRHAaLR7VZbTUlxgP14fmCsfSRFG2gvlG2S1q9rBpjYnEy/EIIzY+bjzs2nTfAHJYXmQ+zTnXSQ== - dependencies: - define-properties "^1.1.2" - es-abstract "^1.12.0" - function-bind "^1.1.1" - has-symbols "^1.0.0" - regexp.prototype.flags "^1.2.0" - string.prototype.matchall@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" @@ -6500,24 +6250,6 @@ string.prototype.matchall@^4.0.8: set-function-name "^2.0.0" side-channel "^1.0.4" -string.prototype.padend@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" - integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.4.3" - function-bind "^1.0.2" - -string.prototype.padstart@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz#5bcfad39f4649bb2d031292e19bcf0b510d4b242" - integrity sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.4.3" - function-bind "^1.0.2" - string.prototype.trim@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" @@ -6682,13 +6414,6 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -symbol.prototype.description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.0.tgz#6e355660eb1e44ca8ad53a68fdb72ef131ca4b12" - integrity sha512-I9mrbZ5M96s7QeJDv95toF1svkUjeBybe8ydhY7foPaBmr0SPJMFupArmMkDrOKTTj0sJVr+nvQNxWLziQ7nDQ== - dependencies: - has-symbols "^1.0.0" - synckit@^0.9.1: version "0.9.2" resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62" @@ -7224,11 +6949,6 @@ whatwg-encoding@^3.1.1: dependencies: iconv-lite "0.6.3" -whatwg-fetch@^0.11.1: - version "0.11.1" - resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.1.tgz#6d3ded245fdd97cd728e0e2587b54b733949e663" - integrity sha1-bT3tJF/dl81yjg4lh7VLczlJ5mM= - whatwg-mimetype@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" @@ -7315,11 +7035,6 @@ wildcard@^2.0.1: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -window-location-origin@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-location-origin/-/window-location-origin-0.1.0.tgz#e0a0b3cbe8802c4966b358f859315355d3a15e04" - integrity sha1-4KCzy+iALElms1j4WTFTVdOhXgQ= - worker-farm@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1" From 09bd8b6ae9849c50285aeff6d3bfe64278ca101d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:50:43 +0100 Subject: [PATCH 0272/1338] DOMRect exists in JSDom --- app/test/globals.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index ec41e9c31ab..1ea12111da7 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -29,11 +29,6 @@ g['log'] = { debug: () => {}, } as IDesktopLogger -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -g.DOMRect = class DOMRect { - public constructor() {} -} - g.ResizeObserver = class ResizeObserver { public constructor(cb: any) { ;(this as any).cb = cb From 3941ebe95d65d164880d81fbd3e940866558431b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 08:52:12 +0100 Subject: [PATCH 0273/1338] As of #18712 no longer attempt to render so we can remove this as well --- app/test/globals.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index 1ea12111da7..bf99ebe72e7 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -29,18 +29,6 @@ g['log'] = { debug: () => {}, } as IDesktopLogger -g.ResizeObserver = class ResizeObserver { - public constructor(cb: any) { - ;(this as any).cb = cb - } - - public observe() { - ;(this as any).cb([{ borderBoxSize: { inlineSize: 0, blockSize: 0 } }]) - } - - public unobserve() {} -} - // structuredClone doesn't exist in JSDOM, see: // https://github.com/jsdom/jsdom/issues/3363 globalThis.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x)) From 7026f084a1807ca3124689d0075d8a04f134f693 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:00:09 +0100 Subject: [PATCH 0274/1338] structuredClone exists in Node these days --- app/test/globals.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index bf99ebe72e7..76f9ffdbf56 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -29,10 +29,6 @@ g['log'] = { debug: () => {}, } as IDesktopLogger -// structuredClone doesn't exist in JSDOM, see: -// https://github.com/jsdom/jsdom/issues/3363 -globalThis.structuredClone ??= (x: any) => JSON.parse(JSON.stringify(x)) - // The following types are part of the WebWorker support in Node.js and are a // common source of hangs in tests due to libraries creating them but not // properly cleaning them up. See for example From 693dc29ff370aacb7c1b97bbb41b6bb2d67bb053 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:06:58 +0100 Subject: [PATCH 0275/1338] :art: cleanup --- app/test/globals.ts | 60 ++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/app/test/globals.ts b/app/test/globals.ts index 76f9ffdbf56..17147588acf 100644 --- a/app/test/globals.ts +++ b/app/test/globals.ts @@ -10,35 +10,39 @@ import { readFileSync } from 'fs' // These constants are defined by Webpack at build time, but since tests aren't // built with Webpack we need to make sure these exist at runtime. -const g: any = globalThis -g['__WIN32__'] = process.platform === 'win32' -g['__DARWIN__'] = process.platform === 'darwin' -g['__LINUX__'] = process.platform === 'linux' -g['__APP_VERSION__'] = JSON.parse( +const packageInfo = JSON.parse( readFileSync(join(__dirname, '../package.json'), 'utf8') ).version -g['__DEV__'] = 'false' -g['__RELEASE_CHANNEL__'] = 'development' -g['__UPDATES_URL__'] = '' -g['__SHA__'] = 'test' -g['log'] = { - error: () => {}, - warn: () => {}, - info: () => {}, - debug: () => {}, -} as IDesktopLogger +Object.assign(globalThis, { + __DEV__: false, + __DEV_SECRETS__: false, + __APP_NAME__: packageInfo.productName, + __APP_VERSION__: packageInfo.version, + __RELEASE_CHANNEL__: 'development', + __UPDATES_URL__: '', + __SHA__: 'test', + __DARWIN__: process.platform === 'darwin', + __WIN32__: process.platform === 'win32', + __LINUX__: process.platform === 'linux', + log: { + error: () => {}, + warn: () => {}, + info: () => {}, + debug: () => {}, + } as IDesktopLogger, -// The following types are part of the WebWorker support in Node.js and are a -// common source of hangs in tests due to libraries creating them but not -// properly cleaning them up. See for example -// https://github.com/facebook/react/issues/20756, and -// https://github.com/dexie/Dexie.js/pull/1577. -// -// We've upgraded Dexie already but react-dom is a bigger beast and we don't -// need any of them to run our tests so we just delete them here. In fact, -// this is exactly what the react-16-node-hanging-test-fix patch does, see -// https://www.npmjs.com/package/react-16-node-hanging-test-fix?activeTab=code -delete g['MessageChannel'] -delete g['MessagePort'] -delete g['BroadcastChannel'] + // The following types are part of the WebWorker support in Node.js and are a + // common source of hangs in tests due to libraries creating them but not + // properly cleaning them up. See for example + // https://github.com/facebook/react/issues/20756, and + // https://github.com/dexie/Dexie.js/pull/1577. + // + // We've upgraded Dexie already but react-dom is a bigger beast and we don't + // need any of them to run our tests so we just delete them here. In fact, + // this is exactly what the react-16-node-hanging-test-fix patch does, see + // https://www.npmjs.com/package/react-16-node-hanging-test-fix?activeTab=code + MessageChannel: undefined, + MessagePort: undefined, + BroadcastChannel: undefined, +}) From bc9f492e5dac2ba13ec45467c0ef0dd0cb47065c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:11:02 +0100 Subject: [PATCH 0276/1338] Switch to .mts to allow top-level await --- app/test/{globals.ts => globals.mts} | 13 ++----------- script/test.mjs | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) rename app/test/{globals.ts => globals.mts} (84%) diff --git a/app/test/globals.ts b/app/test/globals.mts similarity index 84% rename from app/test/globals.ts rename to app/test/globals.mts index 17147588acf..f0a91abf9ad 100644 --- a/app/test/globals.ts +++ b/app/test/globals.mts @@ -1,18 +1,9 @@ import 'fake-indexeddb/auto' -import jsdom from 'global-jsdom' - -jsdom(undefined, { - url: 'http://localhost', -}) - -import { join } from 'path' -import { readFileSync } from 'fs' +import 'global-jsdom/register' // These constants are defined by Webpack at build time, but since tests aren't // built with Webpack we need to make sure these exist at runtime. -const packageInfo = JSON.parse( - readFileSync(join(__dirname, '../package.json'), 'utf8') -).version +const packageInfo = await import('../package.json') Object.assign(globalThis, { __DEV__: false, diff --git a/script/test.mjs b/script/test.mjs index cb9f7745b9c..030925574f1 100644 --- a/script/test.mjs +++ b/script/test.mjs @@ -44,7 +44,7 @@ const args = [ '--experimental-test-module-mocks', ...['--import', 'tsx'], ...['--import', './app/test/__mocks__/electron.mjs'], - ...['--import', './app/test/globals.ts'], + ...['--import', './app/test/globals.mts'], ...switchArgs, '--test', ...reporter('spec'), From 708d43b4952c97988a4c6c1474a3b3df6c48e91d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:11:46 +0100 Subject: [PATCH 0277/1338] Can't do that --- app/test/globals.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/globals.mts b/app/test/globals.mts index f0a91abf9ad..c0cb6256763 100644 --- a/app/test/globals.mts +++ b/app/test/globals.mts @@ -21,7 +21,7 @@ Object.assign(globalThis, { warn: () => {}, info: () => {}, debug: () => {}, - } as IDesktopLogger, + }, // The following types are part of the WebWorker support in Node.js and are a // common source of hangs in tests due to libraries creating them but not From f61578e8edbfc3aaf8b70a1e347db5bfa8caa08e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:13:24 +0100 Subject: [PATCH 0278/1338] Move electron mock into globals now that it's a module --- app/test/__mocks__/electron.mjs | 27 --------------------------- app/test/globals.mts | 27 +++++++++++++++++++++++++++ script/test.mjs | 1 - 3 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 app/test/__mocks__/electron.mjs diff --git a/app/test/__mocks__/electron.mjs b/app/test/__mocks__/electron.mjs deleted file mode 100644 index b20e6c60937..00000000000 --- a/app/test/__mocks__/electron.mjs +++ /dev/null @@ -1,27 +0,0 @@ -import { mock } from 'node:test' - -mock.module('electron', { - namedExports: { - shell: { - trashItem: mock.fn(async () => {}), - }, - remote: { - app: { - on: mock.fn(() => {}), - }, - autoUpdater: { - on: mock.fn(() => {}), - }, - nativeTheme: { - addListener: mock.fn(() => {}), - removeAllListeners: mock.fn(() => {}), - shouldUseDarkColors: true, - }, - }, - ipcRenderer: { - on: mock.fn(x => {}), - send: mock.fn(() => {}), - invoke: mock.fn(() => {}), - }, - }, -}) diff --git a/app/test/globals.mts b/app/test/globals.mts index c0cb6256763..a7be1876119 100644 --- a/app/test/globals.mts +++ b/app/test/globals.mts @@ -1,5 +1,6 @@ import 'fake-indexeddb/auto' import 'global-jsdom/register' +import { mock } from 'node:test' // These constants are defined by Webpack at build time, but since tests aren't // built with Webpack we need to make sure these exist at runtime. @@ -37,3 +38,29 @@ Object.assign(globalThis, { MessagePort: undefined, BroadcastChannel: undefined, }) + +mock.module('electron', { + namedExports: { + shell: { + trashItem: mock.fn(async () => {}), + }, + remote: { + app: { + on: mock.fn(() => {}), + }, + autoUpdater: { + on: mock.fn(() => {}), + }, + nativeTheme: { + addListener: mock.fn(() => {}), + removeAllListeners: mock.fn(() => {}), + shouldUseDarkColors: true, + }, + }, + ipcRenderer: { + on: mock.fn(x => {}), + send: mock.fn(() => {}), + invoke: mock.fn(() => {}), + }, + }, +}) diff --git a/script/test.mjs b/script/test.mjs index 030925574f1..c45f33ccccf 100644 --- a/script/test.mjs +++ b/script/test.mjs @@ -43,7 +43,6 @@ const args = [ '--disable-warning=ExperimentalWarning', '--experimental-test-module-mocks', ...['--import', 'tsx'], - ...['--import', './app/test/__mocks__/electron.mjs'], ...['--import', './app/test/globals.mts'], ...switchArgs, '--test', From 7104219bf9b945a9019a92e57dcf34779ffba7a0 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:32:21 +0100 Subject: [PATCH 0279/1338] Minimal electron mock --- app/test/globals.mts | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/app/test/globals.mts b/app/test/globals.mts index a7be1876119..b33fab090c4 100644 --- a/app/test/globals.mts +++ b/app/test/globals.mts @@ -8,6 +8,7 @@ const packageInfo = await import('../package.json') Object.assign(globalThis, { __DEV__: false, + __TEST__: true, __DEV_SECRETS__: false, __APP_NAME__: packageInfo.productName, __APP_VERSION__: packageInfo.version, @@ -41,26 +42,7 @@ Object.assign(globalThis, { mock.module('electron', { namedExports: { - shell: { - trashItem: mock.fn(async () => {}), - }, - remote: { - app: { - on: mock.fn(() => {}), - }, - autoUpdater: { - on: mock.fn(() => {}), - }, - nativeTheme: { - addListener: mock.fn(() => {}), - removeAllListeners: mock.fn(() => {}), - shouldUseDarkColors: true, - }, - }, - ipcRenderer: { - on: mock.fn(x => {}), - send: mock.fn(() => {}), - invoke: mock.fn(() => {}), - }, + shell: {}, + ipcRenderer: { on: mock.fn(x => {}) }, }, }) From 70b67053934aa24a6b4e226313778ca1a84eb7c2 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 09:32:52 +0100 Subject: [PATCH 0280/1338] Don't import mock, import mts --- .vscode/launch.json | 4 +--- tsconfig.json | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 6b699e41012..ba5d81c8c60 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,7 @@ "--import", "tsx", "--import", - "${workspaceFolder}/app/test/__mocks__/electron.mjs", - "--import", - "${workspaceFolder}/app/test/globals.ts", + "${workspaceFolder}/app/test/globals.mts", "--test", "${relativeFile}" ], diff --git a/tsconfig.json b/tsconfig.json index 2fbed057219..972811e57b3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,13 @@ "lib": ["ES2023", "DOM", "DOM.Iterable"], "types": ["node"] }, - "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"], + "include": [ + "app/**/*.ts", + "app/**/*.tsx", + "app/**/*.d.tsx", + "app/test/globals.mts", + "app/test/globals.mts" + ], "exclude": [ "node_modules", "app/node_modules", From 5e6cdab704c0a20ef9f2cdd31ecdd41899879a03 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 10:01:23 +0100 Subject: [PATCH 0281/1338] Don't create a directory when generating temp file path --- app/src/lib/file-system.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/lib/file-system.ts b/app/src/lib/file-system.ts index 360f20397cd..e5c654b4045 100644 --- a/app/src/lib/file-system.ts +++ b/app/src/lib/file-system.ts @@ -1,20 +1,17 @@ -import * as Os from 'os' -import * as Path from 'path' import { Disposable } from 'event-kit' import { Tailer } from './tailer' import byline from 'byline' import { createReadStream } from 'fs' -import { mkdtemp } from 'fs/promises' +import { randomBytes } from 'crypto' +import { join } from 'path' +import { tmpdir } from 'os' /** * Get a path to a temp file using the given name. Note that the file itself * will not be created. */ -export async function getTempFilePath(name: string): Promise { - const tempDir = Path.join(Os.tmpdir(), `${name}-`) - const directory = await mkdtemp(tempDir) - return Path.join(directory, name) -} +export const getTempFilePath = (name: string) => + join(tmpdir(), `${name}-${randomBytes(8).toString('hex')}`) /** * Tail the file and call the callback on every line. From 84c39bfa5cba91a978e387b4330fa12885f7d50a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 10:14:50 +0100 Subject: [PATCH 0282/1338] Just check the folder array so we can get some more debug data on this flaky test --- app/test/unit/desktop-file-transport-test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 186a875a161..49c0106fcbf 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -81,7 +81,6 @@ describe('DesktopFileTransport', () => { } const retainedFiles = await readdir(d) - assert.equal(retainedFiles.length, 14) // Retains the newest files (ISO date is lexicographically sortable) assert.deepStrictEqual(retainedFiles.sort(), [ From ad3dcb89be10849487f356f8680527cfdc538d12 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 10:15:33 +0100 Subject: [PATCH 0283/1338] Less warnings --- .vscode/launch.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index ba5d81c8c60..90523b067ca 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,6 +6,7 @@ "request": "launch", "name": "Debug current test file", "args": [ + "--disable-warning=ExperimentalWarning", "--experimental-test-module-mocks", "--import", "tsx", From 164170ccf7ba8b63c4c40c9fd22f65a15b1bfee3 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 10:42:26 +0100 Subject: [PATCH 0284/1338] Wait until stream closes and opens before pruning This fixes the flakiness of the desktop-file-transport-test --- app/src/main-process/desktop-file-transport.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main-process/desktop-file-transport.ts b/app/src/main-process/desktop-file-transport.ts index 7bda371d672..5861d0ceeaf 100644 --- a/app/src/main-process/desktop-file-transport.ts +++ b/app/src/main-process/desktop-file-transport.ts @@ -48,9 +48,18 @@ export class DesktopFileTransport extends TransportStream { const path = getFilePath(this.logDirectory) if (this.stream === undefined || this.stream.path !== path) { - this.stream?.end() - this.stream = createWriteStream(path, { flags: 'a' }) - this.stream.on('error', error('stream error')) + if (this.stream !== undefined) { + await promisify(this.stream.end).call(this.stream).catch(error('end')) + await promisify(this.stream.close) + .call(this.stream) + .catch(error('close')) + } + const stream = (this.stream = createWriteStream(path, { flags: 'a' })) + + await new Promise((resolve, reject) => { + stream.on('open', resolve) + stream.on('error', reject) + }).catch(error('stream error')) await pruneDirectory(this.logDirectory).catch(error('prune')) } From 5f58048fbcaf77a8ec8cf008572e947d82bd0da8 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 27 Mar 2025 11:01:09 +0100 Subject: [PATCH 0285/1338] Rewrite desktop-trampoline tests in TypeScript and run them with node test runner instead of jest --- vendor/desktop-trampoline/package.json | 8 +- vendor/desktop-trampoline/script/test.mjs | 21 + .../test/desktop-trampoline-test.ts | 164 + .../test/desktop-trampoline.test.js | 153 - ...sh-wrapper.test.js => ssh-wrapper-test.ts} | 20 +- vendor/desktop-trampoline/yarn.lock | 4182 ++--------------- 6 files changed, 472 insertions(+), 4076 deletions(-) create mode 100644 vendor/desktop-trampoline/script/test.mjs create mode 100644 vendor/desktop-trampoline/test/desktop-trampoline-test.ts delete mode 100644 vendor/desktop-trampoline/test/desktop-trampoline.test.js rename vendor/desktop-trampoline/test/{ssh-wrapper.test.js => ssh-wrapper-test.ts} (65%) diff --git a/vendor/desktop-trampoline/package.json b/vendor/desktop-trampoline/package.json index fe39fa08f78..0a12c07f909 100644 --- a/vendor/desktop-trampoline/package.json +++ b/vendor/desktop-trampoline/package.json @@ -10,16 +10,18 @@ "build": "tsc", "install": "node-gyp rebuild && tsc", "lint": "prettier -c **/*.js **/*.md", - "lint:fix": "prettier --write **/*.js **/*.md" + "lint:fix": "prettier --write **/*.js **/*.md", + "test": "node script/test.mjs" }, "dependencies": { "node-addon-api": "^7.0.0" }, "devDependencies": { - "jest": "^27.5.0", + "node-test-github-reporter": "^1.2.0", + "tsx": "^4.10.5", "node-gyp": "^10.1.0", "typescript": "^5.4.5", - "prettier": "^2.5.1", + "prettier": "^3.3.1", "split2": "^4.1.0" }, "binary": { diff --git a/vendor/desktop-trampoline/script/test.mjs b/vendor/desktop-trampoline/script/test.mjs new file mode 100644 index 00000000000..d0e0e149263 --- /dev/null +++ b/vendor/desktop-trampoline/script/test.mjs @@ -0,0 +1,21 @@ +import { spawn } from 'child_process' +import { join } from 'path' +import { readdir } from 'fs/promises' + +function reporter(r) { + return ['--test-reporter', r, '--test-reporter-destination', 'stdout'] +} + +const files = await readdir('test', { recursive: true }).then(x => + x.filter(f => f.endsWith('-test.ts')).map(f => join('test', f)) +) + +const args = [ + ...['--import', 'tsx'], + '--test', + ...reporter('spec'), + ...(process.env.GITHUB_ACTIONS ? reporter('node-test-github-reporter') : []), + ...files, +] + +spawn('node', args, { stdio: 'inherit' }).on('exit', process.exit) diff --git a/vendor/desktop-trampoline/test/desktop-trampoline-test.ts b/vendor/desktop-trampoline/test/desktop-trampoline-test.ts new file mode 100644 index 00000000000..bdec5fb5786 --- /dev/null +++ b/vendor/desktop-trampoline/test/desktop-trampoline-test.ts @@ -0,0 +1,164 @@ +import { stat, access } from 'fs/promises' +import { constants } from 'fs' +import { execFile as execFileSync, ProcessEnvOptions } from 'child_process' +import { promisify } from 'util' +import { + getDesktopAskpassTrampolinePath, + getDesktopCredentialHelperTrampolinePath, +} from '../index' +import split2 from 'split2' +import { createServer } from 'net' +import assert from 'node:assert' +import { describe, it } from 'node:test' + +const askPassTrampolinePath = getDesktopAskpassTrampolinePath() +const helperTrampolinePath = getDesktopCredentialHelperTrampolinePath() +const execFile = promisify(execFileSync) + +function captureSession() { + const output: string[] = [] + let resolveOutput: (value: string[]) => void + + const outputPromise = new Promise(resolve => { + resolveOutput = resolve + }) + + const server = createServer(socket => { + let timeoutId: NodeJS.Timeout | null = null + socket.pipe(split2(/\0/)).on('data', data => { + output.push(data.toString('utf8')) + + // Hack: consider the session finished after 100ms of inactivity. + // In a real-world scenario, you'd have to parse the data to know when + // the session is finished. + if (timeoutId !== null) { + clearTimeout(timeoutId) + timeoutId = null + } + timeoutId = setTimeout(() => { + resolveOutput(output) + socket.end() + server.close() + }, 100) + }) + }) + + const serverPortPromise = new Promise((resolve, reject) => { + server.on('error', e => reject(e)) + server.listen(0, '127.0.0.1', () => { + const address = server.address() + if (address === null || typeof address === 'string') { + reject(new Error('Failed to get server address')) + return + } + resolve(address.port) + }) + }) + + return { + serverPortPromise, + outputPromise, + } +} + +describe('desktop-trampoline', () => { + it('exists and is a regular file', async () => + assert.equal((await stat(askPassTrampolinePath)).isFile(), true)) + + it('can be executed by current process', () => + assert.doesNotReject(access(askPassTrampolinePath, constants.X_OK))) + + it('fails when required environment variables are missing', () => + assert.rejects(execFile(askPassTrampolinePath, ['Username']))) + + + it('forwards arguments and valid environment variables correctly', async () => { + const {serverPortPromise, outputPromise} = captureSession() + const port = await serverPortPromise + + const env = { + DESKTOP_TRAMPOLINE_TOKEN: '123456', + DESKTOP_PORT: port.toString(), + INVALID_VARIABLE: 'foo bar', + } + const opts: ProcessEnvOptions = { env } + + await execFile(askPassTrampolinePath, ['baz'], opts) + + const output = await outputPromise + const outputArguments = output.slice(1, 2) + assert.deepEqual(outputArguments, ['baz']) + // output[2] is the number of env variables + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + assert.equal(outputEnv.length, 2) + assert.ok(outputEnv.includes('DESKTOP_TRAMPOLINE_TOKEN=123456')) + assert.ok(outputEnv.includes('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS')) + }) + + it('forwards stdin when running in credential-helper mode', async () => { + const { serverPortPromise, outputPromise } = captureSession() + const port = await serverPortPromise + + const cp = execFile(helperTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port.toString() }, + }) + cp.child.stdin?.end('oh hai\n') + + await cp + + const output = await outputPromise + assert.equal(output.at(-1), 'oh hai\n') + }) + + it("doesn't forward stdin when running in askpass mode", async () => { + const { serverPortPromise, outputPromise } = captureSession() + const port = await serverPortPromise + + const cp = execFile(askPassTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port.toString() }, + }) + cp.child.stdin?.end('oh hai\n') + + await cp + + const output = await outputPromise + assert.equal(output.at(-1), '') + }) + + it('askpass handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { + const { serverPortPromise, outputPromise } = captureSession() + const port = await serverPortPromise + + const cp = execFile(askPassTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port.toString(), DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, + }) + cp.child.stdin?.end('oh hai\n') + + await cp + + const output = await outputPromise + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + assert.ok(outputEnv.includes('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS')) + }) + + it('credential handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { + const { serverPortPromise, outputPromise } = captureSession() + const port = await serverPortPromise + + const cp = execFile(helperTrampolinePath, ['get'], { + env: { DESKTOP_PORT: port.toString(), DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, + }) + cp.child.stdin?.end('oh hai\n') + + await cp + + const output = await outputPromise + const envc = parseInt(output[2]) + const outputEnv = output.slice(3, 3 + envc) + assert.ok(outputEnv.includes( + 'DESKTOP_TRAMPOLINE_IDENTIFIER=CREDENTIALHELPER' + )) + }) +}) diff --git a/vendor/desktop-trampoline/test/desktop-trampoline.test.js b/vendor/desktop-trampoline/test/desktop-trampoline.test.js deleted file mode 100644 index db362cd04e7..00000000000 --- a/vendor/desktop-trampoline/test/desktop-trampoline.test.js +++ /dev/null @@ -1,153 +0,0 @@ -const { stat, access } = require('fs').promises -const { constants } = require('fs') -const { execFile } = require('child_process') -const { promisify } = require('util') -const { - getDesktopAskpassTrampolinePath, - getDesktopCredentialHelperTrampolinePath, -} = require('../index') -const split2 = require('split2') -const { createServer } = require('net') - -const askPassTrampolinePath = getDesktopAskpassTrampolinePath() -const helperTrampolinePath = getDesktopCredentialHelperTrampolinePath() -const run = promisify(execFile) - -describe('desktop-trampoline', () => { - it('exists and is a regular file', async () => - expect((await stat(askPassTrampolinePath)).isFile()).toBe(true)) - - it('can be executed by current process', () => - access(askPassTrampolinePath, constants.X_OK)) - - it('fails when required environment variables are missing', () => - expect(run(askPassTrampolinePath, ['Username'])).rejects.toThrow()) - - const captureSession = () => { - const output = [] - let resolveOutput = null - - const outputPromise = new Promise(resolve => { - resolveOutput = resolve - }) - - const server = createServer(socket => { - let timeoutId = null - socket.pipe(split2(/\0/)).on('data', data => { - output.push(data.toString('utf8')) - - // Hack: consider the session finished after 100ms of inactivity. - // In a real-world scenario, you'd have to parse the data to know when - // the session is finished. - if (timeoutId !== null) { - clearTimeout(timeoutId) - timeoutId = null - } - timeoutId = setTimeout(() => { - resolveOutput(output) - socket.end() - server.close() - }, 100) - }) - }) - - const serverPortPromise = new Promise((resolve, reject) => { - server.on('error', e => reject(e)) - server.listen(0, '127.0.0.1', () => { - resolve(server.address().port) - }) - }) - - return [serverPortPromise, outputPromise] - } - - it('forwards arguments and valid environment variables correctly', async () => { - const [portPromise, outputPromise] = captureSession() - const port = await portPromise - - const env = { - DESKTOP_TRAMPOLINE_TOKEN: '123456', - DESKTOP_PORT: port, - INVALID_VARIABLE: 'foo bar', - } - const opts = { env } - - await run(askPassTrampolinePath, ['baz'], opts) - - const output = await outputPromise - const outputArguments = output.slice(1, 2) - expect(outputArguments).toStrictEqual(['baz']) - // output[2] is the number of env variables - const envc = parseInt(output[2]) - const outputEnv = output.slice(3, 3 + envc) - expect(outputEnv).toHaveLength(2) - expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_TOKEN=123456') - expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS') - }) - - it('forwards stdin when running in credential-helper mode', async () => { - const [portPromise, outputPromise] = captureSession() - const port = await portPromise - - const cp = run(helperTrampolinePath, ['get'], { - env: { DESKTOP_PORT: port }, - }) - cp.child.stdin.end('oh hai\n') - - await cp - - const output = await outputPromise - expect(output.at(-1)).toBe('oh hai\n') - }) - - it("doesn't forward stdin when running in askpass mode", async () => { - const [portPromise, outputPromise] = captureSession() - const port = await portPromise - - const cp = run(askPassTrampolinePath, ['get'], { - env: { DESKTOP_PORT: port }, - }) - cp.child.stdin.end('oh hai\n') - - await cp - - const output = await outputPromise - expect(output.at(-1)).toBe('') - }) - - it('askpass handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { - const [portPromise, outputPromise] = captureSession() - const port = await portPromise - - const cp = run(askPassTrampolinePath, ['get'], { - env: { DESKTOP_PORT: port, DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, - }) - cp.child.stdin.end('oh hai\n') - - await cp - - const output = await outputPromise - const envc = parseInt(output[2]) - const outputEnv = output.slice(3, 3 + envc) - expect(outputEnv).toContain('DESKTOP_TRAMPOLINE_IDENTIFIER=ASKPASS') - }) - - it('credential handler ignores the DESKTOP_TRAMPOLINE_IDENTIFIER env var', async () => { - const [portPromise, outputPromise] = captureSession() - const port = await portPromise - - const cp = run(helperTrampolinePath, ['get'], { - env: { DESKTOP_PORT: port, DESKTOP_TRAMPOLINE_IDENTIFIER: 'foo' }, - }) - cp.child.stdin.end('oh hai\n') - - await cp - - const output = await outputPromise - const envc = parseInt(output[2]) - const outputEnv = output.slice(3, 3 + envc) - expect(outputEnv).toContain( - 'DESKTOP_TRAMPOLINE_IDENTIFIER=CREDENTIALHELPER' - ) - }) -}) diff --git a/vendor/desktop-trampoline/test/ssh-wrapper.test.js b/vendor/desktop-trampoline/test/ssh-wrapper-test.ts similarity index 65% rename from vendor/desktop-trampoline/test/ssh-wrapper.test.js rename to vendor/desktop-trampoline/test/ssh-wrapper-test.ts index 6187527e307..afecfc098f0 100644 --- a/vendor/desktop-trampoline/test/ssh-wrapper.test.js +++ b/vendor/desktop-trampoline/test/ssh-wrapper-test.ts @@ -1,15 +1,17 @@ -const { stat, access } = require('fs').promises -const { constants } = require('fs') -const { execFile } = require('child_process') -const { promisify } = require('util') -const { getSSHWrapperPath } = require('../index') +import { stat, access } from 'fs/promises' +import { constants } from 'fs' +import { execFile } from 'child_process' +import { promisify } from 'util' +import { getSSHWrapperPath } from '../index' +import assert from 'node:assert' +import { describe, it } from 'node:test' const sshWrapperPath = getSSHWrapperPath() const run = promisify(execFile) describe('ssh-wrapper', () => { it('exists and is a regular file', async () => - expect((await stat(sshWrapperPath)).isFile()).toBe(true)) + assert.equal(((await stat(sshWrapperPath)).isFile()), true)) // On Windows, the binary generated is just useless, so no point to test it. // Also, this won't be used on Linux (for now at least), so don't bother to @@ -18,8 +20,8 @@ describe('ssh-wrapper', () => { return } - it('can be executed by current process', () => - access(sshWrapperPath, constants.X_OK)) + it('can be executed by current process', async () => + assert.doesNotThrow(async () => await access(sshWrapperPath, constants.X_OK))) it('attempts to use ssh-askpass program', async () => { // Try to connect to github.com with a non-existent known_hosts file to force @@ -35,7 +37,7 @@ describe('ssh-wrapper', () => { } ) - expect(result.stderr).toMatch( + assert.match(result.stderr, /ssh_askpass: exec\(\/path\/to\/fake\/ssh-askpass\): No such file or directory/ ) }) diff --git a/vendor/desktop-trampoline/yarn.lock b/vendor/desktop-trampoline/yarn.lock index 4fb8eae48fa..f5a5a067c0a 100644 --- a/vendor/desktop-trampoline/yarn.lock +++ b/vendor/desktop-trampoline/yarn.lock @@ -2,475 +2,163 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23" - integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g== - dependencies: - "@jridgewell/trace-mapping" "^0.3.0" - -"@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== - dependencies: - "@babel/highlight" "^7.16.7" - -"@babel/compat-data@^7.16.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" - integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== - -"@babel/core@^7.1.0": - version "7.11.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651" - integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.11.6" - "@babel/helper-module-transforms" "^7.11.0" - "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.11.5" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.11.5" - "@babel/types" "^7.11.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.12.3", "@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.17.0" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.0" - "@babel/parser" "^7.17.0" - "@babel/template" "^7.16.7" - "@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" - -"@babel/generator@^7.11.5", "@babel/generator@^7.11.6": - version "7.11.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620" - integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA== - dependencies: - "@babel/types" "^7.11.5" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@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.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-compilation-targets@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" - integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== - dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" - -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== - dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-member-expression-to-functions@^7.10.4": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" - integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== - dependencies: - "@babel/types" "^7.11.0" - -"@babel/helper-module-imports@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620" - integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-transforms@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" - integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@babel/helper-replace-supers" "^7.10.4" - "@babel/helper-simple-access" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/template" "^7.10.4" - "@babel/types" "^7.11.0" - lodash "^4.17.19" - -"@babel/helper-module-transforms@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" - integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== - dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== - -"@babel/helper-replace-supers@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf" - integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-simple-access@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461" - integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw== - dependencies: - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-simple-access@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" - integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== - dependencies: - "@babel/types" "^7.11.0" - -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== - -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== - -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== - -"@babel/helpers@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044" - integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA== - dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" - -"@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.17.0" - "@babel/types" "^7.17.0" - -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== - dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" - integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== - -"@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-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c" - integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-import-meta@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== +"@actions/core@^1.10.0": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.11.1.tgz#ae683aac5112438021588030efb53b1adb86f172" + integrity sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@actions/exec" "^1.1.1" + "@actions/http-client" "^2.0.1" -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== +"@actions/exec@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.1.tgz#2e43f28c54022537172819a7cf886c844221a611" + integrity sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@actions/io" "^1.0.1" -"@babel/template@^7.10.4", "@babel/template@^7.3.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" - integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.11.5" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.11.5" - "@babel/types" "^7.11.5" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" - -"@babel/traverse@^7.16.7", "@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.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.17.0" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.11.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" - integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== +"@actions/http-client@^2.0.1": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.3.tgz#31fc0b25c0e665754ed39a9f19a8611fc6dab674" + integrity sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.16.7", "@babel/types@^7.17.0": - 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" + tunnel "^0.0.6" + undici "^5.25.4" -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@actions/io@^1.0.1": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.3.tgz#4cdb6254da7962b07473ff5c335f3da485d94d71" + integrity sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q== + +"@esbuild/aix-ppc64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz#c33cf6bbee34975626b01b80451cbb72b4c6c91d" + integrity sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ== + +"@esbuild/android-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz#ea766015c7d2655164f22100d33d7f0308a28d6d" + integrity sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA== + +"@esbuild/android-arm@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.1.tgz#e84d2bf2fe2e6177a0facda3a575b2139fd3cb9c" + integrity sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q== + +"@esbuild/android-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.1.tgz#58337bee3bc6d78d10425e5500bd11370cfdfbed" + integrity sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw== + +"@esbuild/darwin-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz#a46805c1c585d451aa83be72500bd6e8495dd591" + integrity sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ== + +"@esbuild/darwin-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz#0643e003bb238c63fc93ddbee7d26a003be3cd98" + integrity sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA== + +"@esbuild/freebsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz#cff18da5469c09986b93e87979de5d6872fe8f8e" + integrity sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A== + +"@esbuild/freebsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz#362fc09c2de14987621c1878af19203c46365dde" + integrity sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww== + +"@esbuild/linux-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz#aa90d5b02efc97a271e124e6d1cea490634f7498" + integrity sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ== + +"@esbuild/linux-arm@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz#dfcefcbac60a20918b19569b4b657844d39db35a" + integrity sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ== + +"@esbuild/linux-ia32@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz#6f9527077ccb7953ed2af02e013d4bac69f13754" + integrity sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ== + +"@esbuild/linux-loong64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz#287d2412a5456e5860c2839d42a4b51284d1697c" + integrity sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg== + +"@esbuild/linux-mips64el@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz#530574b9e1bc5d20f7a4f44c5f045e26f3783d57" + integrity sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg== + +"@esbuild/linux-ppc64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz#5d7e6b283a0b321ea42c6bc0abeb9eb99c1f5589" + integrity sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg== + +"@esbuild/linux-riscv64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz#14fa0cd073c26b4ee2465d18cd1e18eea7859fa8" + integrity sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ== + +"@esbuild/linux-s390x@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz#e677b4b9d1b384098752266ccaa0d52a420dc1aa" + integrity sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ== + +"@esbuild/linux-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz#f1c796b78fff5ce393658313e8c58613198d9954" + integrity sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA== + +"@esbuild/netbsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz#0d280b7dfe3973f111b02d5fe9f3063b92796d29" + integrity sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g== + +"@esbuild/netbsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz#be663893931a4bb3f3a009c5cc24fa9681cc71c0" + integrity sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA== + +"@esbuild/openbsd-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz#d9021b884233673a05dc1cc26de0bf325d824217" + integrity sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg== + +"@esbuild/openbsd-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz#9f1dc1786ed2e2938c404b06bcc48be9a13250de" + integrity sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw== + +"@esbuild/sunos-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz#89aac24a4b4115959b3f790192cf130396696c27" + integrity sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg== + +"@esbuild/win32-arm64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz#354358647a6ea98ea6d243bf48bdd7a434999582" + integrity sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ== + +"@esbuild/win32-ia32@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz#8cea7340f2647eba951a041dc95651e3908cd4cb" + integrity sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A== + +"@esbuild/win32-x64@0.25.1": + version "0.25.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz#7d79922cb2d88f9048f06393dbf62d2e4accb584" + integrity sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg== + +"@fastify/busboy@^2.0.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d" + integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA== "@isaacs/cliui@^8.0.2": version "8.0.2" @@ -484,209 +172,6 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" - integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - get-package-type "^0.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== - -"@jest/console@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.0.tgz#82289a589ad5803555b50b64178128b7a8e45282" - integrity sha512-WUzX5neFb0IOQOy/7A2VhiGdxJKk85Xns2Oq29JaHmtnSel+BsjwyQZxzAs2Xxfd2i452fwdDG9ox/IWi81bdQ== - dependencies: - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^27.5.0" - jest-util "^27.5.0" - slash "^3.0.0" - -"@jest/core@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.0.tgz#27b383f497ff1671cc30fd5e22eba9d9b10c3031" - integrity sha512-DcUTkZyon+dRozTEjy38Bgt3PIU51GdUJuz3uHKg5maGtmCaYqPUGiM3Xddqi7eIMC7E3fTGIlHqH9i0pTOy6Q== - dependencies: - "@jest/console" "^27.5.0" - "@jest/reporters" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - emittery "^0.8.1" - exit "^0.1.2" - graceful-fs "^4.2.9" - jest-changed-files "^27.5.0" - jest-config "^27.5.0" - jest-haste-map "^27.5.0" - jest-message-util "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-resolve-dependencies "^27.5.0" - jest-runner "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" - jest-watcher "^27.5.0" - micromatch "^4.0.4" - rimraf "^3.0.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.0.tgz#a473bc76261aad7dfa3a1d8e35155953a5ba3436" - integrity sha512-lg0JFsMaLKgpwzs0knOg21Z4OQwaJoBLutnmYzip4tyLTXP21VYWtYGpLXgx42fw/Mw05m1WDXWKgwR6WnsiTw== - dependencies: - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - jest-mock "^27.5.0" - -"@jest/fake-timers@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.0.tgz#f9e07b4c723a535f7c532cfb403394fa40d88c8a" - integrity sha512-e3WrlpqSHq3HAQ03JFjTn8YCrsyg640/sr1rjkM2rNv8z1ufjudpv4xq6DvvTJYB6FuUrfg0g+7bSKPet5QfCQ== - dependencies: - "@jest/types" "^27.5.0" - "@sinonjs/fake-timers" "^8.0.1" - "@types/node" "*" - jest-message-util "^27.5.0" - jest-mock "^27.5.0" - jest-util "^27.5.0" - -"@jest/globals@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.0.tgz#16271323f79e3b0fe0842e9588241d202a6c2aff" - integrity sha512-wWpMnTiR65Q4JD7fr2BqN+ZDbi99mmILnEM6u7AaX4geASEIVvQsiB4RCvwZrIX5YZCsAjviJQVq9CYddLABkg== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/types" "^27.5.0" - expect "^27.5.0" - -"@jest/reporters@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.0.tgz#e7602e12656b5051bf4e784cbdd82d4ec1299e33" - integrity sha512-DG+BmVSx2uaJSTKz5z1eScgHTQ6/cZ5CCKSpmpr4sXQPwV2V5aUMOBDwXX1MnqNRhH7/Rq9K97ynnocvho5aMA== - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.2" - graceful-fs "^4.2.9" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^5.1.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.1.3" - jest-haste-map "^27.5.0" - jest-resolve "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" - slash "^3.0.0" - source-map "^0.6.0" - string-length "^4.0.1" - terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" - -"@jest/source-map@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.0.tgz#f22a7e759b8807491f84719c01acf433b917c7a0" - integrity sha512-0xr7VZ+JNCRrlCyRMYhquUm8eU3kNdGDaIW4s3L625bNjk273v9ZhAm3YczIuzJzYH0pnjT+QSCiZQegWKjeow== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.2.9" - source-map "^0.6.0" - -"@jest/test-result@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.0.tgz#29e0ace33570c9dcbd47c67e954f77a7d7fff98e" - integrity sha512-Lxecvx5mN6WIeynIyW0dWDQm8UPGMHvTwxUPK+OsZaqBDMGaNDSZtw53VoVk7HyT6AcRblMR/pfa0XucmH4hGw== - dependencies: - "@jest/console" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.0.tgz#68beceb3de818dcb34fb3ea59be3c22c890bb6e5" - integrity sha512-WzjcDflqbpWe+SnJPCvB2gB6haGfrkzAgzY6Pb1aq+EPoVAj2mwBaKN0ROWI4H87aSslCjq2M+BUQFNJ8VpnDA== - dependencies: - "@jest/test-result" "^27.5.0" - graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-runtime "^27.5.0" - -"@jest/transform@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.0.tgz#a4941e69ac51e8aa9a255ff4855b564c228c400b" - integrity sha512-yXUy/iO3TH1itxJ9BF7LLjuXt8TtgtjAl0PBQbUaCvRa+L0yYBob6uayW9dFRX/CDQweouLhvmXh44zRiaB+yA== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^27.5.0" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-regex-util "^27.5.0" - jest-util "^27.5.0" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - -"@jest/types@^27.5.0": - version "27.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.0.tgz#6ad04a5c5355fd9f46e5cf761850e0edb3c209dd" - integrity sha512-oDHEp7gwSgA82RZ6pzUL3ugM2njP/lVB1MsxRZNOBk+CoNvh9SpH1lQixPFc/kDlV50v59csiW4HLixWmhmgPQ== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^16.0.0" - chalk "^4.0.0" - -"@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/sourcemap-codec@^1.4.10": - version "1.4.10" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186" - integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg== - -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde" - integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@npmcli/agent@^2.0.0": version "2.2.2" resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" @@ -710,183 +195,16 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@sinonjs/commons@^1.7.0": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" - integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^8.0.1": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" - integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== - dependencies: - "@sinonjs/commons" "^1.7.0" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - -"@types/babel__core@^7.0.0": - version "7.1.10" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40" - integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__core@^7.1.14": - version "7.1.18" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8" - integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04" - integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew== - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz#b8aaeba0a45caca7b56a5de9459872dde3727214" - integrity sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.14" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13" - integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg== - dependencies: - "@babel/types" "^7.3.0" - -"@types/babel__traverse@^7.0.4": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== - dependencies: - "@babel/types" "^7.3.0" - "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/graceful-fs@^4.1.2": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" - integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/node@*": - version "14.11.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" - integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA== - -"@types/prettier@^2.1.5": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf" - integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w== - -"@types/stack-utils@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" - integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== - -"@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== - -"@types/yargs@^16.0.0": - version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" - integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== - dependencies: - "@types/yargs-parser" "*" - -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - abbrev@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - -acorn-walk@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn@^7.1.1: - version "7.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" - integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== - -acorn@^8.2.4: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== - -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" @@ -902,31 +220,6 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.12.3: - version "6.12.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" - integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -942,14 +235,7 @@ ansi-regex@^6.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -957,220 +243,15 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - ansi-styles@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -ansi@^0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - -anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" - integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - -are-we-there-yet@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz#aed25dd0eae514660d49ac2b2366b175c614785a" - integrity sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg== - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -array-index@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" - integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= - dependencies: - debug "^2.2.0" - es6-symbol "^3.0.2" - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - -aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - -axios@^1.6.5: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== - dependencies: - follow-redirects "^1.15.6" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - -b4a@^1.6.4: - version "1.6.6" - resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba" - integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg== - -babel-jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.0.tgz#c653985241af3c76f59d70d65a570860c2594a50" - integrity sha512-puhCyvBTNLevhbd1oyw6t3gWBicWoUARQYKCBB/B1moif17NbyhxbsfadqZIw8zfJJD+W7Vw0Nb20pEjLxkXqQ== - dependencies: - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-plugin-istanbul@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" - integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^5.0.4" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.0.tgz#8fdf07835f2165a068de3ce95fd7749a89801b51" - integrity sha512-ztwNkHl+g1GaoQcb8f2BER4C3LMvSXuF7KVqtUioXQgScSEnkl6lLgCILUYIR+CPTwL8H3F/PNLze64HPWF9JA== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" - "@types/babel__traverse" "^7.0.6" - -babel-preset-current-node-syntax@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" - -babel-preset-jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.0.tgz#4e308711c3d2ff1f45cf5d9a23646e37b621fc9f" - integrity sha512-7bfu1cJBlgK/nKfTvMlElzA3jpi6GzDWX3fntnyP2cQSzoi/KUz6ewGlcb3PSRYZGyv+uPnVHY0Im3JbsViqgA== - dependencies: - babel-plugin-jest-hoist "^27.5.0" - babel-preset-current-node-syntax "^1.0.0" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" -bare-events@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.3.1.tgz#5af2ee0be9578f81e3c1aa9bc3a6a2bcf22307ce" - integrity sha512-sJnSOTVESURZ61XgEleqmP255T6zTYwHPwE4r6SssIh0U9/uDvfpdoJYpVUerJJZH2fueO+CdT8ZT+OC/7aZDA== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - dependencies: - tweetnacl "^0.14.3" - -bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - brace-expansion@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" @@ -1178,54 +259,6 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - -browserslist@^4.17.5: - version "4.19.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" - integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== - dependencies: - caniuse-lite "^1.0.30001286" - electron-to-chromium "^1.4.17" - escalade "^3.1.1" - node-releases "^2.0.1" - picocolors "^1.0.0" - -bser@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" - integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== - dependencies: - node-int64 "^0.4.0" - -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - cacache@^18.0.0: version "18.0.3" resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21" @@ -1244,135 +277,16 @@ cacache@^18.0.0: tar "^6.1.11" unique-filename "^3.0.0" -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -caniuse-lite@^1.0.30001286: - version "1.0.30001309" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz#e0ee78b9bec0704f67304b00ff3c5c0c768a9f62" - integrity sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -char-regex@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -ci-info@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" - integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== - -cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -cmake-js@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" - integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== - dependencies: - axios "^1.6.5" - debug "^4" - fs-extra "^11.2.0" - lodash.isplainobject "^4.0.6" - memory-stream "^1.0.0" - node-api-headers "^1.1.0" - npmlog "^6.0.2" - rc "^1.2.7" - semver "^7.5.4" - tar "^6.2.0" - url-join "^4.0.1" - which "^2.0.2" - yargs "^17.7.2" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" - integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -1380,60 +294,12 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" - dependencies: - delayed-stream "~1.0.0" - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.9.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-spawn@^7.0.0, cross-spawn@^7.0.3: +cross-spawn@^7.0.0: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1442,46 +308,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - -d@1, d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - debug@4: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" @@ -1489,27 +315,6 @@ debug@4: dependencies: ms "2.1.2" -debug@^2.2.0: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^4: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.1.0, debug@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -1517,107 +322,11 @@ debug@^4.3.4: dependencies: ms "2.1.2" -decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -detect-libc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" - integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== - -detect-libc@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" - integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== - -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - -diff-sequences@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.0.tgz#a8ac0cb742b17d6f30a6c43e233893a2402c0729" - integrity sha512-ZsOBWnhXiH+Zn0DcBNX/tiQsqrREHs/6oQsEVy2VJJjrTblykPima11pyHMSA/7PGmD+fwclTnKVKL/qtNREDQ== - -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - -duplexer2@~0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= - dependencies: - readable-stream "~1.1.9" - -each-series-async@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" - integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== - eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -electron-to-chromium@^1.4.17: - version "1.4.66" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz#d7453d363dcd7b06ed1757adcde34d724e27b367" - integrity sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg== - -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1635,13 +344,6 @@ encoding@^0.1.13: dependencies: iconv-lite "^0.6.2" -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - env-paths@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" @@ -1652,185 +354,53 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== +error-stack-parser@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + stackframe "^1.3.4" -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" +esbuild@~0.25.0: + version "0.25.1" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.1.tgz#a16b8d070b6ad4871935277bda6ccfe852e3fa2f" + integrity sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ== optionalDependencies: - source-map "~0.6.1" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -execspawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" - integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= - dependencies: - util-extend "^1.0.1" - -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -expect@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.0.tgz#ea2fbebb483c274043098c34a53923a0aee493f0" - integrity sha512-z73GZ132cBqrapO0X6BeRjyBXqOt9YeRtnDteHJIQqp5s2pZ41Hz23VUbsVFMfkrsFLU9GwoIRS0ZzLuFK8M5w== - dependencies: - "@jest/types" "^27.5.0" - jest-get-type "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - -exponential-backoff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" - integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== - -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== - dependencies: - type "^2.0.0" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-fifo@^1.1.0, fast-fifo@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c" - integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== + "@esbuild/aix-ppc64" "0.25.1" + "@esbuild/android-arm" "0.25.1" + "@esbuild/android-arm64" "0.25.1" + "@esbuild/android-x64" "0.25.1" + "@esbuild/darwin-arm64" "0.25.1" + "@esbuild/darwin-x64" "0.25.1" + "@esbuild/freebsd-arm64" "0.25.1" + "@esbuild/freebsd-x64" "0.25.1" + "@esbuild/linux-arm" "0.25.1" + "@esbuild/linux-arm64" "0.25.1" + "@esbuild/linux-ia32" "0.25.1" + "@esbuild/linux-loong64" "0.25.1" + "@esbuild/linux-mips64el" "0.25.1" + "@esbuild/linux-ppc64" "0.25.1" + "@esbuild/linux-riscv64" "0.25.1" + "@esbuild/linux-s390x" "0.25.1" + "@esbuild/linux-x64" "0.25.1" + "@esbuild/netbsd-arm64" "0.25.1" + "@esbuild/netbsd-x64" "0.25.1" + "@esbuild/openbsd-arm64" "0.25.1" + "@esbuild/openbsd-x64" "0.25.1" + "@esbuild/sunos-x64" "0.25.1" + "@esbuild/win32-arm64" "0.25.1" + "@esbuild/win32-ia32" "0.25.1" + "@esbuild/win32-x64" "0.25.1" -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== - dependencies: - bser "2.1.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.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" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -follow-redirects@^1.15.6: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== +exponential-backoff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" + integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== foreground-child@^3.1.0: version "3.1.1" @@ -1840,50 +410,6 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" - integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -1898,156 +424,17 @@ fs-minipass@^3.0.0: dependencies: minipass "^7.0.3" -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -fstream@^1.0.0, fstream@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gauge@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" - integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gauge@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.2.tgz#7ab44c11181da9766333f10db8cd1e4b17fd6c46" - integrity sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^4.0.1" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -gensync@^1.0.0-beta.1: - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" - integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-package-type@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" - integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -ghreleases@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" - integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== - dependencies: - after "~0.8.1" - ghrepos "~2.1.0" - ghutils "~3.2.0" - lodash.uniq "^4.5.0" - simple-mime "~0.1.0" - url-template "~2.0.6" - -ghrepos@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" - integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== - dependencies: - ghutils "~3.2.0" +fsevents@~2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -ghutils@~3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" - integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== - dependencies: - jsonist "~2.1.0" - xtend "~4.0.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -"glob@3 || 4 || 5 || 6 || 7", glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +get-tsconfig@^4.7.5: + version "4.10.0" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.0.tgz#403a682b373a823612475a4c2928c7326fc0f6bb" + integrity sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A== dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" + resolve-pkg-maps "^1.0.0" glob@^10.2.2, glob@^10.3.10: version "10.4.1" @@ -2060,96 +447,16 @@ glob@^10.2.2, glob@^10.3.10: minipass "^7.1.2" path-scurry "^1.11.1" -glob@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graceful-fs@^4.2.0: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.2.6: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-unicode@^2.0.0, has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-agent@^7.0.0: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" @@ -2158,22 +465,6 @@ http-proxy-agent@^7.0.0: agent-base "^7.1.0" debug "^4.3.4" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - https-proxy-agent@^7.0.1: version "7.0.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" @@ -2182,27 +473,6 @@ https-proxy-agent@^7.0.1: agent-base "^7.0.2" debug "4" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -hyperquest@~2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" - integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== - dependencies: - buffer-from "^0.1.1" - duplexer2 "~0.0.2" - through2 "~0.6.3" - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" @@ -2210,19 +480,6 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -2233,27 +490,6 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - ip-address@^9.0.5: version "9.0.5" resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" @@ -2262,66 +498,16 @@ ip-address@^9.0.5: jsbn "1.1.0" sprintf-js "^1.1.3" -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== - dependencies: - has "^1.0.3" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-generator-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" - integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== - is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - -is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - -is-typedarray@^1.0.0, is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -2331,57 +517,6 @@ isexe@^3.1.1: resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - -istanbul-lib-coverage@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" - integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== - -istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" - integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== - dependencies: - "@babel/core" "^7.12.3" - "@babel/parser" "^7.14.7" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.2.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" - integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - jackspeak@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab" @@ -2391,581 +526,11 @@ jackspeak@^3.1.2: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jest-changed-files@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.0.tgz#61e8d0a7394c1ee1cec4c2893e206e62b1566066" - integrity sha512-BGWKI7E6ORqbF5usF1oA4ftbkhVZVrXr8jB0/BrU6TAn3kfOVwX2Zx6pKIXYutJ+qNEjT8Da/gGak0ajya/StA== - dependencies: - "@jest/types" "^27.5.0" - execa "^5.0.0" - throat "^6.0.1" - -jest-circus@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.0.tgz#fcff8829ceb2c8ef4b4532ace7734d156c6664b9" - integrity sha512-+NPd1OxpAHYKjbW8dgL0huFgmtZRKSUKee/UtRgZJEfAxCeA12d7sp0coh5EGDBpW4fCk1Pcia/2dG+j6BQvdw== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^0.7.0" - expect "^27.5.0" - is-generator-fn "^2.0.0" - jest-each "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" - slash "^3.0.0" - stack-utils "^2.0.3" - throat "^6.0.1" - -jest-cli@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.0.tgz#06557ad22818740fb28481089a574ba107a8b369" - integrity sha512-9ANs79Goz1ULKtG7HDm/F//4E69v8EFOLXRIHmeC/eK1xTUeQGlU6XP0Zwst386sKaKB4O60qhWY/UaTBS2MLA== - dependencies: - "@jest/core" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" - chalk "^4.0.0" - exit "^0.1.2" - graceful-fs "^4.2.9" - import-local "^3.0.2" - jest-config "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" - prompts "^2.0.1" - yargs "^16.2.0" - -jest-config@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.0.tgz#d96ccf8e26d3f2f3ae6543686c48449c201bb621" - integrity sha512-eOIpvpXFz5WHuIYZN1QmvBLEjsSk3w+IAC/2jBpZClbprF53Bj9meBMgAbE15DSkaaJBDFmhXXd1L2eCLaWxQw== - dependencies: - "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.0" - "@jest/types" "^27.5.0" - babel-jest "^27.5.0" - chalk "^4.0.0" - ci-info "^3.2.0" - deepmerge "^4.2.2" - glob "^7.1.1" - graceful-fs "^4.2.9" - jest-circus "^27.5.0" - jest-environment-jsdom "^27.5.0" - jest-environment-node "^27.5.0" - jest-get-type "^27.5.0" - jest-jasmine2 "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-runner "^27.5.0" - jest-util "^27.5.0" - jest-validate "^27.5.0" - micromatch "^4.0.4" - pretty-format "^27.5.0" - slash "^3.0.0" - -jest-diff@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.0.tgz#34dc608a3b9159df178dd480b6d835b5e6b92082" - integrity sha512-zztvHDCq/QcAVv+o6rts0reupSOxyrX+KLQEOMWCW2trZgcBFgp/oTK7hJCGpXvEIqKrQzyQlaPKn9W04+IMQg== - dependencies: - chalk "^4.0.0" - diff-sequences "^27.5.0" - jest-get-type "^27.5.0" - pretty-format "^27.5.0" - -jest-docblock@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.0.tgz#096fa3a8b55d019a954ef7cc205c791bf94b2352" - integrity sha512-U4MtJgdZn2x+jpPzd7NAYvDmgJAA5h9QxVAwsyuH7IymGzY8VGHhAkHcIGOmtmdC61ORLxCbEhj6fCJsaCWzXA== - dependencies: - detect-newline "^3.0.0" - -jest-each@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.0.tgz#7bd00a767df0fbec0caba3df0d2c0b3268a2ce84" - integrity sha512-2vpajSdDMZmAxjSP1f4BG9KKduwHtuaI0w66oqLUkfaGUU7Ix/W+d8BW0h3/QEJiew7hR0GSblqdFwTEEbhBdw== - dependencies: - "@jest/types" "^27.5.0" - chalk "^4.0.0" - jest-get-type "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" - -jest-environment-jsdom@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.0.tgz#6d22d9b76890e9b82c7e1062a15730efb3fb7361" - integrity sha512-sX49N8rjp6HSHeGpNgLk6mtHRd1IPAnE/u7wLQkb6Tz/1E08Q++Y8Zk/IbpVdcFywbzH1icFqEuDuHJ6o+uXXg== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - jest-mock "^27.5.0" - jest-util "^27.5.0" - jsdom "^16.6.0" - -jest-environment-node@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.0.tgz#1ab357b4715bff88d48c8b62b8379002ff955dd1" - integrity sha512-7UzisMMfGyrURhS/eUa7p7mgaqN3ajHylsjOgfcn0caNeYRZq4LHKZLfAxrPM34DWLnBZcRupEJlpQsizdSUsw== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - jest-mock "^27.5.0" - jest-util "^27.5.0" - -jest-get-type@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.0.tgz#861c24aa1b176be83c902292cb9618d580cac8a7" - integrity sha512-Vp6O8a52M/dahXRG/E0EJuWQROps2mDQ0sJYPgO8HskhdLwj9ajgngy2OAqZgV6e/RcU67WUHq6TgfvJb8flbA== - -jest-haste-map@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.0.tgz#7cc3a920caf304c89fbfceb5d5717b929873f175" - integrity sha512-0KfckSBEKV+D6e0toXmIj4zzp72EiBnvkC0L+xYxenkLhAdkp2/8tye4AgMzz7Fqb1r8SWtz7+s1UQLrxMBang== - dependencies: - "@jest/types" "^27.5.0" - "@types/graceful-fs" "^4.1.2" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^27.5.0" - jest-serializer "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" - micromatch "^4.0.4" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.3.2" - -jest-jasmine2@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.0.tgz#589d6574d1318d3fb41b3fc368344117ec417dcc" - integrity sha512-X7sT3HLNjjrBEepilxzPyNhNdyunaFBepo1L3T/fvYb9tb8Wb8qY576gwIa+SZcqYUqAA7/bT3EpZI4lAp0Qew== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/source-map" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - expect "^27.5.0" - is-generator-fn "^2.0.0" - jest-each "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-runtime "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - pretty-format "^27.5.0" - throat "^6.0.1" - -jest-leak-detector@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.0.tgz#c98c02e64eab4da9a8b91f058d2b7473272272ee" - integrity sha512-Ak3k+DD3ao5d4/zzJrxAQ5UV5wiCrp47jH94ZD4/vXSzQgE6WBVDfg83VtculLILO7Y6/Q/7yzKSrtN9Na8luA== - dependencies: - jest-get-type "^27.5.0" - pretty-format "^27.5.0" - -jest-matcher-utils@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.0.tgz#d2fc737224fb3bfa38eaa2393ac5bc953d5c5697" - integrity sha512-5ruyzWMGb1ilCWD6ECwNdOhQBeIXAjHmHd5c3uO6quR7RIMHPRP2ucOaejz2j+0R0Ko4GanWM6SqXAeF8nYN5g== - dependencies: - chalk "^4.0.0" - jest-diff "^27.5.0" - jest-get-type "^27.5.0" - pretty-format "^27.5.0" - -jest-message-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.0.tgz#654a781b38a305b1fd8120053c784c67bca00a52" - integrity sha512-lfbWRhTtmZMEHPAtl0SrvNzK1F4UnVNMHOliRQT2BJ4sBFzIb0gBCHA4ebWD4o6l1fUyvDPxM01K9OIMQTAdQw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.0" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^27.5.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-mock@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.0.tgz#1018656fe6bcd0f58fd1edca7f420169f6707c6e" - integrity sha512-PHluG6MJGng82/sxh8OiB9fnxzNn3cazceSHCAmAKs4g5rMhc3EZCrJXv+4w61rA2WGagMUj7QLLrA1SRlFpzQ== - dependencies: - "@jest/types" "^27.5.0" - "@types/node" "*" - -jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== - -jest-regex-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.0.tgz#26c26cf15a73edba13cb8930e261443d25ed8608" - integrity sha512-e9LqSd6HsDsqd7KS3rNyYwmQAaG9jq4U3LbnwVxN/y3nNlDzm2OFs596uo9zrUY+AV1opXq6ome78tRDUCRWfA== - -jest-resolve-dependencies@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.0.tgz#8e3b15589848995ddc9a39f49462dad5b7bc14a2" - integrity sha512-xQsy7CmrT4CJxdNUEdzZU2M/v6YmtQ/pkJM+sx7TA1siG1zfsZuo78PZvzglwRMQFr88f3Su4Om8OEBAic+SMw== - dependencies: - "@jest/types" "^27.5.0" - jest-regex-util "^27.5.0" - jest-snapshot "^27.5.0" - -jest-resolve@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.0.tgz#a8e95a68dfb4a59faa508d7b6d2c6a02dcabb712" - integrity sha512-PkDpYEGV/nFqThnIrlPtj8oTxyAV3iuuS6or7dZYyUWaHr/tyyVb5qfBmZS6FEr7ozBHgjrF1bgcgIefnlicbw== - dependencies: - "@jest/types" "^27.5.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-pnp-resolver "^1.2.2" - jest-util "^27.5.0" - jest-validate "^27.5.0" - resolve "^1.20.0" - resolve.exports "^1.1.0" - slash "^3.0.0" - -jest-runner@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.0.tgz#b5747a4444b4d3faae019bd201943948882d26c3" - integrity sha512-RMzXhkJLLOKKgUPY2trpyVBijaFmswMtgoCCBk2PQVRHC6yo1vLd1/jmFP39s5OXXnt7rntuzKSYvxl+QUibqQ== - dependencies: - "@jest/console" "^27.5.0" - "@jest/environment" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - emittery "^0.8.1" - graceful-fs "^4.2.9" - jest-docblock "^27.5.0" - jest-environment-jsdom "^27.5.0" - jest-environment-node "^27.5.0" - jest-haste-map "^27.5.0" - jest-leak-detector "^27.5.0" - jest-message-util "^27.5.0" - jest-resolve "^27.5.0" - jest-runtime "^27.5.0" - jest-util "^27.5.0" - jest-worker "^27.5.0" - source-map-support "^0.5.6" - throat "^6.0.1" - -jest-runtime@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.0.tgz#2497116742b9e7cc1e5381a9ded36602b8b0c78c" - integrity sha512-T7APxCPjN3p3ePcLuypbWtD0UZHyAdvIADZ9ABI/sFZ9t/Rf2xIUd6D7RzZIX+unewJRooVGWrgDIgeUuj0OUA== - dependencies: - "@jest/environment" "^27.5.0" - "@jest/fake-timers" "^27.5.0" - "@jest/globals" "^27.5.0" - "@jest/source-map" "^27.5.0" - "@jest/test-result" "^27.5.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - chalk "^4.0.0" - cjs-module-lexer "^1.0.0" - collect-v8-coverage "^1.0.0" - execa "^5.0.0" - glob "^7.1.3" - graceful-fs "^4.2.9" - jest-haste-map "^27.5.0" - jest-message-util "^27.5.0" - jest-mock "^27.5.0" - jest-regex-util "^27.5.0" - jest-resolve "^27.5.0" - jest-snapshot "^27.5.0" - jest-util "^27.5.0" - slash "^3.0.0" - strip-bom "^4.0.0" - -jest-serializer@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.0.tgz#439a110df27f97a40c114a429b708c2ada15a81f" - integrity sha512-aSDFqQlVXtBH+Zb5dl9mCvTSFkabixk/9P9cpngL4yJKpmEi9USxfDhONFMzJrtftPvZw3PcltUVmtFZTB93rg== - dependencies: - "@types/node" "*" - graceful-fs "^4.2.9" - -jest-snapshot@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.0.tgz#c5c4c084f5e10036f31e7647de1a6f28c07681fc" - integrity sha512-cAJj15uqWGkro0bfcv/EgusBnqNgCpRruFQZghsMYTq4Fm2lk/VhAf8DgRr8wvhR6Ue1hkeL8tn70Cw4t8x/5A== - dependencies: - "@babel/core" "^7.7.2" - "@babel/generator" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/traverse" "^7.7.2" - "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/babel__traverse" "^7.0.4" - "@types/prettier" "^2.1.5" - babel-preset-current-node-syntax "^1.0.0" - chalk "^4.0.0" - expect "^27.5.0" - graceful-fs "^4.2.9" - jest-diff "^27.5.0" - jest-get-type "^27.5.0" - jest-haste-map "^27.5.0" - jest-matcher-utils "^27.5.0" - jest-message-util "^27.5.0" - jest-util "^27.5.0" - natural-compare "^1.4.0" - pretty-format "^27.5.0" - semver "^7.3.2" - -jest-util@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.0.tgz#0b9540d91b0de65d288f235fa9899e6eeeab8d35" - integrity sha512-FUUqOx0gAzJy3ytatT1Ss372M1kmhczn8x7aE0++11oPGW1FyD/5NjYBI8w1KOXFm6IVjtaZm2szfJJL+CHs0g== - dependencies: - "@jest/types" "^27.5.0" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-validate@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.0.tgz#b3df32372d2c832fa5a5e31ee2c37f94f79f7f1f" - integrity sha512-2XZzQWNrY9Ypo11mm4ZeVjvr++CQG/45XnmA2aWwx155lTwy1JGFI8LpQ2dBCSAeO21ooqg/FCIvv9WwfnPClA== - dependencies: - "@jest/types" "^27.5.0" - camelcase "^6.2.0" - chalk "^4.0.0" - jest-get-type "^27.5.0" - leven "^3.1.0" - pretty-format "^27.5.0" - -jest-watcher@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.0.tgz#ca11c3b9115c92a8fd2fd9e2def296d45206f1ca" - integrity sha512-MhIeIvEd6dnnspE0OfYrqHOAfZZdyFqx/k8U2nvVFSkLYf22qAFfyNWPVQYcwqKVNobcOhJoT0kV/nRHGbqK8A== - dependencies: - "@jest/test-result" "^27.5.0" - "@jest/types" "^27.5.0" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - jest-util "^27.5.0" - string-length "^4.0.1" - -jest-worker@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.0.tgz#99ee77e4d06168107c27328bd7f54e74c3a48d59" - integrity sha512-8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.0.tgz#2c04ff88754e42e9fc5240840b91f9a9a8990875" - integrity sha512-sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A== - dependencies: - "@jest/core" "^27.5.0" - import-local "^3.0.2" - jest-cli "^27.5.0" - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -jsdom@^16.6.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== - dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" - cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" - escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" - symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== - dependencies: - minimist "^1.2.5" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonist@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" - integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== - dependencies: - bl "~3.0.0" - hyperquest "~2.1.3" - json-stringify-safe "~5.0.1" - xtend "~4.0.1" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== - -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== - -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4.17.19: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== - -lodash@^4.7.0: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.2.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" @@ -2978,13 +543,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - make-fetch-happen@^13.0.0: version "13.0.1" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" @@ -3003,59 +561,6 @@ make-fetch-happen@^13.0.0: promise-retry "^2.0.1" ssri "^10.0.0" -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= - dependencies: - tmpl "1.0.x" - -memory-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2" - integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww== - dependencies: - readable-stream "^3.4.0" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -mime-db@~1.38.0: - version "1.38.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad" - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.22" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd" - dependencies: - mime-db "~1.38.0" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -minimatch@3, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - minimatch@^9.0.4: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -3063,16 +568,6 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minimist@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - minipass-collect@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" @@ -3137,78 +632,27 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -"mkdirp@>=0.5 0", mkdirp@^0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -napi-build-utils@^1.0.1, napi-build-utils@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - -node-abi@^3.3.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32" - integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw== - dependencies: - semver "^7.3.5" - -node-abi@^3.54.0: - version "3.62.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.62.0.tgz#017958ed120f89a3a14a7253da810f5d724e3f36" - integrity sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g== - dependencies: - semver "^7.3.5" - -node-addon-api@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" - integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== - -node-api-headers@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.1.0.tgz#3f9dd7bb10b29e1c3e3db675979605a308b2373c" - integrity sha512-ucQW+SbYCUPfprvmzBsnjT034IGRB2XK8rRc78BgjNKhTdFKgAwAmgW704bKIBmcYW48it0Gkjpkd39Azrwquw== +node-addon-api@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" + integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== -node-gyp@^10.0.1, node-gyp@^10.1.0: +node-gyp@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e" integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA== @@ -3224,212 +668,27 @@ node-gyp@^10.0.1, node-gyp@^10.1.0: tar "^6.1.2" which "^4.0.0" -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - -node-ninja@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" - integrity sha512-wMtWsG2QZI1Z5V7GciX9OI2DVT0PuDRIDQfe3L3rJsQ1qN1Gm3QQhoNtb4PMRi7gq4ByvEIYtPwHC7YbEf5yxw== - dependencies: - fstream "^1.0.0" - glob "3 || 4 || 5 || 6 || 7" - graceful-fs "^4.1.2" - minimatch "3" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2" - osenv "0" - path-array "^1.0.0" - request "2" - rimraf "2" - semver "2.x || 3.x || 4 || 5" - tar "^2.0.0" - which "1" - -node-releases@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" - integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== - -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ== - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@^7.0.0: - version "7.2.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" - integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== - dependencies: - abbrev "^2.0.0" - -normalize-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== - dependencies: - which "^1.2.10" - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" - integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= - dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" - -"npmlog@0 || 1 || 2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -"npmlog@0 || 1 || 2 || 3 || 4": - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" - integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== - dependencies: - are-we-there-yet "^3.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.3" - set-blocking "^2.0.0" - -npmlog@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8" - integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg== - dependencies: - are-we-there-yet "^4.0.0" - console-control-strings "^1.1.0" - gauge "^5.0.0" - set-blocking "^2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -nw-gyp@^3.6.6: - version "3.6.6" - resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.6.tgz#0231d603d09665053ea48843d6888d13a4b92fb1" - integrity sha512-FeMnpFQWtEEMJ1BrSfK3T62CjuxaNl0mNHqdrxFcIF5XQdC3gaZYW4n+77lQLk8PE3Upfknkl9VRo6gDKJIHuA== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@0: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== +node-test-github-reporter@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/node-test-github-reporter/-/node-test-github-reporter-1.2.0.tgz#316914021ae66fc944c216080971da4d388e5283" + integrity sha512-rnCQctMTPAqJrOhaHaj60IMS5qB5B2rusCGv7RIbY6FsTKjaRmS4OBKCVQb3kYdMNqj0Fw9btDOZkCi3OFHx/g== dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" + "@actions/core" "^1.10.0" + error-stack-parser "^2.1.4" + node-test-parser "^2.2.1" + stack-utils "^2.0.6" -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" +node-test-parser@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/node-test-parser/-/node-test-parser-2.2.2.tgz#486f0d0c08e31e6b341eadf6a9f574e8c53d8259" + integrity sha512-Cbe0pabtJaZOrjvCguHe9kZLDrHZpRr+4+JO29hNf143qFUhGn6Xn5HxwQmh4vmyyLFlF2YmnJGIwfEX+aQ7mw== -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== +nopt@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== dependencies: - p-limit "^2.2.0" + abbrev "^2.0.0" p-map@^4.0.0: version "4.0.0" @@ -3438,42 +697,11 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - -path-array@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" - integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= - dependencies: - array-index "^1.0.0" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6, path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - path-scurry@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" @@ -3482,98 +710,10 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.0.4: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -picomatch@^2.2.3: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pirates@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -prebuild-install@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056" - integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-13.0.1.tgz#6e554d9e1b232044d4a26115ef8c8e088ad85d25" - integrity sha512-AR+ZoFfG2qQM5iCtNNBWlueuzlBWQdeiU+fBF7ZwbW2w5p/2Ep1+3G4AtAymrMfZn0yg3DoF+xCorh5hHOJY/Q== - dependencies: - cmake-js "^7.3.0" - detect-libc "^2.0.2" - each-series-async "^1.0.1" - execspawn "^1.0.1" - ghreleases "^3.0.2" - github-from-package "0.0.0" - glob "^10.3.10" - minimist "^1.2.8" - napi-build-utils "^1.0.2" - node-abi "^3.54.0" - node-gyp "^10.0.1" - node-ninja "^1.0.2" - noop-logger "^0.1.1" - npm-which "^3.0.1" - npmlog "^7.0.1" - nw-gyp "^3.6.6" - rc "^1.2.8" - run-waterfall "^1.1.7" - tar-stream "^3.1.7" - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= - -prettier@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" - integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== - -pretty-format@^27.5.0: - version "27.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.0.tgz#71e1af7a4b587d259fa4668dcd3e94af077767cb" - integrity sha512-xEi6BRPZ+J1AIS4BAtFC/+rh5jXlXObGZjx5+OSpM95vR/PGla78bFVHMy5GdZjP9wk3AHAMHROXq/r69zXltw== - dependencies: - ansi-regex "^5.0.1" - ansi-styles "^5.0.0" - react-is "^17.0.1" +prettier@^3.3.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5" + integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw== proc-log@^3.0.0: version "3.0.0" @@ -3585,10 +725,6 @@ proc-log@^4.2.0: resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - promise-retry@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" @@ -3597,233 +733,20 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" -prompts@^2.0.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" - integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA== - dependencies: - kleur "^3.0.3" - sisteransi "^1.0.4" - -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -psl@^1.1.28, psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - -queue-tick@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" - integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== - -rc@^1.2.7, rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@^3.6.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -request@2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== - -resolve@^1.20.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== - dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.3.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== - dependencies: - path-parse "^1.0.6" +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= -rimraf@2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-waterfall@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" - integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== - -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== - dependencies: - xmlchars "^2.2.0" - -"semver@2.x || 3.x || 4 || 5", semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" @@ -3831,21 +754,6 @@ semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@^7.5.4: - version "7.6.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" - integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3858,54 +766,11 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - signal-exit@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-mime@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" - integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= - -sisteransi@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -3928,29 +793,6 @@ socks@^2.7.1: ip-address "^9.0.5" smart-buffer "^4.2.0" -source-map-support@^0.5.6: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - split2@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" @@ -3961,25 +803,6 @@ sprintf-js@^1.1.3: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@^10.0.0: version "10.0.6" resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" @@ -3987,32 +810,19 @@ ssri@^10.0.0: dependencies: minipass "^7.0.3" -stack-utils@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== +stack-utils@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" -streamx@^2.15.0: - version "2.16.1" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614" - integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ== - dependencies: - fast-fifo "^1.1.0" - queue-tick "^1.0.1" - optionalDependencies: - bare-events "^2.2.0" - -string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== - dependencies: - char-regex "^1.0.2" - strip-ansi "^6.0.0" +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: +"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== @@ -4021,22 +831,7 @@ string-length@^4.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^4.1.0, string-width@^4.2.0: +string-width@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== @@ -4054,24 +849,6 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1: name strip-ansi-cjs version "6.0.1" @@ -4080,18 +857,6 @@ string_decoder@~1.1.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -4106,100 +871,7 @@ strip-ansi@^7.0.1: dependencies: ansi-regex "^6.0.1" -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar-stream@^3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b" - integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ== - dependencies: - b4a "^1.6.4" - fast-fifo "^1.2.0" - streamx "^2.15.0" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^6.1.11, tar@^6.2.0: +tar@^6.1.11: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -4223,127 +895,32 @@ tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== - dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" - -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - -throat@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" - integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== - -through2@~0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -tmpl@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.1.2" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tr46@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" - integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== - dependencies: - punycode "^2.1.1" - -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== - dependencies: - punycode "^2.1.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= +tsx@^4.10.5: + version "4.19.3" + resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.19.3.tgz#2bdbcb87089374d933596f8645615142ed727666" + integrity sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ== dependencies: - prelude-ls "~1.1.2" - -type-detect@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + esbuild "~0.25.0" + get-tsconfig "^4.7.5" + optionalDependencies: + fsevents "~2.3.3" -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== +typescript@^5.4.5: + version "5.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4" + integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ== -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== +undici@^5.25.4: + version "5.29.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3" + integrity sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg== dependencies: - is-typedarray "^1.0.0" + "@fastify/busboy" "^2.0.0" unique-filename@^3.0.0: version "3.0.0" @@ -4359,131 +936,7 @@ unique-slug@^4.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" - integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - dependencies: - punycode "^2.1.0" - -url-join@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" - integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== - -url-template@~2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - -v8-to-istanbul@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" - integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - source-map "^0.7.3" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - -walker@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= - dependencies: - makeerror "1.0.x" - -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - -whatwg-url@^8.0.0: - version "8.2.2" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd" - integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^2.0.2" - webidl-conversions "^6.1.0" - -whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== - dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" - -which@1, which@^1.2.10: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -4497,25 +950,7 @@ which@^4.0.0: dependencies: isexe "^3.1.1" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - dependencies: - string-width "^1.0.2 || 2" - -wide-align@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -word-wrap@~1.2.3: - version "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== - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm: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== @@ -4533,82 +968,7 @@ wrap-ansi@^8.1.0: string-width "^5.0.1" strip-ansi "^7.0.1" -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@^7.4.6: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== - -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.7.2: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" From 769431fd4f59d02917f2c4c830805c46e54fa1a7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:19:17 +0100 Subject: [PATCH 0286/1338] Remove unused jest transformer --- app/test/esm-transformer.js | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 app/test/esm-transformer.js diff --git a/app/test/esm-transformer.js b/app/test/esm-transformer.js deleted file mode 100644 index 381151b9616..00000000000 --- a/app/test/esm-transformer.js +++ /dev/null @@ -1,15 +0,0 @@ -// Replaces jest-esm-transformer which is apparently no longer maintained, see -// https://github.com/ActuallyACat/jest-esm-transformer/pull/9 -const babel = require('@babel/core') - -module.exports = { - process(src) { - const options = { - babelrc: false, - compact: false, - plugins: [require.resolve('@babel/plugin-transform-modules-commonjs')], - } - - return babel.transform(src, options) - }, -} From 2fcaadbb2b16b4c2aa9a941b9eadde30f9c5dacd Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:19:25 +0100 Subject: [PATCH 0287/1338] No need to ignore jest when we don't have it --- script/.eslintrc.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/script/.eslintrc.yml b/script/.eslintrc.yml index 035b4d895f0..793329336d0 100644 --- a/script/.eslintrc.yml +++ b/script/.eslintrc.yml @@ -1,10 +1,3 @@ rules: unicorn/no-process-exit: off import/no-commonjs: off - -overrides: - - files: 'jest.config.js' - rules: - strict: - - error - - never From 0661ae1f7af63b77b7322e57613938b6efb92740 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:19:53 +0100 Subject: [PATCH 0288/1338] :book: --- docs/technical/adding-tests.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/technical/adding-tests.md b/docs/technical/adding-tests.md index 7d813e75af7..c01962cedda 100644 --- a/docs/technical/adding-tests.md +++ b/docs/technical/adding-tests.md @@ -21,8 +21,6 @@ Other important folders: - `fixtures` - this folder contains Git repositories which can be used in tests - `helpers` - modules containing logic to help setup, manage and teardown tests - - `__mocks__` - this is a special Jest folder that contains mocks for Electron - APIs, which are only stubbed out when tests require it ## Adding Unit Tests @@ -50,7 +48,7 @@ describe('module being tested', () => { ``` If you run `yarn test:unit` from a shell you should see this error, which -indicates the file is loaded into our Jest runner successfully. +indicates the file is loaded into our test runner successfully. Once you're happy that the test is being run, feel free to write some proper tests to exercise your work. From f26ae32f1f7bf9d456f6ea5ee4ce9a6f10803f70 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:23:14 +0100 Subject: [PATCH 0289/1338] :book: --- docs/contributing/setup.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/contributing/setup.md b/docs/contributing/setup.md index 0003ace7a20..b04eca4db5f 100644 --- a/docs/contributing/setup.md +++ b/docs/contributing/setup.md @@ -64,11 +64,14 @@ problems. ## Running tests -- `yarn test` - Runs all unit and integration tests +- `yarn test` - Alias for `yarn test:unit` +- `yarn test:script` - Runs all script tests +- `yarn test:eslint` - Runs all eslint tests - `yarn test:unit` - Runs all unit tests - - Add `` or `` argument to only run tests in the specified file or files matching a pattern - - Add `-t ` to only match tests whose name matches a regex - - For more information on these and other arguments, see [Jest CLI options](https://jestjs.io/docs/en/23.x/cli) + - Add `` argument to only run tests in the specified file + - Add `` to search for tests matching our test pattern in the given directory + - Add `--test-name-pattern ` to only match tests whose name matches the pattern + - For more information on these and other arguments, see [Node CLI options](https://nodejs.org/api/test.html) ## Debugging From 02c2abbf61bb4456ae43b3825132c9e5f83115f8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:23:39 +0100 Subject: [PATCH 0290/1338] Don't ignore all of the vendor directory --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c1caea584f..a2a6a3ef6eb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,8 @@ "**/node_modules": true, "**/out": true, "app/test/fixtures": true, - "vendor": true + "vendor/yarn-*": true, + "app/static/common/choosealicense.com": true }, "files.exclude": { "**/.git": true, From 989eb06e0c91a2b8c52d3e832a5c7cc517b3ba4c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:23:39 +0100 Subject: [PATCH 0291/1338] Don't ignore all of the vendor directory --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c1caea584f..a2a6a3ef6eb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,8 @@ "**/node_modules": true, "**/out": true, "app/test/fixtures": true, - "vendor": true + "vendor/yarn-*": true, + "app/static/common/choosealicense.com": true }, "files.exclude": { "**/.git": true, From e9918436dde218bec437f29588d71a35149bace4 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:27:12 +0100 Subject: [PATCH 0292/1338] There's no tests in here, let alone jests --- vendor/desktop-notifications/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/desktop-notifications/package.json b/vendor/desktop-notifications/package.json index c01c8f45a54..938d4b41f6d 100644 --- a/vendor/desktop-notifications/package.json +++ b/vendor/desktop-notifications/package.json @@ -8,7 +8,6 @@ "install": "node-gyp rebuild && tsc", "build": "tsc", "pretest": "yarn build", - "test": "jest -c jest.json", "prettify": "yarn prettier --write \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"", "check-prettier": "prettier --check \"./**/*.{ts,tsx,js,json,jsx,scss,html,yaml,yml}\"" }, From 4fac1aa5c5043c361466f3379a532b76d10edc9d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 15:53:49 +0100 Subject: [PATCH 0293/1338] assert.rejects with lambda --- app/test/unit/git/commit-test.ts | 2 +- app/test/unit/git/diff-test.ts | 2 +- app/test/unit/git/pull/ahead-and-behind-test.ts | 2 +- app/test/unit/git/remote-test.ts | 2 +- app/test/unit/git/stash-test.ts | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 14efdcd69eb..698b4249e36 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -736,7 +736,7 @@ describe('git/commit', () => { it('throws an error', async () => { const status = await getStatusOrThrow(repository) await assert.rejects( - createMergeCommit(repository, status.workingDirectory.files), + () => createMergeCommit(repository, status.workingDirectory.files), /There are no changes to commit./ ) }) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index be454c32dfe..d92a5c6c4f2 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -406,7 +406,7 @@ describe('git/diff', () => { repo = await setupEmptyRepository() }) it('throws since HEAD doesnt exist', async () => { - await assert.rejects(getBinaryPaths(repo, 'HEAD', [])) + await assert.rejects(() => getBinaryPaths(repo, 'HEAD', [])) }) }) diff --git a/app/test/unit/git/pull/ahead-and-behind-test.ts b/app/test/unit/git/pull/ahead-and-behind-test.ts index 30b9d2d622c..ba66ff5489d 100644 --- a/app/test/unit/git/pull/ahead-and-behind-test.ts +++ b/app/test/unit/git/pull/ahead-and-behind-test.ts @@ -155,7 +155,7 @@ describe('git/pull', () => { }) it(`throws an error as the user blocks merge commits on pull`, async () => { - await assert.rejects(pull(repository, remote)) + await assert.rejects(() => pull(repository, remote)) }) }) }) diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index 67cb5856fde..d1bb27abb7c 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -180,7 +180,7 @@ describe('git/remote', () => { assert.equal(remotes[0].url, newUrl) }) it('returns false for unknown remote name', async () => { - await assert.rejects(setRemoteURL(repository, 'none', newUrl)) + await assert.rejects(() => setRemoteURL(repository, 'none', newUrl)) const remotes = await getRemotes(repository) assert.equal(remotes.length, 1) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index 17e77e11d03..df0a357adcf 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -304,7 +304,9 @@ describe('git/stash', () => { await FSE.writeFile(readme, generateString()) const entryToApply = desktopEntries[0] - await assert.rejects(popStashEntry(repository, entryToApply.stashSha)) + await assert.rejects(() => + popStashEntry(repository, entryToApply.stashSha) + ) }) }) }) From 980d1e53887f46bf0bfc9a466a82419c87caf633 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:14:57 +0100 Subject: [PATCH 0294/1338] Bind lifetime of test directories using test context --- app/test/helpers/repositories.ts | 45 ++-- .../repository-builder-branch-pruner.ts | 5 +- .../repository-builder-cherry-pick-test.ts | 4 +- .../repository-builder-long-rebase-test.ts | 4 +- .../helpers/repository-builder-pull-test.ts | 4 +- .../helpers/repository-builder-rebase-test.ts | 4 +- app/test/helpers/repository-scaffolding.ts | 9 +- app/test/helpers/temp.ts | 24 +- app/test/unit/branch-pruner-test.ts | 24 +- app/test/unit/desktop-file-transport-test.ts | 22 +- app/test/unit/format-commit-message-test.ts | 36 +-- app/test/unit/git-store-test.ts | 73 +++--- app/test/unit/git/apply-test.ts | 83 +++---- app/test/unit/git/branch-test.ts | 86 +++---- app/test/unit/git/checkout-test.ts | 24 +- app/test/unit/git/cherry-pick-test.ts | 205 +++++++++------- app/test/unit/git/commit-test.ts | 149 ++++++------ app/test/unit/git/config-test.ts | 85 ++++--- app/test/unit/git/core-test.ts | 40 ++-- app/test/unit/git/description-test.ts | 12 +- app/test/unit/git/diff-check-test.ts | 24 +- app/test/unit/git/diff-test.ts | 223 ++++++++++-------- app/test/unit/git/fetch-test.ts | 19 +- app/test/unit/git/for-each-ref-test.ts | 30 ++- app/test/unit/git/format-patch-test.ts | 45 ++-- app/test/unit/git/git-attributes-test.ts | 4 +- app/test/unit/git/gitignore-test.ts | 40 ++-- app/test/unit/git/lfs-test.ts | 36 +-- app/test/unit/git/log-test.ts | 65 +++-- app/test/unit/git/merge-test.ts | 50 ++-- .../unit/git/pull/ahead-and-behind-test.ts | 89 +++---- app/test/unit/git/pull/only-ahead-test.ts | 90 +++---- app/test/unit/git/pull/only-behind-test.ts | 76 +++--- .../unit/git/rebase/detect-conflict-test.ts | 171 +++++++------- app/test/unit/git/rebase/progress-test.ts | 97 ++++---- app/test/unit/git/ref-test.ts | 8 +- app/test/unit/git/reflog-test.ts | 39 +-- app/test/unit/git/remote-test.ts | 52 ++-- app/test/unit/git/reorder-test.ts | 48 ++-- app/test/unit/git/reset-test.ts | 19 +- app/test/unit/git/rev-parse-test.ts | 48 ++-- app/test/unit/git/squash-test.ts | 58 +++-- app/test/unit/git/stash-test.ts | 126 +++++----- app/test/unit/git/status-test.ts | 90 +++---- app/test/unit/git/submodule-test.ts | 28 ++- app/test/unit/git/tag-test.ts | 82 ++++--- .../parse-files-to-be-overwritten-test.ts | 20 +- app/test/unit/patch-formatter-test.ts | 27 ++- .../stores/updates/update-remote-url-test.ts | 25 +- app/test/unit/write-default-readme-test.ts | 20 +- 50 files changed, 1474 insertions(+), 1213 deletions(-) diff --git a/app/test/helpers/repositories.ts b/app/test/helpers/repositories.ts index e5c569da99d..73f23ea0781 100644 --- a/app/test/helpers/repositories.ts +++ b/app/test/helpers/repositories.ts @@ -1,12 +1,13 @@ import * as Path from 'path' import * as FSE from 'fs-extra' -import { mkdirSync } from './temp' +import { createTempDirectory } from './temp' import klawSync, { Item } from 'klaw-sync' import { Repository } from '../../src/models/repository' import { exec } from 'dugite' import { makeCommit, switchTo } from './repository-scaffolding' import { writeFile } from 'fs-extra' import { git } from '../../src/lib/git' +import { TestContext } from 'node:test' /** * Set up the named fixture repository to be used in a test. @@ -14,6 +15,7 @@ import { git } from '../../src/lib/git' * @returns The path to the set up fixture repository. */ export async function setupFixtureRepository( + t: TestContext, repositoryName: string ): Promise { const testRepoFixturePath = Path.join( @@ -22,7 +24,7 @@ export async function setupFixtureRepository( 'fixtures', repositoryName ) - const testRepoPath = mkdirSync('desktop-git-test-') + const testRepoPath = await createTempDirectory(t) await FSE.copy(testRepoFixturePath, testRepoPath) await FSE.rename( @@ -55,8 +57,10 @@ export async function setupFixtureRepository( * * @returns the new local repository */ -export async function setupEmptyRepository(): Promise { - const repoPath = mkdirSync('desktop-empty-repo-') +export async function setupEmptyRepository( + t: TestContext +): Promise { + const repoPath = await createTempDirectory(t) await exec(['init'], repoPath) return new Repository(repoPath, -1, null, false) @@ -68,8 +72,10 @@ export async function setupEmptyRepository(): Promise { * * @returns the new local repository */ -export async function setupEmptyRepositoryDefaultMain(): Promise { - const repoPath = mkdirSync('desktop-empty-repo-') +export async function setupEmptyRepositoryDefaultMain( + t: TestContext +): Promise { + const repoPath = await createTempDirectory(t) await exec(['init', '-b', 'main'], repoPath) return new Repository(repoPath, -1, null, false) @@ -80,8 +86,8 @@ export async function setupEmptyRepositoryDefaultMain(): Promise { * repository. This should only be used to test error handling of the Git * interactions. */ -export function setupEmptyDirectory(): Repository { - const repoPath = mkdirSync('no-repository-here') +export async function setupEmptyDirectory(t: TestContext) { + const repoPath = await createTempDirectory(t) return new Repository(repoPath, -1, null, false) } @@ -95,8 +101,8 @@ export function setupEmptyDirectory(): Repository { * * The conflicted file will be 'foo'. */ -export async function setupConflictedRepo(): Promise { - const repo = await setupEmptyRepository() +export async function setupConflictedRepo(t: TestContext): Promise { + const repo = await setupEmptyRepository(t) const firstCommit = { entries: [{ path: 'foo', contents: '' }], @@ -136,8 +142,10 @@ export async function setupConflictedRepo(): Promise { * * The conflicted file will be 'foo'. There will also be uncommitted changes unrelated to the merge in 'perlin'. */ -export async function setupConflictedRepoWithUnrelatedCommittedChange(): Promise { - const repo = await setupEmptyRepository() +export async function setupConflictedRepoWithUnrelatedCommittedChange( + t: TestContext +): Promise { + const repo = await setupEmptyRepository(t) const firstCommit = { entries: [ @@ -182,8 +190,10 @@ export async function setupConflictedRepoWithUnrelatedCommittedChange(): Promise * * The conflicted files will be 'foo', 'bar', and 'baz'. */ -export async function setupConflictedRepoWithMultipleFiles(): Promise { - const repo = await setupEmptyRepository() +export async function setupConflictedRepoWithMultipleFiles( + t: TestContext +): Promise { + const repo = await setupEmptyRepository(t) const firstCommit = { entries: [ @@ -233,8 +243,8 @@ export async function setupConflictedRepoWithMultipleFiles(): Promise { - const repo = await setupEmptyRepository() +export async function setupTwoCommitRepo(t: TestContext): Promise { + const repo = await setupEmptyRepository(t) const firstCommit = { entries: [ @@ -260,9 +270,10 @@ export async function setupTwoCommitRepo(): Promise { * local "upstream" repository. */ export async function setupLocalForkOfRepository( + t: TestContext, upstream: Repository ): Promise { - const path = mkdirSync('desktop-fork-repo-') + const path = await createTempDirectory(t) await git(['clone', '--local', `${upstream.path}`, path], path, 'clone') return new Repository(path, -1, null, false) } diff --git a/app/test/helpers/repository-builder-branch-pruner.ts b/app/test/helpers/repository-builder-branch-pruner.ts index c837a9dc174..dbbaa25d63a 100644 --- a/app/test/helpers/repository-builder-branch-pruner.ts +++ b/app/test/helpers/repository-builder-branch-pruner.ts @@ -10,9 +10,10 @@ import { import { IAPIFullRepository, getDotComAPIEndpoint } from '../../src/lib/api' import { shell } from './test-app-shell' import { TestStatsStore } from './test-stats-store' +import { TestContext } from 'node:test' -export async function createRepository() { - const repo = await setupEmptyRepository() +export async function createRepository(t: TestContext) { + const repo = await setupEmptyRepository(t) const firstCommit = { entries: [ diff --git a/app/test/helpers/repository-builder-cherry-pick-test.ts b/app/test/helpers/repository-builder-cherry-pick-test.ts index 8c441a2c343..15b0621c2aa 100644 --- a/app/test/helpers/repository-builder-cherry-pick-test.ts +++ b/app/test/helpers/repository-builder-cherry-pick-test.ts @@ -1,3 +1,4 @@ +import { TestContext } from 'node:test' import { Repository } from '../../src/models/repository' import { setupEmptyRepositoryDefaultMain } from './repositories' import { makeCommit, switchTo, createBranch } from './repository-scaffolding' @@ -9,10 +10,11 @@ import { makeCommit, switchTo, createBranch } from './repository-scaffolding' * - creates `targetBranchName` off of default branch */ export async function createRepository( + t: TestContext, featureBranchName: string, targetBranchName: string ): Promise { - const repository = await setupEmptyRepositoryDefaultMain() + const repository = await setupEmptyRepositoryDefaultMain(t) const firstCommit = { commitMessage: 'First!', diff --git a/app/test/helpers/repository-builder-long-rebase-test.ts b/app/test/helpers/repository-builder-long-rebase-test.ts index 2a87080526e..1e78f840d64 100644 --- a/app/test/helpers/repository-builder-long-rebase-test.ts +++ b/app/test/helpers/repository-builder-long-rebase-test.ts @@ -1,3 +1,4 @@ +import { TestContext } from 'node:test' import { Repository } from '../../src/models/repository' import { setupEmptyRepository } from './repositories' import { makeCommit, switchTo, createBranch } from './repository-scaffolding' @@ -10,10 +11,11 @@ import { makeCommit, switchTo, createBranch } from './repository-scaffolding' * - ten commits on `secondBranchName`, which is also based on `master` */ export async function createRepository( + t: TestContext, firstBranchName: string, secondBranchName: string ): Promise { - const repository = await setupEmptyRepository() + const repository = await setupEmptyRepository(t) // make two commits on `master` to setup the README diff --git a/app/test/helpers/repository-builder-pull-test.ts b/app/test/helpers/repository-builder-pull-test.ts index 724a5742235..594a02a2b58 100644 --- a/app/test/helpers/repository-builder-pull-test.ts +++ b/app/test/helpers/repository-builder-pull-test.ts @@ -1,3 +1,4 @@ +import { TestContext } from 'node:test' import { Repository } from '../../src/models/repository' import { setupEmptyRepository } from './repositories' import { makeCommit, switchTo } from './repository-scaffolding' @@ -10,9 +11,10 @@ import { makeCommit, switchTo } from './repository-scaffolding' * @param branchName name to use for new branch */ export async function createRepository( + t: TestContext, branchName: string ): Promise { - const repository = await setupEmptyRepository() + const repository = await setupEmptyRepository(t) // make two commits on `master` to setup the README diff --git a/app/test/helpers/repository-builder-rebase-test.ts b/app/test/helpers/repository-builder-rebase-test.ts index c2bb97b2f43..8644d79dde2 100644 --- a/app/test/helpers/repository-builder-rebase-test.ts +++ b/app/test/helpers/repository-builder-rebase-test.ts @@ -1,3 +1,4 @@ +import { TestContext } from 'node:test' import { Repository } from '../../src/models/repository' import { setupEmptyRepository } from './repositories' import { makeCommit, switchTo, createBranch } from './repository-scaffolding' @@ -10,10 +11,11 @@ import { makeCommit, switchTo, createBranch } from './repository-scaffolding' * - one commit on `secondBranchName`, which is also based on `master` */ export async function createRepository( + t: TestContext, firstBranchName: string, secondBranchName: string ): Promise { - const repository = await setupEmptyRepository() + const repository = await setupEmptyRepository(t) // make two commits on `master` to setup the README diff --git a/app/test/helpers/repository-scaffolding.ts b/app/test/helpers/repository-scaffolding.ts index 7822664adfb..956dec90d8a 100644 --- a/app/test/helpers/repository-scaffolding.ts +++ b/app/test/helpers/repository-scaffolding.ts @@ -1,9 +1,10 @@ import { exec } from 'dugite' import * as FSE from 'fs-extra' import * as Path from 'path' +import { TestContext } from 'node:test' import { Repository } from '../../src/models/repository' -import { mkdirSync } from './temp' +import { createTempDirectory } from './temp' type TreeEntry = { /** The relative path of the file in the repository */ @@ -31,9 +32,10 @@ type Tree = { * push/pull/fetch operations can be tested without requiring the network. */ export async function cloneRepository( + t: TestContext, repository: Repository ): Promise { - const newDirectory = mkdirSync('desktop-git-clone-') + const newDirectory = await createTempDirectory(t) await exec(['clone', repository.path, '--', newDirectory], __dirname) @@ -90,9 +92,10 @@ export async function switchTo(repository: Repository, branch: string) { } export async function cloneLocalRepository( + t: TestContext, repository: Repository ): Promise { - const repoPath = mkdirSync('blank-folder') + const repoPath = await createTempDirectory(t) const args = ['clone', '--', repository.path, repoPath] const result = await exec(args, repository.path) diff --git a/app/test/helpers/temp.ts b/app/test/helpers/temp.ts index 219f12cc70c..15168cd8182 100644 --- a/app/test/helpers/temp.ts +++ b/app/test/helpers/temp.ts @@ -3,19 +3,13 @@ /** Module for creating and managing temporary directories and files, using the * `temp` Node module */ -import * as temp from 'temp' -import { promisify } from 'util' -const _temp = temp.track() +import { mkdtemp, rm } from 'fs/promises' +import { tmpdir } from 'os' +import { join } from 'path' +import { TestContext } from 'node:test' -/** - * Open a new temporary directory, specifying the prefix/suffix options the - * directory should use - */ -export const mkdirSync = _temp.mkdirSync -/** - * Open a new temporary file, specifying the prefix/suffix options the file - * should use - */ -export const openSync = _temp.openSync - -export const createTempDirectory = promisify(_temp.mkdir.bind(_temp)) +export const createTempDirectory = (t: TestContext) => + mkdtemp(join(tmpdir(), 'desktop-test-')).then(path => { + t.after(() => rm(path, { recursive: true })) + return path + }) diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index f7dcc27e7da..59e78e607f5 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -35,8 +35,8 @@ describe('BranchPruner', () => { afterEach(() => repositoriesDb.delete()) - it('does nothing on non GitHub repositories', async () => { - const path = await setupFixtureRepository('branch-prune-tests') + it('does nothing on non GitHub repositories', async t => { + const path = await setupFixtureRepository(t, 'branch-prune-tests') const repo = await setupRepository( path, @@ -61,10 +61,10 @@ describe('BranchPruner', () => { assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) - it('prunes for GitHub repository', async () => { + it('prunes for GitHub repository', async t => { const lastPruneDate = new Date(offsetFromNow(-1, 'day')) - const path = await setupFixtureRepository('branch-prune-tests') + const path = await setupFixtureRepository(t, 'branch-prune-tests') const repo = await setupRepository( path, repositoriesStore, @@ -88,9 +88,9 @@ describe('BranchPruner', () => { assert(branchesAfterPruning.includes('not-deleted-branch-1')) }) - it('does not prune if the last prune date is less than 24 hours ago', async () => { + it('does not prune if the last prune date is less than 24 hours ago', async t => { const lastPruneDate = new Date(offsetFromNow(-4, 'hours')) - const path = await setupFixtureRepository('branch-prune-tests') + const path = await setupFixtureRepository(t, 'branch-prune-tests') const repo = await setupRepository( path, repositoriesStore, @@ -114,9 +114,9 @@ describe('BranchPruner', () => { assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) - it('does not prune if there is no default branch', async () => { + it('does not prune if there is no default branch', async t => { const lastPruneDate = new Date(offsetFromNow(-1, 'day')) - const repoPath = await setupFixtureRepository('branch-prune-tests') + const repoPath = await setupFixtureRepository(t, 'branch-prune-tests') FSE.unlink(path.join(repoPath, '.git', 'refs', 'remotes', 'origin', 'HEAD')) const repo = await setupRepository( @@ -142,10 +142,10 @@ describe('BranchPruner', () => { assert.deepStrictEqual(branchesBeforePruning, branchesAfterPruning) }) - it('does not prune reserved branches', async () => { + it('does not prune reserved branches', async t => { const lastPruneDate = new Date(offsetFromNow(-1, 'day')) - const path = await setupFixtureRepository('branch-prune-tests') + const path = await setupFixtureRepository(t, 'branch-prune-tests') const repo = await setupRepository( path, repositoriesStore, @@ -181,8 +181,8 @@ describe('BranchPruner', () => { } }) - it('never prunes a branch that lacks an upstream', async () => { - const path = await createPrunedRepository() + it('never prunes a branch that lacks an upstream', async t => { + const path = await createPrunedRepository(t) const lastPruneDate = new Date(offsetFromNow(-1, 'day')) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 49c0106fcbf..f2dca9c667b 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -14,23 +14,23 @@ const format = (msg: string, lvl: string) => ({ [MESSAGE]: msg, [LEVEL]: lvl }) const info = (t: DesktopFileTransport, m: string) => write(t, format(m, 'info')) describe('DesktopFileTransport', () => { - it('creates a file on demand', async () => { - const d = await createTempDirectory('desktop-logs') - const t = new DesktopFileTransport({ logDirectory: d }) + it('creates a file on demand', async t => { + const d = await createTempDirectory(t) + const transport = new DesktopFileTransport({ logDirectory: d }) assert((await readdir(d)).length === 0) - await info(t, 'heyo') + await info(transport, 'heyo') const files = await readdir(d) assert.equal(files.length, 1) assert.equal(await readFile(join(d, files[0]), 'utf8'), `heyo${EOL}`) - t.close() + await promisify(transport.close).call(transport) }) it('creates a file for each day', async t => { t.mock.timers.enable({ apis: ['Date'] }) - const d = await createTempDirectory('desktop-logs') + const d = await createTempDirectory(t) const transport = new DesktopFileTransport({ logDirectory: d }) assert.equal((await readdir(d)).length, 0) @@ -43,12 +43,12 @@ describe('DesktopFileTransport', () => { assert.equal((await readdir(d)).length, 2) - transport.close() + await promisify(transport.close).call(transport) }) it('retains a maximum of 14 log files', async t => { t.mock.timers.enable({ apis: ['Date'] }) - const d = await createTempDirectory('desktop-logs') + const d = await createTempDirectory(t) const transport = new DesktopFileTransport({ logDirectory: d }) const dates = [ @@ -80,8 +80,12 @@ describe('DesktopFileTransport', () => { await info(transport, 'heyo') } + console.log('FILETRANSPORT:readdir') + const retainedFiles = await readdir(d) + console.log('FILETRANSPORT:readdir done') + // Retains the newest files (ISO date is lexicographically sortable) assert.deepStrictEqual(retainedFiles.sort(), [ '2022-03-07.desktop.development.log', @@ -100,6 +104,6 @@ describe('DesktopFileTransport', () => { '2022-03-20.desktop.development.log', ]) - transport.close() + await promisify(transport.close).call(transport) }) }) diff --git a/app/test/unit/format-commit-message-test.ts b/app/test/unit/format-commit-message-test.ts index 35d5ade7572..87187f1b1e3 100644 --- a/app/test/unit/format-commit-message-test.ts +++ b/app/test/unit/format-commit-message-test.ts @@ -4,8 +4,8 @@ import { formatCommitMessage } from '../../src/lib/format-commit-message' import { setupEmptyRepository } from '../helpers/repositories' describe('formatCommitMessage', () => { - it('always adds trailing newline', async () => { - const repo = await setupEmptyRepository() + it('always adds trailing newline', async t => { + const repo = await setupEmptyRepository(t) assert.equal( await formatCommitMessage(repo, { summary: 'test', description: null }), @@ -17,32 +17,32 @@ describe('formatCommitMessage', () => { ) }) - it('omits description when null', async () => { - const repo = await setupEmptyRepository() + it('omits description when null', async t => { + const repo = await setupEmptyRepository(t) assert.equal( await formatCommitMessage(repo, { summary: 'test', description: null }), 'test\n' ) }) - it('omits description when empty string', async () => { - const repo = await setupEmptyRepository() + it('omits description when empty string', async t => { + const repo = await setupEmptyRepository(t) assert.equal( await formatCommitMessage(repo, { summary: 'test', description: '' }), 'test\n' ) }) - it('adds two newlines between summary and description', async () => { - const repo = await setupEmptyRepository() + it('adds two newlines between summary and description', async t => { + const repo = await setupEmptyRepository(t) assert.equal( await formatCommitMessage(repo, { summary: 'foo', description: 'bar' }), 'foo\n\nbar\n' ) }) - it('appends trailers to a summary-only message', async () => { - const repo = await setupEmptyRepository() + it('appends trailers to a summary-only message', async t => { + const repo = await setupEmptyRepository(t) const trailers = [ { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, @@ -59,8 +59,8 @@ describe('formatCommitMessage', () => { ) }) - it('appends trailers to a regular message', async () => { - const repo = await setupEmptyRepository() + it('appends trailers to a regular message', async t => { + const repo = await setupEmptyRepository(t) const trailers = [ { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, @@ -78,8 +78,8 @@ describe('formatCommitMessage', () => { }) // note, this relies on the default git config - it('merges duplicate trailers', async () => { - const repo = await setupEmptyRepository() + it('merges duplicate trailers', async t => { + const repo = await setupEmptyRepository(t) const trailers = [ { token: 'Co-Authored-By', value: 'Markus Olsson ' }, { token: 'Signed-Off-By', value: 'nerdneha ' }, @@ -97,8 +97,8 @@ describe('formatCommitMessage', () => { }) // note, this relies on the default git config - it('fixes up malformed trailers when trailers are given', async () => { - const repo = await setupEmptyRepository() + it('fixes up malformed trailers when trailers are given', async t => { + const repo = await setupEmptyRepository(t) const trailers = [ { token: 'Signed-Off-By', value: 'nerdneha ' }, ] @@ -117,8 +117,8 @@ describe('formatCommitMessage', () => { }) // note, this relies on the default git config - it("doesn't treat --- as end of commit message", async () => { - const repo = await setupEmptyRepository() + it("doesn't treat --- as end of commit message", async t => { + const repo = await setupEmptyRepository(t) const trailers = [ { token: 'Signed-Off-By', value: 'nerdneha ' }, ] diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index 8b1f2f6018b..972ca136310 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -12,7 +12,6 @@ import { import { GitStore } from '../../src/lib/stores' import { AppFileStatusKind } from '../../src/models/status' import { Repository } from '../../src/models/repository' -import { Commit } from '../../src/models/commit' import { TipState, IValidBranch } from '../../src/models/tip' import { getCommit, getRemotes } from '../../src/lib/git' import { getStatusOrThrow } from '../helpers/status' @@ -26,8 +25,11 @@ import { TestStatsStore } from '../helpers/test-stats-store' describe('GitStore', () => { describe('loadCommitBatch', () => { - it('includes HEAD when loading commits', async () => { - const path = await setupFixtureRepository('repository-with-105-commits') + it('includes HEAD when loading commits', async t => { + const path = await setupFixtureRepository( + t, + 'repository-with-105-commits' + ) const repo = new Repository(path, -1, null, false) const gitStore = new GitStore(repo, shell, new TestStatsStore()) @@ -39,8 +41,8 @@ describe('GitStore', () => { }) }) - it('can discard changes from a repository', async () => { - const repo = await setupEmptyRepository() + it('can discard changes from a repository', async t => { + const repo = await setupEmptyRepository(t) const gitStore = new GitStore(repo, shell, new TestStatsStore()) const readmeFile = 'README.md' @@ -77,8 +79,8 @@ describe('GitStore', () => { assert.equal(files.length, 1) }) - it('can discard a renamed file', async () => { - const repo = await setupEmptyRepository() + it('can discard a renamed file', async t => { + const repo = await setupEmptyRepository(t) const gitStore = new GitStore(repo, shell, new TestStatsStore()) const file = 'README.md' @@ -105,14 +107,9 @@ describe('GitStore', () => { }) describe('undo first commit', () => { - let repository: Repository - let firstCommit: Commit | null = null - const commitMessage = 'added file' - - beforeEach(async () => { - debugger - repository = await setupEmptyRepository() + const setupRepo = async (t: TestContext) => { + const repository = await setupEmptyRepository(t) const file = 'README.md' const filePath = Path.join(repository.path, file) @@ -122,12 +119,15 @@ describe('GitStore', () => { await exec(['add', file], repository.path) await exec(['commit', '-m', commitMessage], repository.path) - firstCommit = await getCommit(repository, 'master') + const firstCommit = await getCommit(repository, 'master') assert(firstCommit !== null) assert.equal(firstCommit.parentSHAs.length, 0) - }) - it('reports the repository is unborn', async () => { + return { repository, firstCommit } + } + + it('reports the repository is unborn', async t => { + const { repository, firstCommit } = await setupRepo(t) const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -140,7 +140,9 @@ describe('GitStore', () => { assert(after.currentTip === undefined) }) - it('pre-fills the commit message', async () => { + it('pre-fills the commit message', async t => { + const { repository, firstCommit } = await setupRepo(t) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) assert(firstCommit !== null) @@ -151,7 +153,9 @@ describe('GitStore', () => { assert.equal(newCommitMessage.summary, commitMessage) }) - it('clears the undo commit dialog', async () => { + it('clears the undo commit dialog', async t => { + const { repository, firstCommit } = await setupRepo(t) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -172,7 +176,9 @@ describe('GitStore', () => { assert.equal(gitStore.localCommitSHAs.length, 0) }) - it('has no staged files', async () => { + it('has no staged files', async t => { + const { repository, firstCommit } = await setupRepo(t) + const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadStatus() @@ -202,8 +208,8 @@ describe('GitStore', () => { }) describe('repository with HEAD file', () => { - it('can discard modified change cleanly', async () => { - const path = await setupFixtureRepository('repository-with-HEAD-file') + it('can discard modified change cleanly', async t => { + const path = await setupFixtureRepository(t, 'repository-with-HEAD-file') const repo = new Repository(path, 1, null, false) const gitStore = new GitStore(repo, shell, new TestStatsStore()) @@ -225,10 +231,8 @@ describe('GitStore', () => { }) describe('loadBranches', () => { - let upstream: Repository - let repository: Repository - beforeEach(async () => { - upstream = await setupEmptyRepository() + const setupRepositories = async (t: TestContext) => { + const upstream = await setupEmptyRepository(t) await makeCommit(upstream, { commitMessage: 'first commit', entries: [ @@ -270,15 +274,19 @@ describe('GitStore', () => { // move this repository back to `master` before cloning await switchTo(upstream, 'master') - repository = await cloneLocalRepository(upstream) - }) + const repository = await cloneLocalRepository(t, upstream) + + return { upstream, repository } + } - it('has a remote defined', async () => { + it('has a remote defined', async t => { + const { repository } = await setupRepositories(t) const remotes = await getRemotes(repository) assert.equal(remotes.length, 1) }) - it('will merge a local and remote branch when tracking branch set', async () => { + it('will merge a local and remote branch when tracking branch set', async t => { + const { repository } = await setupRepositories(t) const gitStore = new GitStore(repository, shell, new TestStatsStore()) await gitStore.loadBranches() @@ -295,7 +303,8 @@ describe('GitStore', () => { assert.equal(remoteBranch.type, BranchType.Remote) }) - it('the tracking branch is not cleared when the remote branch is removed', async () => { + it('the tracking branch is not cleared when the remote branch is removed', async t => { + const { repository, upstream } = await setupRepositories(t) // checkout the other branch after cloning await exec(['checkout', 'some-other-branch'], repository.path) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index f3189008fbe..69143fdd6da 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { exec } from 'dugite' import { @@ -32,11 +32,9 @@ import { structuredPatch } from 'diff' describe('git/apply', () => { describe('checkPatch()', () => { describe('on related repository without conflicts', () => { - let repository: Repository - let patch: string - beforeEach(async () => { - const originalRepo = await setupTwoCommitRepo() - repository = await cloneLocalRepository(originalRepo) + it('returns true', async t => { + const originalRepo = await setupTwoCommitRepo(t) + const repository = await cloneLocalRepository(t, originalRepo) await makeCommit(originalRepo, { entries: [{ path: 'just-okay-file', contents: 'okay' }], }) @@ -44,38 +42,30 @@ describe('git/apply', () => { ['format-patch', '--stdout', 'HEAD~'], originalRepo.path ) - patch = result.stdout - }) - it('returns true', async () => { + const patch = result.stdout assert.equal(await checkPatch(repository, patch), true) }) }) describe('on a related repo with conflicts', () => { - let repository: Repository - let patch: string - beforeEach(async () => { - const originalRepo = await setupTwoCommitRepo() + it('returns false', async t => { + const originalRepo = await setupTwoCommitRepo(t) const result = await exec( ['format-patch', '--stdout', 'HEAD~'], originalRepo.path ) - patch = result.stdout - repository = await cloneLocalRepository(originalRepo) + const patch = result.stdout + const repository = await cloneLocalRepository(t, originalRepo) await makeCommit(repository, { entries: [{ path: 'good-file', contents: 'okay' }], }) - }) - it('returns false', async () => { + assert.equal(await checkPatch(repository, patch), false) }) }) }) describe('discardChangesFromSelection()', () => { - let repository: Repository - let testRepoPath: string - - async function getDiff(filePath: string) { + async function getDiff(repository: Repository, filePath: string) { const file = new WorkingDirectoryFileChange( filePath, { kind: AppFileStatusKind.Modified }, @@ -84,14 +74,12 @@ describe('git/apply', () => { return (await getWorkingDirectoryDiff(repository, file)) as ITextDiff } - beforeEach(async () => { - testRepoPath = await setupFixtureRepository('repo-with-changes') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('does not change the file when an empty selection is passed', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) - it('does not change the file when an empty selection is passed', async () => { const filePath = 'modified-file.md' - const previousDiff = await getDiff(filePath) + const previousDiff = await getDiff(repository, filePath) await discardChangesFromSelection( repository, @@ -100,28 +88,34 @@ describe('git/apply', () => { DiffSelection.fromInitialSelection(DiffSelectionType.None) ) - const diff = await getDiff(filePath) + const diff = await getDiff(repository, filePath) assert.equal(diff.text, previousDiff.text) }) - it('discards all file changes when a full selection is passed', async () => { + it('discards all file changes when a full selection is passed', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const filePath = 'modified-file.md' await discardChangesFromSelection( repository, filePath, - await getDiff(filePath), + await getDiff(repository, filePath), DiffSelection.fromInitialSelection(DiffSelectionType.All) ) - const diff = await getDiff(filePath) + const diff = await getDiff(repository, filePath) // Check that the file has no local changes. assert.equal(diff.text, '') assert(diff.hunks.length === 0) }) - it('re-adds a single removed line', async () => { + it('re-adds a single removed line', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const filePath = 'modified-file.md' const selection = DiffSelection.fromInitialSelection( DiffSelectionType.None @@ -135,7 +129,7 @@ describe('git/apply', () => { await discardChangesFromSelection( repository, filePath, - await getDiff(filePath), + await getDiff(repository, filePath), selection ) @@ -151,9 +145,12 @@ describe('git/apply', () => { ) }) - it('re-adds a removed hunk', async () => { + it('re-adds a removed hunk', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const filePath = 'modified-file.md' - const diff = await getDiff(filePath) + const diff = await getDiff(repository, filePath) const hunkRange = findInteractiveDiffRange(diff.hunks, 4) assert(hunkRange !== null) @@ -187,7 +184,10 @@ describe('git/apply', () => { ) }) - it('removes an added line', async () => { + it('removes an added line', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const filePath = 'modified-file.md' const selection = DiffSelection.fromInitialSelection( DiffSelectionType.None @@ -201,7 +201,7 @@ describe('git/apply', () => { await discardChangesFromSelection( repository, filePath, - await getDiff(filePath), + await getDiff(repository, filePath), selection ) @@ -217,9 +217,12 @@ describe('git/apply', () => { ) }) - it('removes an added hunk', async () => { + it('removes an added hunk', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const filePath = 'modified-file.md' - const diff = await getDiff(filePath) + const diff = await getDiff(repository, filePath) const hunkRange = findInteractiveDiffRange(diff.hunks, 16) assert(hunkRange !== null) const selection = DiffSelection.fromInitialSelection( @@ -238,7 +241,7 @@ describe('git/apply', () => { await discardChangesFromSelection( repository, filePath, - await getDiff(filePath), + await getDiff(repository, filePath), selection ) diff --git a/app/test/unit/git/branch-test.ts b/app/test/unit/git/branch-test.ts index ef19c28eeec..6f707503eb5 100644 --- a/app/test/unit/git/branch-test.ts +++ b/app/test/unit/git/branch-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { shell } from '../../helpers/test-app-shell' import { @@ -30,8 +30,8 @@ import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/branch', () => { describe('tip', () => { - it('returns unborn for new repository', async () => { - const repository = await setupEmptyRepository() + it('returns unborn for new repository', async t => { + const repository = await setupEmptyRepository(t) const store = new GitStore(repository, shell, new TestStatsStore()) await store.loadStatus() @@ -42,8 +42,8 @@ describe('git/branch', () => { assert.equal(unborn.ref, 'master') }) - it('returns correct ref if checkout occurs', async () => { - const repository = await setupEmptyRepository() + it('returns correct ref if checkout occurs', async t => { + const repository = await setupEmptyRepository(t) await exec(['checkout', '-b', 'not-master'], repository.path) @@ -56,8 +56,8 @@ describe('git/branch', () => { assert.equal(unborn.ref, 'not-master') }) - it('returns detached for arbitrary checkout', async () => { - const path = await setupFixtureRepository('detached-head') + it('returns detached for arbitrary checkout', async t => { + const path = await setupFixtureRepository(t, 'detached-head') const repository = new Repository(path, -1, null, false) const store = new GitStore(repository, shell, new TestStatsStore()) @@ -72,8 +72,8 @@ describe('git/branch', () => { ) }) - it('returns current branch when on a valid HEAD', async () => { - const path = await setupFixtureRepository('repo-with-many-refs') + it('returns current branch when on a valid HEAD', async t => { + const path = await setupFixtureRepository(t, 'repo-with-many-refs') const repository = new Repository(path, -1, null, false) const store = new GitStore(repository, shell, new TestStatsStore()) @@ -89,8 +89,8 @@ describe('git/branch', () => { ) }) - it('returns non-origin remote', async () => { - const path = await setupFixtureRepository('repo-with-multiple-remotes') + it('returns non-origin remote', async t => { + const path = await setupFixtureRepository(t, 'repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) const store = new GitStore(repository, shell, new TestStatsStore()) @@ -104,8 +104,8 @@ describe('git/branch', () => { }) describe('upstreamWithoutRemote', () => { - it('returns the upstream name without the remote prefix', async () => { - const path = await setupFixtureRepository('repo-with-multiple-remotes') + it('returns the upstream name without the remote prefix', async t => { + const path = await setupFixtureRepository(t, 'repo-with-multiple-remotes') const repository = new Repository(path, -1, null, false) const store = new GitStore(repository, shell, new TestStatsStore()) @@ -122,39 +122,44 @@ describe('git/branch', () => { }) describe('getBranchesPointedAt', () => { - let repository: Repository describe('in a local repo', () => { - beforeEach(async () => { - const path = await setupFixtureRepository('test-repo') - repository = new Repository(path, -1, null, false) - }) + it('finds one branch name', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(path, -1, null, false) - it('finds one branch name', async () => { const branches = await getBranchesPointedAt(repository, 'HEAD') assert(branches !== null) assert.equal(branches.length, 1) assert.equal(branches[0], 'master') }) - it('finds no branch names', async () => { + it('finds no branch names', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(path, -1, null, false) + const branches = await getBranchesPointedAt(repository, 'HEAD^') assert(branches !== null) assert.equal(branches.length, 0) }) - it('returns null on a malformed committish', async () => { + it('returns null on a malformed committish', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(path, -1, null, false) + const branches = await getBranchesPointedAt(repository, 'MERGE_HEAD') assert(branches === null) }) }) describe('in a repo with identical branches', () => { - beforeEach(async () => { - const path = await setupFixtureRepository('repo-with-multiple-remotes') - repository = new Repository(path, -1, null, false) + it('finds multiple branch names', async t => { + const path = await setupFixtureRepository( + t, + 'repo-with-multiple-remotes' + ) + const repository = new Repository(path, -1, null, false) await createBranch(repository, 'other-branch', null) - }) - it('finds multiple branch names', async () => { + const branches = await getBranchesPointedAt(repository, 'HEAD') assert(branches !== null) assert.equal(branches.length, 2) @@ -165,14 +170,10 @@ describe('git/branch', () => { }) describe('deleteLocalBranch', () => { - let repository: Repository - - beforeEach(async () => { - const path = await setupFixtureRepository('test-repo') - repository = new Repository(path, -1, null, false) - }) + it('deletes local branches', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(path, -1, null, false) - it('deletes local branches', async () => { const name = 'test-branch' await createBranch(repository, name, null) const [branch] = await getBranches(repository, `refs/heads/${name}`) @@ -190,21 +191,17 @@ describe('git/branch', () => { }) describe('deleteRemoteBranch', () => { - let mockRemote: Repository + it('delete a local branches upstream branch', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const mockRemote = new Repository(path, -1, null, false) - beforeEach(async () => { - const path = await setupFixtureRepository('test-repo') - mockRemote = new Repository(path, -1, null, false) - }) - - it('delete a local branches upstream branch', async () => { const name = 'test-branch' const branch = await createBranch(mockRemote, name, null) const localRef = `refs/heads/${name}` assert(branch !== null) - const mockLocal = await setupLocalForkOfRepository(mockRemote) + const mockLocal = await setupLocalForkOfRepository(t, mockRemote) const remoteRef = `refs/remotes/origin/${name}` const [remoteBranch] = await getBranches(mockLocal, remoteRef) @@ -232,7 +229,10 @@ describe('git/branch', () => { assert.equal((await getBranches(mockRemote, localRef)).length, 0) }) - it('handles attempted delete of removed remote branch', async () => { + it('handles attempted delete of removed remote branch', async t => { + const path = await setupFixtureRepository(t, 'test-repo') + const mockRemote = new Repository(path, -1, null, false) + const name = 'test-branch' const branch = await createBranch(mockRemote, name, null) const localRef = `refs/heads/${name}` @@ -240,7 +240,7 @@ describe('git/branch', () => { assert(branch !== null) assert.equal((await getBranches(mockRemote, localRef)).length, 1) - const mockLocal = await setupLocalForkOfRepository(mockRemote) + const mockLocal = await setupLocalForkOfRepository(t, mockRemote) const remoteRef = `refs/remotes/origin/${name}` const [remoteBranch] = await getBranches(mockLocal, remoteRef) diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 05e2785dfbf..d2b29a0659d 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -16,8 +16,8 @@ import { exec } from 'dugite' import { TestStatsStore } from '../../helpers/test-stats-store' describe('git/checkout', () => { - it('throws when invalid characters are used for branch name', async () => { - const repository = await setupEmptyRepository() + it('throws when invalid characters are used for branch name', async t => { + const repository = await setupEmptyRepository(t) const branch: Branch = { name: '..', @@ -43,8 +43,8 @@ describe('git/checkout', () => { assert.equal(errorRaised, true) }) - it('can checkout a valid branch name in an existing repository', async () => { - const path = await setupFixtureRepository('repo-with-many-refs') + it('can checkout a valid branch name in an existing repository', async t => { + const path = await setupFixtureRepository(t, 'repo-with-many-refs') const repository = new Repository(path, -1, null, false) const branches = await getBranches( @@ -68,8 +68,8 @@ describe('git/checkout', () => { assert.equal(validBranch.branch.name, 'commit-with-long-description') }) - it('can checkout a branch when it exists on multiple remotes', async () => { - const path = await setupFixtureRepository('checkout-test-cases') + it('can checkout a branch when it exists on multiple remotes', async t => { + const path = await setupFixtureRepository(t, 'checkout-test-cases') const repository = new Repository(path, -1, null, false) const expectedBranch = 'first' @@ -105,8 +105,8 @@ describe('git/checkout', () => { assert.equal(validBranch.branch.upstreamRemoteName, 'first-remote') }) - it('will fail when an existing branch matches the remote branch', async () => { - const path = await setupFixtureRepository('checkout-test-cases') + it('will fail when an existing branch matches the remote branch', async t => { + const path = await setupFixtureRepository(t, 'checkout-test-cases') const repository = new Repository(path, -1, null, false) const expectedBranch = 'first' @@ -135,8 +135,8 @@ describe('git/checkout', () => { }) describe('with submodules', () => { - it('cleans up an submodule that no longer exists', async () => { - const path = await setupFixtureRepository('test-submodule-checkouts') + it('cleans up an submodule that no longer exists', async t => { + const path = await setupFixtureRepository(t, 'test-submodule-checkouts') const repository = new Repository(path, -1, null, false) // put the repository into a known good state @@ -159,8 +159,8 @@ describe('git/checkout', () => { assert.equal(status.workingDirectory.files.length, 0) }) - it('updates a changed submodule reference', async () => { - const path = await setupFixtureRepository('test-submodule-checkouts') + it('updates a changed submodule reference', async t => { + const path = await setupFixtureRepository(t, 'test-submodule-checkouts') const repository = new Repository(path, -1, null, false) // put the repository into a known good state diff --git a/app/test/unit/git/cherry-pick-test.ts b/app/test/unit/git/cherry-pick-test.ts index dc0393851dc..84bc7ad2f0a 100644 --- a/app/test/unit/git/cherry-pick-test.ts +++ b/app/test/unit/git/cherry-pick-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { exec } from 'dugite' import * as FSE from 'fs-extra' @@ -19,7 +19,6 @@ import { getCherryPickSnapshot, } from '../../../src/lib/git/cherry-pick' import { isConflictedFile } from '../../../src/lib/status' -import { Branch } from '../../../src/models/branch' import { ManualConflictResolution } from '../../../src/models/manual-conflict-resolution' import { IMultiCommitOperationProgress } from '../../../src/models/progress' import { Repository } from '../../../src/models/repository' @@ -37,29 +36,29 @@ const featureBranchName = 'this-is-a-feature' const targetBranchName = 'target-branch' describe('git/cherry-pick', () => { - let repository: Repository - let featureBranch: Branch - let targetBranch: Branch - let result: CherryPickResult | null - - beforeEach(async () => { + const setup = async (t: TestContext) => { // This will create a repository with a feature branch with one commit to // cherry pick and will check out the target branch. - repository = await createRepository(featureBranchName, targetBranchName) + const repository = await createRepository( + t, + featureBranchName, + targetBranchName + ) // branch with tip as commit to cherry pick - featureBranch = await getBranchOrError(repository, featureBranchName) + const featureBranch = await getBranchOrError(repository, featureBranchName) // branch with to cherry pick to - targetBranch = await getBranchOrError(repository, targetBranchName) + const targetBranch = await getBranchOrError(repository, targetBranchName) - // set result to null for each test - result = null - }) + return { repository, featureBranch, targetBranch } + } + + it('successfully cherry-picked one commit without conflicts', async t => { + const { repository, featureBranch, targetBranch } = await setup(t) - it('successfully cherry-picked one commit without conflicts', async () => { const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) - result = await cherryPick(repository, [featureTip]) + const result = await cherryPick(repository, [featureTip]) const cherryPickedCommit = await getCommit( repository, featureBranch.tip.sha @@ -73,7 +72,9 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picked a commit with empty message', async () => { + it('successfully cherry-picked a commit with empty message', async t => { + const { repository, targetBranch } = await setup(t) + // add a commit with no message await switchTo(repository, featureBranchName) const filePath = Path.join(repository.path, 'EMPTY_MESSAGE.md') @@ -81,7 +82,7 @@ describe('git/cherry-pick', () => { await exec(['add', filePath], repository.path) await exec(['commit', '--allow-empty-message', '-m', ''], repository.path) - featureBranch = await getBranchOrError(repository, featureBranchName) + const featureBranch = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) // confirm feature branch tip has an empty message @@ -92,7 +93,7 @@ describe('git/cherry-pick', () => { assert.equal(emptyMessageCommit?.summary, '') const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) - result = await cherryPick(repository, [featureTip]) + const result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 2) @@ -100,9 +101,11 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picks a redundant commit', async () => { + it('successfully cherry-picks a redundant commit', async t => { + const { repository, featureBranch, targetBranch } = await setup(t) + let featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 2) @@ -120,7 +123,9 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picks an empty commit', async () => { + it('successfully cherry-picks an empty commit', async t => { + const { repository, targetBranch } = await setup(t) + // add empty commit to feature branch await switchTo(repository, featureBranchName) await exec( @@ -128,18 +133,19 @@ describe('git/cherry-pick', () => { repository.path ) - featureBranch = await getBranchOrError(repository, featureBranchName) + const featureBranch = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) - result = await cherryPick(repository, [featureTip]) + const result = await cherryPick(repository, [featureTip]) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 2) assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picks an empty commit inside a range', async () => { + it('successfully cherry-picks an empty commit inside a range', async t => { + const { repository, featureBranch, targetBranch } = await setup(t) const firstCommitSha = featureBranch.tip.sha // add empty commit to feature branch @@ -161,33 +167,46 @@ describe('git/cherry-pick', () => { } await makeCommit(repository, featureBranchCommitTwo) - featureBranch = await getBranchOrError(repository, featureBranchName) + const featureBranchUpdated = await getBranchOrError( + repository, + featureBranchName + ) await switchTo(repository, targetBranchName) // cherry picking 3 (on added in setup, empty, featureBranchCommitTwo) - const commitRange = revRangeInclusive(firstCommitSha, featureBranch.tip.sha) + const commitRange = revRangeInclusive( + firstCommitSha, + featureBranchUpdated.tip.sha + ) const commitsInRange = await getCommitsInRange(repository, commitRange) assert(commitsInRange !== null) - result = await cherryPick(repository, commitsInRange) + const result = await cherryPick(repository, commitsInRange) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 4) // original commit + 4 cherry picked assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picked multiple commits without conflicts', async () => { + it('successfully cherry-picked multiple commits without conflicts', async t => { + const { repository, featureBranch, targetBranch } = await setup(t) // keep reference to the first commit in cherry pick range const firstCommitSha = featureBranch.tip.sha await addThreeMoreCommitsOntoFeatureBranch(repository) - featureBranch = await getBranchOrError(repository, featureBranchName) + const featureBranchUpdated = await getBranchOrError( + repository, + featureBranchName + ) await switchTo(repository, targetBranchName) - const commitRange = revRangeInclusive(firstCommitSha, featureBranch.tip.sha) + const commitRange = revRangeInclusive( + firstCommitSha, + featureBranchUpdated.tip.sha + ) const commitsInRange = await getCommitsInRange(repository, commitRange) assert(commitsInRange !== null) - result = await cherryPick(repository, commitsInRange) + await cherryPick(repository, commitsInRange) const commits = await getCommits(repository, targetBranch.ref, 5) assert.equal(commits.length, 5) @@ -195,12 +214,16 @@ describe('git/cherry-pick', () => { assert.equal(commits[2].summary, 'Cherry-picked Feature! Number Two') }) - it('fails to cherry-pick array of no commits', async () => { - result = await cherryPick(repository, []) + it('fails to cherry-pick array of no commits', async t => { + const { repository } = await setup(t) + + const result = await cherryPick(repository, []) assert.equal(result, CherryPickResult.UnableToStart) }) - it('fails to cherry-pick when working tree is not clean', async () => { + it('fails to cherry-pick when working tree is not clean', async t => { + const { repository, featureBranch } = await setup(t) + await FSE.writeFile( Path.join(repository.path, 'THING.md'), '# HELLO WORLD! \nTHINGS GO HERE\nFEATURE BRANCH UNDERWAY\n' @@ -211,7 +234,7 @@ describe('git/cherry-pick', () => { // During target branch checkout, it will fail before we even get to cherry // picking. Thus, this scenario from a UI's perspective is already handled. // No need to add dugite errors to handle it. - result = null + let result = null try { const featureTip = await getCommitOneLine( repository, @@ -230,7 +253,9 @@ describe('git/cherry-pick', () => { assert.equal(result, null) }) - it('successfully cherry-picks a merge commit', async () => { + it('successfully cherry-picks a merge commit', async t => { + const { repository, featureBranch } = await setup(t) + //create new branch off of default to merge into feature branch await switchTo(repository, 'main') const mergeBranchName = 'branch-to-merge' @@ -254,15 +279,16 @@ describe('git/cherry-pick', () => { const commits = await getCommits(repository, featureBranch.ref, 7) assert(commits[0].summary.includes('Merge')) - featureBranch = await getBranchOrError(repository, featureBranchName) + const { tip } = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) - const featureTip = await getCommitOneLine(repository, featureBranch.tip.sha) - result = await cherryPick(repository, [featureTip]) + const featureTip = await getCommitOneLine(repository, tip.sha) + const result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully cherry-picks a merge commit after a conflict', async () => { + it('successfully cherry-picks a merge commit after a conflict', async t => { + const { repository, featureBranch } = await setup(t) const firstSha = featureBranch.tip.sha // In the 'git/cherry-pick' `beforeEach`, we call `createRepository` which @@ -303,13 +329,13 @@ describe('git/cherry-pick', () => { const commits = await getCommits(repository, featureBranch.ref, 7) assert(commits[0].summary.includes('Merge')) - featureBranch = await getBranchOrError(repository, featureBranchName) + const { tip } = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) - const commitRange = revRangeInclusive(firstSha, featureBranch.tip.sha) + const commitRange = revRangeInclusive(firstSha, tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) assert(commitsInRange !== null) - result = await cherryPick(repository, commitsInRange) + let result = await cherryPick(repository, commitsInRange) assert.equal(result, CherryPickResult.ConflictsEncountered) // resolve conflicts by writing files to disk @@ -327,7 +353,7 @@ describe('git/cherry-pick', () => { }) describe('cherry-picking with conflicts', () => { - beforeEach(async () => { + const makeConflictCommit = async (repository: Repository) => { // In the 'git/cherry-pick' `beforeEach`, we call `createRepository` which // adds a commit to the feature branch with a file called THING.md. In // order to make a conflict, we will add the same file to the target @@ -342,14 +368,17 @@ describe('git/cherry-pick', () => { ], } await makeCommit(repository, conflictingCommit) - }) + } + + it('successfully detects cherry-pick with conflicts', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) - it('successfully detects cherry-pick with conflicts', async () => { const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + const result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) const status = await getStatusOrThrow(repository) @@ -359,12 +388,15 @@ describe('git/cherry-pick', () => { assert.equal(conflictedFiles.length, 1) }) - it('successfully continues cherry-picking with conflicts after resolving them by overwriting', async () => { + it('successfully continues cherry-picking with conflicts after resolving them by overwriting', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) @@ -390,12 +422,15 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully continues cherry-picking with conflicts after resolving them manually', async () => { + it('successfully continues cherry-picking with conflicts after resolving them manually', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) @@ -419,12 +454,15 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully continues cherry-picking with conflicts after resolving them manually and no changes to commit', async () => { + it('successfully continues cherry-picking with conflicts after resolving them manually and no changes to commit', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) const statusAfterCherryPick = await getStatusOrThrow(repository) @@ -448,12 +486,15 @@ describe('git/cherry-pick', () => { assert.equal(result, CherryPickResult.CompletedWithoutError) }) - it('successfully detects cherry-picking with outstanding files not staged', async () => { + it('successfully detects cherry-picking with outstanding files not staged', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) result = await continueCherryPick(repository, []) @@ -466,12 +507,15 @@ describe('git/cherry-pick', () => { assert.equal(conflictedFiles.length, 1) }) - it('successfully continues cherry-picking with additional changes to untracked files', async () => { + it('successfully continues cherry-picking with additional changes to untracked files', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + let result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) // resolve conflicts by writing files to disk @@ -501,12 +545,15 @@ describe('git/cherry-pick', () => { assert.equal(status.workingDirectory.files[0].path, 'UNTRACKED_FILE.md') }) - it('successfully aborts cherry-pick after conflict', async () => { + it('successfully aborts cherry-pick after conflict', async t => { + const { repository, featureBranch } = await setup(t) + await makeConflictCommit(repository) + const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip]) + const result = await cherryPick(repository, [featureTip]) assert.equal(result, CherryPickResult.ConflictsEncountered) // files from cherry pick exist in conflicted state @@ -522,17 +569,15 @@ describe('git/cherry-pick', () => { }) describe('cherry-picking progress', () => { - let progress = new Array() - beforeEach(() => { - progress = [] - }) + it('successfully parses progress for a single commit', async t => { + const { repository, featureBranch } = await setup(t) + const progress = new Array() - it('successfully parses progress for a single commit', async () => { const featureTip = await getCommitOneLine( repository, featureBranch.tip.sha ) - result = await cherryPick(repository, [featureTip], p => progress.push(p)) + await cherryPick(repository, [featureTip], p => progress.push(p)) // commit summary set up in before each is "Cherry-picked Feature" assert.deepStrictEqual(progress, [ @@ -546,20 +591,20 @@ describe('git/cherry-pick', () => { ]) }) - it('successfully parses progress for multiple commits', async () => { + it('successfully parses progress for multiple commits', async t => { + const { repository, featureBranch } = await setup(t) + const progress = new Array() + const firstCommitSha = featureBranch.tip.sha await addThreeMoreCommitsOntoFeatureBranch(repository) - featureBranch = await getBranchOrError(repository, featureBranchName) + const { tip } = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) - const commitRange = revRangeInclusive( - firstCommitSha, - featureBranch.tip.sha - ) + const commitRange = revRangeInclusive(firstCommitSha, tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) assert(commitsInRange !== null) - result = await cherryPick(repository, commitsInRange, p => + const result = await cherryPick(repository, commitsInRange, p => progress.push(p) ) @@ -567,11 +612,14 @@ describe('git/cherry-pick', () => { assert.equal(progress.length, 4) }) - it('successfully parses progress for multiple commits including a conflict', async () => { + it('successfully parses progress for multiple commits including a conflict', async t => { + const { repository, featureBranch } = await setup(t) + const progress = new Array() + const firstCommitSha = featureBranch.tip.sha await addThreeMoreCommitsOntoFeatureBranch(repository) - featureBranch = await getBranchOrError(repository, featureBranchName) + const { tip } = await getBranchOrError(repository, featureBranchName) await switchTo(repository, targetBranchName) // Add a commit to the target branch to conflict with the third commit on @@ -587,13 +635,10 @@ describe('git/cherry-pick', () => { } await makeCommit(repository, targetBranchConflictingCommitTwo) - const commitRange = revRangeInclusive( - firstCommitSha, - featureBranch.tip.sha - ) + const commitRange = revRangeInclusive(firstCommitSha, tip.sha) const commitsInRange = await getCommitsInRange(repository, commitRange) assert(commitsInRange !== null) - result = await cherryPick(repository, commitsInRange, p => + let result = await cherryPick(repository, commitsInRange, p => progress.push(p) ) assert.equal(result, CherryPickResult.ConflictsEncountered) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 698b4249e36..4a34595777e 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -48,15 +48,10 @@ async function getTextDiff( } describe('git/commit', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('createCommit normal', () => { - it('commits the given files', async () => { + it('commits the given files', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) await FSE.writeFile(path.join(repository.path, 'README.md'), 'Hi world\n') let status = await getStatusOrThrow(repository) @@ -76,7 +71,10 @@ describe('git/commit', () => { assert.equal(commits[0].sha.substring(0, 7), sha) }) - it('commit does not strip commentary by default', async () => { + it('commit does not strip commentary by default', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await FSE.writeFile(path.join(repository.path, 'README.md'), 'Hi world\n') const status = await getStatusOrThrow(repository) @@ -97,8 +95,8 @@ describe('git/commit', () => { assert.equal(commit.shortSha, sha) }) - it('can commit for empty repository', async () => { - const repo = await setupEmptyRepository() + it('can commit for empty repository', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') await FSE.writeFile(path.join(repo.path, 'bar'), 'bar\n') @@ -131,8 +129,8 @@ describe('git/commit', () => { assert.equal(history[0].body, 'this is a description\n') }) - it('can commit renames', async () => { - const repo = await setupEmptyRepository() + it('can commit renames', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') @@ -157,12 +155,10 @@ describe('git/commit', () => { }) describe('createCommit partials', () => { - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-changes') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('can commit some lines from new file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) - it('can commit some lines from new file', async () => { const previousTip = (await getCommits(repository, 'HEAD', 1))[0] const newFileName = 'new-file.md' @@ -205,7 +201,10 @@ describe('git/commit', () => { assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) - it('can commit second hunk from modified file', async () => { + it('can commit second hunk from modified file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const previousTip = (await getCommits(repository, 'HEAD', 1))[0] const modifiedFile = 'modified-file.md' @@ -257,7 +256,10 @@ describe('git/commit', () => { assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) - it('can commit single delete from modified file', async () => { + it('can commit single delete from modified file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const previousTip = (await getCommits(repository, 'HEAD', 1))[0] const fileName = 'modified-file.md' @@ -301,7 +303,10 @@ describe('git/commit', () => { assert.equal(changesetData.files[0].path, fileName) }) - it('can commit multiple hunks from modified file', async () => { + it('can commit multiple hunks from modified file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const previousTip = (await getCommits(repository, 'HEAD', 1))[0] const modifiedFile = 'modified-file.md' @@ -358,7 +363,10 @@ describe('git/commit', () => { assert.equal(fileChange.status.kind, AppFileStatusKind.Modified) }) - it('can commit some lines from deleted file', async () => { + it('can commit some lines from deleted file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const previousTip = (await getCommits(repository, 'HEAD', 1))[0] const deletedFile = 'deleted-file.md' @@ -400,8 +408,8 @@ describe('git/commit', () => { assert.equal(fileChange.status.kind, AppFileStatusKind.Deleted) }) - it('can commit renames with modifications', async () => { - const repo = await setupEmptyRepository() + it('can commit renames with modifications', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') @@ -431,8 +439,8 @@ describe('git/commit', () => { // The scenario here is that the user has staged a rename (probably using git mv) // and then added some lines to the newly renamed file and they only want to // commit one of these lines. - it('can commit renames with partially selected modifications', async () => { - const repo = await setupEmptyRepository() + it('can commit renames with partially selected modifications', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'line1\n') @@ -476,8 +484,8 @@ describe('git/commit', () => { }) describe('createCommit with a merge conflict', () => { - it('creates a merge commit', async () => { - const repo = await setupConflictedRepo() + it('creates a merge commit', async t => { + const repo = await setupConflictedRepo(t) const filePath = path.join(repo.path, 'foo') const inMerge = await FSE.pathExists( @@ -518,12 +526,10 @@ describe('git/commit', () => { describe('createMergeCommit', () => { describe('with a simple merge conflict', () => { - let repository: Repository describe('with a merge conflict', () => { - beforeEach(async () => { - repository = await setupConflictedRepo() - }) - it('creates a merge commit', async () => { + it('creates a merge commit', async t => { + const repository = await setupConflictedRepo(t) + const status = await getStatusOrThrow(repository) const trackedFiles = status.workingDirectory.files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -537,11 +543,9 @@ describe('git/commit', () => { }) describe('with a merge conflict and manual resolutions', () => { - let repository: Repository - beforeEach(async () => { - repository = await setupConflictedRepoWithMultipleFiles() - }) - it('keeps files chosen to be added and commits', async () => { + it('keeps files chosen to be added and commits', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const status = await getStatusOrThrow(repository) const trackedFiles = status.workingDirectory.files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -563,7 +567,9 @@ describe('git/commit', () => { assert.equal(newStatus.workingDirectory.files.length, 1) }) - it('deletes files chosen to be removed and commits', async () => { + it('deletes files chosen to be removed and commits', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const status = await getStatusOrThrow(repository) const trackedFiles = status.workingDirectory.files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -585,7 +591,9 @@ describe('git/commit', () => { assert.equal(newStatus.workingDirectory.files.length, 1) }) - it('checks out our content for file added in both branches', async () => { + it('checks out our content for file added in both branches', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const status = await getStatusOrThrow(repository) const trackedFiles = status.workingDirectory.files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -607,7 +615,9 @@ describe('git/commit', () => { assert.equal(newStatus.workingDirectory.files.length, 1) }) - it('checks out their content for file added in both branches', async () => { + it('checks out their content for file added in both branches', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const status = await getStatusOrThrow(repository) const trackedFiles = status.workingDirectory.files.filter( f => f.status.kind !== AppFileStatusKind.Untracked @@ -630,36 +640,38 @@ describe('git/commit', () => { }) describe('binary file conflicts', () => { - let fileName: string - let fileContentsOurs: string, fileContentsTheirs: string - beforeEach(async () => { + const setup = async (t: TestContext) => { const repoPath = await setupFixtureRepository( + t, 'detect-conflict-in-binary-file' ) - repository = new Repository(repoPath, -1, null, false) - fileName = 'my-cool-image.png' + const repository = new Repository(repoPath, -1, null, false) + const fileName = 'my-cool-image.png' await exec(['checkout', 'master'], repoPath) - fileContentsTheirs = await FSE.readFile( + const fileContentsTheirs = await FSE.readFile( path.join(repoPath, fileName), 'utf8' ) await exec(['checkout', 'make-a-change'], repoPath) - fileContentsOurs = await FSE.readFile( + const fileContentsOurs = await FSE.readFile( path.join(repoPath, fileName), 'utf8' ) - }) - it('chooses `their` version of a file and commits', async () => { - const repo = repository + return { repository, fileContentsTheirs, fileContentsOurs } + } + + it('chooses `their` version of a file and commits', async t => { + const { repository, fileContentsTheirs, fileContentsOurs } = + await setup(t) - await exec(['merge', 'master'], repo.path) + await exec(['merge', 'master'], repository.path) - const status = await getStatusOrThrow(repo) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 1) @@ -688,12 +700,12 @@ describe('git/commit', () => { assert.equal(fileContents, fileContentsTheirs) }) - it('chooses `our` version of a file and commits', async () => { - const repo = repository + it('chooses `our` version of a file and commits', async t => { + const { repository, fileContentsOurs } = await setup(t) - await exec(['merge', 'master'], repo.path) + await exec(['merge', 'master'], repository.path) - const status = await getStatusOrThrow(repo) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 1) @@ -724,16 +736,13 @@ describe('git/commit', () => { }) describe('with no changes', () => { - let repository: Repository - beforeEach(async () => { - repository = new Repository( - await setupFixtureRepository('test-repo'), + it('throws an error', async t => { + const repository = new Repository( + await setupFixtureRepository(t, 'test-repo'), -1, null, false ) - }) - it('throws an error', async () => { const status = await getStatusOrThrow(repository) await assert.rejects( () => createMergeCommit(repository, status.workingDirectory.files), @@ -744,11 +753,11 @@ describe('git/commit', () => { }) describe('index corner cases', () => { - it('can commit when staged new file is then deleted', async () => { + it('can commit when staged new file is then deleted', async t => { let status, files = null - const repo = await setupEmptyRepository() + const repo = await setupEmptyRepository(t) const firstPath = path.join(repo.path, 'first') const secondPath = path.join(repo.path, 'second') @@ -781,11 +790,11 @@ describe('git/commit', () => { assert.equal(commit.summary, 'commit everything') }) - it('can commit when a delete is staged and the untracked file exists', async () => { + it('can commit when a delete is staged and the untracked file exists', async t => { let status, files = null - const repo = await setupEmptyRepository() + const repo = await setupEmptyRepository(t) const firstPath = path.join(repo.path, 'first') await FSE.writeFile(firstPath, 'line1\n') @@ -819,8 +828,8 @@ describe('git/commit', () => { assert.equal(commit.shortSha, sha) }) - it('file is deleted in index', async () => { - const repo = await setupEmptyRepository() + it('file is deleted in index', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'secret'), 'contents\n') await FSE.writeFile(path.join(repo.path, '.gitignore'), '') diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index 43c901b3d7b..3b9acb96307 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { exec } from 'dugite' import * as Path from 'path' @@ -13,32 +13,32 @@ import { git, } from '../../../src/lib/git' -import { mkdirSync } from '../../helpers/temp' import { setupFixtureRepository } from '../../helpers/repositories' import { realpath } from 'fs/promises' +import { createTempDirectory } from '../../helpers/temp' describe('git/config', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('config', () => { - it('looks up config values', async () => { + it('looks up config values', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) const bare = await getConfigValue(repository, 'core.bare') assert.equal(bare, 'false') }) - it('returns null for undefined values', async () => { + it('returns null for undefined values', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) const value = await getConfigValue(repository, 'core.the-meaning-of-life') assert(value === null) }) }) describe('GIT_CONFIG_PARAMETERS', () => { - it('picks them up', async () => { + it('picks them up', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const withoutEnvOutput = await git( ['config', 'desktop.test'], repository.path, @@ -61,7 +61,10 @@ describe('git/config', () => { assert.equal(withEnvOutput, '1\n') }) - it('takes precedence over GIT_CONFIG_*', async () => { + it('takes precedence over GIT_CONFIG_*', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const output = await git(['config', 'user.name'], repository.path, '', { env: { GIT_CONFIG_PARAMETERS: "'user.name=foobar'", @@ -76,34 +79,36 @@ describe('git/config', () => { }) describe('global config', () => { - const HOME = mkdirSync('global-config-here') - const env = { HOME } - const expectedConfigPath = Path.normalize(Path.join(HOME, '.gitconfig')) + const setup = async (t: TestContext) => { + const HOME = await createTempDirectory(t) + const env = { HOME } + const expectedConfigPath = Path.normalize(Path.join(HOME, '.gitconfig')) + const baseArgs = ['config', '-f', expectedConfigPath] - const baseArgs = ['config', '-f', expectedConfigPath] + return { env, expectedConfigPath, baseArgs } + } describe('getGlobalConfigPath', () => { - beforeEach(async () => { + it('gets the config path', async t => { + const { env, expectedConfigPath, baseArgs } = await setup(t) + // getGlobalConfigPath requires at least one entry, so the // test needs to setup an existing config value await exec([...baseArgs, 'user.name', 'bar'], __dirname) - }) - it('gets the config path', async () => { const path = await getGlobalConfigPath(env) assert.equal(path, await realpath(expectedConfigPath)) }) }) describe('setGlobalConfigValue', () => { - const key = 'foo.bar' + it('will replace all entries for a global value', async t => { + const { env, baseArgs } = await setup(t) + const key = 'foo.bar' - beforeEach(async () => { await exec([...baseArgs, '--add', key, 'first'], __dirname) await exec([...baseArgs, '--add', key, 'second'], __dirname) - }) - it('will replace all entries for a global value', async () => { await setGlobalConfigValue(key, 'the correct value', env) const value = await getGlobalConfigValue(key, env) assert.equal(value, 'the correct value') @@ -113,49 +118,65 @@ describe('git/config', () => { describe('getGlobalBooleanConfigValue', () => { const key = 'foo.bar' - it('treats "false" as false', async () => { + it('treats "false" as false', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'false', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, false) }) - it('treats "off" as false', async () => { + it('treats "off" as false', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'off', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, false) }) - it('treats "no" as false', async () => { + it('treats "no" as false', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'no', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, false) }) - it('treats "0" as false', async () => { + it('treats "0" as false', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, '0', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, false) }) - it('treats "true" as true', async () => { + it('treats "true" as true', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'true', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, true) }) - it('treats "yes" as true', async () => { + it('treats "yes" as true', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'yes', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, true) }) - it('treats "on" as true', async () => { + it('treats "on" as true', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, 'on', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, true) }) - it('treats "1" as true', async () => { + it('treats "1" as true', async t => { + const { env } = await setup(t) + await setGlobalConfigValue(key, '1', env) const value = await getGlobalBooleanConfigValue(key, env) assert.equal(value, true) diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts index 5df46e3298e..ae881f8d59b 100644 --- a/app/test/unit/git/core-test.ts +++ b/app/test/unit/git/core-test.ts @@ -1,7 +1,6 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { GitError } from 'dugite' -import { Repository } from '../../../src/models/repository' import { git, parseConfigLockFilePathFromError, @@ -12,20 +11,15 @@ import { join, resolve } from 'path' import { copy } from 'fs-extra' describe('git/core', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('error handling', () => { - it('does not throw for errors that were expected', async () => { + it('does not throw for errors that were expected', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] let threw = false try { - const result = await git(args, repository.path, 'test', { + const result = await git(args, testRepoPath, 'test', { expectedErrors: new Set([GitError.BadRevision]), }) assert.equal(result.gitError, GitError.BadRevision) @@ -36,12 +30,14 @@ describe('git/core', () => { assert.equal(threw, false) }) - it('throws for errors that were not expected', async () => { + it('throws for errors that were not expected', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] let threw = false try { - await git(args, repository.path, 'test', { + await git(args, testRepoPath, 'test', { expectedErrors: new Set([GitError.SSHKeyAuditUnverified]), }) } catch (e) { @@ -53,12 +49,13 @@ describe('git/core', () => { }) describe('exit code handling', () => { - it('does not throw for exit codes that were expected', async () => { + it('does not throw for exit codes that were expected', async t => { + const repoPath = await setupFixtureRepository(t, 'test-repo') const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] let threw = false try { - const result = await git(args, repository.path, 'test', { + const result = await git(args, repoPath, 'test', { successExitCodes: new Set([128]), }) assert.equal(result.exitCode, 128) @@ -69,12 +66,13 @@ describe('git/core', () => { assert.equal(threw, false) }) - it('throws for exit codes that were not expected', async () => { + it('throws for exit codes that were not expected', async t => { + const repoPath = await setupFixtureRepository(t, 'test-repo') const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] let threw = false try { - await git(args, repository.path, 'test', { + await git(args, repoPath, 'test', { successExitCodes: new Set([2]), }) } catch (e) { @@ -86,14 +84,16 @@ describe('git/core', () => { }) describe('config lock file error handling', () => { - it('can parse lock file path from stderr', async () => { - const configFilePath = join(repository.path, '.git', 'config') + it('can parse lock file path from stderr', async t => { + const repoPath = await setupFixtureRepository(t, 'test-repo') + + const configFilePath = join(repoPath, '.git', 'config') const configLockFilePath = `${configFilePath}.lock` await copy(configFilePath, configLockFilePath) const args = ['config', '--local', 'user.name', 'niik'] - const result = await git(args, repository.path, 'test', { + const result = await git(args, repoPath, 'test', { expectedErrors: new Set([GitError.ConfigLockFileAlreadyExists]), }) diff --git a/app/test/unit/git/description-test.ts b/app/test/unit/git/description-test.ts index 83567325185..07c1b8c0c4c 100644 --- a/app/test/unit/git/description-test.ts +++ b/app/test/unit/git/description-test.ts @@ -8,14 +8,14 @@ import { setupEmptyRepository } from '../../helpers/repositories' describe('git/description', () => { describe('getGitDescription', () => { - it('returns empty for an initialized repository', async () => { - const repo = await setupEmptyRepository() + it('returns empty for an initialized repository', async t => { + const repo = await setupEmptyRepository(t) const actual = await getGitDescription(repo.path) assert.equal(actual, '') }) - it('returns empty when path is missing', async () => { - const repo = await setupEmptyRepository() + it('returns empty when path is missing', async t => { + const repo = await setupEmptyRepository(t) const path = Path.join(repo.path, '.git', 'description') await FSE.unlink(path) @@ -23,9 +23,9 @@ describe('git/description', () => { assert.equal(actual, '') }) - it('reads the custom text', async () => { + it('reads the custom text', async t => { const expected = 'this is a repository description' - const repo = await setupEmptyRepository() + const repo = await setupEmptyRepository(t) const path = Path.join(repo.path, '.git', 'description') await FSE.writeFile(path, expected) diff --git a/app/test/unit/git/diff-check-test.ts b/app/test/unit/git/diff-check-test.ts index 84b7d0ed93f..47b73e91eee 100644 --- a/app/test/unit/git/diff-check-test.ts +++ b/app/test/unit/git/diff-check-test.ts @@ -1,6 +1,5 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' -import { Repository } from '../../../src/models/repository' import { setupConflictedRepo, setupConflictedRepoWithMultipleFiles, @@ -10,14 +9,10 @@ import { import { getFilesWithConflictMarkers } from '../../../src/lib/git/diff-check' describe('getFilesWithConflictMarkers', () => { - let repository: Repository - describe('with one conflicted file', () => { - beforeEach(async () => { - repository = await setupConflictedRepo() - }) + it('finds one conflicted file', async t => { + const repository = await setupConflictedRepo(t) - it('finds one conflicted file', async () => { assert.deepStrictEqual( await getFilesWithConflictMarkers(repository.path), new Map([['foo', 3]]) @@ -26,10 +21,8 @@ describe('getFilesWithConflictMarkers', () => { }) describe('with one conflicted file', () => { - beforeEach(async () => { - repository = await setupConflictedRepoWithMultipleFiles() - }) - it('finds multiple conflicted files', async () => { + it('finds multiple conflicted files', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) assert.deepStrictEqual( await getFilesWithConflictMarkers(repository.path), new Map([ @@ -42,11 +35,8 @@ describe('getFilesWithConflictMarkers', () => { }) describe('with no conflicted files', () => { - beforeEach(async () => { - repository = await setupEmptyRepository() - }) - - it('finds no conflicted files', async () => { + it('finds no conflicted files', async t => { + const repository = await setupEmptyRepository(t) assert((await getFilesWithConflictMarkers(repository.path)).size === 0) }) }) diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index d92a5c6c4f2..203c5013e87 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -36,6 +36,7 @@ import { getStatusOrThrow } from '../../helpers/status' import { GitError as DugiteError, exec } from 'dugite' import { makeCommit, switchTo } from '../../helpers/repository-scaffolding' import { writeFile } from 'fs/promises' +import { join } from 'node:path' async function getTextDiff( repo: Repository, @@ -47,15 +48,13 @@ async function getTextDiff( } describe('git/diff', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-image-changes') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('getWorkingDirectoryImage', () => { - it('retrieves valid image for new file', async () => { + it('retrieves valid image for new file', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-image-changes' + ) + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -70,7 +69,12 @@ describe('git/diff', () => { assert(/A2HkbLsBYSgAAAABJRU5ErkJggg==$/.test(current.contents)) }) - it('retrieves valid images for modified file', async () => { + it('retrieves valid images for modified file', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-image-changes' + ) + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -86,7 +90,12 @@ describe('git/diff', () => { }) describe('getBlobImage', () => { - it('retrieves valid image for modified file', async () => { + it('retrieves valid image for modified file', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-image-changes' + ) + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -105,7 +114,12 @@ describe('git/diff', () => { ) }) - it('retrieves valid images for deleted file', async () => { + it('retrieves valid images for deleted file', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-image-changes' + ) + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -126,7 +140,12 @@ describe('git/diff', () => { }) describe('imageDiff', () => { - it('changes for images are set', async () => { + it('changes for images are set', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-image-changes' + ) + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -144,9 +163,9 @@ describe('git/diff', () => { assert(imageDiff.current !== undefined) }) - it('changes for text are not set', async () => { - const testRepoPath = await setupFixtureRepository('repo-with-changes') - repository = new Repository(testRepoPath, -1, null, false) + it('changes for text are not set', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All @@ -163,12 +182,10 @@ describe('git/diff', () => { }) describe('getWorkingDirectoryDiff', () => { - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-changes') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('counts lines for new file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) - it('counts lines for new file', async () => { const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -191,7 +208,10 @@ describe('git/diff', () => { ) }) - it('counts lines for modified file', async () => { + it('counts lines for modified file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -219,7 +239,10 @@ describe('git/diff', () => { assert(second.lines[7].text.includes('+')) }) - it('counts lines for staged file', async () => { + it('counts lines for staged file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const diffSelection = DiffSelection.fromInitialSelection( DiffSelectionType.All ) @@ -255,8 +278,11 @@ describe('git/diff', () => { assert(second.lines[7].text.includes('+vel sagittis nisl rutrum.')) }) - it('displays a binary diff for a docx file', async () => { - const repositoryPath = await setupFixtureRepository('diff-rendering-docx') + it('displays a binary diff for a docx file', async t => { + const repositoryPath = await setupFixtureRepository( + t, + 'diff-rendering-docx' + ) const repo = new Repository(repositoryPath, -1, null, false) const status = await getStatusOrThrow(repo) @@ -269,8 +295,8 @@ describe('git/diff', () => { assert.equal(diff.kind, DiffType.Binary) }) - it('is empty for a renamed file', async () => { - const repo = await setupEmptyRepository() + it('is empty for a renamed file', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') @@ -292,8 +318,8 @@ describe('git/diff', () => { // with high similarity. If we don't take the rename into account // when generating the diffs we'd be looking at a diff with only // additions. - it('only shows modifications after move for a renamed and modified file', async () => { - const repo = await setupEmptyRepository() + it('only shows modifications after move for a renamed and modified file', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') @@ -318,8 +344,8 @@ describe('git/diff', () => { assert.equal(first.lines[2].text, '+bar') }) - it('handles unborn repository with mixed state', async () => { - const repo = await setupEmptyRepository() + it('handles unborn repository with mixed state', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile( path.join(repo.path, 'foo'), @@ -346,8 +372,8 @@ describe('git/diff', () => { }) describe('getWorkingDirectoryDiff/line-endings', () => { - it('displays line endings change from LF to CRLF', async () => { - const repo = await setupEmptyRepository() + it('displays line endings change from LF to CRLF', async t => { + const repo = await setupEmptyRepository(t) const filePath = path.join(repo.path, 'foo') let lineEnding = '\r\n' @@ -383,8 +409,8 @@ describe('git/diff', () => { }) describe('getWorkingDirectoryDiff/unicode', () => { - it('displays unicode characters', async () => { - const repo = await setupEmptyRepository() + it('displays unicode characters', async t => { + const repo = await setupEmptyRepository(t) const filePath = path.join(repo.path, 'foo') const testString = 'here are some cool characters: • é 漢字' @@ -401,19 +427,15 @@ describe('git/diff', () => { describe('getBinaryPaths', () => { describe('in empty repo', () => { - let repo: Repository - beforeEach(async () => { - repo = await setupEmptyRepository() - }) - it('throws since HEAD doesnt exist', async () => { + it('throws since HEAD doesnt exist', async t => { + const repo = await setupEmptyRepository(t) await assert.rejects(() => getBinaryPaths(repo, 'HEAD', [])) }) }) describe('with files using binary merge driver', () => { - let repo: Repository - beforeEach(async () => { - repo = await setupEmptyRepository() + it('includes plain text files using binary driver', async t => { + const repo = await setupEmptyRepository(t) writeFile(path.join(repo.path, 'foo.bin'), 'foo\n') writeFile( path.join(repo.path, '.gitattributes'), @@ -430,8 +452,7 @@ describe('git/diff', () => { await git(['merge', 'branch-a'], repo.path, '', { expectedErrors: new Set([DugiteError.MergeConflicts]), }) - }) - it('includes plain text files using binary driver', async () => { + assert.deepStrictEqual( await getBinaryPaths(repo, 'MERGE_HEAD', [ { @@ -447,24 +468,22 @@ describe('git/diff', () => { }) describe('in repo with text only files', () => { - let repo: Repository - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-changes') - repo = new Repository(testRepoPath, -1, null, false) - }) - it('returns an empty array', async () => { + it('returns an empty array', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-changes' + ) + const repo = new Repository(testRepoPath, -1, null, false) assert.equal((await getBinaryPaths(repo, 'HEAD', [])).length, 0) }) }) - describe('in repo with image changes', () => { - let repo: Repository - beforeEach(async () => { + describe('in repo with image changes', t => { + it('returns all changed image files', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-image-changes' ) - repo = new Repository(testRepoPath, -1, null, false) - }) - it('returns all changed image files', async () => { + const repo = new Repository(testRepoPath, -1, null, false) assert.deepStrictEqual(await getBinaryPaths(repo, 'HEAD', []), [ 'modified-image.jpg', 'new-animated-image.gif', @@ -473,16 +492,15 @@ describe('git/diff', () => { }) }) describe('in repo with merge conflicts on image files', () => { - let repo: Repository - beforeEach(async () => { + it('returns all conflicted image files', async t => { const testRepoPath = await setupFixtureRepository( + t, 'detect-conflict-in-binary-file' ) - repo = new Repository(testRepoPath, -1, null, false) + const repo = new Repository(testRepoPath, -1, null, false) await exec(['checkout', 'make-a-change'], repo.path) await exec(['merge', 'master'], repo.path) - }) - it('returns all conflicted image files', async () => { + assert.deepStrictEqual(await getBinaryPaths(repo, 'MERGE_HEAD', []), [ 'my-cool-image.png', ]) @@ -491,10 +509,11 @@ describe('git/diff', () => { }) describe('with submodules', () => { - const submoduleRelativePath: string = path.join('foo', 'submodule') - let submodulePath: string + const getSubmodulePath = (repoPath: string, ...components: string[]) => { + return join(repoPath, 'foo', 'submodule', ...components) + } - const getSubmoduleDiff = async () => { + const getSubmoduleDiff = async (repository: Repository) => { const status = await getStatusOrThrow(repository) const file = status.workingDirectory.files[0] const diff = await getWorkingDirectoryDiff(repository, file) @@ -503,27 +522,27 @@ describe('git/diff', () => { return diff as ISubmoduleDiff } - beforeEach(async () => { - const repoPath = await setupFixtureRepository('submodule-basic-setup') - repository = new Repository(repoPath, -1, null, false) - submodulePath = path.join(repoPath, submoduleRelativePath) - }) + it('can get the diff for a submodule with the right paths', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) - it('can get the diff for a submodule with the right paths', async () => { // Just make any change to the submodule to get a diff - await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') + await FSE.writeFile(getSubmodulePath(repoPath, 'README.md'), 'hello\n') - const diff = await getSubmoduleDiff() - assert.equal(diff.fullPath, submodulePath) + const diff = await getSubmoduleDiff(repository) + assert.equal(diff.fullPath, getSubmodulePath(repoPath)) // Even on Windows, the path separator is '/' for this specific attribute assert.equal(diff.path, 'foo/submodule') }) - it('can get the diff for a submodule with only modified changes', async () => { + it('can get the diff for a submodule with only modified changes', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // Modify README.md file. Now the submodule has modified changes. - await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') + await FSE.writeFile(getSubmodulePath(repoPath, 'README.md'), 'hello\n') - const diff = await getSubmoduleDiff() + const diff = await getSubmoduleDiff(repository) assert(diff.oldSHA === null) assert(diff.newSHA === null) assert.equal(diff.status.commitChanged, false) @@ -531,11 +550,14 @@ describe('git/diff', () => { assert.equal(diff.status.untrackedChanges, false) }) - it('can get the diff for a submodule with only untracked changes', async () => { + it('can get the diff for a submodule with only untracked changes', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // Create NEW.md file. Now the submodule has untracked changes. - await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'hello\n') + await FSE.writeFile(getSubmodulePath(repoPath, 'NEW.md'), 'hello\n') - const diff = await getSubmoduleDiff() + const diff = await getSubmoduleDiff(repository) assert(diff.oldSHA === null) assert(diff.newSHA === null) assert.equal(diff.status.commitChanged, false) @@ -543,12 +565,15 @@ describe('git/diff', () => { assert.equal(diff.status.untrackedChanges, true) }) - it('can get the diff for a submodule a commit change', async () => { + it('can get the diff for a submodule a commit change', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // Make a change and commit it. Now the submodule has a commit change. - await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') - await exec(['commit', '-a', '-m', 'test'], submodulePath) + await FSE.writeFile(getSubmodulePath(repoPath, 'README.md'), 'hello\n') + await exec(['commit', '-a', '-m', 'test'], getSubmodulePath(repoPath)) - const diff = await getSubmoduleDiff() + const diff = await getSubmoduleDiff(repository) assert(diff.oldSHA !== null) assert(diff.newSHA !== null) assert.equal(diff.status.commitChanged, true) @@ -556,13 +581,16 @@ describe('git/diff', () => { assert.equal(diff.status.untrackedChanges, false) }) - it('can get the diff for a submodule a all kinds of changes', async () => { - await FSE.writeFile(path.join(submodulePath, 'README.md'), 'hello\n') - await exec(['commit', '-a', '-m', 'test'], submodulePath) - await FSE.writeFile(path.join(submodulePath, 'README.md'), 'bye\n') - await FSE.writeFile(path.join(submodulePath, 'NEW.md'), 'new!!\n') + it('can get the diff for a submodule a all kinds of changes', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + + await FSE.writeFile(getSubmodulePath(repoPath, 'README.md'), 'hello\n') + await exec(['commit', '-a', '-m', 'test'], getSubmodulePath(repoPath)) + await FSE.writeFile(getSubmodulePath(repoPath, 'README.md'), 'bye\n') + await FSE.writeFile(getSubmodulePath(repoPath, 'NEW.md'), 'new!!\n') - const diff = await getSubmoduleDiff() + const diff = await getSubmoduleDiff(repository) assert(diff.oldSHA !== null) assert(diff.newSHA !== null) assert.equal(diff.status.commitChanged, true) @@ -572,7 +600,10 @@ describe('git/diff', () => { }) describe('getBranchMergeBaseChangedFiles', () => { - it('loads the files changed between two branches if merged', async () => { + it('loads the files changed between two branches if merged', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // create feature branch from initial master commit await exec(['branch', 'feature-branch'], repository.path) @@ -621,7 +652,10 @@ describe('git/diff', () => { assert.equal(changesetData.files[0].path, 'feature.md') }) - it('returns null for unrelated histories', async () => { + it('returns null for unrelated histories', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // create a second branch that's orphaned from our current branch await exec(['checkout', '--orphan', 'orphaned-branch'], repository.path) @@ -643,7 +677,10 @@ describe('git/diff', () => { }) describe('getBranchMergeBaseDiff', () => { - it('loads the diff of a file between two branches if merged', async () => { + it('loads the diff of a file between two branches if merged', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) + // Add foo.md to master const fooPath = path.join(repository.path, 'foo.md') await FSE.writeFile(fooPath, 'foo\n') diff --git a/app/test/unit/git/fetch-test.ts b/app/test/unit/git/fetch-test.ts index 6e36dc32c02..e00db2be317 100644 --- a/app/test/unit/git/fetch-test.ts +++ b/app/test/unit/git/fetch-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { setupFixtureRepository } from '../../helpers/repositories' @@ -16,17 +16,14 @@ function branchWithName(branches: ReadonlyArray, name: string) { } describe('git/fetch', () => { - let repository: Repository - describe('fastForwardBranches', () => { - beforeEach(async () => { + it('fast-forwards branches using fetch', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-non-updated-branches' ) - repository = new Repository(testRepoPath, -1, null, false) - }) + const repository = new Repository(testRepoPath, -1, null, false) - it('fast-forwards branches using fetch', async () => { const eligibleBranches = await getBranchesDifferingFromUpstream( repository ) @@ -92,7 +89,13 @@ describe('git/fetch', () => { // We want to avoid messing with the FETCH_HEAD file. Normally, it shouldn't // be something users would rely on, but we want to be good gitizens // (:badpundog:) when possible. - it('does not change FETCH_HEAD after fast-forwarding branches with fetch', async () => { + it('does not change FETCH_HEAD after fast-forwarding branches with fetch', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-non-updated-branches' + ) + const repository = new Repository(testRepoPath, -1, null, false) + const eligibleBranches = await getBranchesDifferingFromUpstream( repository ) diff --git a/app/test/unit/git/for-each-ref-test.ts b/app/test/unit/git/for-each-ref-test.ts index fec0514d79f..7b6c46dc941 100644 --- a/app/test/unit/git/for-each-ref-test.ts +++ b/app/test/unit/git/for-each-ref-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { @@ -13,15 +13,14 @@ import { import { BranchType } from '../../../src/models/branch' describe('git/for-each-ref', () => { - let repository: Repository - describe('getBranches', () => { - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-many-refs') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('fetches branches using for-each-ref', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'repo-with-many-refs' + ) + const repository = new Repository(testRepoPath, -1, null, false) - it('fetches branches using for-each-ref', async () => { const branches = (await getBranches(repository)).filter( b => b.type === BranchType.Local ) @@ -50,28 +49,27 @@ describe('git/for-each-ref', () => { assert.equal(master.tip.sha, 'b9ccfc3307240b86447bca2bd6c51a4bb4ade493') }) - it('should return empty list for empty repo', async () => { - const repo = await setupEmptyRepository() + it('should return empty list for empty repo', async t => { + const repo = await setupEmptyRepository(t) const branches = await getBranches(repo) assert.equal(branches.length, 0) }) - it('should return empty list for directory without a .git directory', async () => { - const repo = setupEmptyDirectory() + it('should return empty list for directory without a .git directory', async t => { + const repo = await setupEmptyDirectory(t) const status = await getBranches(repo) assert.equal(status.length, 0) }) }) describe('getBranchesDifferingFromUpstream', () => { - beforeEach(async () => { + it('filters branches differing from upstream using for-each-ref', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-non-updated-branches' ) - repository = new Repository(testRepoPath, -1, null, false) - }) + const repository = new Repository(testRepoPath, -1, null, false) - it('filters branches differing from upstream using for-each-ref', async () => { const branches = await getBranchesDifferingFromUpstream(repository) const branchRefs = branches.map(branch => branch.ref) diff --git a/app/test/unit/git/format-patch-test.ts b/app/test/unit/git/format-patch-test.ts index 4e50bc34f3d..13a46c2ab77 100644 --- a/app/test/unit/git/format-patch-test.ts +++ b/app/test/unit/git/format-patch-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { setupTwoCommitRepo, @@ -14,37 +14,40 @@ import { exec } from 'dugite' describe('formatPatch', () => { describe('in a repo with commits', () => { - let repository: Repository - beforeEach(async () => { - repository = await setupTwoCommitRepo() + const setup = async (t: TestContext) => { + const repository = await setupTwoCommitRepo(t) await makeCommit(repository, { entries: [{ path: 'another-one', contents: 'dusty' }], }) - }) - it('returns a string for a single commit range', async () => { + return repository + } + + it('returns a string for a single commit range', async t => { + const repository = await setup(t) const patch = await formatPatch(repository, 'HEAD~', 'HEAD') assert.equal(typeof patch, 'string') assert.notEqual(patch.length, 0, 'Expected patch to be empty') }) - it('returns a string for a multi commit range', async () => { + it('returns a string for a multi commit range', async t => { + const repository = await setup(t) const patch = await formatPatch(repository, 'HEAD~2', 'HEAD') assert.equal(typeof patch, 'string') assert.notEqual(patch.length, 0, 'Expected patch to be empty') }) - it('returns empty string for no range', async () => { + it('returns empty string for no range', async t => { + const repository = await setup(t) const patch = await formatPatch(repository, 'HEAD', 'HEAD') assert.equal(typeof patch, 'string') assert.equal(patch.length, 0, 'Expected patch to be empty') }) describe('applied in a related repo', () => { - let clonedRepository: Repository - beforeEach(async () => { - clonedRepository = await cloneLocalRepository(repository) + it('will be applied cleanly', async t => { + const repository = await setup(t) + const clonedRepository = await cloneLocalRepository(t, repository) await makeCommit(clonedRepository, { entries: [{ path: 'okay-file', contents: 'okay' }], }) - }) - it('will be applied cleanly', async () => { + const patch = await formatPatch(repository, 'HEAD~', 'HEAD') const result = await exec(['apply'], clonedRepository.path, { stdin: patch, @@ -54,18 +57,18 @@ describe('formatPatch', () => { }) }) describe('in a repo with 105 commits', () => { - let repository: Repository - let firstCommit: string - beforeEach(async () => { - const path = await setupFixtureRepository('repository-with-105-commits') - repository = new Repository(path, -1, null, false) + it('can create a series of commits from start to HEAD', async t => { + const path = await setupFixtureRepository( + t, + 'repository-with-105-commits' + ) + const repository = new Repository(path, -1, null, false) const { stdout } = await exec( ['rev-list', '--max-parents=0', 'HEAD'], path ) - firstCommit = stdout.trim() - }) - it('can create a series of commits from start to HEAD', async () => { + const firstCommit = stdout.trim() + assert.equal( typeof (await formatPatch(repository, firstCommit, 'HEAD')), 'string' diff --git a/app/test/unit/git/git-attributes-test.ts b/app/test/unit/git/git-attributes-test.ts index 8286badd01f..c3c418a7487 100644 --- a/app/test/unit/git/git-attributes-test.ts +++ b/app/test/unit/git/git-attributes-test.ts @@ -8,8 +8,8 @@ import { writeGitAttributes } from '../../../src/ui/add-repository/git-attribute describe('git/git-attributes', () => { describe('writeGitAttributes', () => { - it('initializes a .gitattributes file', async () => { - const repo = await setupEmptyRepository() + it('initializes a .gitattributes file', async t => { + const repo = await setupEmptyRepository(t) await writeGitAttributes(repo.path) const expectedPath = Path.join(repo.path, '.gitattributes') const contents = await FSE.readFile(expectedPath, 'utf8') diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts index 3e2c94839ed..559cc2f4543 100644 --- a/app/test/unit/git/gitignore-test.ts +++ b/app/test/unit/git/gitignore-test.ts @@ -17,16 +17,16 @@ import { setupLocalConfig } from '../../helpers/local-config' describe('gitignore', () => { describe('readGitIgnoreAtRoot', () => { - it('returns null when .gitignore does not exist on disk', async () => { - const repo = await setupEmptyRepository() + it('returns null when .gitignore does not exist on disk', async t => { + const repo = await setupEmptyRepository(t) const gitignore = await readGitIgnoreAtRoot(repo) assert(gitignore === null) }) - it('reads contents from disk', async () => { - const repo = await setupEmptyRepository() + it('reads contents from disk', async t => { + const repo = await setupEmptyRepository(t) const path = repo.path const expected = 'node_modules\nyarn-error.log\n' @@ -39,8 +39,8 @@ describe('gitignore', () => { assert.equal(gitignore, expected) }) - it('when autocrlf=true and safecrlf=true, appends CRLF to file', async () => { - const repo = await setupEmptyRepository() + it('when autocrlf=true and safecrlf=true, appends CRLF to file', async t => { + const repo = await setupEmptyRepository(t) await setupLocalConfig(repo, [ ['core.autocrlf', 'true'], @@ -63,8 +63,8 @@ describe('gitignore', () => { assert.equal(contents.endsWith('\r\n'), true) }) - it('when autocrlf=input, appends LF to file', async () => { - const repo = await setupEmptyRepository() + it('when autocrlf=input, appends LF to file', async t => { + const repo = await setupEmptyRepository(t) setupLocalConfig(repo, [ // ensure this repository only ever sticks to LF @@ -91,8 +91,8 @@ describe('gitignore', () => { }) describe('saveGitIgnore', () => { - it(`creates gitignore file when it doesn't exist`, async () => { - const repo = await setupEmptyRepository() + it(`creates gitignore file when it doesn't exist`, async t => { + const repo = await setupEmptyRepository(t) await saveGitIgnore(repo, 'node_modules\n') @@ -101,8 +101,8 @@ describe('gitignore', () => { assert.equal(exists, true) }) - it('deletes gitignore file when no entries provided', async () => { - const repo = await setupEmptyRepository() + it('deletes gitignore file when no entries provided', async t => { + const repo = await setupEmptyRepository(t) const path = repo.path const ignoreFile = `${path}/.gitignore` @@ -115,8 +115,8 @@ describe('gitignore', () => { assert.equal(exists, false) }) - it('applies rule correctly to repository', async () => { - const repo = await setupEmptyRepository() + it('applies rule correctly to repository', async t => { + const repo = await setupEmptyRepository(t) const path = repo.path @@ -146,8 +146,8 @@ describe('gitignore', () => { }) describe('appendIgnoreRule', () => { - it('appends one rule', async () => { - const repo = await setupEmptyRepository() + it('appends one rule', async t => { + const repo = await setupEmptyRepository(t) await setupLocalConfig(repo, [['core.autocrlf', 'true']]) @@ -164,8 +164,8 @@ describe('gitignore', () => { assert.equal(gitignore.toString('utf8'), expected) }) - it('appends multiple rules', async () => { - const repo = await setupEmptyRepository() + it('appends multiple rules', async t => { + const repo = await setupEmptyRepository(t) await setupLocalConfig(repo, [['core.autocrlf', 'true']]) @@ -182,8 +182,8 @@ describe('gitignore', () => { assert.equal(gitignore.toString('utf8'), expected) }) - it('appends one file containing special characters', async () => { - const repo = await setupEmptyRepository() + it('appends one file containing special characters', async t => { + const repo = await setupEmptyRepository(t) await setupLocalConfig(repo, [['core.autocrlf', 'true']]) diff --git a/app/test/unit/git/lfs-test.ts b/app/test/unit/git/lfs-test.ts index 897d9939f08..7afa0c33763 100644 --- a/app/test/unit/git/lfs-test.ts +++ b/app/test/unit/git/lfs-test.ts @@ -17,16 +17,16 @@ import { describe('git-lfs', () => { describe('isUsingLFS', () => { - it('returns false for repository not using LFS', async () => { - const path = await setupFixtureRepository('test-repo') + it('returns false for repository not using LFS', async t => { + const path = await setupFixtureRepository(t, 'test-repo') const repository = new Repository(path, -1, null, false) const usingLFS = await isUsingLFS(repository) assert.equal(usingLFS, false) }) - it('returns true if LFS is tracking a path', async () => { - const path = await setupFixtureRepository('test-repo') + it('returns true if LFS is tracking a path', async t => { + const path = await setupFixtureRepository(t, 'test-repo') const repository = new Repository(path, -1, null, false) await exec(['lfs', 'track', '*.psd'], repository.path) @@ -37,8 +37,8 @@ describe('git-lfs', () => { }) describe('isTrackedByLFS', () => { - it('returns false for repository not using LFS', async () => { - const repository = await setupEmptyRepository() + it('returns false for repository not using LFS', async t => { + const repository = await setupEmptyRepository(t) const file = 'README.md' const readme = Path.join(repository.path, file) @@ -48,8 +48,8 @@ describe('git-lfs', () => { assert.equal(found, false) }) - it('returns true after tracking file in Git LFS', async () => { - const repository = await setupEmptyRepository() + it('returns true after tracking file in Git LFS', async t => { + const repository = await setupEmptyRepository(t) const file = 'README.md' const readme = Path.join(repository.path, file) @@ -61,8 +61,8 @@ describe('git-lfs', () => { assert.equal(found, true) }) - it('returns true after tracking file with character issues in Git LFS', async () => { - const repository = await setupEmptyRepository() + it('returns true after tracking file with character issues in Git LFS', async t => { + const repository = await setupEmptyRepository(t) const file = 'Top Ten Worst Repositories to host on GitHub - Carlos Martín Nieto.md' @@ -77,8 +77,8 @@ describe('git-lfs', () => { }) describe('filesNotTrackedByLFS', () => { - it('returns files not listed in Git LFS', async () => { - const repository = await setupEmptyRepository() + it('returns files not listed in Git LFS', async t => { + const repository = await setupEmptyRepository(t) await exec(['lfs', 'track', '*.md'], repository.path) const videoFile = 'some-video-file.mp4' @@ -89,8 +89,8 @@ describe('git-lfs', () => { assert(notFound.includes(videoFile)) }) - it('skips files that are tracked by Git LFS', async () => { - const repository = await setupEmptyRepository() + it('skips files that are tracked by Git LFS', async t => { + const repository = await setupEmptyRepository(t) await exec(['lfs', 'track', '*.png'], repository.path) const photoFile = 'some-cool-photo.png' @@ -100,8 +100,8 @@ describe('git-lfs', () => { assert.equal(notFound.length, 0) }) - it('skips files in a subfolder that are tracked', async () => { - const repository = await setupEmptyRepository() + it('skips files in a subfolder that are tracked', async t => { + const repository = await setupEmptyRepository(t) await exec(['lfs', 'track', '*.png'], repository.path) const photoFileInDirectory = 'app/src/some-cool-photo.png' @@ -112,8 +112,8 @@ describe('git-lfs', () => { assert.equal(notFound.length, 0) }) - it('skips files in a subfolder where the rule only covers the subdirectory', async () => { - const repository = await setupEmptyRepository() + it('skips files in a subfolder where the rule only covers the subdirectory', async t => { + const repository = await setupEmptyRepository(t) await exec(['lfs', 'track', 'app/src/*.png'], repository.path) const photoFileInDirectory = 'app/src/some-cool-photo.png' diff --git a/app/test/unit/git/log-test.ts b/app/test/unit/git/log-test.ts index 19e966ac2aa..33fa1438d38 100644 --- a/app/test/unit/git/log-test.ts +++ b/app/test/unit/git/log-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { getChangedFiles, getCommits } from '../../../src/lib/git' @@ -7,15 +7,14 @@ import { AppFileStatusKind } from '../../../src/models/status' import { setupLocalConfig } from '../../helpers/local-config' describe('git/log', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo-with-tags') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('getCommits', () => { - it('loads history', async () => { + it('loads history', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'test-repo-with-tags' + ) + const repository = new Repository(testRepoPath, -1, null, false) + const commits = await getCommits(repository, 'HEAD', 100) assert.equal(commits.length, 5) @@ -25,15 +24,15 @@ describe('git/log', () => { assert.equal(firstCommit.shortSha, '7cd6640') }) - it('handles repository with HEAD file on disk', async () => { - const path = await setupFixtureRepository('repository-with-HEAD-file') + it('handles repository with HEAD file on disk', async t => { + const path = await setupFixtureRepository(t, 'repository-with-HEAD-file') const repo = new Repository(path, 1, null, false) const commits = await getCommits(repo, 'HEAD', 100) assert.equal(commits.length, 2) }) - it('handles repository with signed commit and log.showSignature set', async () => { - const path = await setupFixtureRepository('just-doing-some-signing') + it('handles repository with signed commit and log.showSignature set', async t => { + const path = await setupFixtureRepository(t, 'just-doing-some-signing') const repository = new Repository(path, 1, null, false) // ensure the default config is to try and show signatures @@ -48,7 +47,13 @@ describe('git/log', () => { assert.equal(commits[0].shortSha, '415e498') }) - it('parses tags', async () => { + it('parses tags', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'test-repo-with-tags' + ) + const repository = new Repository(testRepoPath, -1, null, false) + const commits = await getCommits(repository, 'HEAD', 100) assert.equal(commits.length, 5) @@ -59,7 +64,13 @@ describe('git/log', () => { }) describe('getChangedFiles', () => { - it('loads the files changed in the commit', async () => { + it('loads the files changed in the commit', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'test-repo-with-tags' + ) + const repository = new Repository(testRepoPath, -1, null, false) + const changesetData = await getChangedFiles( repository, '7cd6640e5b6ca8dbfd0b33d0281ebe702127079c' @@ -69,11 +80,12 @@ describe('git/log', () => { assert.equal(changesetData.files[0].status.kind, AppFileStatusKind.New) }) - it('detects renames', async () => { + it('detects renames', async t => { const testRepoPath = await setupFixtureRepository( + t, 'rename-history-detection' ) - repository = new Repository(testRepoPath, -1, null, false) + const repository = new Repository(testRepoPath, -1, null, false) const first = await getChangedFiles(repository, '55bdecb') assert.equal(first.files.length, 1) @@ -98,11 +110,12 @@ describe('git/log', () => { }) }) - it('detect copies', async () => { + it('detect copies', async t => { const testRepoPath = await setupFixtureRepository( + t, 'copies-history-detection' ) - repository = new Repository(testRepoPath, -1, null, false) + const repository = new Repository(testRepoPath, -1, null, false) // ensure the test repository is configured to detect copies await setupLocalConfig(repository, [['diff.renames', 'copies']]) @@ -127,7 +140,13 @@ describe('git/log', () => { }) }) - it('handles commit when HEAD exists on disk', async () => { + it('handles commit when HEAD exists on disk', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'test-repo-with-tags' + ) + const repository = new Repository(testRepoPath, -1, null, false) + const changesetData = await getChangedFiles(repository, 'HEAD') assert.equal(changesetData.files.length, 1) assert.equal(changesetData.files[0].path, 'README.md') @@ -138,9 +157,9 @@ describe('git/log', () => { }) }) - it('detects submodule changes within commits', async () => { - const repoPath = await setupFixtureRepository('submodule-basic-setup') - repository = new Repository(repoPath, -1, null, false) + it('detects submodule changes within commits', async t => { + const repoPath = await setupFixtureRepository(t, 'submodule-basic-setup') + const repository = new Repository(repoPath, -1, null, false) const changesetData = await getChangedFiles(repository, 'HEAD') assert.equal(changesetData.files.length, 2) diff --git a/app/test/unit/git/merge-test.ts b/app/test/unit/git/merge-test.ts index e96c33cb619..9f88b2532e9 100644 --- a/app/test/unit/git/merge-test.ts +++ b/app/test/unit/git/merge-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { abortMerge, @@ -18,23 +18,17 @@ import { Repository } from '../../../src/models/repository' describe('git/merge', () => { describe('merge', () => { describe('and is successful', () => { - let repository: Repository - beforeEach(async () => { - const path = await setupFixtureRepository('merge-base-test') - repository = new Repository(path, -1, null, false) - }) - it('returns MergeResult.Success', async () => { + it('returns MergeResult.Success', async t => { + const path = await setupFixtureRepository(t, 'merge-base-test') + const repository = new Repository(path, -1, null, false) assert.equal(await merge(repository, 'dev'), MergeResult.Success) }) }) describe('and is a noop', () => { - let repository: Repository - beforeEach(async () => { - const path = await setupFixtureRepository('merge-base-test') - repository = new Repository(path, -1, null, false) + it('returns MergeResult.AlreadyUpToDate', async t => { + const path = await setupFixtureRepository(t, 'merge-base-test') + const repository = new Repository(path, -1, null, false) await merge(repository, 'dev') - }) - it('returns MergeResult.AlreadyUpToDate', async () => { assert.equal( await merge(repository, 'dev'), MergeResult.AlreadyUpToDate @@ -44,8 +38,8 @@ describe('git/merge', () => { }) describe('getMergeBase', () => { - it('returns the common ancestor of two branches', async () => { - const path = await setupFixtureRepository('merge-base-test') + it('returns the common ancestor of two branches', async t => { + const path = await setupFixtureRepository(t, 'merge-base-test') const repository = new Repository(path, -1, null, false) const allBranches = await getBranches(repository) @@ -63,8 +57,8 @@ describe('git/merge', () => { assert.equal(ref, 'df0d73dc92ff496c6a61f10843d527b7461703f4') }) - it('returns null when the branches do not have a common ancestor', async () => { - const repository = await setupEmptyRepository() + it('returns null when the branches do not have a common ancestor', async t => { + const repository = await setupEmptyRepository(t) const firstBranch = 'master' const secondBranch = 'gh-pages' @@ -99,8 +93,8 @@ describe('git/merge', () => { assert(ref === null) }) - it('returns null when a ref cannot be found', async () => { - const repository = await setupEmptyRepository() + it('returns null when a ref cannot be found', async t => { + const repository = await setupEmptyRepository(t) // create the first commit await exec( @@ -117,25 +111,19 @@ describe('git/merge', () => { }) }) describe('abortMerge', () => { - let repository: Repository - const subject = () => abortMerge(repository) describe('when there is no in-progress merge', () => { - beforeEach(async () => { - repository = await setupEmptyRepository() - }) - it('throws an error', async () => { + it('throws an error', async t => { + const repository = await setupEmptyRepository(t) await assert.rejects( - subject(), + () => abortMerge(repository), /There is no merge in progress, so there is nothing to abort/ ) }) }) describe('in the middle of resolving conflicts merge', () => { - beforeEach(async () => { - repository = await setupConflictedRepo() - }) - it('aborts the merge', async () => { - await assert.doesNotReject(subject()) + it('aborts the merge', async t => { + const repository = await setupConflictedRepo(t) + await assert.doesNotReject(() => abortMerge(repository)) }) }) }) diff --git a/app/test/unit/git/pull/ahead-and-behind-test.ts b/app/test/unit/git/pull/ahead-and-behind-test.ts index ba66ff5489d..d326cefebf6 100644 --- a/app/test/unit/git/pull/ahead-and-behind-test.ts +++ b/app/test/unit/git/pull/ahead-and-behind-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { fetch, @@ -6,8 +6,6 @@ import { getAheadBehind, revSymmetricDifference, } from '../../../../src/lib/git' -import { Commit } from '../../../../src/models/commit' -import { Repository } from '../../../../src/models/repository' import { createRepository } from '../../../helpers/repository-builder-pull-test' import { cloneRepository, @@ -23,11 +21,9 @@ const remoteBranch = `${remote.name}/${featureBranch}` describe('git/pull', () => { describe('ahead and behind of tracking branch', () => { - let repository: Repository - - beforeEach(async () => { - const remoteRepository = await createRepository(featureBranch) - repository = await cloneRepository(remoteRepository) + const setup = async (t: TestContext) => { + const remoteRepository = await createRepository(t, featureBranch) + const repository = await cloneRepository(t, remoteRepository) // make a commits to both remote and local so histories diverge @@ -55,36 +51,43 @@ describe('git/pull', () => { await makeCommit(repository, changesForLocalRepository) await fetch(repository, remote) - }) - describe('with pull.rebase=false and pull.ff=false set in config', () => { - let previousTip: Commit - let newTip: Commit + return repository + } - beforeEach(async () => { + describe('with pull.rebase=false and pull.ff=false set in config', () => { + const setupConfig = async (t: TestContext) => { + const repository = await setup(t) await setupLocalConfig(repository, [ ['pull.rebase', 'false'], ['pull.ff', 'false'], ]) - previousTip = await getTipOrError(repository) + const previousTip = await getTipOrError(repository) await pull(repository, remote) - newTip = await getTipOrError(repository) - }) + const newTip = await getTipOrError(repository) + return { repository, previousTip, newTip } + } + + it('creates a merge commit', async t => { + const { previousTip, newTip } = await setupConfig(t) - it('creates a merge commit', async () => { assert.notEqual(newTip.sha, previousTip.sha) assert.equal(newTip.parentSHAs.length, 2) }) - it('is different from remote branch', async () => { + it('is different from remote branch', async t => { + const { repository, newTip } = await setupConfig(t) + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.notEqual(remoteCommit.sha, newTip.sha) }) - it('is ahead of tracking branch', async () => { + it('is ahead of tracking branch', async t => { + const { repository } = await setupConfig(t) + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -93,25 +96,28 @@ describe('git/pull', () => { }) describe('with pull.rebase=false set in config', () => { - let previousTip: Commit - let newTip: Commit - - beforeEach(async () => { + const setupConfig = async (t: TestContext) => { + const repository = await setup(t) await setupLocalConfig(repository, [['pull.rebase', 'false']]) - previousTip = await getTipOrError(repository) + const previousTip = await getTipOrError(repository) await pull(repository, remote) - newTip = await getTipOrError(repository) - }) + const newTip = await getTipOrError(repository) - it('creates a merge commit', async () => { + return { repository, previousTip, newTip } + } + + it('creates a merge commit', async t => { + const { previousTip, newTip } = await setupConfig(t) assert.notEqual(newTip.sha, previousTip.sha) assert.equal(newTip.parentSHAs.length, 2) }) - it('is ahead of tracking branch', async () => { + it('is ahead of tracking branch', async t => { + const { repository } = await setupConfig(t) + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -120,25 +126,28 @@ describe('git/pull', () => { }) describe('with pull.rebase=true set in config', () => { - let previousTip: Commit - let newTip: Commit - - beforeEach(async () => { + const setupConfig = async (t: TestContext) => { + const repository = await setup(t) await setupLocalConfig(repository, [['pull.rebase', 'true']]) - previousTip = await getTipOrError(repository) + const previousTip = await getTipOrError(repository) await pull(repository, remote) - newTip = await getTipOrError(repository) - }) + const newTip = await getTipOrError(repository) + + return { repository, previousTip, newTip } + } + + it('does not create a merge commit', async t => { + const { previousTip, newTip } = await setupConfig(t) - it('does not create a merge commit', async () => { assert.notEqual(newTip.sha, previousTip.sha) assert.equal(newTip.parentSHAs.length, 1) }) - it('is ahead of tracking branch', async () => { + it('is ahead of tracking branch', async t => { + const { repository } = await setupConfig(t) const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -147,14 +156,12 @@ describe('git/pull', () => { }) describe('with pull.rebase=false and pull.ff=only set in config', () => { - beforeEach(async () => { + it(`throws an error as the user blocks merge commits on pull`, async t => { + const repository = await setup(t) await setupLocalConfig(repository, [ ['pull.rebase', 'false'], ['pull.ff', 'only'], ]) - }) - - it(`throws an error as the user blocks merge commits on pull`, async () => { await assert.rejects(() => pull(repository, remote)) }) }) diff --git a/app/test/unit/git/pull/only-ahead-test.ts b/app/test/unit/git/pull/only-ahead-test.ts index d21f9b8718f..ed042f4dbb0 100644 --- a/app/test/unit/git/pull/only-ahead-test.ts +++ b/app/test/unit/git/pull/only-ahead-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { fetch, @@ -6,8 +6,6 @@ import { getAheadBehind, revSymmetricDifference, } from '../../../../src/lib/git' -import { Commit } from '../../../../src/models/commit' -import { Repository } from '../../../../src/models/repository' import { createRepository } from '../../../helpers/repository-builder-pull-test' import { cloneRepository, @@ -23,11 +21,9 @@ const remoteBranch = `${remote.name}/${featureBranch}` describe('git/pull', () => { describe('only ahead of tracking branch', () => { - let repository: Repository - - beforeEach(async () => { - const remoteRepository = await createRepository(featureBranch) - repository = await cloneRepository(remoteRepository) + const setup = async (t: TestContext, pullFFConfig?: string) => { + const remoteRepository = await createRepository(t, featureBranch) + const repository = await cloneRepository(t, remoteRepository) // add a commit to the local branch so that it is now "ahead" @@ -43,30 +39,36 @@ describe('git/pull', () => { await makeCommit(repository, changesForLocalRepository) await fetch(repository, remote) - }) - describe('by default', () => { - let previousTip: Commit - let newTip: Commit + if (pullFFConfig) { + await setupLocalConfig(repository, [['pull.ff', pullFFConfig]]) + } - beforeEach(async () => { - previousTip = await getTipOrError(repository) + const previousTip = await getTipOrError(repository) - await pull(repository, remote) + await pull(repository, remote) - newTip = await getTipOrError(repository) - }) + const newTip = await getTipOrError(repository) + + return { repository, previousTip, newTip } + } - it('does not create new commit', async () => { + describe('by default', () => { + it('does not create new commit', async t => { + const { previousTip, newTip } = await setup(t) assert.equal(newTip.sha, previousTip.sha) }) - it('is different from tracking branch', async () => { + it('is different from tracking branch', async t => { + const { newTip, repository } = await setup(t) + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.notEqual(remoteCommit.sha, newTip.sha) }) - it('remains ahead of tracking branch', async () => { + it('remains ahead of tracking branch', async t => { + const { repository } = await setup(t) + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -76,29 +78,21 @@ describe('git/pull', () => { }) describe('with pull.ff=false set in config', () => { - let previousTip: Commit - let newTip: Commit - - beforeEach(async () => { - await setupLocalConfig(repository, [['pull.ff', 'false']]) - - previousTip = await getTipOrError(repository) - - await pull(repository, remote) - - newTip = await getTipOrError(repository) - }) - - it('does not create new commit', async () => { + it('does not create new commit', async t => { + const { previousTip, newTip } = await setup(t, 'false') assert.equal(newTip.sha, previousTip.sha) }) - it('is different to tracking branch', async () => { + it('is different to tracking branch', async t => { + const { newTip, repository } = await setup(t, 'false') + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.notEqual(remoteCommit.sha, newTip.sha) }) - it('is ahead of tracking branch', async () => { + it('is ahead of tracking branch', async t => { + const { repository } = await setup(t, 'false') + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -107,29 +101,21 @@ describe('git/pull', () => { }) describe('with pull.ff=only set in config', () => { - let previousTip: Commit - let newTip: Commit - - beforeEach(async () => { - await setupLocalConfig(repository, [['pull.ff', 'only']]) - - previousTip = await getTipOrError(repository) - - await pull(repository, remote) - - newTip = await getTipOrError(repository) - }) - - it('does not create new commit', async () => { + it('does not create new commit', async t => { + const { previousTip, newTip } = await setup(t, 'only') assert.equal(newTip.sha, previousTip.sha) }) - it('is different from tracking branch', async () => { + it('is different from tracking branch', async t => { + const { repository, newTip } = await setup(t, 'only') + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.notEqual(remoteCommit.sha, newTip.sha) }) - it('is ahead of tracking branch', async () => { + it('is ahead of tracking branch', async t => { + const { repository } = await setup(t, 'only') + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) diff --git a/app/test/unit/git/pull/only-behind-test.ts b/app/test/unit/git/pull/only-behind-test.ts index 57291daad3b..4e85c6c439e 100644 --- a/app/test/unit/git/pull/only-behind-test.ts +++ b/app/test/unit/git/pull/only-behind-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { fetch, @@ -6,8 +6,6 @@ import { getAheadBehind, revSymmetricDifference, } from '../../../../src/lib/git' -import { Commit } from '../../../../src/models/commit' -import { Repository } from '../../../../src/models/repository' import { createRepository } from '../../../helpers/repository-builder-pull-test' import { cloneRepository, @@ -23,11 +21,9 @@ const remoteBranch = `${remote.name}/${featureBranch}` describe('git/pull', () => { describe('only behind tracking branch', () => { - let repository: Repository - - beforeEach(async () => { - const remoteRepository = await createRepository(featureBranch) - repository = await cloneRepository(remoteRepository) + const setup = async (t: TestContext, config?: Array<[string, string]>) => { + const remoteRepository = await createRepository(t, featureBranch) + const repository = await cloneRepository(t, remoteRepository) // make commits to remote is ahead of local repository @@ -55,36 +51,43 @@ describe('git/pull', () => { await makeCommit(remoteRepository, secondCommit) await fetch(repository, remote) - }) - describe('with pull.rebase=false and pull.ff=false set in config', () => { - let previousTip: Commit - let newTip: Commit + if (config) { + await setupLocalConfig(repository, config) + } - beforeEach(async () => { - await setupLocalConfig(repository, [ - ['pull.rebase', 'false'], - ['pull.ff', 'false'], - ]) + const previousTip = await getTipOrError(repository) - previousTip = await getTipOrError(repository) + await pull(repository, remote) - await pull(repository, remote) + const newTip = await getTipOrError(repository) - newTip = await getTipOrError(repository) - }) + return { repository, previousTip, newTip } + } + + describe('with pull.rebase=false and pull.ff=false set in config', () => { + const config = [ + ['pull.rebase', 'false'], + ['pull.ff', 'false'], + ] as [string, string][] + + it('creates a merge commit', async t => { + const { newTip, previousTip } = await setup(t, config) - it('creates a merge commit', async () => { assert.notEqual(newTip.sha, previousTip.sha) assert.equal(newTip.parentSHAs.length, 2) }) - it('is different from remote branch', async () => { + it('is different from remote branch', async t => { + const { newTip, repository } = await setup(t, config) + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.notEqual(remoteCommit.sha, newTip.sha) }) - it('is now ahead of tracking branch', async () => { + it('is now ahead of tracking branch', async t => { + const { repository } = await setup(t, config) + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) @@ -93,32 +96,25 @@ describe('git/pull', () => { }) describe('with pull.ff=only set in config', () => { - let previousTip: Commit - let newTip: Commit - - beforeEach(async () => { - await setupLocalConfig(repository, [['pull.ff', 'only']]) - - previousTip = await getTipOrError(repository) - - await pull(repository, remote) + const config = [['pull.ff', 'only']] as [string, string][] - newTip = await getTipOrError(repository) - }) - - it('does not create a merge commit', async () => { - const newTip = await getTipOrError(repository) + it('does not create a merge commit', async t => { + const { newTip, previousTip } = await setup(t, config) assert.notEqual(newTip.sha, previousTip.sha) assert.equal(newTip.parentSHAs.length, 1) }) - it('is same as remote branch', async () => { + it('is same as remote branch', async t => { + const { newTip, repository } = await setup(t, config) + const remoteCommit = await getRefOrError(repository, remoteBranch) assert.equal(remoteCommit.sha, newTip.sha) }) - it('is not behind tracking branch', async () => { + it('is not behind tracking branch', async t => { + const { repository } = await setup(t, config) + const range = revSymmetricDifference(featureBranch, remoteBranch) const aheadBehind = await getAheadBehind(repository, range) diff --git a/app/test/unit/git/rebase/detect-conflict-test.ts b/app/test/unit/git/rebase/detect-conflict-test.ts index f41d38072ec..77f07ee6807 100644 --- a/app/test/unit/git/rebase/detect-conflict-test.ts +++ b/app/test/unit/git/rebase/detect-conflict-test.ts @@ -1,37 +1,29 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { exec } from 'dugite' import * as FSE from 'fs-extra' import * as Path from 'path' -import { IStatusResult, getChangedFiles } from '../../../../src/lib/git' +import { getChangedFiles } from '../../../../src/lib/git' import { abortRebase, continueRebase, rebase, RebaseResult, } from '../../../../src/lib/git/rebase' -import { - AppFileStatusKind, - CommittedFileChange, -} from '../../../../src/models/status' +import { AppFileStatusKind } from '../../../../src/models/status' import { createRepository } from '../../../helpers/repository-builder-rebase-test' import { getStatusOrThrow } from '../../../helpers/status' import { getBranchOrError } from '../../../helpers/git' -import { IBranchTip } from '../../../../src/models/branch' const baseBranchName = 'base-branch' const featureBranchName = 'this-is-a-feature' describe('git/rebase', () => { describe('detect conflicts', () => { - let result: RebaseResult - let originalBranchTip: string - let baseBranchTip: string - let status: IStatusResult - - beforeEach(async () => { + const setup = async (t: TestContext) => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -40,21 +32,26 @@ describe('git/rebase', () => { repository, featureBranchName ) - originalBranchTip = featureBranch.tip.sha + const originalBranchTip = featureBranch.tip.sha const baseBranch = await getBranchOrError(repository, baseBranchName) - baseBranchTip = baseBranch.tip.sha + const baseBranchTip = baseBranch.tip.sha - result = await rebase(repository, baseBranch, featureBranch) + const result = await rebase(repository, baseBranch, featureBranch) - status = await getStatusOrThrow(repository) - }) + const status = await getStatusOrThrow(repository) - it('returns a value indicating conflicts were encountered', async () => { + return { result, status, originalBranchTip, baseBranchTip } + } + + it('returns a value indicating conflicts were encountered', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.ConflictsEncountered) }) - it('status detects REBASE_HEAD', async () => { + it('status detects REBASE_HEAD', async t => { + const { originalBranchTip, baseBranchTip, status } = await setup(t) + assert.deepStrictEqual(status.rebaseInternalState, { originalBranchTip, baseBranchTip, @@ -62,7 +59,9 @@ describe('git/rebase', () => { }) }) - it('has conflicted files in working directory', async () => { + it('has conflicted files in working directory', async t => { + const { status } = await setup(t) + assert.equal( status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted @@ -71,16 +70,16 @@ describe('git/rebase', () => { ) }) - it('is a detached HEAD state', async () => { + it('is a detached HEAD state', async t => { + const { status } = await setup(t) assert(status.currentBranch === undefined) }) }) describe('abort after conflicts found', () => { - let status: IStatusResult - - beforeEach(async () => { + const setup = async (t: TestContext) => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -96,30 +95,29 @@ describe('git/rebase', () => { await abortRebase(repository) - status = await getStatusOrThrow(repository) - }) + return await getStatusOrThrow(repository) + } - it('REBASE_HEAD is no longer found', async () => { + it('REBASE_HEAD is no longer found', async t => { + const status = await setup(t) assert(status.rebaseInternalState === null) }) - it('no longer has working directory changes', async () => { + it('no longer has working directory changes', async t => { + const status = await setup(t) assert.equal(status.workingDirectory.files.length, 0) }) - it('returns to the feature branch', async () => { + it('returns to the feature branch', async t => { + const status = await setup(t) assert.equal(status.currentBranch, featureBranchName) }) }) describe('attempt to continue without resolving conflicts', () => { - let result: RebaseResult - let originalBranchTip: string - let baseBranchTip: string - let status: IStatusResult - - beforeEach(async () => { + const setup = async (t: TestContext) => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -128,26 +126,30 @@ describe('git/rebase', () => { repository, featureBranchName ) - originalBranchTip = featureBranch.tip.sha + const originalBranchTip = featureBranch.tip.sha const baseBranch = await getBranchOrError(repository, baseBranchName) - baseBranchTip = baseBranch.tip.sha + const baseBranchTip = baseBranch.tip.sha await rebase(repository, baseBranch, featureBranch) // the second parameter here represents files that the UI indicates have // no conflict markers, so can be safely staged before continuing the // rebase - result = await continueRebase(repository, []) + const result = await continueRebase(repository, []) - status = await getStatusOrThrow(repository) - }) + const status = await getStatusOrThrow(repository) + + return { result, status, originalBranchTip, baseBranchTip } + } - it('indicates that the rebase was not complete', async () => { + it('indicates that the rebase was not complete', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.OutstandingFilesNotStaged) }) - it('REBASE_HEAD is still found', async () => { + it('REBASE_HEAD is still found', async t => { + const { status, originalBranchTip, baseBranchTip } = await setup(t) assert.deepStrictEqual(status.rebaseInternalState, { originalBranchTip, baseBranchTip, @@ -155,7 +157,8 @@ describe('git/rebase', () => { }) }) - it('still has conflicted files in working directory', async () => { + it('still has conflicted files in working directory', async t => { + const { status } = await setup(t) assert.equal( status.workingDirectory.files.filter( f => f.status.kind === AppFileStatusKind.Conflicted @@ -166,12 +169,9 @@ describe('git/rebase', () => { }) describe('continue after resolving conflicts', () => { - let beforeRebaseTip: IBranchTip - let result: RebaseResult - let status: IStatusResult - - beforeEach(async () => { + const setup = async (t: TestContext) => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -180,7 +180,7 @@ describe('git/rebase', () => { repository, featureBranchName ) - beforeRebaseTip = featureBranch.tip + const beforeRebaseTip = featureBranch.tip const baseBranch = await getBranchOrError(repository, baseBranchName) @@ -209,40 +209,44 @@ describe('git/rebase', () => { assert.equal(diffCheckAfter.exitCode, 0) - result = await continueRebase(repository, files) + const result = await continueRebase(repository, files) - status = await getStatusOrThrow(repository) - }) + const status = await getStatusOrThrow(repository) + + return { result, status, beforeRebaseTip } + } - it('returns success', () => { + it('returns success', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.CompletedWithoutError) }) - it('REBASE_HEAD is no longer found', () => { + it('REBASE_HEAD is no longer found', async t => { + const { status } = await setup(t) assert(status.rebaseInternalState === null) }) - it('no longer has working directory changes', () => { + it('no longer has working directory changes', async t => { + const { status } = await setup(t) assert.equal(status.workingDirectory.files.length, 0) }) - it('returns to the feature branch', () => { + it('returns to the feature branch', async t => { + const { status } = await setup(t) + assert.equal(status.currentBranch, featureBranchName) }) - it('branch is now a different ref', () => { + it('branch is now a different ref', async t => { + const { status, beforeRebaseTip } = await setup(t) assert.notEqual(status.currentTip, beforeRebaseTip.sha) }) }) describe('continue with additional changes unrelated to conflicted files', () => { - let beforeRebaseTip: IBranchTip - let filesInRebasedCommit: ReadonlyArray - let result: RebaseResult - let status: IStatusResult - - beforeEach(async () => { + const setup = async (t: TestContext) => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -251,7 +255,7 @@ describe('git/rebase', () => { repository, featureBranchName ) - beforeRebaseTip = featureBranch.tip + const beforeRebaseTip = featureBranch.tip const baseBranch = await getBranchOrError(repository, baseBranchName) @@ -284,45 +288,54 @@ describe('git/rebase', () => { const { files } = afterRebase.workingDirectory - result = await continueRebase(repository, files) + const result = await continueRebase(repository, files) - status = await getStatusOrThrow(repository) + const status = await getStatusOrThrow(repository) assert(status.currentTip !== undefined) const changesetData = await getChangedFiles(repository, status.currentTip) - filesInRebasedCommit = changesetData.files - }) + const filesInRebasedCommit = changesetData.files + + return { result, status, beforeRebaseTip, filesInRebasedCommit } + } - it('returns success', () => { + it('returns success', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.CompletedWithoutError) }) - it('keeps untracked working directory file out of rebase', () => { + it('keeps untracked working directory file out of rebase', async t => { + const { status } = await setup(t) assert.equal(status.workingDirectory.files.length, 1) }) - it('has modified but unconflicted file in commit contents', () => { + it('has modified but unconflicted file in commit contents', async t => { + const { filesInRebasedCommit } = await setup(t) + assert( filesInRebasedCommit.find(f => f.path === 'THIRD.md') !== undefined ) }) - it('returns to the feature branch', () => { + it('returns to the feature branch', async t => { + const { status } = await setup(t) + assert.equal(status.currentBranch, featureBranchName) }) - it('branch is now a different ref', () => { + it('branch is now a different ref', async t => { + const { status, beforeRebaseTip } = await setup(t) + assert.notEqual(status.currentTip, beforeRebaseTip.sha) }) }) describe('continue with tracked change omitted from list', () => { - let result: RebaseResult - - beforeEach(async () => { + it('returns error code indicating that required files were missing', async t => { const repository = await createRepository( + t, baseBranchName, featureBranchName ) @@ -361,10 +374,8 @@ describe('git/rebase', () => { // all tracked changes to be staged as a prerequisite for rebasing const onlyConflictedFiles = files.filter(f => f.path !== 'THIRD.md') - result = await continueRebase(repository, onlyConflictedFiles) - }) + const result = await continueRebase(repository, onlyConflictedFiles) - it('returns error code indicating that required files were missing', () => { assert.equal(result, RebaseResult.OutstandingFilesNotStaged) }) }) diff --git a/app/test/unit/git/rebase/progress-test.ts b/app/test/unit/git/rebase/progress-test.ts index cfc12f9237d..c72c86c6a6c 100644 --- a/app/test/unit/git/rebase/progress-test.ts +++ b/app/test/unit/git/rebase/progress-test.ts @@ -1,10 +1,6 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' -import { - IStatusResult, - continueRebase, - getStatus, -} from '../../../../src/lib/git' +import { continueRebase, getStatus } from '../../../../src/lib/git' import { rebase, RebaseResult, @@ -13,7 +9,6 @@ import { import { createRepository as createShortRebaseTest } from '../../../helpers/repository-builder-rebase-test' import { createRepository as createLongRebaseTest } from '../../../helpers/repository-builder-long-rebase-test' import { getStatusOrThrow } from '../../../helpers/status' -import { GitRebaseSnapshot } from '../../../../src/models/rebase' import { setupEmptyDirectory } from '../../../helpers/repositories' import { getBranchOrError } from '../../../helpers/git' import { IMultiCommitOperationProgress } from '../../../../src/models/progress' @@ -26,8 +21,8 @@ const featureBranchName = 'this-is-a-feature' describe('git/rebase', () => { describe('skips a normal repository', () => { - it('returns null for rebase progress', async () => { - const repository = setupEmptyDirectory() + it('returns null for rebase progress', async t => { + const repository = await setupEmptyDirectory(t) const progress = await getRebaseSnapshot(repository) assert.equal(progress, null) @@ -35,14 +30,9 @@ describe('git/rebase', () => { }) describe('can parse progress', () => { - let repository: Repository | null - let result: RebaseResult - let snapshot: GitRebaseSnapshot | null - let status: IStatusResult - let progress = new Array() - - beforeEach(async () => { - repository = await createShortRebaseTest( + const setup = async (t: TestContext) => { + const repository = await createShortRebaseTest( + t, baseBranchName, featureBranchName ) @@ -54,21 +44,25 @@ describe('git/rebase', () => { const baseBranch = await getBranchOrError(repository, baseBranchName) - progress = new Array() - result = await rebase(repository, baseBranch, featureBranch, p => + const progress = new Array() + const result = await rebase(repository, baseBranch, featureBranch, p => progress.push(p) ) - snapshot = await getRebaseSnapshot(repository) + const snapshot = await getRebaseSnapshot(repository) - status = await getStatusOrThrow(repository) - }) + const status = await getStatusOrThrow(repository) + + return { repository, result, snapshot, status, progress } + } - it('returns a value indicating conflicts were encountered', () => { + it('returns a value indicating conflicts were encountered', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.ConflictsEncountered) }) - it('reported step-by-step progress before encountering conflicts', () => { + it('reported step-by-step progress before encountering conflicts', async t => { + const { progress } = await setup(t) assert.deepStrictEqual(progress, [ { currentCommitSummary: 'Feature Branch!', @@ -80,7 +74,9 @@ describe('git/rebase', () => { ]) }) - it('status detects REBASE_HEAD', () => { + it('status detects REBASE_HEAD', async t => { + const { snapshot } = await setup(t) + assert(snapshot !== null) const s = snapshot assert.equal(s.commits.length, 1) @@ -92,20 +88,19 @@ describe('git/rebase', () => { assert.equal(s.progress.value, 1) }) - it('is a detached HEAD state', () => { + it('is a detached HEAD state', async t => { + const { status } = await setup(t) assert(status.currentBranch === undefined) }) }) describe('can parse progress for long rebase', () => { - let repository: Repository | null - let result: RebaseResult - let snapshot: GitRebaseSnapshot | null - let status: IStatusResult - let progress = new Array() - - beforeEach(async () => { - repository = await createLongRebaseTest(baseBranchName, featureBranchName) + const setup = async (t: TestContext) => { + const repository = await createLongRebaseTest( + t, + baseBranchName, + featureBranchName + ) const featureBranch = await getBranchOrError( repository, @@ -114,21 +109,25 @@ describe('git/rebase', () => { const baseBranch = await getBranchOrError(repository, baseBranchName) - progress = new Array() - result = await rebase(repository, baseBranch, featureBranch, p => + const progress = new Array() + const result = await rebase(repository, baseBranch, featureBranch, p => progress.push(p) ) - snapshot = await getRebaseSnapshot(repository) + const snapshot = await getRebaseSnapshot(repository) - status = await getStatusOrThrow(repository) - }) + const status = await getStatusOrThrow(repository) - it('returns a value indicating conflicts were encountered', () => { + return { repository, result, snapshot, status, progress } + } + + it('returns a value indicating conflicts were encountered', async t => { + const { result } = await setup(t) assert.equal(result, RebaseResult.ConflictsEncountered) }) - it('reported step-by-step progress before encountering conflicts', () => { + it('reported step-by-step progress before encountering conflicts', async t => { + const { progress } = await setup(t) assert.deepStrictEqual(progress, [ { currentCommitSummary: 'Feature Branch First Commit!', @@ -140,12 +139,15 @@ describe('git/rebase', () => { ]) }) - it('reports progress after resolving conflicts', async () => { + it('reports progress after resolving conflicts', async t => { + const { progress, result, repository } = await setup(t) + const strategy = ManualConflictResolution.theirs const progressCb = (p: IMultiCommitOperationProgress) => progress.push(p) - while (result === RebaseResult.ConflictsEncountered) { - result = await resolveAndContinue(repository!, strategy, progressCb) + let r = result + while (r === RebaseResult.ConflictsEncountered) { + r = await resolveAndContinue(repository, strategy, progressCb) } assert.equal(progress.length, 10) @@ -158,7 +160,9 @@ describe('git/rebase', () => { }) }) - it('status detects REBASE_HEAD', () => { + it('status detects REBASE_HEAD', async t => { + const { snapshot } = await setup(t) + assert(snapshot !== null) const s = snapshot assert.equal(s.commits.length, 10) @@ -173,7 +177,8 @@ describe('git/rebase', () => { assert.equal(s.progress.value, 0.1) }) - it('is a detached HEAD state', () => { + it('is a detached HEAD state', async t => { + const { status } = await setup(t) assert(status.currentBranch === undefined) }) }) diff --git a/app/test/unit/git/ref-test.ts b/app/test/unit/git/ref-test.ts index 439c4fe2b44..f0f6823ca2d 100644 --- a/app/test/unit/git/ref-test.ts +++ b/app/test/unit/git/ref-test.ts @@ -22,14 +22,14 @@ describe('git/refs', () => { }) describe('getSymbolicRef', () => { - it('resolves a valid symbolic ref', async () => { - const repo = await setupEmptyRepository() + it('resolves a valid symbolic ref', async t => { + const repo = await setupEmptyRepository(t) const ref = await getSymbolicRef(repo, 'HEAD') assert.equal(ref, 'refs/heads/master') }) - it('does not resolve a missing ref', async () => { - const repo = await setupEmptyRepository() + it('does not resolve a missing ref', async t => { + const repo = await setupEmptyRepository(t) const ref = await getSymbolicRef(repo, 'FOO') assert(ref === null) }) diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts index a12ed40a10a..fd2964c15f0 100644 --- a/app/test/unit/git/reflog-test.ts +++ b/app/test/unit/git/reflog-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { @@ -26,15 +26,11 @@ async function createAndCheckout( } describe('git/reflog', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('getRecentBranches', () => { - it('returns the recently checked out branches', async () => { + it('returns the recently checked out branches', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createAndCheckout(repository, 'branch-1') await createAndCheckout(repository, 'branch-2') @@ -43,7 +39,10 @@ describe('git/reflog', () => { assert(branches.includes('branch-2')) }) - it('works after renaming a branch', async () => { + it('works after renaming a branch', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createAndCheckout(repository, 'branch-1') await createAndCheckout(repository, 'branch-2') @@ -61,7 +60,10 @@ describe('git/reflog', () => { assert(branches.includes('branch-2-test')) }) - it('returns a limited number of branches', async () => { + it('returns a limited number of branches', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createAndCheckout(repository, 'branch-1') await createAndCheckout(repository, 'branch-2') await createAndCheckout(repository, 'branch-3') @@ -75,7 +77,10 @@ describe('git/reflog', () => { }) describe('getBranchCheckouts', () => { - it('returns does not return the branches that were checked out before a specific date', async () => { + it('returns does not return the branches that were checked out before a specific date', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createAndCheckout(repository, 'branch-1') await createAndCheckout(repository, 'branch-2') @@ -86,7 +91,10 @@ describe('git/reflog', () => { assert.equal(branches.size, 0) }) - it('returns all branches checked out after a specific date', async () => { + it('returns all branches checked out after a specific date', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createBranch(repository, 'never-checked-out', null) await createAndCheckout(repository, 'branch-1') await createAndCheckout(repository, 'branch-2') @@ -98,7 +106,10 @@ describe('git/reflog', () => { assert.equal(branches.size, 2) }) - it('returns empty when current branch is orphaned', async () => { + it('returns empty when current branch is orphaned', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const result = await exec( ['checkout', '--orphan', 'orphan-branch'], repository.path diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index d1bb27abb7c..3f0ec794473 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import { Repository } from '../../../src/models/repository' import { @@ -18,8 +18,9 @@ import { setConfigValue } from '../../../src/lib/git' describe('git/remote', () => { describe('getRemotes', () => { - it('should return both remotes', async () => { + it('should return both remotes', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-multiple-remotes' ) const repository = new Repository(testRepoPath, -1, null, false) @@ -33,7 +34,11 @@ describe('git/remote', () => { // Changes the output of git remote -v, see // https://github.com/git/git/blob/9005149a4a77e2d3409c6127bf4fd1a0893c3495/builtin/remote.c#L1223-L1226 - setConfigValue(repository, 'remote.bassoon.partialclonefilter', 'foo') + await setConfigValue( + repository, + 'remote.bassoon.partialclonefilter', + 'foo' + ) assert.equal(result[0].name, 'bassoon') assert.equal(result[0].url.endsWith(nwo), true) @@ -45,8 +50,8 @@ describe('git/remote', () => { assert.equal(result[2].url, '/path/with spaces/foo') }) - it('returns remotes sorted alphabetically', async () => { - const repository = await setupEmptyRepository() + it('returns remotes sorted alphabetically', async t => { + const repository = await setupEmptyRepository(t) // adding these remotes out-of-order to test how they are then retrieved const url = 'https://github.com/desktop/not-found.git' @@ -67,14 +72,14 @@ describe('git/remote', () => { assert.equal(result[4].name, 'X') }) - it('returns empty array for directory without a .git directory', async () => { - const repository = setupEmptyDirectory() + it('returns empty array for directory without a .git directory', async t => { + const repository = await setupEmptyDirectory(t) const remotes = await getRemotes(repository) assert.equal(remotes.length, 0) }) - it('returns promisor remote', async () => { - const repository = await setupEmptyRepository() + it('returns promisor remote', async t => { + const repository = await setupEmptyRepository(t) // Add a remote const url = 'https://github.com/desktop/not-found.git' @@ -101,8 +106,9 @@ describe('git/remote', () => { assert(result === null) }) - it('returns origin when multiple remotes found', async () => { + it('returns origin when multiple remotes found', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-multiple-remotes' ) const repository = new Repository(testRepoPath, -1, null, false) @@ -114,8 +120,9 @@ describe('git/remote', () => { assert.equal(result.name, 'origin') }) - it('returns something when origin removed', async () => { + it('returns something when origin removed', async t => { const testRepoPath = await setupFixtureRepository( + t, 'repo-with-multiple-remotes' ) const repository = new Repository(testRepoPath, -1, null, false) @@ -128,8 +135,8 @@ describe('git/remote', () => { assert.equal(result.name, 'bassoon') }) - it('returns null for new repository', async () => { - const repository = await setupEmptyRepository() + it('returns null for new repository', async t => { + const repository = await setupEmptyRepository(t) const remotes = await getRemotes(repository) const result = await findDefaultRemote(remotes) @@ -139,8 +146,8 @@ describe('git/remote', () => { }) describe('addRemote', () => { - it('can set origin and return it as default', async () => { - const repository = await setupEmptyRepository() + it('can set origin and return it as default', async t => { + const repository = await setupEmptyRepository(t) await addRemote( repository, 'origin', @@ -156,30 +163,29 @@ describe('git/remote', () => { }) describe('removeRemote', () => { - it('silently fails when remote not defined', async () => { - const repository = await setupEmptyRepository() + it('silently fails when remote not defined', async t => { + const repository = await setupEmptyRepository(t) await assert.doesNotReject(removeRemote(repository, 'origin')) }) }) describe('setRemoteURL', () => { - let repository: Repository const remoteName = 'origin' const remoteUrl = 'https://fakeweb.com/owner/name' const newUrl = 'https://github.com/desktop/desktop' - beforeEach(async () => { - repository = await setupEmptyRepository() + it('can set the url for an existing remote', async t => { + const repository = await setupEmptyRepository(t) await addRemote(repository, remoteName, remoteUrl) - }) - it('can set the url for an existing remote', async () => { assert.equal(await setRemoteURL(repository, remoteName, newUrl), true) const remotes = await getRemotes(repository) assert.equal(remotes.length, 1) assert.equal(remotes[0].url, newUrl) }) - it('returns false for unknown remote name', async () => { + it('returns false for unknown remote name', async t => { + const repository = await setupEmptyRepository(t) + await addRemote(repository, remoteName, remoteUrl) await assert.rejects(() => setRemoteURL(repository, 'none', newUrl)) const remotes = await getRemotes(repository) diff --git a/app/test/unit/git/reorder-test.ts b/app/test/unit/git/reorder-test.ts index 3fe9a959f98..ff4dd784795 100644 --- a/app/test/unit/git/reorder-test.ts +++ b/app/test/unit/git/reorder-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -19,15 +19,10 @@ import { getTempFilePath } from '../../../src/lib/file-system' import { reorder } from '../../../src/lib/git/reorder' describe('git/reorder', () => { - let repository: Repository - let initialCommit: Commit + it('moves second commit before the first one', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') - beforeEach(async () => { - repository = await setupEmptyRepositoryDefaultMain() - initialCommit = await makeSampleCommit(repository, 'initialize') - }) - - it('moves second commit before the first one', async () => { const firstCommit = await makeSampleCommit(repository, 'first') const secondCommit = await makeSampleCommit(repository, 'second') @@ -47,7 +42,10 @@ describe('git/reorder', () => { assert.equal(log[0].summary, 'first') }) - it('moves first and fourth commits after the second one respecting their order in the log', async () => { + it('moves first and fourth commits after the second one respecting their order in the log', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + const firstCommit = await makeSampleCommit(repository, 'first') await makeSampleCommit(repository, 'second') const thirdCommit = await makeSampleCommit(repository, 'third') @@ -75,7 +73,10 @@ describe('git/reorder', () => { ]) }) - it('moves first commit after the last one', async () => { + it('moves first commit after the last one', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + const firstCommit = await makeSampleCommit(repository, 'first') await makeSampleCommit(repository, 'second') await makeSampleCommit(repository, 'third') @@ -101,7 +102,10 @@ describe('git/reorder', () => { ]) }) - it('reorders using the root of the branch if last retained commit is null', async () => { + it('reorders using the root of the branch if last retained commit is null', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + const firstCommit = await makeSampleCommit(repository, 'first') await makeSampleCommit(repository, 'second') @@ -116,7 +120,10 @@ describe('git/reorder', () => { assert.deepStrictEqual(summaries, ['second', 'initialize', 'first']) }) - it('handles reordering a conflicting commit', async () => { + it('handles reordering a conflicting commit', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + await makeSampleCommit(repository, 'first') // make a commit with a commit message 'second' and adding file 'second.md' @@ -197,7 +204,10 @@ describe('git/reorder', () => { ]) }) - it('returns error on invalid lastRetainedCommitRef', async () => { + it('returns error on invalid lastRetainedCommitRef', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + await makeSampleCommit(repository, 'initialize') + const firstCommit = await makeSampleCommit(repository, 'first') const secondCommit = await makeSampleCommit(repository, 'second') @@ -217,7 +227,10 @@ describe('git/reorder', () => { assert(isRebaseStillOngoing === null) }) - it('returns error on invalid base commit', async () => { + it('returns error on invalid base commit', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + await makeSampleCommit(repository, 'first') const secondCommit = await makeSampleCommit(repository, 'second') @@ -237,7 +250,10 @@ describe('git/reorder', () => { assert(isRebaseStillOngoing === null) }) - it('returns error when no commits are reordered', async () => { + it('returns error when no commits are reordered', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSampleCommit(repository, 'initialize') + const first = await makeSampleCommit(repository, 'first') await makeSampleCommit(repository, 'second') diff --git a/app/test/unit/git/reset-test.ts b/app/test/unit/git/reset-test.ts index 442c4ac3954..ab5f7756397 100644 --- a/app/test/unit/git/reset-test.ts +++ b/app/test/unit/git/reset-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as path from 'path' @@ -11,15 +11,11 @@ import { exec } from 'dugite' import * as FSE from 'fs-extra' describe('git/reset', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('reset', () => { - it('can hard reset a repository', async () => { + it('can hard reset a repository', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const repoPath = repository.path const fileName = 'README.md' const filePath = path.join(repoPath, fileName) @@ -34,7 +30,10 @@ describe('git/reset', () => { }) describe('resetPaths', () => { - it.skip('resets discarded staged file', async () => { + it.skip('resets discarded staged file', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const repoPath = repository.path const fileName = 'README.md' const filePath = path.join(repoPath, fileName) diff --git a/app/test/unit/git/rev-parse-test.ts b/app/test/unit/git/rev-parse-test.ts index 91196d3ee82..6cbeede563f 100644 --- a/app/test/unit/git/rev-parse-test.ts +++ b/app/test/unit/git/rev-parse-test.ts @@ -1,8 +1,7 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' -import * as os from 'os' import { Repository } from '../../../src/models/repository' import { getRepositoryType } from '../../../src/lib/git/rev-parse' @@ -12,19 +11,15 @@ import { setupEmptyRepository, } from '../../helpers/repositories' import { exec } from 'dugite' -import { mkdirSync } from '../../helpers/temp' import { writeFile } from 'fs-extra' +import { createTempDirectory } from '../../helpers/temp' describe('git/rev-parse', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('getRepositoryType', () => { - it('should return an absolute path when run inside a working directory', async () => { + it('should return an absolute path when run inside a working directory', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + assert.deepEqual(await getRepositoryType(repository.path), { kind: 'regular', topLevelWorkingDirectory: repository.path, @@ -39,13 +34,13 @@ describe('git/rev-parse', () => { }) }) - it('should return missing when not run inside a working directory', async () => { - const result = await getRepositoryType(os.tmpdir()) + it('should return missing when not run inside a working directory', async t => { + const result = await getRepositoryType(await createTempDirectory(t)) assert.deepEqual(result, { kind: 'missing' }) }) - it('should return correct path for submodules', async () => { - const fixturePath = mkdirSync('get-top-level-working-directory-test-') + it('should return correct path for submodules', async t => { + const fixturePath = await createTempDirectory(t) const firstRepoPath = path.join(fixturePath, 'repo1') const secondRepoPath = path.join(fixturePath, 'repo2') @@ -82,31 +77,31 @@ describe('git/rev-parse', () => { }) }) - it('returns regular for default initialized repository', async () => { - const repository = await setupEmptyRepository() + it('returns regular for default initialized repository', async t => { + const repository = await setupEmptyRepository(t) assert.deepEqual(await getRepositoryType(repository.path), { kind: 'regular', topLevelWorkingDirectory: repository.path, }) }) - it('returns bare for initialized bare repository', async () => { - const path = mkdirSync('no-repository-here') + it('returns bare for initialized bare repository', async t => { + const path = await createTempDirectory(t) await exec(['init', '--bare'], path) assert.deepEqual(await getRepositoryType(path), { kind: 'bare', }) }) - it('returns missing for empty directory', async () => { - const p = mkdirSync('no-actual-repository-here') + it('returns missing for empty directory', async t => { + const p = await createTempDirectory(t) assert.deepEqual(await getRepositoryType(p), { kind: 'missing', }) }) - it('returns missing for missing directory', async () => { - const rootPath = mkdirSync('no-actual-repository-here') + it('returns missing for missing directory', async t => { + const rootPath = await createTempDirectory(t) const missingPath = path.join(rootPath, 'missing-folder') assert.deepEqual(await getRepositoryType(missingPath), { @@ -114,7 +109,10 @@ describe('git/rev-parse', () => { }) }) - it('returns unsafe for unsafe repository', async () => { + it('returns unsafe for unsafe repository', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const previousHomeValue = process.env['HOME'] // Creating a stub global config so we can unset safe.directory config @@ -123,7 +121,7 @@ describe('git/rev-parse', () => { // // This is because safe.directory setting is ignored if found in local // config, environment variables or command line arguments. - const testHomeDirectory = mkdirSync('test-home-directory') + const testHomeDirectory = await createTempDirectory(t) const gitConfigPath = path.join(testHomeDirectory, '.gitconfig') await writeFile( gitConfigPath, diff --git a/app/test/unit/git/squash-test.ts b/app/test/unit/git/squash-test.ts index 99fad27a669..078083afcad 100644 --- a/app/test/unit/git/squash-test.ts +++ b/app/test/unit/git/squash-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as FSE from 'fs-extra' import * as Path from 'path' @@ -20,15 +20,10 @@ import { getStatusOrThrow } from '../../helpers/status' import { getTempFilePath } from '../../../src/lib/file-system' describe('git/cherry-pick', () => { - let repository: Repository - let initialCommit: Commit + it('squashes one commit onto the next (non-conflicting)', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') - beforeEach(async () => { - repository = await setupEmptyRepositoryDefaultMain() - initialCommit = await makeSquashCommit(repository, 'initialize') - }) - - it('squashes one commit onto the next (non-conflicting)', async () => { const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -60,7 +55,10 @@ describe('git/cherry-pick', () => { assert(squashedFilePaths.includes('second.md')) }) - it('returns error when squashOnto is in the toSquash array', async () => { + it('returns error when squashOnto is in the toSquash array', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -75,7 +73,10 @@ describe('git/cherry-pick', () => { assert.equal(result, RebaseResult.Error) }) - it('squashes multiple commit onto one (non-conflicting)', async () => { + it('squashes multiple commit onto one (non-conflicting)', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') const thirdCommit = await makeSquashCommit(repository, 'third') @@ -111,7 +112,10 @@ describe('git/cherry-pick', () => { assert(squashedFilePaths.includes('fourth.md')) }) - it('squashes using the root of the branch if last retained commit is null', async () => { + it('squashes using the root of the branch if last retained commit is null', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -147,7 +151,10 @@ describe('git/cherry-pick', () => { assert(squashedFilePaths.includes('second.md')) }) - it('squashes multiple commit non-sequential commits (reorders, non-conflicting)', async () => { + it('squashes multiple commit non-sequential commits (reorders, non-conflicting)', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') await makeSquashCommit(repository, 'second') const thirdCommit = await makeSquashCommit(repository, 'third') @@ -200,7 +207,10 @@ describe('git/cherry-pick', () => { assert.equal(squashedFilePaths.includes('fourth.md'), false) }) - it('handles squashing a conflicting commit', async () => { + it('handles squashing a conflicting commit', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') // make a commit with a commit message 'second' and adding file 'second.md' @@ -290,7 +300,10 @@ describe('git/cherry-pick', () => { assert(squashedFilePaths.includes('second.md')) }) - it('squashes with default merged commit message/description if commit message not provided', async () => { + it('squashes with default merged commit message/description if commit message not provided', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -310,7 +323,10 @@ describe('git/cherry-pick', () => { assert.equal(log.length, 2) }) - it('returns error on invalid lastRetainedCommitRef', async () => { + it('returns error on invalid lastRetainedCommitRef', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + await makeSquashCommit(repository, 'initialize') + const firstCommit = await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -331,7 +347,10 @@ describe('git/cherry-pick', () => { assert.equal(isRebaseStillOngoing !== null, false) }) - it('returns error on invalid commit to squashOnto', async () => { + it('returns error on invalid commit to squashOnto', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + await makeSquashCommit(repository, 'first') const secondCommit = await makeSquashCommit(repository, 'second') @@ -352,7 +371,10 @@ describe('git/cherry-pick', () => { assert.equal(isRebaseStillOngoing !== null, false) }) - it('returns error on empty toSquash', async () => { + it('returns error on empty toSquash', async t => { + const repository = await setupEmptyRepositoryDefaultMain(t) + const initialCommit = await makeSquashCommit(repository, 'initialize') + const first = await makeSquashCommit(repository, 'first') await makeSquashCommit(repository, 'second') diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index df0a357adcf..f4956c35364 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import * as FSE from 'fs-extra' import * as path from 'path' @@ -20,35 +20,30 @@ import { StashedChangesLoadStates, } from '../../../src/models/stash-entry' import { generateString } from '../../helpers/random-data' +import { join } from 'node:path' describe('git/stash', () => { describe('getStash', () => { - let repository: Repository - let readme: string - - beforeEach(async () => { - repository = await setupEmptyRepository() - readme = path.join(repository.path, 'README.md') - await FSE.writeFile(readme, '') - await exec(['add', 'README.md'], repository.path) - await exec(['commit', '-m', 'initial commit'], repository.path) - }) - - it('handles unborn repo by returning empty list', async () => { - const repo = await setupEmptyRepository() - + it('handles unborn repo by returning empty list', async t => { + const repo = await setupEmptyRepository(t) const stash = await getStashes(repo) assert.equal(stash.desktopEntries.length, 0) }) - it('returns an empty list when no stash entries have been created', async () => { - const stash = await getStashes(repository) + it('returns an empty list when no stash entries have been created', async t => { + const stash = await getStashes(await setupEmptyRepository(t)) assert.equal(stash.desktopEntries.length, 0) }) - it('returns all stash entries created by Desktop', async () => { + it('returns all stash entries created by Desktop', async t => { + const repository = await setupEmptyRepository(t) + const readme = path.join(repository.path, 'README.md') + await FSE.writeFile(readme, '') + await exec(['add', 'README.md'], repository.path) + await exec(['commit', '-m', 'initial commit'], repository.path) + await generateTestStashEntry(repository, 'master', false) await generateTestStashEntry(repository, 'master', false) await generateTestStashEntry(repository, 'master', true) @@ -62,19 +57,22 @@ describe('git/stash', () => { }) describe('createDesktopStashEntry', () => { - let repository: Repository - let readme: string - - beforeEach(async () => { - repository = await setupEmptyRepository() - readme = path.join(repository.path, 'README.md') + const setup = async (t: TestContext) => { + const repository = await setupEmptyRepository(t) + const readme = join(repository.path, 'README.md') await FSE.writeFile(readme, '') await exec(['add', 'README.md'], repository.path) await exec(['commit', '-m', 'initial commit'], repository.path) - }) - it('creates a stash entry when repo is not unborn or in any kind of conflict or rebase state', async () => { - await FSE.appendFile(readme, 'just testing stuff') + return repository + } + + it('creates a stash entry when repo is not unborn or in any kind of conflict or rebase state', async t => { + const repository = await setup(t) + await FSE.appendFile( + join(repository.path, 'README.md'), + 'just testing stuff' + ) await createDesktopStashEntry(repository, 'master', []) @@ -85,7 +83,8 @@ describe('git/stash', () => { assert.equal(entries[0].branchName, 'master') }) - it('stashes untracked files and removes them from the working directory', async () => { + it('stashes untracked files and removes them from the working directory', async t => { + const repository = await setup(t) const untrackedFile = path.join(repository.path, 'not-tracked.txt') FSE.writeFile(untrackedFile, 'some untracked file') @@ -109,18 +108,17 @@ describe('git/stash', () => { }) describe('getLastDesktopStashEntryForBranch', () => { - let repository: Repository - let readme: string - - beforeEach(async () => { - repository = await setupEmptyRepository() - readme = path.join(repository.path, 'README.md') - await FSE.writeFile(readme, '') + const setup = async (t: TestContext) => { + const repository = await setupEmptyRepository(t) + await FSE.writeFile(join(repository.path, 'README.md'), '') await exec(['add', 'README.md'], repository.path) await exec(['commit', '-m', 'initial commit'], repository.path) - }) - it('returns null when no stash entries exist for branch', async () => { + return repository + } + + it('returns null when no stash entries exist for branch', async t => { + const repository = await setup(t) await generateTestStashEntry(repository, 'some-other-branch', true) const entry = await getLastDesktopStashEntryForBranch( @@ -131,7 +129,8 @@ describe('git/stash', () => { assert(entry === null) }) - it('returns last entry made for branch', async () => { + it('returns last entry made for branch', async t => { + const repository = await setup(t) const branchName = 'master' await generateTestStashEntry(repository, branchName, true) await generateTestStashEntry(repository, branchName, true) @@ -161,18 +160,19 @@ describe('git/stash', () => { }) describe('dropDesktopStashEntry', () => { - let repository: Repository - let readme: string - - beforeEach(async () => { - repository = await setupEmptyRepository() - readme = path.join(repository.path, 'README.md') + const setup = async (t: TestContext) => { + const repository = await setupEmptyRepository(t) + const readme = join(repository.path, 'README.md') await FSE.writeFile(readme, '') await exec(['add', 'README.md'], repository.path) await exec(['commit', '-m', 'initial commit'], repository.path) - }) - it('removes the entry identified by `stashSha`', async () => { + return repository + } + + it('removes the entry identified by `stashSha`', async t => { + const repository = await setup(t) + await generateTestStashEntry(repository, 'master', true) await generateTestStashEntry(repository, 'master', true) @@ -191,7 +191,9 @@ describe('git/stash', () => { assert.notEqual(entries[0].stashSha, stashToDelete) }) - it('does not fail when attempting to delete when stash is empty', async () => { + it('does not fail when attempting to delete when stash is empty', async t => { + const repository = await setup(t) + let didFail = false const doesNotExist: IStashEntry = { name: 'refs/stash@{0}', @@ -211,7 +213,9 @@ describe('git/stash', () => { assert.equal(didFail, false) }) - it("does not fail when attempting to delete stash entry that doesn't exist", async () => { + it("does not fail when attempting to delete stash entry that doesn't exist", async t => { + const repository = await setup(t) + let didFail = false const doesNotExist: IStashEntry = { name: 'refs/stash@{4}', @@ -236,18 +240,20 @@ describe('git/stash', () => { }) describe('popStashEntry', () => { - let repository: Repository - let readme: string - - beforeEach(async () => { - repository = await setupEmptyRepository() - readme = path.join(repository.path, 'README.md') + const setup = async (t: TestContext) => { + const repository = await setupEmptyRepository(t) + const readme = path.join(repository.path, 'README.md') await FSE.writeFile(readme, '') await exec(['add', 'README.md'], repository.path) await exec(['commit', '-m', 'initial commit'], repository.path) - }) + + return repository + } + describe('without any conflicts', () => { - it('restores changes back to the working directory', async () => { + it('restores changes back to the working directory', async t => { + const repository = await setup(t) + await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash @@ -267,7 +273,9 @@ describe('git/stash', () => { }) describe('when there are (resolvable) conflicts', () => { - it('restores changes and drops stash', async () => { + it('restores changes and drops stash', async t => { + const repository = await setup(t) + await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash @@ -294,7 +302,9 @@ describe('git/stash', () => { }) describe('when there are unresolvable conflicts', () => { - it('throws an error', async () => { + it('throws an error', async t => { + const repository = await setup(t) + await generateTestStashEntry(repository, 'master', true) const stash = await getStashes(repository) const { desktopEntries } = stash diff --git a/app/test/unit/git/status-test.ts b/app/test/unit/git/status-test.ts index b6b4c612517..cc10a024503 100644 --- a/app/test/unit/git/status-test.ts +++ b/app/test/unit/git/status-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -26,17 +26,10 @@ import { generateString } from '../../helpers/random-data' describe('git/status', () => { describe('getStatus', () => { - let repository: Repository - describe('with conflicted repo', () => { - let filePath: string - - beforeEach(async () => { - repository = await setupConflictedRepoWithMultipleFiles() - filePath = path.join(repository.path, 'foo') - }) + it('parses conflicted files with markers', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) - it('parses conflicted files with markers', async () => { const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 5) @@ -88,7 +81,9 @@ describe('git/status', () => { }) }) - it('parses conflicted files without markers', async () => { + it('parses conflicted files without markers', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 5) @@ -112,8 +107,8 @@ describe('git/status', () => { }) }) - it('parses conflicted files resulting from popping a stash', async () => { - const repository = await setupEmptyRepository() + it('parses conflicted files resulting from popping a stash', async t => { + const repository = await setupEmptyRepository(t) const readme = path.join(repository.path, 'README.md') await FSE.writeFile(readme, '') await exec(['add', 'README.md'], repository.path) @@ -140,7 +135,10 @@ describe('git/status', () => { assert.equal(conflictedFiles.length, 1) }) - it('parses resolved files', async () => { + it('parses resolved files', async t => { + const repository = await setupConflictedRepoWithMultipleFiles(t) + const filePath = path.join(repository.path, 'foo') + await FSE.writeFile(filePath, 'b1b2') const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files @@ -171,20 +169,17 @@ describe('git/status', () => { }) describe('with conflicted images repo', () => { - beforeEach(async () => { + it('parses conflicted image file on merge', async t => { const path = await setupFixtureRepository( + t, 'detect-conflict-in-binary-file' ) - repository = new Repository(path, -1, null, false) + const repository = new Repository(path, -1, null, false) await exec(['checkout', 'make-a-change'], repository.path) - }) - - it('parses conflicted image file on merge', async () => { - const repo = repository - await exec(['merge', 'master'], repo.path) + await exec(['merge', 'master'], repository.path) - const status = await getStatusOrThrow(repo) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 1) @@ -196,15 +191,19 @@ describe('git/status', () => { ) }) - it('parses conflicted image file on merge after removing', async () => { - const repo = repository + it('parses conflicted image file on merge after removing', async t => { + const path = await setupFixtureRepository( + t, + 'detect-conflict-in-binary-file' + ) + const repository = new Repository(path, -1, null, false) - await exec(['rm', 'my-cool-image.png'], repo.path) - await exec(['commit', '-am', 'removed the image'], repo.path) + await exec(['rm', 'my-cool-image.png'], repository.path) + await exec(['commit', '-am', 'removed the image'], repository.path) - await exec(['merge', 'master'], repo.path) + await exec(['merge', 'master'], repository.path) - const status = await getStatusOrThrow(repo) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 1) @@ -218,12 +217,10 @@ describe('git/status', () => { }) describe('with unconflicted repo', () => { - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('parses changed files', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) - it('parses changed files', async () => { await FSE.writeFile( path.join(repository.path, 'README.md'), 'Hi world\n' @@ -238,14 +235,17 @@ describe('git/status', () => { assert.equal(file.status.kind, AppFileStatusKind.Modified) }) - it('returns an empty array when there are no changes', async () => { + it('returns an empty array when there are no changes', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const status = await getStatusOrThrow(repository) const files = status.workingDirectory.files assert.equal(files.length, 0) }) - it('reflects renames', async () => { - const repo = await setupEmptyRepository() + it('reflects renames', async t => { + const repo = await setupEmptyRepository(t) await FSE.writeFile(path.join(repo.path, 'foo'), 'foo\n') @@ -266,11 +266,12 @@ describe('git/status', () => { }) }) - it('reflects copies', async () => { + it('reflects copies', async t => { const testRepoPath = await setupFixtureRepository( + t, 'copy-detection-status' ) - repository = new Repository(testRepoPath, -1, null, false) + const repository = new Repository(testRepoPath, -1, null, false) // Git 2.18 now uses a new config value to handle detecting copies, so // users who have this enabled will see this. For reference, Desktop does @@ -296,16 +297,19 @@ describe('git/status', () => { }) }) - it('returns null for directory without a .git directory', async () => { - repository = setupEmptyDirectory() + it('returns null for directory without a .git directory', async t => { + const repository = await setupEmptyDirectory(t) const status = await getStatus(repository) assert(status === null) }) }) describe('with submodules', () => { - it('returns the submodule status', async () => { - const repoPath = await setupFixtureRepository('submodule-basic-setup') - repository = new Repository(repoPath, -1, null, false) + it('returns the submodule status', async t => { + const repoPath = await setupFixtureRepository( + t, + 'submodule-basic-setup' + ) + const repository = new Repository(repoPath, -1, null, false) const submodulePath = path.join(repoPath, 'foo', 'submodule') const checkSubmoduleChanges = async (changes: { diff --git a/app/test/unit/git/submodule-test.ts b/app/test/unit/git/submodule-test.ts index f6d774390fc..9919690dd62 100644 --- a/app/test/unit/git/submodule-test.ts +++ b/app/test/unit/git/submodule-test.ts @@ -13,8 +13,11 @@ import { setupFixtureRepository } from '../../helpers/repositories' describe('git/submodule', () => { describe('listSubmodules', () => { - it('returns the submodule entry', async () => { - const testRepoPath = await setupFixtureRepository('submodule-basic-setup') + it('returns the submodule entry', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'submodule-basic-setup' + ) const repository = new Repository(testRepoPath, -1, null, false) const result = await listSubmodules(repository) assert.equal(result.length, 1) @@ -23,8 +26,11 @@ describe('git/submodule', () => { assert.equal(result[0].describe, 'first-tag~2') }) - it('returns the expected tag', async () => { - const testRepoPath = await setupFixtureRepository('submodule-basic-setup') + it('returns the expected tag', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'submodule-basic-setup' + ) const repository = new Repository(testRepoPath, -1, null, false) const submodulePath = path.join(testRepoPath, 'foo', 'submodule') @@ -50,8 +56,11 @@ describe('git/submodule', () => { }) describe('resetSubmodulePaths', () => { - it('update submodule to original commit', async () => { - const testRepoPath = await setupFixtureRepository('submodule-basic-setup') + it('update submodule to original commit', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'submodule-basic-setup' + ) const repository = new Repository(testRepoPath, -1, null, false) const submodulePath = path.join(testRepoPath, 'foo', 'submodule') @@ -77,8 +86,11 @@ describe('git/submodule', () => { assert.equal(result[0].describe, 'first-tag~2') }) - it('eliminate submodule dirty state', async () => { - const testRepoPath = await setupFixtureRepository('submodule-basic-setup') + it('eliminate submodule dirty state', async t => { + const testRepoPath = await setupFixtureRepository( + t, + 'submodule-basic-setup' + ) const repository = new Repository(testRepoPath, -1, null, false) const submodulePath = path.join(testRepoPath, 'foo', 'submodule') diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 964205bf4e5..6b52bede7cb 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import * as path from 'path' import * as FSE from 'fs-extra' @@ -21,21 +21,16 @@ import { setupFixtureRepository, setupLocalForkOfRepository, } from '../../helpers/repositories' -import { IRemote } from '../../../src/models/remote' import { findDefaultRemote } from '../../../src/lib/stores/helpers/find-default-remote' import { getStatusOrThrow } from '../../helpers/status' import { assertNonNullable, forceUnwrap } from '../../../src/lib/fatal-error' describe('git/tag', () => { - let repository: Repository - - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('test-repo') - repository = new Repository(testRepoPath, -1, null, false) - }) - describe('createTag', () => { - it('creates a tag with the given name', async () => { + it('creates a tag with the given name', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createTag(repository, 'my-new-tag', 'HEAD') const commit = await getCommit(repository, 'HEAD') @@ -43,7 +38,10 @@ describe('git/tag', () => { assert.deepStrictEqual(commit.tags, ['my-new-tag']) }) - it('creates a tag with the a comma in it', async () => { + it('creates a tag with the a comma in it', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createTag(repository, 'my-new-tag,has-a-comma', 'HEAD') const commit = await getCommit(repository, 'HEAD') @@ -51,7 +49,10 @@ describe('git/tag', () => { assert.deepStrictEqual(commit.tags, ['my-new-tag,has-a-comma']) }) - it('creates multiple tags', async () => { + it('creates multiple tags', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createTag(repository, 'my-new-tag', 'HEAD') await createTag(repository, 'another-tag', 'HEAD') @@ -60,7 +61,10 @@ describe('git/tag', () => { assert.deepStrictEqual(commit.tags, ['my-new-tag', 'another-tag']) }) - it('creates a tag on a specified commit', async () => { + it('creates a tag on a specified commit', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const commits = await getCommits(repository, 'HEAD', 2) const commitSha = commits[1].sha @@ -72,7 +76,10 @@ describe('git/tag', () => { assert.deepStrictEqual(commit.tags, ['my-new-tag']) }) - it('fails when creating a tag with a name that already exists', async () => { + it('fails when creating a tag with a name that already exists', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createTag(repository, 'my-new-tag', 'HEAD') await assert.rejects( @@ -83,7 +90,10 @@ describe('git/tag', () => { }) describe('deleteTag', () => { - it('deletes a tag with the given name', async () => { + it('deletes a tag with the given name', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + await createTag(repository, 'my-new-tag', 'HEAD') await deleteTag(repository, 'my-new-tag') @@ -94,11 +104,17 @@ describe('git/tag', () => { }) describe('getAllTags', () => { - it('returns an empty map when the repository has no tags', async () => { + it('returns an empty map when the repository has no tags', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + assert((await getAllTags(repository)).size === 0) }) - it('returns all the created tags', async () => { + it('returns all the created tags', async t => { + const testRepoPath = await setupFixtureRepository(t, 'test-repo') + const repository = new Repository(testRepoPath, -1, null, false) + const commit = await getCommit(repository, 'HEAD') assert(commit !== null) @@ -116,29 +132,30 @@ describe('git/tag', () => { }) describe('fetchTagsToPush', () => { - let remoteRepository: Repository - let originRemote: IRemote - - beforeEach(async () => { - const path = await setupFixtureRepository('test-repo-with-tags') - remoteRepository = new Repository(path, -1, null, false) - repository = await setupLocalForkOfRepository(remoteRepository) + const setup = async (t: TestContext) => { + const path = await setupFixtureRepository(t, 'test-repo-with-tags') + const remoteRepository = new Repository(path, -1, null, false) + const repository = await setupLocalForkOfRepository(t, remoteRepository) const remotes = await getRemotes(repository) - originRemote = forceUnwrap( + const originRemote = forceUnwrap( "couldn't find origin remote", findDefaultRemote(remotes) ) - }) - it('returns an empty array when there are no tags to get pushed', async () => { + return { repository, originRemote, remoteRepository } + } + + it('returns an empty array when there are no tags to get pushed', async t => { + const { repository, originRemote } = await setup(t) assert.equal( (await fetchTagsToPush(repository, originRemote, 'master')).length, 0 ) }) - it("returns local tags that haven't been pushed", async () => { + it("returns local tags that haven't been pushed", async t => { + const { repository, originRemote } = await setup(t) await createTag(repository, 'my-new-tag', 'HEAD') assert.deepStrictEqual( @@ -147,7 +164,8 @@ describe('git/tag', () => { ) }) - it('returns an empty array after pushing the tag', async () => { + it('returns an empty array after pushing the tag', async t => { + const { repository, originRemote } = await setup(t) await createTag(repository, 'my-new-tag', 'HEAD') await push(repository, originRemote, 'master', null, ['my-new-tag']) @@ -158,7 +176,8 @@ describe('git/tag', () => { ) }) - it('does not return a tag created on a non-pushed branch', async () => { + it('does not return a tag created on a non-pushed branch', async t => { + const { repository, originRemote } = await setup(t) // Create a tag on a local branch that's not pushed to the remote. const branchName = 'new-branch' await createBranch(repository, branchName, 'master') @@ -181,9 +200,10 @@ describe('git/tag', () => { ) }) - it('returns unpushed tags even if it fails to push the branch', async () => { + it('returns unpushed tags even if it fails to push the branch', async t => { // Create a new commit on the remote repository so the `git push` command // that fetchUnpushedTags() does fails. + const { repository, originRemote, remoteRepository } = await setup(t) await FSE.writeFile( path.join(remoteRepository.path, 'README.md'), 'Hi world\n' diff --git a/app/test/unit/parse-files-to-be-overwritten-test.ts b/app/test/unit/parse-files-to-be-overwritten-test.ts index d023a2f8dd7..9589fd4ecfc 100644 --- a/app/test/unit/parse-files-to-be-overwritten-test.ts +++ b/app/test/unit/parse-files-to-be-overwritten-test.ts @@ -9,8 +9,8 @@ import { GitError as DugiteError } from 'dugite' import { parseFilesToBeOverwritten } from '../../src/ui/lib/parse-files-to-be-overwritten' describe('parseFilesToBeOverwritten', () => { - it('parses files from pull error', async () => { - const parent = await setupEmptyRepository() + it('parses files from pull error', async t => { + const parent = await setupEmptyRepository(t) await writeFile(join(parent.path, 'a'), '1') await writeFile(join(parent.path, 'b'), '2') await git(['add', 'a', 'b'], parent.path, 'add') @@ -21,7 +21,7 @@ describe('parseFilesToBeOverwritten', () => { await git(['add', 'a', 'b'], parent.path, 'add') await git(['commit', '-m', 'second'], parent.path, 'add') - const fork = await cloneLocalRepository(parent) + const fork = await cloneLocalRepository(t, parent) await git(['reset', 'HEAD^'], fork.path, 'reset') const result = await git(['pull'], fork.path, 'pull', { expectedErrors: new Set([DugiteError.MergeWithLocalChanges]), @@ -31,8 +31,8 @@ describe('parseFilesToBeOverwritten', () => { assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), ['a', 'b']) }) - it("isn't able to parse files from pull rebase error", async () => { - const parent = await setupEmptyRepository() + it("isn't able to parse files from pull rebase error", async t => { + const parent = await setupEmptyRepository(t) await writeFile(join(parent.path, 'a'), '1') await writeFile(join(parent.path, 'b'), '2') await git(['add', 'a', 'b'], parent.path, 'add') @@ -43,7 +43,7 @@ describe('parseFilesToBeOverwritten', () => { await git(['add', 'a', 'b'], parent.path, 'add') await git(['commit', '-m', 'second'], parent.path, 'add') - const fork = await cloneLocalRepository(parent) + const fork = await cloneLocalRepository(t, parent) await git(['reset', 'HEAD^'], fork.path, 'reset') const result = await git(['pull', '--rebase'], fork.path, 'pull', { expectedErrors: new Set([DugiteError.RebaseWithLocalChanges]), @@ -53,8 +53,8 @@ describe('parseFilesToBeOverwritten', () => { assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), []) }) - it('parses files from merge error', async () => { - const repo = await setupEmptyRepository() + it('parses files from merge error', async t => { + const repo = await setupEmptyRepository(t) await writeFile(join(repo.path, 'a'), '1') await writeFile(join(repo.path, 'b'), '2') await git(['add', 'a', 'b'], repo.path, 'add') @@ -74,8 +74,8 @@ describe('parseFilesToBeOverwritten', () => { assert.deepStrictEqual(parseFilesToBeOverwritten(result.stderr), ['a', 'b']) }) - it('parses files from checkout error', async () => { - const repo = await setupEmptyRepository() + it('parses files from checkout error', async t => { + const repo = await setupEmptyRepository(t) await writeFile(join(repo.path, 'a'), '1') await writeFile(join(repo.path, 'b'), '2') await git(['add', 'a', 'b'], repo.path, 'add') diff --git a/app/test/unit/patch-formatter-test.ts b/app/test/unit/patch-formatter-test.ts index ed5ba717674..056de4e3bc4 100644 --- a/app/test/unit/patch-formatter-test.ts +++ b/app/test/unit/patch-formatter-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as Path from 'path' import * as FSE from 'fs-extra' @@ -33,15 +33,11 @@ async function parseDiff(diff: string): Promise { } describe('patch formatting', () => { - let repository: Repository - describe('formatPatchesForModifiedFile', () => { - beforeEach(async () => { - const testRepoPath = await setupFixtureRepository('repo-with-changes') - repository = new Repository(testRepoPath, -1, null, false) - }) + it('creates right patch when first hunk is selected', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) - it('creates right patch when first hunk is selected', async () => { const modifiedFile = 'modified-file.md' const unselectedFile = DiffSelection.fromInitialSelection( @@ -81,7 +77,10 @@ describe('patch formatting', () => { assert(patch.includes('@@ -4,10 +4,6 @@')) }) - it('creates right patch when second hunk is selected', async () => { + it('creates right patch when second hunk is selected', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const modifiedFile = 'modified-file.md' const unselectedFile = DiffSelection.fromInitialSelection( DiffSelectionType.None @@ -120,7 +119,10 @@ describe('patch formatting', () => { assert(patch.includes('@@ -21,6 +17,10 @@')) }) - it('creates right patch when first and third hunk is selected', async () => { + it('creates right patch when first and third hunk is selected', async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const modifiedFile = 'modified-file.md' const unselectedFile = DiffSelection.fromInitialSelection( @@ -159,7 +161,10 @@ describe('patch formatting', () => { assert(patch.includes('@@ -31,3 +31,8 @@')) }) - it(`creates the right patch when an addition is selected but preceding deletions aren't`, async () => { + it(`creates the right patch when an addition is selected but preceding deletions aren't`, async t => { + const testRepoPath = await setupFixtureRepository(t, 'repo-with-changes') + const repository = new Repository(testRepoPath, -1, null, false) + const modifiedFile = 'modified-file.md' await FSE.writeFile(Path.join(repository.path, modifiedFile), 'line 1\n') diff --git a/app/test/unit/stores/updates/update-remote-url-test.ts b/app/test/unit/stores/updates/update-remote-url-test.ts index ad26470d02c..54d581aaf3e 100644 --- a/app/test/unit/stores/updates/update-remote-url-test.ts +++ b/app/test/unit/stores/updates/update-remote-url-test.ts @@ -1,4 +1,4 @@ -import { describe, it } from 'node:test' +import { describe, it, TestContext } from 'node:test' import assert from 'node:assert' import { GitStore, RepositoriesStore } from '../../../../src/lib/stores' import { TestRepositoriesDatabase } from '../../../helpers/databases' @@ -38,6 +38,7 @@ describe('Update remote url', () => { let gitStore: GitStore const createRepository = async ( + t: TestContext, apiRepo: IAPIFullRepository, remoteUrl: string | null = null ) => { @@ -45,7 +46,7 @@ describe('Update remote url', () => { await db.reset() const repositoriesStore = new RepositoriesStore(db) - const repoPath = await setupFixtureRepository('test-repo') + const repoPath = await setupFixtureRepository(t, 'test-repo') const repository = await repositoriesStore.setGitHubRepository( await repositoriesStore.addRepository(repoPath), await repositoriesStore.upsertGitHubRepository(endpoint, apiRepo) @@ -58,8 +59,11 @@ describe('Update remote url', () => { return { gitHubRepository, gitStore } } - it("updates the repository's remote url when the github url changes", async () => { - const { gitHubRepository, gitStore } = await createRepository(apiRepository) + it("updates the repository's remote url when the github url changes", async t => { + const { gitHubRepository, gitStore } = await createRepository( + t, + apiRepository + ) assert(gitStore.currentRemote !== null) const originalUrl = gitStore.currentRemote.url @@ -70,8 +74,11 @@ describe('Update remote url', () => { assert.equal(gitStore.currentRemote.url, updatedUrl) }) - it("doesn't update the repository's remote url when the github url is the same", async () => { - const { gitHubRepository, gitStore } = await createRepository(apiRepository) + it("doesn't update the repository's remote url when the github url is the same", async t => { + const { gitHubRepository, gitStore } = await createRepository( + t, + apiRepository + ) assert(gitStore.currentRemote !== null) const originalUrl = gitStore.currentRemote.url assert.notEqual(originalUrl.length, 0, 'Expected originalUrl to be empty') @@ -80,13 +87,14 @@ describe('Update remote url', () => { assert.equal(gitStore.currentRemote.url, originalUrl) }) - it("doesn't update repository's remote url if protocols don't match", async () => { + it("doesn't update repository's remote url if protocols don't match", async t => { const originalUrl = 'git@github.com:desktop/desktop.git' const sshApiRepository = { ...apiRepository, clone_url: originalUrl, } const { gitHubRepository, gitStore } = await createRepository( + t, sshApiRepository ) const updatedUrl = 'https://github.com/my-user/my-updated-repo' @@ -97,9 +105,10 @@ describe('Update remote url', () => { assert.equal(gitStore.currentRemote.url, originalUrl) }) - it("doesn't update the repository's remote url if it differs from the default from the github API", async () => { + it("doesn't update the repository's remote url if it differs from the default from the github API", async t => { const originalUrl = 'https://github.com/my-user/something-different' const { gitHubRepository, gitStore } = await createRepository( + t, apiRepository, originalUrl ) diff --git a/app/test/unit/write-default-readme-test.ts b/app/test/unit/write-default-readme-test.ts index de4166b5631..eb6034ad689 100644 --- a/app/test/unit/write-default-readme-test.ts +++ b/app/test/unit/write-default-readme-test.ts @@ -1,29 +1,27 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' import * as FSE from 'fs-extra' import * as path from 'path' -import { mkdirSync } from '../helpers/temp' import { writeDefaultReadme } from '../../src/ui/add-repository/write-default-readme' +import { createTempDirectory } from '../helpers/temp' describe('repository setup', () => { describe('writeDefaultReadme', () => { - let directory: string - let file: string + it('writes a default README without a description', async t => { + const directory = await createTempDirectory(t) + const file = path.join(directory, 'README.md') - beforeEach(() => { - directory = mkdirSync('new-readme') - file = path.join(directory, 'README.md') - }) - - it('writes a default README without a description', async () => { await writeDefaultReadme(directory, 'some-repository') const text = await FSE.readFile(file, 'utf8') assert.equal(text, '# some-repository\n') }) - it('writes a README with description when provided', async () => { + it('writes a README with description when provided', async t => { + const directory = await createTempDirectory(t) + const file = path.join(directory, 'README.md') + await writeDefaultReadme( directory, 'some-repository', From 88ed76a3445d2c3e8b766eb1b0fd633f35f5aeea Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 13:16:40 +0100 Subject: [PATCH 0295/1338] Remove temp dependency --- app/package.json | 1 - app/yarn.lock | 18 ------------------ package.json | 1 - yarn.lock | 7 ------- 4 files changed, 27 deletions(-) diff --git a/app/package.json b/app/package.json index 679092c1ae6..35c58b596b2 100644 --- a/app/package.json +++ b/app/package.json @@ -73,7 +73,6 @@ }, "devDependencies": { "electron-devtools-installer": "^4.0.0", - "temp": "^0.8.3", "webpack-hot-middleware": "^2.10.0" } } diff --git a/app/yarn.lock b/app/yarn.lock index 7df28e1ce86..f0ec7658672 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -824,11 +824,6 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" @@ -1124,11 +1119,6 @@ registry-js@^1.16.0: node-addon-api "^3.1.0" prebuild-install "^5.3.5" -rimraf@~2.2.6: - version "2.2.8" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI= - safe-buffer@^5.0.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -1356,14 +1346,6 @@ tar-stream@^3.1.7: fast-fifo "^1.2.0" streamx "^2.15.0" -temp@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" - integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k= - dependencies: - os-tmpdir "^1.0.0" - rimraf "~2.2.6" - text-decoder@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.1.tgz#e173f5121d97bfa3ff8723429ad5ba92e1ead67e" diff --git a/package.json b/package.json index 34704b6a062..acb2512e747 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,6 @@ "@types/source-map-support": "^0.5.2", "@types/split2": "^4.2.3", "@types/strip-ansi": "^3.0.0", - "@types/temp": "^0.8.29", "@types/textarea-caret": "^3.0.0", "@types/to-camel-case": "^1.0.0", "@types/triple-beam": "^1.3.2", diff --git a/yarn.lock b/yarn.lock index 5aabd028b0f..1a67d825f9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1240,13 +1240,6 @@ resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae" integrity sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= -"@types/temp@^0.8.29": - version "0.8.31" - resolved "https://registry.yarnpkg.com/@types/temp/-/temp-0.8.31.tgz#8518b6fb4c7d7cf106c78e5d88d3cff88d508f97" - integrity sha512-zlQRhRYRTuO1lNF0WIYshou/BaVPslf6Rg6jm6sykKn9G/8gOKtlAXtWAZzyQl762XBtpdhsoP5WuN902OQ6RQ== - dependencies: - "@types/node" "*" - "@types/tern@*": version "0.23.3" resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz#4b54538f04a88c9ff79de1f6f94f575a7f339460" From f688751cbde497f0232ed89230d85ee138673afd Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 16:15:45 +0100 Subject: [PATCH 0296/1338] Well, i hate this --- app/test/helpers/temp.ts | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/app/test/helpers/temp.ts b/app/test/helpers/temp.ts index 15168cd8182..3f7c97a104e 100644 --- a/app/test/helpers/temp.ts +++ b/app/test/helpers/temp.ts @@ -1,15 +1,26 @@ -/* eslint-disable no-sync */ - -/** Module for creating and managing temporary directories and files, using the - * `temp` Node module - */ import { mkdtemp, rm } from 'fs/promises' import { tmpdir } from 'os' import { join } from 'path' import { TestContext } from 'node:test' +import { sleep } from '../../src/lib/promise' +import { isErrnoException } from '../../src/lib/errno-exception' + +const codes = ['EMFILE', 'ENFILE', 'EBUSY'] + +// Reimplementation of retry logic in rimraf: +// https://github.com/isaacs/rimraf/blob/8733d4c30078a1ae5f18bb6affe83c1eea0259b4/src/retry-busy.ts#L10 +const clean = async (path: string) => { + for (let i = 1; i <= 6; i++) { + await rm(path, { recursive: true }).catch((e: unknown) => + isErrnoException(e) && codes.includes(e.code) + ? sleep(Math.ceil(Math.pow(i, 1.2))) + : Promise.reject(e) + ) + } +} export const createTempDirectory = (t: TestContext) => mkdtemp(join(tmpdir(), 'desktop-test-')).then(path => { - t.after(() => rm(path, { recursive: true })) + t.after(() => clean(path)) return path }) From d2a2b2719ca3b4e9021fca0b3515b2762a195b93 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 16:16:16 +0100 Subject: [PATCH 0297/1338] inline it --- app/test/helpers/temp.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/test/helpers/temp.ts b/app/test/helpers/temp.ts index 3f7c97a104e..14fefd0172f 100644 --- a/app/test/helpers/temp.ts +++ b/app/test/helpers/temp.ts @@ -5,14 +5,12 @@ import { TestContext } from 'node:test' import { sleep } from '../../src/lib/promise' import { isErrnoException } from '../../src/lib/errno-exception' -const codes = ['EMFILE', 'ENFILE', 'EBUSY'] - // Reimplementation of retry logic in rimraf: // https://github.com/isaacs/rimraf/blob/8733d4c30078a1ae5f18bb6affe83c1eea0259b4/src/retry-busy.ts#L10 const clean = async (path: string) => { for (let i = 1; i <= 6; i++) { await rm(path, { recursive: true }).catch((e: unknown) => - isErrnoException(e) && codes.includes(e.code) + isErrnoException(e) && ['EMFILE', 'ENFILE', 'EBUSY'].includes(e.code) ? sleep(Math.ceil(Math.pow(i, 1.2))) : Promise.reject(e) ) From e45fa12eab7b7545bae4f10bb9c6e1ff9e142de5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 16:28:48 +0100 Subject: [PATCH 0298/1338] Don't retry more than once --- app/test/helpers/temp.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/test/helpers/temp.ts b/app/test/helpers/temp.ts index 14fefd0172f..f3eb03b7262 100644 --- a/app/test/helpers/temp.ts +++ b/app/test/helpers/temp.ts @@ -5,17 +5,16 @@ import { TestContext } from 'node:test' import { sleep } from '../../src/lib/promise' import { isErrnoException } from '../../src/lib/errno-exception' +const isBusyError = (e: unknown) => isErrnoException(e) && e.code === 'EBUSY' + // Reimplementation of retry logic in rimraf: // https://github.com/isaacs/rimraf/blob/8733d4c30078a1ae5f18bb6affe83c1eea0259b4/src/retry-busy.ts#L10 -const clean = async (path: string) => { - for (let i = 1; i <= 6; i++) { - await rm(path, { recursive: true }).catch((e: unknown) => - isErrnoException(e) && ['EMFILE', 'ENFILE', 'EBUSY'].includes(e.code) - ? sleep(Math.ceil(Math.pow(i, 1.2))) - : Promise.reject(e) - ) - } -} +const clean = async (path: string, n = 1): Promise => + rm(path, { recursive: true }).catch((e: unknown) => + n <= 6 && isBusyError(e) + ? sleep(Math.ceil(Math.pow(n, 1.2))).then(() => clean(path, n + 1)) + : Promise.reject(e) + ) export const createTempDirectory = (t: TestContext) => mkdtemp(join(tmpdir(), 'desktop-test-')).then(path => { From 81d17e1486602e5c44285342667a8555d4bdd098 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Mar 2025 15:22:13 +0100 Subject: [PATCH 0299/1338] Avoid git init for empty repo creation --- app/src/lib/git/description.ts | 2 +- app/test/helpers/repositories.ts | 43 ++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/src/lib/git/description.ts b/app/src/lib/git/description.ts index 2e72bb5b5d7..ca15d74d9b8 100644 --- a/app/src/lib/git/description.ts +++ b/app/src/lib/git/description.ts @@ -3,7 +3,7 @@ import { readFile, writeFile } from 'fs/promises' const GitDescriptionPath = '.git/description' -const DefaultGitDescription = +export const DefaultGitDescription = "Unnamed repository; edit this file 'description' to name the repository.\n" /** Get the repository's description from the .git/description file. */ diff --git a/app/test/helpers/repositories.ts b/app/test/helpers/repositories.ts index 73f23ea0781..699d979d73b 100644 --- a/app/test/helpers/repositories.ts +++ b/app/test/helpers/repositories.ts @@ -6,8 +6,10 @@ import { Repository } from '../../src/models/repository' import { exec } from 'dugite' import { makeCommit, switchTo } from './repository-scaffolding' import { writeFile } from 'fs-extra' -import { git } from '../../src/lib/git' +import { DefaultGitDescription, git } from '../../src/lib/git' import { TestContext } from 'node:test' +import { mkdir } from 'fs/promises' +import { join } from 'path' /** * Set up the named fixture repository to be used in a test. @@ -58,10 +60,35 @@ export async function setupFixtureRepository( * @returns the new local repository */ export async function setupEmptyRepository( - t: TestContext + t: TestContext, + defaultBranchName = 'master' ): Promise { const repoPath = await createTempDirectory(t) - await exec(['init'], repoPath) + + await mkdir(join(repoPath, '.git')) + await mkdir(join(repoPath, '.git/objects')) + await mkdir(join(repoPath, '.git/refs')) + await mkdir(join(repoPath, '.git/refs/tags')) + await mkdir(join(repoPath, '.git/refs/heads')) + await mkdir(join(repoPath, '.git/info')) + + const headRef = `ref: refs/heads/${defaultBranchName}\n` + + await Promise.all([ + writeFile(join(repoPath, '.git/HEAD'), headRef), + writeFile( + join(repoPath, '.git/config'), + `[core] +repositoryformatversion = 0 +filemode = true +bare = false +logallrefupdates = true +ignorecase = ${process.platform === 'linux' ? 'true' : 'false'} +precomposeunicode = true +` + ), + writeFile(join(repoPath, '.git/description'), DefaultGitDescription), + ]) return new Repository(repoPath, -1, null, false) } @@ -72,14 +99,8 @@ export async function setupEmptyRepository( * * @returns the new local repository */ -export async function setupEmptyRepositoryDefaultMain( - t: TestContext -): Promise { - const repoPath = await createTempDirectory(t) - await exec(['init', '-b', 'main'], repoPath) - - return new Repository(repoPath, -1, null, false) -} +export const setupEmptyRepositoryDefaultMain = (t: TestContext) => + setupEmptyRepository(t, 'main') /** * Initialize a new, empty folder that is incorrectly associated with a Git From 3343947f625a38240b16ea8b509e0ffb4f8a5b5f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 28 Mar 2025 13:13:04 +0100 Subject: [PATCH 0300/1338] Remove unnecessary dispatcher method for Copilot metrics Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com> --- app/src/ui/changes/changes-list.tsx | 4 +++- app/src/ui/changes/filter-changes-list.tsx | 4 +++- app/src/ui/dispatcher/dispatcher.ts | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 9a4f9ef7c69..bfb7945ae1e 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -902,7 +902,9 @@ export class ChangesList extends React.Component< filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => { - this.props.dispatcher.recordGenerateCommitMessageButtonClicked() + this.props.dispatcher.incrementMetric( + 'generateCommitMessageButtonClickCount' + ) return mustOverrideExistingMessage ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 16cd386cdf3..0e644328ab0 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1015,7 +1015,9 @@ export class FilterChangesList extends React.Component< filesSelected: ReadonlyArray, mustOverrideExistingMessage: boolean ) => { - this.props.dispatcher.recordGenerateCommitMessageButtonClicked() + this.props.dispatcher.incrementMetric( + 'generateCommitMessageButtonClickCount' + ) return mustOverrideExistingMessage ? this.props.dispatcher.promptOverrideWithGeneratedCommitMessage( diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index f7448c5a640..991e0505559 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -2514,10 +2514,6 @@ export class Dispatcher { this.statsStore.recordAddExistingRepository() } - public recordGenerateCommitMessageButtonClicked() { - this.statsStore.increment('generateCommitMessageButtonClickCount') - } - // TODO: more rebase-related actions /** From 5ea780b9b59fd84902dce64d97b469e5b9245cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Mar 2025 00:03:18 +0000 Subject: [PATCH 0301/1338] Bump tar-fs from 2.0.0 to 2.1.2 in /app Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.0.0 to 2.1.2. - [Commits](https://github.com/mafintosh/tar-fs/compare/v2.0.0...v2.1.2) --- updated-dependencies: - dependency-name: tar-fs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 56 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index 7df28e1ce86..97ea82fb48b 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -138,12 +138,27 @@ bare-events@^2.2.0: resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.0.tgz#305b511e262ffd8b9d5616b056464f8e1b3329cc" integrity sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A== -bl@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== dependencies: - readable-stream "^3.0.1" + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" byline@^5.0.0: version "5.0.0" @@ -525,12 +540,17 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -inherits@^2.0.3, inherits@~2.0.3: +inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -717,7 +737,7 @@ minimist@^1.2.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -mkdirp-classic@^0.5.3: +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -1097,7 +1117,7 @@ readable-stream@^2.0.6, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -1327,21 +1347,21 @@ tabbable@^5.1.0: integrity sha512-Y3nSukchqM5UchuZjhj/WyE79Qb4RM/Vx3x3oHO3UYKKpf70Hy3iVRxb61MzCavN74aZsKzvPl4KNG8tQUAjFQ== tar-fs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== + version "2.1.2" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5" + integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA== dependencies: chownr "^1.1.1" - mkdirp "^0.5.1" + mkdirp-classic "^0.5.2" pump "^3.0.0" - tar-stream "^2.0.0" + tar-stream "^2.1.4" -tar-stream@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" - integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw== +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== dependencies: - bl "^3.0.0" + bl "^4.0.3" end-of-stream "^1.4.1" fs-constants "^1.0.0" inherits "^2.0.3" From ff84bf3c759d835874782c519013082b0f681f29 Mon Sep 17 00:00:00 2001 From: Arjun Suresh <123arjunsuresh@gmail.com> Date: Sat, 29 Mar 2025 17:21:06 +0530 Subject: [PATCH 0302/1338] fix indentation error in context row ,after side indent --- app/styles/ui/_side-by-side-diff.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/_side-by-side-diff.scss b/app/styles/ui/_side-by-side-diff.scss index fc495b17238..3d44f3c2faf 100644 --- a/app/styles/ui/_side-by-side-diff.scss +++ b/app/styles/ui/_side-by-side-diff.scss @@ -43,7 +43,7 @@ } &.context .after { - border-right: calc(var(--hunk-handle-width) / 2) solid var(--diff-border-color); + border-left: calc(var(--hunk-handle-width) / 2) solid var(--diff-border-color); } &.has-check-all-control.context .before { From 26af9224407051b207249c637227d1adb48ebf7f Mon Sep 17 00:00:00 2001 From: Arjun Suresh <123arjunsuresh@gmail.com> Date: Mon, 31 Mar 2025 16:22:31 +0530 Subject: [PATCH 0303/1338] fix integration setting not initialised properly --- app/src/ui/preferences/integrations.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/ui/preferences/integrations.tsx b/app/src/ui/preferences/integrations.tsx index 51061c8a942..d04ab7bc50d 100644 --- a/app/src/ui/preferences/integrations.tsx +++ b/app/src/ui/preferences/integrations.tsx @@ -81,10 +81,13 @@ export class Integrations extends React.Component< nextProps.onSelectedShellChanged(selectedShell) } } - this.setState({ selectedExternalEditor, selectedShell, + useCustomEditor: nextProps.useCustomEditor, + useCustomShell: nextProps.useCustomShell, + customShell: nextProps.customShell, + customEditor: nextProps.customEditor, }) } From 7f8c17f05d433e99c926fefb84ecd87073fc6275 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:29:10 +0200 Subject: [PATCH 0304/1338] Replace straightforward boolean equality assertions with assert --- app/test/unit/ci-checks-test.ts | 32 +++++++++++++------------- app/test/unit/enum-test.ts | 2 +- app/test/unit/git/commit-test.ts | 2 +- app/test/unit/git/remote-test.ts | 4 ++-- app/test/unit/identifier-rules-test.ts | 2 +- app/test/unit/path-test.ts | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/test/unit/ci-checks-test.ts b/app/test/unit/ci-checks-test.ts index 758452bca88..217b045bced 100644 --- a/app/test/unit/ci-checks-test.ts +++ b/app/test/unit/ci-checks-test.ts @@ -14,8 +14,8 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('test2'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('test2')) }) it('groups any check run without an actions workflow name into Other', () => { @@ -25,8 +25,8 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('Other'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('Other')) }) it('groups any check run without an actions workflow name with an app name of "GitHub Code Scanning" into "Code scanning results"', () => { @@ -37,9 +37,9 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { ] const groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) const groupNames = [...groups.keys()] - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('Other'), true) - assert.equal(groupNames.includes('Code scanning results'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('Other')) + assert(groupNames.includes('Code scanning results')) }) it('groups by actions event type if more than one event type', () => { @@ -51,27 +51,27 @@ describe('getCheckRunsGroupedByActionWorkflowNameAndEvent', () => { let groupNames = [...groups.keys()] // no event types - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('test2'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('test2')) checkRuns.push(buildMockCheckRun('1', '', 'test3', 'pull_request')) groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) groupNames = [...groups.keys()] // only one event - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('test2'), true) - assert.equal(groupNames.includes('test3'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('test2')) + assert(groupNames.includes('test3')) checkRuns.push(buildMockCheckRun('1', '', 'test4', 'push')) groups = getCheckRunsGroupedByActionWorkflowNameAndEvent(checkRuns) groupNames = [...groups.keys()] // two event types for test3 and test4 - assert.equal(groupNames.includes('test1'), true) - assert.equal(groupNames.includes('test2'), true) - assert.equal(groupNames.includes('test3 (pull_request)'), true) - assert.equal(groupNames.includes('test4 (push)'), true) + assert(groupNames.includes('test1')) + assert(groupNames.includes('test2')) + assert(groupNames.includes('test3 (pull_request)')) + assert(groupNames.includes('test4 (push)')) }) }) diff --git a/app/test/unit/enum-test.ts b/app/test/unit/enum-test.ts index e04d7fb234e..86cec49f0b6 100644 --- a/app/test/unit/enum-test.ts +++ b/app/test/unit/enum-test.ts @@ -28,7 +28,7 @@ describe('parseEnumValue', () => { const child = Object.create(parent) - assert.equal('foo' in child, true) + assert('foo' in child) assert.equal(child.foo, 'bar') assert.equal(parseEnumValue(child, 'bar'), undefined) }) diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts index 698b4249e36..1f0ed1007f1 100644 --- a/app/test/unit/git/commit-test.ts +++ b/app/test/unit/git/commit-test.ts @@ -483,7 +483,7 @@ describe('git/commit', () => { const inMerge = await FSE.pathExists( path.join(repo.path, '.git', 'MERGE_HEAD') ) - assert.equal(inMerge, true) + assert(inMerge) await FSE.writeFile(filePath, 'b1b2') diff --git a/app/test/unit/git/remote-test.ts b/app/test/unit/git/remote-test.ts index d1bb27abb7c..be01e0441f4 100644 --- a/app/test/unit/git/remote-test.ts +++ b/app/test/unit/git/remote-test.ts @@ -36,10 +36,10 @@ describe('git/remote', () => { setConfigValue(repository, 'remote.bassoon.partialclonefilter', 'foo') assert.equal(result[0].name, 'bassoon') - assert.equal(result[0].url.endsWith(nwo), true) + assert(result[0].url.endsWith(nwo)) assert.equal(result[1].name, 'origin') - assert.equal(result[1].url.endsWith(nwo), true) + assert(result[1].url.endsWith(nwo)) assert.equal(result[2].name, 'spaces-in-path') assert.equal(result[2].url, '/path/with spaces/foo') diff --git a/app/test/unit/identifier-rules-test.ts b/app/test/unit/identifier-rules-test.ts index 4259d0b8f01..0e01459bb4c 100644 --- a/app/test/unit/identifier-rules-test.ts +++ b/app/test/unit/identifier-rules-test.ts @@ -18,7 +18,7 @@ describe('Identifier rules', () => { }) it('returns true for empty strings', () => { - assert.equal(gitAuthorNameIsValid(''), true) + assert(gitAuthorNameIsValid('')) }) it('returns false when name consists only of ascii character codes 0-32 inclusive', () => { diff --git a/app/test/unit/path-test.ts b/app/test/unit/path-test.ts index 9af9a312cd3..ace3c809fb8 100644 --- a/app/test/unit/path-test.ts +++ b/app/test/unit/path-test.ts @@ -36,7 +36,7 @@ describe('path', () => { const dirName = '/Users/The Kong #2/AppData/Local/GitHubDesktop/app-1.0.4/resources/app' const uri = encodePathAsUrl(dirName, 'index.html') - assert.equal(uri.startsWith('file:///Users/The%20Kong%20%232/'), true) + assert(uri.startsWith('file:///Users/The%20Kong%20%232/')) }) } }) From d39169f90d1349d44b66810d948f54a78c1c81a1 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:31:58 +0200 Subject: [PATCH 0305/1338] If it throws the test will fail, simplify --- app/test/unit/git/core-test.ts | 56 +++++++++------------------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/app/test/unit/git/core-test.ts b/app/test/unit/git/core-test.ts index 5df46e3298e..a8b9931e4a7 100644 --- a/app/test/unit/git/core-test.ts +++ b/app/test/unit/git/core-test.ts @@ -22,66 +22,38 @@ describe('git/core', () => { describe('error handling', () => { it('does not throw for errors that were expected', async () => { const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] - - let threw = false - try { - const result = await git(args, repository.path, 'test', { - expectedErrors: new Set([GitError.BadRevision]), - }) - assert.equal(result.gitError, GitError.BadRevision) - } catch (e) { - threw = true - } - - assert.equal(threw, false) + const result = await git(args, repository.path, 'test', { + expectedErrors: new Set([GitError.BadRevision]), + }) + assert.equal(result.gitError, GitError.BadRevision) }) it('throws for errors that were not expected', async () => { const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] - - let threw = false - try { - await git(args, repository.path, 'test', { + await assert.rejects( + git(args, repository.path, 'test', { expectedErrors: new Set([GitError.SSHKeyAuditUnverified]), }) - } catch (e) { - threw = true - } - - assert.equal(threw, true) + ) }) }) describe('exit code handling', () => { it('does not throw for exit codes that were expected', async () => { const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] - - let threw = false - try { - const result = await git(args, repository.path, 'test', { - successExitCodes: new Set([128]), - }) - assert.equal(result.exitCode, 128) - } catch (e) { - threw = true - } - - assert.equal(threw, false) + const result = await git(args, repository.path, 'test', { + successExitCodes: new Set([128]), + }) + assert.equal(result.exitCode, 128) }) it('throws for exit codes that were not expected', async () => { const args = ['rev-list', '--left-right', '--count', 'some-ref', '--'] - - let threw = false - try { - await git(args, repository.path, 'test', { + await assert.rejects( + git(args, repository.path, 'test', { successExitCodes: new Set([2]), }) - } catch (e) { - threw = true - } - - assert.equal(threw, true) + ) }) }) From adca442763bb3d3818264e5e46a79b4d4ede0aa0 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:32:31 +0200 Subject: [PATCH 0306/1338] Make it clear that it has to be a boolean --- app/test/unit/git/config-test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index 43c901b3d7b..3ddbbe1be0e 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -140,25 +140,25 @@ describe('git/config', () => { it('treats "true" as true', async () => { await setGlobalConfigValue(key, 'true', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, true) + assert.strictEqual(value, true) }) it('treats "yes" as true', async () => { await setGlobalConfigValue(key, 'yes', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, true) + assert.strictEqual(value, true) }) it('treats "on" as true', async () => { await setGlobalConfigValue(key, 'on', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, true) + assert.strictEqual(value, true) }) it('treats "1" as true', async () => { await setGlobalConfigValue(key, '1', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, true) + assert.strictEqual(value, true) }) }) }) From 68bca4bc8e137e95b9fafa27d56dffe94d6515f5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:35:22 +0200 Subject: [PATCH 0307/1338] Make it clear that we care about the type here --- app/test/unit/local-storage-test.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/test/unit/local-storage-test.ts b/app/test/unit/local-storage-test.ts index d51ad719dba..45a49ab7d46 100644 --- a/app/test/unit/local-storage-test.ts +++ b/app/test/unit/local-storage-test.ts @@ -19,13 +19,13 @@ describe('local storage', () => { it('round-trips a true value', () => { const expected = true setBoolean(booleanKey, expected) - assert.equal(getBoolean(booleanKey), expected) + assert.strictEqual(getBoolean(booleanKey), expected) }) it('round-trips a false value', () => { const expected = false setBoolean(booleanKey, expected) - assert.equal(getBoolean(booleanKey), expected) + assert.strictEqual(getBoolean(booleanKey), expected) }) }) @@ -35,7 +35,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - assert.equal(actual, defaultValue) + assert.strictEqual(actual, defaultValue) }) it('returns default value when malformed string encountered', () => { @@ -44,7 +44,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - assert.equal(actual, defaultValue) + assert.strictEqual(actual, defaultValue) }) it('returns false if found and ignores default value', () => { @@ -52,7 +52,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, true) - assert.equal(actual, false) + assert.strictEqual(actual, false) }) it(`can parse the string 'true' if found`, () => { @@ -60,7 +60,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey) - assert.equal(actual, true) + assert.strictEqual(actual, true) }) it(`can parse the string 'false' if found`, () => { @@ -69,7 +69,7 @@ describe('local storage', () => { const actual = getBoolean(booleanKey, defaultValue) - assert.equal(actual, false) + assert.strictEqual(actual, false) }) }) @@ -79,7 +79,7 @@ describe('local storage', () => { setNumber(numberKey, expected) - assert.equal(getNumber(numberKey), expected) + assert.strictEqual(getNumber(numberKey), expected) }) it('round-trip zero and ignore default value', () => { @@ -88,7 +88,7 @@ describe('local storage', () => { setNumber(numberKey, expected) - assert.equal(getNumber(numberKey, defaultNumber), expected) + assert.strictEqual(getNumber(numberKey, defaultNumber), expected) }) }) @@ -96,7 +96,7 @@ describe('local storage', () => { it('returns default value when no key found', () => { const defaultValue = 3456 const actual = getNumber(numberKey, defaultValue) - assert.equal(actual, defaultValue) + assert.strictEqual(actual, defaultValue) }) it('returns default value when malformed string encountered', () => { @@ -105,7 +105,7 @@ describe('local storage', () => { const actual = getNumber(numberKey, defaultValue) - assert.equal(actual, defaultValue) + assert.strictEqual(actual, defaultValue) }) it('returns zero if found and ignores default value', () => { @@ -114,7 +114,7 @@ describe('local storage', () => { const actual = getNumber(numberKey, defaultValue) - assert.equal(actual, 0) + assert.strictEqual(actual, 0) }) }) }) From 0709a672c0bb30af1fcf2b3520a72d9803ed39a4 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:39:37 +0200 Subject: [PATCH 0308/1338] More simple boolean equality simplifications --- app/test/unit/diff-parser-test.ts | 2 +- app/test/unit/identifier-rules-test.ts | 6 +++--- app/test/unit/popup-manager-test.ts | 12 +++--------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/test/unit/diff-parser-test.ts b/app/test/unit/diff-parser-test.ts index a85fb250848..b896a0a7207 100644 --- a/app/test/unit/diff-parser-test.ts +++ b/app/test/unit/diff-parser-test.ts @@ -332,7 +332,7 @@ Binary files /dev/null and b/IMG_2306.CR2 differ const parser = new DiffParser() const diff = parser.parse(diffText) assert.equal(diff.hunks.length, 0) - assert.equal(diff.isBinary, true) + assert(diff.isBinary) }) it('parses diff of empty file', () => { diff --git a/app/test/unit/identifier-rules-test.ts b/app/test/unit/identifier-rules-test.ts index 0e01459bb4c..4cbb8117194 100644 --- a/app/test/unit/identifier-rules-test.ts +++ b/app/test/unit/identifier-rules-test.ts @@ -33,17 +33,17 @@ describe('Identifier rules', () => { }) it('returns true if the value consists of allowed characters', () => { - assert.equal(gitAuthorNameIsValid('this is great'), true) + assert(gitAuthorNameIsValid('this is great')) }) it('returns true if the value contains allowed characters with disallowed characters', () => { const allowed = `;hi. there;${String.fromCharCode(31)}` - assert.equal(gitAuthorNameIsValid(allowed), true) + assert(gitAuthorNameIsValid(allowed)) }) it('returns true if the value contains ASCII characters whose code point is greater than 32', () => { const allowed = String.fromCharCode(33) - assert.equal(gitAuthorNameIsValid(allowed), true) + assert(gitAuthorNameIsValid(allowed)) }) }) }) diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts index beeafe02e35..9b6d45d3b81 100644 --- a/app/test/unit/popup-manager-test.ts +++ b/app/test/unit/popup-manager-test.ts @@ -45,7 +45,7 @@ describe('PopupManager', () => { popupManager.addPopup({ type: PopupType.About }) const isAPopupOpen = popupManager.isAPopupOpen - assert.equal(isAPopupOpen, true) + assert(isAPopupOpen) }) }) @@ -74,20 +74,14 @@ describe('PopupManager', () => { const popupManager = new PopupManager() popupManager.addPopup({ type: PopupType.About }) - const areThereAboutPopups = popupManager.areTherePopupsOfType( - PopupType.About - ) - assert.equal(areThereAboutPopups, true) + assert(popupManager.areTherePopupsOfType(PopupType.About)) }) it('returns false if there are no popups of that type', () => { const popupManager = new PopupManager() popupManager.addPopup({ type: PopupType.About }) - const areThereSignInPopups = popupManager.areTherePopupsOfType( - PopupType.SignIn - ) - assert.equal(areThereSignInPopups, false) + assert(popupManager.areTherePopupsOfType(PopupType.SignIn)) }) }) From e0e821a4c31b7e307b0d774ce4a24545e0dfa8a7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:39:45 +0200 Subject: [PATCH 0309/1338] Assert.rejects to simplify --- app/test/unit/git/checkout-test.ts | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index 05e2785dfbf..1b242e26988 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -32,15 +32,10 @@ describe('git/checkout', () => { ref: '', } - let errorRaised = false - try { - await checkoutBranch(repository, branch, null) - } catch (error) { - errorRaised = true - assert.equal(error.message, 'fatal: invalid reference: ..\n') - } - - assert.equal(errorRaised, true) + await assert.rejects( + checkoutBranch(repository, branch, null), + /fatal: invalid reference: ..\n/ + ) }) it('can checkout a valid branch name in an existing repository', async () => { @@ -122,16 +117,10 @@ describe('git/checkout', () => { await createBranch(repository, expectedBranch, null) - let errorRaised = false - - try { - await checkoutBranch(repository, remoteBranch, null) - } catch (error) { - errorRaised = true - assert.equal(error.message, 'A branch with that name already exists.') - } - - assert.equal(errorRaised, true) + await assert.rejects( + checkoutBranch(repository, remoteBranch, null), + /A branch with that name already exists./ + ) }) describe('with submodules', () => { From b37cd6f819fad992f3519bd1c7f8fe4b559dce7d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:41:59 +0200 Subject: [PATCH 0310/1338] More simplifciations --- app/test/unit/repository-state-cache-test.ts | 6 +++--- app/test/unit/stats-store-test.ts | 4 +--- app/test/unit/welcome-test.ts | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/test/unit/repository-state-cache-test.ts b/app/test/unit/repository-state-cache-test.ts index f816c79242f..e3fc85ec305 100644 --- a/app/test/unit/repository-state-cache-test.ts +++ b/app/test/unit/repository-state-cache-test.ts @@ -54,7 +54,7 @@ describe('RepositoryStateCache', () => { }) const { branchesState } = cache.get(repository) - assert.equal(branchesState.isLoadingPullRequests, true) + assert(branchesState.isLoadingPullRequests) assert.equal(branchesState.openPullRequests.length, 1) }) @@ -84,9 +84,9 @@ describe('RepositoryStateCache', () => { }) const { changesState } = cache.get(repository) - assert.equal(changesState.workingDirectory.includeAll, true) + assert(changesState.workingDirectory.includeAll) assert.equal(changesState.workingDirectory.files.length, 1) - assert.equal(changesState.showCoAuthoredBy, true) + assert(changesState.showCoAuthoredBy) assert.equal(changesState.commitMessage.summary, summary) }) diff --git a/app/test/unit/stats-store-test.ts b/app/test/unit/stats-store-test.ts index a1d82d2b98d..bbb25609bd8 100644 --- a/app/test/unit/stats-store-test.ts +++ b/app/test/unit/stats-store-test.ts @@ -29,9 +29,7 @@ describe('StatsStore', () => { // from the StatsStore has completed before we try reading the table. await statsDb.transaction('rw!', statsDb.dailyMeasures, async () => { const statsEntry = await statsDb.dailyMeasures.limit(1).first() - - assert(statsEntry !== undefined) - assert.equal(statsEntry.active, true) + assert(statsEntry?.active === true) }) }) diff --git a/app/test/unit/welcome-test.ts b/app/test/unit/welcome-test.ts index e9be0535f96..6bf6808056e 100644 --- a/app/test/unit/welcome-test.ts +++ b/app/test/unit/welcome-test.ts @@ -29,7 +29,7 @@ describe('Welcome', () => { it('returns true when one found', () => { localStorage.setItem(key, '1') - assert.equal(hasShownWelcomeFlow(), true) + assert(hasShownWelcomeFlow()) }) }) From f66490b3b99f7f32c4ee14b2c36eb40cf9ab3c2b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 13:52:22 +0200 Subject: [PATCH 0311/1338] Simplify --- app/test/unit/branch-pruner-test.ts | 2 +- .../unit/find-forked-remotes-to-prune-test.ts | 4 ++-- app/test/unit/git/config-test.ts | 8 +++---- app/test/unit/git/diff-test.ts | 14 ++++++------ app/test/unit/git/for-each-ref-test.ts | 4 ++-- app/test/unit/git/gitignore-test.ts | 8 +++---- app/test/unit/git/lfs-test.ts | 10 ++++----- app/test/unit/git/reflog-test.ts | 2 +- app/test/unit/git/squash-test.ts | 13 +++++------ app/test/unit/git/stash-test.ts | 22 +++++-------------- app/test/unit/identifier-rules-test.ts | 22 +++++++++---------- app/test/unit/popup-manager-test.ts | 3 +-- app/test/unit/repo-rules-test.ts | 4 ++-- app/test/unit/repositories-store-test.ts | 2 +- app/test/unit/welcome-test.ts | 6 ++--- 15 files changed, 54 insertions(+), 70 deletions(-) diff --git a/app/test/unit/branch-pruner-test.ts b/app/test/unit/branch-pruner-test.ts index f7dcc27e7da..1874785dce2 100644 --- a/app/test/unit/branch-pruner-test.ts +++ b/app/test/unit/branch-pruner-test.ts @@ -84,7 +84,7 @@ describe('BranchPruner', () => { await branchPruner.runOnce() const branchesAfterPruning = await getBranchesFromGit(repo) - assert.equal(branchesAfterPruning.includes('deleted-branch-1'), false) + assert(!branchesAfterPruning.includes('deleted-branch-1')) assert(branchesAfterPruning.includes('not-deleted-branch-1')) }) diff --git a/app/test/unit/find-forked-remotes-to-prune-test.ts b/app/test/unit/find-forked-remotes-to-prune-test.ts index bb468692922..1015a8db116 100644 --- a/app/test/unit/find-forked-remotes-to-prune-test.ts +++ b/app/test/unit/find-forked-remotes-to-prune-test.ts @@ -84,8 +84,8 @@ describe('findForkedRemotesToPrune', () => { const names = getNamesFromRemotes(remotesToPrune) assert.notEqual(names.length, 0, 'Expected names to be empty') - assert.equal(names.includes(OriginRemote), false) - assert.equal(names.includes(NonGitHubDesktopRemote), false) + assert(!names.includes(OriginRemote)) + assert(!names.includes(NonGitHubDesktopRemote)) }) it('never prunes remotes with local branches', () => { diff --git a/app/test/unit/git/config-test.ts b/app/test/unit/git/config-test.ts index 3ddbbe1be0e..b8e6948d67c 100644 --- a/app/test/unit/git/config-test.ts +++ b/app/test/unit/git/config-test.ts @@ -116,25 +116,25 @@ describe('git/config', () => { it('treats "false" as false', async () => { await setGlobalConfigValue(key, 'false', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, false) + assert.strictEqual(value, false) }) it('treats "off" as false', async () => { await setGlobalConfigValue(key, 'off', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, false) + assert.strictEqual(value, false) }) it('treats "no" as false', async () => { await setGlobalConfigValue(key, 'no', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, false) + assert.strictEqual(value, false) }) it('treats "0" as false', async () => { await setGlobalConfigValue(key, '0', env) const value = await getGlobalBooleanConfigValue(key, env) - assert.equal(value, false) + assert.strictEqual(value, false) }) it('treats "true" as true', async () => { diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index d92a5c6c4f2..1335781b020 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -526,9 +526,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() assert(diff.oldSHA === null) assert(diff.newSHA === null) - assert.equal(diff.status.commitChanged, false) + assert(!diff.status.commitChanged) assert.equal(diff.status.modifiedChanges, true) - assert.equal(diff.status.untrackedChanges, false) + assert(!diff.status.untrackedChanges) }) it('can get the diff for a submodule with only untracked changes', async () => { @@ -538,8 +538,8 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() assert(diff.oldSHA === null) assert(diff.newSHA === null) - assert.equal(diff.status.commitChanged, false) - assert.equal(diff.status.modifiedChanges, false) + assert(!diff.status.commitChanged) + assert(!diff.status.modifiedChanges) assert.equal(diff.status.untrackedChanges, true) }) @@ -552,8 +552,8 @@ describe('git/diff', () => { assert(diff.oldSHA !== null) assert(diff.newSHA !== null) assert.equal(diff.status.commitChanged, true) - assert.equal(diff.status.modifiedChanges, false) - assert.equal(diff.status.untrackedChanges, false) + assert(!diff.status.modifiedChanges) + assert(!diff.status.untrackedChanges) }) it('can get the diff for a submodule a all kinds of changes', async () => { @@ -698,7 +698,7 @@ describe('git/diff', () => { return } - assert.equal(diff.text.includes('bar'), false) + assert(!diff.text.includes('bar')) assert(diff.text.includes('feature')) }) }) diff --git a/app/test/unit/git/for-each-ref-test.ts b/app/test/unit/git/for-each-ref-test.ts index fec0514d79f..9f614b99ab8 100644 --- a/app/test/unit/git/for-each-ref-test.ts +++ b/app/test/unit/git/for-each-ref-test.ts @@ -83,10 +83,10 @@ describe('git/for-each-ref', () => { assert(branchRefs.includes('refs/heads/branch-ahead-and-behind')) // `main` is the current branch, and shouldn't be included - assert.equal(branchRefs.includes('refs/heads/main'), false) + assert(!branchRefs.includes('refs/heads/main')) // Branches that are up to date shouldn't be included - assert.equal(branchRefs.includes('refs/heads/branch-up-to-date'), false) + assert(!branchRefs.includes('refs/heads/branch-up-to-date')) }) }) }) diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts index 3e2c94839ed..997c5819c6b 100644 --- a/app/test/unit/git/gitignore-test.ts +++ b/app/test/unit/git/gitignore-test.ts @@ -60,7 +60,7 @@ describe('gitignore', () => { const contents = await readGitIgnoreAtRoot(repo) assert(contents !== null) - assert.equal(contents.endsWith('\r\n'), true) + assert(contents.endsWith('\r\n')) }) it('when autocrlf=input, appends LF to file', async () => { @@ -86,7 +86,7 @@ describe('gitignore', () => { const contents = await readGitIgnoreAtRoot(repo) assert(contents !== null) - assert.equal(contents.endsWith('\n'), true) + assert(contents.endsWith('\n')) }) }) @@ -98,7 +98,7 @@ describe('gitignore', () => { const exists = await FSE.pathExists(`${repo.path}/.gitignore`) - assert.equal(exists, true) + assert(exists) }) it('deletes gitignore file when no entries provided', async () => { @@ -112,7 +112,7 @@ describe('gitignore', () => { await saveGitIgnore(repo, '') const exists = await FSE.pathExists(ignoreFile) - assert.equal(exists, false) + assert(!exists) }) it('applies rule correctly to repository', async () => { diff --git a/app/test/unit/git/lfs-test.ts b/app/test/unit/git/lfs-test.ts index 897d9939f08..2a36c5ba300 100644 --- a/app/test/unit/git/lfs-test.ts +++ b/app/test/unit/git/lfs-test.ts @@ -22,7 +22,7 @@ describe('git-lfs', () => { const repository = new Repository(path, -1, null, false) const usingLFS = await isUsingLFS(repository) - assert.equal(usingLFS, false) + assert(!usingLFS) }) it('returns true if LFS is tracking a path', async () => { @@ -32,7 +32,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.psd'], repository.path) const usingLFS = await isUsingLFS(repository) - assert.equal(usingLFS, true) + assert(usingLFS) }) }) @@ -45,7 +45,7 @@ describe('git-lfs', () => { await writeFile(readme, 'Hello world!') const found = await isTrackedByLFS(repository, file) - assert.equal(found, false) + assert(!found) }) it('returns true after tracking file in Git LFS', async () => { @@ -58,7 +58,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.md'], repository.path) const found = await isTrackedByLFS(repository, file) - assert.equal(found, true) + assert(found) }) it('returns true after tracking file with character issues in Git LFS', async () => { @@ -72,7 +72,7 @@ describe('git-lfs', () => { await exec(['lfs', 'track', '*.md'], repository.path) const found = await isTrackedByLFS(repository, file) - assert.equal(found, true) + assert(found) }) }) diff --git a/app/test/unit/git/reflog-test.ts b/app/test/unit/git/reflog-test.ts index a12ed40a10a..6af0445b5cf 100644 --- a/app/test/unit/git/reflog-test.ts +++ b/app/test/unit/git/reflog-test.ts @@ -56,7 +56,7 @@ describe('git/reflog', () => { await renameBranch(repository, currentBranch, 'branch-2-test') const branches = await getRecentBranches(repository, 10) - assert.equal(branches.includes('branch-2'), false) + assert(!branches.includes('branch-2')) assert(branches.includes('branch-1')) assert(branches.includes('branch-2-test')) }) diff --git a/app/test/unit/git/squash-test.ts b/app/test/unit/git/squash-test.ts index 99fad27a669..0e5ba74770d 100644 --- a/app/test/unit/git/squash-test.ts +++ b/app/test/unit/git/squash-test.ts @@ -196,8 +196,8 @@ describe('git/cherry-pick', () => { assert(squashedFilePaths.includes('first.md')) assert(squashedFilePaths.includes('third.md')) assert(squashedFilePaths.includes('fifth.md')) - assert.equal(squashedFilePaths.includes('second.md'), false) - assert.equal(squashedFilePaths.includes('fourth.md'), false) + assert(!squashedFilePaths.includes('second.md')) + assert(!squashedFilePaths.includes('fourth.md')) }) it('handles squashing a conflicting commit', async () => { @@ -327,8 +327,7 @@ describe('git/cherry-pick', () => { // Rebase will not start - As it won't be able retrieve a commits to build a // todo and then interactive rebase would fail for bad revision. Added logic // to short circuit to prevent unnecessary attempt at an interactive rebase. - const isRebaseStillOngoing = await getRebaseInternalState(repository) - assert.equal(isRebaseStillOngoing !== null, false) + assert.equal(await getRebaseInternalState(repository), null) }) it('returns error on invalid commit to squashOnto', async () => { @@ -348,8 +347,7 @@ describe('git/cherry-pick', () => { // Rebase should not start - if we did attempt this, it could result in // dropping commits. - const isRebaseStillOngoing = await getRebaseInternalState(repository) - assert.equal(isRebaseStillOngoing !== null, false) + assert.equal(await getRebaseInternalState(repository), null) }) it('returns error on empty toSquash', async () => { @@ -369,8 +367,7 @@ describe('git/cherry-pick', () => { // Rebase should not start - technically there would be no harm in this // rebase as it would just replay history, but we should not use squash to // replay history. - const isRebaseStillOngoing = await getRebaseInternalState(repository) - assert.equal(isRebaseStillOngoing !== null, false) + assert.equal(await getRebaseInternalState(repository), null) }) }) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index df0a357adcf..6394122d16f 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -192,7 +192,6 @@ describe('git/stash', () => { }) it('does not fail when attempting to delete when stash is empty', async () => { - let didFail = false const doesNotExist: IStashEntry = { name: 'refs/stash@{0}', branchName: 'master', @@ -202,17 +201,10 @@ describe('git/stash', () => { files: { kind: StashedChangesLoadStates.NotLoaded }, } - try { - await dropDesktopStashEntry(repository, doesNotExist.stashSha) - } catch { - didFail = true - } - - assert.equal(didFail, false) + await dropDesktopStashEntry(repository, doesNotExist.stashSha) }) it("does not fail when attempting to delete stash entry that doesn't exist", async () => { - let didFail = false const doesNotExist: IStashEntry = { name: 'refs/stash@{4}', branchName: 'master', @@ -225,13 +217,9 @@ describe('git/stash', () => { await generateTestStashEntry(repository, 'master', true) await generateTestStashEntry(repository, 'master', true) - try { - await dropDesktopStashEntry(repository, doesNotExist.stashSha) - } catch { - didFail = true - } - - assert.equal(didFail, false) + await assert.rejects( + dropDesktopStashEntry(repository, doesNotExist.stashSha) + ) }) }) @@ -289,7 +277,7 @@ describe('git/stash', () => { assert.equal(files.length, 1) const stashAfter = await getStashes(repository) - assert.equal(stashAfter.desktopEntries.includes(entryToApply), false) + assert(!stashAfter.desktopEntries.includes(entryToApply)) }) }) diff --git a/app/test/unit/identifier-rules-test.ts b/app/test/unit/identifier-rules-test.ts index 4cbb8117194..1056ecf0b46 100644 --- a/app/test/unit/identifier-rules-test.ts +++ b/app/test/unit/identifier-rules-test.ts @@ -5,16 +5,16 @@ import { gitAuthorNameIsValid } from '../../src/ui/lib/identifier-rules' describe('Identifier rules', () => { describe('gitAuthorNameIsValid', () => { it('returns any value that is a disallowed character', () => { - assert.equal(gitAuthorNameIsValid('.'), false) + assert(!gitAuthorNameIsValid('.')) assert.equal(gitAuthorNameIsValid(','), false) - assert.equal(gitAuthorNameIsValid(':'), false) - assert.equal(gitAuthorNameIsValid(';'), false) - assert.equal(gitAuthorNameIsValid('<'), false) - assert.equal(gitAuthorNameIsValid('>'), false) - assert.equal(gitAuthorNameIsValid('"'), false) - assert.equal(gitAuthorNameIsValid('\\'), false) - assert.equal(gitAuthorNameIsValid("'"), false) - assert.equal(gitAuthorNameIsValid(' '), false) + assert(!gitAuthorNameIsValid(':')) + assert(!gitAuthorNameIsValid(';')) + assert(!gitAuthorNameIsValid('<')) + assert(!gitAuthorNameIsValid('>')) + assert(!gitAuthorNameIsValid('"')) + assert(!gitAuthorNameIsValid('\\')) + assert(!gitAuthorNameIsValid("'")) + assert(!gitAuthorNameIsValid(' ')) }) it('returns true for empty strings', () => { @@ -24,12 +24,12 @@ describe('Identifier rules', () => { it('returns false when name consists only of ascii character codes 0-32 inclusive', () => { for (let i = 0; i <= 32; i++) { const char = String.fromCharCode(i) - assert.equal(gitAuthorNameIsValid(char), false) + assert(!gitAuthorNameIsValid(char)) } }) it('returns false when name consists solely of disallowed characters', () => { - assert.equal(gitAuthorNameIsValid('.;:<>'), false) + assert(!gitAuthorNameIsValid('.;:<>')) }) it('returns true if the value consists of allowed characters', () => { diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts index 9b6d45d3b81..d57cc4c6ce0 100644 --- a/app/test/unit/popup-manager-test.ts +++ b/app/test/unit/popup-manager-test.ts @@ -36,8 +36,7 @@ describe('PopupManager', () => { describe('isAPopupOpen', () => { it('returns false when no popups added', () => { const popupManager = new PopupManager() - const isAPopupOpen = popupManager.isAPopupOpen - assert.equal(isAPopupOpen, false) + assert(!popupManager.isAPopupOpen) }) it('returns last added popup', () => { diff --git a/app/test/unit/repo-rules-test.ts b/app/test/unit/repo-rules-test.ts index 780a9643c38..7097574c3e6 100644 --- a/app/test/unit/repo-rules-test.ts +++ b/app/test/unit/repo-rules-test.ts @@ -174,7 +174,7 @@ describe('await parseRepoRules', () => { it('is not enforced when no rules are provided', async () => { const rules: IAPIRepoRule[] = [] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - assert.equal(repoRulesInfo.creationRestricted, false) + assert(!repoRulesInfo.creationRestricted) }) }) @@ -183,7 +183,7 @@ describe('repo metadata rules', () => { it('shows no rules and passes everything when no rules are provided', async () => { const rules: IAPIRepoRule[] = [] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - assert.equal(repoRulesInfo.commitMessagePatterns.hasRules, false) + assert(!repoRulesInfo.commitMessagePatterns.hasRules) const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('abc') diff --git a/app/test/unit/repositories-store-test.ts b/app/test/unit/repositories-store-test.ts index fb718121ee4..bc35250744d 100644 --- a/app/test/unit/repositories-store-test.ts +++ b/app/test/unit/repositories-store-test.ts @@ -73,7 +73,7 @@ describe('RepositoriesStore', () => { const repo = repositories[0] assertIsRepositoryWithGitHubRepository(repo) assert.equal(repo.gitHubRepository.isPrivate, true) - assert.equal(repo.gitHubRepository.fork, false) + assert(!repo.gitHubRepository.fork) assert.equal( repo.gitHubRepository.htmlURL, 'https://github.com/my-user/my-repo' diff --git a/app/test/unit/welcome-test.ts b/app/test/unit/welcome-test.ts index 6bf6808056e..d2ff7635420 100644 --- a/app/test/unit/welcome-test.ts +++ b/app/test/unit/welcome-test.ts @@ -14,17 +14,17 @@ describe('Welcome', () => { }) it('defaults to false when no value found', () => { - assert.equal(hasShownWelcomeFlow(), false) + assert(!hasShownWelcomeFlow()) }) it('returns false for some non-numeric value', () => { localStorage.setItem(key, 'a') - assert.equal(hasShownWelcomeFlow(), false) + assert(!hasShownWelcomeFlow()) }) it('returns false when zero found', () => { localStorage.setItem(key, '0') - assert.equal(hasShownWelcomeFlow(), false) + assert(!hasShownWelcomeFlow()) }) it('returns true when one found', () => { From 42865a260302e802cffa4666af35441c7a715382 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 31 Mar 2025 15:00:05 +0200 Subject: [PATCH 0312/1338] More simplifications --- app/test/unit/email-test.ts | 6 +++--- app/test/unit/git/diff-test.ts | 12 +++++------ app/test/unit/git/stash-test.ts | 6 ++++-- app/test/unit/identifier-rules-test.ts | 2 +- app/test/unit/popup-manager-test.ts | 2 +- app/test/unit/repo-rules-test.ts | 8 ++++---- .../unit/repositories-list-grouping-test.ts | 8 ++++---- app/test/unit/repositories-store-test.ts | 2 +- app/test/unit/repository-matching-test.ts | 20 +++++++++---------- app/test/unit/round-test.ts | 4 ++-- 10 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/test/unit/email-test.ts b/app/test/unit/email-test.ts index 057981a33e9..e235b69ded5 100644 --- a/app/test/unit/email-test.ts +++ b/app/test/unit/email-test.ts @@ -271,8 +271,8 @@ describe('emails', () => { 'free' ) - assert.equal(isAttributableEmailFor(account, 'personal@gmail.com'), true) - assert.equal(isAttributableEmailFor(account, 'company@github.com'), true) + assert(isAttributableEmailFor(account, 'personal@gmail.com')) + assert(isAttributableEmailFor(account, 'company@github.com')) assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com'), true @@ -330,7 +330,7 @@ describe('emails', () => { 'free' ) - assert.equal(isAttributableEmailFor(account, 'niik@github.com'), true) + assert(isAttributableEmailFor(account, 'niik@github.com')) assert.equal( isAttributableEmailFor(account, 'niik@users.noreply.github.com'), true diff --git a/app/test/unit/git/diff-test.ts b/app/test/unit/git/diff-test.ts index 1335781b020..a001a845c49 100644 --- a/app/test/unit/git/diff-test.ts +++ b/app/test/unit/git/diff-test.ts @@ -527,7 +527,7 @@ describe('git/diff', () => { assert(diff.oldSHA === null) assert(diff.newSHA === null) assert(!diff.status.commitChanged) - assert.equal(diff.status.modifiedChanges, true) + assert(diff.status.modifiedChanges) assert(!diff.status.untrackedChanges) }) @@ -540,7 +540,7 @@ describe('git/diff', () => { assert(diff.newSHA === null) assert(!diff.status.commitChanged) assert(!diff.status.modifiedChanges) - assert.equal(diff.status.untrackedChanges, true) + assert(diff.status.untrackedChanges) }) it('can get the diff for a submodule a commit change', async () => { @@ -551,7 +551,7 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() assert(diff.oldSHA !== null) assert(diff.newSHA !== null) - assert.equal(diff.status.commitChanged, true) + assert(diff.status.commitChanged) assert(!diff.status.modifiedChanges) assert(!diff.status.untrackedChanges) }) @@ -565,9 +565,9 @@ describe('git/diff', () => { const diff = await getSubmoduleDiff() assert(diff.oldSHA !== null) assert(diff.newSHA !== null) - assert.equal(diff.status.commitChanged, true) - assert.equal(diff.status.modifiedChanges, true) - assert.equal(diff.status.untrackedChanges, true) + assert(diff.status.commitChanged) + assert(diff.status.modifiedChanges) + assert(diff.status.untrackedChanges) }) }) diff --git a/app/test/unit/git/stash-test.ts b/app/test/unit/git/stash-test.ts index 6394122d16f..84c4940c27b 100644 --- a/app/test/unit/git/stash-test.ts +++ b/app/test/unit/git/stash-test.ts @@ -201,7 +201,9 @@ describe('git/stash', () => { files: { kind: StashedChangesLoadStates.NotLoaded }, } - await dropDesktopStashEntry(repository, doesNotExist.stashSha) + await assert.doesNotReject( + dropDesktopStashEntry(repository, doesNotExist.stashSha) + ) }) it("does not fail when attempting to delete stash entry that doesn't exist", async () => { @@ -217,7 +219,7 @@ describe('git/stash', () => { await generateTestStashEntry(repository, 'master', true) await generateTestStashEntry(repository, 'master', true) - await assert.rejects( + await assert.doesNotReject( dropDesktopStashEntry(repository, doesNotExist.stashSha) ) }) diff --git a/app/test/unit/identifier-rules-test.ts b/app/test/unit/identifier-rules-test.ts index 1056ecf0b46..cfa1e95d9f9 100644 --- a/app/test/unit/identifier-rules-test.ts +++ b/app/test/unit/identifier-rules-test.ts @@ -6,7 +6,7 @@ describe('Identifier rules', () => { describe('gitAuthorNameIsValid', () => { it('returns any value that is a disallowed character', () => { assert(!gitAuthorNameIsValid('.')) - assert.equal(gitAuthorNameIsValid(','), false) + assert(!gitAuthorNameIsValid(',')) assert(!gitAuthorNameIsValid(':')) assert(!gitAuthorNameIsValid(';')) assert(!gitAuthorNameIsValid('<')) diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts index d57cc4c6ce0..3f57dc888e2 100644 --- a/app/test/unit/popup-manager-test.ts +++ b/app/test/unit/popup-manager-test.ts @@ -80,7 +80,7 @@ describe('PopupManager', () => { const popupManager = new PopupManager() popupManager.addPopup({ type: PopupType.About }) - assert(popupManager.areTherePopupsOfType(PopupType.SignIn)) + assert(!popupManager.areTherePopupsOfType(PopupType.SignIn)) }) }) diff --git a/app/test/unit/repo-rules-test.ts b/app/test/unit/repo-rules-test.ts index 7097574c3e6..932ed7ee34b 100644 --- a/app/test/unit/repo-rules-test.ts +++ b/app/test/unit/repo-rules-test.ts @@ -151,7 +151,7 @@ describe('await parseRepoRules', () => { // the creation rule references ruleset ID 1, which has a bypass of 'never' const rules = [creationRule] const result = await parseRepoRules(rules, rulesets, repo) - assert.equal(result.creationRestricted, true) + assert(result.creationRestricted) }) it('can bypass when bypass is "always"', async () => { @@ -164,11 +164,11 @@ describe('await parseRepoRules', () => { it('cannot bypass when at least one bypass mode is "never" or "pull_requests_only"', async () => { const rules = [creationRule, creationBypassAlwaysRule] const result = await parseRepoRules(rules, rulesets, repo) - assert.equal(result.creationRestricted, true) + assert(result.creationRestricted) const rules2 = [creationRule, creationBypassPullRequestsOnlyRule] const result2 = await parseRepoRules(rules2, rulesets, repo) - assert.equal(result2.creationRestricted, true) + assert(result2.creationRestricted) }) it('is not enforced when no rules are provided', async () => { @@ -193,7 +193,7 @@ describe('repo metadata rules', () => { it('has correct matching logic for StartsWith rule', async () => { const rules = [commitMessagePatternStartsWithRule] const repoRulesInfo = await parseRepoRules(rules, rulesets, repo) - assert.equal(repoRulesInfo.commitMessagePatterns.hasRules, true) + assert(repoRulesInfo.commitMessagePatterns.hasRules) const failedRules = repoRulesInfo.commitMessagePatterns.getFailedRules('def') diff --git a/app/test/unit/repositories-list-grouping-test.ts b/app/test/unit/repositories-list-grouping-test.ts index fb2f2c8168b..2de41d25bed 100644 --- a/app/test/unit/repositories-list-grouping-test.ts +++ b/app/test/unit/repositories-list-grouping-test.ts @@ -142,15 +142,15 @@ describe('repository list grouping', () => { assert.equal(grouped[2].items.length, 2) assert.equal(grouped[0].items[0].text[0], 'repo') - assert.equal(grouped[0].items[0].needsDisambiguation, false) + assert(!grouped[0].items[0].needsDisambiguation) assert.equal(grouped[1].items[0].text[0], 'repo') - assert.equal(grouped[1].items[0].needsDisambiguation, false) + assert(!grouped[1].items[0].needsDisambiguation) assert.equal(grouped[2].items[0].text[0], 'enterprise-repo') - assert.equal(grouped[2].items[0].needsDisambiguation, true) + assert(grouped[2].items[0].needsDisambiguation) assert.equal(grouped[2].items[1].text[0], 'enterprise-repo') - assert.equal(grouped[2].items[1].needsDisambiguation, true) + assert(grouped[2].items[1].needsDisambiguation) }) }) diff --git a/app/test/unit/repositories-store-test.ts b/app/test/unit/repositories-store-test.ts index bc35250744d..0c0c5462294 100644 --- a/app/test/unit/repositories-store-test.ts +++ b/app/test/unit/repositories-store-test.ts @@ -72,7 +72,7 @@ describe('RepositoriesStore', () => { const repositories = await repositoriesStore.getAll() const repo = repositories[0] assertIsRepositoryWithGitHubRepository(repo) - assert.equal(repo.gitHubRepository.isPrivate, true) + assert(repo.gitHubRepository.isPrivate) assert(!repo.gitHubRepository.fork) assert.equal( repo.gitHubRepository.htmlURL, diff --git a/app/test/unit/repository-matching-test.ts b/app/test/unit/repository-matching-test.ts index d2ffffc1f5d..b16d54aa72d 100644 --- a/app/test/unit/repository-matching-test.ts +++ b/app/test/unit/repository-matching-test.ts @@ -132,37 +132,37 @@ describe('repository-matching', () => { } it('does not match null', () => { - assert.equal(urlMatchesRemote(null, remoteWithSuffix), false) + assert(!urlMatchesRemote(null, remoteWithSuffix)) }) it('matches cloneURL from API', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - assert.equal(urlMatchesRemote(cloneURL, remoteWithSuffix), true) + assert(urlMatchesRemote(cloneURL, remoteWithSuffix)) }) it('matches cloneURL from API with different casing', () => { const cloneURL = 'https://GITHUB.COM/SHIFTKEY/DESKTOP.git' - assert.equal(urlMatchesRemote(cloneURL, remoteWithSuffix), true) + assert(urlMatchesRemote(cloneURL, remoteWithSuffix)) }) it('matches cloneURL from API without suffix', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - assert.equal(urlMatchesRemote(cloneURL, remote), true) + assert(urlMatchesRemote(cloneURL, remote)) }) it('matches htmlURL from API', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - assert.equal(urlMatchesRemote(htmlURL, remoteWithSuffix), true) + assert(urlMatchesRemote(htmlURL, remoteWithSuffix)) }) it('matches htmlURL from API with different casing', () => { const htmlURL = 'https://GITHUB.COM/SHIFTKEY/DESKTOP' - assert.equal(urlMatchesRemote(htmlURL, remoteWithSuffix), true) + assert(urlMatchesRemote(htmlURL, remoteWithSuffix)) }) it('matches htmlURL from API without suffix', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - assert.equal(urlMatchesRemote(htmlURL, remote), true) + assert(urlMatchesRemote(htmlURL, remote)) }) }) @@ -172,17 +172,17 @@ describe('repository-matching', () => { url: 'git@github.com:shiftkey/desktop.git', } it('does not match null', () => { - assert.equal(urlMatchesRemote(null, remote), false) + assert(!urlMatchesRemote(null, remote)) }) it('matches cloneURL from API', () => { const cloneURL = 'https://github.com/shiftkey/desktop.git' - assert.equal(urlMatchesRemote(cloneURL, remote), true) + assert(urlMatchesRemote(cloneURL, remote)) }) it('matches htmlURL from API', () => { const htmlURL = 'https://github.com/shiftkey/desktop' - assert.equal(urlMatchesRemote(htmlURL, remote), true) + assert(urlMatchesRemote(htmlURL, remote)) }) }) }) diff --git a/app/test/unit/round-test.ts b/app/test/unit/round-test.ts index ad8e51227f8..ea3b2001607 100644 --- a/app/test/unit/round-test.ts +++ b/app/test/unit/round-test.ts @@ -18,8 +18,8 @@ describe('round', () => { }) it("doesn't attempt to round infinity", () => { - assert.equal(Number.isFinite(round(Infinity, 1)), false) - assert.equal(Number.isFinite(round(-Infinity, 1)), false) + assert(!Number.isFinite(round(Infinity, 1))) + assert(!Number.isFinite(round(-Infinity, 1))) }) it("doesn't attempt to round to less than zero decimals", () => { From 432765aef089bc76d77d477294a155cc749fc3a3 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Mon, 31 Mar 2025 10:03:34 -0400 Subject: [PATCH 0313/1338] Make check all label take entire row for expanded click target --- app/styles/ui/changes/_changes-list.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 6cfc841e51e..71faefbe605 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -146,11 +146,13 @@ } .changes-list-check-all { + flex-grow: 1; + input { margin-right: 7px; } label { - text-align: right; + text-align: left; padding: 0; position: unset; } From d2f7fff80ae9d8b0ec442af715db76c80b6b44ef Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 1 Apr 2025 09:19:10 +0200 Subject: [PATCH 0314/1338] Don't include test setup files --- tsconfig.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 972811e57b3..2fbed057219 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,13 +19,7 @@ "lib": ["ES2023", "DOM", "DOM.Iterable"], "types": ["node"] }, - "include": [ - "app/**/*.ts", - "app/**/*.tsx", - "app/**/*.d.tsx", - "app/test/globals.mts", - "app/test/globals.mts" - ], + "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"], "exclude": [ "node_modules", "app/node_modules", From 546b61c7014f8642ea0b8470485697d15326ac6e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 1 Apr 2025 09:26:23 +0200 Subject: [PATCH 0315/1338] Simplify --- app/test/unit/find-forked-remotes-to-prune-test.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/test/unit/find-forked-remotes-to-prune-test.ts b/app/test/unit/find-forked-remotes-to-prune-test.ts index 1015a8db116..68494141069 100644 --- a/app/test/unit/find-forked-remotes-to-prune-test.ts +++ b/app/test/unit/find-forked-remotes-to-prune-test.ts @@ -98,11 +98,10 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, [], allBranches) - assert.equal( - getNamesFromRemotes(remotesToPrune).includes( + assert( + !getNamesFromRemotes(remotesToPrune).includes( GitHubDesktopRemoteWithLocalBranch - ), - false + ) ) }) @@ -117,11 +116,10 @@ describe('findForkedRemotesToPrune', () => { const remotesToPrune = findForkedRemotesToPrune(remotes, openPRs, []) - assert.equal( - getNamesFromRemotes(remotesToPrune).includes( + assert( + !getNamesFromRemotes(remotesToPrune).includes( GitHubDesktopRemoteWithPullRequest - ), - false + ) ) }) From dcec329f1c7229a74377f189af41c99e5aebdc69 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 1 Apr 2025 09:30:27 +0200 Subject: [PATCH 0316/1338] Use assert.equal when comparing lengths --- app/test/unit/desktop-file-transport-test.ts | 2 +- app/test/unit/git/apply-test.ts | 2 +- app/test/unit/git/tag-test.ts | 3 +-- app/test/unit/popup-manager-test.ts | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 49c0106fcbf..7c6ce8d8c76 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -18,7 +18,7 @@ describe('DesktopFileTransport', () => { const d = await createTempDirectory('desktop-logs') const t = new DesktopFileTransport({ logDirectory: d }) - assert((await readdir(d)).length === 0) + assert.equal((await readdir(d)).length, 0) await info(t, 'heyo') const files = await readdir(d) assert.equal(files.length, 1) diff --git a/app/test/unit/git/apply-test.ts b/app/test/unit/git/apply-test.ts index f3189008fbe..29f9e26a2b6 100644 --- a/app/test/unit/git/apply-test.ts +++ b/app/test/unit/git/apply-test.ts @@ -118,7 +118,7 @@ describe('git/apply', () => { // Check that the file has no local changes. assert.equal(diff.text, '') - assert(diff.hunks.length === 0) + assert.equal(diff.hunks.length, 0) }) it('re-adds a single removed line', async () => { diff --git a/app/test/unit/git/tag-test.ts b/app/test/unit/git/tag-test.ts index 964205bf4e5..e102f60fcba 100644 --- a/app/test/unit/git/tag-test.ts +++ b/app/test/unit/git/tag-test.ts @@ -88,8 +88,7 @@ describe('git/tag', () => { await deleteTag(repository, 'my-new-tag') const commit = await getCommit(repository, 'HEAD') - assert(commit !== null) - assert(commit.tags.length === 0) + assert.equal(commit?.tags.length, 0) }) }) diff --git a/app/test/unit/popup-manager-test.ts b/app/test/unit/popup-manager-test.ts index 3f57dc888e2..08f266e92bb 100644 --- a/app/test/unit/popup-manager-test.ts +++ b/app/test/unit/popup-manager-test.ts @@ -94,7 +94,7 @@ describe('PopupManager', () => { assert.equal(popupsOfType.length, 1) assert(currentPopup !== null) assert.equal(currentPopup.type, PopupType.About) - assert(currentPopup.id?.length === 36) + assert.equal(currentPopup.id?.length, 36) }) it('does not add multiple popups of the same kind to the stack', () => { @@ -154,7 +154,7 @@ describe('PopupManager', () => { assert.equal(popupsOfType.length, 1) assert(currentPopup !== null) assert.equal(currentPopup?.type, PopupType.Error) - assert(currentPopup.id?.length === 36) + assert.equal(currentPopup.id?.length, 36) }) it('adds multiple popups of type error to the stack', () => { From a380e988a24d2bee0ce48427eb159778fe760b3f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 1 Apr 2025 11:48:33 +0200 Subject: [PATCH 0317/1338] Add . to all Copilot error messages Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Co-Authored-By: Candy Ho <7498102+candyho@users.noreply.github.com> --- app/src/lib/api.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index a7f0f19772f..52bb6eb490b 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -1877,29 +1877,30 @@ export class API { const retryAfter = response.headers.get('Retry-After') if (retryAfter) { throw new CopilotError( - `Rate limited, retry after ${retryAfter} seconds`, + `Rate limited, retry after ${retryAfter} seconds.`, response.status ) } else { throw new CopilotError( - 'Rate limited, try again in a few minutes', + 'Rate limited, try again in a few minutes.', response.status ) } } else if (response.status === HttpStatusCode.PaymentRequired) { - const errorMsg = (await response.text()) || 'You have exceeded your quota' + const errorMsg = + (await response.text()) || 'You have reached your quota limit.' throw new CopilotError(errorMsg, response.status) } else if (response.status === HttpStatusCode.Unauthorized) { throw new CopilotError( - 'Unauthorized: error with authentication', + 'Unauthorized: error with authentication.', response.status ) } else if (response.status === HttpStatusCode.Forbidden) { const body = await response.text() if (body.includes('unauthorized: not licensed to use Copilot')) { throw new CopilotError( - 'Unauthorized: not licensed to use Copilot', + 'Unauthorized: not licensed to use Copilot.', response.status ) } else if ( @@ -1909,28 +1910,28 @@ export class API { ) ) { throw new CopilotError( - 'Unauthorized: not authorized to use this Copilot feature', + 'Unauthorized: not authorized to use this Copilot feature.', response.status ) } else if ( body.includes('integration does not have GitHub chat enabled') ) { throw new CopilotError( - 'Integration does not have GitHub chat enabled', + 'Integration does not have GitHub chat enabled.', response.status ) } else { - throw new CopilotError('Unauthorized: unknown', response.status) + throw new CopilotError('Unauthorized: unknown.', response.status) } } else if (response.status === 466) { throw new CopilotError( - 'Client issue: unsupported API version', + 'Client issue: unsupported API version.', response.status ) } else if (response.status >= HttpStatusCode.BadRequest) { const internalError = `Internal server error, code: ${ response.status - }, request ID: ${response.headers.get('X-Github-Request-Id')}` + }, request ID: ${response.headers.get('X-Github-Request-Id')}.` throw new CopilotError(internalError, response.status) } From d1bc192fc4e8de8bf5c2fcdc1f9f32a0ccf38b62 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 1 Apr 2025 11:52:25 +0200 Subject: [PATCH 0318/1338] Use text instead of URL to upgrade Copilot plan Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Co-Authored-By: Candy Ho <7498102+candyho@users.noreply.github.com> --- app/src/ui/app-error.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx index 8549bc521db..fe0e732ec6e 100644 --- a/app/src/ui/app-error.tsx +++ b/app/src/ui/app-error.tsx @@ -131,8 +131,9 @@ export class AppError extends React.Component { <>

{e.message}

- Upgrade your plan:{' '} - {copilotPlansURL} + + Upgrade to increase your limit. +

) From 4b1462f3584802943bfdafbcf01e084b38de64c2 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 1 Apr 2025 17:09:02 +0200 Subject: [PATCH 0319/1338] Use assert properly --- vendor/desktop-trampoline/test/desktop-trampoline-test.ts | 8 ++++---- vendor/desktop-trampoline/test/ssh-wrapper-test.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor/desktop-trampoline/test/desktop-trampoline-test.ts b/vendor/desktop-trampoline/test/desktop-trampoline-test.ts index bdec5fb5786..d992645696f 100644 --- a/vendor/desktop-trampoline/test/desktop-trampoline-test.ts +++ b/vendor/desktop-trampoline/test/desktop-trampoline-test.ts @@ -65,11 +65,11 @@ describe('desktop-trampoline', () => { it('exists and is a regular file', async () => assert.equal((await stat(askPassTrampolinePath)).isFile(), true)) - it('can be executed by current process', () => - assert.doesNotReject(access(askPassTrampolinePath, constants.X_OK))) + it('can be executed by current process', async () => + await assert.doesNotReject(access(askPassTrampolinePath, constants.X_OK))) - it('fails when required environment variables are missing', () => - assert.rejects(execFile(askPassTrampolinePath, ['Username']))) + it('fails when required environment variables are missing', async () => + await assert.rejects(execFile(askPassTrampolinePath, ['Username']))) it('forwards arguments and valid environment variables correctly', async () => { diff --git a/vendor/desktop-trampoline/test/ssh-wrapper-test.ts b/vendor/desktop-trampoline/test/ssh-wrapper-test.ts index afecfc098f0..4b89b0e05c4 100644 --- a/vendor/desktop-trampoline/test/ssh-wrapper-test.ts +++ b/vendor/desktop-trampoline/test/ssh-wrapper-test.ts @@ -21,7 +21,7 @@ describe('ssh-wrapper', () => { } it('can be executed by current process', async () => - assert.doesNotThrow(async () => await access(sshWrapperPath, constants.X_OK))) + await assert.doesNotReject(access(sshWrapperPath, constants.X_OK))) it('attempts to use ssh-askpass program', async () => { // Try to connect to github.com with a non-existent known_hosts file to force From 5b16452b7f99a426e8bfb802156d0ed4670667f8 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 1 Apr 2025 17:12:30 +0200 Subject: [PATCH 0320/1338] Run desktop-trampoline tests on CI --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80585c2a8f4..fa2480b4aa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,11 @@ jobs: env: npm_config_arch: ${{ matrix.arch }} TARGET_ARCH: ${{ matrix.arch }} + - name: Run desktop-trampoline tests + run: | + cd vendor/desktop-trampoline + yarn build + yarn test - name: Build production app run: yarn build:prod env: From 6d1afaef0c1da84221ce8a951c88d40d7b732712 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 1 Apr 2025 17:17:58 +0200 Subject: [PATCH 0321/1338] And now? --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa2480b4aa8..3b36bcf72aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: - name: Run desktop-trampoline tests run: | cd vendor/desktop-trampoline - yarn build + yarn install yarn test - name: Build production app run: yarn build:prod From 2ab41d639bbde1ec552f76ba3cabaf9c04042bbc Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 2 Apr 2025 12:45:09 +0200 Subject: [PATCH 0322/1338] whoopsie daisy --- app/test/unit/desktop-file-transport-test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/test/unit/desktop-file-transport-test.ts b/app/test/unit/desktop-file-transport-test.ts index 3434e0810a0..3116b97a262 100644 --- a/app/test/unit/desktop-file-transport-test.ts +++ b/app/test/unit/desktop-file-transport-test.ts @@ -80,12 +80,8 @@ describe('DesktopFileTransport', () => { await info(transport, 'heyo') } - console.log('FILETRANSPORT:readdir') - const retainedFiles = await readdir(d) - console.log('FILETRANSPORT:readdir done') - // Retains the newest files (ISO date is lexicographically sortable) assert.deepStrictEqual(retainedFiles.sort(), [ '2022-03-07.desktop.development.log', From 9e39d5de51946e011dc4c2ee21d6f11b3b159f31 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 4 Apr 2025 16:08:18 +0200 Subject: [PATCH 0323/1338] Add custom headers to API requests Added custom headers 'X-Initiator', 'X-Interaction-ID', and 'X-Interaction-Type' to API requests for better tracking and identification of interactions. --- app/src/lib/api.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index f332a8b99ed..127c98b8586 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -1871,6 +1871,11 @@ export class API { type: 'json_object', }, }, + customHeaders: { + 'X-Initiator': 'user', + 'X-Interaction-ID': uuid(), + 'X-Interaction-Type': 'generateCommitMessage', + }, }) if (response.status === HttpStatusCode.TooManyRequests) { From 2df5961c66e38798dd84d1eb41051a4c4d9e13d8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 9 Apr 2025 11:25:45 +0200 Subject: [PATCH 0324/1338] No need to flex it --- app/src/ui/invalidated-token/invalidated-token.tsx | 9 +++------ app/styles/ui/_dialog.scss | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/ui/invalidated-token/invalidated-token.tsx b/app/src/ui/invalidated-token/invalidated-token.tsx index e9b21083a6b..d6c685544d9 100644 --- a/app/src/ui/invalidated-token/invalidated-token.tsx +++ b/app/src/ui/invalidated-token/invalidated-token.tsx @@ -1,7 +1,6 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { Dispatcher } from '../dispatcher' -import { Row } from '../lib/row' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { Account, isEnterpriseAccount } from '../../models/account' import { getHTMLURL } from '../../lib/api' @@ -32,11 +31,9 @@ export class InvalidatedToken extends React.Component { onDismissed={this.props.onDismissed} > - - Your account token has been invalidated and you have been signed out - from your {account.friendlyEndpoint} account. Do you want - to sign in again? - + Your account token has been invalidated and you have been signed out + from your {account.friendlyEndpoint} account. Do you want + to sign in again? diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 9d4f5341084..1e5ce82af0e 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -635,3 +635,9 @@ dialog { margin-right: var(--spacing-half); } } + +dialog#invalidated-token { + .dialog-content .ref-component { + white-space: nowrap; + } +} From 12de4514831fa9c81fe01b420a0fec965460f62f Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 9 Apr 2025 11:34:40 +0200 Subject: [PATCH 0325/1338] Allow credential helper to prompt to credentials even if the user has an enterprise account already --- app/src/lib/trampoline/trampoline-credential-helper.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/lib/trampoline/trampoline-credential-helper.ts b/app/src/lib/trampoline/trampoline-credential-helper.ts index c8a88b22fc2..acc6d2efa72 100644 --- a/app/src/lib/trampoline/trampoline-credential-helper.ts +++ b/app/src/lib/trampoline/trampoline-credential-helper.ts @@ -102,14 +102,13 @@ async function getCredential(cred: Credential, store: Store, token: string) { const accounts = await store.getAll() const hasDotComAccount = accounts.some(a => isDotCom(a.endpoint)) - const hasEnterpriseAccount = accounts.some(a => !isDotCom(a.endpoint)) // If it appears as if the endpoint is a GitHub host and we don't have an - // account for it (since we currently only allow one GitHub.com account and - // one Enterprise account) we prompt the user to sign in. + // account for it (since we currently only allow one GitHub.com account if ( (endpointKind === 'github.com' && !hasDotComAccount) || - (endpointKind === 'enterprise' && !hasEnterpriseAccount) + endpointKind === 'ghe.com' || + endpointKind === 'enterprise' ) { if (getIsBackgroundTaskEnvironment(token)) { debug('background task environment, skipping prompt') From 287c422e5e7f94cec0b59562bc5db6029c8a9351 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 9 Apr 2025 11:54:21 +0200 Subject: [PATCH 0326/1338] Allow prompting as long as we don't have an account for that endpoint --- .../trampoline/trampoline-credential-helper.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/lib/trampoline/trampoline-credential-helper.ts b/app/src/lib/trampoline/trampoline-credential-helper.ts index acc6d2efa72..f81dceda66c 100644 --- a/app/src/lib/trampoline/trampoline-credential-helper.ts +++ b/app/src/lib/trampoline/trampoline-credential-helper.ts @@ -26,7 +26,7 @@ import { } from '../generic-git-auth' import { urlWithoutCredentials } from './url-without-credentials' import { trampolineUIHelper as ui } from './trampoline-ui-helper' -import { isGitHubHost } from '../api' +import { getDotComAPIEndpoint, getEnterpriseAPIURL, isGitHubHost } from '../api' import { isDotCom, isGHE, isGist } from '../endpoint-capabilities' type Credential = Map @@ -101,21 +101,22 @@ async function getCredential(cred: Credential, store: Store, token: string) { const endpointKind = await getEndpointKind(cred, store) const accounts = await store.getAll() - const hasDotComAccount = accounts.some(a => isDotCom(a.endpoint)) + const endpoint = `${getCredentialUrl(cred)}` + const apiEndpoint = isDotCom(endpoint) + ? getDotComAPIEndpoint() + : getEnterpriseAPIURL(endpoint) // If it appears as if the endpoint is a GitHub host and we don't have an - // account for it (since we currently only allow one GitHub.com account + // account for that endpoint then we should prompt the user to sign in. if ( - (endpointKind === 'github.com' && !hasDotComAccount) || - endpointKind === 'ghe.com' || - endpointKind === 'enterprise' + endpointKind !== 'generic' && + !accounts.some(a => a.endpoint === apiEndpoint) ) { if (getIsBackgroundTaskEnvironment(token)) { debug('background task environment, skipping prompt') return undefined } - const endpoint = `${getCredentialUrl(cred)}` const account = await ui.promptForGitHubSignIn(endpoint) if (!account) { From aa9d356e7ee151783a37f913437240b5ebf425ee Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 9 Apr 2025 11:56:36 +0200 Subject: [PATCH 0327/1338] This function should be shared --- app/src/lib/api.ts | 3 +++ app/src/lib/trampoline/trampoline-credential-helper.ts | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 2ce5de84b7c..2942b85b9e0 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -1990,6 +1990,9 @@ export function getEnterpriseAPIURL(endpoint: string): string { return `${parsed.protocol}//${parsed.hostname}/api/v3` } +export const getAPIEndpoint = (endpoint: string) => + isDotCom(endpoint) ? getDotComAPIEndpoint() : getEnterpriseAPIURL(endpoint) + /** Get github.com's API endpoint. */ export function getDotComAPIEndpoint(): string { // NOTE: diff --git a/app/src/lib/trampoline/trampoline-credential-helper.ts b/app/src/lib/trampoline/trampoline-credential-helper.ts index f81dceda66c..2e2d4549a3f 100644 --- a/app/src/lib/trampoline/trampoline-credential-helper.ts +++ b/app/src/lib/trampoline/trampoline-credential-helper.ts @@ -26,7 +26,7 @@ import { } from '../generic-git-auth' import { urlWithoutCredentials } from './url-without-credentials' import { trampolineUIHelper as ui } from './trampoline-ui-helper' -import { getDotComAPIEndpoint, getEnterpriseAPIURL, isGitHubHost } from '../api' +import { getAPIEndpoint, isGitHubHost } from '../api' import { isDotCom, isGHE, isGist } from '../endpoint-capabilities' type Credential = Map @@ -102,9 +102,7 @@ async function getCredential(cred: Credential, store: Store, token: string) { const accounts = await store.getAll() const endpoint = `${getCredentialUrl(cred)}` - const apiEndpoint = isDotCom(endpoint) - ? getDotComAPIEndpoint() - : getEnterpriseAPIURL(endpoint) + const apiEndpoint = getAPIEndpoint(endpoint) // If it appears as if the endpoint is a GitHub host and we don't have an // account for that endpoint then we should prompt the user to sign in. From 7e6ce974f83afdcdd64cafb4f803bb4bbd658ccd Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 9 Apr 2025 15:38:29 +0200 Subject: [PATCH 0328/1338] Check if list includes index path properly --- app/src/ui/lib/list/list-row-index-path.ts | 7 +++++++ app/src/ui/lib/list/section-list.tsx | 19 +++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/ui/lib/list/list-row-index-path.ts b/app/src/ui/lib/list/list-row-index-path.ts index 20b40044aeb..ebb77e7c0ee 100644 --- a/app/src/ui/lib/list/list-row-index-path.ts +++ b/app/src/ui/lib/list/list-row-index-path.ts @@ -9,6 +9,13 @@ export function rowIndexPathEquals(a: RowIndexPath, b: RowIndexPath): boolean { return a.section === b.section && a.row === b.row } +export function rowListIncludesIndexPath( + list: ReadonlyArray, + indexPath: RowIndexPath +) { + return list.some(item => rowIndexPathEquals(item, indexPath)) +} + export function getTotalRowCount(rowCount: ReadonlyArray) { return rowCount.reduce((sum, count) => sum + count, 0) } diff --git a/app/src/ui/lib/list/section-list.tsx b/app/src/ui/lib/list/section-list.tsx index 98fdf4040bc..e8cf95e1340 100644 --- a/app/src/ui/lib/list/section-list.tsx +++ b/app/src/ui/lib/list/section-list.tsx @@ -28,6 +28,7 @@ import { RowIndexPath, rowIndexPathEquals, rowIndexPathToGlobalIndex, + rowListIncludesIndexPath, } from './list-row-index-path' import { range } from '../../../lib/range' import { sendNonFatalException } from '../../../lib/helpers/non-fatal-exception' @@ -1133,7 +1134,7 @@ export class SectionList extends React.Component< const customClasses = new Array() rowCustomClassNameMap.forEach( (rows: ReadonlyArray, className: string) => { - if (rows.includes(rowIndex)) { + if (rowListIncludesIndexPath(rows, rowIndex)) { customClasses.push(className) } } @@ -1521,7 +1522,10 @@ export class SectionList extends React.Component< (__DARWIN__ && event.button === 0 && event.ctrlKey) // prevent the right-click event from changing the selection if not necessary - if (isRightClick && this.props.selectedRows.includes(row)) { + if ( + isRightClick && + rowListIncludesIndexPath(this.props.selectedRows, row) + ) { return } @@ -1566,7 +1570,7 @@ export class SectionList extends React.Component< */ if (this.props.onSelectionChanged) { let newSelection: ReadonlyArray - if (this.props.selectedRows.includes(row)) { + if (rowListIncludesIndexPath(this.props.selectedRows, row)) { // remove the ability to deselect the last item if (this.props.selectedRows.length === 1) { return @@ -1587,7 +1591,7 @@ export class SectionList extends React.Component< (this.props.selectionMode === 'range' || this.props.selectionMode === 'multi') && this.props.selectedRows.length > 1 && - this.props.selectedRows.includes(row) + rowListIncludesIndexPath(this.props.selectedRows, row) ) { // Do nothing. Multiple rows are already selected. We assume the user is // pressing down on multiple and may desire to start dragging. We will @@ -1618,7 +1622,10 @@ export class SectionList extends React.Component< event.button === 2 || (__DARWIN__ && event.button === 0 && event.ctrlKey) // prevent the right-click event from changing the selection if not necessary - if (isRightClick && this.props.selectedRows.includes(row)) { + if ( + isRightClick && + rowListIncludesIndexPath(this.props.selectedRows, row) + ) { return } @@ -1628,7 +1635,7 @@ export class SectionList extends React.Component< !event.shiftKey && !multiSelectKey && this.props.selectedRows.length > 1 && - this.props.selectedRows.includes(row) && + rowListIncludesIndexPath(this.props.selectedRows, row) && (this.props.selectionMode === 'range' || this.props.selectionMode === 'multi') ) { From 19a8320bc5ee865ad12ef2cebe4aadbb9bc8ff9e Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 9 Apr 2025 16:32:18 +0200 Subject: [PATCH 0329/1338] Bump changelog and version to 3.4.19-beta2 --- app/package.json | 2 +- changelog.json | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 35c58b596b2..da181eb56c2 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.19-beta1", + "version": "3.4.19-beta2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index e6d04a37939..18ce2a4cd51 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,13 @@ { "releases": { + "3.4.19-beta2": [ + "[Fixed] Right-clicking on selected files will keep those files selected - #20319", + "[Fixed] Let credential helper prompt for the specific enterprise account used in a given repository - #20318", + "[Fixed] Fix invalidated token dialog styling - #20317", + "[Fixed] Fix indentation bug in split diff view - #18800. Thanks @iamarjunsuresh!", + "[Fixed] Initialize Integrations settings when opening it from a no-changes screen - #19807. Thanks @iamarjunsuresh!", + "[Improved] Return changes check all label to full row width for expanded click target area - #20282" + ], "3.4.19-beta1": [ "[New] Add support for multiple enterprise accounts - #20227", "[New] Users can filter the changed files list - #20220", From 24f32934f9a75b1bd977619e27939041483192d5 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:35:25 -0400 Subject: [PATCH 0330/1338] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 18ce2a4cd51..b01191f8c98 100644 --- a/changelog.json +++ b/changelog.json @@ -1,7 +1,7 @@ { "releases": { "3.4.19-beta2": [ - "[Fixed] Right-clicking on selected files will keep those files selected - #20319", + "[Fixed] Right-clicking on selected files will keep those files selected in the changes list - #20319", "[Fixed] Let credential helper prompt for the specific enterprise account used in a given repository - #20318", "[Fixed] Fix invalidated token dialog styling - #20317", "[Fixed] Fix indentation bug in split diff view - #18800. Thanks @iamarjunsuresh!", From 0d911fca2a6128e28465fc56872aaecb540dfeb3 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 10 Apr 2025 11:55:47 +0200 Subject: [PATCH 0331/1338] Update Copilot disclaimer link --- .../generate-commit-message-disclaimer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx index 6144c53ea17..a6b5f5f8c66 100644 --- a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx +++ b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx @@ -41,7 +41,7 @@ export class GenerateCommitMessageDisclaimer extends React.Component Copilot is powered by AI, so mistakes are possible. Review and edit the generated message carefully before use.{' '} - + Learn more about GitHub Copilot.

From 501b30f08450fb11fa8b736139680f9c703717ed Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 10 Apr 2025 11:56:19 +0200 Subject: [PATCH 0332/1338] Add responsible use link to About dialog --- app/src/ui/about/about.tsx | 27 +++++++++++++++++---------- app/styles/ui/_about.scss | 4 ++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index 26dc9fb12a2..871bdbf7b87 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -282,19 +282,26 @@ export class About extends React.Component { {' '} ({releaseNotesLink})

-

- - Terms and Conditions - -

-

- - License and Open Source Notices - -

{this.renderUpdateDetails()} {this.renderUpdateButton()} {this.renderBetaLink()} +
+

+ + Terms and Conditions + +

+

+ + License and Open Source Notices + +

+

+ + Responsible use of Copilot for Desktop + +

+
diff --git a/app/styles/ui/_about.scss b/app/styles/ui/_about.scss index 68ea236889e..681972c067e 100644 --- a/app/styles/ui/_about.scss +++ b/app/styles/ui/_about.scss @@ -33,6 +33,10 @@ dialog#about { } } + .terms-and-license-container { + margin-top: var(--spacing); + } + .version-text { cursor: pointer; .octicon { From b4db75c4458a7974d8a579aef518b61d0ea0900a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 10 Apr 2025 12:11:28 +0200 Subject: [PATCH 0333/1338] :facepalm: --- app/src/ui/about/about.tsx | 2 +- .../generate-commit-message-disclaimer.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index 871bdbf7b87..1ddc6d3de54 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -297,7 +297,7 @@ export class About extends React.Component {

- + Responsible use of Copilot for Desktop

diff --git a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx index a6b5f5f8c66..86125440f2d 100644 --- a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx +++ b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx @@ -41,7 +41,7 @@ export class GenerateCommitMessageDisclaimer extends React.Component Copilot is powered by AI, so mistakes are possible. Review and edit the generated message carefully before use.{' '} - + Learn more about GitHub Copilot.

From 6e40f8e683bef6c377a47ff08bf2e97d19a6bb03 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 10 Apr 2025 16:01:58 +0200 Subject: [PATCH 0334/1338] Update app/src/ui/about/about.tsx Co-authored-by: Melissa Xie --- app/src/ui/about/about.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index 1ddc6d3de54..4a3173101a1 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -298,7 +298,7 @@ export class About extends React.Component {

- Responsible use of Copilot for Desktop + Responsible use of Copilot in GitHub Desktop

From 7e12981f759bdd8916c71f9b9e60440ff4d996f7 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 10 Apr 2025 16:02:18 +0200 Subject: [PATCH 0335/1338] Update app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx Co-authored-by: Melissa Xie --- .../generate-commit-message-disclaimer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx index 86125440f2d..d6682cb9016 100644 --- a/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx +++ b/app/src/ui/generate-commit-message/generate-commit-message-disclaimer.tsx @@ -42,7 +42,7 @@ export class GenerateCommitMessageDisclaimer extends React.Component - Learn more about GitHub Copilot. + Learn more about Copilot in GitHub Desktop.

From 08addff47bfe1beb7b03b4e64d124447776a132a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 11 Apr 2025 10:55:08 +0200 Subject: [PATCH 0336/1338] Use the whole commit range to diff images --- app/src/lib/git/diff.ts | 25 ++++++++++++++++++------- app/test/unit/patch-formatter-test.ts | 8 +++++++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 2322d90fc9b..e92e4dc1b8a 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -140,7 +140,7 @@ export async function getCommitDiff( encoding: 'buffer', }) - return buildDiff(stdout, repository, file, commitish) + return buildDiff(stdout, repository, file, commitish, commitish) } /** @@ -179,7 +179,7 @@ export async function getBranchMergeBaseDiff( encoding: 'buffer', }) - return buildDiff(result.stdout, repository, file, latestCommit) + return buildDiff(result.stdout, repository, file, latestCommit, latestCommit) } /** @@ -197,6 +197,7 @@ export async function getCommitRangeDiff( throw new Error('No commits to diff...') } + const oldestCommit = useNullTreeSHA ? NullTreeSHA : commits[0] const oldestCommitRef = useNullTreeSHA ? NullTreeSHA : `${commits[0]}^` const latestCommit = commits.at(-1) ?? '' // can't be undefined since commits.length > 0 const args = [ @@ -237,7 +238,7 @@ export async function getCommitRangeDiff( ) } - return buildDiff(result.stdout, repository, file, latestCommit) + return buildDiff(result.stdout, repository, file, latestCommit, oldestCommit) } /** @@ -392,12 +393,13 @@ export async function getWorkingDirectoryDiff( ) const lineEndingsChange = parseLineEndingsWarning(stderr) - return buildDiff(stdout, repository, file, 'HEAD', lineEndingsChange) + return buildDiff(stdout, repository, file, 'HEAD', 'HEAD', lineEndingsChange) } async function getImageDiff( repository: Repository, file: FileChange, + newestCommitish: string, oldestCommitish: string ): Promise { let current: Image | undefined = undefined @@ -432,7 +434,7 @@ async function getImageDiff( } else { // File status can't be conflicted for a file in a commit if (file.status.kind !== AppFileStatusKind.Deleted) { - current = await getBlobImage(repository, file.path, oldestCommitish) + current = await getBlobImage(repository, file.path, newestCommitish) } // File status can't be conflicted for a file in a commit @@ -475,6 +477,7 @@ export async function convertDiff( repository: Repository, file: FileChange, diff: IRawDiff, + newestCommitish: string, oldestCommitish: string, lineEndingsChange?: LineEndingsChange ): Promise { @@ -487,7 +490,7 @@ export async function convertDiff( kind: DiffType.Binary, } } else { - return getImageDiff(repository, file, oldestCommitish) + return getImageDiff(repository, file, newestCommitish, oldestCommitish) } } @@ -631,6 +634,7 @@ async function buildDiff( buffer: Buffer, repository: Repository, file: FileChange, + newestCommitish: string, oldestCommitish: string, lineEndingsChange?: LineEndingsChange ): Promise { @@ -666,7 +670,14 @@ async function buildDiff( return largeTextDiff } - return convertDiff(repository, file, diff, oldestCommitish, lineEndingsChange) + return convertDiff( + repository, + file, + diff, + newestCommitish, + oldestCommitish, + lineEndingsChange + ) } /** diff --git a/app/test/unit/patch-formatter-test.ts b/app/test/unit/patch-formatter-test.ts index 056de4e3bc4..29b7321aa6a 100644 --- a/app/test/unit/patch-formatter-test.ts +++ b/app/test/unit/patch-formatter-test.ts @@ -27,7 +27,13 @@ async function parseDiff(diff: string): Promise { const fileChange = new FileChange('file.txt', { kind: AppFileStatusKind.Modified, }) - const output = await convertDiff(repository, fileChange, rawDiff, 'HEAD') + const output = await convertDiff( + repository, + fileChange, + rawDiff, + 'HEAD', + 'HEAD' + ) assert.equal(output.kind, DiffType.Text) return output as ITextDiff } From a7b9243de2a2629f2ce83d07f3a4ef855b0f547d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 15 Apr 2025 16:30:30 +0200 Subject: [PATCH 0337/1338] Update version to 3.4.19-beta3 and changelog Bump version to 3.4.19-beta3 in package.json. Add new release notes for 3.4.19-beta3 in changelog.json, including a new feature for AI-generated commit messages. --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index da181eb56c2..cd341d92a25 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.19-beta2", + "version": "3.4.19-beta3", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index b01191f8c98..46ef73838f3 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.4.19-beta3": [ + "[New] Copilot now helps you craft AI-generated commit messages with just one click - #17439" + ], "3.4.19-beta2": [ "[Fixed] Right-clicking on selected files will keep those files selected in the changes list - #20319", "[Fixed] Let credential helper prompt for the specific enterprise account used in a given repository - #20318", From 293539c4ac5100aa4e9246908e32c90d64cd5bfc Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Mon, 21 Apr 2025 11:13:13 -0400 Subject: [PATCH 0338/1338] Add support for handling push protection errors Updated the Dugite dependency to version 3.0.0-rc11 and added handling for the new DugiteError.PushWithSecretDetected error. Implemented a specific error handler for GitHub's push protection feature related to secret scanning in the dispatcher. --- app/package.json | 2 +- app/src/lib/git/core.ts | 1 + app/src/ui/dispatcher/error-handlers.ts | 25 +++++++++++++++++++++++++ app/src/ui/index.tsx | 2 ++ app/yarn.lock | 8 ++++---- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index da181eb56c2..56217b43c46 100644 --- a/app/package.json +++ b/app/package.json @@ -33,7 +33,7 @@ "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10", "dexie": "^3.2.3", "dompurify": "^3.2.4", - "dugite": "3.0.0-rc10", + "dugite": "3.0.0-rc11", "electron-window-state": "^5.0.3", "event-kit": "^2.0.0", "focus-trap-react": "^8.1.0", diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index ace69eb88da..11e9036c075 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -531,6 +531,7 @@ export function getDescriptionForError( case DugiteError.MergeCommitNoMainlineOption: case DugiteError.UnsafeDirectory: case DugiteError.PathExistsButNotInRef: + case DugiteError.PushWithSecretDetected: return null default: return assertNever(error, `Unknown error: ${error}`) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index ce134b8c713..0072cc1fc37 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -604,6 +604,31 @@ export async function discardChangesHandler( return null } + +/** + * Handler for when a push is denied by GitHub's push protection feature of + * secret scanning. + */ +export async function secretScanningPushProtectionErrorHandler( + error: Error, + dispatcher: Dispatcher +) { + const e = asErrorWithMetadata(error) + if (!e) { + return error + } + + const gitError = asGitError(e.underlyingError) + if (gitError?.result.gitError !== DugiteError.PushWithSecretDetected) { + return error + } + + /// This error is a result of the push protection feature of secret scanning + /// and should be handled by the PushProtectionErrorDialog. + + return error +} + /** * Extract lines from Git's stderr output starting with the * prefix `remote: `. Useful to extract server-specific diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx index 510e5877f46..eeee435ae93 100644 --- a/app/src/ui/index.tsx +++ b/app/src/ui/index.tsx @@ -21,6 +21,7 @@ import { samlReauthRequired, insufficientGitHubRepoPermissions, discardChangesHandler, + secretScanningPushProtectionErrorHandler, } from './dispatcher' import { AppStore, @@ -343,6 +344,7 @@ dispatcher.registerErrorHandler(localChangesOverwrittenHandler) dispatcher.registerErrorHandler(rebaseConflictsHandler) dispatcher.registerErrorHandler(refusedWorkflowUpdate) dispatcher.registerErrorHandler(discardChangesHandler) +dispatcher.registerErrorHandler(secretScanningPushProtectionErrorHandler) document.body.classList.add(`platform-${process.platform}`) diff --git a/app/yarn.lock b/app/yarn.lock index 13c6e75b47a..39ebfcf9495 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -377,10 +377,10 @@ dompurify@^3.2.4: optionalDependencies: "@types/trusted-types" "^2.0.7" -dugite@3.0.0-rc10: - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc10.tgz#7b307db3848b055755c3d2cf90b1a1a44358aba0" - integrity sha512-BVziV8Qy5x/qcElcLpyNpgYfq0j3mDQMEsP1TOrzrUpt18xhHZttlDKpHR+47Q4bMF64lOohs9rCEZaKW6B7qQ== +dugite@3.0.0-rc11: + version "3.0.0-rc11" + resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc11.tgz#413445ef8092a00cf4b1402d1297f1c47a39ba35" + integrity sha512-dqPXCPT44BfmL/ytaJZE711QdvCCsCyl+wsr2/o20UVsK3gfc26k4fDKpGbJMyyr0/eCR8plgPyv6uSWrK0GyA== dependencies: progress "^2.0.3" tar-stream "^3.1.7" From cadef46066053cfb422222b5f33a359cb33e75f1 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Mon, 21 Apr 2025 20:25:42 -0400 Subject: [PATCH 0339/1338] Add push protection error dialog Introduced a new dialog to handle push protection errors triggered by GitHub's secret scanning feature. Updated the popup model, error handler, and styles to support the new dialog. --- app/src/models/popup.ts | 4 ++ app/src/ui/app.tsx | 8 +++ app/src/ui/dispatcher/error-handlers.ts | 7 +- .../secret-scanning/push-protection-error.tsx | 64 +++++++++++++++++++ app/styles/ui/_dialog.scss | 1 + app/styles/ui/dialogs/_push-protection.scss | 12 ++++ 6 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 app/src/ui/secret-scanning/push-protection-error.tsx create mode 100644 app/styles/ui/dialogs/_push-protection.scss diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 19a2c54448b..106d7d3d08e 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -97,6 +97,7 @@ export enum PopupType { TestIcons = 'TestIcons', ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges', TestAbout = 'TestAbout', + PushProtectionError = 'PushProtectionError', } interface IBasePopup { @@ -433,5 +434,8 @@ export type PopupDetail = | { type: PopupType.TestAbout } + | { + type: PopupType.PushProtectionError + } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 1c001ac3dbf..88af87a1b5d 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -186,6 +186,7 @@ import { showTestUI } from './lib/test-ui-components/test-ui-components' import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog' import { AboutTestDialog } from './about/about-test-dialog' import { enableMultipleEnterpriseAccounts } from '../lib/feature-flag' +import { PushProtectionErrorDialog } from './secret-scanning/push-protection-error' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2494,6 +2495,13 @@ export class App extends React.Component { onShowTermsAndConditions={this.showTermsAndConditions} /> ) + case PopupType.PushProtectionError: + return ( + + ) default: return assertNever(popup, `Unknown popup type: ${popup}`) } diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 0072cc1fc37..3e357de9aa8 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -623,10 +623,11 @@ export async function secretScanningPushProtectionErrorHandler( return error } - /// This error is a result of the push protection feature of secret scanning - /// and should be handled by the PushProtectionErrorDialog. + dispatcher.showPopup({ + type: PopupType.PushProtectionError, + }) - return error + return null } /** diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx new file mode 100644 index 00000000000..ec1a9a5d41e --- /dev/null +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -0,0 +1,64 @@ +import * as React from 'react' +import { Dialog, DialogContent, DialogFooter } from '../dialog' +import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' +import { LinkButton } from '../lib/link-button' + +interface IPushProtectionErrorDialogProps { + readonly onDismissed: () => void +} + +/** + * The dialog shown when a push is denied by GitHub's push protection feature of secret scanning. + */ +export class PushProtectionErrorDialog extends React.Component< + IPushProtectionErrorDialogProps, + {} +> { + public render() { + return ( + + +
+

+ + Secret Scanning + {' '} + found secret(s) in the commit(s) you attempted to push.{' '} +

+

+ Allowing secrets risks exposure. Consider{' '} + + removing the secret from your commit and commit history. + +

+ Exposing this secret can allow someone to: +
    +
  • + Verify the identity of this GitHub Personal Access Token secret +
    • +
  • Know which resources this secret can access
    • +
  • Act on behalf of the secret's owner
    • +
  • Push this secret to this repository without being blocked
    • +
+
+ + + + + + ) + } +} + diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 1e5ce82af0e..9e04fd72144 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -24,6 +24,7 @@ @import 'dialogs/pull-request-comment-like'; @import 'dialogs/unknown-authors'; @import 'dialogs/icon_preview'; +@import 'dialogs/push-protection'; // The styles herein attempt to follow a flow where margins are only applied // to the bottom of elements (with the exception of the last child). This to diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss new file mode 100644 index 00000000000..aa9fb8cd760 --- /dev/null +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -0,0 +1,12 @@ +dialog.push-protection-error-dialog { + .dialog-content { + ul { + + li { + margin: 0; + padding: 0; + }; + } + } + +} From bc7da18f4a7888b9fe254f317312aa164683b450 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 09:49:05 -0400 Subject: [PATCH 0340/1338] Add secret scanning result extraction and types Introduced a function to parse secret scanning results from Git error remote message, extracting details like secret descriptions, locations, and bypass URLs. Added TypeScript interfaces for secret scanning results and locations to improve type safety and clarity. --- app/src/ui/dispatcher/error-handlers.ts | 63 +++++++++++++++++++ .../secret-scanning/push-protection-error.tsx | 22 +++++++ 2 files changed, 85 insertions(+) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 3e357de9aa8..66bf9e23e62 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -23,6 +23,10 @@ import { hasWritePermission } from '../../models/github-repository' import { RetryActionType } from '../../models/retry-actions' import { parseFilesToBeOverwritten } from '../lib/parse-files-to-be-overwritten' import { pathExists } from '../lib/path-exists' +import { + ISecretLocation, + ISecretScanResult, +} from '../secret-scanning/push-protection-error' /** An error which also has a code property. */ interface IErrorWithCode extends Error { @@ -604,6 +608,61 @@ export async function discardChangesHandler( return null } +/** + * Extracts secret scanning results from the provided `remoteMessage` string + * from the git error provided when GitHub Secret Scanning detects a secret on + * push.. + * + * This function parses the output of a secret scanning tool to identify + * secrets, their descriptions, locations in the codebase, and bypass URLs. + */ +function extractSecretScanningResults( + remoteMessage: string +): ReadonlyArray { + const secretsRegex = + /—— (?.*?) —+[.\s\S]*?locations:(?(?:\s+- commit: [a-f0-9]{40}\s+path: [.\s\S]*?)+).*?(?https:\/\/github\.com\/.*?\/unblock-secret\/[a-zA-Z0-9]+)/g + const matches = [...remoteMessage.matchAll(secretsRegex)] + + const secrets: Array = [] + if (matches.length === 0) { + return secrets + } + + for (const match of matches) { + if (match.groups === undefined || match.index === undefined) { + continue + } + + const { bypassURL, description, locationsGroup } = match.groups + + const locationsRegex = + /- commit: (?[a-f0-9]{40})\s+path: (?.*?):(?\d+)/g + const locationMatches = [...locationsGroup.matchAll(locationsRegex)] + + const locations: ISecretLocation[] = [] + + locationMatches.forEach(locationMatch => { + if (locationMatch.groups === undefined) { + return + } + const { commitSha, path, lineNumber } = locationMatch.groups + locations.push({ + commitSha, + path, + lineNumber: parseInt(lineNumber, 10), + }) + }) + + secrets.push({ + id: bypassURL.split('/').pop() || '', + description, + bypassURL, + locations, + }) + } + + return secrets +} /** * Handler for when a push is denied by GitHub's push protection feature of @@ -623,6 +682,10 @@ export async function secretScanningPushProtectionErrorHandler( return error } + const remoteMessage = getRemoteMessage(coerceToString(gitError.result.stderr)) + const secretLocations = extractSecretScanningResults(remoteMessage) + console.log('secretLocations', secretLocations) + dispatcher.showPopup({ type: PopupType.PushProtectionError, }) diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index ec1a9a5d41e..0b9f8307406 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -3,6 +3,28 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { LinkButton } from '../lib/link-button' +/** Represents the location of a detected secret detected on push */ +export interface ISecretLocation { + /**The SHA of the commit where the secret was detected. */ + commitSha: string + /** The file path where the secret is located. */ + path: string + /** The line number in the file where the secret is found. */ + lineNumber: number +} + +/** Represents secret detected by GitHub's Secret Scanning feature on push. */ +export interface ISecretScanResult { + /** The id used in the bypassURL to unique identify this secret */ + id: string + /** The name of the secret - e.g "GitHub Access Token" */ + description: string + /** The location of the secret, given as a commitSha, file path, and line number */ + locations: ReadonlyArray + /** The URL to use to get to GitHub.com's dialog for bypassing blocking the push of the secret */ + bypassURL: string +} + interface IPushProtectionErrorDialogProps { readonly onDismissed: () => void } From 9b154f007271db8bc73148d0c931e452e9cd5e4f Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 09:56:25 -0400 Subject: [PATCH 0341/1338] Add secret locations to push protection dialog Added support for displaying detected secrets in the push protection error dialog. Updated the popup model, dispatcher, and UI components to handle and render secret scan results. Styled the secret locations section in the dialog for better user experience. --- app/src/models/popup.ts | 2 + app/src/ui/app.tsx | 1 + app/src/ui/dispatcher/error-handlers.ts | 4 +- .../secret-scanning/push-protection-error.tsx | 43 ++++++++++ app/styles/ui/dialogs/_push-protection.scss | 84 +++++++++++++++++++ 5 files changed, 132 insertions(+), 2 deletions(-) diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 106d7d3d08e..bc2251cc28b 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -23,6 +23,7 @@ import { GitHubRepository } from './github-repository' import { ValidNotificationPullRequestReview } from '../lib/valid-notification-pull-request-review' import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog' import { IAPIComment } from '../lib/api' +import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error' export enum PopupType { RenameBranch = 'RenameBranch', @@ -436,6 +437,7 @@ export type PopupDetail = } | { type: PopupType.PushProtectionError + secrets: ReadonlyArray } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 88af87a1b5d..5675646bf5c 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -2499,6 +2499,7 @@ export class App extends React.Component { return ( ) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 66bf9e23e62..7aad98bae4c 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -683,11 +683,11 @@ export async function secretScanningPushProtectionErrorHandler( } const remoteMessage = getRemoteMessage(coerceToString(gitError.result.stderr)) - const secretLocations = extractSecretScanningResults(remoteMessage) - console.log('secretLocations', secretLocations) + const secrets = extractSecretScanningResults(remoteMessage) dispatcher.showPopup({ type: PopupType.PushProtectionError, + secrets, }) return null diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index 0b9f8307406..fb006df93de 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -2,6 +2,9 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { LinkButton } from '../lib/link-button' +import { Octicon } from '../octicons' +import * as octicons from '../octicons/octicons.generated' +import { CopyButton } from '../copy-button' /** Represents the location of a detected secret detected on push */ export interface ISecretLocation { @@ -26,6 +29,8 @@ export interface ISecretScanResult { } interface IPushProtectionErrorDialogProps { + /** The secrets that were detected on push */ + readonly secrets: ReadonlyArray readonly onDismissed: () => void } @@ -37,6 +42,7 @@ export class PushProtectionErrorDialog extends React.Component< {} > { public render() { + console.log(this.props.secrets) return ( Act on behalf of the secret's owner
  • Push this secret to this repository without being blocked
    • +
    + Secret Locations: + {this.renderLocations()} +
    @@ -82,5 +92,38 @@ export class PushProtectionErrorDialog extends React.Component< ) } + + private renderLocations = () => { + const rows = this.props.secrets.map((secret, index) => ( +
    +
    + {secret.description} + + Bypass + +
    +
    +
    + +
    + {secret.locations.at(0)?.commitSha.substring(0, 7)} +
    + +
    +
    + +
    + {secret.locations.at(0)?.path} at line{' '} + {secret.locations.at(0)?.lineNumber} +
    +
    +
    +
    + )) + return
    {rows}
    + } } diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss index aa9fb8cd760..dbaf7255ac8 100644 --- a/app/styles/ui/dialogs/_push-protection.scss +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -7,6 +7,90 @@ dialog.push-protection-error-dialog { padding: 0; }; } + + .secret-locations-container { + margin-top: var(--spacing); + + .secret-locations { + max-height: 200px; + overflow-y: scroll; + border: 1px solid var(--box-border-color); + + .location { + display: flex; + flex-direction: column; + width: 100%; + border-top: 1px solid var(--box-border-color); + + padding: var(--spacing-half) var(--spacing); + + &:first-child { + border-top: 1px solid var(--box-border-color); + } + + + &.selected { + --text-color: var(--box-selected-text-color); + --text-secondary-color: var(--box-selected-text-color); + + color: var(--text-color); + background-color: var(--box-selected-background-color); + } + + &:focus { + outline: none; + } + + &:not(.not-selectable):hover { + background: var(--list-item-hover-background-color); + } + + .location-header { + display: flex; + flex-direction: row; + margin-bottom: var(--spacing-half); + + span:first-child { + font-weight: var(--font-weight-semibold); + flex-grow: 1; + } + } + + .location-details{ + display: flex; + flex-direction: column; + + + > div { + display: flex; + flex-direction: row; + margin-bottom: var(--spacing-half); + } + + .ref { + padding-left: var(--spacing-half); + } + + .commit-sha { + .copy-button { + margin-left: var(--spacing-half); + + // Removing default button styles + background: transparent; + border: none; + padding: 0; + height: auto; + min-width: 16px; + + :hover { + color: var(--text-secondary-color); + } + } + } + } + } + } + } } } From 41db37cee2362c79ff5ec4eb4563d29519b6315a Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 11:29:22 -0400 Subject: [PATCH 0342/1338] Refactor push protection error UI to handle multiple file paths. --- .../push-protection-error-location.tsx | 96 ++++++++++ .../secret-scanning/push-protection-error.tsx | 65 +++---- app/styles/ui/dialogs/_push-protection.scss | 174 ++++++++++-------- 3 files changed, 222 insertions(+), 113 deletions(-) create mode 100644 app/src/ui/secret-scanning/push-protection-error-location.tsx diff --git a/app/src/ui/secret-scanning/push-protection-error-location.tsx b/app/src/ui/secret-scanning/push-protection-error-location.tsx new file mode 100644 index 00000000000..40dc0a8ad85 --- /dev/null +++ b/app/src/ui/secret-scanning/push-protection-error-location.tsx @@ -0,0 +1,96 @@ +import * as React from 'react' +import { Octicon } from '../octicons' +import * as octicons from '../octicons/octicons.generated' +import { CopyButton } from '../copy-button' +import { ISecretLocation, ISecretScanResult } from './push-protection-error' +import { PathText } from '../lib/path-text' +import { Button } from '../lib/button' + +interface IPushProtectionErrorLocationProps { + readonly secret: ISecretScanResult +} + +interface IPushProtectionErrorLocationState { + readonly showMoreLocations: boolean +} + +/** + * The dialog shown when a push is denied by GitHub's push protection feature of secret scanning. + */ +export class PushProtectionErrorLocation extends React.Component< + IPushProtectionErrorLocationProps, + IPushProtectionErrorLocationState +> { + public constructor(props: IPushProtectionErrorLocationProps) { + super(props) + this.state = { + showMoreLocations: false, + } + } + + private onClickShowMoreLocations = () => { + this.setState({ showMoreLocations: !this.state.showMoreLocations }) + } + + private renderLocation(location: ISecretLocation, isFirst: boolean = false) { + return ( + + + + + {location.commitSha.substring(0, 7)} + + + + + + + at line {location.lineNumber} + + + + ) + } + + public render() { + const { secret } = this.props + const { showMoreLocations } = this.state + const firstLocation = secret.locations.at(0) + const showMoreLocationsToggle = secret.locations.length > 1 + const toggleText = showMoreLocations ? 'Show Less Locations' : 'Show More locations' + if (firstLocation === undefined) { + return null + } + + + return ( + + + {this.renderLocation(firstLocation, true)} + {showMoreLocationsToggle && ( + + )} + + + {showMoreLocations && ( + <> + {secret.locations.map((location, index) => { + if (index === 0) { + return null + } + return this.renderLocation(location) + })} + + )} + + ) + } +} diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index fb006df93de..f5b5fcf6278 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -2,9 +2,7 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { LinkButton } from '../lib/link-button' -import { Octicon } from '../octicons' -import * as octicons from '../octicons/octicons.generated' -import { CopyButton } from '../copy-button' +import { PushProtectionErrorLocation } from './push-protection-error-location' /** Represents the location of a detected secret detected on push */ export interface ISecretLocation { @@ -80,10 +78,7 @@ export class PushProtectionErrorDialog extends React.Component<
  • Act on behalf of the secret's owner
  • Push this secret to this repository without being blocked
    • -
    - Secret Locations: - {this.renderLocations()} -
    + {this.renderSecrets()}
    @@ -93,37 +88,33 @@ export class PushProtectionErrorDialog extends React.Component< ) } - private renderLocations = () => { - const rows = this.props.secrets.map((secret, index) => ( -
    -
    - {secret.description} - - Bypass - -
    -
    -
    - -
    - {secret.locations.at(0)?.commitSha.substring(0, 7)} -
    - -
    -
    - -
    - {secret.locations.at(0)?.path} at line{' '} - {secret.locations.at(0)?.lineNumber} -
    -
    -
    -
    + private renderSecretDescription = (secret: ISecretScanResult) => { + return this.props.secrets.filter(s => s.description === secret.description) + .length > 1 + ? `${secret.description} (${secret.id})` + : secret.description + } + + private renderSecrets = () => { + const listItems = this.props.secrets.map((secret, index) => ( +
  • + + {this.renderSecretDescription(secret)} + + Bypass + + + +
    • )) - return
    {rows}
    + return ( +
      + {listItems} +
    + ) } } diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss index dbaf7255ac8..ad11adf4f2b 100644 --- a/app/styles/ui/dialogs/_push-protection.scss +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -1,96 +1,118 @@ dialog.push-protection-error-dialog { .dialog-content { ul { - li { margin: 0; padding: 0; - }; + } } - .secret-locations-container { + ul.secret-list { + list-style-type: none; + padding: 0; + margin: 0; margin-top: var(--spacing); - - .secret-locations { - max-height: 200px; - overflow-y: scroll; - border: 1px solid var(--box-border-color); - - .location { + max-height: 200px; + overflow-y: scroll; + border: 1px solid var(--box-border-color); + + li.secret-list-item { + display: flex; + flex-direction: column; + width: 100%; + border-top: 1px solid var(--box-border-color); + + padding: var(--spacing) var(--spacing); + + &:first-child { + border-top: 1px solid var(--box-border-color); + } + + &.selected { + --text-color: var(--box-selected-text-color); + --text-secondary-color: var(--box-selected-text-color); + + color: var(--text-color); + background-color: var(--box-selected-background-color); + } + + &:focus { + outline: none; + } + + &:not(.not-selectable):hover { + background: var(--list-item-hover-background-color); + } + + .secret-list-item-header { + display: flex; + flex-direction: row; + margin-bottom: var(--spacing-half); + + span:first-child { + font-weight: var(--font-weight-semibold); + flex-grow: 1; + } + } + + .secret-location { + display: flex; + flex-direction: column; + + .first-location, .secret-location-details { display: flex; - flex-direction: column; - width: 100%; - border-top: 1px solid var(--box-border-color); - - padding: var(--spacing-half) var(--spacing); - - &:first-child { - border-top: 1px solid var(--box-border-color); - } - - - &.selected { - --text-color: var(--box-selected-text-color); - --text-secondary-color: var(--box-selected-text-color); - - color: var(--text-color); - background-color: var(--box-selected-background-color); - } - - &:focus { - outline: none; + flex-direction: row; + flex-grow: 1; + + button { + font-size: 10; + padding: 0 var(--spacing-half); + height: auto; } - - &:not(.not-selectable):hover { - background: var(--list-item-hover-background-color); + } + + .ref { + flex-grow: 1; + display: flex; + } + + .secret-path { + display: flex; + align-items: center; + + .path-text-component { + display: inline-block; + margin-right: var(--spacing-half); } - - .location-header { - display: flex; - flex-direction: row; - margin-bottom: var(--spacing-half); - - span:first-child { - font-weight: var(--font-weight-semibold); - flex-grow: 1; - } + } + + .commit-sha { + display: flex; + margin-right: var(--spacing); + align-items: center; + min-width: 95px; + + .ref { + padding-left: var(--spacing-half); } - - .location-details{ - display: flex; - flex-direction: column; - - - > div { - display: flex; - flex-direction: row; - margin-bottom: var(--spacing-half); - } - - .ref { - padding-left: var(--spacing-half); - } - - .commit-sha { - .copy-button { - margin-left: var(--spacing-half); - - // Removing default button styles - background: transparent; - border: none; - padding: 0; - height: auto; - min-width: 16px; - - :hover { - color: var(--text-secondary-color); - } - } + + .copy-button { + margin-left: var(--spacing-half); + + // Removing default button styles + background: transparent; + border: none; + padding: 0; + height: auto; + min-width: 16px; + + :hover { + color: var(--text-secondary-color); } } + } } } } } - } From 08f026e2e2ffbec2912c8d3ab44e7c8fd5a4606b Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 22 Apr 2025 11:36:23 -0400 Subject: [PATCH 0343/1338] Update app/src/ui/secret-scanning/push-protection-error.tsx Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/src/ui/secret-scanning/push-protection-error.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index f5b5fcf6278..f075f0f584b 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -40,7 +40,6 @@ export class PushProtectionErrorDialog extends React.Component< {} > { public render() { - console.log(this.props.secrets) return ( Date: Tue, 22 Apr 2025 11:50:30 -0400 Subject: [PATCH 0344/1338] Only show scroll bar when needed --- app/styles/ui/dialogs/_push-protection.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss index ad11adf4f2b..2bf8f694613 100644 --- a/app/styles/ui/dialogs/_push-protection.scss +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -13,7 +13,7 @@ dialog.push-protection-error-dialog { margin: 0; margin-top: var(--spacing); max-height: 200px; - overflow-y: scroll; + overflow-y: auto; border: 1px solid var(--box-border-color); li.secret-list-item { From 93c78b68f5034317785f0774d38d0b20a17ba90f Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 11:51:22 -0400 Subject: [PATCH 0345/1338] Lint:fix --- .../push-protection-error-location.tsx | 11 ++++++++--- app/src/ui/secret-scanning/push-protection-error.tsx | 1 - app/styles/ui/dialogs/_push-protection.scss | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/ui/secret-scanning/push-protection-error-location.tsx b/app/src/ui/secret-scanning/push-protection-error-location.tsx index 40dc0a8ad85..d5b6c963c87 100644 --- a/app/src/ui/secret-scanning/push-protection-error-location.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-location.tsx @@ -63,18 +63,23 @@ export class PushProtectionErrorLocation extends React.Component< const { showMoreLocations } = this.state const firstLocation = secret.locations.at(0) const showMoreLocationsToggle = secret.locations.length > 1 - const toggleText = showMoreLocations ? 'Show Less Locations' : 'Show More locations' + const toggleText = showMoreLocations + ? 'Show Less Locations' + : 'Show More locations' if (firstLocation === undefined) { return null } - return ( {this.renderLocation(firstLocation, true)} {showMoreLocationsToggle && ( - )} diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index f075f0f584b..200fc86db5f 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -116,4 +116,3 @@ export class PushProtectionErrorDialog extends React.Component< ) } } - diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss index 2bf8f694613..c03bf2f25da 100644 --- a/app/styles/ui/dialogs/_push-protection.scss +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -59,7 +59,8 @@ dialog.push-protection-error-dialog { display: flex; flex-direction: column; - .first-location, .secret-location-details { + .first-location, + .secret-location-details { display: flex; flex-direction: row; flex-grow: 1; From 8d6f66b46bc8964134d23f15e872a09706cef31d Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 13:28:27 -0400 Subject: [PATCH 0346/1338] Pluralize copy --- app/src/ui/secret-scanning/push-protection-error.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index 200fc86db5f..9a896676684 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -70,12 +70,12 @@ export class PushProtectionErrorDialog extends React.Component<

    Exposing this secret can allow someone to:
      +
    • Verify the identity of the secret(s)
      • +
    • Know which resources the secret(s) can access
      • +
    • Act on behalf of the secret's owner
    • - Verify the identity of this GitHub Personal Access Token secret + Push the secret(s) to this repository without being blocked
      • -
    • Know which resources this secret can access
      • -
    • Act on behalf of the secret's owner
      • -
    • Push this secret to this repository without being blocked
    {this.renderSecrets()} From ab88c08b49caeab53cebcc432f98550aa49aa7c1 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 13:54:48 -0400 Subject: [PATCH 0347/1338] Add method to create push protection bypass Introduced a new method `createPushProtectionBypass` in the API class to create a push protection bypass for a repository. This includes sending a POST request to the GitHub API with a reason and placeholder ID, and handling errors with appropriate logging. --- app/src/lib/api.ts | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index bb0faea860b..e88cd42ed67 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -814,6 +814,12 @@ interface IAPIAliveWebSocket { type TokenInvalidatedCallback = (endpoint: string, token: string) => void +interface IAPICreatePushProtectionBypassResponse { + reason: string + expire_at: string + token_type: string +} + /** * An object for making authenticated requests to the GitHub API */ @@ -2138,6 +2144,48 @@ export class API { throw e } } + + /** + * Creates a push protection bypass for a repository. + * + * This method sends a POST request to the GitHub API to create a bypass + * for push protection in a specified repository. The bypass is associated + * with a reason and a placeholder ID. + * + * @param owner - The owner of the repository. + * @param name - The name of the repository. + * @param reason - The reason for creating the bypass - false_positive, used_in_tests, will_fix_later. + * @param placeholderId - The placeholder ID associated with the bypass. + * @param bypassURL - The URL to retry the bypass creation on Github.com in case of failure. + * @returns A promise that resolves to the response of the bypass creation. + * @throws An error if the bypass creation fails, including a warning log. + */ + public async createPushProtectionBypass( + owner: string, + name: string, + reason: string, + placeholderId: string, + bypassURL: string + ): Promise { + const path = `repos/${owner}/${name}/secret-scanning/push-protection-bypasses` + const body = { + reason, + placeholder_id: placeholderId, + } + + try { + const response = await this.ghRequest('POST', path, { body }) + return await parsedResponse( + response + ) + } catch (e) { + const msg = `Unable to create push protection bypass for ${owner}/${name} + with reason ${reason} and + placeholderId ${placeholderId}. Try again at: ${bypassURL}` + log.warn(msg, e) + throw new Error(msg) + } + } } export async function deleteToken(account: Account) { From 757ebc495302e86fc30f28f30752a2c66d90cdae Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 15:58:44 -0400 Subject: [PATCH 0348/1338] Hardcode/wire up push protection bypass functionality to error dialog Introduced the ability to bypass GitHub's push protection for secret scanning. Updated API, AppStore, Dispatcher, and UI components to support bypassing detected secrets with specific reasons and tracking bypassed secrets in the UI. --- app/src/lib/api.ts | 7 ++- app/src/lib/stores/app-store.ts | 39 +++++++++++++ app/src/ui/app.tsx | 17 +++++- app/src/ui/dispatcher/dispatcher.ts | 14 +++++ .../secret-scanning/push-protection-error.tsx | 58 ++++++++++++++++--- 5 files changed, 124 insertions(+), 11 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index e88cd42ed67..93bacf3a869 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -23,6 +23,7 @@ import { } from './suppress-certificate-error' import { HttpStatusCode } from './http-status-code' import { CopilotError } from './copilot-error' +import { BypassReason } from '../ui/secret-scanning/push-protection-error' const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT'] const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL'] @@ -814,8 +815,8 @@ interface IAPIAliveWebSocket { type TokenInvalidatedCallback = (endpoint: string, token: string) => void -interface IAPICreatePushProtectionBypassResponse { - reason: string +export interface IAPICreatePushProtectionBypassResponse { + reason: BypassReason expire_at: string token_type: string } @@ -2163,7 +2164,7 @@ export class API { public async createPushProtectionBypass( owner: string, name: string, - reason: string, + reason: BypassReason, placeholderId: string, bypassURL: string ): Promise { diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index ffd6758748c..5da5cecef30 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -101,6 +101,7 @@ import { IAPIComment, IAPIRepoRuleset, deleteToken, + IAPICreatePushProtectionBypassResponse, } from '../api' import { shell } from '../app-shell' import { @@ -346,6 +347,7 @@ import { migratedCustomIntegration, } from '../custom-integration' import { updateStore } from '../../ui/lib/update-store' +import { BypassReason } from '../../ui/secret-scanning/push-protection-error' const LastSelectedRepositoryIDKey = 'last-selected-repository-id' @@ -8282,6 +8284,43 @@ export class AppStore extends TypedBaseStore { })) this.emitUpdate() } + + public async _createPushProtectionBypass( + reason: BypassReason, + placeholderId: string, + bypassURL: string + ): Promise { + const repository = this.selectedRepository + if ( + repository === null || + repository instanceof CloningRepository || + isRepositoryWithGitHubRepository(repository) === false + ) { + log.error('[_createPushProtectionBypass] - No GitHub repository selected') + return null + } + + const { endpoint, name, owner } = repository.gitHubRepository + + const account = getAccountForEndpoint(this.accounts, endpoint) + + if (account === null) { + log.error( + `[_createPushProtectionBypass] - No account found for endpoint - ${endpoint}` + ) + return null + } + + const api = API.fromAccount(account) + + return api.createPushProtectionBypass( + owner.login, + name, + reason, + placeholderId, + bypassURL + ) + } } /** diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 049f5c4fce5..6b4e02fda51 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -186,9 +186,13 @@ import { showTestUI } from './lib/test-ui-components/test-ui-components' import { ConfirmCommitFilteredChanges } from './changes/confirm-commit-filtered-changes-dialog' import { AboutTestDialog } from './about/about-test-dialog' import { enableMultipleEnterpriseAccounts } from '../lib/feature-flag' -import { PushProtectionErrorDialog } from './secret-scanning/push-protection-error' +import { + ISecretScanResult, + PushProtectionErrorDialog, +} from './secret-scanning/push-protection-error' import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/generate-commit-message-override-warning' import { GenerateCommitMessageDisclaimer } from './generate-commit-message/generate-commit-message-disclaimer' +import { IAPICreatePushProtectionBypassResponse } from '../lib/api' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2502,6 +2506,7 @@ export class App extends React.Component { ) @@ -2548,6 +2553,16 @@ export class App extends React.Component { return selectedState.state.pullRequestState } + private bypassPushProtection = ( + secret: ISecretScanResult + ): Promise => { + return this.props.dispatcher.createPushProtectionBypass( + 'false_positive', + secret.id, + secret.bypassURL + ) + } + private getWarnForcePushDialogOnBegin( onBegin: () => void, onPopupDismissedFn: () => void diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index d5afaa5c96c..809f5fd43be 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -7,6 +7,7 @@ import { IAPICheckSuite, IAPIRepoRuleset, getDotComAPIEndpoint, + IAPICreatePushProtectionBypassResponse, } from '../../lib/api' import { shell } from '../../lib/app-shell' import { @@ -124,6 +125,7 @@ import { SignInResult } from '../../lib/stores/sign-in-store' import { ICustomIntegration } from '../../lib/custom-integration' import { isAbsolute } from 'path' import { CLIAction } from '../../lib/cli-action' +import { BypassReason } from '../secret-scanning/push-protection-error' /** * An error handler function. @@ -4007,4 +4009,16 @@ export class Dispatcher { includedChangesInCommitFilter ) } + + public async createPushProtectionBypass( + reason: BypassReason, + placeholderId: string, + bypassURL: string + ): Promise { + return this.appStore._createPushProtectionBypass( + reason, + placeholderId, + bypassURL + ) + } } diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error.tsx index 9a896676684..7abcee50885 100644 --- a/app/src/ui/secret-scanning/push-protection-error.tsx +++ b/app/src/ui/secret-scanning/push-protection-error.tsx @@ -3,6 +3,11 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { LinkButton } from '../lib/link-button' import { PushProtectionErrorLocation } from './push-protection-error-location' +import { IAPICreatePushProtectionBypassResponse } from '../../lib/api' +import { Octicon } from '../octicons' +import * as octicons from '../octicons/octicons.generated' + +export type BypassReason = 'false_positive' | 'used_in_tests' | 'will_fix_later' /** Represents the location of a detected secret detected on push */ export interface ISecretLocation { @@ -29,16 +34,31 @@ export interface ISecretScanResult { interface IPushProtectionErrorDialogProps { /** The secrets that were detected on push */ readonly secrets: ReadonlyArray + /** The function to call when the user clicks the bypass button */ + readonly bypassPushProtection: ( + secret: ISecretScanResult + ) => Promise readonly onDismissed: () => void } +interface IPushProtectionErrorDialogState { + readonly secretsBypassed: Map +} + /** * The dialog shown when a push is denied by GitHub's push protection feature of secret scanning. */ export class PushProtectionErrorDialog extends React.Component< IPushProtectionErrorDialogProps, - {} + IPushProtectionErrorDialogState > { + public constructor(props: IPushProtectionErrorDialogProps) { + super(props) + this.state = { + secretsBypassed: new Map(), + } + } + public render() { return ( { + return async () => { + const bypassed = await this.props.bypassPushProtection(secret) + if (bypassed) { + this.setState(prevState => ({ + secretsBypassed: new Map(prevState.secretsBypassed).set( + secret.id, + true + ), + })) + } + } + } + + private renderBypassButton = (secret: ISecretScanResult) => { + if (this.state.secretsBypassed.get(secret.id)) { + return + } + + return ( + + Bypass + + ) + } + private renderSecrets = () => { const listItems = this.props.secrets.map((secret, index) => (
  • {this.renderSecretDescription(secret)} - - Bypass - + {this.renderBypassButton(secret)}
    • From a36d528b65a0dd570d888e469569f67c7b0b2756 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 16:01:17 -0400 Subject: [PATCH 0349/1338] Rename push protection error dialog file name to match component name --- app/src/lib/api.ts | 2 +- app/src/lib/stores/app-store.ts | 2 +- app/src/models/popup.ts | 2 +- app/src/ui/app.tsx | 2 +- app/src/ui/dispatcher/dispatcher.ts | 2 +- app/src/ui/dispatcher/error-handlers.ts | 2 +- ...protection-error.tsx => push-protection-error-dialog.tsx} | 0 .../ui/secret-scanning/push-protection-error-location.tsx | 5 ++++- 8 files changed, 10 insertions(+), 7 deletions(-) rename app/src/ui/secret-scanning/{push-protection-error.tsx => push-protection-error-dialog.tsx} (100%) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 93bacf3a869..a4ee9d04fa4 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -23,7 +23,7 @@ import { } from './suppress-certificate-error' import { HttpStatusCode } from './http-status-code' import { CopilotError } from './copilot-error' -import { BypassReason } from '../ui/secret-scanning/push-protection-error' +import { BypassReason } from '../ui/secret-scanning/push-protection-error-dialog' const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT'] const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL'] diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 5da5cecef30..e11b9ea09b5 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -347,7 +347,7 @@ import { migratedCustomIntegration, } from '../custom-integration' import { updateStore } from '../../ui/lib/update-store' -import { BypassReason } from '../../ui/secret-scanning/push-protection-error' +import { BypassReason } from '../../ui/secret-scanning/push-protection-error-dialog' const LastSelectedRepositoryIDKey = 'last-selected-repository-id' diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 4090e302ba3..dc8809fd82d 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -23,7 +23,7 @@ import { GitHubRepository } from './github-repository' import { ValidNotificationPullRequestReview } from '../lib/valid-notification-pull-request-review' import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog' import { IAPIComment } from '../lib/api' -import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error' +import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error-dialog' export enum PopupType { RenameBranch = 'RenameBranch', diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 6b4e02fda51..e3d867da483 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -189,7 +189,7 @@ import { enableMultipleEnterpriseAccounts } from '../lib/feature-flag' import { ISecretScanResult, PushProtectionErrorDialog, -} from './secret-scanning/push-protection-error' +} from './secret-scanning/push-protection-error-dialog' import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/generate-commit-message-override-warning' import { GenerateCommitMessageDisclaimer } from './generate-commit-message/generate-commit-message-disclaimer' import { IAPICreatePushProtectionBypassResponse } from '../lib/api' diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 809f5fd43be..4b796b256ef 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -125,7 +125,7 @@ import { SignInResult } from '../../lib/stores/sign-in-store' import { ICustomIntegration } from '../../lib/custom-integration' import { isAbsolute } from 'path' import { CLIAction } from '../../lib/cli-action' -import { BypassReason } from '../secret-scanning/push-protection-error' +import { BypassReason } from '../secret-scanning/push-protection-error-dialog' /** * An error handler function. diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 7aad98bae4c..b02841345e2 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -26,7 +26,7 @@ import { pathExists } from '../lib/path-exists' import { ISecretLocation, ISecretScanResult, -} from '../secret-scanning/push-protection-error' +} from '../secret-scanning/push-protection-error-dialog' /** An error which also has a code property. */ interface IErrorWithCode extends Error { diff --git a/app/src/ui/secret-scanning/push-protection-error.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx similarity index 100% rename from app/src/ui/secret-scanning/push-protection-error.tsx rename to app/src/ui/secret-scanning/push-protection-error-dialog.tsx diff --git a/app/src/ui/secret-scanning/push-protection-error-location.tsx b/app/src/ui/secret-scanning/push-protection-error-location.tsx index d5b6c963c87..46f293dfabe 100644 --- a/app/src/ui/secret-scanning/push-protection-error-location.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-location.tsx @@ -2,7 +2,10 @@ import * as React from 'react' import { Octicon } from '../octicons' import * as octicons from '../octicons/octicons.generated' import { CopyButton } from '../copy-button' -import { ISecretLocation, ISecretScanResult } from './push-protection-error' +import { + ISecretLocation, + ISecretScanResult, +} from './push-protection-error-dialog' import { PathText } from '../lib/path-text' import { Button } from '../lib/button' From bedfd64d96bea4093baf626d971dfecb54593258 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 16:17:02 -0400 Subject: [PATCH 0350/1338] Create push protection bypass dialog Introduced a new `BypassPushProtectionDialog` component to handle bypassing push protection for secret scanning. Replaced `BypassReason` with `BypassReasonType` for improved type safety and moved related logic to the new dialog. Updated references in `api.ts` and `app-store.ts` to use the new type. --- app/src/lib/api.ts | 6 +- app/src/lib/stores/app-store.ts | 4 +- .../bypass-push-protection-dialog.tsx | 102 ++++++++++++++++++ .../push-protection-error-dialog.tsx | 2 - 4 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index a4ee9d04fa4..b3119b4bdf2 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -23,7 +23,7 @@ import { } from './suppress-certificate-error' import { HttpStatusCode } from './http-status-code' import { CopilotError } from './copilot-error' -import { BypassReason } from '../ui/secret-scanning/push-protection-error-dialog' +import { BypassReasonType } from '../ui/secret-scanning/bypass-push-protection-dialog' const envEndpoint = process.env['DESKTOP_GITHUB_DOTCOM_API_ENDPOINT'] const envHTMLURL = process.env['DESKTOP_GITHUB_DOTCOM_HTML_URL'] @@ -816,7 +816,7 @@ interface IAPIAliveWebSocket { type TokenInvalidatedCallback = (endpoint: string, token: string) => void export interface IAPICreatePushProtectionBypassResponse { - reason: BypassReason + reason: BypassReasonType expire_at: string token_type: string } @@ -2164,7 +2164,7 @@ export class API { public async createPushProtectionBypass( owner: string, name: string, - reason: BypassReason, + reason: BypassReasonType, placeholderId: string, bypassURL: string ): Promise { diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index e11b9ea09b5..4e9225ea61e 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -347,7 +347,7 @@ import { migratedCustomIntegration, } from '../custom-integration' import { updateStore } from '../../ui/lib/update-store' -import { BypassReason } from '../../ui/secret-scanning/push-protection-error-dialog' +import { BypassReasonType } from '../../ui/secret-scanning/bypass-push-protection-dialog' const LastSelectedRepositoryIDKey = 'last-selected-repository-id' @@ -8286,7 +8286,7 @@ export class AppStore extends TypedBaseStore { } public async _createPushProtectionBypass( - reason: BypassReason, + reason: BypassReasonType, placeholderId: string, bypassURL: string ): Promise { diff --git a/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx new file mode 100644 index 00000000000..6152247c2c9 --- /dev/null +++ b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx @@ -0,0 +1,102 @@ +import * as React from 'react' +import { Dialog, DialogContent, DialogFooter } from '../dialog' +import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' +import { IAPICreatePushProtectionBypassResponse } from '../../lib/api' +import { ISecretScanResult } from './push-protection-error-dialog' +import { VerticalSegmentedControl } from '../lib/vertical-segmented-control' + +enum BypassReason { + FalsePositive = 'false_positive', + UsedInTests = 'used_in_tests', + WillFixLater = 'will_fix_later', +} + +export type BypassReasonType = + | BypassReason.FalsePositive + | BypassReason.UsedInTests + | BypassReason.WillFixLater + +interface IBypassPushProtectionDialogProps { + /** The secret to be bypassed */ + readonly secret: ISecretScanResult + + /** The function to call when the user clicks the bypass button */ + readonly bypassPushProtection: ( + secret: ISecretScanResult + ) => Promise + + readonly onDismissed: () => void +} + +interface IBypassPushProtectionDialogState { + readonly reason: BypassReasonType +} +/** + * The dialog shown when a user wants to bypass the push protection feature of secret scanning. + */ +export class BypassPushProtectionDialog extends React.Component< + IBypassPushProtectionDialogProps, + IBypassPushProtectionDialogState +> { + public constructor(props: IBypassPushProtectionDialogProps) { + super(props) + this.state = { + reason: BypassReason.FalsePositive, + } + } + + public render() { + const items = [ + { + title: "It's used in tests", + description: + 'The secret poses no risk. If anyone finds it, they cannot do any damage or gain access to sensitive information.', + key: BypassReason.UsedInTests, + }, + { + title: "It's a false positive", + description: 'The detected string is not a secret', + key: BypassReason.FalsePositive, + }, + { + title: "I'll fix it later", + description: + 'The secret is real, I understand the risk, and I will need to revoke it. This will open a security alert and notify admins of this repository.', + key: BypassReason.WillFixLater, + }, + ] + + return ( + + + + + + + + + ) + } + + private onSelectionChanged = (reason: BypassReasonType) => { + this.setState({ reason }) + } + + private bypassPushProtection = () => { + this.props.bypassPushProtection(this.props.secret) + } +} diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index 7abcee50885..d529eb79a03 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -7,8 +7,6 @@ import { IAPICreatePushProtectionBypassResponse } from '../../lib/api' import { Octicon } from '../octicons' import * as octicons from '../octicons/octicons.generated' -export type BypassReason = 'false_positive' | 'used_in_tests' | 'will_fix_later' - /** Represents the location of a detected secret detected on push */ export interface ISecretLocation { /**The SHA of the commit where the secret was detected. */ From fba17ab200197263b35e0462cab8dc7a6ec8f114 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 17:07:30 -0400 Subject: [PATCH 0351/1338] Wire bypass push protection dialog to error dialog --- app/src/models/popup.ts | 11 ++++ app/src/ui/app.tsx | 62 ++++++++++++++++++- app/src/ui/dispatcher/dispatcher.ts | 4 +- .../bypass-push-protection-dialog.tsx | 11 ++-- .../push-protection-error-dialog.tsx | 7 ++- app/styles/ui/dialogs/_push-protection.scss | 8 +++ 6 files changed, 91 insertions(+), 12 deletions(-) diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index dc8809fd82d..61ca273d8c0 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -24,6 +24,7 @@ import { ValidNotificationPullRequestReview } from '../lib/valid-notification-pu import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog' import { IAPIComment } from '../lib/api' import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error-dialog' +import { BypassReasonType } from '../ui/secret-scanning/bypass-push-protection-dialog' export enum PopupType { RenameBranch = 'RenameBranch', @@ -99,6 +100,7 @@ export enum PopupType { ConfirmCommitFilteredChanges = 'ConfirmCommitFilteredChanges', TestAbout = 'TestAbout', PushProtectionError = 'PushProtectionError', + BypassPushProtection = 'BypassPushProtection', GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', GenerateCommitMessageDisclaimer = 'GenerateCommitMessageDisclaimer', } @@ -441,6 +443,15 @@ export type PopupDetail = type: PopupType.PushProtectionError secrets: ReadonlyArray } + | { + type: PopupType.BypassPushProtection + secret: ISecretScanResult + bypassPushProtection: ( + secret: ISecretScanResult, + reason: BypassReasonType + ) => void + onDismissed: () => void + } | { type: PopupType.GenerateCommitMessageOverrideWarning repository: Repository diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index e3d867da483..fe21a3cbc8d 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -193,6 +193,10 @@ import { import { GenerateCommitMessageOverrideWarning } from './generate-commit-message/generate-commit-message-override-warning' import { GenerateCommitMessageDisclaimer } from './generate-commit-message/generate-commit-message-disclaimer' import { IAPICreatePushProtectionBypassResponse } from '../lib/api' +import { + BypassPushProtectionDialog, + BypassReasonType, +} from './secret-scanning/bypass-push-protection-dialog' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2506,10 +2510,22 @@ export class App extends React.Component { ) + case PopupType.BypassPushProtection: + return ( + + ) case PopupType.GenerateCommitMessageOverrideWarning: { return ( { } } + private onDismissBypassPushProtection = ( + popup: string, + popupDismiss: () => void + ) => { + return () => { + popupDismiss() + this.onPopupDismissed(popup) + } + } + private setConfirmCommitFilteredChanges = (value: boolean) => { this.props.dispatcher.setConfirmCommitFilteredChanges(value) } @@ -2553,11 +2579,41 @@ export class App extends React.Component { return selectedState.state.pullRequestState } + private openBypassPushProtection = (secret: ISecretScanResult) => { + return new Promise( + resolve => { + this.props.dispatcher.showPopup({ + type: PopupType.BypassPushProtection, + secret, + bypassPushProtection: ( + secret: ISecretScanResult, + reason: BypassReasonType + ) => { + this.bypassPushProtection(secret, reason) + .then(response => { + resolve(response) + }) + .catch(() => { + resolve(null) + }) + .finally(() => { + this.props.dispatcher.closePopup(PopupType.BypassPushProtection) + }) + }, + onDismissed: () => { + resolve(null) + }, + }) + } + ) + } + private bypassPushProtection = ( - secret: ISecretScanResult + secret: ISecretScanResult, + reason: BypassReasonType ): Promise => { return this.props.dispatcher.createPushProtectionBypass( - 'false_positive', + reason, secret.id, secret.bypassURL ) diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 4b796b256ef..1571f802269 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -125,7 +125,7 @@ import { SignInResult } from '../../lib/stores/sign-in-store' import { ICustomIntegration } from '../../lib/custom-integration' import { isAbsolute } from 'path' import { CLIAction } from '../../lib/cli-action' -import { BypassReason } from '../secret-scanning/push-protection-error-dialog' +import { BypassReasonType } from '../secret-scanning/bypass-push-protection-dialog' /** * An error handler function. @@ -4011,7 +4011,7 @@ export class Dispatcher { } public async createPushProtectionBypass( - reason: BypassReason, + reason: BypassReasonType, placeholderId: string, bypassURL: string ): Promise { diff --git a/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx index 6152247c2c9..49857318f3b 100644 --- a/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx +++ b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx @@ -1,7 +1,6 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' -import { IAPICreatePushProtectionBypassResponse } from '../../lib/api' import { ISecretScanResult } from './push-protection-error-dialog' import { VerticalSegmentedControl } from '../lib/vertical-segmented-control' @@ -22,8 +21,9 @@ interface IBypassPushProtectionDialogProps { /** The function to call when the user clicks the bypass button */ readonly bypassPushProtection: ( - secret: ISecretScanResult - ) => Promise + secret: ISecretScanResult, + reason: BypassReasonType + ) => void readonly onDismissed: () => void } @@ -71,12 +71,11 @@ export class BypassPushProtectionDialog extends React.Component< title={__DARWIN__ ? 'Bypass Push Detection' : 'Bypass push detection'} onDismissed={this.props.onDismissed} onSubmit={this.bypassPushProtection} - type="error" className="bypass-push-protection-dialog" > { - this.props.bypassPushProtection(this.props.secret) + this.props.bypassPushProtection(this.props.secret, this.state.reason) } } diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index d529eb79a03..4b4f78130ac 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -128,7 +128,12 @@ export class PushProtectionErrorDialog extends React.Component< private renderBypassButton = (secret: ISecretScanResult) => { if (this.state.secretsBypassed.get(secret.id)) { - return + return ( + + Bypassed{' '} + {' '} + + ) } return ( diff --git a/app/styles/ui/dialogs/_push-protection.scss b/app/styles/ui/dialogs/_push-protection.scss index c03bf2f25da..0d8e242178c 100644 --- a/app/styles/ui/dialogs/_push-protection.scss +++ b/app/styles/ui/dialogs/_push-protection.scss @@ -53,6 +53,14 @@ dialog.push-protection-error-dialog { font-weight: var(--font-weight-semibold); flex-grow: 1; } + + .bypass-success { + display: flex; + + .octicon { + margin-left: var(--spacing-half); + } + } } .secret-location { From d147b1a3176ead5ed2470a06c2e2c3ed11c44618 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Tue, 22 Apr 2025 18:13:21 -0400 Subject: [PATCH 0352/1338] Release 3.4.19 --- app/package.json | 2 +- app/src/lib/feature-flag.ts | 4 ++-- changelog.json | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/package.json b/app/package.json index cd341d92a25..ed3796ee0f2 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.19-beta3", + "version": "3.4.19", "main": "./main.js", "repository": { "type": "git", diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 5331e77d1a8..caa66c4f6fa 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -103,8 +103,8 @@ export const enableCustomIntegration = () => true export const enableResizingToolbarButtons = () => true -export const enableFilteredChangesList = enableBetaFeatures -export const enableMultipleEnterpriseAccounts = enableBetaFeatures +export const enableFilteredChangesList = () => true +export const enableMultipleEnterpriseAccounts = () => true export const enableCommitMessageGeneration = (account: Account) => { return ( diff --git a/changelog.json b/changelog.json index 46ef73838f3..ada65f426ed 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,23 @@ { "releases": { + "3.4.19": [ + "[New] Users can filter the changed files list - #20220", + "[New] Add support for multiple enterprise accounts - #20227", + "[Fixed] Right-clicking on selected files will keep those files selected in the changes list - #20319", + "[Fixed] Let credential helper prompt for the specific enterprise account used in a given repository - #20318", + "[Fixed] Fix invalidated token dialog styling - #20317", + "[Fixed] Fix indentation bug in split diff view - #18800. Thanks @iamarjunsuresh!", + "[Fixed] Initialize Integrations settings when opening it from a no-changes screen - #19807. Thanks @iamarjunsuresh!", + "[Fixed] Resizing the list of files in \"Preview Pull Request\" does not open/create the pull request - #20200", + "[Fixed] Section lists such as the repository list in the cloning dialog and the pull request list announce their labels to screen readers - #20184", + "[Fixed] The added and removed prefixes of diff do not wrap making diff contents width equal in side by side diffs - #20191", + "[Fixed] Pressing Ctrl+A in the Find dialog selects the search text instead of the diff content - #20049", + "[Improved] Improve default README formatting - #20161. Thanks @OctCarp!", + "[Improved] The radio options label in the \"How do you plan to use this fork?\" dialog reflects their purpose - #20183", + "[Improved] The radio controls in the create branch, stashing changes, and fork behavior dialogs have visual selection indicators - #20052", + "[Improved] Promote use of GIT_CONFIG_PARAMETERS to production - #20198", + "[Improved] Use the default cursor instead of the text cursor in the whitespace hint popover - #20153" + ], "3.4.19-beta3": [ "[New] Copilot now helps you craft AI-generated commit messages with just one click - #17439" ], @@ -138,6 +156,7 @@ "[Fixed] Add aria-labelledby and aria-describedby attributes to \"Show whitespace changes?\" popover - #19518", "[Fixed] Fix logical tab order from co-authors text box - #19517", "[Fixed] Allow using Escape to dismiss the commit message warning popover - #19514", + "[Fixed] Fix diffing images when multiple commits are selected - #20329", "[Improved] Improved appearance of the list of files in 'File size limit exceeded' dialog - #19581", "[Improved] Resize events of resizable elements are announced by screen readers - #19649", "[Improved] Update the names of some JetBrains editors on Linux - #19637. Thanks @ankddev!", From 2435dc67d1e78512b061b361c1aaef6e28ffd77c Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 23 Apr 2025 10:05:38 -0400 Subject: [PATCH 0353/1338] Broadan secret scanning results parsing to handle bypasses with exemption and bypass urls Updated the regex in `extractSecretScanningResults` to handle broader cases by adjusting the patterns for bypass URL and whitespace handling. This ensures more accurate parsing of secret scanning results from remote messages. --- app/src/ui/dispatcher/error-handlers.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index b02841345e2..74726ffac9c 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -620,7 +620,8 @@ function extractSecretScanningResults( remoteMessage: string ): ReadonlyArray { const secretsRegex = - /—— (?.*?) —+[.\s\S]*?locations:(?(?:\s+- commit: [a-f0-9]{40}\s+path: [.\s\S]*?)+).*?(?https:\/\/github\.com\/.*?\/unblock-secret\/[a-zA-Z0-9]+)/g + /—— (?.*?) —+[\s\S]*?locations:(?(?:\s+- commit: [a-f0-9]{40}\s+path: [\s\S]*?)+).*?(?https[\s\S]*?) /g + const matches = [...remoteMessage.matchAll(secretsRegex)] const secrets: Array = [] From 113da2d009f175cc400b8dfe6758817ec73bfc52 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 23 Apr 2025 10:06:12 -0400 Subject: [PATCH 0354/1338] Improve error handling in API and UI components Updated `api.ts` to log errors with more detailed formatting and switched from `log.warn` to `log.error`. Modified `app.tsx` to dispatch errors using `postError` when a promise is rejected, improving error visibility in the UI. --- app/src/lib/api.ts | 13 +++++++++---- app/src/ui/app.tsx | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index b3119b4bdf2..c4f0e96dc14 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -2180,10 +2180,15 @@ export class API { response ) } catch (e) { - const msg = `Unable to create push protection bypass for ${owner}/${name} - with reason ${reason} and - placeholderId ${placeholderId}. Try again at: ${bypassURL}` - log.warn(msg, e) + const msg = `Unable to create push protection bypass. + + Repository: ${owner}/${name} + Reason: ${reason} + Placeholder Id: ${placeholderId}. + + Try again at: ${bypassURL}` + + log.error(msg, e) throw new Error(msg) } } diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index fe21a3cbc8d..d36cc1972c6 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -2593,8 +2593,9 @@ export class App extends React.Component { .then(response => { resolve(response) }) - .catch(() => { + .catch(error => { resolve(null) + this.props.dispatcher.postError(error) }) .finally(() => { this.props.dispatcher.closePopup(PopupType.BypassPushProtection) From 30a7e8f592303d4b8857ffd1132de58026fd5cd5 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 23 Apr 2025 10:06:30 -0400 Subject: [PATCH 0355/1338] Add 'requiresApproval' to secret scanning results Introduced a new 'requiresApproval' property to the secret scanning results to indicate if a bypass requires approval. Updated the error-handlers and push-protection-error-dialog components to handle this new property. --- app/src/ui/dispatcher/error-handlers.ts | 1 + app/src/ui/secret-scanning/push-protection-error-dialog.tsx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 74726ffac9c..0640dc6764f 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -659,6 +659,7 @@ function extractSecretScanningResults( description, bypassURL, locations, + requiresApproval: !!match.at(0)?.includes('request an exemption'), }) } diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index 4b4f78130ac..6a4950e379f 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -27,6 +27,8 @@ export interface ISecretScanResult { locations: ReadonlyArray /** The URL to use to get to GitHub.com's dialog for bypassing blocking the push of the secret */ bypassURL: string + /** The user cannot bypass themselves, but can request a bypass */ + requiresApproval: boolean } interface IPushProtectionErrorDialogProps { From 6edc769d5a45e49f9a1667a8215ce35b911eafb4 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 23 Apr 2025 10:08:51 -0400 Subject: [PATCH 0356/1338] Add bypass button for secrets requiring approval Introduced a conditional check to render a 'Bypass' button for secrets that require approval. The button includes an accessible label and links to the provided bypass URL. --- .../secret-scanning/push-protection-error-dialog.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index 6a4950e379f..c564d81caa2 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -129,6 +129,17 @@ export class PushProtectionErrorDialog extends React.Component< } private renderBypassButton = (secret: ISecretScanResult) => { + if (secret.requiresApproval) { + return ( + + Bypass + + ) + } + if (this.state.secretsBypassed.get(secret.id)) { return ( From 8196cc427c7ca61781e0a876dc4d2cfad2bbed4f Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Wed, 23 Apr 2025 10:20:06 -0400 Subject: [PATCH 0357/1338] lint:fix --- app/src/ui/secret-scanning/push-protection-error-dialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index c564d81caa2..f2f50966d06 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -139,7 +139,7 @@ export class PushProtectionErrorDialog extends React.Component< ) } - + if (this.state.secretsBypassed.get(secret.id)) { return ( From 4df2534881eeb3ec67c3ae5ef5b10988361c085d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 24 Apr 2025 12:46:03 +0200 Subject: [PATCH 0358/1338] Refactor state initialization in RefNameTextBox Moved state initialization logic to a new helper method `getStateForInitialValue` for better reusability. Added `componentWillReceiveProps` to update state when `initialValue` changes and the sanitized value is empty. --- app/src/ui/lib/ref-name-text-box.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/ui/lib/ref-name-text-box.tsx b/app/src/ui/lib/ref-name-text-box.tsx index 5500e88d2ef..141e5be079c 100644 --- a/app/src/ui/lib/ref-name-text-box.tsx +++ b/app/src/ui/lib/ref-name-text-box.tsx @@ -65,10 +65,12 @@ export class RefNameTextBox extends React.Component< public constructor(props: IRefNameProps) { super(props) + this.state = this.getStateForInitialValue(props.initialValue) + } - const proposedValue = props.initialValue || '' - - this.state = { + private getStateForInitialValue(initialValue?: string): IRefNameState { + const proposedValue = initialValue || '' + return { proposedValue, sanitizedValue: sanitizedRefName(proposedValue), } @@ -83,6 +85,15 @@ export class RefNameTextBox extends React.Component< } } + public componentWillReceiveProps(nextProps: IRefNameProps): void { + if ( + nextProps.initialValue !== this.props.initialValue && + this.state.sanitizedValue === '' + ) { + this.setState(this.getStateForInitialValue(nextProps.initialValue)) + } + } + public render() { return (
    From 9f1c0fdeb5c8cfc98fd78bb1a2eb1c8cd5fe1fc3 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 24 Apr 2025 13:00:50 +0200 Subject: [PATCH 0359/1338] Fix initial path handling in repository creation Updated the logic to correctly derive the repository path and name from the initial path. The change ensures that the last part of the initial path is treated as the repository name, and the parent directory is used as the path. --- app/src/ui/add-repository/create-repository.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/ui/add-repository/create-repository.tsx b/app/src/ui/add-repository/create-repository.tsx index 1544e20e52c..aad987b23cd 100644 --- a/app/src/ui/add-repository/create-repository.tsx +++ b/app/src/ui/add-repository/create-repository.tsx @@ -121,7 +121,14 @@ export class CreateRepository extends React.Component< public constructor(props: ICreateRepositoryProps) { super(props) - const path = this.props.initialPath ? this.props.initialPath : null + // If there is an initial path, remove the last part of the path which will + // be the suggested repository name. For example, if the initial path is + // /Users/adam/Projects/MyProject, the path will be /Users/adam/Projects and + // the name will be MyProject, so the repository will be created at + // /Users/adam/Projects/MyProject. + const path = this.props.initialPath + ? Path.dirname(this.props.initialPath) + : null const name = this.props.initialPath ? sanitizedRepositoryName(Path.basename(this.props.initialPath)) From c76eaed695a82085c09b9fdd368e9874c587c488 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Thu, 24 Apr 2025 12:47:37 -0400 Subject: [PATCH 0360/1338] Release 3.4.20 --- app/package.json | 2 +- changelog.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 8bd34b66c4e..91e739efe3a 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.19", + "version": "3.4.20-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index ada65f426ed..ebb2ce1acbb 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,10 @@ { "releases": { + "3.4.20-beta1": [ + "[Added] Handled GitHub Secret Scanning push protection errors in a friendly dialog with the ability to bypass blocked non-approval requiring secrets - #20386, #20387, #20391", + "[Fixed] Fix path used to create repository on existing non-Git directory - #20400", + "[Fixed] Show default branch name when opening Git settings from 'committing as' popup - #20399" + ], "3.4.19": [ "[New] Users can filter the changed files list - #20220", "[New] Add support for multiple enterprise accounts - #20227", From feeb95a41e26a35bc74ca99ecec33b81e2a354d8 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 25 Apr 2025 10:27:20 +0200 Subject: [PATCH 0361/1338] Fix rendering structure in OpenThankYouCard Wrapped the content of the OpenThankYouCard component in a element to address potential rendering or event handling issues. This ensures proper structure and behavior for the banner's interactive elements. --- app/src/ui/banners/open-thank-you-card.tsx | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/app/src/ui/banners/open-thank-you-card.tsx b/app/src/ui/banners/open-thank-you-card.tsx index f2ac0e65b9c..4eeae6e89af 100644 --- a/app/src/ui/banners/open-thank-you-card.tsx +++ b/app/src/ui/banners/open-thank-you-card.tsx @@ -21,21 +21,26 @@ export class OpenThankYouCard extends React.Component< public render() { return ( - The Desktop team would like to thank you for your contributions.{' '} - Open Your Card{' '} - - or Throw It Away{' '} - + + The Desktop team would like to thank you for your contributions.{' '} + + Open Your Card + {' '} + + or{' '} + Throw It Away{' '} + + ) } From b269b65b6b928197ac0ce78f16236fda516c327f Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Mon, 28 Apr 2025 15:24:59 -0400 Subject: [PATCH 0362/1338] Add app state property for changes filter visibility Introduced a new app state property to toggle the visibility of the changes filter in the application. This includes updates to the app state, menu options, and dispatcher to handle the new 'toggle-changes-filter' action, along with corresponding menu event changes. Still need to wire up to filter --- app/src/lib/app-state.ts | 3 +++ app/src/lib/menu-update.ts | 1 + app/src/lib/stores/app-store.ts | 15 +++++++++++++++ app/src/main-process/menu/build-default-menu.ts | 11 +++++++++++ app/src/main-process/menu/menu-event.ts | 1 + app/src/models/menu-ids.ts | 1 + app/src/models/menu-labels.ts | 7 +++++++ app/src/ui/app.tsx | 9 +++++++++ app/src/ui/dispatcher/dispatcher.ts | 4 ++++ 9 files changed, 52 insertions(+) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index f6e3ffad685..0da248329bb 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -376,6 +376,9 @@ export interface IAppState { readonly updateState: IUpdateState readonly commitMessageGenerationDisclaimerLastSeen: number | null + + /** Whether the changes filter is shown */ + readonly showChangesFilter: boolean } export enum FoldoutType { diff --git a/app/src/lib/menu-update.ts b/app/src/lib/menu-update.ts index aa5353be272..89840c2b76b 100644 --- a/app/src/lib/menu-update.ts +++ b/app/src/lib/menu-update.ts @@ -241,6 +241,7 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder { 'show-branches-list', 'open-external-editor', 'compare-to-branch', + 'toggle-changes-filter', ] const menuStateBuilder = new MenuStateBuilder() diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 4e9225ea61e..3ce371c157b 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -455,6 +455,8 @@ export const showDiffCheckMarksKey = 'diff-check-marks-visible' export const commitMessageGenerationDisclaimerLastSeenKey = 'commit-message-generation-disclaimer-last-seen' +const showChangesFilterKey = 'show-changes-filter' + export class AppStore extends TypedBaseStore { private readonly gitStoreCache: GitStoreCache @@ -607,6 +609,8 @@ export class AppStore extends TypedBaseStore { private commitMessageGenerationDisclaimerLastSeen: number | null = null + private showChangesFilter: boolean = false + public constructor( private readonly gitHubUserStore: GitHubUserStore, private readonly cloningRepositoriesStore: CloningRepositoriesStore, @@ -1101,6 +1105,7 @@ export class AppStore extends TypedBaseStore { updateState: updateStore.state, commitMessageGenerationDisclaimerLastSeen: this.commitMessageGenerationDisclaimerLastSeen, + showChangesFilter: this.showChangesFilter, } } @@ -2330,6 +2335,8 @@ export class AppStore extends TypedBaseStore { this.commitMessageGenerationDisclaimerLastSeen = getNumber(commitMessageGenerationDisclaimerLastSeenKey) ?? null + this.showChangesFilter = getBoolean(showChangesFilterKey, true) + this.emitUpdateNow() this.accountsStore.refresh() @@ -2547,6 +2554,7 @@ export class AppStore extends TypedBaseStore { isStashedChangesVisible, hasCurrentPullRequest: currentPullRequest !== null, askForConfirmationWhenStashingAllChanges, + isChangesFilterVisible: this.showChangesFilter, }) } @@ -8321,6 +8329,13 @@ export class AppStore extends TypedBaseStore { bypassURL ) } + + public _toggleChangesFilterVisibility() { + this.showChangesFilter = !this.showChangesFilter + setBoolean(showChangesFilterKey, this.showChangesFilter) + this.updateMenuLabelsForSelectedRepository() + this.emitUpdate() + } } /** diff --git a/app/src/main-process/menu/build-default-menu.ts b/app/src/main-process/menu/build-default-menu.ts index a67781c2921..b1896ee7625 100644 --- a/app/src/main-process/menu/build-default-menu.ts +++ b/app/src/main-process/menu/build-default-menu.ts @@ -45,6 +45,7 @@ export function buildDefaultMenu({ isForcePushForCurrentRepository = false, isStashedChangesVisible = false, askForConfirmationWhenStashingAllChanges = true, + isChangesFilterVisible = true, }: MenuLabelsEvent): Electron.Menu { contributionTargetDefaultBranch = truncateWithEllipsis( contributionTargetDefaultBranch, @@ -212,6 +213,16 @@ export function buildDefaultMenu({ ? emit('hide-stashed-changes') : emit('show-stashed-changes'), }, + { + label: __DARWIN__ + ? `${isChangesFilterVisible ? 'Hide' : 'Show'} Changes Filter` + : `${ + isChangesFilterVisible ? 'Hide' : 'Show' + } Toggle Changes &Filter`, + id: 'toggle-changes-filter', + accelerator: 'CmdOrCtrl+L', + click: emit('toggle-changes-filter'), + }, { label: __DARWIN__ ? 'Toggle Full Screen' : 'Toggle &full screen', role: 'togglefullscreen', diff --git a/app/src/main-process/menu/menu-event.ts b/app/src/main-process/menu/menu-event.ts index ec3a43d8c48..5dc2a0dcd5d 100644 --- a/app/src/main-process/menu/menu-event.ts +++ b/app/src/main-process/menu/menu-event.ts @@ -44,6 +44,7 @@ export type MenuEvent = | 'test-app-error' | 'decrease-active-resizable-width' | 'increase-active-resizable-width' + | 'toggle-changes-filter' | TestMenuEvent /** diff --git a/app/src/models/menu-ids.ts b/app/src/models/menu-ids.ts index bcabc009a31..efdef9dc4e1 100644 --- a/app/src/models/menu-ids.ts +++ b/app/src/models/menu-ids.ts @@ -38,3 +38,4 @@ export type MenuIDs = | 'preview-pull-request' | 'decrease-active-resizable-width' | 'increase-active-resizable-width' + | 'toggle-changes-filter' diff --git a/app/src/models/menu-labels.ts b/app/src/models/menu-labels.ts index 1093e0c474e..4b367795221 100644 --- a/app/src/models/menu-labels.ts +++ b/app/src/models/menu-labels.ts @@ -60,4 +60,11 @@ export type MenuLabelsEvent = { * their existing stash or not. */ readonly askForConfirmationWhenStashingAllChanges?: boolean + + /** + * Whether or not the changes filter is visible in the current view. + * This is used to determine whether the toggle changes filter menu item + * says "Show changes filter" or "Hide changes filter". + */ + readonly isChangesFilterVisible?: boolean } diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index d36cc1972c6..31073f52a62 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -529,6 +529,8 @@ export class App extends React.Component { return this.resizeActiveResizable('increase-active-resizable-width') case 'decrease-active-resizable-width': return this.resizeActiveResizable('decrease-active-resizable-width') + case 'toggle-changes-filter': + return this.toggleChangesFilterVisibility() default: if (isTestMenuEvent(name)) { return showTestUI( @@ -542,6 +544,13 @@ export class App extends React.Component { } } + /** + * This method dispatches an action to update the changes filter visibility + */ + private toggleChangesFilterVisibility() { + this.props.dispatcher.toggleChangesFilterVisibility() + } + /** * Handler for the 'increase-active-resizable-width' and * 'decrease-active-resizable-width' menu event, dispatches a custom DOM event diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 1571f802269..80f0c4f378c 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -4021,4 +4021,8 @@ export class Dispatcher { bypassURL ) } + + public toggleChangesFilterVisibility() { + this.appStore._toggleChangesFilterVisibility() + } } From 582a6ce2966b032ed7b66efbd0d2d589cfe565a1 Mon Sep 17 00:00:00 2001 From: tidy-dev Date: Mon, 28 Apr 2025 15:29:53 -0400 Subject: [PATCH 0363/1338] Add feature flag for filtered changes list toggle Wrapped the 'Changes Filter' menu item in a feature flag check using `enableFilteredChangesList`. This allows conditional inclusion of the menu item based on the feature flag's state. --- .../main-process/menu/build-default-menu.ts | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main-process/menu/build-default-menu.ts b/app/src/main-process/menu/build-default-menu.ts index b1896ee7625..fcb65631508 100644 --- a/app/src/main-process/menu/build-default-menu.ts +++ b/app/src/main-process/menu/build-default-menu.ts @@ -8,6 +8,7 @@ import { MenuLabelsEvent } from '../../models/menu-labels' import * as ipcWebContents from '../ipc-webcontents' import { mkdir } from 'fs/promises' import { buildTestMenu } from './build-test-menu' +import { enableFilteredChangesList } from '../../lib/feature-flag' const createPullRequestLabel = __DARWIN__ ? 'Create Pull Request' @@ -213,16 +214,20 @@ export function buildDefaultMenu({ ? emit('hide-stashed-changes') : emit('show-stashed-changes'), }, - { - label: __DARWIN__ - ? `${isChangesFilterVisible ? 'Hide' : 'Show'} Changes Filter` - : `${ - isChangesFilterVisible ? 'Hide' : 'Show' - } Toggle Changes &Filter`, - id: 'toggle-changes-filter', - accelerator: 'CmdOrCtrl+L', - click: emit('toggle-changes-filter'), - }, + ...(enableFilteredChangesList() + ? [ + { + label: __DARWIN__ + ? `${isChangesFilterVisible ? 'Hide' : 'Show'} Changes Filter` + : `${ + isChangesFilterVisible ? 'Hide' : 'Show' + } Toggle Changes &Filter`, + id: 'toggle-changes-filter', + accelerator: 'CmdOrCtrl+L', + click: emit('toggle-changes-filter'), + }, + ] + : []), { label: __DARWIN__ ? 'Toggle Full Screen' : 'Toggle &full screen', role: 'togglefullscreen', From c19bfe47aa59bdaa51e6bd7bb34ca38e5d693828 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:47:37 -0400 Subject: [PATCH 0364/1338] Add support for toggling changes filter visibility Introduced a new `showChangesFilter` prop across multiple components to conditionally render the changes filter UI. This allows for better control over the visibility of the changes filter in the application. --- app/src/ui/app.tsx | 1 + app/src/ui/changes/filter-changes-list.tsx | 18 ++++++++++++++++-- app/src/ui/changes/sidebar.tsx | 4 ++++ app/src/ui/repository.tsx | 4 ++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 31073f52a62..884d1ca060d 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -3381,6 +3381,7 @@ export class App extends React.Component { showCommitLengthWarning={this.state.showCommitLengthWarning} onCherryPick={this.startCherryPickWithoutBranch} pullRequestSuggestedNextAction={state.pullRequestSuggestedNextAction} + showChangesFilter={state.showChangesFilter} /> ) } else if (selectedState.type === SelectionType.CloningRepository) { diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a3fe875b0e8..b85ed6965a2 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -219,6 +219,9 @@ interface IFilterChangesListProps { readonly filterText: string readonly includedChangesInCommitFilter: boolean + + /** Whether or not to show the changes filter */ + readonly showChangesFilter: boolean } interface IFilterChangesListState { @@ -1299,6 +1302,10 @@ export class FilterChangesList extends React.Component< } private renderFilterBox = () => { + if (!this.props.showChangesFilter) { + return null + } + const buttonTextLabel = `Filter Options ${ this.props.includedChangesInCommitFilter ? '(1 applied)' : '' }` @@ -1344,7 +1351,11 @@ export class FilterChangesList extends React.Component< ) } - private isIncludedInCommit(item: IChangesListItem) { + private isIncludedInCommit = (item: IChangesListItem) => { + if (!this.props.showChangesFilter) { + return true + } + return item.change.selection.getSelectionType() !== DiffSelectionType.None } @@ -1363,7 +1374,9 @@ export class FilterChangesList extends React.Component< ref={this.filterListRef} id="changes-list" rowHeight={RowHeight} - filterText={this.props.filterText} + filterText={ + this.props.showChangesFilter ? this.props.filterText : '' + } filterTextBox={this.filterTextBox} onFilterListResultsChanged={this.onFilterListResultsChanged} selectedItems={this.state.selectedItems} @@ -1387,6 +1400,7 @@ export class FilterChangesList extends React.Component< workingDirectory: workingDirectory, isCommitting: isCommitting, focusedRow: this.state.focusedRow, + showChangesFilter: this.props.showChangesFilter, }} onItemContextMenu={this.onItemContextMenu} renderCustomFilterRow={this.renderFilterRow} diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 781b1995e9d..2af6e938d1b 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -89,6 +89,9 @@ interface IChangesSidebarProps { readonly commitSpellcheckEnabled: boolean readonly showCommitLengthWarning: boolean + + /** Whether or not to show the changes filter */ + readonly showChangesFilter: boolean } export class ChangesSidebar extends React.Component { @@ -461,6 +464,7 @@ export class ChangesSidebar extends React.Component { includedChangesInCommitFilter={ this.props.changes.includedChangesInCommitFilter } + showChangesFilter={this.props.showChangesFilter} /> {this.renderUndoCommit(rebaseConflictState)}
    diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 40b8f0532bd..98815f9a889 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -109,6 +109,9 @@ interface IRepositoryViewProps { /** The user's preference of pull request suggested next action to use **/ readonly pullRequestSuggestedNextAction?: PullRequestSuggestedNextAction + + /** Whether or not to show the changes filter */ + readonly showChangesFilter: boolean } interface IRepositoryViewState { @@ -267,6 +270,7 @@ export class RepositoryView extends React.Component< } commitSpellcheckEnabled={this.props.commitSpellcheckEnabled} showCommitLengthWarning={this.props.showCommitLengthWarning} + showChangesFilter={this.props.showChangesFilter} /> ) } From fdb69f467595a41ce88f24d11d5389047c33bc0a Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:54:54 -0400 Subject: [PATCH 0365/1338] Don't duplicate menu quick cut --- app/src/main-process/menu/build-default-menu.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main-process/menu/build-default-menu.ts b/app/src/main-process/menu/build-default-menu.ts index fcb65631508..ee8a2d29c2b 100644 --- a/app/src/main-process/menu/build-default-menu.ts +++ b/app/src/main-process/menu/build-default-menu.ts @@ -221,7 +221,7 @@ export function buildDefaultMenu({ ? `${isChangesFilterVisible ? 'Hide' : 'Show'} Changes Filter` : `${ isChangesFilterVisible ? 'Hide' : 'Show' - } Toggle Changes &Filter`, + } Toggle Chan&ges Filter`, id: 'toggle-changes-filter', accelerator: 'CmdOrCtrl+L', click: emit('toggle-changes-filter'), From ce960e18a32d052a7b5a483a786d21a319aebb03 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 30 Apr 2025 12:07:28 +0200 Subject: [PATCH 0366/1338] Batch file selection updates --- app/src/lib/stores/app-store.ts | 22 ++++++++++++++----- app/src/ui/changes/changed-file.tsx | 7 ++++-- app/src/ui/changes/changes-list.tsx | 13 ++++++----- app/src/ui/changes/filter-changes-list.tsx | 25 +++++++++++----------- app/src/ui/changes/sidebar.tsx | 17 ++++++--------- app/src/ui/dispatcher/dispatcher.ts | 4 +++- 6 files changed, 49 insertions(+), 39 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 4e9225ea61e..1c55cdbf2b8 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3404,13 +3404,25 @@ export class AppStore extends TypedBaseStore { /** This shouldn't be called directly. See `Dispatcher`. */ public _changeFileIncluded( repository: Repository, - file: WorkingDirectoryFileChange, + file: + | WorkingDirectoryFileChange + | ReadonlyArray, include: boolean ): Promise { - const selection = include - ? file.selection.withSelectAll() - : file.selection.withSelectNone() - this.updateWorkingDirectoryFileSelection(repository, file, selection) + const files = Array.isArray(file) ? file : [file] + const modifiedIds = new Set(files.map(f => f.id)) + + this.repositoryStateCache.updateChangesState(repository, state => { + const workingDirectory = WorkingDirectoryStatus.fromFiles( + state.workingDirectory.files.map(f => + modifiedIds.has(f.id) ? f.withIncludeAll(include) : f + ) + ) + + return { workingDirectory } + }) + + this.emitUpdate() return Promise.resolve() } diff --git a/app/src/ui/changes/changed-file.tsx b/app/src/ui/changes/changed-file.tsx index 2ce78891bc4..c82c9e79b83 100644 --- a/app/src/ui/changes/changed-file.tsx +++ b/app/src/ui/changes/changed-file.tsx @@ -19,14 +19,17 @@ interface IChangedFileProps { readonly focused: boolean /** The characters in the file path to highlight */ readonly matches?: IMatches - readonly onIncludeChanged: (path: string, include: boolean) => void + readonly onIncludeChanged: ( + file: WorkingDirectoryFileChange, + include: boolean + ) => void } /** a changed file in the working directory for a given repository */ export class ChangedFile extends React.Component { private handleCheckboxChange = (event: React.FormEvent) => { const include = event.currentTarget.checked - this.props.onIncludeChanged(this.props.file.path, include) + this.props.onIncludeChanged(this.props.file, include) } private get checkboxValue(): CheckboxValue { diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 40b592aa4d1..f1791934386 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -130,7 +130,10 @@ interface IChangesListProps { readonly rebaseConflictState: RebaseConflictState | null readonly selectedFileIDs: ReadonlyArray readonly onFileSelectionChanged: (rows: ReadonlyArray) => void - readonly onIncludeChanged: (path: string, include: boolean) => void + readonly onIncludeChanged: ( + file: WorkingDirectoryFileChange, + include: boolean + ) => void readonly onSelectAll: (selectAll: boolean) => void readonly onCreateCommit: (context: ICommitContext) => Promise readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void @@ -633,9 +636,7 @@ export class ChangesList extends React.Component< ? 'Include Selected Files' : 'Include selected files', action: () => { - selectedFiles.map(file => - this.props.onIncludeChanged(file.path, true) - ) + selectedFiles.map(file => this.props.onIncludeChanged(file, true)) }, }, { @@ -643,9 +644,7 @@ export class ChangesList extends React.Component< ? 'Exclude Selected Files' : 'Exclude selected files', action: () => { - selectedFiles.map(file => - this.props.onIncludeChanged(file.path, false) - ) + selectedFiles.map(file => this.props.onIncludeChanged(file, false)) }, }, { type: 'separator' }, diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a3fe875b0e8..84dfa67f3ab 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -119,7 +119,12 @@ interface IFilterChangesListProps { readonly rebaseConflictState: RebaseConflictState | null readonly selectedFileIDs: ReadonlyArray readonly onFileSelectionChanged: (rows: ReadonlyArray) => void - readonly onIncludeChanged: (path: string, include: boolean) => void + readonly onIncludeChanged: ( + file: + | WorkingDirectoryFileChange + | ReadonlyArray, + include: boolean + ) => void readonly onCreateCommit: (context: ICommitContext) => Promise readonly onDiscardChanges: (file: WorkingDirectoryFileChange) => void readonly askForConfirmationOnDiscardChanges: boolean @@ -388,13 +393,11 @@ export class FilterChangesList extends React.Component< private onIncludeAllChanged = (event: React.FormEvent) => { const include = event.currentTarget.checked - - const filteredItemPaths = [...this.state.filteredItems.values()].map( - i => i.change.path - ) - filteredItemPaths.forEach(path => - this.props.onIncludeChanged(path, include) + const filteredItemPaths = Array.from( + this.state.filteredItems, + ([k, v]) => v.change ) + this.props.onIncludeChanged(filteredItemPaths, include) } private renderChangedFile = ( @@ -750,9 +753,7 @@ export class FilterChangesList extends React.Component< ? 'Include Selected Files' : 'Include selected files', action: () => { - selectedFiles.map(file => - this.props.onIncludeChanged(file.path, true) - ) + selectedFiles.map(file => this.props.onIncludeChanged(file, true)) }, }, { @@ -760,9 +761,7 @@ export class FilterChangesList extends React.Component< ? 'Exclude Selected Files' : 'Exclude selected files', action: () => { - selectedFiles.map(file => - this.props.onIncludeChanged(file.path, false) - ) + selectedFiles.map(file => this.props.onIncludeChanged(file, false)) }, }, { type: 'separator' }, diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 781b1995e9d..63abb2d7a76 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -197,17 +197,12 @@ export class ChangesSidebar extends React.Component { ) } - private onIncludeChanged = (path: string, include: boolean) => { - const workingDirectory = this.props.changes.workingDirectory - const file = workingDirectory.files.find(f => f.path === path) - if (!file) { - console.error( - 'unable to find working directory file to apply included change: ' + - path - ) - return - } - + private onIncludeChanged = ( + file: + | WorkingDirectoryFileChange + | ReadonlyArray, + include: boolean + ) => { this.props.dispatcher.changeFileIncluded( this.props.repository, file, diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 1571f802269..8e4cd130c2b 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -338,7 +338,9 @@ export class Dispatcher { /** Change the file's includedness. */ public changeFileIncluded( repository: Repository, - file: WorkingDirectoryFileChange, + file: + | WorkingDirectoryFileChange + | ReadonlyArray, include: boolean ): Promise { return this.appStore._changeFileIncluded(repository, file, include) From 3d9b580816ebdb2d53dd6aab901d1b0ab2c5fa31 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:36:48 +0200 Subject: [PATCH 0367/1338] Bump electron to 35.2.2 --- .github/workflows/ci.yml | 2 +- .node-version | 2 +- .nvmrc | 2 +- .tool-versions | 2 +- app/.npmrc | 2 +- package.json | 2 +- script/validate-electron-version.ts | 2 +- yarn.lock | 30 ++++++++++++++--------------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b36bcf72aa..c716d368afd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ on: APPLE_APPLICATION_CERT_PASSWORD: env: - NODE_VERSION: 20.18.1 + NODE_VERSION: 22.14.0 jobs: lint: diff --git a/.node-version b/.node-version index d4b7699d36c..7d41c735d71 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.18.1 +22.14.0 diff --git a/.nvmrc b/.nvmrc index e8aa6441747..517f38666b4 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.18.1 +v22.14.0 diff --git a/.tool-versions b/.tool-versions index 43bc1074604..175418896e3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ python 3.9.5 -nodejs 20.18.1 +nodejs 22.14.0 diff --git a/app/.npmrc b/app/.npmrc index e4f82c0c101..301521c051f 100644 --- a/app/.npmrc +++ b/app/.npmrc @@ -1,3 +1,3 @@ runtime = electron disturl = https://electronjs.org/headers -target = 34.0.1 +target = 35.2.2 diff --git a/package.json b/package.json index acb2512e747..94c2bdfa3f5 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", "diff": "^7.0.0", - "electron": "34.0.1", + "electron": "35.2.2", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index 5cb3e0bc208..a406be06ef1 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -19,7 +19,7 @@ type ChannelToValidate = 'production' | 'beta' */ const ValidElectronVersions: Record = { production: '34.0.1', - beta: '34.0.1', + beta: '35.2.2', } // Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment. diff --git a/yarn.lock b/yarn.lock index 1a67d825f9c..893931de397 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1088,12 +1088,12 @@ dependencies: undici-types "~6.20.0" -"@types/node@^20.9.0": - version "20.12.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050" - integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw== +"@types/node@^22.7.7": + version "22.15.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.12.tgz#9ce54e51e09536faa94e4ec300c4728ee83bfa85" + integrity sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw== dependencies: - undici-types "~5.26.4" + undici-types "~6.21.0" "@types/parse-dds@^1.0.3": version "1.0.3" @@ -2730,13 +2730,13 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@34.0.1: - version "34.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.0.1.tgz#bc2fdb8956831ba4c5c7d17bfa7b8780a7d635e7" - integrity sha512-aArw5tAM80i3CKwEREnyZSM1SkARf5Jd1yBMTIdOL4pB1M+p/oDeyWSFI9Dl+vujyfJKiK4SS5+j19wna1onMw== +electron@35.2.2: + version "35.2.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" + integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^20.9.0" + "@types/node" "^22.7.7" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -6728,11 +6728,6 @@ underscore@~1.6.0: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - undici-types@~6.19.2: version "6.19.8" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" @@ -6743,6 +6738,11 @@ undici-types@~6.20.0: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== + undici@^5.25.4: version "5.29.0" resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3" From 5ec4f8ce4218fd12fb98e43e43de5bc62370a243 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:37:02 +0200 Subject: [PATCH 0368/1338] Fix for updated type --- app/src/main-process/app-window.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts index 204c3c04285..d79d2d25822 100644 --- a/app/src/main-process/app-window.ts +++ b/app/src/main-process/app-window.ts @@ -326,7 +326,7 @@ export class AppWindow { // automatically. The modal panel is not brought to the front for an inactive app." // NOTE: flashFrame() uses the 'informational' level, so we need to explicitly bounce the dock // with the 'critical' level in order to that described behavior. - app.dock.bounce('critical') + app.dock?.bounce('critical') } else { // See https://learn.microsoft.com/en-us/windows/win32/uxguide/winenv-taskbar#taskbar-button-flashing // "If an inactive program requires immediate attention, From d71a45a54737019a9c507db6a55ee621dff99074 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:47:35 +0200 Subject: [PATCH 0369/1338] Bump node-ipc to get out of DBAD license mess --- yarn.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index 893931de397..658487a8a41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2684,10 +2684,10 @@ eastasianwidth@^0.2.0: resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -easy-stack@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788" - integrity sha1-EskbMIWjfwuqM26UhurEv5Tj54g= +easy-stack@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066" + integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w== electron-packager@^17.1.1: version "17.1.1" @@ -4561,17 +4561,17 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -js-message@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15" - integrity sha1-IwDSSxrwjondCVvBpMnJz8uJLRU= +js-message@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47" + integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA== -js-queue@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.0.tgz#362213cf860f468f0125fc6c96abc1742531f948" - integrity sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug= +js-queue@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482" + integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA== dependencies: - easy-stack "^1.0.0" + easy-stack "^1.0.1" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -5176,13 +5176,13 @@ no-case@^3.0.4: tslib "^2.0.3" node-ipc@^9.1.0: - version "9.1.1" - resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69" - integrity sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w== + version "9.1.3" + resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.3.tgz#1df3f069d103184ae9127fa885dbdaea56a4436f" + integrity sha512-8RS4RZyS/KMKKYG8mrje+cLxwATe9dBCuOiqKFSWND4oOuKytfuKCiR9yinvhoXF/nGdX/WnbywaUee+9U87zA== dependencies: event-pubsub "4.3.0" - js-message "1.0.5" - js-queue "2.0.0" + js-message "1.0.7" + js-queue "2.0.2" node-releases@^2.0.18: version "2.0.18" From 98f6c7c2653b5c046a5a8d954ee3fe9b06c02637 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:54:38 +0200 Subject: [PATCH 0370/1338] Check for permissive licenses in project root and include additional permitted licenses --- script/licenses/update-license-dump.ts | 41 +++++++++++++++++++------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/script/licenses/update-license-dump.ts b/script/licenses/update-license-dump.ts index d6959d0abe5..4054ef4b3d9 100644 --- a/script/licenses/update-license-dump.ts +++ b/script/licenses/update-license-dump.ts @@ -9,19 +9,29 @@ const legalEagle = promisify(_legalEagle) import { getVersion } from '../../app/package-info' import { readFile, writeFile } from 'fs/promises' -export async function updateLicenseDump( - projectRoot: string, - outRoot: string -): Promise { - const appRoot = path.join(projectRoot, 'app') - const outPath = path.join(outRoot, 'static', 'licenses.json') - - let summary = await legalEagle({ - path: appRoot, +const assertValidLicensesIn = async (dir: string) => { + const summary = await legalEagle({ + path: dir, overrides: licenseOverrides, omitPermissive: true, }) + // Sourced from OSPOs license-policy + const additionalAllowedLicenses = [ + '0BSD', + 'BlueOak-1.0.0', + 'Python-2.0', + 'MPL-2.0', + 'CC0-1.0', + ] + + for (const key in summary) { + const license = summary[key] + if (additionalAllowedLicenses.includes(license.license)) { + delete summary[key] + } + } + if (Object.keys(summary).length > 0) { let licensesMessage = '' for (const key in summary) { @@ -34,8 +44,19 @@ export async function updateLicenseDump( const message = `The following dependencies have unknown or non-permissive licenses. Check it out and update ${overridesPath} if appropriate:\n${licensesMessage}` throw new Error(message) } +} + +export async function updateLicenseDump( + projectRoot: string, + outRoot: string +): Promise { + const appRoot = path.join(projectRoot, 'app') + const outPath = path.join(outRoot, 'static', 'licenses.json') + + await assertValidLicensesIn(projectRoot) + await assertValidLicensesIn(appRoot) - summary = await legalEagle({ + const summary = await legalEagle({ path: appRoot, overrides: licenseOverrides, }) From a595f48e09e2d46ae7be2d3a877dae8b32e57dfc Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:54:45 +0200 Subject: [PATCH 0371/1338] TSLib no longer requires override --- script/licenses/license-overrides.ts | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/script/licenses/license-overrides.ts b/script/licenses/license-overrides.ts index e0ec136c9c0..655723d20d0 100644 --- a/script/licenses/license-overrides.ts +++ b/script/licenses/license-overrides.ts @@ -1,23 +1,4 @@ -import { Entry, LicenseLookup } from 'legal-eagle' - -const tslibLicenseOverride: Entry = { - repository: 'git+https://github.com/microsoft/tslib', - license: 'BSD', - source: - 'https://github.com/microsoft/tslib/blob/74f1ff794985b33657b599b611e82937e3074617/LICENSE.txt', - sourceText: `Copyright (c) Microsoft Corporation. - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE.`, -} +import { LicenseLookup } from 'legal-eagle' export const licenseOverrides: LicenseLookup = { 'cycle@1.0.3': { @@ -37,7 +18,4 @@ export const licenseOverrides: LicenseLookup = { sourceText: 'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.', }, - - 'tslib@2.0.0': tslibLicenseOverride, - 'tslib@2.8.1': tslibLicenseOverride, } From 9ebc916b93769221ae25b2fbd95e2b10800d9f63 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 6 May 2025 10:56:10 +0200 Subject: [PATCH 0372/1338] We no longer depend on these packages --- script/licenses/license-overrides.ts | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/script/licenses/license-overrides.ts b/script/licenses/license-overrides.ts index 655723d20d0..d35c3521b4e 100644 --- a/script/licenses/license-overrides.ts +++ b/script/licenses/license-overrides.ts @@ -1,21 +1,3 @@ import { LicenseLookup } from 'legal-eagle' -export const licenseOverrides: LicenseLookup = { - 'cycle@1.0.3': { - repository: 'git+ssh://git@github.com/dscape/cycle', - license: 'Public Domain', - source: - 'cycle.js header comment at https://github.com/dscape/cycle/blob/ab67ce90e8fa2efdb8f21074661366ec56f6a724/cycle.js', - sourceText: - 'Public Domain.\n\nNO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.', - }, - - 'json-schema@0.2.3': { - repository: 'git+ssh://git@github.com/kriszyp/json-schema', - license: 'BSD', - source: - 'README.md at https://github.com/kriszyp/json-schema/tree/24c4ed1b2359ab457a00e90606a777c2962ecd3b', - sourceText: - 'Code is licensed under the AFL or BSD 3-Clause license as part of the Persevere project which is administered under the Dojo foundation, and all contributions require a Dojo CLA.', - }, -} +export const licenseOverrides: LicenseLookup = {} From 33c7bc646ad57bf073038a2240d827421143c732 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 6 May 2025 09:49:41 -0400 Subject: [PATCH 0373/1338] Add filtering changes feature to stats and app stores Introduced a new `filteringChangesEnabled` property in the stats store to track the filtering changes feature. Added constants `showChangesFilterKey` and `showChangesFilterDefault` to the app store for managing the default state and key for this feature. --- app/src/lib/stats/stats-store.ts | 14 +++++++++++++- app/src/lib/stores/app-store.ts | 8 ++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index adef4060fc7..41cbb918c37 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -13,6 +13,8 @@ import { getPersistedThemeName } from '../../ui/lib/application-theme' import { IUiActivityMonitor } from '../../ui/lib/ui-activity-monitor' import { Disposable } from 'event-kit' import { + showChangesFilterDefault, + showChangesFilterKey, showDiffCheckMarksDefault, showDiffCheckMarksKey, underlineLinksDefault, @@ -408,6 +410,11 @@ interface ICalculatedStats { * if the user has not yet made an active decision **/ readonly useExternalCredentialHelper?: boolean | null + + /** + * Whether or not the user has the filtering changes enabled + **/ + readonly filteringChangesEnabled: boolean } type DailyStats = ICalculatedStats & @@ -590,10 +597,14 @@ export class StatsStore implements IStatsStore { showDiffCheckMarksKey, showDiffCheckMarksDefault ) - const useExternalCredentialHelper = getBoolean(useExternalCredentialHelperKey) ?? null + const filteringChangesEnabled = getBoolean( + showChangesFilterKey, + showChangesFilterDefault + ) + // isInApplicationsFolder is undefined when not running on Darwin const launchedFromApplicationsFolder = __DARWIN__ ? await isInApplicationFolder() @@ -621,6 +632,7 @@ export class StatsStore implements IStatsStore { linkUnderlinesVisible, diffCheckMarksVisible, useExternalCredentialHelper, + filteringChangesEnabled, } } diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 972e382bca5..77391c67d67 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -455,7 +455,8 @@ export const showDiffCheckMarksKey = 'diff-check-marks-visible' export const commitMessageGenerationDisclaimerLastSeenKey = 'commit-message-generation-disclaimer-last-seen' -const showChangesFilterKey = 'show-changes-filter' +export const showChangesFilterKey = 'show-changes-filter' +export const showChangesFilterDefault = true export class AppStore extends TypedBaseStore { private readonly gitStoreCache: GitStoreCache @@ -2335,7 +2336,10 @@ export class AppStore extends TypedBaseStore { this.commitMessageGenerationDisclaimerLastSeen = getNumber(commitMessageGenerationDisclaimerLastSeenKey) ?? null - this.showChangesFilter = getBoolean(showChangesFilterKey, true) + this.showChangesFilter = getBoolean( + showChangesFilterKey, + showChangesFilterDefault + ) this.emitUpdateNow() From 078edfdae809d471874b2eeec3cd922432f4dc6e Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 6 May 2025 11:00:12 -0400 Subject: [PATCH 0374/1338] Refactor radio button component and styles Moved the radio input inside the label in the RadioButton component for better accessibility and structure. Updated related SCSS files to adjust styles for the new structure, including improved alignment and spacing for labels and inputs. --- app/src/ui/lib/radio-button.tsx | 20 ++--- app/styles/ui/_preferences.scss | 83 ++++++++++--------- app/styles/ui/_radio-button.scss | 17 ++-- .../ui/_vertical-segmented-control.scss | 2 +- 4 files changed, 65 insertions(+), 57 deletions(-) diff --git a/app/src/ui/lib/radio-button.tsx b/app/src/ui/lib/radio-button.tsx index 6e9d71a63f1..ed2b3cb57da 100644 --- a/app/src/ui/lib/radio-button.tsx +++ b/app/src/ui/lib/radio-button.tsx @@ -64,17 +64,17 @@ export class RadioButton extends React.Component< public render() { return (
    -
    ) diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss index a28661edf6c..9c9a527942a 100644 --- a/app/styles/ui/_preferences.scss +++ b/app/styles/ui/_preferences.scss @@ -139,51 +139,54 @@ width: 50%; margin: 0; - input[type='radio'] { - position: absolute; - left: calc(var(--spacing) + var(--spacing-half)); - margin-top: calc(54.5%); - - &:checked + label { - border-color: var(--box-selected-active-background-color); - } - } - + label { - border-radius: var(--border-radius); - border: var(--base-border); - float: left; - overflow: hidden; - padding-bottom: var(--spacing-half); - width: 100%; - margin: 0; - - .theme-value-label { - margin-left: calc(var(--spacing-triple)); - } - - img { - width: 100%; - border-bottom: var(--base-border); - margin-bottom: var(--spacing-half); - display: block; + input[type='radio'] { + position: absolute; + left: calc(var(--spacing) + var(--spacing-half)); + margin-top: calc(50.5%); + + &:checked + label { + border-color: var(--box-selected-active-background-color); + } } - .system-theme-swatch { + > span { + border-radius: var(--border-radius); + border: var(--base-border); + float: left; + overflow: hidden; + padding-bottom: var(--spacing-half); width: 100%; - position: relative; - display: block; - + margin: 0; + + .theme-value-label { + margin-left: calc(var(--spacing-triple)); + } + img { - position: absolute; - top: 0; - - &:first-child { - position: inherit; - } - - &:last-child { - clip-path: polygon(50% 0, 100% 0%, 100% 100%, 50% 100%); + width: 100%; + border-bottom: var(--base-border); + margin-bottom: var(--spacing-half); + display: block; + } + + .system-theme-swatch { + width: 100%; + position: relative; + display: block; + + img { + position: absolute; + top: 0; + + &:first-child { + position: inherit; + } + + &:last-child { + clip-path: polygon(50% 0, 100% 0%, 100% 100%, 50% 100%); + } } } } diff --git a/app/styles/ui/_radio-button.scss b/app/styles/ui/_radio-button.scss index a65eaa6c72f..47c5c1ea7c9 100644 --- a/app/styles/ui/_radio-button.scss +++ b/app/styles/ui/_radio-button.scss @@ -6,12 +6,17 @@ margin-top: var(--spacing-half); } - & > input { - margin: 0; - } - & > label { - margin: 0; - margin-left: var(--spacing-half); + display: flex; + align-items: center; + + & > input { + margin: 0; + } + + > span { + margin: 0; + margin-left: var(--spacing-half); + } } } diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index 1978937ca00..3add9ea4469 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -17,7 +17,6 @@ fieldset.vertical-segmented-control { width: 100%; .radio-button-component { - padding: var(--spacing); margin: 0; border: var(--base-border); // Last child to have a border-bottom @@ -61,6 +60,7 @@ fieldset.vertical-segmented-control { > label { min-width: 0; + padding: var(--spacing); } } } From 3cb4fba1eadd21d6e134cf00c16320718875fdc2 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 6 May 2025 11:05:29 -0400 Subject: [PATCH 0375/1338] Update min-width for vertical segmented control labels Changed the `min-width` of labels in the vertical segmented control from `0` to `100%` to ensure proper alignment and layout consistency. --- app/styles/ui/_vertical-segmented-control.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/_vertical-segmented-control.scss b/app/styles/ui/_vertical-segmented-control.scss index 3add9ea4469..bec47d60ca9 100644 --- a/app/styles/ui/_vertical-segmented-control.scss +++ b/app/styles/ui/_vertical-segmented-control.scss @@ -59,7 +59,7 @@ fieldset.vertical-segmented-control { } > label { - min-width: 0; + min-width: 100%; padding: var(--spacing); } } From 4d529b909f10078ff0a089adb7a54e3ac6a66b13 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 6 May 2025 11:14:19 -0400 Subject: [PATCH 0376/1338] Fix selector for checked preference styles Updated the SCSS selector from `label` to `span` for checked preferences to ensure the correct element is styled with the selected border color. --- app/styles/ui/_preferences.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss index 9c9a527942a..ea0bd58a2a3 100644 --- a/app/styles/ui/_preferences.scss +++ b/app/styles/ui/_preferences.scss @@ -146,7 +146,7 @@ left: calc(var(--spacing) + var(--spacing-half)); margin-top: calc(50.5%); - &:checked + label { + &:checked + span { border-color: var(--box-selected-active-background-color); } } From 545107fcd941519cc5dce865235502ab01cb708e Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 6 May 2025 11:15:17 -0400 Subject: [PATCH 0377/1338] Remove unnecessary whitespace in SCSS files Cleaned up extra blank lines and trailing spaces in _preferences.scss and _radio-button.scss to improve code readability and maintain consistency in the stylesheets. --- app/styles/ui/_preferences.scss | 15 +++++++-------- app/styles/ui/_radio-button.scss | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss index ea0bd58a2a3..244442c45b7 100644 --- a/app/styles/ui/_preferences.scss +++ b/app/styles/ui/_preferences.scss @@ -139,13 +139,12 @@ width: 50%; margin: 0; - label { input[type='radio'] { position: absolute; left: calc(var(--spacing) + var(--spacing-half)); margin-top: calc(50.5%); - + &:checked + span { border-color: var(--box-selected-active-background-color); } @@ -159,31 +158,31 @@ padding-bottom: var(--spacing-half); width: 100%; margin: 0; - + .theme-value-label { margin-left: calc(var(--spacing-triple)); } - + img { width: 100%; border-bottom: var(--base-border); margin-bottom: var(--spacing-half); display: block; } - + .system-theme-swatch { width: 100%; position: relative; display: block; - + img { position: absolute; top: 0; - + &:first-child { position: inherit; } - + &:last-child { clip-path: polygon(50% 0, 100% 0%, 100% 100%, 50% 100%); } diff --git a/app/styles/ui/_radio-button.scss b/app/styles/ui/_radio-button.scss index 47c5c1ea7c9..fe56259a807 100644 --- a/app/styles/ui/_radio-button.scss +++ b/app/styles/ui/_radio-button.scss @@ -9,7 +9,7 @@ & > label { display: flex; align-items: center; - + & > input { margin: 0; } From 57010d54c49564177f158d69ab35facb9f3e7dc4 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 7 May 2025 13:52:29 +0200 Subject: [PATCH 0378/1338] Bump to Electron 36 --- app/.npmrc | 2 +- package.json | 2 +- script/validate-electron-version.ts | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/.npmrc b/app/.npmrc index 301521c051f..6b1f40f4d4e 100644 --- a/app/.npmrc +++ b/app/.npmrc @@ -1,3 +1,3 @@ runtime = electron disturl = https://electronjs.org/headers -target = 35.2.2 +target = 36.1.0 diff --git a/package.json b/package.json index 94c2bdfa3f5..463febca54d 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", "diff": "^7.0.0", - "electron": "35.2.2", + "electron": "^36.1.0", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index a406be06ef1..97528c16607 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -19,7 +19,7 @@ type ChannelToValidate = 'production' | 'beta' */ const ValidElectronVersions: Record = { production: '34.0.1', - beta: '35.2.2', + beta: '36.1.0', } // Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment. diff --git a/yarn.lock b/yarn.lock index 658487a8a41..b60f3a447a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,10 +2730,10 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@35.2.2: - version "35.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" - integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== +electron@^36.1.0: + version "36.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-36.1.0.tgz#9919b77e61cd1400acc6dd24f9db8451fba5f8eb" + integrity sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^22.7.7" From d1a71d8b11b97ee610150feffdb129cc9bf8123d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 7 May 2025 14:42:58 +0200 Subject: [PATCH 0379/1338] Disable Copilot API call on GHES --- app/src/lib/api.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index c4f0e96dc14..b47dfa97423 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -15,6 +15,7 @@ import { getEndpointVersion, isDotCom, isGHE, + isGHES, updateEndpointVersion, } from './endpoint-capabilities' import { @@ -2073,6 +2074,11 @@ export class API { * @returns Copilot license and API endpoint. */ public async fetchUserCopilotInfo(): Promise { + // Copilot is not available on GHES + if (isGHES(this.endpoint)) { + return undefined + } + const graphql = ` { viewer { @@ -2101,10 +2107,7 @@ export class API { isCopilotDesktopEnabled: viewer.isCopilotDesktopEnabled, } } catch (e) { - log.warn( - `fetchCopilotAPIEndpoint: failed with endpoint ${this.endpoint}`, - e - ) + log.warn(`fetchUserCopilotInfo: failed with endpoint ${this.endpoint}`, e) return undefined } } @@ -2182,8 +2185,8 @@ export class API { } catch (e) { const msg = `Unable to create push protection bypass. - Repository: ${owner}/${name} - Reason: ${reason} + Repository: ${owner}/${name} + Reason: ${reason} Placeholder Id: ${placeholderId}. Try again at: ${bypassURL}` From be9d774edc69e625ce07f702e6c8150c9c1f36e8 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 7 May 2025 13:52:36 -0400 Subject: [PATCH 0380/1338] Updated the discardChanges method to manually remove untracked file when not moving to trash. See #20428 --- app/src/lib/stores/app-store.ts | 1 + app/src/lib/stores/git-store.ts | 30 +++++++++++++++++++----------- app/test/unit/git-store-test.ts | 6 +++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 972e382bca5..d8eae180223 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5026,6 +5026,7 @@ export class AppStore extends TypedBaseStore { try { await gitStore.discardChanges( files, + repository.path, moveToTrash, askForConfirmationOnDiscardChangesPermanently ) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 23e03c2098d..509c3c90de6 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -97,7 +97,7 @@ import { IStatsStore } from '../stats' import { getTagsToPush, storeTagsToPush } from './helpers/tags-to-push-storage' import { DiffSelection, ITextDiff } from '../../models/diff' import { getDefaultBranch } from '../helpers/default-branch' -import { stat } from 'fs/promises' +import { rm, stat } from 'fs/promises' import { findForkedRemotesToPrune } from './helpers/find-forked-remotes-to-prune' import { findDefaultBranch } from '../find-default-branch' @@ -1505,6 +1505,7 @@ export class GitStore extends BaseStore { public async discardChanges( files: ReadonlyArray, + repoPath: string, moveToTrash: boolean = true, askForConfirmationOnDiscardChangesPermanently: boolean = false ): Promise { @@ -1521,17 +1522,24 @@ export class GitStore extends BaseStore { !foundSubmodule && moveToTrash ) { - // N.B. moveItemToTrash can take a fair bit of time which is why we're - // running it inside this work queue that spreads out the calls across - // as many animation frames as it needs to. - try { - await this.shell.moveItemToTrash( - Path.resolve(this.repository.path, file.path) - ) - } catch (e) { - if (askForConfirmationOnDiscardChangesPermanently) { - throw new DiscardChangesError(e, this.repository, files) + if (moveToTrash) { + // N.B. moveItemToTrash can take a fair bit of time which is why we're + // running it inside this work queue that spreads out the calls across + // as many animation frames as it needs to. + try { + await this.shell.moveItemToTrash( + Path.resolve(this.repository.path, file.path) + ) + } catch (e) { + if (askForConfirmationOnDiscardChangesPermanently) { + throw new DiscardChangesError(e, this.repository, files) + } } + } else if (file.status.kind === AppFileStatusKind.Untracked) { + // Removing untracked files as they will not be reset since they are + // no detected as changes in the index. We need to remove them + // manually. + rm(Path.join(repoPath, file.path)) } } diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index 972ca136310..c3711ecd6a9 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -71,7 +71,7 @@ describe('GitStore', () => { assert.equal(files[0].status.kind, AppFileStatusKind.Modified) // discard the LICENSE.md file - await gitStore.discardChanges([files[1]]) + await gitStore.discardChanges([files[1]], repo.path) status = await getStatusOrThrow(repo) files = status.workingDirectory.files @@ -98,7 +98,7 @@ describe('GitStore', () => { const filesToDiscard = statusBeforeDiscard.workingDirectory.files // discard the renamed file - await gitStore.discardChanges(filesToDiscard) + await gitStore.discardChanges(filesToDiscard, repo.path) const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files @@ -222,7 +222,7 @@ describe('GitStore', () => { let files = status.workingDirectory.files assert.equal(files.length, 1) - await gitStore.discardChanges([files[0]]) + await gitStore.discardChanges([files[0]], repo.path) status = await getStatusOrThrow(repo) files = status.workingDirectory.files From 227cb5a9066123bdb02611f4289ec11fde697bfc Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 7 May 2025 14:07:21 -0400 Subject: [PATCH 0381/1338] Remove upper moveToTrash check --- app/src/lib/stores/git-store.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 509c3c90de6..98217e9bda5 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -1517,11 +1517,7 @@ export class GitStore extends BaseStore { await queueWorkHigh(files, async file => { const foundSubmodule = submodules.some(s => s.path === file.path) - if ( - file.status.kind !== AppFileStatusKind.Deleted && - !foundSubmodule && - moveToTrash - ) { + if (file.status.kind !== AppFileStatusKind.Deleted && !foundSubmodule) { if (moveToTrash) { // N.B. moveItemToTrash can take a fair bit of time which is why we're // running it inside this work queue that spreads out the calls across From 78e8976c268d3b57ef42ad8b729af94beae703d2 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 8 May 2025 11:05:02 +0200 Subject: [PATCH 0382/1338] Delete unused `.call-to-action-bubble` CSS rules --- app/styles/ui/_diff-options.scss | 11 ----------- app/styles/ui/_tab-bar.scss | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/app/styles/ui/_diff-options.scss b/app/styles/ui/_diff-options.scss index df163d08c40..fd955b33c28 100644 --- a/app/styles/ui/_diff-options.scss +++ b/app/styles/ui/_diff-options.scss @@ -29,17 +29,6 @@ } } - .call-to-action-bubble { - font-weight: var(--font-weight-semibold); - display: inline-block; - font-size: var(--font-size-xs); - border: 1px solid var(--call-to-action-bubble-border-color); - color: var(--call-to-action-bubble-color); - padding: 1px 5px; - border-radius: var(--border-radius); - margin-left: var(--spacing-third); - } - label { display: flex; flex-direction: row; diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss index 31b86d5d415..070016bca46 100644 --- a/app/styles/ui/_tab-bar.scss +++ b/app/styles/ui/_tab-bar.scss @@ -79,17 +79,6 @@ &:focus-visible { outline-offset: -4px; } - - .call-to-action-bubble { - font-weight: var(--font-weight-semibold); - display: inline-block; - font-size: var(--font-size-xs); - border: 1px solid var(--call-to-action-bubble-border-color); - color: var(--call-to-action-bubble-color); - padding: 1px 5px; - border-radius: var(--border-radius); - margin-left: var(--spacing-third); - } } &.switch &-item { From 43836cf6b6180f27965e06ac52260b7cd259acb0 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 8 May 2025 11:05:17 +0200 Subject: [PATCH 0383/1338] Add NEW call to action for Copilot button --- app/src/ui/changes/commit-message.tsx | 1 + app/styles/ui/changes/_commit-message.scss | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 15e26ccc14d..b0f745e9dce 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -900,6 +900,7 @@ export class CommitMessage extends React.Component< } > + New ) diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index fa4750f8134..869eec08c81 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -107,6 +107,20 @@ &:focus { outline-offset: 2px; } + + width: auto !important; + } + + .call-to-action-bubble { + font-weight: var(--font-weight-semibold); + display: inline-block; + font-size: var(--font-size-xs); + border: 1px solid var(--call-to-action-bubble-border-color); + color: var(--call-to-action-bubble-color); + padding: 1px 5px; + border-radius: var(--border-radius); + margin-left: var(--spacing-third); + cursor: pointer; } .co-authors-toggle { From f6195f818756d177c62499578d5d4c904d19df30 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 8 May 2025 12:05:38 +0200 Subject: [PATCH 0384/1338] Show Copilot call-out if the disclaimer hasn't been shown --- app/src/ui/app.tsx | 3 +++ app/src/ui/changes/changes-list.tsx | 5 +++++ app/src/ui/changes/commit-message.tsx | 5 ++++- app/src/ui/changes/filter-changes-list.tsx | 5 +++++ app/src/ui/changes/sidebar.tsx | 4 ++++ app/src/ui/repository.tsx | 4 ++++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 884d1ca060d..9716c526c91 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -3382,6 +3382,9 @@ export class App extends React.Component { onCherryPick={this.startCherryPickWithoutBranch} pullRequestSuggestedNextAction={state.pullRequestSuggestedNextAction} showChangesFilter={state.showChangesFilter} + shouldShowGenerateCommitMessageCallOut={ + this.state.commitMessageGenerationDisclaimerLastSeen === null + } /> ) } else if (selectedState.type === SelectionType.CloningRepository) { diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index f1791934386..0b849b30b46 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -175,6 +175,7 @@ interface IChangesListProps { readonly availableWidth: number readonly isCommitting: boolean readonly isGeneratingCommitMessage: boolean + readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null readonly currentBranchProtected: boolean readonly currentRepoRulesInfo: RepoRulesInfo @@ -771,6 +772,7 @@ export class ChangesList extends React.Component< commitToAmend, currentBranchProtected, currentRepoRulesInfo: currentRepoRulesInfo, + shouldShowGenerateCommitMessageCallOut, } = this.props if (rebaseConflictState !== null) { @@ -838,6 +840,9 @@ export class ChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} + shouldShowGenerateCommitMessageCallOut={ + shouldShowGenerateCommitMessageCallOut + } commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index b0f745e9dce..f4ddbfb32dc 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -107,6 +107,7 @@ interface ICommitMessageProps { readonly autocompletionProviders: ReadonlyArray> readonly isCommitting?: boolean readonly isGeneratingCommitMessage?: boolean + readonly shouldShowGenerateCommitMessageCallOut?: boolean readonly commitToAmend: Commit | null readonly placeholder: string readonly prepopulateCommitSummary: boolean @@ -900,7 +901,9 @@ export class CommitMessage extends React.Component< } > - New + {this.props.shouldShowGenerateCommitMessageCallOut && ( + New + )} ) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 03b0665f91c..f637f0646e7 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -166,6 +166,7 @@ interface IFilterChangesListProps { readonly availableWidth: number readonly isCommitting: boolean readonly isGeneratingCommitMessage: boolean + readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null readonly currentBranchProtected: boolean readonly currentRepoRulesInfo: RepoRulesInfo @@ -890,6 +891,7 @@ export class FilterChangesList extends React.Component< commitToAmend, currentBranchProtected, currentRepoRulesInfo: currentRepoRulesInfo, + shouldShowGenerateCommitMessageCallOut, } = this.props if (rebaseConflictState !== null) { @@ -962,6 +964,9 @@ export class FilterChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} isGeneratingCommitMessage={isGeneratingCommitMessage} + shouldShowGenerateCommitMessageCallOut={ + shouldShowGenerateCommitMessageCallOut + } commitToAmend={commitToAmend} showCoAuthoredBy={this.props.showCoAuthoredBy} coAuthors={this.props.coAuthors} diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 5ad3e53782b..9ddb380b11f 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -57,6 +57,7 @@ interface IChangesSidebarProps { readonly availableWidth: number readonly isCommitting: boolean readonly isGeneratingCommitMessage: boolean + readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null readonly isPushPullFetchInProgress: boolean // Used in receiveProps, no-unused-prop-types doesn't know that @@ -439,6 +440,9 @@ export class ChangesSidebar extends React.Component { onIgnorePattern={this.onIgnorePattern} isCommitting={this.props.isCommitting} isGeneratingCommitMessage={this.props.isGeneratingCommitMessage} + shouldShowGenerateCommitMessageCallOut={ + this.props.shouldShowGenerateCommitMessageCallOut + } commitToAmend={this.props.commitToAmend} showCoAuthoredBy={showCoAuthoredBy} coAuthors={coAuthors} diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 98815f9a889..135df802cce 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -59,6 +59,7 @@ interface IRepositoryViewProps { readonly commitSpellcheckEnabled: boolean readonly showCommitLengthWarning: boolean readonly accounts: ReadonlyArray + readonly shouldShowGenerateCommitMessageCallOut: boolean /** * A value indicating whether or not the application is currently presenting @@ -249,6 +250,9 @@ export class RepositoryView extends React.Component< gitHubUserStore={this.props.gitHubUserStore} isCommitting={this.props.state.isCommitting} isGeneratingCommitMessage={this.props.state.isGeneratingCommitMessage} + shouldShowGenerateCommitMessageCallOut={ + this.props.shouldShowGenerateCommitMessageCallOut + } commitToAmend={this.props.state.commitToAmend} isPushPullFetchInProgress={this.props.state.isPushPullFetchInProgress} focusCommitMessage={this.props.focusCommitMessage} From 1a83f5b0c894b1d2ee3c28e659cd555c654d35fc Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 8 May 2025 12:30:08 +0200 Subject: [PATCH 0385/1338] Show Copilot call-out if it was never used Added a new state property and logic to track whether the commit message generation button has been clicked. This includes updates to the app state, store, and UI to ensure the button click is properly recorded and used to conditionally display the callout. --- app/src/lib/app-state.ts | 2 ++ app/src/lib/stores/app-store.ts | 23 ++++++++++++++++++++++- app/src/ui/app.tsx | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 0da248329bb..9b47fb2d810 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -377,6 +377,8 @@ export interface IAppState { readonly commitMessageGenerationDisclaimerLastSeen: number | null + readonly commitMessageGenerationButtonClicked: boolean + /** Whether the changes filter is shown */ readonly showChangesFilter: boolean } diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 972e382bca5..8ff48563f00 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -452,9 +452,12 @@ export const underlineLinksDefault = true export const showDiffCheckMarksDefault = true export const showDiffCheckMarksKey = 'diff-check-marks-visible' -export const commitMessageGenerationDisclaimerLastSeenKey = +const commitMessageGenerationDisclaimerLastSeenKey = 'commit-message-generation-disclaimer-last-seen' +const commitMessageGenerationButtonClickedKey = + 'commit-message-generation-button-clicked' + const showChangesFilterKey = 'show-changes-filter' export class AppStore extends TypedBaseStore { @@ -608,6 +611,7 @@ export class AppStore extends TypedBaseStore { private underlineLinks: boolean = underlineLinksDefault private commitMessageGenerationDisclaimerLastSeen: number | null = null + private commitMessageGenerationButtonClicked: boolean = false private showChangesFilter: boolean = false @@ -1105,6 +1109,8 @@ export class AppStore extends TypedBaseStore { updateState: updateStore.state, commitMessageGenerationDisclaimerLastSeen: this.commitMessageGenerationDisclaimerLastSeen, + commitMessageGenerationButtonClicked: + this.commitMessageGenerationButtonClicked, showChangesFilter: this.showChangesFilter, } } @@ -2335,6 +2341,11 @@ export class AppStore extends TypedBaseStore { this.commitMessageGenerationDisclaimerLastSeen = getNumber(commitMessageGenerationDisclaimerLastSeenKey) ?? null + this.commitMessageGenerationButtonClicked = getBoolean( + commitMessageGenerationButtonClickedKey, + false + ) + this.showChangesFilter = getBoolean(showChangesFilterKey, true) this.emitUpdateNow() @@ -5435,6 +5446,14 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } + public _setCommitMessageGenerationButtonClicked(): void { + if (!this.commitMessageGenerationButtonClicked) { + this.commitMessageGenerationButtonClicked = true + setBoolean(commitMessageGenerationButtonClickedKey, true) + this.emitUpdate() + } + } + public async _generateCommitMessage( repository: Repository, filesSelected: ReadonlyArray @@ -5445,6 +5464,8 @@ export class AppStore extends TypedBaseStore { return false } + this._setCommitMessageGenerationButtonClicked() + if ( !this.commitMessageGenerationDisclaimerLastSeen || offsetFromNow(-30, 'days') > diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 9716c526c91..cf8f2469f7f 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -3383,7 +3383,7 @@ export class App extends React.Component { pullRequestSuggestedNextAction={state.pullRequestSuggestedNextAction} showChangesFilter={state.showChangesFilter} shouldShowGenerateCommitMessageCallOut={ - this.state.commitMessageGenerationDisclaimerLastSeen === null + !this.state.commitMessageGenerationButtonClicked } /> ) From 8f00083d02d6f480a0238715692045cfd5c23fa3 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 8 May 2025 09:32:13 -0400 Subject: [PATCH 0386/1338] Update git-store.ts --- app/src/lib/stores/git-store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 98217e9bda5..8d272220a60 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -1535,7 +1535,7 @@ export class GitStore extends BaseStore { // Removing untracked files as they will not be reset since they are // no detected as changes in the index. We need to remove them // manually. - rm(Path.join(repoPath, file.path)) + await rm(Path.join(repoPath, file.path)) } } From 1b8f37d11d3681a1d091d3cc200905d18498f082 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 8 May 2025 10:03:33 -0400 Subject: [PATCH 0387/1338] Also rm if users have selected to always continue anyway on trash fail --- app/src/lib/stores/git-store.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 8d272220a60..7b10091d975 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -1530,10 +1530,17 @@ export class GitStore extends BaseStore { if (askForConfirmationOnDiscardChangesPermanently) { throw new DiscardChangesError(e, this.repository, files) } + + // The user has received the confirmation dialog in past and has + // chosen to always discard the changes permanently if trash failes. + // We need to remove the file manually. + if (file.status.kind === AppFileStatusKind.Untracked) { + await rm(Path.join(repoPath, file.path)) + } } - } else if (file.status.kind === AppFileStatusKind.Untracked) { - // Removing untracked files as they will not be reset since they are - // no detected as changes in the index. We need to remove them + } else if (moveToTrash === false) { + // The user has received the confirmation dialog and has chosen to + // discard the changes permanently. We need to remove the file // manually. await rm(Path.join(repoPath, file.path)) } From 49f92fddbfd1bcf648e500dda61ad02cfc4da8c0 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 8 May 2025 10:14:44 -0400 Subject: [PATCH 0388/1338] Use this.repository.path --- app/src/lib/stores/app-store.ts | 1 - app/src/lib/stores/git-store.ts | 7 ++++--- app/test/unit/git-store-test.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index d8eae180223..972e382bca5 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -5026,7 +5026,6 @@ export class AppStore extends TypedBaseStore { try { await gitStore.discardChanges( files, - repository.path, moveToTrash, askForConfirmationOnDiscardChangesPermanently ) diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 7b10091d975..fb13690856d 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -1505,7 +1505,6 @@ export class GitStore extends BaseStore { public async discardChanges( files: ReadonlyArray, - repoPath: string, moveToTrash: boolean = true, askForConfirmationOnDiscardChangesPermanently: boolean = false ): Promise { @@ -1535,14 +1534,16 @@ export class GitStore extends BaseStore { // chosen to always discard the changes permanently if trash failes. // We need to remove the file manually. if (file.status.kind === AppFileStatusKind.Untracked) { - await rm(Path.join(repoPath, file.path)) + await rm(Path.join(this.repository.path, file.path)) } } } else if (moveToTrash === false) { // The user has received the confirmation dialog and has chosen to // discard the changes permanently. We need to remove the file // manually. - await rm(Path.join(repoPath, file.path)) + if (file.status.kind === AppFileStatusKind.Untracked) { + await rm(Path.join(this.repository.path, file.path)) + } } } diff --git a/app/test/unit/git-store-test.ts b/app/test/unit/git-store-test.ts index c3711ecd6a9..972ca136310 100644 --- a/app/test/unit/git-store-test.ts +++ b/app/test/unit/git-store-test.ts @@ -71,7 +71,7 @@ describe('GitStore', () => { assert.equal(files[0].status.kind, AppFileStatusKind.Modified) // discard the LICENSE.md file - await gitStore.discardChanges([files[1]], repo.path) + await gitStore.discardChanges([files[1]]) status = await getStatusOrThrow(repo) files = status.workingDirectory.files @@ -98,7 +98,7 @@ describe('GitStore', () => { const filesToDiscard = statusBeforeDiscard.workingDirectory.files // discard the renamed file - await gitStore.discardChanges(filesToDiscard, repo.path) + await gitStore.discardChanges(filesToDiscard) const status = await getStatusOrThrow(repo) const files = status.workingDirectory.files @@ -222,7 +222,7 @@ describe('GitStore', () => { let files = status.workingDirectory.files assert.equal(files.length, 1) - await gitStore.discardChanges([files[0]], repo.path) + await gitStore.discardChanges([files[0]]) status = await getStatusOrThrow(repo) files = status.workingDirectory.files From eae90db80af8c9402ea395728532421090445c57 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 9 May 2025 11:17:47 +0200 Subject: [PATCH 0389/1338] Add documentation --- app/styles/ui/changes/_commit-message.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 869eec08c81..13254574328 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -108,6 +108,8 @@ outline-offset: 2px; } + // Override default button width for as long as we have the call-to-action + // bubble in the button. DELETE AFTER THE CALL-TO-ACTION BUBBLE IS REMOVED width: auto !important; } From 961fe35a14c7e0d00eff51ced50ae2702d3e15ce Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 9 May 2025 14:50:41 +0200 Subject: [PATCH 0390/1338] Fix semantic HTML in OpenThankYouCard component Replaced a element with a
    element to properly handle the onSubmit event in the OpenThankYouCard component. This ensures better semantic HTML and improves accessibility. --- app/src/ui/banners/open-thank-you-card.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/banners/open-thank-you-card.tsx b/app/src/ui/banners/open-thank-you-card.tsx index 4eeae6e89af..e15f1dadfee 100644 --- a/app/src/ui/banners/open-thank-you-card.tsx +++ b/app/src/ui/banners/open-thank-you-card.tsx @@ -21,7 +21,7 @@ export class OpenThankYouCard extends React.Component< public render() { return ( - + The Desktop team would like to thank you for your contributions.{' '} Open Your Card @@ -40,7 +40,7 @@ export class OpenThankYouCard extends React.Component< emoji={this.props.emoji} renderUrlsAsLinks={true} /> - +
    ) } From eb74a624b98869a471e983d3f1b493f15b0db2b0 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 11:37:44 -0400 Subject: [PATCH 0391/1338] Add secret scanning metrics to stats store/database Introduced new fields in `IDailyMeasures` and `DefaultDailyMeasures` to track metrics related to secret scanning, including counts for blocked pushes, detected secrets, bypass reasons, and remediation actions. This enhances the ability to monitor and analyze secret scanning usage and user interactions. --- app/src/lib/stats/stats-database.ts | 24 ++++++++++++++++++++++++ app/src/lib/stats/stats-store.ts | 8 ++++++++ 2 files changed, 32 insertions(+) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 511f5880db6..31a1985dd79 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -621,6 +621,30 @@ export interface IDailyMeasures { /** The number of times a user used the verbatim commit message generated by Copilot */ readonly generateCommitMessageUsedVerbatimCount: number + + /** The number of times a push was blocked by secret scanning */ + readonly pushBlockedBySecretScanningCount: number + + /** The number of secrets detected on push count */ + readonly secretsDetectedOnPushCount: number + + /** The number of secrets detected on push bypassed */ + readonly secretsDetectedOnPushBypassedCount: number + + /** The number of types the user bypassed a secret with the reason of "False Positive" */ + readonly secretsDetectedOnPushBypassedAsFalsePositiveCount: number + + /** The number of types the user bypassed a secret with the reason of "Used in Test" */ + readonly secretsDetectedOnPushBypassedAsUsedInTestCount: number + + /** The number of types the user bypassed a secret with the reason of "Will Fix Later" */ + readonly secretsDetectedOnPushBypassedAsWillFixLaterCount: number + + /** The number of secrets detected on push where the delegated bypass linked was clicked */ + readonly secretsDetectedOnPushDelegatedBypassLinkClickedCount: number + + /** The number of times the user clicked on the secret remediation instructions link */ + readonly secretRemediationInstructionsLinkClickedCount: number } export class StatsDatabase extends Dexie { diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index 41cbb918c37..0e9882e7b91 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -247,6 +247,14 @@ const DefaultDailyMeasures: IDailyMeasures = { generateCommitMessageButtonClickCount: 0, generateCommitMessageCount: 0, generateCommitMessageUsedVerbatimCount: 0, + pushBlockedBySecretScanningCount: 0, + secretsDetectedOnPushCount: 0, + secretsDetectedOnPushBypassedCount: 0, + secretsDetectedOnPushBypassedAsFalsePositiveCount: 0, + secretsDetectedOnPushBypassedAsUsedInTestCount: 0, + secretsDetectedOnPushBypassedAsWillFixLaterCount: 0, + secretsDetectedOnPushDelegatedBypassLinkClickedCount: 0, + secretRemediationInstructionsLinkClickedCount: 0, } // A subtype of IDailyMeasures filtered to contain only its numeric properties From 8c9c69c17ed16efa35020b8dc23d2e5d700b6c39 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 11:59:34 -0400 Subject: [PATCH 0392/1338] Enhance secret scanning with metrics and link tracking Added metrics tracking for secret scanning events, including bypass and remediation actions. Exported BypassReason enum for broader use and updated dialogs to handle link click events for delegated bypass and remediation instructions. These changes improve monitoring and user interaction with secret scanning features. --- app/src/ui/app.tsx | 41 +++++++++++++++++++ app/src/ui/dispatcher/error-handlers.ts | 3 ++ .../bypass-push-protection-dialog.tsx | 2 +- .../push-protection-error-dialog.tsx | 12 +++++- 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index cf8f2469f7f..72a20aa5e0b 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -195,6 +195,7 @@ import { GenerateCommitMessageDisclaimer } from './generate-commit-message/gener import { IAPICreatePushProtectionBypassResponse } from '../lib/api' import { BypassPushProtectionDialog, + BypassReason, BypassReasonType, } from './secret-scanning/bypass-push-protection-dialog' @@ -2519,6 +2520,10 @@ export class App extends React.Component { @@ -2562,6 +2567,18 @@ export class App extends React.Component { } } + private onSecretDelegatedBypassLinkClick = () => { + this.props.dispatcher.incrementMetric( + 'secretsDetectedOnPushDelegatedBypassLinkClickedCount' + ) + } + + private onSecretRemediationInstructionsLinkClick = () => { + this.props.dispatcher.incrementMetric( + 'secretRemediationInstructionsLinkClickedCount' + ) + } + private onDismissBypassPushProtection = ( popup: string, popupDismiss: () => void @@ -2600,6 +2617,7 @@ export class App extends React.Component { ) => { this.bypassPushProtection(secret, reason) .then(response => { + this.recordSecretBypassStats(reason) resolve(response) }) .catch(error => { @@ -2618,6 +2636,29 @@ export class App extends React.Component { ) } + private recordSecretBypassStats = (reason: BypassReasonType) => { + this.props.dispatcher.incrementMetric('secretsDetectedOnPushBypassedCount') + switch (reason) { + case BypassReason.FalsePositive: + this.props.dispatcher.incrementMetric( + 'secretsDetectedOnPushBypassedAsFalsePositiveCount' + ) + break + case BypassReason.UsedInTests: + this.props.dispatcher.incrementMetric( + 'secretsDetectedOnPushBypassedAsUsedInTestCount' + ) + break + case BypassReason.WillFixLater: + this.props.dispatcher.incrementMetric( + 'secretsDetectedOnPushBypassedAsWillFixLaterCount' + ) + break + default: + return assertNever(reason, `Unknown Bypass reason: ${reason}`) + } + } + private bypassPushProtection = ( secret: ISecretScanResult, reason: BypassReasonType diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts index 0640dc6764f..1dbf54d2115 100644 --- a/app/src/ui/dispatcher/error-handlers.ts +++ b/app/src/ui/dispatcher/error-handlers.ts @@ -687,6 +687,9 @@ export async function secretScanningPushProtectionErrorHandler( const remoteMessage = getRemoteMessage(coerceToString(gitError.result.stderr)) const secrets = extractSecretScanningResults(remoteMessage) + dispatcher.incrementMetric('pushBlockedBySecretScanningCount') + dispatcher.incrementMetric('secretsDetectedOnPushCount', secrets.length) + dispatcher.showPopup({ type: PopupType.PushProtectionError, secrets, diff --git a/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx index 49857318f3b..af248e221be 100644 --- a/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx +++ b/app/src/ui/secret-scanning/bypass-push-protection-dialog.tsx @@ -4,7 +4,7 @@ import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { ISecretScanResult } from './push-protection-error-dialog' import { VerticalSegmentedControl } from '../lib/vertical-segmented-control' -enum BypassReason { +export enum BypassReason { FalsePositive = 'false_positive', UsedInTests = 'used_in_tests', WillFixLater = 'will_fix_later', diff --git a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx index f2f50966d06..0f3bf820336 100644 --- a/app/src/ui/secret-scanning/push-protection-error-dialog.tsx +++ b/app/src/ui/secret-scanning/push-protection-error-dialog.tsx @@ -34,10 +34,16 @@ export interface ISecretScanResult { interface IPushProtectionErrorDialogProps { /** The secrets that were detected on push */ readonly secrets: ReadonlyArray + /** The function to call when the user clicks the bypass button */ readonly bypassPushProtection: ( secret: ISecretScanResult ) => Promise + + readonly onDelegatedBypassLinkClick: () => void + + readonly onRemediationInstructionsLinkClick: () => void + readonly onDismissed: () => void } @@ -84,7 +90,10 @@ export class PushProtectionErrorDialog extends React.Component<

    Allowing secrets risks exposure. Consider{' '} - + removing the secret from your commit and commit history.

    @@ -134,6 +143,7 @@ export class PushProtectionErrorDialog extends React.Component< Bypass From 7b6e9af74073cda648a592acbb0ddf1be47c1a7b Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 12:01:00 -0400 Subject: [PATCH 0393/1338] Update stats-database.ts --- app/src/lib/stats/stats-database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 31a1985dd79..fea34aa2cee 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -625,7 +625,7 @@ export interface IDailyMeasures { /** The number of times a push was blocked by secret scanning */ readonly pushBlockedBySecretScanningCount: number - /** The number of secrets detected on push count */ + /** The number of times a secrets is detected on push count */ readonly secretsDetectedOnPushCount: number /** The number of secrets detected on push bypassed */ From a482bcc342fae1e2c69aebd0c74ae5cdcd280d06 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 12:54:29 -0400 Subject: [PATCH 0394/1338] Update app/src/lib/stats/stats-database.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/src/lib/stats/stats-database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index fea34aa2cee..fbc6136ea14 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -625,7 +625,7 @@ export interface IDailyMeasures { /** The number of times a push was blocked by secret scanning */ readonly pushBlockedBySecretScanningCount: number - /** The number of times a secrets is detected on push count */ + /** The number of times a secret is detected on push */ readonly secretsDetectedOnPushCount: number /** The number of secrets detected on push bypassed */ From 37f299e9ce391746c4b8c3730f9f6b82e4edd762 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 12:54:41 -0400 Subject: [PATCH 0395/1338] Update app/src/lib/stats/stats-database.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/src/lib/stats/stats-database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index fbc6136ea14..b92ffbe1212 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -628,7 +628,7 @@ export interface IDailyMeasures { /** The number of times a secret is detected on push */ readonly secretsDetectedOnPushCount: number - /** The number of secrets detected on push bypassed */ + /** The number of secrets detected on push that were bypassed */ readonly secretsDetectedOnPushBypassedCount: number /** The number of types the user bypassed a secret with the reason of "False Positive" */ From 3d0d7823f41de1d85b04cb7679f39021c7f703d2 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 12:54:53 -0400 Subject: [PATCH 0396/1338] Update app/src/lib/stats/stats-database.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/src/lib/stats/stats-database.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index b92ffbe1212..3bdbdf75dc9 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -631,13 +631,13 @@ export interface IDailyMeasures { /** The number of secrets detected on push that were bypassed */ readonly secretsDetectedOnPushBypassedCount: number - /** The number of types the user bypassed a secret with the reason of "False Positive" */ + /** The number of times the user bypassed a secret with the reason of "False Positive" */ readonly secretsDetectedOnPushBypassedAsFalsePositiveCount: number - /** The number of types the user bypassed a secret with the reason of "Used in Test" */ + /** The number of times the user bypassed a secret with the reason of "Used in Test" */ readonly secretsDetectedOnPushBypassedAsUsedInTestCount: number - /** The number of types the user bypassed a secret with the reason of "Will Fix Later" */ + /** The number of times the user bypassed a secret with the reason of "Will Fix Later" */ readonly secretsDetectedOnPushBypassedAsWillFixLaterCount: number /** The number of secrets detected on push where the delegated bypass linked was clicked */ From 618d0b73adbc256aebea46ec562d4572daddcac2 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 12 May 2025 12:55:04 -0400 Subject: [PATCH 0397/1338] Update app/src/lib/stats/stats-database.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/src/lib/stats/stats-database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 3bdbdf75dc9..56bc782663e 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -640,7 +640,7 @@ export interface IDailyMeasures { /** The number of times the user bypassed a secret with the reason of "Will Fix Later" */ readonly secretsDetectedOnPushBypassedAsWillFixLaterCount: number - /** The number of secrets detected on push where the delegated bypass linked was clicked */ + /** The number of secrets detected on push where the delegated bypass link was clicked */ readonly secretsDetectedOnPushDelegatedBypassLinkClickedCount: number /** The number of times the user clicked on the secret remediation instructions link */ From 606757c82bd4bf267f677c718f43d9832335c776 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 14 May 2025 10:47:33 +0200 Subject: [PATCH 0398/1338] Bump changelog and version to 3.4.20-beta2 --- app/package.json | 2 +- changelog.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 91e739efe3a..9a1ee801205 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.20-beta1", + "version": "3.4.20-beta2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index ebb2ce1acbb..86684df2b2c 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,12 @@ { "releases": { + "3.4.20-beta2": [ + "[Fixed] Fix spacing of text in \"Thank You\" banner - #20411", + "[Fixed] Radio inputs include the area around the radio button as a click surface. - #20404", + "[Fixed] Checking or unchecking lots of files is fast once again - #20429", + "[Improved] Upgrade Electron to v36.1.0 - #20450", + "[Improved] Users can turn off the filter in the changes list in the `View` menu - #20303" + ], "3.4.20-beta1": [ "[Added] Handled GitHub Secret Scanning push protection errors in a friendly dialog with the ability to bypass blocked non-approval requiring secrets - #20386, #20387, #20391", "[Fixed] Fix path used to create repository on existing non-Git directory - #20400", From ee66d129bd9ba6e1c9fe531151b39cf8794b3a5a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 14 May 2025 11:19:25 +0200 Subject: [PATCH 0399/1338] Use strict 36.1.0 version for electron --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 463febca54d..798fdc51186 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", "diff": "^7.0.0", - "electron": "^36.1.0", + "electron": "36.1.0", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", diff --git a/yarn.lock b/yarn.lock index b60f3a447a5..65aedf5ef8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,7 +2730,7 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@^36.1.0: +electron@36.1.0: version "36.1.0" resolved "https://registry.yarnpkg.com/electron/-/electron-36.1.0.tgz#9919b77e61cd1400acc6dd24f9db8451fba5f8eb" integrity sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg== From 3ac640d239c644650dd0ed65a0ccd7286854d103 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 19 May 2025 12:44:35 +0200 Subject: [PATCH 0400/1338] Update gitignore submodule reference Updated the submodule reference for the gitignore file in the app/static/common directory to point to a new commit. --- app/static/common/gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/static/common/gitignore b/app/static/common/gitignore index 4488915eec0..81ceb66b6b9 160000 --- a/app/static/common/gitignore +++ b/app/static/common/gitignore @@ -1 +1 @@ -Subproject commit 4488915eec0b3a45b5c63ead28f286819c0917de +Subproject commit 81ceb66b6b9d32324c98fe1c51f27d2eb9451865 From ee30f5793c00edd0a8e1ac220862505c975a10f7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 14 May 2025 13:50:47 +0200 Subject: [PATCH 0401/1338] Add top and literal pathspec magic to prevent realpath traversing into network share --- app/src/lib/git/diff.ts | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 127685a1cef..277595dc67d 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -128,14 +128,14 @@ export async function getCommitDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const { stdout } = await git(args, repository.path, 'getCommitDiff', { @@ -167,14 +167,14 @@ export async function getBranchMergeBaseDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const result = await git(args, repository.path, 'getBranchMergeBaseDiff', { @@ -212,14 +212,14 @@ export async function getCommitRangeDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const result = await git(args, repository.path, 'getCommitsDiff', { @@ -373,7 +373,7 @@ export async function getWorkingDirectoryDiff( // citation in source: // https://github.com/git/git/blob/1f66975deb8402131fbf7c14330d0c7cdebaeaa2/diff-no-index.c#L300 successExitCodes.add(1) - args.push('--no-index', '--', '/dev/null', file.path) + args.push('--no-index', '--', '/dev/null', relativePathSpec(file.path)) } else if (file.status.kind === AppFileStatusKind.Renamed) { // NB: Technically this is incorrect, the best kind of incorrect. // In order to show exactly what will end up in the commit we should @@ -382,9 +382,9 @@ export async function getWorkingDirectoryDiff( // already staged to the renamed file which differs from our other diffs. // The closest I got to that was running hash-object and then using // git diff but that seems a bit excessive. - args.push('--', file.path) + args.push('--', relativePathSpec(file.path)) } else { - args.push('HEAD', '--', file.path) + args.push('HEAD', '--', relativePathSpec(file.path)) } const { stdout, stderr } = await git( @@ -831,3 +831,11 @@ async function getFilesUsingBinaryMergeDriver( .filter(x => x.attr === 'merge' && x.value === 'binary') .map(x => x.path) } + +// Prefix a path with `:(top,literal)` to ensure that git treats it as a literal +// path and not a glob pattern. This is important for paths that contain +// special characters like `*`, `?`, or `[` which would otherwise be treated as +// glob patterns and for paths that appear to be absolute paths on some platforms +// and not others. +// See https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top +const relativePathSpec = (path: string) => `:(top,literal)${path}` From 587887cf99564e7447053dd0c6ef9431fea1096c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 14 May 2025 13:50:47 +0200 Subject: [PATCH 0402/1338] Add top and literal pathspec magic to prevent realpath traversing into network share --- app/src/lib/git/diff.ts | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 127685a1cef..277595dc67d 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -128,14 +128,14 @@ export async function getCommitDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const { stdout } = await git(args, repository.path, 'getCommitDiff', { @@ -167,14 +167,14 @@ export async function getBranchMergeBaseDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const result = await git(args, repository.path, 'getBranchMergeBaseDiff', { @@ -212,14 +212,14 @@ export async function getCommitRangeDiff( '-z', '--no-color', '--', - file.path, + relativePathSpec(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(file.status.oldPath) + args.push(relativePathSpec(file.status.oldPath)) } const result = await git(args, repository.path, 'getCommitsDiff', { @@ -373,7 +373,7 @@ export async function getWorkingDirectoryDiff( // citation in source: // https://github.com/git/git/blob/1f66975deb8402131fbf7c14330d0c7cdebaeaa2/diff-no-index.c#L300 successExitCodes.add(1) - args.push('--no-index', '--', '/dev/null', file.path) + args.push('--no-index', '--', '/dev/null', relativePathSpec(file.path)) } else if (file.status.kind === AppFileStatusKind.Renamed) { // NB: Technically this is incorrect, the best kind of incorrect. // In order to show exactly what will end up in the commit we should @@ -382,9 +382,9 @@ export async function getWorkingDirectoryDiff( // already staged to the renamed file which differs from our other diffs. // The closest I got to that was running hash-object and then using // git diff but that seems a bit excessive. - args.push('--', file.path) + args.push('--', relativePathSpec(file.path)) } else { - args.push('HEAD', '--', file.path) + args.push('HEAD', '--', relativePathSpec(file.path)) } const { stdout, stderr } = await git( @@ -831,3 +831,11 @@ async function getFilesUsingBinaryMergeDriver( .filter(x => x.attr === 'merge' && x.value === 'binary') .map(x => x.path) } + +// Prefix a path with `:(top,literal)` to ensure that git treats it as a literal +// path and not a glob pattern. This is important for paths that contain +// special characters like `*`, `?`, or `[` which would otherwise be treated as +// glob patterns and for paths that appear to be absolute paths on some platforms +// and not others. +// See https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top +const relativePathSpec = (path: string) => `:(top,literal)${path}` From 8b5c6bc5155896177018f1c7edf596d42df7d888 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 10:16:42 +0200 Subject: [PATCH 0403/1338] Don't use pathspec magic for untracked files --- app/src/lib/git/diff.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 277595dc67d..f3f9c9378e9 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -373,7 +373,7 @@ export async function getWorkingDirectoryDiff( // citation in source: // https://github.com/git/git/blob/1f66975deb8402131fbf7c14330d0c7cdebaeaa2/diff-no-index.c#L300 successExitCodes.add(1) - args.push('--no-index', '--', '/dev/null', relativePathSpec(file.path)) + args.push('--no-index', '--', '/dev/null', file.path) } else if (file.status.kind === AppFileStatusKind.Renamed) { // NB: Technically this is incorrect, the best kind of incorrect. // In order to show exactly what will end up in the commit we should From 413fe3d43c70d00504b13f0c8eade52fbc75504b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 10:16:42 +0200 Subject: [PATCH 0404/1338] Don't use pathspec magic for untracked files --- app/src/lib/git/diff.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index 277595dc67d..f3f9c9378e9 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -373,7 +373,7 @@ export async function getWorkingDirectoryDiff( // citation in source: // https://github.com/git/git/blob/1f66975deb8402131fbf7c14330d0c7cdebaeaa2/diff-no-index.c#L300 successExitCodes.add(1) - args.push('--no-index', '--', '/dev/null', relativePathSpec(file.path)) + args.push('--no-index', '--', '/dev/null', file.path) } else if (file.status.kind === AppFileStatusKind.Renamed) { // NB: Technically this is incorrect, the best kind of incorrect. // In order to show exactly what will end up in the commit we should From a2ce5f9269df18807edad5d21c3b0e302e81289d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 12:44:28 +0200 Subject: [PATCH 0405/1338] Only apply prefix to absolute paths --- app/src/lib/git/diff.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index f3f9c9378e9..8d470bc31d7 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -36,6 +36,7 @@ import { createLogParser } from './git-delimiter-parser' import { enableImagePreviewsForDDSFiles } from '../feature-flag' import { unstageAll } from './reset' import { stageFiles } from './update-index' +import { isAbsolute } from 'path' /** * V8 has a limit on the size of string it can create (~256MB), and unless we want to @@ -128,14 +129,14 @@ export async function getCommitDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const { stdout } = await git(args, repository.path, 'getCommitDiff', { @@ -167,14 +168,14 @@ export async function getBranchMergeBaseDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const result = await git(args, repository.path, 'getBranchMergeBaseDiff', { @@ -212,14 +213,14 @@ export async function getCommitRangeDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const result = await git(args, repository.path, 'getCommitsDiff', { @@ -382,9 +383,9 @@ export async function getWorkingDirectoryDiff( // already staged to the renamed file which differs from our other diffs. // The closest I got to that was running hash-object and then using // git diff but that seems a bit excessive. - args.push('--', relativePathSpec(file.path)) + args.push('--', ensureRelativePath(file.path)) } else { - args.push('HEAD', '--', relativePathSpec(file.path)) + args.push('HEAD', '--', ensureRelativePath(file.path)) } const { stdout, stderr } = await git( @@ -832,10 +833,9 @@ async function getFilesUsingBinaryMergeDriver( .map(x => x.path) } -// Prefix a path with `:(top,literal)` to ensure that git treats it as a literal -// path and not a glob pattern. This is important for paths that contain -// special characters like `*`, `?`, or `[` which would otherwise be treated as -// glob patterns and for paths that appear to be absolute paths on some platforms -// and not others. -// See https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top -const relativePathSpec = (path: string) => `:(top,literal)${path}` +// Prefix absolute path with `:(top,literal)` to ensure that git treats it as a +// literal path. This is important for paths that appear to be absolute paths on +// some platforms and not others. See +// https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top +const ensureRelativePath = (path: string) => + isAbsolute(path) ? `:(top,literal)${path}` : path From d2e01c602d04d4858517c603c21609021caa2e98 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 12:46:10 +0200 Subject: [PATCH 0406/1338] Version bump and changelog entry --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index ed3796ee0f2..1e674bfeb5d 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.19", + "version": "3.4.20", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index ada65f426ed..35ae18ade71 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.4.20": [ + "[Fixed] Prevent network share traversal with renamed UNC paths on Windows" + ], "3.4.19": [ "[New] Users can filter the changed files list - #20220", "[New] Add support for multiple enterprise accounts - #20227", From 8d4152fec12b209664eea86bb5069c68e92a8825 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 12:44:28 +0200 Subject: [PATCH 0407/1338] Only apply prefix to absolute paths --- app/src/lib/git/diff.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/lib/git/diff.ts b/app/src/lib/git/diff.ts index f3f9c9378e9..8d470bc31d7 100644 --- a/app/src/lib/git/diff.ts +++ b/app/src/lib/git/diff.ts @@ -36,6 +36,7 @@ import { createLogParser } from './git-delimiter-parser' import { enableImagePreviewsForDDSFiles } from '../feature-flag' import { unstageAll } from './reset' import { stageFiles } from './update-index' +import { isAbsolute } from 'path' /** * V8 has a limit on the size of string it can create (~256MB), and unless we want to @@ -128,14 +129,14 @@ export async function getCommitDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const { stdout } = await git(args, repository.path, 'getCommitDiff', { @@ -167,14 +168,14 @@ export async function getBranchMergeBaseDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const result = await git(args, repository.path, 'getBranchMergeBaseDiff', { @@ -212,14 +213,14 @@ export async function getCommitRangeDiff( '-z', '--no-color', '--', - relativePathSpec(file.path), + ensureRelativePath(file.path), ] if ( file.status.kind === AppFileStatusKind.Renamed || file.status.kind === AppFileStatusKind.Copied ) { - args.push(relativePathSpec(file.status.oldPath)) + args.push(ensureRelativePath(file.status.oldPath)) } const result = await git(args, repository.path, 'getCommitsDiff', { @@ -382,9 +383,9 @@ export async function getWorkingDirectoryDiff( // already staged to the renamed file which differs from our other diffs. // The closest I got to that was running hash-object and then using // git diff but that seems a bit excessive. - args.push('--', relativePathSpec(file.path)) + args.push('--', ensureRelativePath(file.path)) } else { - args.push('HEAD', '--', relativePathSpec(file.path)) + args.push('HEAD', '--', ensureRelativePath(file.path)) } const { stdout, stderr } = await git( @@ -832,10 +833,9 @@ async function getFilesUsingBinaryMergeDriver( .map(x => x.path) } -// Prefix a path with `:(top,literal)` to ensure that git treats it as a literal -// path and not a glob pattern. This is important for paths that contain -// special characters like `*`, `?`, or `[` which would otherwise be treated as -// glob patterns and for paths that appear to be absolute paths on some platforms -// and not others. -// See https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top -const relativePathSpec = (path: string) => `:(top,literal)${path}` +// Prefix absolute path with `:(top,literal)` to ensure that git treats it as a +// literal path. This is important for paths that appear to be absolute paths on +// some platforms and not others. See +// https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-top +const ensureRelativePath = (path: string) => + isAbsolute(path) ? `:(top,literal)${path}` : path From c0867f8b1442dfd2f930a252811a65461489e45b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 21 May 2025 12:47:41 +0200 Subject: [PATCH 0408/1338] Version bump and changelog entry --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 9a1ee801205..210100f7343 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.20-beta2", + "version": "3.4.20-beta3", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 86684df2b2c..ac67c211412 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.4.20-beta3": [ + "[Fixed] Prevent network share traversal with renamed UNC paths on Windows" + ], "3.4.20-beta2": [ "[Fixed] Fix spacing of text in \"Thank You\" banner - #20411", "[Fixed] Radio inputs include the area around the radio button as a click surface. - #20404", From 29d3438c296ad34ae2b801c46f0228943c72dc2d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 21 May 2025 13:25:22 +0200 Subject: [PATCH 0409/1338] Improve Copilot error handling in API class Enhanced error handling by logging detailed error messages to the console and updating the user-facing error message for better clarity when a Copilot request fails. --- app/src/lib/api.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index b47dfa97423..d195dca0860 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -1945,7 +1945,13 @@ export class API { const internalError = `Internal server error, code: ${ response.status }, request ID: ${response.headers.get('X-Github-Request-Id')}.` - throw new CopilotError(internalError, response.status) + console.error( + `Copilot request failed with status ${response.status}: ${internalError}` + ) + throw new CopilotError( + 'Something went wrong. Please, try again later.', + response.status + ) } const text = await response.text() From b1e7fb553e83e9d52cdc59b9aa19b361dcbdae1f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 23 May 2025 12:04:12 +0200 Subject: [PATCH 0410/1338] Adjust resizable handle styles Updated the `.resize-handle` styles to reduce width and adjust right offset for better alignment. Added padding and z-index for improved usability and layering. --- app/styles/ui/_resizable.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/styles/ui/_resizable.scss b/app/styles/ui/_resizable.scss index 3f61851f7ba..e30bf151953 100644 --- a/app/styles/ui/_resizable.scss +++ b/app/styles/ui/_resizable.scss @@ -8,10 +8,12 @@ .resize-handle { position: absolute; - right: -5px; + right: -3px; top: 0px; height: 100%; - width: 10px; + width: 6px; + padding: 0; + z-index: var(--drag-overlay-z-index); cursor: ew-resize; // remove button styles From a3e196fb2ce4b9ce07b5592a78d2870f8be36c68 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Fri, 23 May 2025 17:19:43 +0400 Subject: [PATCH 0411/1338] Add comprehensive filter functionality for changes list - Implement robust filtering for working directory file changes - Add filter state management to app store and repository cache - Update UI components (sidebar, filter-changes-list) for filter support - Enhance dispatcher with filter-related actions - Add comprehensive test suite covering all filter scenarios - Include unit tests and integration tests for filter functionality --- app/src/lib/app-state.ts | 6 + app/src/lib/stores/app-store.ts | 17 + app/src/lib/stores/repository-state-cache.ts | 2 + app/src/ui/changes/filter-changes-list.tsx | 160 ++++++- app/src/ui/changes/sidebar.tsx | 2 + app/src/ui/dispatcher/dispatcher.ts | 14 + app/test/helpers/changes-state-helper.ts | 2 + app/test/unit/app-store-filter-test.ts | 383 +++++++++++++++++ .../unit/changes-filter-integration-test.ts | 403 ++++++++++++++++++ app/test/unit/changes-filter-test.ts | 365 ++++++++++++++++ app/test/unit/dispatcher-filter-test.ts | 286 +++++++++++++ 11 files changed, 1624 insertions(+), 16 deletions(-) create mode 100644 app/test/unit/app-store-filter-test.ts create mode 100644 app/test/unit/changes-filter-integration-test.ts create mode 100644 app/test/unit/changes-filter-test.ts create mode 100644 app/test/unit/dispatcher-filter-test.ts diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 9b47fb2d810..c5bd187a59e 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -776,6 +776,12 @@ export interface IChangesState { /** The state of the changes list filter of included changes. */ readonly includedChangesInCommitFilter: boolean + + /** Whether to filter and show only new files */ + readonly filterNewFiles: boolean + + /** Whether to filter and show only modified files */ + readonly filterModifiedFiles: boolean } /** diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 72515ad6b66..c7855f400b1 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -8330,6 +8330,23 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } + public _setFilterNewFiles(repository: Repository, filterNewFiles: boolean) { + this.repositoryStateCache.updateChangesState(repository, () => ({ + filterNewFiles, + })) + this.emitUpdate() + } + + public _setFilterModifiedFiles( + repository: Repository, + filterModifiedFiles: boolean + ) { + this.repositoryStateCache.updateChangesState(repository, () => ({ + filterModifiedFiles, + })) + this.emitUpdate() + } + public async _createPushProtectionBypass( reason: BypassReasonType, placeholderId: string, diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 57d1d57ba71..d745786d06a 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -320,6 +320,8 @@ function getInitialRepositoryState(): IRepositoryState { currentRepoRulesInfo: new RepoRulesInfo(), filterText: '', includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, }, selectedSection: RepositorySectionTab.Changes, branchesState: { diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index f637f0646e7..108d3b546b9 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -226,6 +226,12 @@ interface IFilterChangesListProps { readonly includedChangesInCommitFilter: boolean + /** Whether to filter and show only new files */ + readonly filterNewFiles: boolean + + /** Whether to filter and show only modified files */ + readonly filterModifiedFiles: boolean + /** Whether or not to show the changes filter */ readonly showChangesFilter: boolean } @@ -340,6 +346,26 @@ export class FilterChangesList extends React.Component< } ) + /** Calculate the count of new files (including untracked) */ + private getNewFilesCount = memoizeOne( + (workingDirectory: WorkingDirectoryStatus) => { + return workingDirectory.files.filter( + f => + f.status.kind === AppFileStatusKind.New || + f.status.kind === AppFileStatusKind.Untracked + ).length + } + ) + + /** Calculate the count of modified files */ + private getModifiedFilesCount = memoizeOne( + (workingDirectory: WorkingDirectoryStatus) => { + return workingDirectory.files.filter( + f => f.status.kind === AppFileStatusKind.Modified + ).length + } + ) + private headerRef = createObservableRef() private filterOptionsButtonRef: HTMLButtonElement | null = null private includeAllCheckBoxRef = React.createRef() @@ -1213,6 +1239,10 @@ export class FilterChangesList extends React.Component< ) } + private closeFilterOptions = () => { + this.setState({ isFilterOptionsOpen: false }) + } + private renderCheckBoxRow = () => { const { workingDirectory, rebaseConflictState, isCommitting } = this.props const { files } = workingDirectory @@ -1256,10 +1286,6 @@ export class FilterChangesList extends React.Component< this.setState({ isFilterOptionsOpen: !this.state.isFilterOptionsOpen }) } - private closeFilterOptions = () => { - this.setState({ isFilterOptionsOpen: false }) - } - private renderFilterOptions() { const checkedFilesThatAreVisibleCount = [ ...this.state.filteredItems.values(), @@ -1300,6 +1326,26 @@ export class FilterChangesList extends React.Component< onChange={this.onFilterToIncludedInCommit} label={`Included in commit (${checkedFilesThatAreVisibleCount})`} /> + +     ) @@ -1310,8 +1356,16 @@ export class FilterChangesList extends React.Component< return null } + // Count active filters + const activeFiltersCount = [ + this.props.includedChangesInCommitFilter, + this.props.filterNewFiles, + this.props.filterModifiedFiles, + ].filter(Boolean).length + + const hasActiveFilters = activeFiltersCount > 0 const buttonTextLabel = `Filter Options ${ - this.props.includedChangesInCommitFilter ? '(1 applied)' : '' + hasActiveFilters ? `(${activeFiltersCount} applied)` : '' }` return ( @@ -1319,7 +1373,7 @@ export class FilterChangesList extends React.Component< diff --git a/app/src/ui/welcome/welcome.tsx b/app/src/ui/welcome/welcome.tsx index ccbe952d443..fd018268c79 100644 --- a/app/src/ui/welcome/welcome.tsx +++ b/app/src/ui/welcome/welcome.tsx @@ -10,6 +10,7 @@ import { Start } from './start' import { SignInEnterprise } from './sign-in-enterprise' import { ConfigureGit } from './configure-git' import { UiView } from '../ui-view' +import { getGlobalConfigValue } from '../../lib/git' /** The steps along the Welcome flow. */ export enum WelcomeStep { @@ -35,6 +36,9 @@ interface IWelcomeState { * time to run to completion. */ readonly exiting: boolean + + readonly globalUserName?: string + readonly globalUserEmail?: string } // Note that we're reusing the welcome illustrations in the crash process, any @@ -69,6 +73,20 @@ export class Welcome extends React.Component { public componentDidMount() { this.props.dispatcher.recordWelcomeWizardInitiated() + + Promise.all([ + getGlobalConfigValue('user.name'), + getGlobalConfigValue('user.email'), + ]) + .then(([globalUserName, globalUserEmail]) => { + this.setState({ + globalUserName: globalUserName ?? undefined, + globalUserEmail: globalUserEmail ?? undefined, + }) + }) + .catch(e => { + log.error(`[Welcome] error while fetching global user config`, e) + }) } /** @@ -166,6 +184,8 @@ export class Welcome extends React.Component { advance={this.advanceToStep} accounts={this.props.accounts} done={this.done} + globalUserName={this.state.globalUserName} + globalUserEmail={this.state.globalUserEmail} /> ) @@ -180,6 +200,25 @@ export class Welcome extends React.Component { this.props.dispatcher.beginEnterpriseSignIn() } + // Refresh the global user name and email if we're moving to the + // ConfigureGit step. This is necessary because the user could theoretically + // have changed their global git config while the welcome flow was open. + if (step === WelcomeStep.ConfigureGit) { + Promise.all([ + getGlobalConfigValue('user.name'), + getGlobalConfigValue('user.email'), + ]) + .then(([globalUserName, globalUserEmail]) => { + this.setState({ + globalUserName: globalUserName ?? undefined, + globalUserEmail: globalUserEmail ?? undefined, + }) + }) + .catch(e => { + log.error(`[Welcome] error while fetching global user config`, e) + }) + } + this.setState({ currentStep: step }) } From 2e4442431d0d04274c4311a32971ebbc281a6908 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 12 Jun 2025 15:43:33 +0200 Subject: [PATCH 0444/1338] Whoopsie --- app/src/ui/lib/configure-git-user.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx index 65e78faaae2..3419be41dbe 100644 --- a/app/src/ui/lib/configure-git-user.tsx +++ b/app/src/ui/lib/configure-git-user.tsx @@ -108,7 +108,7 @@ export class ConfigureGitUser extends React.Component< if (globalUserEmail && globalUserEmail !== prevProps.globalUserEmail) { this.setState(prevState => ({ - manualEmail: prevState.manualName || globalUserEmail, + manualEmail: prevState.manualEmail || globalUserEmail, })) } } From d39285210e12dcdabca7f102696de3d8d8e154b5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 12 Jun 2025 15:44:28 +0200 Subject: [PATCH 0445/1338] Reuse --- app/src/ui/welcome/welcome.tsx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/src/ui/welcome/welcome.tsx b/app/src/ui/welcome/welcome.tsx index fd018268c79..93f6f19a033 100644 --- a/app/src/ui/welcome/welcome.tsx +++ b/app/src/ui/welcome/welcome.tsx @@ -73,7 +73,10 @@ export class Welcome extends React.Component { public componentDidMount() { this.props.dispatcher.recordWelcomeWizardInitiated() + this.refreshGlobalGitAuthorInfo() + } + public refreshGlobalGitAuthorInfo() { Promise.all([ getGlobalConfigValue('user.name'), getGlobalConfigValue('user.email'), @@ -204,19 +207,7 @@ export class Welcome extends React.Component { // ConfigureGit step. This is necessary because the user could theoretically // have changed their global git config while the welcome flow was open. if (step === WelcomeStep.ConfigureGit) { - Promise.all([ - getGlobalConfigValue('user.name'), - getGlobalConfigValue('user.email'), - ]) - .then(([globalUserName, globalUserEmail]) => { - this.setState({ - globalUserName: globalUserName ?? undefined, - globalUserEmail: globalUserEmail ?? undefined, - }) - }) - .catch(e => { - log.error(`[Welcome] error while fetching global user config`, e) - }) + this.refreshGlobalGitAuthorInfo() } this.setState({ currentStep: step }) From b4b013fc376e5845a3998ef642bd96076fdb144d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 12 Jun 2025 15:45:32 +0200 Subject: [PATCH 0446/1338] These are required, but they don't have to be a string --- app/src/ui/lib/configure-git-user.tsx | 4 ++-- app/src/ui/welcome/configure-git.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx index 3419be41dbe..5bc0fdbfd37 100644 --- a/app/src/ui/lib/configure-git-user.tsx +++ b/app/src/ui/lib/configure-git-user.tsx @@ -28,8 +28,8 @@ interface IConfigureGitUserProps { /** The label for the button which saves config changes. */ readonly saveLabel?: string - readonly globalUserName?: string - readonly globalUserEmail?: string + readonly globalUserName: string | undefined + readonly globalUserEmail: string | undefined } interface IConfigureGitUserState { diff --git a/app/src/ui/welcome/configure-git.tsx b/app/src/ui/welcome/configure-git.tsx index 76fe86f036e..5c02066f473 100644 --- a/app/src/ui/welcome/configure-git.tsx +++ b/app/src/ui/welcome/configure-git.tsx @@ -8,8 +8,8 @@ interface IConfigureGitProps { readonly accounts: ReadonlyArray readonly advance: (step: WelcomeStep) => void readonly done: () => void - readonly globalUserName?: string - readonly globalUserEmail?: string + readonly globalUserName: string | undefined + readonly globalUserEmail: string | undefined } /** The Welcome flow step to configure git. */ From bad5f9bd347589902b4dce35a4fa610bc464a647 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 12 Jun 2025 16:17:48 +0200 Subject: [PATCH 0447/1338] =?UTF-8?q?Don't=20move=20focus=20when=CB=9C=20b?= =?UTF-8?q?uttons=20in=20the=20action=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/ui/changes/commit-message.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index f4ddbfb32dc..236b1245b29 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -971,6 +971,16 @@ export class CommitMessage extends React.Component< } private onFocusContainerClick = (event: React.MouseEvent) => { + if (event.defaultPrevented) { + // Our description text area is styled to look like it's a big textarea + // with buttons towards the bottom but it's not. It's a textarea inside of + // a focus container (div) which is styled to look like a text area. + // To maintain that illusion we need to focus the description text area + // when the user clicks on the focus container but we don't want to + // do that if the user clicked on one of the buttons in the action bar + return + } + if (this.descriptionComponent) { this.descriptionComponent.focus() } From 380c967acb258f5808c71ad3dc566d33586b06f0 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 12 Jun 2025 17:30:12 +0200 Subject: [PATCH 0448/1338] Move image diff tabs to the top --- .../diff/image-diffs/modified-image-diff.tsx | 4 +-- app/src/ui/diff/image-diffs/onion-skin.tsx | 25 +++++++++---------- app/src/ui/diff/image-diffs/swipe.tsx | 24 +++++++++--------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/src/ui/diff/image-diffs/modified-image-diff.tsx b/app/src/ui/diff/image-diffs/modified-image-diff.tsx index c774a232f7a..06344767c73 100644 --- a/app/src/ui/diff/image-diffs/modified-image-diff.tsx +++ b/app/src/ui/diff/image-diffs/modified-image-diff.tsx @@ -148,8 +148,6 @@ export class ModifiedImageDiff extends React.Component< public render() { return (
    - {this.renderCurrentDiffType()} - Onion Skin Difference + + {this.renderCurrentDiffType()}
    ) } diff --git a/app/src/ui/diff/image-diffs/onion-skin.tsx b/app/src/ui/diff/image-diffs/onion-skin.tsx index f77c65f58ce..0208a38bfa5 100644 --- a/app/src/ui/diff/image-diffs/onion-skin.tsx +++ b/app/src/ui/diff/image-diffs/onion-skin.tsx @@ -29,6 +29,18 @@ export class OnionSkin extends React.Component< return (
    +
    @@ -54,19 +66,6 @@ export class OnionSkin extends React.Component<
    - -
    ) } diff --git a/app/src/ui/diff/image-diffs/swipe.tsx b/app/src/ui/diff/image-diffs/swipe.tsx index f75f236b1f3..bb48bf28a1d 100644 --- a/app/src/ui/diff/image-diffs/swipe.tsx +++ b/app/src/ui/diff/image-diffs/swipe.tsx @@ -55,6 +55,18 @@ export class Swipe extends React.Component< return (
    +
    @@ -73,18 +85,6 @@ export class Swipe extends React.Component<
    -
    ) } From 0bae51e4ee967f6147a0ac49bc86251a37b554cd Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 12 Jun 2025 18:22:41 +0200 Subject: [PATCH 0449/1338] Improve selection look&feel of Switch tab bar --- app/src/ui/tab-bar.tsx | 34 ++++++++++++++++++++-------------- app/styles/ui/_tab-bar.scss | 28 +++++++++++++++++++--------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/app/src/ui/tab-bar.tsx b/app/src/ui/tab-bar.tsx index 88f7e9e9897..cab5cc29bd7 100644 --- a/app/src/ui/tab-bar.tsx +++ b/app/src/ui/tab-bar.tsx @@ -112,24 +112,30 @@ export class TabBar extends React.Component { } private renderItems() { + const { type, selectedIndex } = this.props const children = React.Children.toArray(this.props.children) return children.map((child, index) => { - const selected = index === this.props.selectedIndex + const selected = index === selectedIndex return ( - - {child} - + <> + + {child} + + {type === TabBarType.Switch && index < children.length - 1 && ( +
    + )} + ) }) } diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss index 070016bca46..3087748f8d2 100644 --- a/app/styles/ui/_tab-bar.scss +++ b/app/styles/ui/_tab-bar.scss @@ -11,6 +11,10 @@ padding: var(--spacing) 0; } + &:not(.vertical) { + gap: var(--spacing); + } + &-item { // Reset styles from global buttons border: none; @@ -21,6 +25,11 @@ font-size: var(--font-size); } + .tab-bar-separator { + width: 1px; + background-color: var(--box-border-color); + } + &.tabs &-item { border-radius: 0; @@ -83,7 +92,6 @@ &.switch &-item { cursor: pointer; - border-radius: 0; // Give each item equal space flex: 1; @@ -92,22 +100,24 @@ display: flex; align-items: center; justify-content: center; + padding: 0; - border-right: 1px solid var(--box-border-color); + border: none; - // This makes it so that we never render a double-width item border. - // It has the unintended consequence of making it impossible to have a tab - // bar with just one item but we can live with that. - &:last-child { - border-right: none; - } + border-radius: var(--border-radius); // We intentionally swap foreground and background here to create // a more intense selected state. The tab bar is kind of a special snowflake // in so far that it doesn't have an active selection state, just a selected // one. &.selected { - font-weight: var(--font-weight-semibold); + background-color: var(--tab-bar-active-color); + color: var(--box-selected-active-text-color); + } + + &:focus-visible { + border-radius: var(--outlined-border-radius); + outline-offset: 3px; } } From 1ed4daed6be6c34ee4fca71f152647f37fdf8123 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Fri, 13 Jun 2025 10:42:05 +0400 Subject: [PATCH 0450/1338] Complete comprehensive filter functionality for changes list - Update terminology from "staged/unstaged" to "included in commit/excluded from commit" - Add clear filters functionality with buttons in dropdown and empty state - Implement comprehensive metrics tracking for all filter operations - Enhance no results message with bulleted list of active filters - Add responsive empty state design with proper container queries - Fix hidden changes warning to work with all filter types - Add extensive test coverage for clear filters functionality - Verify OR logic implementation in filter operations This completes PR #20537 with full feature implementation and test coverage. --- app/src/lib/app-state.ts | 4 +- app/src/lib/stats/stats-database.ts | 15 + app/src/lib/stats/stats-store.ts | 5 + app/src/lib/stores/app-store.ts | 6 +- app/src/lib/stores/repository-state-cache.ts | 2 +- app/src/ui/changes/filter-changes-list.tsx | 203 +++++++++--- app/src/ui/changes/sidebar.tsx | 2 +- app/src/ui/dispatcher/dispatcher.ts | 8 +- app/styles/ui/changes/_changes-list.scss | 77 +++++ app/test/helpers/changes-state-helper.ts | 2 +- app/test/unit/app-store-filter-test.ts | 36 +-- .../unit/changes-filter-integration-test.ts | 54 ++-- app/test/unit/changes-filter-test.ts | 24 +- app/test/unit/clear-filters-metrics-test.ts | 293 +++++++++++++++++ app/test/unit/dispatcher-filter-test.ts | 10 +- .../filter-changes-list-count-methods-test.ts | 34 +- ...ilter-changes-list-ui-interactions-test.ts | 301 ++++++++++++++++-- 17 files changed, 900 insertions(+), 176 deletions(-) create mode 100644 app/test/unit/clear-filters-metrics-test.ts diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 8df988d9091..d459e9d3e38 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -786,8 +786,8 @@ export interface IChangesState { /** Whether to filter and show only deleted files */ readonly filterDeletedFiles: boolean - /** Whether to filter and show only unstaged files */ - readonly filterUnstagedFiles: boolean + /** Whether to filter and show only excluded from commit files */ + readonly filterExcludedFiles: boolean } /** diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 56bc782663e..85fce08a4bf 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -607,6 +607,21 @@ export interface IDailyMeasures { /** The number of times the user applies the "Included in Commit" Filter */ appliesIncludedInCommitFilterCount: 0 + /** The number of times the user applies the "Excluded from Commit" Filter */ + appliesExcludedFromCommitFilterCount: 0 + + /** The number of times the user applies the "New Files" Filter */ + appliesNewFilesFilterCount: 0 + + /** The number of times the user applies the "Modified Files" Filter */ + appliesModifiedFilesFilterCount: 0 + + /** The number of times the user applies the "Deleted Files" Filter */ + appliesDeletedFilesFilterCount: 0 + + /** The number of times the user clears all filters */ + appliesClearAllFiltersCount: 0 + /** The number of times the user adjust the filter from warnings about hidden changes */ adjustedFiltersForHiddenChangesCount: 0 diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index 0e9882e7b91..6d6740f55cc 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -242,6 +242,11 @@ const DefaultDailyMeasures: IDailyMeasures = { previewedPullRequestCount: 0, typedInChangesFilterCount: 0, appliesIncludedInCommitFilterCount: 0, + appliesExcludedFromCommitFilterCount: 0, + appliesNewFilesFilterCount: 0, + appliesModifiedFilesFilterCount: 0, + appliesDeletedFilesFilterCount: 0, + appliesClearAllFiltersCount: 0, adjustedFiltersForHiddenChangesCount: 0, enterpriseAccountCount: 0, generateCommitMessageButtonClickCount: 0, diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 5e9390f9368..79096ace8e8 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -8357,12 +8357,12 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } - public _setFilterUnstagedFiles( + public _setFilterExcludedFiles( repository: Repository, - filterUnstagedFiles: boolean + filterExcludedFiles: boolean ) { this.repositoryStateCache.updateChangesState(repository, () => ({ - filterUnstagedFiles, + filterExcludedFiles, })) this.emitUpdate() } diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index ca23264c086..ee5d420895b 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -323,7 +323,7 @@ function getInitialRepositoryState(): IRepositoryState { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, }, selectedSection: RepositorySectionTab.Changes, branchesState: { diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index c4f46d9f301..a39dc310c58 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -4,6 +4,7 @@ import * as Path from 'path' import { Dispatcher } from '../dispatcher' import { IMenuItem } from '../../lib/menu-item' import { revealInFileManager } from '../../lib/app-shell' +import { encodePathAsUrl } from '../../lib/path' import { WorkingDirectoryStatus, WorkingDirectoryFileChange, @@ -235,8 +236,8 @@ interface IFilterChangesListProps { /** Whether to filter and show only deleted files */ readonly filterDeletedFiles: boolean - /** Whether to filter and show only unstaged files */ - readonly filterUnstagedFiles: boolean + /** Whether to filter and show only excluded from commit files */ + readonly filterExcludedFiles: boolean /** Whether or not to show the changes filter */ readonly showChangesFilter: boolean @@ -286,10 +287,24 @@ export class FilterChangesList extends React.Component< filterText: string, fileIdsIncludedInCommit: ReadonlyArray, filteredItems: Map, - fileCount: number + fileCount: number, + includedChangesInCommitFilter: boolean, + filterNewFiles: boolean, + filterModifiedFiles: boolean, + filterDeletedFiles: boolean, + filterExcludedFiles: boolean ) => { - // All possible files are present in the list (empty filter or all matching filter) - if (filterText === '' || filteredItems.size === fileCount) { + // Check if any filters are active + const hasAnyActiveFilter = + filterText !== '' || + includedChangesInCommitFilter || + filterNewFiles || + filterModifiedFiles || + filterDeletedFiles || + filterExcludedFiles + + // All possible files are present in the list (no active filters or all files match active filters) + if (!hasAnyActiveFilter || filteredItems.size === fileCount) { return false } @@ -381,8 +396,8 @@ export class FilterChangesList extends React.Component< } ) - /** Calculate the count of unstaged files (files with DiffSelectionType.None) */ - private getUnstagedFilesCount = memoizeOne( + /** Calculate the count of excluded from commit files (files with DiffSelectionType.None) */ + private getExcludedFilesCount = memoizeOne( (workingDirectory: WorkingDirectoryStatus) => { return workingDirectory.files.filter( f => f.selection.getSelectionType() === DiffSelectionType.None @@ -390,8 +405,8 @@ export class FilterChangesList extends React.Component< } ) - /** Calculate the count of staged files (files with DiffSelectionType.All or DiffSelectionType.Partial) */ - private getStagedFilesCount = memoizeOne( + /** Calculate the count of included in commit files (files with DiffSelectionType.All or DiffSelectionType.Partial) */ + private getIncludedFilesCount = memoizeOne( (workingDirectory: WorkingDirectoryStatus) => { return workingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None @@ -998,7 +1013,12 @@ export class FilterChangesList extends React.Component< this.props.filterText, filesSelected.map(f => f.id), this.state.filteredItems, - fileCount + fileCount, + this.props.includedChangesInCommitFilter, + this.props.filterNewFiles, + this.props.filterModifiedFiles, + this.props.filterDeletedFiles, + this.props.filterExcludedFiles ) return ( @@ -1325,6 +1345,15 @@ export class FilterChangesList extends React.Component< } private renderFilterOptions() { + // Check if any filters are active + const hasActiveFilters = [ + this.props.includedChangesInCommitFilter, + this.props.filterNewFiles, + this.props.filterModifiedFiles, + this.props.filterDeletedFiles, + this.props.filterExcludedFiles, + ].some(Boolean) + return ( @@ -1400,6 +1429,11 @@ export class FilterChangesList extends React.Component< )})`} />
    + {hasActiveFilters && ( +
    + +
    + )} ) } @@ -1415,7 +1449,7 @@ export class FilterChangesList extends React.Component< this.props.filterNewFiles, this.props.filterModifiedFiles, this.props.filterDeletedFiles, - this.props.filterUnstagedFiles, + this.props.filterExcludedFiles, ].filter(Boolean).length const hasActiveFilters = activeFiltersCount > 0 @@ -1471,7 +1505,7 @@ export class FilterChangesList extends React.Component< // Check if any filters are active const hasAnyFilter = this.props.includedChangesInCommitFilter || - this.props.filterUnstagedFiles || + this.props.filterExcludedFiles || this.props.filterNewFiles || this.props.filterModifiedFiles || this.props.filterDeletedFiles @@ -1491,7 +1525,7 @@ export class FilterChangesList extends React.Component< return true } - if (this.props.filterUnstagedFiles && isUnstaged) { + if (this.props.filterExcludedFiles && isUnstaged) { return true } @@ -1562,7 +1596,7 @@ export class FilterChangesList extends React.Component< this.props.filterNewFiles || this.props.filterModifiedFiles || this.props.filterDeletedFiles || - this.props.filterUnstagedFiles + this.props.filterExcludedFiles ? this.applyFilters : undefined } @@ -1574,7 +1608,7 @@ export class FilterChangesList extends React.Component< filterNewFiles: this.props.filterNewFiles, filterModifiedFiles: this.props.filterModifiedFiles, filterDeletedFiles: this.props.filterDeletedFiles, - filterUnstagedFiles: this.props.filterUnstagedFiles, + filterExcludedFiles: this.props.filterExcludedFiles, }} onItemContextMenu={this.onItemContextMenu} renderCustomFilterRow={this.renderFilterRow} @@ -1601,7 +1635,12 @@ export class FilterChangesList extends React.Component< this.props.filterText, filesSelected.map(f => f.id), this.state.filteredItems, - files.length + files.length, + this.props.includedChangesInCommitFilter, + this.props.filterNewFiles, + this.props.filterModifiedFiles, + this.props.filterDeletedFiles, + this.props.filterExcludedFiles ) ) { return null @@ -1626,46 +1665,43 @@ export class FilterChangesList extends React.Component< !this.props.filterNewFiles && !this.props.filterModifiedFiles && !this.props.filterDeletedFiles && - !this.props.filterUnstagedFiles + !this.props.filterExcludedFiles ) { return undefined } - const filterTextMessage = this.props.filterText - ? ` matching your filter of '${this.props.filterText}'` - : '' + const activeFilters: string[] = [] - const includedCommitText = this.props.includedChangesInCommitFilter - ? ' that are staged' - : '' + if (this.props.filterText) { + activeFilters.push(`"${this.props.filterText}"`) + } - const newFilesText = this.props.filterNewFiles ? ' that are new' : '' + if (this.props.includedChangesInCommitFilter) { + activeFilters.push('Included in commit') + } - const modifiedFilesText = this.props.filterModifiedFiles - ? ' that are modified' - : '' + if (this.props.filterExcludedFiles) { + activeFilters.push('Excluded from commit') + } - const deletedFilesText = this.props.filterDeletedFiles - ? ' that are deleted' - : '' + if (this.props.filterNewFiles) { + activeFilters.push('New files') + } - const unstagedFilesText = this.props.filterUnstagedFiles - ? ' that are unstaged' - : '' + if (this.props.filterModifiedFiles) { + activeFilters.push('Modified files') + } - const filterTexts = [ - filterTextMessage, - includedCommitText, - newFilesText, - modifiedFilesText, - deletedFilesText, - unstagedFilesText, - ].filter(text => text !== '') + if (this.props.filterDeletedFiles) { + activeFilters.push('Deleted files') + } - const conjunction = filterTexts.length > 1 ? ' or ' : '' - const combinedFilters = filterTexts.join(conjunction) + if (activeFilters.length === 0) { + return undefined + } - return `Sorry, I can't find any changed files${combinedFilters}.` + const bulletedList = activeFilters.map(filter => `• ${filter}`).join('\n') + return `Sorry, I can't find any changed files matching the following filters:\n${bulletedList}` } private renderNoChanges = () => { @@ -1675,13 +1711,43 @@ export class FilterChangesList extends React.Component< !this.props.filterNewFiles && !this.props.filterModifiedFiles && !this.props.filterDeletedFiles && - !this.props.filterUnstagedFiles + !this.props.filterExcludedFiles ) { return null } + // Check if any filters are active (including text filter) + const hasActiveFilters = + [ + this.props.includedChangesInCommitFilter, + this.props.filterNewFiles, + this.props.filterModifiedFiles, + this.props.filterDeletedFiles, + this.props.filterExcludedFiles, + ].some(Boolean) || this.props.filterText.length > 0 + + const BlankSlateImage = encodePathAsUrl( + __dirname, + 'static/empty-no-file-selected.svg' + ) + return ( -
    {this.getNoResultsMessage()}
    +
    + + +
    No files match your current filters
    + +
    {this.getNoResultsMessage()}
    + + {hasActiveFilters && ( + + )} +
    ) } @@ -1699,6 +1765,9 @@ export class FilterChangesList extends React.Component< } private onFilterNewFiles = () => { + if (!this.props.filterNewFiles) { + this.props.dispatcher.incrementMetric('appliesNewFilesFilterCount') + } this.props.dispatcher.setFilterNewFiles( this.props.repository, !this.props.filterNewFiles @@ -1707,6 +1776,9 @@ export class FilterChangesList extends React.Component< } private onFilterModifiedFiles = () => { + if (!this.props.filterModifiedFiles) { + this.props.dispatcher.incrementMetric('appliesModifiedFilesFilterCount') + } this.props.dispatcher.setFilterModifiedFiles( this.props.repository, !this.props.filterModifiedFiles @@ -1715,6 +1787,9 @@ export class FilterChangesList extends React.Component< } private onFilterDeletedFiles = () => { + if (!this.props.filterDeletedFiles) { + this.props.dispatcher.incrementMetric('appliesDeletedFilesFilterCount') + } this.props.dispatcher.setFilterDeletedFiles( this.props.repository, !this.props.filterDeletedFiles @@ -1722,11 +1797,33 @@ export class FilterChangesList extends React.Component< this.closeFilterOptions() } - private onFilterUnstagedFiles = () => { - this.props.dispatcher.setFilterUnstagedFiles( + private onFilterExcludedFiles = () => { + if (!this.props.filterExcludedFiles) { + this.props.dispatcher.incrementMetric( + 'appliesExcludedFromCommitFilterCount' + ) + } + this.props.dispatcher.setFilterExcludedFiles( + this.props.repository, + !this.props.filterExcludedFiles + ) + this.closeFilterOptions() + } + + private onClearAllFilters = () => { + this.props.dispatcher.incrementMetric('appliesClearAllFiltersCount') + + // Clear all filters including text filter + this.props.dispatcher.setChangesListFilterText(this.props.repository, '') + this.props.dispatcher.setIncludedChangesInCommitFilter( this.props.repository, - !this.props.filterUnstagedFiles + false ) + this.props.dispatcher.setFilterExcludedFiles(this.props.repository, false) + this.props.dispatcher.setFilterNewFiles(this.props.repository, false) + this.props.dispatcher.setFilterModifiedFiles(this.props.repository, false) + this.props.dispatcher.setFilterDeletedFiles(this.props.repository, false) + this.closeFilterOptions() } diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index e342f5fb345..80f8e4b9bc4 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -466,7 +466,7 @@ export class ChangesSidebar extends React.Component { filterNewFiles={this.props.changes.filterNewFiles} filterModifiedFiles={this.props.changes.filterModifiedFiles} filterDeletedFiles={this.props.changes.filterDeletedFiles} - filterUnstagedFiles={this.props.changes.filterUnstagedFiles} + filterExcludedFiles={this.props.changes.filterExcludedFiles} showChangesFilter={this.props.showChangesFilter} /> {this.renderUndoCommit(rebaseConflictState)} diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 41e3ea7d8de..2307e5d1188 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -4033,13 +4033,13 @@ export class Dispatcher { return this.appStore._setFilterDeletedFiles(repository, filterDeletedFiles) } - public setFilterUnstagedFiles( + public setFilterExcludedFiles( repository: Repository, - filterUnstagedFiles: boolean + filterExcludedFiles: boolean ) { - return this.appStore._setFilterUnstagedFiles( + return this.appStore._setFilterExcludedFiles( repository, - filterUnstagedFiles + filterExcludedFiles ) } diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 0c86301a619..9478fa88ccd 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -61,6 +61,12 @@ .filter-options { margin: var(--spacing) 0; } + + .filter-options-footer { + padding: var(--spacing-half) 0 var(--spacing) 0; + margin-top: var(--spacing-quarter); + text-align: left; + } .popover-content { padding: var(--spacing) var(--spacing) 0 var(--spacing); } @@ -276,3 +282,74 @@ display: inline; } } + +.no-changes-filtered { + max-width: 365px; + min-width: 180px; + width: 100%; + margin: var(--spacing-half) auto; + display: flex; + flex: 1; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + padding: var(--spacing); + box-sizing: border-box; + overflow: hidden; // Prevent scrollbars + max-height: 100%; // Ensure it fits within container + container-type: size; // Enable container queries + + .blankslate-image { + margin-bottom: var(--spacing); + opacity: 0.8; + max-width: 80px; + width: 100%; + height: auto; + flex-shrink: 0; + } + + .title { + font-weight: var(--font-weight-semibold); + text-align: center; + margin-bottom: var(--spacing-half); + font-size: var(--font-size); + line-height: 1.3; + color: var(--text-color); + flex-shrink: 0; + } + + .subtitle { + margin: 0 var(--spacing-half) var(--spacing) var(--spacing-half); + text-align: center; + font-size: var(--font-size-sm); + color: var(--text-secondary-color); + white-space: pre-line; + line-height: 1.4; + flex-shrink: 1; // Allow subtitle to shrink if needed + overflow: hidden; + max-height: 100px; // Prevent excessive height + } + + .clear-filters-button { + align-self: center; + min-width: 120px; + flex-shrink: 0; + margin-top: var(--spacing-half); + } + + // Container queries for width-based image resizing + @container (max-width: 300px) { + .blankslate-image { + max-width: none; + width: 100%; + } + } + + // Container queries for height-based image hiding + @container (max-height: 250px) { + .blankslate-image { + display: none; + } + } +} diff --git a/app/test/helpers/changes-state-helper.ts b/app/test/helpers/changes-state-helper.ts index 2027e239de8..f8c97fef653 100644 --- a/app/test/helpers/changes-state-helper.ts +++ b/app/test/helpers/changes-state-helper.ts @@ -27,7 +27,7 @@ export function createState( filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, } return merge(baseChangesState, pick) diff --git a/app/test/unit/app-store-filter-test.ts b/app/test/unit/app-store-filter-test.ts index b5baab2095a..23e99037f4e 100644 --- a/app/test/unit/app-store-filter-test.ts +++ b/app/test/unit/app-store-filter-test.ts @@ -249,39 +249,39 @@ describe('App Store Filter Functionality', () => { }) }) - describe('_setFilterUnstagedFiles', () => { - it('enables unstaged files filter', () => { + describe('_setFilterExcludedFiles', () => { + it('enables excluded files filter', () => { repositoryStateCache.updateChangesState(repository, () => ({ - filterUnstagedFiles: true, + filterExcludedFiles: true, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterUnstagedFiles, true) + assert.equal(state.changesState.filterExcludedFiles, true) }) - it('disables unstaged files filter', () => { + it('disables excluded files filter', () => { repositoryStateCache.updateChangesState(repository, () => ({ - filterUnstagedFiles: false, + filterExcludedFiles: false, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterUnstagedFiles, false) + assert.equal(state.changesState.filterExcludedFiles, false) }) - it('toggles unstaged files filter state', () => { + it('toggles excluded files filter state', () => { repositoryStateCache.updateChangesState(repository, () => ({ - filterUnstagedFiles: true, + filterExcludedFiles: true, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterUnstagedFiles, true) + assert.equal(state.changesState.filterExcludedFiles, true) repositoryStateCache.updateChangesState(repository, () => ({ - filterUnstagedFiles: false, + filterExcludedFiles: false, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterUnstagedFiles, false) + assert.equal(state.changesState.filterExcludedFiles, false) }) }) @@ -292,7 +292,7 @@ describe('App Store Filter Functionality', () => { filterNewFiles: true, filterModifiedFiles: true, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: true, })) @@ -301,7 +301,7 @@ describe('App Store Filter Functionality', () => { assert.equal(state.changesState.filterNewFiles, true) assert.equal(state.changesState.filterModifiedFiles, true) assert.equal(state.changesState.filterDeletedFiles, true) - assert.equal(state.changesState.filterUnstagedFiles, true) + assert.equal(state.changesState.filterExcludedFiles, true) assert.equal(state.changesState.includedChangesInCommitFilter, true) }) @@ -391,7 +391,7 @@ describe('App Store Filter Functionality', () => { assert.equal(state.changesState.filterNewFiles, false) assert.equal(state.changesState.filterModifiedFiles, false) assert.equal(state.changesState.filterDeletedFiles, false) - assert.equal(state.changesState.filterUnstagedFiles, false) + assert.equal(state.changesState.filterExcludedFiles, false) assert.equal(state.changesState.includedChangesInCommitFilter, false) }) @@ -402,7 +402,7 @@ describe('App Store Filter Functionality', () => { filterNewFiles: true, filterModifiedFiles: true, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: true, })) @@ -412,7 +412,7 @@ describe('App Store Filter Functionality', () => { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: false, })) @@ -421,7 +421,7 @@ describe('App Store Filter Functionality', () => { assert.equal(state.changesState.filterNewFiles, false) assert.equal(state.changesState.filterModifiedFiles, false) assert.equal(state.changesState.filterDeletedFiles, false) - assert.equal(state.changesState.filterUnstagedFiles, false) + assert.equal(state.changesState.filterExcludedFiles, false) assert.equal(state.changesState.includedChangesInCommitFilter, false) }) }) diff --git a/app/test/unit/changes-filter-integration-test.ts b/app/test/unit/changes-filter-integration-test.ts index b5269dd8dae..364f0259b75 100644 --- a/app/test/unit/changes-filter-integration-test.ts +++ b/app/test/unit/changes-filter-integration-test.ts @@ -247,14 +247,14 @@ describe('Changes Filter Integration Tests', () => { assert.ok(filteredFiles.some(f => f.path === 'old-file.txt')) }) - it('filters unstaged files when filterUnstagedFiles is enabled', () => { + it('filters unstaged files when filterExcludedFiles is enabled', () => { const state = createState({ workingDirectory, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterUnstagedFiles) { + if (!state.filterExcludedFiles) { return true } // Unstaged files are those not selected for commit (noneSelected) @@ -301,13 +301,13 @@ describe('Changes Filter Integration Tests', () => { const state = createState({ workingDirectory, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) // Apply both deleted and unstaged files filters const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging filter (unstaged files) - const hasStagingFilter = state.filterUnstagedFiles + const hasStagingFilter = state.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { matchesStagingFilter = @@ -347,14 +347,14 @@ describe('Changes Filter Integration Tests', () => { const state = createState({ workingDirectory, includedChangesInCommitFilter: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) // Apply both staged and unstaged files filters const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging filter - should show both staged AND unstaged files const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterUnstagedFiles + state.includedChangesInCommitFilter || state.filterExcludedFiles let matchesStagingFilter = false if (hasStagingFilter) { const isStaged = @@ -365,12 +365,12 @@ describe('Changes Filter Integration Tests', () => { // When both filters are active, show files that match either condition if ( state.includedChangesInCommitFilter && - state.filterUnstagedFiles + state.filterExcludedFiles ) { matchesStagingFilter = isStaged || isUnstaged } else if (state.includedChangesInCommitFilter) { matchesStagingFilter = isStaged - } else if (state.filterUnstagedFiles) { + } else if (state.filterExcludedFiles) { matchesStagingFilter = isUnstaged } } @@ -454,7 +454,7 @@ describe('Changes Filter Integration Tests', () => { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: false, }) @@ -471,7 +471,7 @@ describe('Changes Filter Integration Tests', () => { !state.filterDeletedFiles || file.status.kind === AppFileStatusKind.Deleted const matchesUnstagedFiles = - !state.filterUnstagedFiles || + !state.filterExcludedFiles || file.selection.getSelectionType() === DiffSelectionType.None const matchesIncluded = !state.includedChangesInCommitFilter || @@ -588,11 +588,11 @@ describe('Changes Filter Integration Tests', () => { WorkingDirectoryStatus.fromFiles(largeFileSet) const state = createState({ workingDirectory: largeWorkingDirectory, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterUnstagedFiles) { + if (!state.filterExcludedFiles) { return true } return file.selection.getSelectionType() === DiffSelectionType.None @@ -609,14 +609,14 @@ describe('Changes Filter Integration Tests', () => { const state = createState({ workingDirectory, includedChangesInCommitFilter: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) // Apply the fixed filtering logic that allows both filters to work together const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging status filters (included in commit and unstaged files) const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterUnstagedFiles + state.includedChangesInCommitFilter || state.filterExcludedFiles if (hasStagingFilter) { let matchesStagingFilter = false const isStaged = @@ -630,7 +630,7 @@ describe('Changes Filter Integration Tests', () => { } // Check if file matches unstaged files filter - if (state.filterUnstagedFiles && isUnstaged) { + if (state.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -651,18 +651,18 @@ describe('Changes Filter Integration Tests', () => { const state = createState({ workingDirectory, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, }) const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging status filters - const hasStagingFilter = state.filterUnstagedFiles + const hasStagingFilter = state.filterExcludedFiles if (hasStagingFilter) { let matchesStagingFilter = false const isUnstaged = file.selection.getSelectionType() === DiffSelectionType.None - if (state.filterUnstagedFiles && isUnstaged) { + if (state.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -740,7 +740,7 @@ describe('Changes Filter Integration Tests', () => { workingDirectory, filterText: 'src/', filterNewFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: false, }) @@ -751,7 +751,7 @@ describe('Changes Filter Integration Tests', () => { file.path.toLowerCase().includes(state.filterText.toLowerCase()) // Apply staging filter - const hasStagingFilter = state.filterUnstagedFiles + const hasStagingFilter = state.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { const isUnstaged = @@ -787,7 +787,7 @@ describe('Changes Filter Integration Tests', () => { filterNewFiles: true, filterModifiedFiles: true, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: true, }, }, @@ -798,7 +798,7 @@ describe('Changes Filter Integration Tests', () => { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: true, }, }, @@ -809,7 +809,7 @@ describe('Changes Filter Integration Tests', () => { filterNewFiles: true, filterModifiedFiles: true, filterDeletedFiles: true, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: false, }, }, @@ -820,7 +820,7 @@ describe('Changes Filter Integration Tests', () => { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: true, }, }, @@ -841,7 +841,7 @@ describe('Changes Filter Integration Tests', () => { // Staging filters const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterUnstagedFiles + state.includedChangesInCommitFilter || state.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { matchesStagingFilter = false @@ -853,7 +853,7 @@ describe('Changes Filter Integration Tests', () => { if (state.includedChangesInCommitFilter && isStaged) { matchesStagingFilter = true } - if (state.filterUnstagedFiles && isUnstaged) { + if (state.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } } diff --git a/app/test/unit/changes-filter-test.ts b/app/test/unit/changes-filter-test.ts index 012a949411d..e8f8f8d27ff 100644 --- a/app/test/unit/changes-filter-test.ts +++ b/app/test/unit/changes-filter-test.ts @@ -111,24 +111,24 @@ describe('Changes Filter Functionality', () => { }) }) - describe('filterUnstagedFiles', () => { + describe('filterExcludedFiles', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.filterUnstagedFiles, false) + assert.equal(state.filterExcludedFiles, false) }) it('can be set to true', () => { const state = createState({ - filterUnstagedFiles: true, + filterExcludedFiles: true, }) - assert.equal(state.filterUnstagedFiles, true) + assert.equal(state.filterExcludedFiles, true) }) it('can be set to false explicitly', () => { const state = createState({ - filterUnstagedFiles: false, + filterExcludedFiles: false, }) - assert.equal(state.filterUnstagedFiles, false) + assert.equal(state.filterExcludedFiles, false) }) }) @@ -181,7 +181,7 @@ describe('Changes Filter Functionality', () => { filterNewFiles: true, filterModifiedFiles: true, filterDeletedFiles: true, - filterUnstagedFiles: true, + filterExcludedFiles: true, includedChangesInCommitFilter: true, filterText: 'test', }) @@ -189,7 +189,7 @@ describe('Changes Filter Functionality', () => { assert.equal(state.filterNewFiles, true) assert.equal(state.filterModifiedFiles, true) assert.equal(state.filterDeletedFiles, true) - assert.equal(state.filterUnstagedFiles, true) + assert.equal(state.filterExcludedFiles, true) assert.equal(state.includedChangesInCommitFilter, true) assert.equal(state.filterText, 'test') }) @@ -199,7 +199,7 @@ describe('Changes Filter Functionality', () => { filterNewFiles: true, filterModifiedFiles: false, filterDeletedFiles: true, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: true, filterText: 'feature', }) @@ -207,7 +207,7 @@ describe('Changes Filter Functionality', () => { assert.equal(state.filterNewFiles, true) assert.equal(state.filterModifiedFiles, false) assert.equal(state.filterDeletedFiles, true) - assert.equal(state.filterUnstagedFiles, false) + assert.equal(state.filterExcludedFiles, false) assert.equal(state.includedChangesInCommitFilter, true) assert.equal(state.filterText, 'feature') }) @@ -217,7 +217,7 @@ describe('Changes Filter Functionality', () => { filterNewFiles: false, filterModifiedFiles: false, filterDeletedFiles: false, - filterUnstagedFiles: false, + filterExcludedFiles: false, includedChangesInCommitFilter: false, filterText: '', }) @@ -225,7 +225,7 @@ describe('Changes Filter Functionality', () => { assert.equal(state.filterNewFiles, false) assert.equal(state.filterModifiedFiles, false) assert.equal(state.filterDeletedFiles, false) - assert.equal(state.filterUnstagedFiles, false) + assert.equal(state.filterExcludedFiles, false) assert.equal(state.includedChangesInCommitFilter, false) assert.equal(state.filterText, '') }) diff --git a/app/test/unit/clear-filters-metrics-test.ts b/app/test/unit/clear-filters-metrics-test.ts new file mode 100644 index 00000000000..c0f20ec3945 --- /dev/null +++ b/app/test/unit/clear-filters-metrics-test.ts @@ -0,0 +1,293 @@ +import { describe, it, beforeEach } from 'node:test' +import assert from 'node:assert' + +describe('Clear Filters Metrics Tests', () => { + describe('appliesClearAllFiltersCount metric', () => { + it('should be tracked when clear filters is called', () => { + // Simulate metric tracking for clear all filters + const metricsCalls: Array<{ metric: string; count: number }> = [] + + const mockIncrementMetric = (metric: string) => { + const existingCall = metricsCalls.find(call => call.metric === metric) + if (existingCall) { + existingCall.count++ + } else { + metricsCalls.push({ metric, count: 1 }) + } + } + + // Simulate calling clear filters multiple times + mockIncrementMetric('appliesClearAllFiltersCount') + mockIncrementMetric('appliesClearAllFiltersCount') + mockIncrementMetric('appliesClearAllFiltersCount') + + const clearAllMetric = metricsCalls.find(call => call.metric === 'appliesClearAllFiltersCount') + assert.ok(clearAllMetric, 'Should track appliesClearAllFiltersCount metric') + assert.equal(clearAllMetric.count, 3, 'Should increment metric each time clear filters is called') + }) + + it('should be separate from individual filter metrics', () => { + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } + + // Simulate applying individual filters + mockIncrementMetric('appliesIncludedInCommitFilterCount') + mockIncrementMetric('appliesNewFilesFilterCount') + mockIncrementMetric('appliesModifiedFilesFilterCount') + + // Simulate clearing all filters + mockIncrementMetric('appliesClearAllFiltersCount') + + assert.ok(metricsCalls.includes('appliesClearAllFiltersCount'), 'Should track clear all filters metric') + assert.ok(metricsCalls.includes('appliesIncludedInCommitFilterCount'), 'Should track individual filter metrics') + assert.equal(metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, 1, 'Should only track clear all once per call') + }) + + it('should track clear filters regardless of which filters were active', () => { + const scenarios = [ + { + description: 'only text filter active', + activeFilters: { filterText: 'README' }, + }, + { + description: 'only one boolean filter active', + activeFilters: { filterNewFiles: true }, + }, + { + description: 'multiple filters active', + activeFilters: { + filterText: 'src/', + includedChangesInCommitFilter: true, + filterDeletedFiles: true + }, + }, + { + description: 'all filters active', + activeFilters: { + filterText: 'test', + includedChangesInCommitFilter: true, + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + }, + }, + ] + + scenarios.forEach(({ description, activeFilters }) => { + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } + + // Simulate clear filters being called regardless of which filters were active + mockIncrementMetric('appliesClearAllFiltersCount') + + assert.ok( + metricsCalls.includes('appliesClearAllFiltersCount'), + `Should track clear all filters metric for ${description}` + ) + }) + }) + }) + + describe('metrics integration with clear filters workflow', () => { + it('should track the complete clear filters workflow', () => { + const workflowEvents: Array<{ event: string; timestamp: number }> = [] + const currentTime = Date.now() + + const mockEvent = (event: string) => { + workflowEvents.push({ event, timestamp: currentTime + workflowEvents.length }) + } + + // Simulate the complete clear filters workflow + mockEvent('user_clicks_clear_filters_button') + mockEvent('increment_metric_appliesClearAllFiltersCount') + mockEvent('clear_filter_text') + mockEvent('clear_included_changes_filter') + mockEvent('clear_excluded_files_filter') + mockEvent('clear_new_files_filter') + mockEvent('clear_modified_files_filter') + mockEvent('clear_deleted_files_filter') + mockEvent('close_filter_options_popover') + + // Verify the workflow order + const expectedEvents = [ + 'user_clicks_clear_filters_button', + 'increment_metric_appliesClearAllFiltersCount', + 'clear_filter_text', + 'clear_included_changes_filter', + 'clear_excluded_files_filter', + 'clear_new_files_filter', + 'clear_modified_files_filter', + 'clear_deleted_files_filter', + 'close_filter_options_popover', + ] + + expectedEvents.forEach((expectedEvent, index) => { + assert.equal( + workflowEvents[index]?.event, + expectedEvent, + `Event ${index + 1} should be ${expectedEvent}` + ) + }) + + // Verify metrics are tracked early in the workflow + const metricsEventIndex = workflowEvents.findIndex( + event => event.event === 'increment_metric_appliesClearAllFiltersCount' + ) + assert.equal(metricsEventIndex, 1, 'Metrics should be tracked early in the workflow') + }) + + it('should handle multiple rapid clear filters calls', () => { + const metricsCalls: number[] = [] + + const mockIncrementMetric = (metric: string) => { + if (metric === 'appliesClearAllFiltersCount') { + metricsCalls.push(Date.now()) + } + } + + // Simulate rapid clicking of clear filters + for (let i = 0; i < 5; i++) { + mockIncrementMetric('appliesClearAllFiltersCount') + } + + assert.equal(metricsCalls.length, 5, 'Should track each clear filters call separately') + }) + }) + + describe('clear filters button states and metrics', () => { + it('should only allow metrics tracking when button is actually visible', () => { + const buttonVisibilityScenarios = [ + { + hasActiveFilters: false, + shouldTrackMetrics: false, + description: 'no filters active - button hidden' + }, + { + hasActiveFilters: true, + shouldTrackMetrics: true, + description: 'filters active - button visible' + }, + ] + + buttonVisibilityScenarios.forEach(({ hasActiveFilters, shouldTrackMetrics, description }) => { + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } + + // Only call metrics if button would be visible + if (hasActiveFilters) { + mockIncrementMetric('appliesClearAllFiltersCount') + } + + const hasMetrics = metricsCalls.includes('appliesClearAllFiltersCount') + assert.equal(hasMetrics, shouldTrackMetrics, description) + }) + }) + + it('should track metrics for both clear filters button locations', () => { + const buttonLocations = [ + { location: 'filter_dropdown', description: 'Clear filters button in filter options dropdown' }, + { location: 'empty_state', description: 'Clear filters button in empty state' }, + ] + + buttonLocations.forEach(({ location, description }) => { + const metricsCalls: Array<{ metric: string; source: string }> = [] + + const mockIncrementMetric = (metric: string, source: string) => { + metricsCalls.push({ metric, source }) + } + + // Both buttons should track the same metric + mockIncrementMetric('appliesClearAllFiltersCount', location) + + const relevantCall = metricsCalls.find( + call => call.metric === 'appliesClearAllFiltersCount' && call.source === location + ) + assert.ok(relevantCall, `Should track metrics for ${description}`) + }) + }) + }) + + describe('edge cases for clear filters metrics', () => { + it('should handle clear filters with no repository context', () => { + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } + + // Even without repository context, metrics should still be tracked + mockIncrementMetric('appliesClearAllFiltersCount') + + assert.ok( + metricsCalls.includes('appliesClearAllFiltersCount'), + 'Should track metrics even without repository context' + ) + }) + + it('should handle clear filters during component unmount', () => { + let componentMounted = true + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + if (componentMounted) { + metricsCalls.push(metric) + } + } + + // Call clear filters before unmount + mockIncrementMetric('appliesClearAllFiltersCount') + + // Simulate component unmount + componentMounted = false + + // Try to call clear filters after unmount (should not track) + mockIncrementMetric('appliesClearAllFiltersCount') + + assert.equal( + metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, + 1, + 'Should only track metrics while component is mounted' + ) + }) + + it('should handle clear filters with corrupted filter state', () => { + const corruptedStates = [ + { filterText: null, description: 'null filter text' }, + { filterText: undefined, description: 'undefined filter text' }, + { includedChangesInCommitFilter: null, description: 'null boolean filter' }, + { filterNewFiles: 'true', description: 'string instead of boolean' }, + ] + + corruptedStates.forEach(({ description }) => { + const metricsCalls: string[] = [] + + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } + + // Clear filters should still work and track metrics even with corrupted state + try { + mockIncrementMetric('appliesClearAllFiltersCount') + } catch (error) { + // Should not throw errors + assert.fail(`Clear filters should handle corrupted state: ${description}`) + } + + assert.ok( + metricsCalls.includes('appliesClearAllFiltersCount'), + `Should track metrics even with ${description}` + ) + }) + }) + }) +}) \ No newline at end of file diff --git a/app/test/unit/dispatcher-filter-test.ts b/app/test/unit/dispatcher-filter-test.ts index 69eff88be1a..a2e672e6fb0 100644 --- a/app/test/unit/dispatcher-filter-test.ts +++ b/app/test/unit/dispatcher-filter-test.ts @@ -300,18 +300,18 @@ describe('Dispatcher Filter Functionality', () => { assert.strictEqual(methodContract.parameters[1].type, 'boolean') }) - it('defines expected method contracts for setFilterUnstagedFiles', () => { - // Method signature: setFilterUnstagedFiles(repository: Repository, filterUnstagedFiles: boolean) + it('defines expected method contracts for setFilterExcludedFiles', () => { + // Method signature: setFilterExcludedFiles(repository: Repository, filterExcludedFiles: boolean) const methodContract = { - name: 'setFilterUnstagedFiles', + name: 'setFilterExcludedFiles', parameters: [ { name: 'repository', type: 'Repository' }, - { name: 'filterUnstagedFiles', type: 'boolean' }, + { name: 'filterExcludedFiles', type: 'boolean' }, ], returnType: 'void', } - assert.strictEqual(methodContract.name, 'setFilterUnstagedFiles') + assert.strictEqual(methodContract.name, 'setFilterExcludedFiles') assert.strictEqual(methodContract.parameters.length, 2) assert.strictEqual(methodContract.parameters[0].type, 'Repository') assert.strictEqual(methodContract.parameters[1].type, 'boolean') diff --git a/app/test/unit/filter-changes-list-count-methods-test.ts b/app/test/unit/filter-changes-list-count-methods-test.ts index 7c696e0b561..79e5a288e77 100644 --- a/app/test/unit/filter-changes-list-count-methods-test.ts +++ b/app/test/unit/filter-changes-list-count-methods-test.ts @@ -178,9 +178,9 @@ describe('FilterChangesList Count Methods Tests', () => { }) }) - describe('getUnstagedFilesCount', () => { - it('counts unstaged files correctly', () => { - // Expected: Files with DiffSelectionType.None + describe('getExcludedFilesCount', () => { + it('counts excluded from commit files correctly', () => { + // Expected: Files with DiffSelectionType.None (excluded from commit) // src/components/App.tsx, docs/api.md, deprecated.js, temp-file.tmp, cache.log = 5 files const expectedCount = 5 @@ -191,13 +191,13 @@ describe('FilterChangesList Count Methods Tests', () => { assert.equal(actualCount, expectedCount) }) - it('returns zero when all files are staged', () => { + it('returns zero when all files are included in commit', () => { const allStagedFiles = testFiles.map( file => new WorkingDirectoryFileChange( file.path, file.status, - allSelected // Make all files staged + allSelected // Make all files included in commit ) ) const workingDirectoryAllStaged = @@ -210,13 +210,13 @@ describe('FilterChangesList Count Methods Tests', () => { assert.equal(actualCount, 0) }) - it('counts all files when all are unstaged', () => { + it('counts all files when all are excluded from commit', () => { const allUnstagedFiles = testFiles.map( file => new WorkingDirectoryFileChange( file.path, file.status, - noneSelected // Make all files unstaged + noneSelected // Make all files excluded from commit ) ) const workingDirectoryAllUnstaged = @@ -230,9 +230,9 @@ describe('FilterChangesList Count Methods Tests', () => { }) }) - describe('getStagedFilesCount', () => { - it('counts staged files correctly', () => { - // Expected: Files with DiffSelectionType.All or DiffSelectionType.Partial + describe('getIncludedFilesCount', () => { + it('counts included in commit files correctly', () => { + // Expected: Files with DiffSelectionType.All or DiffSelectionType.Partial (included in commit) // README.md, package.json, src/utils/helpers.ts, old-file.txt, renamed-component.tsx = 5 files const expectedCount = 5 @@ -243,30 +243,30 @@ describe('FilterChangesList Count Methods Tests', () => { assert.equal(actualCount, expectedCount) }) - it('includes partially staged files in count', () => { + it('includes partially included files in count', () => { const partiallyStaged = workingDirectory.files.filter( f => f.selection.getSelectionType() === DiffSelectionType.Partial ) - // Should have 1 partially staged file (package.json) + // Should have 1 partially included file (package.json) assert.equal(partiallyStaged.length, 1) assert.equal(partiallyStaged[0].path, 'package.json') - // Partially staged files should be included in staged count - const stagedCount = workingDirectory.files.filter( + // Partially included files should be included in commit count + const includedCount = workingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ).length - assert.ok(stagedCount > 0) + assert.ok(includedCount > 0) }) - it('returns zero when no files are staged', () => { + it('returns zero when no files are included in commit', () => { const allUnstagedFiles = testFiles.map( file => new WorkingDirectoryFileChange( file.path, file.status, - noneSelected // Make all files unstaged + noneSelected // Make all files excluded from commit ) ) const workingDirectoryAllUnstaged = diff --git a/app/test/unit/filter-changes-list-ui-interactions-test.ts b/app/test/unit/filter-changes-list-ui-interactions-test.ts index d3193b19b24..e0ee9c58163 100644 --- a/app/test/unit/filter-changes-list-ui-interactions-test.ts +++ b/app/test/unit/filter-changes-list-ui-interactions-test.ts @@ -80,7 +80,7 @@ describe('FilterChangesList UI Interactions Tests', () => { it('filters by staging status correctly', () => { // Test the staging filter logic from applyFilters const includedChangesInCommitFilter = true - const filterUnstagedFiles = false + const filterExcludedFiles = false const testFile = testFiles[0] // README.md (staged) const isStaged = @@ -92,7 +92,7 @@ describe('FilterChangesList UI Interactions Tests', () => { if (includedChangesInCommitFilter && isStaged) { matchesStagingFilter = true } - if (filterUnstagedFiles && isUnstaged) { + if (filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -134,7 +134,7 @@ describe('FilterChangesList UI Interactions Tests', () => { it('handles combined staging and file type filters', () => { // Test combined filter logic const includedChangesInCommitFilter = true - const filterUnstagedFiles = true + const filterExcludedFiles = true const filterDeletedFiles = true const deletedStagedFile = testFiles.find( @@ -160,7 +160,7 @@ describe('FilterChangesList UI Interactions Tests', () => { if (includedChangesInCommitFilter && isStaged1) { matchesStagingFilter1 = true } - if (filterUnstagedFiles && isUnstaged1) { + if (filterExcludedFiles && isUnstaged1) { matchesStagingFilter1 = true } @@ -186,7 +186,7 @@ describe('FilterChangesList UI Interactions Tests', () => { if (includedChangesInCommitFilter && isStaged2) { matchesStagingFilter2 = true } - if (filterUnstagedFiles && isUnstaged2) { + if (filterExcludedFiles && isUnstaged2) { matchesStagingFilter2 = true } @@ -214,7 +214,7 @@ describe('FilterChangesList UI Interactions Tests', () => { filterNewFiles: false, filterModifiedFiles: true, filterDeletedFiles: false, - filterUnstagedFiles: true, + filterExcludedFiles: true, } const activeFiltersCount = [ @@ -222,7 +222,7 @@ describe('FilterChangesList UI Interactions Tests', () => { filters.filterNewFiles, filters.filterModifiedFiles, filters.filterDeletedFiles, - filters.filterUnstagedFiles, + filters.filterExcludedFiles, ].filter(Boolean).length assert.equal(activeFiltersCount, 3) @@ -261,16 +261,16 @@ describe('FilterChangesList UI Interactions Tests', () => { }) describe('filter checkbox states', () => { - it('determines correct checkbox value for staged files filter', () => { + it('determines correct checkbox value for included files filter', () => { const includedChangesInCommitFilter = true const checkboxValue = includedChangesInCommitFilter ? 'On' : 'Off' assert.equal(checkboxValue, 'On') }) - it('determines correct checkbox value for unstaged files filter', () => { - const filterUnstagedFiles = false - const checkboxValue = filterUnstagedFiles ? 'On' : 'Off' + it('determines correct checkbox value for excluded files filter', () => { + const filterExcludedFiles = false + const checkboxValue = filterExcludedFiles ? 'On' : 'Off' assert.equal(checkboxValue, 'Off') }) @@ -298,24 +298,24 @@ describe('FilterChangesList UI Interactions Tests', () => { }) describe('filter labels with counts', () => { - it('generates correct label for staged files', () => { - const stagedCount = workingDirectory.files.filter( + it('generates correct label for included files', () => { + const includedCount = workingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ).length - const label = `Staged files (${stagedCount})` + const label = `Included files (${includedCount})` // Expected: README.md, package.json, src/utils/helpers.ts, old-file.txt = 4 files - assert.equal(label, 'Staged files (4)') + assert.equal(label, 'Included files (4)') }) - it('generates correct label for unstaged files', () => { - const unstagedCount = workingDirectory.files.filter( + it('generates correct label for excluded files', () => { + const excludedCount = workingDirectory.files.filter( f => f.selection.getSelectionType() === DiffSelectionType.None ).length - const label = `Unstaged files (${unstagedCount})` + const label = `Excluded files (${excludedCount})` // Expected: src/components/App.tsx, docs/api.md, deprecated.js, temp-file.tmp = 4 files - assert.equal(label, 'Unstaged files (4)') + assert.equal(label, 'Excluded files (4)') }) it('generates correct label for new files', () => { @@ -355,11 +355,11 @@ describe('FilterChangesList UI Interactions Tests', () => { it('handles scenario where staged and unstaged filters are both enabled', () => { // This should show all files since every file is either staged or unstaged const includedChangesInCommitFilter = true - const filterUnstagedFiles = true + const filterExcludedFiles = true const filteredFiles = workingDirectory.files.filter(file => { const hasStagingFilter = - includedChangesInCommitFilter || filterUnstagedFiles + includedChangesInCommitFilter || filterExcludedFiles if (!hasStagingFilter) { return true } @@ -373,7 +373,7 @@ describe('FilterChangesList UI Interactions Tests', () => { if (includedChangesInCommitFilter && isStaged) { matchesStagingFilter = true } - if (filterUnstagedFiles && isUnstaged) { + if (filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -434,11 +434,11 @@ describe('FilterChangesList UI Interactions Tests', () => { it('handles scenario where no filters match any files', () => { // Create a scenario where filters exclude all files const filterNewFiles = true - const filterUnstagedFiles = true + const filterExcludedFiles = true // Filter for new files that are also unstaged const filteredFiles = workingDirectory.files.filter(file => { - const hasStagingFilter = filterUnstagedFiles + const hasStagingFilter = filterExcludedFiles const hasFileTypeFilter = filterNewFiles let matchesStagingFilter = true @@ -461,15 +461,252 @@ describe('FilterChangesList UI Interactions Tests', () => { }) }) + describe('clear filters functionality', () => { + it('onClearAllFilters clears all filter states', () => { + // Simulate the onClearAllFilters method logic + const initialState = { + filterText: 'README', + includedChangesInCommitFilter: true, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: false, + } + + // Simulate clearing all filters + const clearedState = { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + } + + // Verify initial state has filters active + const hasInitialFilters = + initialState.filterText !== '' || + initialState.includedChangesInCommitFilter || + initialState.filterNewFiles || + initialState.filterModifiedFiles || + initialState.filterDeletedFiles || + initialState.filterExcludedFiles + + // Verify cleared state has no filters active + const hasClearedFilters = + clearedState.filterText !== '' || + clearedState.includedChangesInCommitFilter || + clearedState.filterNewFiles || + clearedState.filterModifiedFiles || + clearedState.filterDeletedFiles || + clearedState.filterExcludedFiles + + assert.equal(hasInitialFilters, true) + assert.equal(hasClearedFilters, false) + }) + + it('onClearAllFilters clears text filter along with other filters', () => { + const initialState = { + filterText: 'src/', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + } + + const clearedState = { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + } + + // Even if only text filter is active, it should be cleared + assert.equal(initialState.filterText, 'src/') + assert.equal(clearedState.filterText, '') + }) + + it('hasActiveFilters includes text filter in determination', () => { + // Test the logic for determining if clear filters button should be visible + const testCases = [ + { + state: { filterText: '', includedChangesInCommitFilter: false, filterNewFiles: false }, + expected: false, + description: 'no filters active' + }, + { + state: { filterText: 'README', includedChangesInCommitFilter: false, filterNewFiles: false }, + expected: true, + description: 'only text filter active' + }, + { + state: { filterText: '', includedChangesInCommitFilter: true, filterNewFiles: false }, + expected: true, + description: 'only included filter active' + }, + { + state: { filterText: 'test', includedChangesInCommitFilter: true, filterNewFiles: true }, + expected: true, + description: 'multiple filters active' + }, + ] + + testCases.forEach(({ state, expected, description }) => { + const hasActiveFilters = + state.filterText.length > 0 || + state.includedChangesInCommitFilter || + state.filterNewFiles + + assert.equal(hasActiveFilters, expected, `Failed for ${description}`) + }) + }) + + it('clear filters button visibility logic works correctly', () => { + // Test the exact logic from renderFilterOptions and renderNoChanges + const scenarios = [ + { + filters: { + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, + filterText: '', + expectedVisible: false, + description: 'no filters - button should be hidden' + }, + { + filters: { + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, + filterText: '', + expectedVisible: true, + description: 'one filter active - button should be visible' + }, + { + filters: { + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, + filterText: 'search', + expectedVisible: true, + description: 'only text filter - button should be visible' + }, + { + filters: { + includedChangesInCommitFilter: true, + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + }, + filterText: 'complex search', + expectedVisible: true, + description: 'all filters active - button should be visible' + }, + ] + + scenarios.forEach(({ filters, filterText, expectedVisible, description }) => { + // Logic from renderFilterOptions for dropdown button + const hasActiveFiltersDropdown = [ + filters.includedChangesInCommitFilter, + filters.filterNewFiles, + filters.filterModifiedFiles, + filters.filterDeletedFiles, + filters.filterExcludedFiles, + ].some(Boolean) + + // Logic from renderNoChanges for empty state button + const hasActiveFiltersEmptyState = [ + filters.includedChangesInCommitFilter, + filters.filterNewFiles, + filters.filterModifiedFiles, + filters.filterDeletedFiles, + filters.filterExcludedFiles, + ].some(Boolean) || filterText.length > 0 + + if (filterText.length > 0) { + // When text filter is active, empty state button should always be visible + assert.equal(hasActiveFiltersEmptyState, true, `Empty state: ${description}`) + } else { + // When no text filter, both buttons should have same visibility + assert.equal(hasActiveFiltersDropdown, expectedVisible, `Dropdown: ${description}`) + assert.equal(hasActiveFiltersEmptyState, expectedVisible, `Empty state: ${description}`) + } + }) + }) + + it('clear filters operation resets to default state', () => { + // Simulate the exact dispatcher calls made by onClearAllFilters + const dispatcherCalls = [ + { method: 'setChangesListFilterText', args: ['repository', ''] }, + { method: 'setIncludedChangesInCommitFilter', args: ['repository', false] }, + { method: 'setFilterExcludedFiles', args: ['repository', false] }, + { method: 'setFilterNewFiles', args: ['repository', false] }, + { method: 'setFilterModifiedFiles', args: ['repository', false] }, + { method: 'setFilterDeletedFiles', args: ['repository', false] }, + { method: 'incrementMetric', args: ['appliesClearAllFiltersCount'] }, + ] + + // Verify all expected dispatcher calls are made + assert.equal(dispatcherCalls.length, 7) + + // Verify text filter is cleared + const textFilterCall = dispatcherCalls.find(call => call.method === 'setChangesListFilterText') + assert.ok(textFilterCall, 'Should call setChangesListFilterText') + assert.equal(textFilterCall.args[1], '', 'Should clear text filter') + + // Verify all boolean filters are set to false + const booleanFilterCalls = dispatcherCalls.filter(call => + call.method.startsWith('setFilter') || call.method === 'setIncludedChangesInCommitFilter' + ) + assert.equal(booleanFilterCalls.length, 5, 'Should have 5 boolean filter calls') + + booleanFilterCalls.forEach(call => { + assert.equal(call.args[1], false, `${call.method} should be set to false`) + }) + + // Verify metrics are tracked + const metricsCall = dispatcherCalls.find(call => call.method === 'incrementMetric') + assert.ok(metricsCall, 'Should call incrementMetric') + assert.equal(metricsCall.args[0], 'appliesClearAllFiltersCount', 'Should track clear all filters metric') + }) + + it('clear filters closes filter options popover', () => { + // Test that closeFilterOptions is called after clearing filters + let popoverClosed = false + + const mockCloseFilterOptions = () => { + popoverClosed = true + } + + // Simulate the end of onClearAllFilters method + mockCloseFilterOptions() + + assert.equal(popoverClosed, true, 'Should close filter options popover after clearing') + }) + }) + describe('edge cases', () => { it('handles empty working directory with filters enabled', () => { const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) - const stagedCount = emptyWorkingDirectory.files.filter( + const includedCount = emptyWorkingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ).length - const unstagedCount = emptyWorkingDirectory.files.filter( + const excludedCount = emptyWorkingDirectory.files.filter( f => f.selection.getSelectionType() === DiffSelectionType.None ).length @@ -479,8 +716,8 @@ describe('FilterChangesList UI Interactions Tests', () => { f.status.kind === AppFileStatusKind.Untracked ).length - assert.equal(stagedCount, 0) - assert.equal(unstagedCount, 0) + assert.equal(includedCount, 0) + assert.equal(excludedCount, 0) assert.equal(newCount, 0) }) @@ -495,11 +732,11 @@ describe('FilterChangesList UI Interactions Tests', () => { const singleFileWorkingDirectory = WorkingDirectoryStatus.fromFiles(singleFile) - const stagedCount = singleFileWorkingDirectory.files.filter( + const includedCount = singleFileWorkingDirectory.files.filter( f => f.selection.getSelectionType() !== DiffSelectionType.None ).length - const unstagedCount = singleFileWorkingDirectory.files.filter( + const excludedCount = singleFileWorkingDirectory.files.filter( f => f.selection.getSelectionType() === DiffSelectionType.None ).length @@ -507,8 +744,8 @@ describe('FilterChangesList UI Interactions Tests', () => { f => f.status.kind === AppFileStatusKind.Modified ).length - assert.equal(stagedCount, 1) - assert.equal(unstagedCount, 0) + assert.equal(includedCount, 1) + assert.equal(excludedCount, 0) assert.equal(modifiedCount, 1) }) }) From 39ba25732bb6be07483834b95c010fb8453faf77 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:20:07 -0400 Subject: [PATCH 0451/1338] Release 3.4.22-beta1 --- app/package.json | 2 +- changelog.json | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 2d10437f82f..8e4a4711857 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.21", + "version": "3.4.22-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index e24b251f6f2..24151b68ad6 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,16 @@ { "releases": { + "3.4.22-beta1": [ + "[Fixed] Disambiguate repositories in the recent group - #20582", + "[Fixed] Screen readers announces text fields in the welcome flow as editable - #20634", + "[Fixed] Using tab to cycle through elements in an alert dialog does not result in redundant dialog content announcement on Windows - #20629", + "[Fixed] Layout image diff tabs and slider in logical order for improved accessibility - #20637", + "[Fixed] Stop moving focus when clicking on buttons in the commit description area - #20636", + "[Fixed] The repo rule failure list label is announced by screen readers - #20617", + "[Improved] VoiceOver announces all changes in image diff sliders - #20625", + "[Improved] The whitespace hint popover does not announce landmark information to screen reader users - #20618", + "[Improved] Filter changes text box follows expected focus order upon changes view opening - #20621" + ], "3.4.21": [ "[Added] Handled GitHub Secret Scanning push protection errors in a friendly dialog with the ability to bypass blocked non-approval requiring secrets - #20386, #20387, #20391", "[Fixed] Fix spacing of text in \"Thank You\" banner - #20411", From 6ef102149b87efb9329924cdb59c600caae27b44 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 17 Jun 2025 09:44:12 +0200 Subject: [PATCH 0452/1338] Disambiguate based on what's shown --- .../repositories-list/group-repositories.ts | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/app/src/ui/repositories-list/group-repositories.ts b/app/src/ui/repositories-list/group-repositories.ts index dad2df78919..393eb51cb31 100644 --- a/app/src/ui/repositories-list/group-repositories.ts +++ b/app/src/ui/repositories-list/group-repositories.ts @@ -118,6 +118,11 @@ export function groupRepositories( })) } +// Returns the display title for a repository, which is either the alias +// (if available) or the name. +const getDisplayTitle = (r: Repositoryish) => + r instanceof Repository && r.alias != null ? r.alias : r.name + const toSortedListItems = ( group: RepositoryListGroup, repositories: ReadonlyArray, @@ -128,10 +133,16 @@ const toSortedListItems = ( const allNames = new Map() for (const groupItem of groups.values()) { - for (const r of groupItem.repos) { - allNames.set(r.name, (allNames.get(r.name) ?? 0) + 1) + // All items in the recent group are by definition present in another + // group and therefore we don't want to count them. + if (groupItem.group.kind === 'recent') { + continue + } + + for (const title of groupItem.repos.map(getDisplayTitle)) { + allNames.set(title, (allNames.get(title) ?? 0) + 1) if (groupItem.group === group) { - groupNames.set(r.name, (groupNames.get(r.name) ?? 0) + 1) + groupNames.set(title, (groupNames.get(title) ?? 0) + 1) } } } @@ -139,10 +150,10 @@ const toSortedListItems = ( return repositories .map(r => { const repoState = localRepositoryStateLookup.get(r.id) + const title = getDisplayTitle(r) return { - text: - r instanceof Repository ? [r.alias ?? r.name, nameOf(r)] : [r.name], + text: r instanceof Repository ? [title, nameOf(r)] : [title], id: r.id.toString(), repository: r, needsDisambiguation: @@ -152,18 +163,13 @@ const toSortedListItems = ( // already grouped by owner. If the repository is in the 'recent' // group and has a duplicate name in any group, we need to // disambiguate it. - ((groupNames.get(r.name) ?? 0) > 1 && group.kind === 'enterprise') || - ((allNames.get(r.name) ?? 0) > 1 && group.kind === 'recent'), + ((groupNames.get(title) ?? 0) > 1 && group.kind === 'enterprise') || + ((allNames.get(title) ?? 0) > 1 && group.kind === 'recent'), aheadBehind: repoState?.aheadBehind ?? null, changedFilesCount: repoState?.changedFilesCount ?? 0, } }) .sort(({ repository: x }, { repository: y }) => - caseInsensitiveCompare(repositorySortingKey(x), repositorySortingKey(y)) + caseInsensitiveCompare(getDisplayTitle(x), getDisplayTitle(y)) ) } - -// Use either the configured alias or the repository name when sorting the -// repository list. -const repositorySortingKey = (r: Repositoryish) => - r instanceof Repository && r.alias !== null ? r.alias : r.name From e46740011465583644c5170055ebf3a96b66c991 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 17 Jun 2025 09:44:55 +0200 Subject: [PATCH 0453/1338] Move key prop to React.Fragment in TabBar The key prop was moved from TabBarItem to the surrounding React.Fragment to avoid React warnings and ensure correct list rendering. --- app/src/ui/tab-bar.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/ui/tab-bar.tsx b/app/src/ui/tab-bar.tsx index cab5cc29bd7..a2ac14b3cdb 100644 --- a/app/src/ui/tab-bar.tsx +++ b/app/src/ui/tab-bar.tsx @@ -118,9 +118,8 @@ export class TabBar extends React.Component { return children.map((child, index) => { const selected = index === selectedIndex return ( - <> + { {type === TabBarType.Switch && index < children.length - 1 && (
    )} - + ) }) } From 1041714e40ab751c99a03a6fa2d42685eac79306 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 13:45:51 +0400 Subject: [PATCH 0454/1338] Refactor filter state to use FileListFilterState interface --- app/src/lib/app-state.ts | 10 +- app/src/lib/stores/app-store.ts | 43 +++-- app/src/lib/stores/repository-state-cache.ts | 14 +- app/src/ui/changes/sidebar.tsx | 12 +- app/test/helpers/changes-state-helper.ts | 14 +- app/test/unit/clear-filters-metrics-test.ts | 137 ++++++++++----- ...ilter-changes-list-ui-interactions-test.ts | 164 ++++++++++++------ 7 files changed, 253 insertions(+), 141 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index d459e9d3e38..0c7595873f6 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -771,7 +771,15 @@ export interface IChangesState { */ readonly currentRepoRulesInfo: RepoRulesInfo - /** The text entered into the compare branch filter text box */ + /** The file list filter state containing all filter options */ + readonly fileListFilter: IFileListFilterState +} + +/** + * State interface for file list filtering options + */ +export interface IFileListFilterState { + /** The text entered into the filter text box */ readonly filterText: string /** The state of the changes list filter of included changes. */ diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 79096ace8e8..f8070cf6bf9 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -122,6 +122,7 @@ import { ChangesWorkingDirectorySelection, isRebaseConflictState, isCherryPickConflictState, + IFileListFilterState, isMergeConflictState, IMultiCommitOperationState, IConstrainedValue, @@ -8313,58 +8314,54 @@ export class AppStore extends TypedBaseStore { } } - public _setChangesListFilterText(repository: Repository, filterText: string) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - filterText, + public _updateFileListFilter( + repository: Repository, + filterUpdate: Partial + ) { + this.repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + ...filterUpdate, + }, })) this.emitUpdate() } + // Legacy methods for backwards compatibility + public _setChangesListFilterText(repository: Repository, filterText: string) { + this._updateFileListFilter(repository, { filterText }) + } + public _setIncludedChangesInCommitFilter( repository: Repository, includedChangesInCommitFilter: boolean ) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - includedChangesInCommitFilter, - })) - this.emitUpdate() + this._updateFileListFilter(repository, { includedChangesInCommitFilter }) } public _setFilterNewFiles(repository: Repository, filterNewFiles: boolean) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - filterNewFiles, - })) - this.emitUpdate() + this._updateFileListFilter(repository, { filterNewFiles }) } public _setFilterModifiedFiles( repository: Repository, filterModifiedFiles: boolean ) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - filterModifiedFiles, - })) - this.emitUpdate() + this._updateFileListFilter(repository, { filterModifiedFiles }) } public _setFilterDeletedFiles( repository: Repository, filterDeletedFiles: boolean ) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - filterDeletedFiles, - })) - this.emitUpdate() + this._updateFileListFilter(repository, { filterDeletedFiles }) } public _setFilterExcludedFiles( repository: Repository, filterExcludedFiles: boolean ) { - this.repositoryStateCache.updateChangesState(repository, () => ({ - filterExcludedFiles, - })) - this.emitUpdate() + this._updateFileListFilter(repository, { filterExcludedFiles }) } public async _createPushProtectionBypass( diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index ee5d420895b..aa4579397ba 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -318,12 +318,14 @@ function getInitialRepositoryState(): IRepositoryState { stashEntry: null, currentBranchProtected: false, currentRepoRulesInfo: new RepoRulesInfo(), - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }, selectedSection: RepositorySectionTab.Changes, branchesState: { diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 80f8e4b9bc4..4aee591c4f1 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -459,14 +459,14 @@ export class ChangesSidebar extends React.Component { currentRepoRulesInfo={currentRepoRulesInfo} aheadBehind={this.props.aheadBehind} accounts={this.props.accounts} - filterText={this.props.changes.filterText} + filterText={this.props.changes.fileListFilter.filterText} includedChangesInCommitFilter={ - this.props.changes.includedChangesInCommitFilter + this.props.changes.fileListFilter.includedChangesInCommitFilter } - filterNewFiles={this.props.changes.filterNewFiles} - filterModifiedFiles={this.props.changes.filterModifiedFiles} - filterDeletedFiles={this.props.changes.filterDeletedFiles} - filterExcludedFiles={this.props.changes.filterExcludedFiles} + filterNewFiles={this.props.changes.fileListFilter.filterNewFiles} + filterModifiedFiles={this.props.changes.fileListFilter.filterModifiedFiles} + filterDeletedFiles={this.props.changes.fileListFilter.filterDeletedFiles} + filterExcludedFiles={this.props.changes.fileListFilter.filterExcludedFiles} showChangesFilter={this.props.showChangesFilter} /> {this.renderUndoCommit(rebaseConflictState)} diff --git a/app/test/helpers/changes-state-helper.ts b/app/test/helpers/changes-state-helper.ts index f8c97fef653..cf2ab708055 100644 --- a/app/test/helpers/changes-state-helper.ts +++ b/app/test/helpers/changes-state-helper.ts @@ -22,12 +22,14 @@ export function createState( stashEntry: null, currentBranchProtected: false, currentRepoRulesInfo: new RepoRulesInfo(), - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, } return merge(baseChangesState, pick) diff --git a/app/test/unit/clear-filters-metrics-test.ts b/app/test/unit/clear-filters-metrics-test.ts index c0f20ec3945..350265cbefe 100644 --- a/app/test/unit/clear-filters-metrics-test.ts +++ b/app/test/unit/clear-filters-metrics-test.ts @@ -1,4 +1,4 @@ -import { describe, it, beforeEach } from 'node:test' +import { describe, it } from 'node:test' import assert from 'node:assert' describe('Clear Filters Metrics Tests', () => { @@ -6,7 +6,7 @@ describe('Clear Filters Metrics Tests', () => { it('should be tracked when clear filters is called', () => { // Simulate metric tracking for clear all filters const metricsCalls: Array<{ metric: string; count: number }> = [] - + const mockIncrementMetric = (metric: string) => { const existingCall = metricsCalls.find(call => call.metric === metric) if (existingCall) { @@ -21,14 +21,23 @@ describe('Clear Filters Metrics Tests', () => { mockIncrementMetric('appliesClearAllFiltersCount') mockIncrementMetric('appliesClearAllFiltersCount') - const clearAllMetric = metricsCalls.find(call => call.metric === 'appliesClearAllFiltersCount') - assert.ok(clearAllMetric, 'Should track appliesClearAllFiltersCount metric') - assert.equal(clearAllMetric.count, 3, 'Should increment metric each time clear filters is called') + const clearAllMetric = metricsCalls.find( + call => call.metric === 'appliesClearAllFiltersCount' + ) + assert.ok( + clearAllMetric, + 'Should track appliesClearAllFiltersCount metric' + ) + assert.equal( + clearAllMetric.count, + 3, + 'Should increment metric each time clear filters is called' + ) }) it('should be separate from individual filter metrics', () => { const metricsCalls: string[] = [] - + const mockIncrementMetric = (metric: string) => { metricsCalls.push(metric) } @@ -37,13 +46,23 @@ describe('Clear Filters Metrics Tests', () => { mockIncrementMetric('appliesIncludedInCommitFilterCount') mockIncrementMetric('appliesNewFilesFilterCount') mockIncrementMetric('appliesModifiedFilesFilterCount') - + // Simulate clearing all filters mockIncrementMetric('appliesClearAllFiltersCount') - assert.ok(metricsCalls.includes('appliesClearAllFiltersCount'), 'Should track clear all filters metric') - assert.ok(metricsCalls.includes('appliesIncludedInCommitFilterCount'), 'Should track individual filter metrics') - assert.equal(metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, 1, 'Should only track clear all once per call') + assert.ok( + metricsCalls.includes('appliesClearAllFiltersCount'), + 'Should track clear all filters metric' + ) + assert.ok( + metricsCalls.includes('appliesIncludedInCommitFilterCount'), + 'Should track individual filter metrics' + ) + assert.equal( + metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, + 1, + 'Should only track clear all once per call' + ) }) it('should track clear filters regardless of which filters were active', () => { @@ -58,10 +77,10 @@ describe('Clear Filters Metrics Tests', () => { }, { description: 'multiple filters active', - activeFilters: { + activeFilters: { filterText: 'src/', includedChangesInCommitFilter: true, - filterDeletedFiles: true + filterDeletedFiles: true, }, }, { @@ -79,7 +98,7 @@ describe('Clear Filters Metrics Tests', () => { scenarios.forEach(({ description, activeFilters }) => { const metricsCalls: string[] = [] - + const mockIncrementMetric = (metric: string) => { metricsCalls.push(metric) } @@ -99,9 +118,12 @@ describe('Clear Filters Metrics Tests', () => { it('should track the complete clear filters workflow', () => { const workflowEvents: Array<{ event: string; timestamp: number }> = [] const currentTime = Date.now() - + const mockEvent = (event: string) => { - workflowEvents.push({ event, timestamp: currentTime + workflowEvents.length }) + workflowEvents.push({ + event, + timestamp: currentTime + workflowEvents.length, + }) } // Simulate the complete clear filters workflow @@ -140,12 +162,16 @@ describe('Clear Filters Metrics Tests', () => { const metricsEventIndex = workflowEvents.findIndex( event => event.event === 'increment_metric_appliesClearAllFiltersCount' ) - assert.equal(metricsEventIndex, 1, 'Metrics should be tracked early in the workflow') + assert.equal( + metricsEventIndex, + 1, + 'Metrics should be tracked early in the workflow' + ) }) it('should handle multiple rapid clear filters calls', () => { const metricsCalls: number[] = [] - + const mockIncrementMetric = (metric: string) => { if (metric === 'appliesClearAllFiltersCount') { metricsCalls.push(Date.now()) @@ -157,7 +183,11 @@ describe('Clear Filters Metrics Tests', () => { mockIncrementMetric('appliesClearAllFiltersCount') } - assert.equal(metricsCalls.length, 5, 'Should track each clear filters call separately') + assert.equal( + metricsCalls.length, + 5, + 'Should track each clear filters call separately' + ) }) }) @@ -167,41 +197,51 @@ describe('Clear Filters Metrics Tests', () => { { hasActiveFilters: false, shouldTrackMetrics: false, - description: 'no filters active - button hidden' + description: 'no filters active - button hidden', }, { hasActiveFilters: true, shouldTrackMetrics: true, - description: 'filters active - button visible' + description: 'filters active - button visible', }, ] - buttonVisibilityScenarios.forEach(({ hasActiveFilters, shouldTrackMetrics, description }) => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } + buttonVisibilityScenarios.forEach( + ({ hasActiveFilters, shouldTrackMetrics, description }) => { + const metricsCalls: string[] = [] - // Only call metrics if button would be visible - if (hasActiveFilters) { - mockIncrementMetric('appliesClearAllFiltersCount') - } + const mockIncrementMetric = (metric: string) => { + metricsCalls.push(metric) + } - const hasMetrics = metricsCalls.includes('appliesClearAllFiltersCount') - assert.equal(hasMetrics, shouldTrackMetrics, description) - }) + // Only call metrics if button would be visible + if (hasActiveFilters) { + mockIncrementMetric('appliesClearAllFiltersCount') + } + + const hasMetrics = metricsCalls.includes( + 'appliesClearAllFiltersCount' + ) + assert.equal(hasMetrics, shouldTrackMetrics, description) + } + ) }) it('should track metrics for both clear filters button locations', () => { const buttonLocations = [ - { location: 'filter_dropdown', description: 'Clear filters button in filter options dropdown' }, - { location: 'empty_state', description: 'Clear filters button in empty state' }, + { + location: 'filter_dropdown', + description: 'Clear filters button in filter options dropdown', + }, + { + location: 'empty_state', + description: 'Clear filters button in empty state', + }, ] buttonLocations.forEach(({ location, description }) => { const metricsCalls: Array<{ metric: string; source: string }> = [] - + const mockIncrementMetric = (metric: string, source: string) => { metricsCalls.push({ metric, source }) } @@ -210,7 +250,9 @@ describe('Clear Filters Metrics Tests', () => { mockIncrementMetric('appliesClearAllFiltersCount', location) const relevantCall = metricsCalls.find( - call => call.metric === 'appliesClearAllFiltersCount' && call.source === location + call => + call.metric === 'appliesClearAllFiltersCount' && + call.source === location ) assert.ok(relevantCall, `Should track metrics for ${description}`) }) @@ -220,7 +262,7 @@ describe('Clear Filters Metrics Tests', () => { describe('edge cases for clear filters metrics', () => { it('should handle clear filters with no repository context', () => { const metricsCalls: string[] = [] - + const mockIncrementMetric = (metric: string) => { metricsCalls.push(metric) } @@ -237,7 +279,7 @@ describe('Clear Filters Metrics Tests', () => { it('should handle clear filters during component unmount', () => { let componentMounted = true const metricsCalls: string[] = [] - + const mockIncrementMetric = (metric: string) => { if (componentMounted) { metricsCalls.push(metric) @@ -246,10 +288,10 @@ describe('Clear Filters Metrics Tests', () => { // Call clear filters before unmount mockIncrementMetric('appliesClearAllFiltersCount') - + // Simulate component unmount componentMounted = false - + // Try to call clear filters after unmount (should not track) mockIncrementMetric('appliesClearAllFiltersCount') @@ -264,13 +306,16 @@ describe('Clear Filters Metrics Tests', () => { const corruptedStates = [ { filterText: null, description: 'null filter text' }, { filterText: undefined, description: 'undefined filter text' }, - { includedChangesInCommitFilter: null, description: 'null boolean filter' }, + { + includedChangesInCommitFilter: null, + description: 'null boolean filter', + }, { filterNewFiles: 'true', description: 'string instead of boolean' }, ] corruptedStates.forEach(({ description }) => { const metricsCalls: string[] = [] - + const mockIncrementMetric = (metric: string) => { metricsCalls.push(metric) } @@ -280,7 +325,9 @@ describe('Clear Filters Metrics Tests', () => { mockIncrementMetric('appliesClearAllFiltersCount') } catch (error) { // Should not throw errors - assert.fail(`Clear filters should handle corrupted state: ${description}`) + assert.fail( + `Clear filters should handle corrupted state: ${description}` + ) } assert.ok( @@ -290,4 +337,4 @@ describe('Clear Filters Metrics Tests', () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/app/test/unit/filter-changes-list-ui-interactions-test.ts b/app/test/unit/filter-changes-list-ui-interactions-test.ts index e0ee9c58163..414ea28eb41 100644 --- a/app/test/unit/filter-changes-list-ui-interactions-test.ts +++ b/app/test/unit/filter-changes-list-ui-interactions-test.ts @@ -484,7 +484,7 @@ describe('FilterChangesList UI Interactions Tests', () => { } // Verify initial state has filters active - const hasInitialFilters = + const hasInitialFilters = initialState.filterText !== '' || initialState.includedChangesInCommitFilter || initialState.filterNewFiles || @@ -493,7 +493,7 @@ describe('FilterChangesList UI Interactions Tests', () => { initialState.filterExcludedFiles // Verify cleared state has no filters active - const hasClearedFilters = + const hasClearedFilters = clearedState.filterText !== '' || clearedState.includedChangesInCommitFilter || clearedState.filterNewFiles || @@ -533,29 +533,45 @@ describe('FilterChangesList UI Interactions Tests', () => { // Test the logic for determining if clear filters button should be visible const testCases = [ { - state: { filterText: '', includedChangesInCommitFilter: false, filterNewFiles: false }, + state: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + }, expected: false, - description: 'no filters active' + description: 'no filters active', }, { - state: { filterText: 'README', includedChangesInCommitFilter: false, filterNewFiles: false }, + state: { + filterText: 'README', + includedChangesInCommitFilter: false, + filterNewFiles: false, + }, expected: true, - description: 'only text filter active' + description: 'only text filter active', }, { - state: { filterText: '', includedChangesInCommitFilter: true, filterNewFiles: false }, + state: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: false, + }, expected: true, - description: 'only included filter active' + description: 'only included filter active', }, { - state: { filterText: 'test', includedChangesInCommitFilter: true, filterNewFiles: true }, + state: { + filterText: 'test', + includedChangesInCommitFilter: true, + filterNewFiles: true, + }, expected: true, - description: 'multiple filters active' + description: 'multiple filters active', }, ] testCases.forEach(({ state, expected, description }) => { - const hasActiveFilters = + const hasActiveFilters = state.filterText.length > 0 || state.includedChangesInCommitFilter || state.filterNewFiles @@ -577,7 +593,7 @@ describe('FilterChangesList UI Interactions Tests', () => { }, filterText: '', expectedVisible: false, - description: 'no filters - button should be hidden' + description: 'no filters - button should be hidden', }, { filters: { @@ -589,7 +605,7 @@ describe('FilterChangesList UI Interactions Tests', () => { }, filterText: '', expectedVisible: true, - description: 'one filter active - button should be visible' + description: 'one filter active - button should be visible', }, { filters: { @@ -601,7 +617,7 @@ describe('FilterChangesList UI Interactions Tests', () => { }, filterText: 'search', expectedVisible: true, - description: 'only text filter - button should be visible' + description: 'only text filter - button should be visible', }, { filters: { @@ -613,45 +629,63 @@ describe('FilterChangesList UI Interactions Tests', () => { }, filterText: 'complex search', expectedVisible: true, - description: 'all filters active - button should be visible' + description: 'all filters active - button should be visible', }, ] - scenarios.forEach(({ filters, filterText, expectedVisible, description }) => { - // Logic from renderFilterOptions for dropdown button - const hasActiveFiltersDropdown = [ - filters.includedChangesInCommitFilter, - filters.filterNewFiles, - filters.filterModifiedFiles, - filters.filterDeletedFiles, - filters.filterExcludedFiles, - ].some(Boolean) - - // Logic from renderNoChanges for empty state button - const hasActiveFiltersEmptyState = [ - filters.includedChangesInCommitFilter, - filters.filterNewFiles, - filters.filterModifiedFiles, - filters.filterDeletedFiles, - filters.filterExcludedFiles, - ].some(Boolean) || filterText.length > 0 - - if (filterText.length > 0) { - // When text filter is active, empty state button should always be visible - assert.equal(hasActiveFiltersEmptyState, true, `Empty state: ${description}`) - } else { - // When no text filter, both buttons should have same visibility - assert.equal(hasActiveFiltersDropdown, expectedVisible, `Dropdown: ${description}`) - assert.equal(hasActiveFiltersEmptyState, expectedVisible, `Empty state: ${description}`) + scenarios.forEach( + ({ filters, filterText, expectedVisible, description }) => { + // Logic from renderFilterOptions for dropdown button + const hasActiveFiltersDropdown = [ + filters.includedChangesInCommitFilter, + filters.filterNewFiles, + filters.filterModifiedFiles, + filters.filterDeletedFiles, + filters.filterExcludedFiles, + ].some(Boolean) + + // Logic from renderNoChanges for empty state button + const hasActiveFiltersEmptyState = + [ + filters.includedChangesInCommitFilter, + filters.filterNewFiles, + filters.filterModifiedFiles, + filters.filterDeletedFiles, + filters.filterExcludedFiles, + ].some(Boolean) || filterText.length > 0 + + if (filterText.length > 0) { + // When text filter is active, empty state button should always be visible + assert.equal( + hasActiveFiltersEmptyState, + true, + `Empty state: ${description}` + ) + } else { + // When no text filter, both buttons should have same visibility + assert.equal( + hasActiveFiltersDropdown, + expectedVisible, + `Dropdown: ${description}` + ) + assert.equal( + hasActiveFiltersEmptyState, + expectedVisible, + `Empty state: ${description}` + ) + } } - }) + ) }) it('clear filters operation resets to default state', () => { // Simulate the exact dispatcher calls made by onClearAllFilters const dispatcherCalls = [ { method: 'setChangesListFilterText', args: ['repository', ''] }, - { method: 'setIncludedChangesInCommitFilter', args: ['repository', false] }, + { + method: 'setIncludedChangesInCommitFilter', + args: ['repository', false], + }, { method: 'setFilterExcludedFiles', args: ['repository', false] }, { method: 'setFilterNewFiles', args: ['repository', false] }, { method: 'setFilterModifiedFiles', args: ['repository', false] }, @@ -661,32 +695,50 @@ describe('FilterChangesList UI Interactions Tests', () => { // Verify all expected dispatcher calls are made assert.equal(dispatcherCalls.length, 7) - + // Verify text filter is cleared - const textFilterCall = dispatcherCalls.find(call => call.method === 'setChangesListFilterText') + const textFilterCall = dispatcherCalls.find( + call => call.method === 'setChangesListFilterText' + ) assert.ok(textFilterCall, 'Should call setChangesListFilterText') assert.equal(textFilterCall.args[1], '', 'Should clear text filter') // Verify all boolean filters are set to false - const booleanFilterCalls = dispatcherCalls.filter(call => - call.method.startsWith('setFilter') || call.method === 'setIncludedChangesInCommitFilter' + const booleanFilterCalls = dispatcherCalls.filter( + call => + call.method.startsWith('setFilter') || + call.method === 'setIncludedChangesInCommitFilter' ) - assert.equal(booleanFilterCalls.length, 5, 'Should have 5 boolean filter calls') - + assert.equal( + booleanFilterCalls.length, + 5, + 'Should have 5 boolean filter calls' + ) + booleanFilterCalls.forEach(call => { - assert.equal(call.args[1], false, `${call.method} should be set to false`) + assert.equal( + call.args[1], + false, + `${call.method} should be set to false` + ) }) // Verify metrics are tracked - const metricsCall = dispatcherCalls.find(call => call.method === 'incrementMetric') + const metricsCall = dispatcherCalls.find( + call => call.method === 'incrementMetric' + ) assert.ok(metricsCall, 'Should call incrementMetric') - assert.equal(metricsCall.args[0], 'appliesClearAllFiltersCount', 'Should track clear all filters metric') + assert.equal( + metricsCall.args[0], + 'appliesClearAllFiltersCount', + 'Should track clear all filters metric' + ) }) it('clear filters closes filter options popover', () => { // Test that closeFilterOptions is called after clearing filters let popoverClosed = false - + const mockCloseFilterOptions = () => { popoverClosed = true } @@ -694,7 +746,11 @@ describe('FilterChangesList UI Interactions Tests', () => { // Simulate the end of onClearAllFilters method mockCloseFilterOptions() - assert.equal(popoverClosed, true, 'Should close filter options popover after clearing') + assert.equal( + popoverClosed, + true, + 'Should close filter options popover after clearing' + ) }) }) From 6f9764e55b5e08fee5cd5729603d7a972a30bf36 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 13:49:44 +0400 Subject: [PATCH 0455/1338] Update CSS for better overflow handling and top alignment --- app/styles/ui/changes/_changes-list.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 9478fa88ccd..231221f92c3 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -292,11 +292,12 @@ flex: 1; flex-direction: column; align-items: center; - justify-content: center; + justify-content: flex-start; text-align: center; padding: var(--spacing); box-sizing: border-box; - overflow: hidden; // Prevent scrollbars + overflow-x: hidden; + overflow-y: auto; max-height: 100%; // Ensure it fits within container container-type: size; // Enable container queries @@ -327,7 +328,6 @@ white-space: pre-line; line-height: 1.4; flex-shrink: 1; // Allow subtitle to shrink if needed - overflow: hidden; max-height: 100px; // Prevent excessive height } From 148abd6092d0e4ceff847193c8c7aab664933637 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 13:51:20 +0400 Subject: [PATCH 0456/1338] Add Changes prefix to filter stats naming --- app/src/lib/stats/stats-database.ts | 12 ++++++------ app/src/lib/stats/stats-store.ts | 6 +++--- app/src/ui/changes/filter-changes-list.tsx | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/lib/stats/stats-database.ts b/app/src/lib/stats/stats-database.ts index 85fce08a4bf..4195e1c2346 100644 --- a/app/src/lib/stats/stats-database.ts +++ b/app/src/lib/stats/stats-database.ts @@ -610,14 +610,14 @@ export interface IDailyMeasures { /** The number of times the user applies the "Excluded from Commit" Filter */ appliesExcludedFromCommitFilterCount: 0 - /** The number of times the user applies the "New Files" Filter */ - appliesNewFilesFilterCount: 0 + /** The number of times the user applies the "New Files" Changes Filter */ + appliesNewFilesChangesFilterCount: 0 - /** The number of times the user applies the "Modified Files" Filter */ - appliesModifiedFilesFilterCount: 0 + /** The number of times the user applies the "Modified Files" Changes Filter */ + appliesModifiedFilesChangesFilterCount: 0 - /** The number of times the user applies the "Deleted Files" Filter */ - appliesDeletedFilesFilterCount: 0 + /** The number of times the user applies the "Deleted Files" Changes Filter */ + appliesDeletedFilesChangesFilterCount: 0 /** The number of times the user clears all filters */ appliesClearAllFiltersCount: 0 diff --git a/app/src/lib/stats/stats-store.ts b/app/src/lib/stats/stats-store.ts index 6d6740f55cc..95029c93a8e 100644 --- a/app/src/lib/stats/stats-store.ts +++ b/app/src/lib/stats/stats-store.ts @@ -243,9 +243,9 @@ const DefaultDailyMeasures: IDailyMeasures = { typedInChangesFilterCount: 0, appliesIncludedInCommitFilterCount: 0, appliesExcludedFromCommitFilterCount: 0, - appliesNewFilesFilterCount: 0, - appliesModifiedFilesFilterCount: 0, - appliesDeletedFilesFilterCount: 0, + appliesNewFilesChangesFilterCount: 0, + appliesModifiedFilesChangesFilterCount: 0, + appliesDeletedFilesChangesFilterCount: 0, appliesClearAllFiltersCount: 0, adjustedFiltersForHiddenChangesCount: 0, enterpriseAccountCount: 0, diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index a39dc310c58..54e4557924c 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1766,7 +1766,7 @@ export class FilterChangesList extends React.Component< private onFilterNewFiles = () => { if (!this.props.filterNewFiles) { - this.props.dispatcher.incrementMetric('appliesNewFilesFilterCount') + this.props.dispatcher.incrementMetric('appliesNewFilesChangesFilterCount') } this.props.dispatcher.setFilterNewFiles( this.props.repository, @@ -1777,7 +1777,7 @@ export class FilterChangesList extends React.Component< private onFilterModifiedFiles = () => { if (!this.props.filterModifiedFiles) { - this.props.dispatcher.incrementMetric('appliesModifiedFilesFilterCount') + this.props.dispatcher.incrementMetric('appliesModifiedFilesChangesFilterCount') } this.props.dispatcher.setFilterModifiedFiles( this.props.repository, @@ -1788,7 +1788,7 @@ export class FilterChangesList extends React.Component< private onFilterDeletedFiles = () => { if (!this.props.filterDeletedFiles) { - this.props.dispatcher.incrementMetric('appliesDeletedFilesFilterCount') + this.props.dispatcher.incrementMetric('appliesDeletedFilesChangesFilterCount') } this.props.dispatcher.setFilterDeletedFiles( this.props.repository, From 5124ea34edf8a79a452d01a9fa0b4aad0b43cdc2 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 13:52:04 +0400 Subject: [PATCH 0457/1338] Change no results message to comma-delimited format --- app/src/ui/changes/filter-changes-list.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 54e4557924c..f293c682487 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1700,8 +1700,8 @@ export class FilterChangesList extends React.Component< return undefined } - const bulletedList = activeFilters.map(filter => `• ${filter}`).join('\n') - return `Sorry, I can't find any changed files matching the following filters:\n${bulletedList}` + const filterList = activeFilters.join(', ') + return `Sorry, I can't find any changed files matching the following filters: ${filterList}` } private renderNoChanges = () => { From 8dc8bf50179deb731bd7eb896869763d18c60762 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 13:56:46 +0400 Subject: [PATCH 0458/1338] Update tests for FileListFilterState interface --- app/test/unit/app-store-filter-test.ts | 36 ++-- app/test/unit/changes-filter-test.ts | 234 +++++++++++++++++-------- 2 files changed, 186 insertions(+), 84 deletions(-) diff --git a/app/test/unit/app-store-filter-test.ts b/app/test/unit/app-store-filter-test.ts index 23e99037f4e..79672f59353 100644 --- a/app/test/unit/app-store-filter-test.ts +++ b/app/test/unit/app-store-filter-test.ts @@ -143,37 +143,49 @@ describe('App Store Filter Functionality', () => { describe('_setFilterNewFiles', () => { it('enables new files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterNewFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterNewFiles: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) }) it('disables new files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterNewFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterNewFiles: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterNewFiles, false) + assert.equal(state.changesState.fileListFilter.filterNewFiles, false) }) it('toggles new files filter state', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterNewFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterNewFiles: true, + }, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - repositoryStateCache.updateChangesState(repository, () => ({ - filterNewFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterNewFiles: false, + }, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterNewFiles, false) + assert.equal(state.changesState.fileListFilter.filterNewFiles, false) }) }) diff --git a/app/test/unit/changes-filter-test.ts b/app/test/unit/changes-filter-test.ts index e8f8f8d27ff..91d2d5aed9d 100644 --- a/app/test/unit/changes-filter-test.ts +++ b/app/test/unit/changes-filter-test.ts @@ -48,186 +48,276 @@ describe('Changes Filter Functionality', () => { workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) }) - describe('filterNewFiles', () => { + describe('fileListFilter.filterNewFiles', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.filterNewFiles, false) + assert.equal(state.fileListFilter.filterNewFiles, false) }) it('can be set to true', () => { const state = createState({ - filterNewFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterNewFiles, true) + assert.equal(state.fileListFilter.filterNewFiles, true) }) it('can be set to false explicitly', () => { const state = createState({ - filterNewFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterNewFiles, false) + assert.equal(state.fileListFilter.filterNewFiles, false) }) }) - describe('filterModifiedFiles', () => { + describe('fileListFilter.filterModifiedFiles', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.filterModifiedFiles, false) + assert.equal(state.fileListFilter.filterModifiedFiles, false) }) it('can be set to true', () => { const state = createState({ - filterModifiedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterModifiedFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, true) }) it('can be set to false explicitly', () => { const state = createState({ - filterModifiedFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterModifiedFiles, false) + assert.equal(state.fileListFilter.filterModifiedFiles, false) }) }) - describe('filterDeletedFiles', () => { + describe('fileListFilter.filterDeletedFiles', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.filterDeletedFiles, false) + assert.equal(state.fileListFilter.filterDeletedFiles, false) }) it('can be set to true', () => { const state = createState({ - filterDeletedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterDeletedFiles, true) + assert.equal(state.fileListFilter.filterDeletedFiles, true) }) it('can be set to false explicitly', () => { const state = createState({ - filterDeletedFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterDeletedFiles, false) + assert.equal(state.fileListFilter.filterDeletedFiles, false) }) }) - describe('filterExcludedFiles', () => { + describe('fileListFilter.filterExcludedFiles', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.filterExcludedFiles, false) + assert.equal(state.fileListFilter.filterExcludedFiles, false) }) it('can be set to true', () => { const state = createState({ - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + }, }) - assert.equal(state.filterExcludedFiles, true) + assert.equal(state.fileListFilter.filterExcludedFiles, true) }) it('can be set to false explicitly', () => { const state = createState({ - filterExcludedFiles: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterExcludedFiles, false) + assert.equal(state.fileListFilter.filterExcludedFiles, false) }) }) - describe('includedChangesInCommitFilter', () => { + describe('fileListFilter.includedChangesInCommitFilter', () => { it('initializes with default value false', () => { const state = createState({}) - assert.equal(state.includedChangesInCommitFilter, false) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) }) it('can be set to true', () => { const state = createState({ - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.includedChangesInCommitFilter, true) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) }) it('can be set to false explicitly', () => { const state = createState({ - includedChangesInCommitFilter: false, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.includedChangesInCommitFilter, false) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) }) }) - describe('filterText', () => { + describe('fileListFilter.filterText', () => { it('initializes with empty string', () => { const state = createState({}) - assert.equal(state.filterText, '') + assert.equal(state.fileListFilter.filterText, '') }) it('can be set to a filter string', () => { const filterText = 'README' const state = createState({ - filterText, + fileListFilter: { + filterText, + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, filterText) + assert.equal(state.fileListFilter.filterText, filterText) }) it('can be set to empty string explicitly', () => { const state = createState({ - filterText: '', + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, '') + assert.equal(state.fileListFilter.filterText, '') }) }) describe('combined filter states', () => { it('can have multiple filters enabled simultaneously', () => { const state = createState({ - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - filterText: 'test', + fileListFilter: { + filterText: 'test', + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + includedChangesInCommitFilter: true, + }, }) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterModifiedFiles, true) - assert.equal(state.filterDeletedFiles, true) - assert.equal(state.filterExcludedFiles, true) - assert.equal(state.includedChangesInCommitFilter, true) - assert.equal(state.filterText, 'test') + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, true) + assert.equal(state.fileListFilter.filterDeletedFiles, true) + assert.equal(state.fileListFilter.filterExcludedFiles, true) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) + assert.equal(state.fileListFilter.filterText, 'test') }) it('can have mixed filter states', () => { const state = createState({ - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - includedChangesInCommitFilter: true, - filterText: 'feature', + fileListFilter: { + filterText: 'feature', + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: false, + includedChangesInCommitFilter: true, + }, }) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterModifiedFiles, false) - assert.equal(state.filterDeletedFiles, true) - assert.equal(state.filterExcludedFiles, false) - assert.equal(state.includedChangesInCommitFilter, true) - assert.equal(state.filterText, 'feature') + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, false) + assert.equal(state.fileListFilter.filterDeletedFiles, true) + assert.equal(state.fileListFilter.filterExcludedFiles, false) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) + assert.equal(state.fileListFilter.filterText, 'feature') }) it('can disable all filters', () => { const state = createState({ - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, - filterText: '', + fileListFilter: { + filterText: '', + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + includedChangesInCommitFilter: false, + }, }) - assert.equal(state.filterNewFiles, false) - assert.equal(state.filterModifiedFiles, false) - assert.equal(state.filterDeletedFiles, false) - assert.equal(state.filterExcludedFiles, false) - assert.equal(state.includedChangesInCommitFilter, false) - assert.equal(state.filterText, '') + assert.equal(state.fileListFilter.filterNewFiles, false) + assert.equal(state.fileListFilter.filterModifiedFiles, false) + assert.equal(state.fileListFilter.filterDeletedFiles, false) + assert.equal(state.fileListFilter.filterExcludedFiles, false) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) + assert.equal(state.fileListFilter.filterText, '') }) }) From cd034b17323d799400b22832b040158c29650865 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 17 Jun 2025 15:47:27 +0400 Subject: [PATCH 0459/1338] fix unit tests and eslint --- app/src/ui/changes/filter-changes-list.tsx | 23 +- app/src/ui/changes/sidebar.tsx | 12 +- app/test/unit/app-store-filter-test.ts | 419 ++++++++++------ .../unit/changes-filter-integration-test.ts | 459 +++++++++++++----- app/test/unit/changes-filter-test.ts | 153 ++++-- 5 files changed, 739 insertions(+), 327 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index f293c682487..06552033ec5 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -281,6 +281,11 @@ export class FilterChangesList extends React.Component< IFilterChangesListState > { private filterTextBox: TextBox | undefined = undefined + private headerRef = createObservableRef() + private filterOptionsButtonRef: HTMLButtonElement | null = null + private includeAllCheckBoxRef = React.createRef() + private filterListRef = + React.createRef>() private isCommittingFileHiddenByFilter = memoizeOne( ( @@ -414,12 +419,6 @@ export class FilterChangesList extends React.Component< } ) - private headerRef = createObservableRef() - private filterOptionsButtonRef: HTMLButtonElement | null = null - private includeAllCheckBoxRef = React.createRef() - private filterListRef = - React.createRef>() - public constructor(props: IFilterChangesListProps) { super(props) @@ -473,7 +472,7 @@ export class FilterChangesList extends React.Component< const include = event.currentTarget.checked const filteredItemPaths = Array.from( this.state.filteredItems, - ([k, v]) => v.change + ([, v]) => v.change ) this.props.onIncludeChanged(filteredItemPaths, include) } @@ -949,7 +948,7 @@ export class FilterChangesList extends React.Component< } } - private onScroll = (scrollTop: number, clientHeight: number) => { + private onScroll = (scrollTop: number, _clientHeight: number) => { this.props.onChangesListScrolled(scrollTop) } @@ -1777,7 +1776,9 @@ export class FilterChangesList extends React.Component< private onFilterModifiedFiles = () => { if (!this.props.filterModifiedFiles) { - this.props.dispatcher.incrementMetric('appliesModifiedFilesChangesFilterCount') + this.props.dispatcher.incrementMetric( + 'appliesModifiedFilesChangesFilterCount' + ) } this.props.dispatcher.setFilterModifiedFiles( this.props.repository, @@ -1788,7 +1789,9 @@ export class FilterChangesList extends React.Component< private onFilterDeletedFiles = () => { if (!this.props.filterDeletedFiles) { - this.props.dispatcher.incrementMetric('appliesDeletedFilesChangesFilterCount') + this.props.dispatcher.incrementMetric( + 'appliesDeletedFilesChangesFilterCount' + ) } this.props.dispatcher.setFilterDeletedFiles( this.props.repository, diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 4aee591c4f1..e5e83cafd31 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -464,9 +464,15 @@ export class ChangesSidebar extends React.Component { this.props.changes.fileListFilter.includedChangesInCommitFilter } filterNewFiles={this.props.changes.fileListFilter.filterNewFiles} - filterModifiedFiles={this.props.changes.fileListFilter.filterModifiedFiles} - filterDeletedFiles={this.props.changes.fileListFilter.filterDeletedFiles} - filterExcludedFiles={this.props.changes.fileListFilter.filterExcludedFiles} + filterModifiedFiles={ + this.props.changes.fileListFilter.filterModifiedFiles + } + filterDeletedFiles={ + this.props.changes.fileListFilter.filterDeletedFiles + } + filterExcludedFiles={ + this.props.changes.fileListFilter.filterExcludedFiles + } showChangesFilter={this.props.showChangesFilter} /> {this.renderUndoCommit(rebaseConflictState)} diff --git a/app/test/unit/app-store-filter-test.ts b/app/test/unit/app-store-filter-test.ts index 79672f59353..cc00c260c48 100644 --- a/app/test/unit/app-store-filter-test.ts +++ b/app/test/unit/app-store-filter-test.ts @@ -52,92 +52,134 @@ describe('App Store Filter Functionality', () => { it('updates filter text in repository state cache', () => { const filterText = 'README' - repositoryStateCache.updateChangesState(repository, () => ({ - filterText, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, filterText) + assert.equal(state.changesState.fileListFilter.filterText, filterText) }) it('handles empty filter text', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: '', + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: '', + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, '') + assert.equal(state.changesState.fileListFilter.filterText, '') }) it('handles special characters in filter text', () => { const specialText = 'file@#$%^&*().txt' - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: specialText, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: specialText, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, specialText) + assert.equal(state.changesState.fileListFilter.filterText, specialText) }) it('handles unicode characters in filter text', () => { const unicodeText = '测试文件.txt' - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: unicodeText, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: unicodeText, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, unicodeText) + assert.equal(state.changesState.fileListFilter.filterText, unicodeText) }) it('overwrites previous filter text', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'first', + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'first', + }, })) - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'second', + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'second', + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'second') + assert.equal(state.changesState.fileListFilter.filterText, 'second') }) }) describe('_setIncludedChangesInCommitFilter', () => { it('enables included changes filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + includedChangesInCommitFilter: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.includedChangesInCommitFilter, true) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + true + ) }) it('disables included changes filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - includedChangesInCommitFilter: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + includedChangesInCommitFilter: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.includedChangesInCommitFilter, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + false + ) }) it('toggles included changes filter state', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + includedChangesInCommitFilter: true, + }, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.includedChangesInCommitFilter, true) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + true + ) - repositoryStateCache.updateChangesState(repository, () => ({ - includedChangesInCommitFilter: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + includedChangesInCommitFilter: false, + }, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.includedChangesInCommitFilter, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + false + ) }) }) @@ -191,193 +233,256 @@ describe('App Store Filter Functionality', () => { describe('_setFilterModifiedFiles', () => { it('enables modified files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterModifiedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterModifiedFiles: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterModifiedFiles, true) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) }) it('disables modified files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterModifiedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterModifiedFiles: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterModifiedFiles, false) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) }) it('toggles modified files filter state', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterModifiedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterModifiedFiles: true, + }, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterModifiedFiles, true) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) - repositoryStateCache.updateChangesState(repository, () => ({ - filterModifiedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterModifiedFiles: false, + }, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterModifiedFiles, false) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) }) }) describe('_setFilterDeletedFiles', () => { it('enables deleted files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterDeletedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterDeletedFiles: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterDeletedFiles, true) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) }) it('disables deleted files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterDeletedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterDeletedFiles: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterDeletedFiles, false) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) }) it('toggles deleted files filter state', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterDeletedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterDeletedFiles: true, + }, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterDeletedFiles, true) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) - repositoryStateCache.updateChangesState(repository, () => ({ - filterDeletedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterDeletedFiles: false, + }, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterDeletedFiles, false) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) }) }) describe('_setFilterExcludedFiles', () => { it('enables excluded files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterExcludedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterExcludedFiles: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterExcludedFiles, true) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) }) it('disables excluded files filter', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterExcludedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterExcludedFiles: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterExcludedFiles, false) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) }) it('toggles excluded files filter state', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterExcludedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterExcludedFiles: true, + }, })) let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterExcludedFiles, true) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) - repositoryStateCache.updateChangesState(repository, () => ({ - filterExcludedFiles: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterExcludedFiles: false, + }, })) state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterExcludedFiles, false) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) }) }) describe('combined filter operations', () => { it('sets multiple filters simultaneously', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'test', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'test', + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + includedChangesInCommitFilter: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'test') - assert.equal(state.changesState.filterNewFiles, true) - assert.equal(state.changesState.filterModifiedFiles, true) - assert.equal(state.changesState.filterDeletedFiles, true) - assert.equal(state.changesState.filterExcludedFiles, true) - assert.equal(state.changesState.includedChangesInCommitFilter, true) + assert.equal(state.changesState.fileListFilter.filterText, 'test') + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + true + ) }) it('updates individual filters without affecting others', () => { // Set initial state - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'initial', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'initial', + filterNewFiles: true, + filterModifiedFiles: false, + includedChangesInCommitFilter: true, + }, })) // Update only filter text - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'updated', + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'updated', + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'updated') - assert.equal(state.changesState.filterNewFiles, true) - assert.equal(state.changesState.filterModifiedFiles, false) - assert.equal(state.changesState.includedChangesInCommitFilter, true) + assert.equal(state.changesState.fileListFilter.filterText, 'updated') + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + true + ) }) it('handles mixed filter states', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'partial', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'partial', + filterNewFiles: true, + filterModifiedFiles: false, + includedChangesInCommitFilter: true, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'partial') - assert.equal(state.changesState.filterNewFiles, true) - assert.equal(state.changesState.filterModifiedFiles, false) - assert.equal(state.changesState.includedChangesInCommitFilter, true) + assert.equal(state.changesState.fileListFilter.filterText, 'partial') + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + true + ) }) }) describe('filter state persistence', () => { it('maintains filter state across multiple updates', () => { // Set initial filters - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'persistent', - filterNewFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'persistent', + filterNewFiles: true, + }, })) // Update working directory without affecting filters const workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - repositoryStateCache.updateChangesState(repository, () => ({ + repositoryStateCache.updateChangesState(repository, state => ({ workingDirectory, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'persistent') - assert.equal(state.changesState.filterNewFiles, true) + assert.equal(state.changesState.fileListFilter.filterText, 'persistent') + assert.equal(state.changesState.fileListFilter.filterNewFiles, true) assert.equal(state.changesState.workingDirectory.files.length, 4) }) it('preserves filter state when updating selection', () => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'selection-test', - filterModifiedFiles: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'selection-test', + filterModifiedFiles: true, + }, selection: { kind: ChangesSelectionKind.WorkingDirectory, selectedFileIDs: ['test-id'], @@ -386,8 +491,11 @@ describe('App Store Filter Functionality', () => { })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'selection-test') - assert.equal(state.changesState.filterModifiedFiles, true) + assert.equal( + state.changesState.fileListFilter.filterText, + 'selection-test' + ) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) assert.equal( state.changesState.selection.kind, ChangesSelectionKind.WorkingDirectory @@ -399,42 +507,54 @@ describe('App Store Filter Functionality', () => { it('initializes with correct default filter values', () => { const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, '') - assert.equal(state.changesState.filterNewFiles, false) - assert.equal(state.changesState.filterModifiedFiles, false) - assert.equal(state.changesState.filterDeletedFiles, false) - assert.equal(state.changesState.filterExcludedFiles, false) - assert.equal(state.changesState.includedChangesInCommitFilter, false) + assert.equal(state.changesState.fileListFilter.filterText, '') + assert.equal(state.changesState.fileListFilter.filterNewFiles, false) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + false + ) }) it('resets to default values when explicitly set', () => { // Set non-default values - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: 'non-default', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: 'non-default', + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + includedChangesInCommitFilter: true, + }, })) // Reset to defaults - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: '', + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + includedChangesInCommitFilter: false, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, '') - assert.equal(state.changesState.filterNewFiles, false) - assert.equal(state.changesState.filterModifiedFiles, false) - assert.equal(state.changesState.filterDeletedFiles, false) - assert.equal(state.changesState.filterExcludedFiles, false) - assert.equal(state.changesState.includedChangesInCommitFilter, false) + assert.equal(state.changesState.fileListFilter.filterText, '') + assert.equal(state.changesState.fileListFilter.filterNewFiles, false) + assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) + assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) + assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) + assert.equal( + state.changesState.fileListFilter.includedChangesInCommitFilter, + false + ) }) }) @@ -442,24 +562,30 @@ describe('App Store Filter Functionality', () => { it('handles very long filter text', () => { const longText = 'a'.repeat(10000) - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: longText, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: longText, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, longText) - assert.equal(state.changesState.filterText.length, 10000) + assert.equal(state.changesState.fileListFilter.filterText, longText) + assert.equal(state.changesState.fileListFilter.filterText.length, 10000) }) it('handles filter text with newlines and special characters', () => { const complexText = 'line1\nline2\ttab\rcarriage-return' - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: complexText, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: complexText, + }, })) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, complexText) + assert.equal(state.changesState.fileListFilter.filterText, complexText) }) it('handles rapid filter updates', () => { @@ -467,13 +593,16 @@ describe('App Store Filter Functionality', () => { const updates = ['a', 'ab', 'abc', 'abcd', 'abcde'] updates.forEach(text => { - repositoryStateCache.updateChangesState(repository, () => ({ - filterText: text, + repositoryStateCache.updateChangesState(repository, state => ({ + fileListFilter: { + ...state.fileListFilter, + filterText: text, + }, })) }) const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.filterText, 'abcde') + assert.equal(state.changesState.fileListFilter.filterText, 'abcde') }) }) }) diff --git a/app/test/unit/changes-filter-integration-test.ts b/app/test/unit/changes-filter-integration-test.ts index 364f0259b75..66d8c60035a 100644 --- a/app/test/unit/changes-filter-integration-test.ts +++ b/app/test/unit/changes-filter-integration-test.ts @@ -75,13 +75,22 @@ describe('Changes Filter Integration Tests', () => { it('filters files by filename', () => { const state = createState({ workingDirectory, - filterText: 'README', + fileListFilter: { + filterText: 'README', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) // In a real implementation, this would be handled by the UI component // that applies the filter. Here we simulate the filtering logic. const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 1) @@ -91,11 +100,20 @@ describe('Changes Filter Integration Tests', () => { it('filters files by partial path', () => { const state = createState({ workingDirectory, - filterText: 'src/', + fileListFilter: { + filterText: 'src/', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 2) @@ -106,11 +124,20 @@ describe('Changes Filter Integration Tests', () => { it('filters files by extension', () => { const state = createState({ workingDirectory, - filterText: '.tsx', + fileListFilter: { + filterText: '.tsx', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 2) @@ -121,11 +148,20 @@ describe('Changes Filter Integration Tests', () => { it('handles case-insensitive filtering', () => { const state = createState({ workingDirectory, - filterText: 'APP', + fileListFilter: { + filterText: 'APP', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 1) @@ -135,13 +171,22 @@ describe('Changes Filter Integration Tests', () => { it('returns all files when filter text is empty', () => { const state = createState({ workingDirectory, - filterText: '', + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter( file => - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, testFiles.length) @@ -152,12 +197,19 @@ describe('Changes Filter Integration Tests', () => { it('filters new files when filterNewFiles is enabled', () => { const state = createState({ workingDirectory, - filterNewFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) // Simulate the filtering logic that would be applied in the UI const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterNewFiles) { + if (!state.fileListFilter.filterNewFiles) { return true } return ( @@ -182,11 +234,18 @@ describe('Changes Filter Integration Tests', () => { it('filters modified files when filterModifiedFiles is enabled', () => { const state = createState({ workingDirectory, - filterModifiedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterModifiedFiles) { + if (!state.fileListFilter.filterModifiedFiles) { return true } return file.status.kind === AppFileStatusKind.Modified @@ -204,11 +263,18 @@ describe('Changes Filter Integration Tests', () => { it('filters included files when includedChangesInCommitFilter is enabled', () => { const state = createState({ workingDirectory, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.includedChangesInCommitFilter) { + if (!state.fileListFilter.includedChangesInCommitFilter) { return true } return file.selection.getSelectionType() !== DiffSelectionType.None @@ -230,11 +296,18 @@ describe('Changes Filter Integration Tests', () => { it('filters deleted files when filterDeletedFiles is enabled', () => { const state = createState({ workingDirectory, - filterDeletedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterDeletedFiles) { + if (!state.fileListFilter.filterDeletedFiles) { return true } return file.status.kind === AppFileStatusKind.Deleted @@ -250,11 +323,18 @@ describe('Changes Filter Integration Tests', () => { it('filters unstaged files when filterExcludedFiles is enabled', () => { const state = createState({ workingDirectory, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterExcludedFiles) { + if (!state.fileListFilter.filterExcludedFiles) { return true } // Unstaged files are those not selected for commit (noneSelected) @@ -277,17 +357,26 @@ describe('Changes Filter Integration Tests', () => { it('applies multiple filters simultaneously', () => { const state = createState({ workingDirectory, - filterText: 'src/', - filterNewFiles: true, + fileListFilter: { + filterText: 'src/', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) // Apply both text filter and new files filter const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesType = - !state.filterNewFiles || file.status.kind === AppFileStatusKind.New + !state.fileListFilter.filterNewFiles || + file.status.kind === AppFileStatusKind.New return matchesText && matchesType }) @@ -300,14 +389,20 @@ describe('Changes Filter Integration Tests', () => { it('applies multiple file type filters simultaneously', () => { const state = createState({ workingDirectory, - filterDeletedFiles: true, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: true, + }, }) // Apply both deleted and unstaged files filters const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging filter (unstaged files) - const hasStagingFilter = state.filterExcludedFiles + const hasStagingFilter = state.fileListFilter.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { matchesStagingFilter = @@ -315,7 +410,7 @@ describe('Changes Filter Integration Tests', () => { } // Check file type filter (deleted files) - const hasFileTypeFilter = state.filterDeletedFiles + const hasFileTypeFilter = state.fileListFilter.filterDeletedFiles let matchesFileTypeFilter = true if (hasFileTypeFilter) { matchesFileTypeFilter = file.status.kind === AppFileStatusKind.Deleted @@ -346,15 +441,22 @@ describe('Changes Filter Integration Tests', () => { it('applies both staged and unstaged filters simultaneously', () => { const state = createState({ workingDirectory, - includedChangesInCommitFilter: true, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + }, }) // Apply both staged and unstaged files filters const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging filter - should show both staged AND unstaged files const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterExcludedFiles + state.fileListFilter.includedChangesInCommitFilter || + state.fileListFilter.filterExcludedFiles let matchesStagingFilter = false if (hasStagingFilter) { const isStaged = @@ -364,13 +466,13 @@ describe('Changes Filter Integration Tests', () => { // When both filters are active, show files that match either condition if ( - state.includedChangesInCommitFilter && - state.filterExcludedFiles + state.fileListFilter.includedChangesInCommitFilter && + state.fileListFilter.filterExcludedFiles ) { matchesStagingFilter = isStaged || isUnstaged - } else if (state.includedChangesInCommitFilter) { + } else if (state.fileListFilter.includedChangesInCommitFilter) { matchesStagingFilter = isStaged - } else if (state.filterExcludedFiles) { + } else if (state.fileListFilter.filterExcludedFiles) { matchesStagingFilter = isUnstaged } } @@ -385,16 +487,24 @@ describe('Changes Filter Integration Tests', () => { it('applies text filter with deleted files filter', () => { const state = createState({ workingDirectory, - filterText: 'old', - filterDeletedFiles: true, + fileListFilter: { + filterText: 'old', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesType = - !state.filterDeletedFiles || + !state.fileListFilter.filterDeletedFiles || file.status.kind === AppFileStatusKind.Deleted return matchesText && matchesType @@ -408,16 +518,24 @@ describe('Changes Filter Integration Tests', () => { it('applies text filter with included changes filter', () => { const state = createState({ workingDirectory, - filterText: '.md', - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '.md', + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesIncluded = - !state.includedChangesInCommitFilter || + !state.fileListFilter.includedChangesInCommitFilter || file.selection.getSelectionType() !== DiffSelectionType.None return matchesText && matchesIncluded @@ -430,16 +548,25 @@ describe('Changes Filter Integration Tests', () => { it('returns empty result when filters exclude all files', () => { const state = createState({ workingDirectory, - filterText: 'nonexistent', - filterNewFiles: true, + fileListFilter: { + filterText: 'nonexistent', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesType = - !state.filterNewFiles || file.status.kind === AppFileStatusKind.New + !state.fileListFilter.filterNewFiles || + file.status.kind === AppFileStatusKind.New return matchesText && matchesType }) @@ -450,31 +577,36 @@ describe('Changes Filter Integration Tests', () => { it('handles all filters disabled (shows all files)', () => { const state = createState({ workingDirectory, - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, + fileListFilter: { + filterText: '', + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + includedChangesInCommitFilter: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesNewFiles = - !state.filterNewFiles || file.status.kind === AppFileStatusKind.New + !state.fileListFilter.filterNewFiles || + file.status.kind === AppFileStatusKind.New const matchesModifiedFiles = - !state.filterModifiedFiles || + !state.fileListFilter.filterModifiedFiles || file.status.kind === AppFileStatusKind.Modified const matchesDeletedFiles = - !state.filterDeletedFiles || + !state.fileListFilter.filterDeletedFiles || file.status.kind === AppFileStatusKind.Deleted const matchesUnstagedFiles = - !state.filterExcludedFiles || + !state.fileListFilter.filterExcludedFiles || file.selection.getSelectionType() === DiffSelectionType.None const matchesIncluded = - !state.includedChangesInCommitFilter || + !state.fileListFilter.includedChangesInCommitFilter || file.selection.getSelectionType() !== DiffSelectionType.None return ( @@ -496,16 +628,25 @@ describe('Changes Filter Integration Tests', () => { const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) const state = createState({ workingDirectory: emptyWorkingDirectory, - filterText: 'anything', - filterNewFiles: true, + fileListFilter: { + filterText: 'anything', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) const matchesType = - !state.filterNewFiles || file.status.kind === AppFileStatusKind.New + !state.fileListFilter.filterNewFiles || + file.status.kind === AppFileStatusKind.New return matchesText && matchesType }) @@ -531,11 +672,20 @@ describe('Changes Filter Integration Tests', () => { WorkingDirectoryStatus.fromFiles(specialFiles) const state = createState({ workingDirectory: specialWorkingDirectory, - filterText: '@#$', + fileListFilter: { + filterText: '@#$', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 1) @@ -560,11 +710,20 @@ describe('Changes Filter Integration Tests', () => { WorkingDirectoryStatus.fromFiles(unicodeFiles) const state = createState({ workingDirectory: unicodeWorkingDirectory, - filterText: '测试', + fileListFilter: { + filterText: '测试', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) ) assert.equal(filteredFiles.length, 1) @@ -588,11 +747,18 @@ describe('Changes Filter Integration Tests', () => { WorkingDirectoryStatus.fromFiles(largeFileSet) const state = createState({ workingDirectory: largeWorkingDirectory, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.filterExcludedFiles) { + if (!state.fileListFilter.filterExcludedFiles) { return true } return file.selection.getSelectionType() === DiffSelectionType.None @@ -608,15 +774,22 @@ describe('Changes Filter Integration Tests', () => { // This test verifies the fix for the bug where staged and unstaged filters couldn't work together const state = createState({ workingDirectory, - includedChangesInCommitFilter: true, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + }, }) // Apply the fixed filtering logic that allows both filters to work together const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging status filters (included in commit and unstaged files) const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterExcludedFiles + state.fileListFilter.includedChangesInCommitFilter || + state.fileListFilter.filterExcludedFiles if (hasStagingFilter) { let matchesStagingFilter = false const isStaged = @@ -625,12 +798,12 @@ describe('Changes Filter Integration Tests', () => { file.selection.getSelectionType() === DiffSelectionType.None // Check if file matches included in commit filter (staged files) - if (state.includedChangesInCommitFilter && isStaged) { + if (state.fileListFilter.includedChangesInCommitFilter && isStaged) { matchesStagingFilter = true } // Check if file matches unstaged files filter - if (state.filterExcludedFiles && isUnstaged) { + if (state.fileListFilter.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -650,19 +823,25 @@ describe('Changes Filter Integration Tests', () => { // Test the deleted files filter working with staging filters const state = createState({ workingDirectory, - filterDeletedFiles: true, - filterExcludedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: true, + filterExcludedFiles: true, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { // Check staging status filters - const hasStagingFilter = state.filterExcludedFiles + const hasStagingFilter = state.fileListFilter.filterExcludedFiles if (hasStagingFilter) { let matchesStagingFilter = false const isUnstaged = file.selection.getSelectionType() === DiffSelectionType.None - if (state.filterExcludedFiles && isUnstaged) { + if (state.fileListFilter.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } @@ -672,11 +851,11 @@ describe('Changes Filter Integration Tests', () => { } // Apply file type filters - const hasFileTypeFilter = state.filterDeletedFiles + const hasFileTypeFilter = state.fileListFilter.filterDeletedFiles if (hasFileTypeFilter) { let matchesFileTypeFilter = false - if (state.filterDeletedFiles) { + if (state.fileListFilter.filterDeletedFiles) { const isDeletedFile = file.status.kind === AppFileStatusKind.Deleted if (isDeletedFile) { matchesFileTypeFilter = true @@ -738,20 +917,26 @@ describe('Changes Filter Integration Tests', () => { // Test a complex filter combination that might have caused issues before the fix const state = createState({ workingDirectory, - filterText: 'src/', - filterNewFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: false, + fileListFilter: { + filterText: 'src/', + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + includedChangesInCommitFilter: false, + }, }) const filteredFiles = state.workingDirectory.files.filter(file => { // Apply text filter const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) // Apply staging filter - const hasStagingFilter = state.filterExcludedFiles + const hasStagingFilter = state.fileListFilter.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { const isUnstaged = @@ -760,7 +945,7 @@ describe('Changes Filter Integration Tests', () => { } // Apply file type filter - const hasFileTypeFilter = state.filterNewFiles + const hasFileTypeFilter = state.fileListFilter.filterNewFiles let matchesFileTypeFilter = true if (hasFileTypeFilter) { matchesFileTypeFilter = file.status.kind === AppFileStatusKind.New @@ -783,45 +968,53 @@ describe('Changes Filter Integration Tests', () => { { name: 'All filters enabled', filters: { - filterText: 'src/', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: 'src/', + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: true, + includedChangesInCommitFilter: true, + }, }, }, { name: 'Only staging filters', filters: { - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '', + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: true, + includedChangesInCommitFilter: true, + }, }, }, { name: 'Only file type filters', filters: { - filterText: '', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, + fileListFilter: { + filterText: '', + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: true, + filterExcludedFiles: false, + includedChangesInCommitFilter: false, + }, }, }, { name: 'Text and staging filters', filters: { - filterText: 'README', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: 'README', + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + includedChangesInCommitFilter: true, + }, }, }, ] @@ -836,12 +1029,15 @@ describe('Changes Filter Integration Tests', () => { const filteredFiles = state.workingDirectory.files.filter(file => { // Text filter const matchesText = - state.filterText === '' || - file.path.toLowerCase().includes(state.filterText.toLowerCase()) + state.fileListFilter.filterText === '' || + file.path + .toLowerCase() + .includes(state.fileListFilter.filterText.toLowerCase()) // Staging filters const hasStagingFilter = - state.includedChangesInCommitFilter || state.filterExcludedFiles + state.fileListFilter.includedChangesInCommitFilter || + state.fileListFilter.filterExcludedFiles let matchesStagingFilter = true if (hasStagingFilter) { matchesStagingFilter = false @@ -850,36 +1046,39 @@ describe('Changes Filter Integration Tests', () => { const isUnstaged = file.selection.getSelectionType() === DiffSelectionType.None - if (state.includedChangesInCommitFilter && isStaged) { + if ( + state.fileListFilter.includedChangesInCommitFilter && + isStaged + ) { matchesStagingFilter = true } - if (state.filterExcludedFiles && isUnstaged) { + if (state.fileListFilter.filterExcludedFiles && isUnstaged) { matchesStagingFilter = true } } // File type filters const hasFileTypeFilter = - state.filterNewFiles || - state.filterModifiedFiles || - state.filterDeletedFiles + state.fileListFilter.filterNewFiles || + state.fileListFilter.filterModifiedFiles || + state.fileListFilter.filterDeletedFiles let matchesFileTypeFilter = true if (hasFileTypeFilter) { matchesFileTypeFilter = false if ( - state.filterNewFiles && + state.fileListFilter.filterNewFiles && file.status.kind === AppFileStatusKind.New ) { matchesFileTypeFilter = true } if ( - state.filterModifiedFiles && + state.fileListFilter.filterModifiedFiles && file.status.kind === AppFileStatusKind.Modified ) { matchesFileTypeFilter = true } if ( - state.filterDeletedFiles && + state.fileListFilter.filterDeletedFiles && file.status.kind === AppFileStatusKind.Deleted ) { matchesFileTypeFilter = true diff --git a/app/test/unit/changes-filter-test.ts b/app/test/unit/changes-filter-test.ts index 91d2d5aed9d..ad023263d28 100644 --- a/app/test/unit/changes-filter-test.ts +++ b/app/test/unit/changes-filter-test.ts @@ -326,8 +326,14 @@ describe('Changes Filter Functionality', () => { const firstFile = testFiles[0].id const state = createState({ workingDirectory, - filterNewFiles: true, - filterText: 'README', + fileListFilter: { + filterText: 'README', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, selection: { kind: ChangesSelectionKind.WorkingDirectory, selectedFileIDs: [firstFile], @@ -335,16 +341,22 @@ describe('Changes Filter Functionality', () => { }, }) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterText, 'README') + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterText, 'README') assert.equal(state.selection.kind, ChangesSelectionKind.WorkingDirectory) }) it('works with empty file selection', () => { const state = createState({ workingDirectory, - filterNewFiles: true, - filterModifiedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, selection: { kind: ChangesSelectionKind.WorkingDirectory, selectedFileIDs: [], @@ -352,8 +364,8 @@ describe('Changes Filter Functionality', () => { }, }) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterModifiedFiles, true) + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, true) assert.equal(state.selection.kind, ChangesSelectionKind.WorkingDirectory) }) }) @@ -363,51 +375,84 @@ describe('Changes Filter Functionality', () => { const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) const state = createState({ workingDirectory: emptyWorkingDirectory, - filterNewFiles: true, - filterModifiedFiles: true, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterModifiedFiles, true) - assert.equal(state.includedChangesInCommitFilter, true) + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, true) + assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) assert.equal(state.workingDirectory.files.length, 0) }) it('handles special characters in filter text', () => { const specialFilterText = 'file-with-special_chars@#$.txt' const state = createState({ - filterText: specialFilterText, + fileListFilter: { + filterText: specialFilterText, + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, specialFilterText) + assert.equal(state.fileListFilter.filterText, specialFilterText) }) it('handles very long filter text', () => { const longFilterText = 'a'.repeat(1000) const state = createState({ - filterText: longFilterText, + fileListFilter: { + filterText: longFilterText, + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, longFilterText) + assert.equal(state.fileListFilter.filterText, longFilterText) }) it('handles unicode characters in filter text', () => { const unicodeFilterText = '测试文件.txt' const state = createState({ - filterText: unicodeFilterText, + fileListFilter: { + filterText: unicodeFilterText, + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, unicodeFilterText) + assert.equal(state.fileListFilter.filterText, unicodeFilterText) }) it('handles filter text with whitespace', () => { const whitespaceFilterText = ' file with spaces ' const state = createState({ - filterText: whitespaceFilterText, + fileListFilter: { + filterText: whitespaceFilterText, + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.equal(state.filterText, whitespaceFilterText) + assert.equal(state.fileListFilter.filterText, whitespaceFilterText) }) }) @@ -439,13 +484,19 @@ describe('Changes Filter Functionality', () => { const basicWorkingDirectory = WorkingDirectoryStatus.fromFiles(basicFiles) const state = createState({ workingDirectory: basicWorkingDirectory, - filterNewFiles: true, - filterModifiedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: true, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) assert.equal(state.workingDirectory.files.length, 4) - assert.equal(state.filterNewFiles, true) - assert.equal(state.filterModifiedFiles, true) + assert.equal(state.fileListFilter.filterNewFiles, true) + assert.equal(state.fileListFilter.filterModifiedFiles, true) }) it('works with complex file status kinds', () => { @@ -474,36 +525,60 @@ describe('Changes Filter Functionality', () => { WorkingDirectoryStatus.fromFiles(complexFiles) const state = createState({ workingDirectory: complexWorkingDirectory, - filterNewFiles: false, - filterModifiedFiles: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: true, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) assert.equal(state.workingDirectory.files.length, 2) - assert.equal(state.filterNewFiles, false) - assert.equal(state.filterModifiedFiles, true) + assert.equal(state.fileListFilter.filterNewFiles, false) + assert.equal(state.fileListFilter.filterModifiedFiles, true) }) }) describe('filter state validation', () => { it('accepts boolean values for filter flags', () => { const state = createState({ - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, + fileListFilter: { + filterText: '', + includedChangesInCommitFilter: true, + filterNewFiles: true, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.strictEqual(typeof state.filterNewFiles, 'boolean') - assert.strictEqual(typeof state.filterModifiedFiles, 'boolean') - assert.strictEqual(typeof state.includedChangesInCommitFilter, 'boolean') + assert.strictEqual(typeof state.fileListFilter.filterNewFiles, 'boolean') + assert.strictEqual( + typeof state.fileListFilter.filterModifiedFiles, + 'boolean' + ) + assert.strictEqual( + typeof state.fileListFilter.includedChangesInCommitFilter, + 'boolean' + ) }) it('accepts string values for filter text', () => { const state = createState({ - filterText: 'test-filter', + fileListFilter: { + filterText: 'test-filter', + includedChangesInCommitFilter: false, + filterNewFiles: false, + filterModifiedFiles: false, + filterDeletedFiles: false, + filterExcludedFiles: false, + }, }) - assert.strictEqual(typeof state.filterText, 'string') - assert.equal(state.filterText, 'test-filter') + assert.strictEqual(typeof state.fileListFilter.filterText, 'string') + assert.equal(state.fileListFilter.filterText, 'test-filter') }) }) }) From 39117d49075f0832eebcd4ba33408655a0d36a8b Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 17 Jun 2025 15:52:01 +0200 Subject: [PATCH 0460/1338] Increase height of commit message buttons This allows the New callout for the Copilot button to fit entirely on Windows --- app/styles/ui/changes/_commit-message.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 13254574328..a4e974323cf 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -249,7 +249,7 @@ align-items: center; display: block; - height: 16px; + height: 17px; width: 18px; cursor: pointer; From 4104d678a1928c58eb895e01a0a711bb7f1d8468 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 17 Jun 2025 15:57:38 +0200 Subject: [PATCH 0461/1338] Use lighter color for Copilot button separator on dark theme --- app/styles/_variables.scss | 4 ++++ app/styles/themes/_dark.scss | 4 ++++ app/styles/ui/changes/_commit-message.scss | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index 98fe19c9a71..8ad90375ab9 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -59,6 +59,10 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --commit-message-icon-warning-color: var(--input-icon-warning-color); --commit-message-icon-error-color: var(--input-icon-error-color); + // Colors used for the separator of commit message action buttons + // (e.g. co-authors and Copilot buttons) + --commit-message-action-button-separator-color: var(--box-border-color); + // Typography // // Font, line-height, and color for body text, headings, and more. diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index 290c97ad9ce..a03d76ddab0 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -57,6 +57,10 @@ body.theme-dark { --commit-message-icon-warning-color: var(--input-icon-warning-color); --commit-message-icon-error-color: var(--input-icon-error-color); + // Colors used for the separator of commit message action buttons + // (e.g. co-authors and Copilot buttons) + --commit-message-action-button-separator-color: var(--box-border-contrast-color); + /** * Background color for custom scroll bars. * The color is applied to the thumb part of the scrollbar. diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index a4e974323cf..d1d69997750 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -232,7 +232,7 @@ margin-right: var(--spacing-half); margin-top: 1px; margin-bottom: 1px; - background: var(--box-border-color); + background: var(--commit-message-action-button-separator-color); } } From 3fb4c99286f4ea30c0c797cead43ed5c61622726 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 17 Jun 2025 16:48:57 +0200 Subject: [PATCH 0462/1338] Bump version to 3.5.0 and update changelog Updated package.json to version 3.5.0 and added a changelog entry for the new Copilot commit message feature. --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 2d10437f82f..e26b1429382 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.4.21", + "version": "3.5.0", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index e24b251f6f2..08372ffcdf1 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.5.0": [ + "[New] Copilot now helps you craft AI-generated commit messages with just one click - #17439" + ], "3.4.21": [ "[Added] Handled GitHub Secret Scanning push protection errors in a friendly dialog with the ability to bypass blocked non-approval requiring secrets - #20386, #20387, #20391", "[Fixed] Fix spacing of text in \"Thank You\" banner - #20411", From 922634a13288e558b5748d427223e2469be4b2a6 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 17 Jun 2025 16:29:05 +0200 Subject: [PATCH 0463/1338] Merge pull request #20655 from desktop/fix-copilot-new-callout Fix Copilot new callout appearance --- app/styles/_variables.scss | 4 ++++ app/styles/themes/_dark.scss | 4 ++++ app/styles/ui/changes/_commit-message.scss | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index 98fe19c9a71..8ad90375ab9 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -59,6 +59,10 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --commit-message-icon-warning-color: var(--input-icon-warning-color); --commit-message-icon-error-color: var(--input-icon-error-color); + // Colors used for the separator of commit message action buttons + // (e.g. co-authors and Copilot buttons) + --commit-message-action-button-separator-color: var(--box-border-color); + // Typography // // Font, line-height, and color for body text, headings, and more. diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index 290c97ad9ce..a03d76ddab0 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -57,6 +57,10 @@ body.theme-dark { --commit-message-icon-warning-color: var(--input-icon-warning-color); --commit-message-icon-error-color: var(--input-icon-error-color); + // Colors used for the separator of commit message action buttons + // (e.g. co-authors and Copilot buttons) + --commit-message-action-button-separator-color: var(--box-border-contrast-color); + /** * Background color for custom scroll bars. * The color is applied to the thumb part of the scrollbar. diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 13254574328..d1d69997750 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -232,7 +232,7 @@ margin-right: var(--spacing-half); margin-top: 1px; margin-bottom: 1px; - background: var(--box-border-color); + background: var(--commit-message-action-button-separator-color); } } @@ -249,7 +249,7 @@ align-items: center; display: block; - height: 16px; + height: 17px; width: 18px; cursor: pointer; From 3d21337d373691dee49dd6ae60671fd58ce2ed37 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 17 Jun 2025 16:51:53 +0200 Subject: [PATCH 0464/1338] Remove beta feature check from commit message generation The enableCommitMessageGeneration function no longer requires beta features to be enabled, relying solely on the account's feature list. --- app/src/lib/feature-flag.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index caa66c4f6fa..2832f8037be 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -108,7 +108,6 @@ export const enableMultipleEnterpriseAccounts = () => true export const enableCommitMessageGeneration = (account: Account) => { return ( - enableBetaFeatures() && (account.features ?? []).includes( 'desktop_copilot_generate_commit_message' ) && From 12de05bbb5ff69bd0979c1cfbdea11d9dd65f570 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 18 Jun 2025 10:13:55 +0200 Subject: [PATCH 0465/1338] Only apply gap to switch-style tab bar --- app/styles/ui/_tab-bar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss index 3087748f8d2..6c3d300260a 100644 --- a/app/styles/ui/_tab-bar.scss +++ b/app/styles/ui/_tab-bar.scss @@ -11,7 +11,7 @@ padding: var(--spacing) 0; } - &:not(.vertical) { + &.switch:not(.vertical) { gap: var(--spacing); } From cf940beeb06e43c8cc74264eacc33b1b9746495b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 18 Jun 2025 10:14:11 +0200 Subject: [PATCH 0466/1338] Apply cursor to inner span as well as button --- app/styles/ui/_tab-bar.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/styles/ui/_tab-bar.scss b/app/styles/ui/_tab-bar.scss index 6c3d300260a..491109fecf0 100644 --- a/app/styles/ui/_tab-bar.scss +++ b/app/styles/ui/_tab-bar.scss @@ -91,7 +91,10 @@ } &.switch &-item { - cursor: pointer; + &, + * { + cursor: pointer; + } // Give each item equal space flex: 1; From 85f5834379dc91fa3730b95ea43b6158cc58495f Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Wed, 18 Jun 2025 12:17:25 +0400 Subject: [PATCH 0467/1338] Clean up CSS --- app/styles/ui/changes/_changes-list.scss | 80 +++++++++--------------- 1 file changed, 28 insertions(+), 52 deletions(-) diff --git a/app/styles/ui/changes/_changes-list.scss b/app/styles/ui/changes/_changes-list.scss index 231221f92c3..b1dda284b6d 100644 --- a/app/styles/ui/changes/_changes-list.scss +++ b/app/styles/ui/changes/_changes-list.scss @@ -6,8 +6,8 @@ /** A React component holding the currently selected repository's changes */ .changes-list-container { - flex-grow: 1; display: flex; + flex: 1; flex-direction: column; min-height: 100px; @@ -157,10 +157,11 @@ input { margin-right: 7px; } + label { - text-align: left; + position: static; padding: 0; - position: unset; + text-align: left; } } } @@ -171,22 +172,15 @@ // will be overlapped by the commit message form. min-height: 0; } - - .no-changes-in-list { - text-align: center; - padding: var(--spacing-double); - } } .stashed-changes-button { @include ellipsis; - min-height: 29px; - display: flex; align-items: center; - flex-grow: 1; - padding: 0 var(--spacing); width: 100%; + min-height: 29px; + padding: 0 var(--spacing); // Chrome on Windows ignores the body element // font-family and uses Arial so we redefine @@ -194,8 +188,6 @@ font-family: var(--font-family-sans-serif); font-size: var(--font-size); - padding: 0 var(--spacing); - color: var(--secondary-button-text-color); background-color: var(--secondary-button-background); @@ -210,8 +202,7 @@ &:hover, &:focus { - background-color: var(--secondary-button-hover-background); - background: var(--box-selected-background-color); + background-color: var(--box-selected-background-color); } &.selected, @@ -284,72 +275,57 @@ } .no-changes-filtered { - max-width: 365px; - min-width: 180px; - width: 100%; - margin: var(--spacing-half) auto; display: flex; flex: 1; flex-direction: column; align-items: center; - justify-content: flex-start; - text-align: center; + max-width: 365px; + min-width: 180px; + width: 100%; + margin: var(--spacing-half) auto; padding: var(--spacing); + text-align: center; box-sizing: border-box; - overflow-x: hidden; - overflow-y: auto; - max-height: 100%; // Ensure it fits within container - container-type: size; // Enable container queries + container-type: size; + overflow: hidden; .blankslate-image { - margin-bottom: var(--spacing); - opacity: 0.8; - max-width: 80px; width: 100%; + max-width: 80px; height: auto; + margin-bottom: var(--spacing); + opacity: 0.8; + object-fit: contain; flex-shrink: 0; + + // Hide image in small containers + @container (max-height: 310px) { + display: none; + } } .title { - font-weight: var(--font-weight-semibold); - text-align: center; margin-bottom: var(--spacing-half); font-size: var(--font-size); + font-weight: var(--font-weight-semibold); line-height: 1.3; color: var(--text-color); flex-shrink: 0; } .subtitle { + max-height: 100px; margin: 0 var(--spacing-half) var(--spacing) var(--spacing-half); - text-align: center; font-size: var(--font-size-sm); + line-height: 1.4; color: var(--text-secondary-color); white-space: pre-line; - line-height: 1.4; - flex-shrink: 1; // Allow subtitle to shrink if needed - max-height: 100px; // Prevent excessive height + flex-shrink: 1; } .clear-filters-button { - align-self: center; min-width: 120px; - flex-shrink: 0; margin-top: var(--spacing-half); - } - - // Container queries for width-based image resizing - @container (max-width: 300px) { - .blankslate-image { - max-width: none; - width: 100%; - } - } - - // Container queries for height-based image hiding - @container (max-height: 250px) { - .blankslate-image { - display: none; - } + flex-shrink: 0; } } From 819cd0e6c3108a9aafff64f977722f3b6dd4eb41 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Wed, 18 Jun 2025 15:22:41 +0400 Subject: [PATCH 0468/1338] Remove test files that don't test actual application logic --- app/test/unit/app-store-filter-test.ts | 608 --------- .../unit/changes-filter-integration-test.ts | 1103 ----------------- app/test/unit/clear-filters-metrics-test.ts | 340 ----- app/test/unit/dispatcher-filter-test.ts | 320 ----- .../filter-changes-list-count-methods-test.ts | 417 ------- ...ilter-changes-list-ui-interactions-test.ts | 808 ------------ 6 files changed, 3596 deletions(-) delete mode 100644 app/test/unit/app-store-filter-test.ts delete mode 100644 app/test/unit/changes-filter-integration-test.ts delete mode 100644 app/test/unit/clear-filters-metrics-test.ts delete mode 100644 app/test/unit/dispatcher-filter-test.ts delete mode 100644 app/test/unit/filter-changes-list-count-methods-test.ts delete mode 100644 app/test/unit/filter-changes-list-ui-interactions-test.ts diff --git a/app/test/unit/app-store-filter-test.ts b/app/test/unit/app-store-filter-test.ts deleted file mode 100644 index cc00c260c48..00000000000 --- a/app/test/unit/app-store-filter-test.ts +++ /dev/null @@ -1,608 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { Repository } from '../../src/models/repository' -import { RepositoryStateCache } from '../../src/lib/stores/repository-state-cache' -import { - WorkingDirectoryStatus, - WorkingDirectoryFileChange, - AppFileStatusKind, -} from '../../src/models/status' -import { DiffSelection, DiffSelectionType } from '../../src/models/diff' -import { ChangesSelectionKind } from '../../src/lib/app-state' -import { TestStatsStore } from '../helpers/test-stats-store' - -const allSelected = DiffSelection.fromInitialSelection(DiffSelectionType.All) -const noneSelected = DiffSelection.fromInitialSelection(DiffSelectionType.None) - -describe('App Store Filter Functionality', () => { - let repository: Repository - let repositoryStateCache: RepositoryStateCache - let testFiles: WorkingDirectoryFileChange[] - - beforeEach(() => { - repository = new Repository('/test/path', 1, null, false) - const statsStore = new TestStatsStore() - repositoryStateCache = new RepositoryStateCache(statsStore) - - testFiles = [ - new WorkingDirectoryFileChange( - 'README.md', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'new-feature.ts', - { kind: AppFileStatusKind.New }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'package.json', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'untracked-file.txt', - { kind: AppFileStatusKind.Untracked }, - noneSelected - ), - ] - }) - - describe('_setChangesListFilterText', () => { - it('updates filter text in repository state cache', () => { - const filterText = 'README' - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, filterText) - }) - - it('handles empty filter text', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: '', - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, '') - }) - - it('handles special characters in filter text', () => { - const specialText = 'file@#$%^&*().txt' - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: specialText, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, specialText) - }) - - it('handles unicode characters in filter text', () => { - const unicodeText = '测试文件.txt' - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: unicodeText, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, unicodeText) - }) - - it('overwrites previous filter text', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'first', - }, - })) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'second', - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'second') - }) - }) - - describe('_setIncludedChangesInCommitFilter', () => { - it('enables included changes filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - includedChangesInCommitFilter: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - true - ) - }) - - it('disables included changes filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - includedChangesInCommitFilter: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - false - ) - }) - - it('toggles included changes filter state', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - includedChangesInCommitFilter: true, - }, - })) - - let state = repositoryStateCache.get(repository) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - true - ) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - includedChangesInCommitFilter: false, - }, - })) - - state = repositoryStateCache.get(repository) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - false - ) - }) - }) - - describe('_setFilterNewFiles', () => { - it('enables new files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterNewFiles: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - }) - - it('disables new files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterNewFiles: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterNewFiles, false) - }) - - it('toggles new files filter state', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterNewFiles: true, - }, - })) - - let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterNewFiles: false, - }, - })) - - state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterNewFiles, false) - }) - }) - - describe('_setFilterModifiedFiles', () => { - it('enables modified files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterModifiedFiles: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) - }) - - it('disables modified files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterModifiedFiles: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - }) - - it('toggles modified files filter state', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterModifiedFiles: true, - }, - })) - - let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterModifiedFiles: false, - }, - })) - - state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - }) - }) - - describe('_setFilterDeletedFiles', () => { - it('enables deleted files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterDeletedFiles: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) - }) - - it('disables deleted files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterDeletedFiles: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) - }) - - it('toggles deleted files filter state', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterDeletedFiles: true, - }, - })) - - let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterDeletedFiles: false, - }, - })) - - state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) - }) - }) - - describe('_setFilterExcludedFiles', () => { - it('enables excluded files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterExcludedFiles: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) - }) - - it('disables excluded files filter', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterExcludedFiles: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) - }) - - it('toggles excluded files filter state', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterExcludedFiles: true, - }, - })) - - let state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterExcludedFiles: false, - }, - })) - - state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) - }) - }) - - describe('combined filter operations', () => { - it('sets multiple filters simultaneously', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'test', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'test') - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, true) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, true) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - true - ) - }) - - it('updates individual filters without affecting others', () => { - // Set initial state - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'initial', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, - }, - })) - - // Update only filter text - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'updated', - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'updated') - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - true - ) - }) - - it('handles mixed filter states', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'partial', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'partial') - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - true - ) - }) - }) - - describe('filter state persistence', () => { - it('maintains filter state across multiple updates', () => { - // Set initial filters - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'persistent', - filterNewFiles: true, - }, - })) - - // Update working directory without affecting filters - const workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - repositoryStateCache.updateChangesState(repository, state => ({ - workingDirectory, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'persistent') - assert.equal(state.changesState.fileListFilter.filterNewFiles, true) - assert.equal(state.changesState.workingDirectory.files.length, 4) - }) - - it('preserves filter state when updating selection', () => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'selection-test', - filterModifiedFiles: true, - }, - selection: { - kind: ChangesSelectionKind.WorkingDirectory, - selectedFileIDs: ['test-id'], - diff: null, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal( - state.changesState.fileListFilter.filterText, - 'selection-test' - ) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, true) - assert.equal( - state.changesState.selection.kind, - ChangesSelectionKind.WorkingDirectory - ) - }) - }) - - describe('default filter values', () => { - it('initializes with correct default filter values', () => { - const state = repositoryStateCache.get(repository) - - assert.equal(state.changesState.fileListFilter.filterText, '') - assert.equal(state.changesState.fileListFilter.filterNewFiles, false) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - false - ) - }) - - it('resets to default values when explicitly set', () => { - // Set non-default values - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: 'non-default', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - }, - })) - - // Reset to defaults - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, '') - assert.equal(state.changesState.fileListFilter.filterNewFiles, false) - assert.equal(state.changesState.fileListFilter.filterModifiedFiles, false) - assert.equal(state.changesState.fileListFilter.filterDeletedFiles, false) - assert.equal(state.changesState.fileListFilter.filterExcludedFiles, false) - assert.equal( - state.changesState.fileListFilter.includedChangesInCommitFilter, - false - ) - }) - }) - - describe('edge cases', () => { - it('handles very long filter text', () => { - const longText = 'a'.repeat(10000) - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: longText, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, longText) - assert.equal(state.changesState.fileListFilter.filterText.length, 10000) - }) - - it('handles filter text with newlines and special characters', () => { - const complexText = 'line1\nline2\ttab\rcarriage-return' - - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: complexText, - }, - })) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, complexText) - }) - - it('handles rapid filter updates', () => { - // Simulate rapid user typing - const updates = ['a', 'ab', 'abc', 'abcd', 'abcde'] - - updates.forEach(text => { - repositoryStateCache.updateChangesState(repository, state => ({ - fileListFilter: { - ...state.fileListFilter, - filterText: text, - }, - })) - }) - - const state = repositoryStateCache.get(repository) - assert.equal(state.changesState.fileListFilter.filterText, 'abcde') - }) - }) -}) diff --git a/app/test/unit/changes-filter-integration-test.ts b/app/test/unit/changes-filter-integration-test.ts deleted file mode 100644 index 66d8c60035a..00000000000 --- a/app/test/unit/changes-filter-integration-test.ts +++ /dev/null @@ -1,1103 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { - WorkingDirectoryStatus, - WorkingDirectoryFileChange, - AppFileStatusKind, -} from '../../src/models/status' -import { DiffSelection, DiffSelectionType } from '../../src/models/diff' -import { createState } from '../helpers/changes-state-helper' - -const allSelected = DiffSelection.fromInitialSelection(DiffSelectionType.All) -const noneSelected = DiffSelection.fromInitialSelection(DiffSelectionType.None) - -describe('Changes Filter Integration Tests', () => { - let testFiles: WorkingDirectoryFileChange[] - let workingDirectory: WorkingDirectoryStatus - - beforeEach(() => { - testFiles = [ - // Modified files - new WorkingDirectoryFileChange( - 'README.md', - { kind: AppFileStatusKind.Modified }, - allSelected // included in commit - ), - new WorkingDirectoryFileChange( - 'src/components/App.tsx', - { kind: AppFileStatusKind.Modified }, - noneSelected // not included in commit - ), - new WorkingDirectoryFileChange( - 'package.json', - { kind: AppFileStatusKind.Modified }, - allSelected // included in commit - ), - - // New files - new WorkingDirectoryFileChange( - 'src/utils/helpers.ts', - { kind: AppFileStatusKind.New }, - allSelected // included in commit - ), - new WorkingDirectoryFileChange( - 'docs/api.md', - { kind: AppFileStatusKind.New }, - noneSelected // not included in commit - ), - - // Other file types - new WorkingDirectoryFileChange( - 'old-file.txt', - { kind: AppFileStatusKind.Deleted }, - allSelected // included in commit - ), - new WorkingDirectoryFileChange( - 'temp-file.tmp', - { kind: AppFileStatusKind.Untracked }, - noneSelected // not included in commit - ), - new WorkingDirectoryFileChange( - 'renamed-component.tsx', - { - kind: AppFileStatusKind.Renamed, - oldPath: 'old-component.tsx', - renameIncludesModifications: false, - }, - allSelected // included in commit - ), - ] - - workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - }) - - describe('filter text functionality', () => { - it('filters files by filename', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'README', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - // In a real implementation, this would be handled by the UI component - // that applies the filter. Here we simulate the filtering logic. - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'README.md') - }) - - it('filters files by partial path', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'src/', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 2) - assert.ok(filteredFiles.some(f => f.path === 'src/components/App.tsx')) - assert.ok(filteredFiles.some(f => f.path === 'src/utils/helpers.ts')) - }) - - it('filters files by extension', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '.tsx', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 2) - assert.ok(filteredFiles.some(f => f.path === 'src/components/App.tsx')) - assert.ok(filteredFiles.some(f => f.path === 'renamed-component.tsx')) - }) - - it('handles case-insensitive filtering', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'APP', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'src/components/App.tsx') - }) - - it('returns all files when filter text is empty', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter( - file => - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, testFiles.length) - }) - }) - - describe('file type filtering', () => { - it('filters new files when filterNewFiles is enabled', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - // Simulate the filtering logic that would be applied in the UI - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.filterNewFiles) { - return true - } - return ( - file.status.kind === AppFileStatusKind.New || - file.status.kind === AppFileStatusKind.Untracked - ) - }) - - assert.equal(filteredFiles.length, 3) - assert.ok( - filteredFiles.every( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ) - ) - assert.ok(filteredFiles.some(f => f.path === 'src/utils/helpers.ts')) - assert.ok(filteredFiles.some(f => f.path === 'docs/api.md')) - assert.ok(filteredFiles.some(f => f.path === 'temp-file.tmp')) - }) - - it('filters modified files when filterModifiedFiles is enabled', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.filterModifiedFiles) { - return true - } - return file.status.kind === AppFileStatusKind.Modified - }) - - assert.equal(filteredFiles.length, 3) - assert.ok( - filteredFiles.every(f => f.status.kind === AppFileStatusKind.Modified) - ) - assert.ok(filteredFiles.some(f => f.path === 'README.md')) - assert.ok(filteredFiles.some(f => f.path === 'src/components/App.tsx')) - assert.ok(filteredFiles.some(f => f.path === 'package.json')) - }) - - it('filters included files when includedChangesInCommitFilter is enabled', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.includedChangesInCommitFilter) { - return true - } - return file.selection.getSelectionType() !== DiffSelectionType.None - }) - - // Files with allSelected should be included - const expectedIncludedFiles = testFiles.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ) - - assert.equal(filteredFiles.length, expectedIncludedFiles.length) - assert.ok(filteredFiles.some(f => f.path === 'README.md')) - assert.ok(filteredFiles.some(f => f.path === 'package.json')) - assert.ok(filteredFiles.some(f => f.path === 'src/utils/helpers.ts')) - assert.ok(filteredFiles.some(f => f.path === 'old-file.txt')) - assert.ok(filteredFiles.some(f => f.path === 'renamed-component.tsx')) - }) - - it('filters deleted files when filterDeletedFiles is enabled', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.filterDeletedFiles) { - return true - } - return file.status.kind === AppFileStatusKind.Deleted - }) - - assert.equal(filteredFiles.length, 1) - assert.ok( - filteredFiles.every(f => f.status.kind === AppFileStatusKind.Deleted) - ) - assert.ok(filteredFiles.some(f => f.path === 'old-file.txt')) - }) - - it('filters unstaged files when filterExcludedFiles is enabled', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.filterExcludedFiles) { - return true - } - // Unstaged files are those not selected for commit (noneSelected) - return file.selection.getSelectionType() === DiffSelectionType.None - }) - - assert.equal(filteredFiles.length, 3) - assert.ok( - filteredFiles.every( - f => f.selection.getSelectionType() === DiffSelectionType.None - ) - ) - assert.ok(filteredFiles.some(f => f.path === 'src/components/App.tsx')) - assert.ok(filteredFiles.some(f => f.path === 'docs/api.md')) - assert.ok(filteredFiles.some(f => f.path === 'temp-file.tmp')) - }) - }) - - describe('combined filtering', () => { - it('applies multiple filters simultaneously', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'src/', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - // Apply both text filter and new files filter - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesType = - !state.fileListFilter.filterNewFiles || - file.status.kind === AppFileStatusKind.New - - return matchesText && matchesType - }) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'src/utils/helpers.ts') - assert.equal(filteredFiles[0].status.kind, AppFileStatusKind.New) - }) - - it('applies multiple file type filters simultaneously', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: true, - }, - }) - - // Apply both deleted and unstaged files filters - const filteredFiles = state.workingDirectory.files.filter(file => { - // Check staging filter (unstaged files) - const hasStagingFilter = state.fileListFilter.filterExcludedFiles - let matchesStagingFilter = true - if (hasStagingFilter) { - matchesStagingFilter = - file.selection.getSelectionType() === DiffSelectionType.None - } - - // Check file type filter (deleted files) - const hasFileTypeFilter = state.fileListFilter.filterDeletedFiles - let matchesFileTypeFilter = true - if (hasFileTypeFilter) { - matchesFileTypeFilter = file.status.kind === AppFileStatusKind.Deleted - } - - // When both filters are active, file must match both conditions - if (hasStagingFilter && hasFileTypeFilter) { - return matchesStagingFilter && matchesFileTypeFilter - } - - // If only one filter is active, file must match that filter - if (hasStagingFilter) { - return matchesStagingFilter - } - if (hasFileTypeFilter) { - return matchesFileTypeFilter - } - - return true - }) - - // Only files that are both deleted AND unstaged should match - // In our test data, 'old-file.txt' is deleted but staged (allSelected) - // So no files should match both conditions - assert.equal(filteredFiles.length, 0) - }) - - it('applies both staged and unstaged filters simultaneously', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - }, - }) - - // Apply both staged and unstaged files filters - const filteredFiles = state.workingDirectory.files.filter(file => { - // Check staging filter - should show both staged AND unstaged files - const hasStagingFilter = - state.fileListFilter.includedChangesInCommitFilter || - state.fileListFilter.filterExcludedFiles - let matchesStagingFilter = false - if (hasStagingFilter) { - const isStaged = - file.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - - // When both filters are active, show files that match either condition - if ( - state.fileListFilter.includedChangesInCommitFilter && - state.fileListFilter.filterExcludedFiles - ) { - matchesStagingFilter = isStaged || isUnstaged - } else if (state.fileListFilter.includedChangesInCommitFilter) { - matchesStagingFilter = isStaged - } else if (state.fileListFilter.filterExcludedFiles) { - matchesStagingFilter = isUnstaged - } - } - - return matchesStagingFilter - }) - - // Should show all files since every file is either staged or unstaged - assert.equal(filteredFiles.length, testFiles.length) - }) - - it('applies text filter with deleted files filter', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'old', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesType = - !state.fileListFilter.filterDeletedFiles || - file.status.kind === AppFileStatusKind.Deleted - - return matchesText && matchesType - }) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'old-file.txt') - assert.equal(filteredFiles[0].status.kind, AppFileStatusKind.Deleted) - }) - - it('applies text filter with included changes filter', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '.md', - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesIncluded = - !state.fileListFilter.includedChangesInCommitFilter || - file.selection.getSelectionType() !== DiffSelectionType.None - - return matchesText && matchesIncluded - }) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'README.md') - }) - - it('returns empty result when filters exclude all files', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'nonexistent', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesType = - !state.fileListFilter.filterNewFiles || - file.status.kind === AppFileStatusKind.New - - return matchesText && matchesType - }) - - assert.equal(filteredFiles.length, 0) - }) - - it('handles all filters disabled (shows all files)', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesNewFiles = - !state.fileListFilter.filterNewFiles || - file.status.kind === AppFileStatusKind.New - const matchesModifiedFiles = - !state.fileListFilter.filterModifiedFiles || - file.status.kind === AppFileStatusKind.Modified - const matchesDeletedFiles = - !state.fileListFilter.filterDeletedFiles || - file.status.kind === AppFileStatusKind.Deleted - const matchesUnstagedFiles = - !state.fileListFilter.filterExcludedFiles || - file.selection.getSelectionType() === DiffSelectionType.None - const matchesIncluded = - !state.fileListFilter.includedChangesInCommitFilter || - file.selection.getSelectionType() !== DiffSelectionType.None - - return ( - matchesText && - matchesNewFiles && - matchesModifiedFiles && - matchesDeletedFiles && - matchesUnstagedFiles && - matchesIncluded - ) - }) - - assert.equal(filteredFiles.length, testFiles.length) - }) - }) - - describe('edge cases in filtering', () => { - it('handles empty working directory', () => { - const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) - const state = createState({ - workingDirectory: emptyWorkingDirectory, - fileListFilter: { - filterText: 'anything', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - const matchesType = - !state.fileListFilter.filterNewFiles || - file.status.kind === AppFileStatusKind.New - - return matchesText && matchesType - }) - - assert.equal(filteredFiles.length, 0) - }) - - it('handles special characters in filter text', () => { - const specialFiles = [ - new WorkingDirectoryFileChange( - 'file@#$%^&*().txt', - { kind: AppFileStatusKind.New }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'normal-file.txt', - { kind: AppFileStatusKind.New }, - noneSelected - ), - ] - - const specialWorkingDirectory = - WorkingDirectoryStatus.fromFiles(specialFiles) - const state = createState({ - workingDirectory: specialWorkingDirectory, - fileListFilter: { - filterText: '@#$', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'file@#$%^&*().txt') - }) - - it('handles unicode characters in filter text and filenames', () => { - const unicodeFiles = [ - new WorkingDirectoryFileChange( - '测试文件.txt', - { kind: AppFileStatusKind.New }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'english-file.txt', - { kind: AppFileStatusKind.New }, - noneSelected - ), - ] - - const unicodeWorkingDirectory = - WorkingDirectoryStatus.fromFiles(unicodeFiles) - const state = createState({ - workingDirectory: unicodeWorkingDirectory, - fileListFilter: { - filterText: '测试', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - ) - - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, '测试文件.txt') - }) - - it('handles very large number of files with filters', () => { - // Create a large number of files to test performance - const largeFileSet = [] - for (let i = 0; i < 1000; i++) { - largeFileSet.push( - new WorkingDirectoryFileChange( - `file${i}.txt`, - { kind: AppFileStatusKind.Modified }, - i % 2 === 0 ? allSelected : noneSelected - ) - ) - } - - const largeWorkingDirectory = - WorkingDirectoryStatus.fromFiles(largeFileSet) - const state = createState({ - workingDirectory: largeWorkingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - if (!state.fileListFilter.filterExcludedFiles) { - return true - } - return file.selection.getSelectionType() === DiffSelectionType.None - }) - - // Should show half the files (unstaged ones) - assert.equal(filteredFiles.length, 500) - }) - }) - - describe('fixed filter interaction bugs', () => { - it('allows staged and unstaged filters to work together correctly', () => { - // This test verifies the fix for the bug where staged and unstaged filters couldn't work together - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - }, - }) - - // Apply the fixed filtering logic that allows both filters to work together - const filteredFiles = state.workingDirectory.files.filter(file => { - // Check staging status filters (included in commit and unstaged files) - const hasStagingFilter = - state.fileListFilter.includedChangesInCommitFilter || - state.fileListFilter.filterExcludedFiles - if (hasStagingFilter) { - let matchesStagingFilter = false - const isStaged = - file.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - - // Check if file matches included in commit filter (staged files) - if (state.fileListFilter.includedChangesInCommitFilter && isStaged) { - matchesStagingFilter = true - } - - // Check if file matches unstaged files filter - if (state.fileListFilter.filterExcludedFiles && isUnstaged) { - matchesStagingFilter = true - } - - if (!matchesStagingFilter) { - return false - } - } - - return true - }) - - // Should show all files since every file is either staged or unstaged - assert.equal(filteredFiles.length, testFiles.length) - }) - - it('correctly filters deleted files with staging filters', () => { - // Test the deleted files filter working with staging filters - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: true, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - // Check staging status filters - const hasStagingFilter = state.fileListFilter.filterExcludedFiles - if (hasStagingFilter) { - let matchesStagingFilter = false - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - - if (state.fileListFilter.filterExcludedFiles && isUnstaged) { - matchesStagingFilter = true - } - - if (!matchesStagingFilter) { - return false - } - } - - // Apply file type filters - const hasFileTypeFilter = state.fileListFilter.filterDeletedFiles - if (hasFileTypeFilter) { - let matchesFileTypeFilter = false - - if (state.fileListFilter.filterDeletedFiles) { - const isDeletedFile = file.status.kind === AppFileStatusKind.Deleted - if (isDeletedFile) { - matchesFileTypeFilter = true - } - } - - if (!matchesFileTypeFilter) { - return false - } - } - - return true - }) - - // Should only show deleted files that are unstaged - // In our test data, 'old-file.txt' is deleted but staged, so no files should match - assert.equal(filteredFiles.length, 0) - }) - - it('correctly calculates unstaged files count including untracked files', () => { - // Test the fix for unstaged files count calculation - const unstagedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - // Should include: src/components/App.tsx, docs/api.md, temp-file.tmp = 3 files - assert.equal(unstagedCount, 3) - - // Verify that untracked files are included in unstaged count - const untrackedFiles = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Untracked - ) - const untrackedUnstagedFiles = untrackedFiles.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ) - - assert.equal(untrackedFiles.length, untrackedUnstagedFiles.length) - }) - - it('correctly calculates staged files count including partial selections', () => { - // Test the staged files count calculation - const stagedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - // Should include: README.md, package.json, src/utils/helpers.ts, old-file.txt, renamed-component.tsx = 5 files - assert.equal(stagedCount, 5) - - // Verify that partially staged files are included - const partiallyStaged = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.Partial - ) - - // All partially staged files should be counted as staged - assert.ok(stagedCount >= partiallyStaged.length) - }) - - it('handles filter combinations that previously caused issues', () => { - // Test a complex filter combination that might have caused issues before the fix - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'src/', - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - includedChangesInCommitFilter: false, - }, - }) - - const filteredFiles = state.workingDirectory.files.filter(file => { - // Apply text filter - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - - // Apply staging filter - const hasStagingFilter = state.fileListFilter.filterExcludedFiles - let matchesStagingFilter = true - if (hasStagingFilter) { - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - matchesStagingFilter = isUnstaged - } - - // Apply file type filter - const hasFileTypeFilter = state.fileListFilter.filterNewFiles - let matchesFileTypeFilter = true - if (hasFileTypeFilter) { - matchesFileTypeFilter = file.status.kind === AppFileStatusKind.New - } - - return matchesText && matchesStagingFilter && matchesFileTypeFilter - }) - - // Should show new files in src/ that are unstaged - // Expected: docs/api.md doesn't match 'src/', src/utils/helpers.ts is staged - // So no files should match all criteria - assert.equal(filteredFiles.length, 0) - }) - }) - - describe('comprehensive filter scenarios', () => { - it('tests all filter combinations work correctly', () => { - // Test every possible combination of filters to ensure they work together - const filterCombinations = [ - { - name: 'All filters enabled', - filters: { - fileListFilter: { - filterText: 'src/', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - }, - }, - }, - { - name: 'Only staging filters', - filters: { - fileListFilter: { - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - }, - }, - }, - { - name: 'Only file type filters', - filters: { - fileListFilter: { - filterText: '', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, - }, - }, - }, - { - name: 'Text and staging filters', - filters: { - fileListFilter: { - filterText: 'README', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: true, - }, - }, - }, - ] - - filterCombinations.forEach(({ name, filters }) => { - const state = createState({ - workingDirectory, - ...filters, - }) - - // Apply comprehensive filtering logic - const filteredFiles = state.workingDirectory.files.filter(file => { - // Text filter - const matchesText = - state.fileListFilter.filterText === '' || - file.path - .toLowerCase() - .includes(state.fileListFilter.filterText.toLowerCase()) - - // Staging filters - const hasStagingFilter = - state.fileListFilter.includedChangesInCommitFilter || - state.fileListFilter.filterExcludedFiles - let matchesStagingFilter = true - if (hasStagingFilter) { - matchesStagingFilter = false - const isStaged = - file.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - - if ( - state.fileListFilter.includedChangesInCommitFilter && - isStaged - ) { - matchesStagingFilter = true - } - if (state.fileListFilter.filterExcludedFiles && isUnstaged) { - matchesStagingFilter = true - } - } - - // File type filters - const hasFileTypeFilter = - state.fileListFilter.filterNewFiles || - state.fileListFilter.filterModifiedFiles || - state.fileListFilter.filterDeletedFiles - let matchesFileTypeFilter = true - if (hasFileTypeFilter) { - matchesFileTypeFilter = false - if ( - state.fileListFilter.filterNewFiles && - file.status.kind === AppFileStatusKind.New - ) { - matchesFileTypeFilter = true - } - if ( - state.fileListFilter.filterModifiedFiles && - file.status.kind === AppFileStatusKind.Modified - ) { - matchesFileTypeFilter = true - } - if ( - state.fileListFilter.filterDeletedFiles && - file.status.kind === AppFileStatusKind.Deleted - ) { - matchesFileTypeFilter = true - } - } - - return matchesText && matchesStagingFilter && matchesFileTypeFilter - }) - - // Each combination should produce a valid result (not throw errors) - assert.ok( - Array.isArray(filteredFiles), - `${name} should produce an array` - ) - assert.ok( - filteredFiles.length >= 0, - `${name} should have non-negative length` - ) - }) - }) - }) -}) diff --git a/app/test/unit/clear-filters-metrics-test.ts b/app/test/unit/clear-filters-metrics-test.ts deleted file mode 100644 index 350265cbefe..00000000000 --- a/app/test/unit/clear-filters-metrics-test.ts +++ /dev/null @@ -1,340 +0,0 @@ -import { describe, it } from 'node:test' -import assert from 'node:assert' - -describe('Clear Filters Metrics Tests', () => { - describe('appliesClearAllFiltersCount metric', () => { - it('should be tracked when clear filters is called', () => { - // Simulate metric tracking for clear all filters - const metricsCalls: Array<{ metric: string; count: number }> = [] - - const mockIncrementMetric = (metric: string) => { - const existingCall = metricsCalls.find(call => call.metric === metric) - if (existingCall) { - existingCall.count++ - } else { - metricsCalls.push({ metric, count: 1 }) - } - } - - // Simulate calling clear filters multiple times - mockIncrementMetric('appliesClearAllFiltersCount') - mockIncrementMetric('appliesClearAllFiltersCount') - mockIncrementMetric('appliesClearAllFiltersCount') - - const clearAllMetric = metricsCalls.find( - call => call.metric === 'appliesClearAllFiltersCount' - ) - assert.ok( - clearAllMetric, - 'Should track appliesClearAllFiltersCount metric' - ) - assert.equal( - clearAllMetric.count, - 3, - 'Should increment metric each time clear filters is called' - ) - }) - - it('should be separate from individual filter metrics', () => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } - - // Simulate applying individual filters - mockIncrementMetric('appliesIncludedInCommitFilterCount') - mockIncrementMetric('appliesNewFilesFilterCount') - mockIncrementMetric('appliesModifiedFilesFilterCount') - - // Simulate clearing all filters - mockIncrementMetric('appliesClearAllFiltersCount') - - assert.ok( - metricsCalls.includes('appliesClearAllFiltersCount'), - 'Should track clear all filters metric' - ) - assert.ok( - metricsCalls.includes('appliesIncludedInCommitFilterCount'), - 'Should track individual filter metrics' - ) - assert.equal( - metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, - 1, - 'Should only track clear all once per call' - ) - }) - - it('should track clear filters regardless of which filters were active', () => { - const scenarios = [ - { - description: 'only text filter active', - activeFilters: { filterText: 'README' }, - }, - { - description: 'only one boolean filter active', - activeFilters: { filterNewFiles: true }, - }, - { - description: 'multiple filters active', - activeFilters: { - filterText: 'src/', - includedChangesInCommitFilter: true, - filterDeletedFiles: true, - }, - }, - { - description: 'all filters active', - activeFilters: { - filterText: 'test', - includedChangesInCommitFilter: true, - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - }, - }, - ] - - scenarios.forEach(({ description, activeFilters }) => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } - - // Simulate clear filters being called regardless of which filters were active - mockIncrementMetric('appliesClearAllFiltersCount') - - assert.ok( - metricsCalls.includes('appliesClearAllFiltersCount'), - `Should track clear all filters metric for ${description}` - ) - }) - }) - }) - - describe('metrics integration with clear filters workflow', () => { - it('should track the complete clear filters workflow', () => { - const workflowEvents: Array<{ event: string; timestamp: number }> = [] - const currentTime = Date.now() - - const mockEvent = (event: string) => { - workflowEvents.push({ - event, - timestamp: currentTime + workflowEvents.length, - }) - } - - // Simulate the complete clear filters workflow - mockEvent('user_clicks_clear_filters_button') - mockEvent('increment_metric_appliesClearAllFiltersCount') - mockEvent('clear_filter_text') - mockEvent('clear_included_changes_filter') - mockEvent('clear_excluded_files_filter') - mockEvent('clear_new_files_filter') - mockEvent('clear_modified_files_filter') - mockEvent('clear_deleted_files_filter') - mockEvent('close_filter_options_popover') - - // Verify the workflow order - const expectedEvents = [ - 'user_clicks_clear_filters_button', - 'increment_metric_appliesClearAllFiltersCount', - 'clear_filter_text', - 'clear_included_changes_filter', - 'clear_excluded_files_filter', - 'clear_new_files_filter', - 'clear_modified_files_filter', - 'clear_deleted_files_filter', - 'close_filter_options_popover', - ] - - expectedEvents.forEach((expectedEvent, index) => { - assert.equal( - workflowEvents[index]?.event, - expectedEvent, - `Event ${index + 1} should be ${expectedEvent}` - ) - }) - - // Verify metrics are tracked early in the workflow - const metricsEventIndex = workflowEvents.findIndex( - event => event.event === 'increment_metric_appliesClearAllFiltersCount' - ) - assert.equal( - metricsEventIndex, - 1, - 'Metrics should be tracked early in the workflow' - ) - }) - - it('should handle multiple rapid clear filters calls', () => { - const metricsCalls: number[] = [] - - const mockIncrementMetric = (metric: string) => { - if (metric === 'appliesClearAllFiltersCount') { - metricsCalls.push(Date.now()) - } - } - - // Simulate rapid clicking of clear filters - for (let i = 0; i < 5; i++) { - mockIncrementMetric('appliesClearAllFiltersCount') - } - - assert.equal( - metricsCalls.length, - 5, - 'Should track each clear filters call separately' - ) - }) - }) - - describe('clear filters button states and metrics', () => { - it('should only allow metrics tracking when button is actually visible', () => { - const buttonVisibilityScenarios = [ - { - hasActiveFilters: false, - shouldTrackMetrics: false, - description: 'no filters active - button hidden', - }, - { - hasActiveFilters: true, - shouldTrackMetrics: true, - description: 'filters active - button visible', - }, - ] - - buttonVisibilityScenarios.forEach( - ({ hasActiveFilters, shouldTrackMetrics, description }) => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } - - // Only call metrics if button would be visible - if (hasActiveFilters) { - mockIncrementMetric('appliesClearAllFiltersCount') - } - - const hasMetrics = metricsCalls.includes( - 'appliesClearAllFiltersCount' - ) - assert.equal(hasMetrics, shouldTrackMetrics, description) - } - ) - }) - - it('should track metrics for both clear filters button locations', () => { - const buttonLocations = [ - { - location: 'filter_dropdown', - description: 'Clear filters button in filter options dropdown', - }, - { - location: 'empty_state', - description: 'Clear filters button in empty state', - }, - ] - - buttonLocations.forEach(({ location, description }) => { - const metricsCalls: Array<{ metric: string; source: string }> = [] - - const mockIncrementMetric = (metric: string, source: string) => { - metricsCalls.push({ metric, source }) - } - - // Both buttons should track the same metric - mockIncrementMetric('appliesClearAllFiltersCount', location) - - const relevantCall = metricsCalls.find( - call => - call.metric === 'appliesClearAllFiltersCount' && - call.source === location - ) - assert.ok(relevantCall, `Should track metrics for ${description}`) - }) - }) - }) - - describe('edge cases for clear filters metrics', () => { - it('should handle clear filters with no repository context', () => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } - - // Even without repository context, metrics should still be tracked - mockIncrementMetric('appliesClearAllFiltersCount') - - assert.ok( - metricsCalls.includes('appliesClearAllFiltersCount'), - 'Should track metrics even without repository context' - ) - }) - - it('should handle clear filters during component unmount', () => { - let componentMounted = true - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - if (componentMounted) { - metricsCalls.push(metric) - } - } - - // Call clear filters before unmount - mockIncrementMetric('appliesClearAllFiltersCount') - - // Simulate component unmount - componentMounted = false - - // Try to call clear filters after unmount (should not track) - mockIncrementMetric('appliesClearAllFiltersCount') - - assert.equal( - metricsCalls.filter(m => m === 'appliesClearAllFiltersCount').length, - 1, - 'Should only track metrics while component is mounted' - ) - }) - - it('should handle clear filters with corrupted filter state', () => { - const corruptedStates = [ - { filterText: null, description: 'null filter text' }, - { filterText: undefined, description: 'undefined filter text' }, - { - includedChangesInCommitFilter: null, - description: 'null boolean filter', - }, - { filterNewFiles: 'true', description: 'string instead of boolean' }, - ] - - corruptedStates.forEach(({ description }) => { - const metricsCalls: string[] = [] - - const mockIncrementMetric = (metric: string) => { - metricsCalls.push(metric) - } - - // Clear filters should still work and track metrics even with corrupted state - try { - mockIncrementMetric('appliesClearAllFiltersCount') - } catch (error) { - // Should not throw errors - assert.fail( - `Clear filters should handle corrupted state: ${description}` - ) - } - - assert.ok( - metricsCalls.includes('appliesClearAllFiltersCount'), - `Should track metrics even with ${description}` - ) - }) - }) - }) -}) diff --git a/app/test/unit/dispatcher-filter-test.ts b/app/test/unit/dispatcher-filter-test.ts deleted file mode 100644 index a2e672e6fb0..00000000000 --- a/app/test/unit/dispatcher-filter-test.ts +++ /dev/null @@ -1,320 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { Repository } from '../../src/models/repository' - -describe('Dispatcher Filter Functionality', () => { - let repository: Repository - - beforeEach(() => { - repository = new Repository('/test/path', 1, null, false) - }) - - describe('filter method signatures', () => { - it('should have correct method signatures for filter operations', () => { - // This test verifies that the dispatcher methods exist with correct signatures - // In a real implementation, we would import the actual Dispatcher class - // and verify the method signatures exist - - // For now, we'll test the basic types and interfaces - const filterText = 'README' - const filterBoolean = true - - assert.strictEqual(typeof filterText, 'string') - assert.strictEqual(typeof filterBoolean, 'boolean') - assert.ok(repository instanceof Repository) - }) - - it('should handle filter text parameter types', () => { - const validFilterTexts = [ - '', - 'README', - 'package.json', - 'src/components', - 'file-with-special_chars@#$.txt', - '测试文件.txt', - ' file with spaces ', - 'a'.repeat(1000), - ] - - validFilterTexts.forEach(text => { - assert.strictEqual(typeof text, 'string') - }) - }) - - it('should handle boolean filter parameters', () => { - const validBooleans = [true, false] - - validBooleans.forEach(value => { - assert.strictEqual(typeof value, 'boolean') - }) - }) - - it('should handle repository parameter', () => { - assert.ok(repository instanceof Repository) - assert.strictEqual(typeof repository.path, 'string') - assert.strictEqual(typeof repository.id, 'number') - }) - }) - - describe('filter parameter validation', () => { - it('validates filter text constraints', () => { - // Test various filter text scenarios - const testCases = [ - { input: '', expected: true, description: 'empty string' }, - { - input: 'normal-file.txt', - expected: true, - description: 'normal filename', - }, - { - input: 'file with spaces', - expected: true, - description: 'filename with spaces', - }, - { - input: 'file@#$%^&*().txt', - expected: true, - description: 'special characters', - }, - { - input: '测试文件.txt', - expected: true, - description: 'unicode characters', - }, - { - input: '\n\t\r', - expected: true, - description: 'whitespace characters', - }, - { - input: 'a'.repeat(10000), - expected: true, - description: 'very long string', - }, - ] - - testCases.forEach(({ input, expected, description }) => { - const isValid = typeof input === 'string' - assert.strictEqual(isValid, expected, `Failed for ${description}`) - }) - }) - - it('validates boolean filter constraints', () => { - const testCases = [ - { input: true, expected: true, description: 'true value' }, - { input: false, expected: true, description: 'false value' }, - { input: 1, expected: false, description: 'number 1' }, - { input: 0, expected: false, description: 'number 0' }, - { input: 'true', expected: false, description: 'string true' }, - { input: null, expected: false, description: 'null value' }, - { input: undefined, expected: false, description: 'undefined value' }, - ] - - testCases.forEach(({ input, expected, description }) => { - const isValid = typeof input === 'boolean' - assert.strictEqual(isValid, expected, `Failed for ${description}`) - }) - }) - }) - - describe('filter operation combinations', () => { - it('supports multiple filter types simultaneously', () => { - const filterState = { - filterText: 'README', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: true, - } - - assert.strictEqual(typeof filterState.filterText, 'string') - assert.strictEqual(typeof filterState.filterNewFiles, 'boolean') - assert.strictEqual(typeof filterState.filterModifiedFiles, 'boolean') - assert.strictEqual( - typeof filterState.includedChangesInCommitFilter, - 'boolean' - ) - }) - - it('handles filter state transitions', () => { - const initialState = { - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - includedChangesInCommitFilter: false, - } - - const activeState = { - filterText: 'src/', - filterNewFiles: true, - filterModifiedFiles: true, - includedChangesInCommitFilter: true, - } - - const partialState = { - filterText: 'package', - filterNewFiles: true, - filterModifiedFiles: false, - includedChangesInCommitFilter: false, - } - - const states = [initialState, activeState, partialState] - - states.forEach((state, index) => { - assert.strictEqual( - typeof state.filterText, - 'string', - `State ${index} filterText` - ) - assert.strictEqual( - typeof state.filterNewFiles, - 'boolean', - `State ${index} filterNewFiles` - ) - assert.strictEqual( - typeof state.filterModifiedFiles, - 'boolean', - `State ${index} filterModifiedFiles` - ) - assert.strictEqual( - typeof state.includedChangesInCommitFilter, - 'boolean', - `State ${index} includedChangesInCommitFilter` - ) - }) - }) - }) - - describe('edge case handling', () => { - it('handles empty and whitespace filter text', () => { - const edgeCases = ['', ' ', '\t', '\n', '\r\n', ' \t\n '] - - edgeCases.forEach(text => { - assert.strictEqual(typeof text, 'string') - // In a real implementation, we would test how the dispatcher - // handles these edge cases - }) - }) - - it('handles extreme filter text lengths', () => { - const shortText = '' - const normalText = 'README.md' - const longText = 'a'.repeat(1000) - const veryLongText = 'x'.repeat(100000) - - const texts = [shortText, normalText, longText, veryLongText] - - texts.forEach(text => { - assert.strictEqual(typeof text, 'string') - // In a real implementation, we would test performance - // and memory usage with very long filter texts - }) - }) - }) - - describe('filter method contracts', () => { - it('defines expected method contracts for setChangesListFilterText', () => { - // Method signature: setChangesListFilterText(repository: Repository, filterText: string) - const methodContract = { - name: 'setChangesListFilterText', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'filterText', type: 'string' }, - ], - returnType: 'void', - } - - assert.strictEqual(methodContract.name, 'setChangesListFilterText') - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'string') - }) - - it('defines expected method contracts for setIncludedChangesInCommitFilter', () => { - // Method signature: setIncludedChangesInCommitFilter(repository: Repository, includedChangesInCommitFilter: boolean) - const methodContract = { - name: 'setIncludedChangesInCommitFilter', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'includedChangesInCommitFilter', type: 'boolean' }, - ], - returnType: 'void', - } - - assert.strictEqual( - methodContract.name, - 'setIncludedChangesInCommitFilter' - ) - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'boolean') - }) - - it('defines expected method contracts for setFilterNewFiles', () => { - // Method signature: setFilterNewFiles(repository: Repository, filterNewFiles: boolean) - const methodContract = { - name: 'setFilterNewFiles', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'filterNewFiles', type: 'boolean' }, - ], - returnType: 'void', - } - - assert.strictEqual(methodContract.name, 'setFilterNewFiles') - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'boolean') - }) - - it('defines expected method contracts for setFilterModifiedFiles', () => { - // Method signature: setFilterModifiedFiles(repository: Repository, filterModifiedFiles: boolean) - const methodContract = { - name: 'setFilterModifiedFiles', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'filterModifiedFiles', type: 'boolean' }, - ], - returnType: 'void', - } - - assert.strictEqual(methodContract.name, 'setFilterModifiedFiles') - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'boolean') - }) - - it('defines expected method contracts for setFilterDeletedFiles', () => { - // Method signature: setFilterDeletedFiles(repository: Repository, filterDeletedFiles: boolean) - const methodContract = { - name: 'setFilterDeletedFiles', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'filterDeletedFiles', type: 'boolean' }, - ], - returnType: 'void', - } - - assert.strictEqual(methodContract.name, 'setFilterDeletedFiles') - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'boolean') - }) - - it('defines expected method contracts for setFilterExcludedFiles', () => { - // Method signature: setFilterExcludedFiles(repository: Repository, filterExcludedFiles: boolean) - const methodContract = { - name: 'setFilterExcludedFiles', - parameters: [ - { name: 'repository', type: 'Repository' }, - { name: 'filterExcludedFiles', type: 'boolean' }, - ], - returnType: 'void', - } - - assert.strictEqual(methodContract.name, 'setFilterExcludedFiles') - assert.strictEqual(methodContract.parameters.length, 2) - assert.strictEqual(methodContract.parameters[0].type, 'Repository') - assert.strictEqual(methodContract.parameters[1].type, 'boolean') - }) - }) -}) diff --git a/app/test/unit/filter-changes-list-count-methods-test.ts b/app/test/unit/filter-changes-list-count-methods-test.ts deleted file mode 100644 index 79e5a288e77..00000000000 --- a/app/test/unit/filter-changes-list-count-methods-test.ts +++ /dev/null @@ -1,417 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { - WorkingDirectoryStatus, - WorkingDirectoryFileChange, - AppFileStatusKind, -} from '../../src/models/status' -import { DiffSelection, DiffSelectionType } from '../../src/models/diff' - -const allSelected = DiffSelection.fromInitialSelection(DiffSelectionType.All) -const noneSelected = DiffSelection.fromInitialSelection(DiffSelectionType.None) -// Create a partial selection by starting with All and toggling some lines -const partialSelected = DiffSelection.fromInitialSelection( - DiffSelectionType.All -) - .withSelectableLines(new Set([1, 2, 3, 4, 5])) - .withLineSelection(1, false) - .withLineSelection(3, false) - -describe('FilterChangesList Count Methods Tests', () => { - let testFiles: WorkingDirectoryFileChange[] - let workingDirectory: WorkingDirectoryStatus - - beforeEach(() => { - testFiles = [ - // Modified files - mixed staging - new WorkingDirectoryFileChange( - 'README.md', - { kind: AppFileStatusKind.Modified }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'src/components/App.tsx', - { kind: AppFileStatusKind.Modified }, - noneSelected // unstaged - ), - new WorkingDirectoryFileChange( - 'package.json', - { kind: AppFileStatusKind.Modified }, - partialSelected // partially staged - ), - - // New files - mixed staging - new WorkingDirectoryFileChange( - 'src/utils/helpers.ts', - { kind: AppFileStatusKind.New }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'docs/api.md', - { kind: AppFileStatusKind.New }, - noneSelected // unstaged - ), - - // Deleted files - mixed staging - new WorkingDirectoryFileChange( - 'old-file.txt', - { kind: AppFileStatusKind.Deleted }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'deprecated.js', - { kind: AppFileStatusKind.Deleted }, - noneSelected // unstaged - ), - - // Untracked files (always unstaged) - new WorkingDirectoryFileChange( - 'temp-file.tmp', - { kind: AppFileStatusKind.Untracked }, - noneSelected // unstaged - ), - new WorkingDirectoryFileChange( - 'cache.log', - { kind: AppFileStatusKind.Untracked }, - noneSelected // unstaged - ), - - // Other file types - new WorkingDirectoryFileChange( - 'renamed-component.tsx', - { - kind: AppFileStatusKind.Renamed, - oldPath: 'old-component.tsx', - renameIncludesModifications: false, - }, - allSelected // staged - ), - ] - - workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - }) - - describe('getNewFilesCount', () => { - it('counts new and untracked files correctly', () => { - // Expected: 2 New + 2 Untracked = 4 total - const expectedCount = 4 - - const actualCount = workingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - assert.equal(actualCount, expectedCount) - }) - - it('returns zero when no new or untracked files exist', () => { - const filesWithoutNew = testFiles.filter( - f => - f.status.kind !== AppFileStatusKind.New && - f.status.kind !== AppFileStatusKind.Untracked - ) - const workingDirectoryWithoutNew = - WorkingDirectoryStatus.fromFiles(filesWithoutNew) - - const actualCount = workingDirectoryWithoutNew.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - assert.equal(actualCount, 0) - }) - }) - - describe('getModifiedFilesCount', () => { - it('counts modified files correctly', () => { - // Expected: 3 Modified files - const expectedCount = 3 - - const actualCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - assert.equal(actualCount, expectedCount) - }) - - it('returns zero when no modified files exist', () => { - const filesWithoutModified = testFiles.filter( - f => f.status.kind !== AppFileStatusKind.Modified - ) - const workingDirectoryWithoutModified = - WorkingDirectoryStatus.fromFiles(filesWithoutModified) - - const actualCount = workingDirectoryWithoutModified.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - assert.equal(actualCount, 0) - }) - }) - - describe('getDeletedFilesCount', () => { - it('counts deleted files correctly', () => { - // Expected: 2 Deleted files - const expectedCount = 2 - - const actualCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - - assert.equal(actualCount, expectedCount) - }) - - it('returns zero when no deleted files exist', () => { - const filesWithoutDeleted = testFiles.filter( - f => f.status.kind !== AppFileStatusKind.Deleted - ) - const workingDirectoryWithoutDeleted = - WorkingDirectoryStatus.fromFiles(filesWithoutDeleted) - - const actualCount = workingDirectoryWithoutDeleted.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - - assert.equal(actualCount, 0) - }) - }) - - describe('getExcludedFilesCount', () => { - it('counts excluded from commit files correctly', () => { - // Expected: Files with DiffSelectionType.None (excluded from commit) - // src/components/App.tsx, docs/api.md, deprecated.js, temp-file.tmp, cache.log = 5 files - const expectedCount = 5 - - const actualCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - assert.equal(actualCount, expectedCount) - }) - - it('returns zero when all files are included in commit', () => { - const allStagedFiles = testFiles.map( - file => - new WorkingDirectoryFileChange( - file.path, - file.status, - allSelected // Make all files included in commit - ) - ) - const workingDirectoryAllStaged = - WorkingDirectoryStatus.fromFiles(allStagedFiles) - - const actualCount = workingDirectoryAllStaged.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - assert.equal(actualCount, 0) - }) - - it('counts all files when all are excluded from commit', () => { - const allUnstagedFiles = testFiles.map( - file => - new WorkingDirectoryFileChange( - file.path, - file.status, - noneSelected // Make all files excluded from commit - ) - ) - const workingDirectoryAllUnstaged = - WorkingDirectoryStatus.fromFiles(allUnstagedFiles) - - const actualCount = workingDirectoryAllUnstaged.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - assert.equal(actualCount, testFiles.length) - }) - }) - - describe('getIncludedFilesCount', () => { - it('counts included in commit files correctly', () => { - // Expected: Files with DiffSelectionType.All or DiffSelectionType.Partial (included in commit) - // README.md, package.json, src/utils/helpers.ts, old-file.txt, renamed-component.tsx = 5 files - const expectedCount = 5 - - const actualCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - assert.equal(actualCount, expectedCount) - }) - - it('includes partially included files in count', () => { - const partiallyStaged = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.Partial - ) - - // Should have 1 partially included file (package.json) - assert.equal(partiallyStaged.length, 1) - assert.equal(partiallyStaged[0].path, 'package.json') - - // Partially included files should be included in commit count - const includedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - assert.ok(includedCount > 0) - }) - - it('returns zero when no files are included in commit', () => { - const allUnstagedFiles = testFiles.map( - file => - new WorkingDirectoryFileChange( - file.path, - file.status, - noneSelected // Make all files excluded from commit - ) - ) - const workingDirectoryAllUnstaged = - WorkingDirectoryStatus.fromFiles(allUnstagedFiles) - - const actualCount = workingDirectoryAllUnstaged.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - assert.equal(actualCount, 0) - }) - - it('counts all files when all are staged', () => { - const allStagedFiles = testFiles.map( - file => - new WorkingDirectoryFileChange( - file.path, - file.status, - allSelected // Make all files staged - ) - ) - const workingDirectoryAllStaged = - WorkingDirectoryStatus.fromFiles(allStagedFiles) - - const actualCount = workingDirectoryAllStaged.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - assert.equal(actualCount, testFiles.length) - }) - }) - - describe('count consistency', () => { - it('staged and unstaged counts should sum to total files', () => { - const stagedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - const unstagedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - const totalFiles = workingDirectory.files.length - - assert.equal(stagedCount + unstagedCount, totalFiles) - }) - - it('file type counts should sum to total files', () => { - const newCount = workingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - const modifiedCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - const deletedCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - - const otherCount = workingDirectory.files.filter( - f => - f.status.kind !== AppFileStatusKind.New && - f.status.kind !== AppFileStatusKind.Untracked && - f.status.kind !== AppFileStatusKind.Modified && - f.status.kind !== AppFileStatusKind.Deleted - ).length - - const totalFiles = workingDirectory.files.length - - assert.equal( - newCount + modifiedCount + deletedCount + otherCount, - totalFiles - ) - }) - }) - - describe('edge cases', () => { - it('handles empty working directory', () => { - const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) - - const newCount = emptyWorkingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - const modifiedCount = emptyWorkingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - const deletedCount = emptyWorkingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - - const stagedCount = emptyWorkingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - const unstagedCount = emptyWorkingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - assert.equal(newCount, 0) - assert.equal(modifiedCount, 0) - assert.equal(deletedCount, 0) - assert.equal(stagedCount, 0) - assert.equal(unstagedCount, 0) - }) - - it('handles working directory with only one file type', () => { - const onlyModifiedFiles = [ - new WorkingDirectoryFileChange( - 'file1.txt', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'file2.txt', - { kind: AppFileStatusKind.Modified }, - noneSelected - ), - ] - const workingDirectoryOnlyModified = - WorkingDirectoryStatus.fromFiles(onlyModifiedFiles) - - const newCount = workingDirectoryOnlyModified.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - const modifiedCount = workingDirectoryOnlyModified.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - const deletedCount = workingDirectoryOnlyModified.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - - assert.equal(newCount, 0) - assert.equal(modifiedCount, 2) - assert.equal(deletedCount, 0) - }) - }) -}) diff --git a/app/test/unit/filter-changes-list-ui-interactions-test.ts b/app/test/unit/filter-changes-list-ui-interactions-test.ts deleted file mode 100644 index 414ea28eb41..00000000000 --- a/app/test/unit/filter-changes-list-ui-interactions-test.ts +++ /dev/null @@ -1,808 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { - WorkingDirectoryStatus, - WorkingDirectoryFileChange, - AppFileStatusKind, -} from '../../src/models/status' -import { DiffSelection, DiffSelectionType } from '../../src/models/diff' - -const allSelected = DiffSelection.fromInitialSelection(DiffSelectionType.All) -const noneSelected = DiffSelection.fromInitialSelection(DiffSelectionType.None) - -describe('FilterChangesList UI Interactions Tests', () => { - let testFiles: WorkingDirectoryFileChange[] - let workingDirectory: WorkingDirectoryStatus - - beforeEach(() => { - testFiles = [ - // Modified files - mixed staging - new WorkingDirectoryFileChange( - 'README.md', - { kind: AppFileStatusKind.Modified }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'src/components/App.tsx', - { kind: AppFileStatusKind.Modified }, - noneSelected // unstaged - ), - new WorkingDirectoryFileChange( - 'package.json', - { kind: AppFileStatusKind.Modified }, - allSelected // staged - ), - - // New files - mixed staging - new WorkingDirectoryFileChange( - 'src/utils/helpers.ts', - { kind: AppFileStatusKind.New }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'docs/api.md', - { kind: AppFileStatusKind.New }, - noneSelected // unstaged - ), - - // Deleted files - mixed staging - new WorkingDirectoryFileChange( - 'old-file.txt', - { kind: AppFileStatusKind.Deleted }, - allSelected // staged - ), - new WorkingDirectoryFileChange( - 'deprecated.js', - { kind: AppFileStatusKind.Deleted }, - noneSelected // unstaged - ), - - // Untracked files (always unstaged) - new WorkingDirectoryFileChange( - 'temp-file.tmp', - { kind: AppFileStatusKind.Untracked }, - noneSelected // unstaged - ), - ] - - workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - }) - - describe('applyFilters method logic', () => { - it('returns true when showChangesFilter is false', () => { - // Simulate the applyFilters method logic - const showChangesFilter = false - const result = !showChangesFilter ? true : false - - assert.equal(result, true) - }) - - it('filters by staging status correctly', () => { - // Test the staging filter logic from applyFilters - const includedChangesInCommitFilter = true - const filterExcludedFiles = false - - const testFile = testFiles[0] // README.md (staged) - const isStaged = - testFile.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - testFile.selection.getSelectionType() === DiffSelectionType.None - - let matchesStagingFilter = false - if (includedChangesInCommitFilter && isStaged) { - matchesStagingFilter = true - } - if (filterExcludedFiles && isUnstaged) { - matchesStagingFilter = true - } - - assert.equal(matchesStagingFilter, true) // Should match staged filter - }) - - it('filters by file type correctly', () => { - // Test the file type filter logic from applyFilters - const filterNewFiles = true - const filterModifiedFiles = false - - const newFile = testFiles.find( - f => f.status.kind === AppFileStatusKind.New - )! - const modifiedFile = testFiles.find( - f => f.status.kind === AppFileStatusKind.Modified - )! - - let matchesFileTypeFilterForNew = false - let matchesFileTypeFilterForModified = false - - // Check new file - if (filterNewFiles && newFile.status.kind === AppFileStatusKind.New) { - matchesFileTypeFilterForNew = true - } - - // Check modified file - if ( - filterModifiedFiles && - modifiedFile.status.kind === AppFileStatusKind.Modified - ) { - matchesFileTypeFilterForModified = true - } - - assert.equal(matchesFileTypeFilterForNew, true) - assert.equal(matchesFileTypeFilterForModified, false) - }) - - it('handles combined staging and file type filters', () => { - // Test combined filter logic - const includedChangesInCommitFilter = true - const filterExcludedFiles = true - const filterDeletedFiles = true - - const deletedStagedFile = testFiles.find( - f => - f.status.kind === AppFileStatusKind.Deleted && - f.selection.getSelectionType() !== DiffSelectionType.None - )! - - const deletedUnstagedFile = testFiles.find( - f => - f.status.kind === AppFileStatusKind.Deleted && - f.selection.getSelectionType() === DiffSelectionType.None - )! - - // Test staged deleted file - const isStaged1 = - deletedStagedFile.selection.getSelectionType() !== - DiffSelectionType.None - const isUnstaged1 = - deletedStagedFile.selection.getSelectionType() === - DiffSelectionType.None - let matchesStagingFilter1 = false - if (includedChangesInCommitFilter && isStaged1) { - matchesStagingFilter1 = true - } - if (filterExcludedFiles && isUnstaged1) { - matchesStagingFilter1 = true - } - - let matchesFileTypeFilter1 = false - if ( - filterDeletedFiles && - deletedStagedFile.status.kind === AppFileStatusKind.Deleted - ) { - matchesFileTypeFilter1 = true - } - - const shouldShowStagedDeleted = - matchesStagingFilter1 && matchesFileTypeFilter1 - - // Test unstaged deleted file - const isStaged2 = - deletedUnstagedFile.selection.getSelectionType() !== - DiffSelectionType.None - const isUnstaged2 = - deletedUnstagedFile.selection.getSelectionType() === - DiffSelectionType.None - let matchesStagingFilter2 = false - if (includedChangesInCommitFilter && isStaged2) { - matchesStagingFilter2 = true - } - if (filterExcludedFiles && isUnstaged2) { - matchesStagingFilter2 = true - } - - let matchesFileTypeFilter2 = false - if ( - filterDeletedFiles && - deletedUnstagedFile.status.kind === AppFileStatusKind.Deleted - ) { - matchesFileTypeFilter2 = true - } - - const shouldShowUnstagedDeleted = - matchesStagingFilter2 && matchesFileTypeFilter2 - - assert.equal(shouldShowStagedDeleted, true) - assert.equal(shouldShowUnstagedDeleted, true) - }) - }) - - describe('filter options button state', () => { - it('calculates active filters count correctly', () => { - // Simulate the active filters count logic from renderFilterBox - const filters = { - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: true, - } - - const activeFiltersCount = [ - filters.includedChangesInCommitFilter, - filters.filterNewFiles, - filters.filterModifiedFiles, - filters.filterDeletedFiles, - filters.filterExcludedFiles, - ].filter(Boolean).length - - assert.equal(activeFiltersCount, 3) - }) - - it('determines hasActiveFilters correctly', () => { - const activeFiltersCount1 = 0 - const activeFiltersCount2 = 3 - - const hasActiveFilters1 = activeFiltersCount1 > 0 - const hasActiveFilters2 = activeFiltersCount2 > 0 - - assert.equal(hasActiveFilters1, false) - assert.equal(hasActiveFilters2, true) - }) - - it('generates correct button text label', () => { - const activeFiltersCount = 2 - const hasActiveFilters = activeFiltersCount > 0 - const buttonTextLabel = `Filter Options ${ - hasActiveFilters ? `(${activeFiltersCount} applied)` : '' - }` - - assert.equal(buttonTextLabel, 'Filter Options (2 applied)') - }) - - it('generates correct button text label with no active filters', () => { - const activeFiltersCount = 0 - const hasActiveFilters = activeFiltersCount > 0 - const buttonTextLabel = `Filter Options ${ - hasActiveFilters ? `(${activeFiltersCount} applied)` : '' - }` - - assert.equal(buttonTextLabel, 'Filter Options ') - }) - }) - - describe('filter checkbox states', () => { - it('determines correct checkbox value for included files filter', () => { - const includedChangesInCommitFilter = true - const checkboxValue = includedChangesInCommitFilter ? 'On' : 'Off' - - assert.equal(checkboxValue, 'On') - }) - - it('determines correct checkbox value for excluded files filter', () => { - const filterExcludedFiles = false - const checkboxValue = filterExcludedFiles ? 'On' : 'Off' - - assert.equal(checkboxValue, 'Off') - }) - - it('determines correct checkbox value for new files filter', () => { - const filterNewFiles = true - const checkboxValue = filterNewFiles ? 'On' : 'Off' - - assert.equal(checkboxValue, 'On') - }) - - it('determines correct checkbox value for modified files filter', () => { - const filterModifiedFiles = false - const checkboxValue = filterModifiedFiles ? 'On' : 'Off' - - assert.equal(checkboxValue, 'Off') - }) - - it('determines correct checkbox value for deleted files filter', () => { - const filterDeletedFiles = true - const checkboxValue = filterDeletedFiles ? 'On' : 'Off' - - assert.equal(checkboxValue, 'On') - }) - }) - - describe('filter labels with counts', () => { - it('generates correct label for included files', () => { - const includedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - const label = `Included files (${includedCount})` - - // Expected: README.md, package.json, src/utils/helpers.ts, old-file.txt = 4 files - assert.equal(label, 'Included files (4)') - }) - - it('generates correct label for excluded files', () => { - const excludedCount = workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - const label = `Excluded files (${excludedCount})` - - // Expected: src/components/App.tsx, docs/api.md, deprecated.js, temp-file.tmp = 4 files - assert.equal(label, 'Excluded files (4)') - }) - - it('generates correct label for new files', () => { - const newCount = workingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - const label = `New files (${newCount})` - - // Expected: src/utils/helpers.ts, docs/api.md, temp-file.tmp = 3 files - assert.equal(label, 'New files (3)') - }) - - it('generates correct label for modified files', () => { - const modifiedCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - const label = `Modified files (${modifiedCount})` - - // Expected: README.md, src/components/App.tsx, package.json = 3 files - assert.equal(label, 'Modified files (3)') - }) - - it('generates correct label for deleted files', () => { - const deletedCount = workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - const label = `Deleted files (${deletedCount})` - - // Expected: old-file.txt, deprecated.js = 2 files - assert.equal(label, 'Deleted files (2)') - }) - }) - - describe('filter interaction scenarios', () => { - it('handles scenario where staged and unstaged filters are both enabled', () => { - // This should show all files since every file is either staged or unstaged - const includedChangesInCommitFilter = true - const filterExcludedFiles = true - - const filteredFiles = workingDirectory.files.filter(file => { - const hasStagingFilter = - includedChangesInCommitFilter || filterExcludedFiles - if (!hasStagingFilter) { - return true - } - - const isStaged = - file.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - file.selection.getSelectionType() === DiffSelectionType.None - - let matchesStagingFilter = false - if (includedChangesInCommitFilter && isStaged) { - matchesStagingFilter = true - } - if (filterExcludedFiles && isUnstaged) { - matchesStagingFilter = true - } - - return matchesStagingFilter - }) - - assert.equal(filteredFiles.length, testFiles.length) - }) - - it('handles scenario where only deleted files filter is enabled', () => { - const filterDeletedFiles = true - - const filteredFiles = workingDirectory.files.filter(file => { - const hasFileTypeFilter = filterDeletedFiles - if (!hasFileTypeFilter) { - return true - } - - return file.status.kind === AppFileStatusKind.Deleted - }) - - // Should only show deleted files - assert.equal(filteredFiles.length, 2) - assert.ok( - filteredFiles.every(f => f.status.kind === AppFileStatusKind.Deleted) - ) - }) - - it('handles scenario where multiple file type filters are enabled', () => { - const filterNewFiles = true - const filterDeletedFiles = true - - const filteredFiles = workingDirectory.files.filter(file => { - const hasFileTypeFilter = filterNewFiles || filterDeletedFiles - if (!hasFileTypeFilter) { - return true - } - - let matchesFileTypeFilter = false - if (filterNewFiles && file.status.kind === AppFileStatusKind.New) { - matchesFileTypeFilter = true - } - if ( - filterDeletedFiles && - file.status.kind === AppFileStatusKind.Deleted - ) { - matchesFileTypeFilter = true - } - - return matchesFileTypeFilter - }) - - // Should show new files + deleted files (but not untracked) - // Expected: src/utils/helpers.ts, docs/api.md, old-file.txt, deprecated.js = 4 files - assert.equal(filteredFiles.length, 4) - }) - - it('handles scenario where no filters match any files', () => { - // Create a scenario where filters exclude all files - const filterNewFiles = true - const filterExcludedFiles = true - - // Filter for new files that are also unstaged - const filteredFiles = workingDirectory.files.filter(file => { - const hasStagingFilter = filterExcludedFiles - const hasFileTypeFilter = filterNewFiles - - let matchesStagingFilter = true - if (hasStagingFilter) { - matchesStagingFilter = - file.selection.getSelectionType() === DiffSelectionType.None - } - - let matchesFileTypeFilter = true - if (hasFileTypeFilter) { - matchesFileTypeFilter = file.status.kind === AppFileStatusKind.New - } - - return matchesStagingFilter && matchesFileTypeFilter - }) - - // Should show new files that are unstaged: docs/api.md = 1 file - assert.equal(filteredFiles.length, 1) - assert.equal(filteredFiles[0].path, 'docs/api.md') - }) - }) - - describe('clear filters functionality', () => { - it('onClearAllFilters clears all filter states', () => { - // Simulate the onClearAllFilters method logic - const initialState = { - filterText: 'README', - includedChangesInCommitFilter: true, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - } - - // Simulate clearing all filters - const clearedState = { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - } - - // Verify initial state has filters active - const hasInitialFilters = - initialState.filterText !== '' || - initialState.includedChangesInCommitFilter || - initialState.filterNewFiles || - initialState.filterModifiedFiles || - initialState.filterDeletedFiles || - initialState.filterExcludedFiles - - // Verify cleared state has no filters active - const hasClearedFilters = - clearedState.filterText !== '' || - clearedState.includedChangesInCommitFilter || - clearedState.filterNewFiles || - clearedState.filterModifiedFiles || - clearedState.filterDeletedFiles || - clearedState.filterExcludedFiles - - assert.equal(hasInitialFilters, true) - assert.equal(hasClearedFilters, false) - }) - - it('onClearAllFilters clears text filter along with other filters', () => { - const initialState = { - filterText: 'src/', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - } - - const clearedState = { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - } - - // Even if only text filter is active, it should be cleared - assert.equal(initialState.filterText, 'src/') - assert.equal(clearedState.filterText, '') - }) - - it('hasActiveFilters includes text filter in determination', () => { - // Test the logic for determining if clear filters button should be visible - const testCases = [ - { - state: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - }, - expected: false, - description: 'no filters active', - }, - { - state: { - filterText: 'README', - includedChangesInCommitFilter: false, - filterNewFiles: false, - }, - expected: true, - description: 'only text filter active', - }, - { - state: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: false, - }, - expected: true, - description: 'only included filter active', - }, - { - state: { - filterText: 'test', - includedChangesInCommitFilter: true, - filterNewFiles: true, - }, - expected: true, - description: 'multiple filters active', - }, - ] - - testCases.forEach(({ state, expected, description }) => { - const hasActiveFilters = - state.filterText.length > 0 || - state.includedChangesInCommitFilter || - state.filterNewFiles - - assert.equal(hasActiveFilters, expected, `Failed for ${description}`) - }) - }) - - it('clear filters button visibility logic works correctly', () => { - // Test the exact logic from renderFilterOptions and renderNoChanges - const scenarios = [ - { - filters: { - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - filterText: '', - expectedVisible: false, - description: 'no filters - button should be hidden', - }, - { - filters: { - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - filterText: '', - expectedVisible: true, - description: 'one filter active - button should be visible', - }, - { - filters: { - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - filterText: 'search', - expectedVisible: true, - description: 'only text filter - button should be visible', - }, - { - filters: { - includedChangesInCommitFilter: true, - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - }, - filterText: 'complex search', - expectedVisible: true, - description: 'all filters active - button should be visible', - }, - ] - - scenarios.forEach( - ({ filters, filterText, expectedVisible, description }) => { - // Logic from renderFilterOptions for dropdown button - const hasActiveFiltersDropdown = [ - filters.includedChangesInCommitFilter, - filters.filterNewFiles, - filters.filterModifiedFiles, - filters.filterDeletedFiles, - filters.filterExcludedFiles, - ].some(Boolean) - - // Logic from renderNoChanges for empty state button - const hasActiveFiltersEmptyState = - [ - filters.includedChangesInCommitFilter, - filters.filterNewFiles, - filters.filterModifiedFiles, - filters.filterDeletedFiles, - filters.filterExcludedFiles, - ].some(Boolean) || filterText.length > 0 - - if (filterText.length > 0) { - // When text filter is active, empty state button should always be visible - assert.equal( - hasActiveFiltersEmptyState, - true, - `Empty state: ${description}` - ) - } else { - // When no text filter, both buttons should have same visibility - assert.equal( - hasActiveFiltersDropdown, - expectedVisible, - `Dropdown: ${description}` - ) - assert.equal( - hasActiveFiltersEmptyState, - expectedVisible, - `Empty state: ${description}` - ) - } - } - ) - }) - - it('clear filters operation resets to default state', () => { - // Simulate the exact dispatcher calls made by onClearAllFilters - const dispatcherCalls = [ - { method: 'setChangesListFilterText', args: ['repository', ''] }, - { - method: 'setIncludedChangesInCommitFilter', - args: ['repository', false], - }, - { method: 'setFilterExcludedFiles', args: ['repository', false] }, - { method: 'setFilterNewFiles', args: ['repository', false] }, - { method: 'setFilterModifiedFiles', args: ['repository', false] }, - { method: 'setFilterDeletedFiles', args: ['repository', false] }, - { method: 'incrementMetric', args: ['appliesClearAllFiltersCount'] }, - ] - - // Verify all expected dispatcher calls are made - assert.equal(dispatcherCalls.length, 7) - - // Verify text filter is cleared - const textFilterCall = dispatcherCalls.find( - call => call.method === 'setChangesListFilterText' - ) - assert.ok(textFilterCall, 'Should call setChangesListFilterText') - assert.equal(textFilterCall.args[1], '', 'Should clear text filter') - - // Verify all boolean filters are set to false - const booleanFilterCalls = dispatcherCalls.filter( - call => - call.method.startsWith('setFilter') || - call.method === 'setIncludedChangesInCommitFilter' - ) - assert.equal( - booleanFilterCalls.length, - 5, - 'Should have 5 boolean filter calls' - ) - - booleanFilterCalls.forEach(call => { - assert.equal( - call.args[1], - false, - `${call.method} should be set to false` - ) - }) - - // Verify metrics are tracked - const metricsCall = dispatcherCalls.find( - call => call.method === 'incrementMetric' - ) - assert.ok(metricsCall, 'Should call incrementMetric') - assert.equal( - metricsCall.args[0], - 'appliesClearAllFiltersCount', - 'Should track clear all filters metric' - ) - }) - - it('clear filters closes filter options popover', () => { - // Test that closeFilterOptions is called after clearing filters - let popoverClosed = false - - const mockCloseFilterOptions = () => { - popoverClosed = true - } - - // Simulate the end of onClearAllFilters method - mockCloseFilterOptions() - - assert.equal( - popoverClosed, - true, - 'Should close filter options popover after clearing' - ) - }) - }) - - describe('edge cases', () => { - it('handles empty working directory with filters enabled', () => { - const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) - - const includedCount = emptyWorkingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - const excludedCount = emptyWorkingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - const newCount = emptyWorkingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - - assert.equal(includedCount, 0) - assert.equal(excludedCount, 0) - assert.equal(newCount, 0) - }) - - it('handles working directory with only one file', () => { - const singleFile = [ - new WorkingDirectoryFileChange( - 'single.txt', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - ] - const singleFileWorkingDirectory = - WorkingDirectoryStatus.fromFiles(singleFile) - - const includedCount = singleFileWorkingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - - const excludedCount = singleFileWorkingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - - const modifiedCount = singleFileWorkingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - - assert.equal(includedCount, 1) - assert.equal(excludedCount, 0) - assert.equal(modifiedCount, 1) - }) - }) -}) From bfe62b7658734cc81c0acf7333c3e4fe0c2324cb Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Wed, 18 Jun 2025 15:26:29 +0400 Subject: [PATCH 0469/1338] Remove changes-filter-test.ts - only tests setter/getter functionality This test file follows the same problematic pattern as the others removed earlier. It only verifies that state values can be set and retrieved, without testing any actual filtering logic or application behavior. --- app/test/unit/changes-filter-test.ts | 584 --------------------------- 1 file changed, 584 deletions(-) delete mode 100644 app/test/unit/changes-filter-test.ts diff --git a/app/test/unit/changes-filter-test.ts b/app/test/unit/changes-filter-test.ts deleted file mode 100644 index ad023263d28..00000000000 --- a/app/test/unit/changes-filter-test.ts +++ /dev/null @@ -1,584 +0,0 @@ -import { describe, it, beforeEach } from 'node:test' -import assert from 'node:assert' -import { - WorkingDirectoryStatus, - WorkingDirectoryFileChange, - AppFileStatusKind, -} from '../../src/models/status' -import { DiffSelection, DiffSelectionType } from '../../src/models/diff' -import { createState } from '../helpers/changes-state-helper' -import { ChangesSelectionKind } from '../../src/lib/app-state' - -const allSelected = DiffSelection.fromInitialSelection(DiffSelectionType.All) -const noneSelected = DiffSelection.fromInitialSelection(DiffSelectionType.None) - -describe('Changes Filter Functionality', () => { - let testFiles: WorkingDirectoryFileChange[] - let workingDirectory: WorkingDirectoryStatus - - beforeEach(() => { - testFiles = [ - new WorkingDirectoryFileChange( - 'README.md', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'new-feature.ts', - { kind: AppFileStatusKind.New }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'package.json', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'untracked-file.txt', - { kind: AppFileStatusKind.Untracked }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'deleted-file.md', - { kind: AppFileStatusKind.Deleted }, - allSelected - ), - ] - - workingDirectory = WorkingDirectoryStatus.fromFiles(testFiles) - }) - - describe('fileListFilter.filterNewFiles', () => { - it('initializes with default value false', () => { - const state = createState({}) - assert.equal(state.fileListFilter.filterNewFiles, false) - }) - - it('can be set to true', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterNewFiles, true) - }) - - it('can be set to false explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterNewFiles, false) - }) - }) - - describe('fileListFilter.filterModifiedFiles', () => { - it('initializes with default value false', () => { - const state = createState({}) - assert.equal(state.fileListFilter.filterModifiedFiles, false) - }) - - it('can be set to true', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - }) - - it('can be set to false explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterModifiedFiles, false) - }) - }) - - describe('fileListFilter.filterDeletedFiles', () => { - it('initializes with default value false', () => { - const state = createState({}) - assert.equal(state.fileListFilter.filterDeletedFiles, false) - }) - - it('can be set to true', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterDeletedFiles, true) - }) - - it('can be set to false explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterDeletedFiles, false) - }) - }) - - describe('fileListFilter.filterExcludedFiles', () => { - it('initializes with default value false', () => { - const state = createState({}) - assert.equal(state.fileListFilter.filterExcludedFiles, false) - }) - - it('can be set to true', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: true, - }, - }) - assert.equal(state.fileListFilter.filterExcludedFiles, true) - }) - - it('can be set to false explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterExcludedFiles, false) - }) - }) - - describe('fileListFilter.includedChangesInCommitFilter', () => { - it('initializes with default value false', () => { - const state = createState({}) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) - }) - - it('can be set to true', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) - }) - - it('can be set to false explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) - }) - }) - - describe('fileListFilter.filterText', () => { - it('initializes with empty string', () => { - const state = createState({}) - assert.equal(state.fileListFilter.filterText, '') - }) - - it('can be set to a filter string', () => { - const filterText = 'README' - const state = createState({ - fileListFilter: { - filterText, - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterText, filterText) - }) - - it('can be set to empty string explicitly', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - assert.equal(state.fileListFilter.filterText, '') - }) - }) - - describe('combined filter states', () => { - it('can have multiple filters enabled simultaneously', () => { - const state = createState({ - fileListFilter: { - filterText: 'test', - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: true, - filterExcludedFiles: true, - includedChangesInCommitFilter: true, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - assert.equal(state.fileListFilter.filterDeletedFiles, true) - assert.equal(state.fileListFilter.filterExcludedFiles, true) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) - assert.equal(state.fileListFilter.filterText, 'test') - }) - - it('can have mixed filter states', () => { - const state = createState({ - fileListFilter: { - filterText: 'feature', - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: true, - filterExcludedFiles: false, - includedChangesInCommitFilter: true, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterModifiedFiles, false) - assert.equal(state.fileListFilter.filterDeletedFiles, true) - assert.equal(state.fileListFilter.filterExcludedFiles, false) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) - assert.equal(state.fileListFilter.filterText, 'feature') - }) - - it('can disable all filters', () => { - const state = createState({ - fileListFilter: { - filterText: '', - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - includedChangesInCommitFilter: false, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, false) - assert.equal(state.fileListFilter.filterModifiedFiles, false) - assert.equal(state.fileListFilter.filterDeletedFiles, false) - assert.equal(state.fileListFilter.filterExcludedFiles, false) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, false) - assert.equal(state.fileListFilter.filterText, '') - }) - }) - - describe('filter state with file selection', () => { - it('maintains filter states with file selection', () => { - const firstFile = testFiles[0].id - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: 'README', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - selection: { - kind: ChangesSelectionKind.WorkingDirectory, - selectedFileIDs: [firstFile], - diff: null, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterText, 'README') - assert.equal(state.selection.kind, ChangesSelectionKind.WorkingDirectory) - }) - - it('works with empty file selection', () => { - const state = createState({ - workingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - selection: { - kind: ChangesSelectionKind.WorkingDirectory, - selectedFileIDs: [], - diff: null, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - assert.equal(state.selection.kind, ChangesSelectionKind.WorkingDirectory) - }) - }) - - describe('edge cases', () => { - it('handles empty working directory with filters enabled', () => { - const emptyWorkingDirectory = WorkingDirectoryStatus.fromFiles([]) - const state = createState({ - workingDirectory: emptyWorkingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - assert.equal(state.fileListFilter.includedChangesInCommitFilter, true) - assert.equal(state.workingDirectory.files.length, 0) - }) - - it('handles special characters in filter text', () => { - const specialFilterText = 'file-with-special_chars@#$.txt' - const state = createState({ - fileListFilter: { - filterText: specialFilterText, - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.fileListFilter.filterText, specialFilterText) - }) - - it('handles very long filter text', () => { - const longFilterText = 'a'.repeat(1000) - const state = createState({ - fileListFilter: { - filterText: longFilterText, - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.fileListFilter.filterText, longFilterText) - }) - - it('handles unicode characters in filter text', () => { - const unicodeFilterText = '测试文件.txt' - const state = createState({ - fileListFilter: { - filterText: unicodeFilterText, - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.fileListFilter.filterText, unicodeFilterText) - }) - - it('handles filter text with whitespace', () => { - const whitespaceFilterText = ' file with spaces ' - const state = createState({ - fileListFilter: { - filterText: whitespaceFilterText, - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.fileListFilter.filterText, whitespaceFilterText) - }) - }) - - describe('filter state with different file types', () => { - it('works with files of basic status kinds', () => { - const basicFiles = [ - new WorkingDirectoryFileChange( - 'modified.ts', - { kind: AppFileStatusKind.Modified }, - allSelected - ), - new WorkingDirectoryFileChange( - 'new.ts', - { kind: AppFileStatusKind.New }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'deleted.ts', - { kind: AppFileStatusKind.Deleted }, - allSelected - ), - new WorkingDirectoryFileChange( - 'untracked.ts', - { kind: AppFileStatusKind.Untracked }, - noneSelected - ), - ] - - const basicWorkingDirectory = WorkingDirectoryStatus.fromFiles(basicFiles) - const state = createState({ - workingDirectory: basicWorkingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: true, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.workingDirectory.files.length, 4) - assert.equal(state.fileListFilter.filterNewFiles, true) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - }) - - it('works with complex file status kinds', () => { - const complexFiles = [ - new WorkingDirectoryFileChange( - 'renamed.ts', - { - kind: AppFileStatusKind.Renamed, - oldPath: 'old-name.ts', - renameIncludesModifications: false, - }, - noneSelected - ), - new WorkingDirectoryFileChange( - 'copied.ts', - { - kind: AppFileStatusKind.Copied, - oldPath: 'original.ts', - renameIncludesModifications: true, - }, - allSelected - ), - ] - - const complexWorkingDirectory = - WorkingDirectoryStatus.fromFiles(complexFiles) - const state = createState({ - workingDirectory: complexWorkingDirectory, - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: true, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.equal(state.workingDirectory.files.length, 2) - assert.equal(state.fileListFilter.filterNewFiles, false) - assert.equal(state.fileListFilter.filterModifiedFiles, true) - }) - }) - - describe('filter state validation', () => { - it('accepts boolean values for filter flags', () => { - const state = createState({ - fileListFilter: { - filterText: '', - includedChangesInCommitFilter: true, - filterNewFiles: true, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.strictEqual(typeof state.fileListFilter.filterNewFiles, 'boolean') - assert.strictEqual( - typeof state.fileListFilter.filterModifiedFiles, - 'boolean' - ) - assert.strictEqual( - typeof state.fileListFilter.includedChangesInCommitFilter, - 'boolean' - ) - }) - - it('accepts string values for filter text', () => { - const state = createState({ - fileListFilter: { - filterText: 'test-filter', - includedChangesInCommitFilter: false, - filterNewFiles: false, - filterModifiedFiles: false, - filterDeletedFiles: false, - filterExcludedFiles: false, - }, - }) - - assert.strictEqual(typeof state.fileListFilter.filterText, 'string') - assert.equal(state.fileListFilter.filterText, 'test-filter') - }) - }) -}) From 6a7df5cf6a622a8c31d7f45055c553b0689d6c94 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Wed, 18 Jun 2025 15:50:40 +0400 Subject: [PATCH 0470/1338] Change filter logic from OR to AND for narrowing search results - Modified applyFilters method to use AND logic instead of OR logic - Files must now satisfy ALL active filters to be displayed - This ensures filtering narrows down results rather than expanding them - Addresses reviewer feedback to make filtering more intuitive for users When multiple filters are selected, the list will show only files that match all selected criteria, providing more precise filtering. --- app/src/ui/changes/filter-changes-list.tsx | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 06552033ec5..7f40a749874 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -1513,49 +1513,53 @@ export class FilterChangesList extends React.Component< return true } - // Use OR logic - file matches if it satisfies ANY of the active filters + // Use AND logic - file must satisfy ALL active filters const isStaged = item.change.selection.getSelectionType() !== DiffSelectionType.None const isUnstaged = item.change.selection.getSelectionType() === DiffSelectionType.None // Check staging status filters - if (this.props.includedChangesInCommitFilter && isStaged) { - return true + if (this.props.includedChangesInCommitFilter && !isStaged) { + return false } - if (this.props.filterExcludedFiles && isUnstaged) { - return true + if (this.props.filterExcludedFiles && !isUnstaged) { + return false } - // Check file type filters - if (this.props.filterNewFiles) { + // Check if file type filters are active + const hasFileTypeFilter = + this.props.filterNewFiles || + this.props.filterModifiedFiles || + this.props.filterDeletedFiles + + if (hasFileTypeFilter) { + // Determine the file type const isNewFile = item.change.status.kind === AppFileStatusKind.New || item.change.status.kind === AppFileStatusKind.Untracked - if (isNewFile) { - return true - } - } - - if (this.props.filterModifiedFiles) { const isModifiedFile = item.change.status.kind === AppFileStatusKind.Modified - if (isModifiedFile) { - return true - } - } - - if (this.props.filterDeletedFiles) { const isDeletedFile = item.change.status.kind === AppFileStatusKind.Deleted - if (isDeletedFile) { - return true + + // Check each active file type filter + if (this.props.filterNewFiles && !isNewFile) { + return false + } + + if (this.props.filterModifiedFiles && !isModifiedFile) { + return false + } + + if (this.props.filterDeletedFiles && !isDeletedFile) { + return false } } - // File doesn't match any active filters - return false + // File matches all active filters + return true } private getListAriaLabel = () => { From 539925537c03058aa5939d4fd68144f29ea22d91 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Wed, 18 Jun 2025 16:34:09 +0400 Subject: [PATCH 0471/1338] added new tests and extracted functions --- app/src/ui/changes/filter-changes-list.tsx | 346 ++++----------- app/src/ui/changes/filter-changes-logic.ts | 315 ++++++++++++++ app/test/unit/filter-changes-logic-test.ts | 478 +++++++++++++++++++++ 3 files changed, 877 insertions(+), 262 deletions(-) create mode 100644 app/src/ui/changes/filter-changes-logic.ts create mode 100644 app/test/unit/filter-changes-logic-test.ts diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 7f40a749874..ddf5947a535 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -70,6 +70,20 @@ import { } from '../lib/popover' import { LinkButton } from '../lib/link-button' import { plural } from '../lib/plural' +import { + applyFilters, + isCommittingFileHiddenByFilter, + getNewFilesCount, + getModifiedFilesCount, + getDeletedFilesCount, + getExcludedFilesCount, + getIncludedFilesCount, + getCheckAllValue, + getNoResultsMessage, + hasActiveFilters, + countActiveFilters, + IFileFilterState, +} from './filter-changes-logic' interface IChangesListItem extends IFilterListItem { readonly id: string @@ -95,18 +109,6 @@ const StashIcon: OcticonSymbolVariant = { const GitIgnoreFileName = '.gitignore' -function getCheckBoxValueFromIncludeAll(includeAll: boolean | null) { - if (includeAll === true) { - return CheckboxValue.On - } - - if (includeAll === false) { - return CheckboxValue.Off - } - - return CheckboxValue.Mixed -} - interface IFilterChangesListProps { readonly repository: Repository readonly repositoryAccount: Account | null @@ -293,37 +295,15 @@ export class FilterChangesList extends React.Component< fileIdsIncludedInCommit: ReadonlyArray, filteredItems: Map, fileCount: number, - includedChangesInCommitFilter: boolean, - filterNewFiles: boolean, - filterModifiedFiles: boolean, - filterDeletedFiles: boolean, - filterExcludedFiles: boolean - ) => { - // Check if any filters are active - const hasAnyActiveFilter = - filterText !== '' || - includedChangesInCommitFilter || - filterNewFiles || - filterModifiedFiles || - filterDeletedFiles || - filterExcludedFiles - - // All possible files are present in the list (no active filters or all files match active filters) - if (!hasAnyActiveFilter || filteredItems.size === fileCount) { - return false - } - - // If filtered rows count is 1 and included for commit rows count is 2, - // there is no way the included for commit rows are visible regardless of - // what they are. - if (fileIdsIncludedInCommit.length > this.state.filteredItems.size) { - return true - } - - // If we can find a file id included in the commit that does not exist in - // the filtered items, then we are committing a hidden file. - return fileIdsIncludedInCommit.some(fId => !filteredItems.get(fId)) - } + filters: IFileFilterState + ) => + isCommittingFileHiddenByFilter( + filterText, + fileIdsIncludedInCommit, + filteredItems, + fileCount, + filters + ) ) /** Compute the 'Include All' checkbox value */ @@ -332,92 +312,24 @@ export class FilterChangesList extends React.Component< workingDirectory: WorkingDirectoryStatus, rebaseConflictState: RebaseConflictState | null, filteredItems: Map - ) => { - if ( - filteredItems.size === workingDirectory.files.length && - rebaseConflictState === null - ) { - return getCheckBoxValueFromIncludeAll(workingDirectory.includeAll) - } - - const files = workingDirectory.files.filter(f => filteredItems.has(f.id)) - - if (files.length === 0) { - // the current commit will be skipped in the rebase - return CheckboxValue.Off - } - - if (rebaseConflictState !== null) { - // untracked files will be skipped by the rebase, so we need to ensure that - // the "Include All" checkbox matches this state - const onlyUntrackedFilesFound = files.every( - f => f.status.kind === AppFileStatusKind.Untracked - ) - - if (onlyUntrackedFilesFound) { - return CheckboxValue.Off - } - - const onlyTrackedFilesFound = files.every( - f => f.status.kind !== AppFileStatusKind.Untracked - ) - - // show "Mixed" if we have a mixture of tracked and untracked changes - return onlyTrackedFilesFound ? CheckboxValue.On : CheckboxValue.Mixed - } - - const filteredStatus = WorkingDirectoryStatus.fromFiles(files) - - return getCheckBoxValueFromIncludeAll(filteredStatus.includeAll) - } + ) => + getCheckAllValue(workingDirectory, rebaseConflictState, filteredItems) ) /** Calculate the count of new files (including untracked) */ - private getNewFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus) => { - return workingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - } - ) + private getNewFilesCount = memoizeOne(getNewFilesCount) /** Calculate the count of modified files */ - private getModifiedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus) => { - return workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - } - ) + private getModifiedFilesCount = memoizeOne(getModifiedFilesCount) /** Calculate the count of deleted files */ - private getDeletedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus) => { - return workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - } - ) + private getDeletedFilesCount = memoizeOne(getDeletedFilesCount) /** Calculate the count of excluded from commit files (files with DiffSelectionType.None) */ - private getExcludedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus) => { - return workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - } - ) + private getExcludedFilesCount = memoizeOne(getExcludedFilesCount) /** Calculate the count of included in commit files (files with DiffSelectionType.All or DiffSelectionType.Partial) */ - private getIncludedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus) => { - return workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - } - ) + private getIncludedFilesCount = memoizeOne(getIncludedFilesCount) public constructor(props: IFilterChangesListProps) { super(props) @@ -1013,11 +925,13 @@ export class FilterChangesList extends React.Component< filesSelected.map(f => f.id), this.state.filteredItems, fileCount, - this.props.includedChangesInCommitFilter, - this.props.filterNewFiles, - this.props.filterModifiedFiles, - this.props.filterDeletedFiles, - this.props.filterExcludedFiles + { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + } ) return ( @@ -1345,13 +1259,13 @@ export class FilterChangesList extends React.Component< private renderFilterOptions() { // Check if any filters are active - const hasActiveFilters = [ - this.props.includedChangesInCommitFilter, - this.props.filterNewFiles, - this.props.filterModifiedFiles, - this.props.filterDeletedFiles, - this.props.filterExcludedFiles, - ].some(Boolean) + const filtersActive = hasActiveFilters('', { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + }) return (
    - {hasActiveFilters && ( + {filtersActive && (
    @@ -1443,13 +1357,13 @@ export class FilterChangesList extends React.Component< } // Count active filters - const activeFiltersCount = [ - this.props.includedChangesInCommitFilter, - this.props.filterNewFiles, - this.props.filterModifiedFiles, - this.props.filterDeletedFiles, - this.props.filterExcludedFiles, - ].filter(Boolean).length + const activeFiltersCount = countActiveFilters({ + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + }) const hasActiveFilters = activeFiltersCount > 0 const buttonTextLabel = `Filter Options ${ @@ -1501,65 +1415,13 @@ export class FilterChangesList extends React.Component< return true } - // Check if any filters are active - const hasAnyFilter = - this.props.includedChangesInCommitFilter || - this.props.filterExcludedFiles || - this.props.filterNewFiles || - this.props.filterModifiedFiles || - this.props.filterDeletedFiles - - if (!hasAnyFilter) { - return true - } - - // Use AND logic - file must satisfy ALL active filters - const isStaged = - item.change.selection.getSelectionType() !== DiffSelectionType.None - const isUnstaged = - item.change.selection.getSelectionType() === DiffSelectionType.None - - // Check staging status filters - if (this.props.includedChangesInCommitFilter && !isStaged) { - return false - } - - if (this.props.filterExcludedFiles && !isUnstaged) { - return false - } - - // Check if file type filters are active - const hasFileTypeFilter = - this.props.filterNewFiles || - this.props.filterModifiedFiles || - this.props.filterDeletedFiles - - if (hasFileTypeFilter) { - // Determine the file type - const isNewFile = - item.change.status.kind === AppFileStatusKind.New || - item.change.status.kind === AppFileStatusKind.Untracked - const isModifiedFile = - item.change.status.kind === AppFileStatusKind.Modified - const isDeletedFile = - item.change.status.kind === AppFileStatusKind.Deleted - - // Check each active file type filter - if (this.props.filterNewFiles && !isNewFile) { - return false - } - - if (this.props.filterModifiedFiles && !isModifiedFile) { - return false - } - - if (this.props.filterDeletedFiles && !isDeletedFile) { - return false - } - } - - // File matches all active filters - return true + return applyFilters(item, { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + }) } private getListAriaLabel = () => { @@ -1639,11 +1501,13 @@ export class FilterChangesList extends React.Component< filesSelected.map(f => f.id), this.state.filteredItems, files.length, - this.props.includedChangesInCommitFilter, - this.props.filterNewFiles, - this.props.filterModifiedFiles, - this.props.filterDeletedFiles, - this.props.filterExcludedFiles + { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + } ) ) { return null @@ -1662,72 +1526,30 @@ export class FilterChangesList extends React.Component< } private getNoResultsMessage = () => { - if ( - this.props.filterText === '' && - !this.props.includedChangesInCommitFilter && - !this.props.filterNewFiles && - !this.props.filterModifiedFiles && - !this.props.filterDeletedFiles && - !this.props.filterExcludedFiles - ) { - return undefined - } - - const activeFilters: string[] = [] - - if (this.props.filterText) { - activeFilters.push(`"${this.props.filterText}"`) - } - - if (this.props.includedChangesInCommitFilter) { - activeFilters.push('Included in commit') - } - - if (this.props.filterExcludedFiles) { - activeFilters.push('Excluded from commit') - } - - if (this.props.filterNewFiles) { - activeFilters.push('New files') - } - - if (this.props.filterModifiedFiles) { - activeFilters.push('Modified files') - } - - if (this.props.filterDeletedFiles) { - activeFilters.push('Deleted files') - } - - if (activeFilters.length === 0) { - return undefined - } - - const filterList = activeFilters.join(', ') - return `Sorry, I can't find any changed files matching the following filters: ${filterList}` + return getNoResultsMessage(this.props.filterText, { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + }) } private renderNoChanges = () => { - if ( - this.props.filterText === '' && - !this.props.includedChangesInCommitFilter && - !this.props.filterNewFiles && - !this.props.filterModifiedFiles && - !this.props.filterDeletedFiles && - !this.props.filterExcludedFiles - ) { + const filtersState: IFileFilterState = { + includedChangesInCommitFilter: this.props.includedChangesInCommitFilter, + filterExcludedFiles: this.props.filterExcludedFiles, + filterNewFiles: this.props.filterNewFiles, + filterModifiedFiles: this.props.filterModifiedFiles, + filterDeletedFiles: this.props.filterDeletedFiles, + } + + if (!hasActiveFilters(this.props.filterText, filtersState)) { return null } // Check if any filters are active (including text filter) - const hasActiveFilters = - [ - this.props.includedChangesInCommitFilter, - this.props.filterNewFiles, - this.props.filterModifiedFiles, - this.props.filterDeletedFiles, - this.props.filterExcludedFiles, - ].some(Boolean) || this.props.filterText.length > 0 + const filtersActive = hasActiveFilters(this.props.filterText, filtersState) const BlankSlateImage = encodePathAsUrl( __dirname, @@ -1742,7 +1564,7 @@ export class FilterChangesList extends React.Component<
    {this.getNoResultsMessage()}
    - {hasActiveFilters && ( + {filtersActive && ( From ac62517cf8b7f920db240fc71a3a2d7a8212b5f1 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 24 Jun 2025 16:33:28 +0200 Subject: [PATCH 0478/1338] Add keyboard selection state to repositories list Introduces a selectedItem state to track keyboard navigation selection in the repositories list. The component now distinguishes between app-wide repository selection and keyboard-based selection, updating the UI accordingly. --- .../repositories-list/repositories-list.tsx | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx index 6ffa4b2f7f5..c6f485ff577 100644 --- a/app/src/ui/repositories-list/repositories-list.tsx +++ b/app/src/ui/repositories-list/repositories-list.tsx @@ -78,6 +78,7 @@ interface IRepositoriesListProps { interface IRepositoriesListState { readonly newRepositoryMenuExpanded: boolean + readonly selectedItem: IRepositoryListItem | null } const RowHeight = 29 @@ -147,6 +148,7 @@ export class RepositoriesList extends React.Component< this.state = { newRepositoryMenuExpanded: false, + selectedItem: null, } } @@ -246,10 +248,15 @@ export class RepositoriesList extends React.Component< this.props.recentRepositories ) - const selectedItem = this.getSelectedListItem( - groups, - this.props.selectedRepository - ) + // So there's two types of selection at play here. There's the repository + // selection for the whole app and then there's the keyboard selection in + // the list itself. + // If the user has selected a repository using keyboard navigation we want + // to honor that selection. If the user hasn't selected a repository yet + // we'll select the repository currently selected in the app. + const selectedItem = + this.state.selectedItem ?? + this.getSelectedListItem(groups, this.props.selectedRepository) return (
    @@ -271,11 +278,16 @@ export class RepositoriesList extends React.Component< onItemContextMenu={this.onItemContextMenu} getGroupAriaLabel={this.getGroupAriaLabelGetter(groups)} getItemAriaLabel={this.getItemAriaLabel} + onSelectionChanged={this.onSelectionChanged} />
    ) } + private onSelectionChanged = (selectedItem: IRepositoryListItem | null) => { + this.setState({ selectedItem }) + } + private renderPostFilter = () => { return ( From 42a2e52aae782e3b8289a1c9018d9ad9896dd92c Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 8 Jul 2025 15:07:27 -0400 Subject: [PATCH 0495/1338] Release 3.5.1 --- app/package.json | 2 +- changelog.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index a65bf64c42b..f7c717c9e96 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.0", + "version": "3.5.1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 08372ffcdf1..979eb6eab85 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,9 @@ { "releases": { + "3.5.1": [ + "[Fixed] Use all changes to generate a commit message when amending commits - #20664", + "[Improved] Upgrade embedded Git to v2.47.3 on macOS, and to v2.47.3.windows.1 on Windows" + ], "3.5.0": [ "[New] Copilot now helps you craft AI-generated commit messages with just one click - #17439" ], From 27759e13324d499f2dc4d13f0d4533e6931b114c Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:07:25 -0400 Subject: [PATCH 0496/1338] Release 3.5.2-beta1 --- app/package.json | 2 +- changelog.json | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index f7c717c9e96..b10129a23f3 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.1", + "version": "3.5.2-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 77ec32b05ca..8db7453a967 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,13 @@ { "releases": { + "3.5.2-beta1": [ + "[Fixed] Use all changes to generate a commit message when amending commits - #20664", + "[Fixed] Fix CmdOrCtrl+Enter in squash dialog - #20716", + "[Fixed] Keyboard selection in the repository list now persists when the list of repositories update - #20672", + "[Fixed] Organization is no longer prefixed to repositories with aliases in the recent group - #20651", + "[Improved] Tutorial responsively adapts at high zoom levels - #20691", + "[Improved] Upgrade embedded Git to v2.47.3 on macOS, and to v2.47.3.windows.1 on Windows" + ], "3.5.1": [ "[Fixed] Use all changes to generate a commit message when amending commits - #20664", "[Improved] Upgrade embedded Git to v2.47.3 on macOS, and to v2.47.3.windows.1 on Windows" From eb237cea430e8da880c2ebae96d6e76bbe36d645 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:05:38 -0400 Subject: [PATCH 0497/1338] Create Filter Options Component - Make counts reflect "AND" logic - Simply some methods that can just consume the filter state --- app/src/models/status.ts | 24 ++ .../changes/changes-list-filter-options.tsx | 265 ++++++++++++++++++ app/src/ui/changes/filter-changes-list.tsx | 238 ++-------------- app/src/ui/changes/filter-changes-logic.ts | 20 +- app/test/unit/filter-changes-logic-test.ts | 12 +- 5 files changed, 320 insertions(+), 239 deletions(-) create mode 100644 app/src/ui/changes/changes-list-filter-options.tsx diff --git a/app/src/models/status.ts b/app/src/models/status.ts index 13aba603479..6ca49c0d239 100644 --- a/app/src/models/status.ts +++ b/app/src/models/status.ts @@ -273,6 +273,22 @@ export class FileChange { this.id = `${status.kind}+${path}` } } + + public isDeleted(): boolean { + return this.status.kind === AppFileStatusKind.Deleted + } + + public isNew(): boolean { + return this.status.kind === AppFileStatusKind.New + } + + public isModified(): boolean { + return this.status.kind === AppFileStatusKind.Modified + } + + public isUntracked(): boolean { + return this.status.kind === AppFileStatusKind.Untracked + } } /** encapsulate the changes to a file in the working directory */ @@ -304,6 +320,14 @@ export class WorkingDirectoryFileChange extends FileChange { public withSelection(selection: DiffSelection): WorkingDirectoryFileChange { return new WorkingDirectoryFileChange(this.path, this.status, selection) } + + public isIncludedInCommit(): boolean { + return this.selection.getSelectionType() === DiffSelectionType.All + } + + public isExcludedFromCommit(): boolean { + return this.selection.getSelectionType() === DiffSelectionType.None + } } /** diff --git a/app/src/ui/changes/changes-list-filter-options.tsx b/app/src/ui/changes/changes-list-filter-options.tsx new file mode 100644 index 00000000000..83290ba8eda --- /dev/null +++ b/app/src/ui/changes/changes-list-filter-options.tsx @@ -0,0 +1,265 @@ +import * as React from 'react' +import { + Popover, + PopoverAnchorPosition, + PopoverDecoration, +} from '../lib/popover' +import { + countActiveFilterOptions, + hasActiveFilters, +} from './filter-changes-logic' +import { Octicon } from '../octicons' +import * as octicons from '../octicons/octicons.generated' +import { IFileListFilterState } from '../../lib/app-state' +import { Checkbox, CheckboxValue } from '../lib/checkbox' +import memoizeOne from 'memoize-one' +import { Button } from '../lib/button' +import classNames from 'classnames' +import { IChangesListItem } from './filter-changes-list' +import { WorkingDirectoryStatus } from '../../models/status' + +interface IChangesListFilterOptionsProps { + readonly fileListFilter: IFileListFilterState + readonly filteredItems: Map + readonly workingDirectory: WorkingDirectoryStatus + readonly onFilterToIncludedInCommit: () => void + readonly onFilterExcludedFiles: () => void + readonly onFilterDeletedFiles: () => void + readonly onFilterModifiedFiles: () => void + readonly onFilterNewFiles: () => void + readonly onClearAllFilters: () => void +} + +interface IChangesListFilterOptionsState { + readonly isFilterOptionsOpen: boolean +} + +/** + * Component to render filter options for the changes list. + * + * Allows users to filter files based on their status (new, modified, deleted, etc.) + * and includes a button to clear all filters. + */ +export class ChangesListFilterOptions extends React.Component< + IChangesListFilterOptionsProps, + IChangesListFilterOptionsState +> { + private getFilterCounts = memoizeOne( + ( + wd: WorkingDirectoryStatus, + filteredItems: Map + ) => { + const counts = { + newFilesCount: 0, + modifiedFilesCount: 0, + deletedFilesCount: 0, + includedFilesCount: 0, + excludedFilesCount: 0, + } + + Array.from(filteredItems.values()).forEach(v => { + const file = wd.findFileWithID(v.id) + if (file) { + if (file.isNew() || file.isUntracked()) { + counts.newFilesCount++ + } + if (file.isModified()) { + counts.modifiedFilesCount++ + } + if (file.isDeleted()) { + counts.deletedFilesCount++ + } + if (file.isIncludedInCommit()) { + counts.includedFilesCount++ + } + if (file.isExcludedFromCommit()) { + counts.excludedFilesCount++ + } + } + }) + + return counts + } + ) + + private filterOptionsButtonRef: HTMLButtonElement | null = null + + public constructor(props: IChangesListFilterOptionsProps) { + super(props) + + this.state = { + isFilterOptionsOpen: false, + } + } + + private closeFilterOptions = () => { + this.setState({ isFilterOptionsOpen: false }) + } + + private onFilterToIncludedInCommit = () => { + this.props.onFilterToIncludedInCommit() + this.closeFilterOptions() + } + + private onFilterExcludedFiles = () => { + this.props.onFilterExcludedFiles() + this.closeFilterOptions() + } + + private onFilterDeletedFiles = () => { + this.props.onFilterDeletedFiles() + this.closeFilterOptions() + } + + private onFilterModifiedFiles = () => { + this.props.onFilterModifiedFiles() + this.closeFilterOptions() + } + + private onFilterNewFiles = () => { + this.props.onFilterNewFiles() + this.closeFilterOptions() + } + + private onClearAllFilters = () => { + this.props.onClearAllFilters() + this.closeFilterOptions() + } + + private openFilterOptions = () => { + this.setState({ isFilterOptionsOpen: true }) + } + + private renderFilterOptions() { + // Check if any filters are active + const filtersActive = hasActiveFilters(this.props.fileListFilter) + + const { + newFilesCount, + modifiedFilesCount, + deletedFilesCount, + excludedFilesCount, + includedFilesCount, + } = this.getFilterCounts( + this.props.workingDirectory, + this.props.filteredItems + ) + + return ( + +
    +

    Filter Options

    + +
    +
    + + + + + +
    + {filtersActive && ( +
    + +
    + )} +     + ) + } + + private onFilterOptionsButtonRef = (buttonRef: HTMLButtonElement | null) => { + this.filterOptionsButtonRef = buttonRef + } + + public render() { + const activeFiltersCount = countActiveFilterOptions( + this.props.fileListFilter + ) + const hasActiveFilters = activeFiltersCount > 0 + const buttonTextLabel = `Filter Options ${ + hasActiveFilters ? `(${activeFiltersCount} applied)` : '' + }` + + return ( + <> + + {this.state.isFilterOptionsOpen && this.renderFilterOptions()} + + ) + } +} diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index ce8f269ee06..15b2c72dc7e 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -64,20 +64,15 @@ import memoizeOne from 'memoize-one' import { IMatches } from '../../lib/fuzzy-find' import { TextBox } from '../lib/text-box' import { Button } from '../lib/button' -import { - Popover, - PopoverAnchorPosition, - PopoverDecoration, -} from '../lib/popover' import { LinkButton } from '../lib/link-button' import { plural } from '../lib/plural' import { isCommittingFileHiddenByFilter, getNoResultsMessage, - countActiveFilterOptions, hasActiveFilters, applyFilters, } from './filter-changes-logic' +import { ChangesListFilterOptions } from './changes-list-filter-options' export interface IChangesListItem extends IFilterListItem { readonly id: string @@ -231,7 +226,6 @@ interface IFilterChangesListState { readonly selectedItems: ReadonlyArray readonly focusedRow: string | null readonly groups: ReadonlyArray> - readonly isFilterOptionsOpen: boolean } function getSelectedItemsFromProps( @@ -285,7 +279,6 @@ export class FilterChangesList extends React.Component< private filterListRef = React.createRef>() - /** Compute the 'Include All' checkbox value */ private getCheckAllValue = memoizeOne( ( @@ -332,58 +325,6 @@ export class FilterChangesList extends React.Component< } ) - /** Calculate the count of new files (including untracked) */ - private getNewFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus): number => { - return workingDirectory.files.filter( - f => - f.status.kind === AppFileStatusKind.New || - f.status.kind === AppFileStatusKind.Untracked - ).length - } - ) - - /** Calculate the count of modified files */ - private getModifiedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus): number => { - return workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Modified - ).length - } - ) - - /** Calculate the count of deleted files */ - private getDeletedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus): number => { - return workingDirectory.files.filter( - f => f.status.kind === AppFileStatusKind.Deleted - ).length - } - ) - - /** Calculate the count of excluded from commit files (files with DiffSelectionType.None) */ - private getExcludedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus): number => { - return workingDirectory.files.filter( - f => f.selection.getSelectionType() === DiffSelectionType.None - ).length - } - ) - - /** Calculate the count of included in commit files (files with DiffSelectionType.All or DiffSelectionType.Partial) */ - private getIncludedFilesCount = memoizeOne( - (workingDirectory: WorkingDirectoryStatus): number => { - return workingDirectory.files.filter( - f => f.selection.getSelectionType() !== DiffSelectionType.None - ).length - } - ) - - /** Get the file filter state in the format expected by filter logic */ - private get fileFilterState(): IFileListFilterState { - return this.props.fileListFilter - } - public constructor(props: IFilterChangesListProps) { super(props) @@ -397,7 +338,6 @@ export class FilterChangesList extends React.Component< selectedItems: getSelectedItemsFromProps(props), focusedRow: null, groups, - isFilterOptionsOpen: false, } } @@ -974,11 +914,10 @@ export class FilterChangesList extends React.Component< const showPromptForCommittingFileHiddenByFilter = this.props.askForConfirmationOnCommitFilteredChanges && isCommittingFileHiddenByFilter( - this.props.fileListFilter.filterText, filesSelected.map(f => f.id), this.state.filteredItems, fileCount, - this.fileFilterState + this.props.fileListFilter ) return ( @@ -1264,10 +1203,6 @@ export class FilterChangesList extends React.Component< ) } - private closeFilterOptions = () => { - this.setState({ isFilterOptionsOpen: false }) - } - private renderCheckBoxRow = () => { const { workingDirectory, rebaseConflictState, isCommitting } = this.props const { files } = workingDirectory @@ -1303,143 +1238,25 @@ export class FilterChangesList extends React.Component< ) } - private onFilterOptionsButtonRef = (buttonRef: HTMLButtonElement | null) => { - this.filterOptionsButtonRef = buttonRef - } - - private openFilterOptions = () => { - this.setState({ isFilterOptionsOpen: !this.state.isFilterOptionsOpen }) - } - - private renderFilterOptions() { - // Check if any filters are active - const filtersActive = hasActiveFilters('', this.fileFilterState) - - return ( - -
    -

    Filter Options

    - -
    -
    - - - - - -
    - {filtersActive && ( -
    - -
    - )} -     - ) - } - private renderFilterBox = () => { if (!this.props.showChangesFilter) { return null } - // Count active filters - const activeFiltersCount = countActiveFilterOptions(this.fileFilterState) - - const hasActiveFilters = activeFiltersCount > 0 - const buttonTextLabel = `Filter Options ${ - hasActiveFilters ? `(${activeFiltersCount} applied)` : '' - }` - return (
    - - {this.state.isFilterOptionsOpen && this.renderFilterOptions()} +
    @@ -1541,11 +1357,10 @@ export class FilterChangesList extends React.Component< if ( !isCommittingFileHiddenByFilter( - this.props.fileListFilter.filterText, filesSelected.map(f => f.id), this.state.filteredItems, files.length, - this.fileFilterState + this.props.fileListFilter ) ) { return null @@ -1564,17 +1379,12 @@ export class FilterChangesList extends React.Component< } private renderNoChanges = () => { - const filtersState = this.fileFilterState - - if (!hasActiveFilters(this.props.fileListFilter.filterText, filtersState)) { + if (!hasActiveFilters(this.props.fileListFilter)) { return null } // Check if any filters are active (including text filter) - const filtersActive = hasActiveFilters( - this.props.fileListFilter.filterText, - filtersState - ) + const filtersActive = hasActiveFilters(this.props.fileListFilter) const BlankSlateImage = encodePathAsUrl( __dirname, @@ -1588,10 +1398,7 @@ export class FilterChangesList extends React.Component<
    No files match your current filters
    - {getNoResultsMessage( - this.props.fileListFilter.filterText, - this.fileFilterState - )} + {getNoResultsMessage(this.props.fileListFilter)}
    {filtersActive && ( @@ -1616,7 +1423,6 @@ export class FilterChangesList extends React.Component< this.props.repository, !this.props.fileListFilter.isIncludedInCommit ) - this.closeFilterOptions() } private onFilterNewFiles = () => { @@ -1627,7 +1433,6 @@ export class FilterChangesList extends React.Component< this.props.repository, !this.props.fileListFilter.isNewFile ) - this.closeFilterOptions() } private onFilterModifiedFiles = () => { @@ -1640,7 +1445,6 @@ export class FilterChangesList extends React.Component< this.props.repository, !this.props.fileListFilter.isModifiedFile ) - this.closeFilterOptions() } private onFilterDeletedFiles = () => { @@ -1653,7 +1457,6 @@ export class FilterChangesList extends React.Component< this.props.repository, !this.props.fileListFilter.isDeletedFile ) - this.closeFilterOptions() } private onFilterExcludedFiles = () => { @@ -1666,7 +1469,6 @@ export class FilterChangesList extends React.Component< this.props.repository, !this.props.fileListFilter.isExcludedFromCommit ) - this.closeFilterOptions() } private onClearAllFilters = () => { @@ -1684,8 +1486,6 @@ export class FilterChangesList extends React.Component< this.props.dispatcher.setFilterNewFiles(this.props.repository, false) this.props.dispatcher.setFilterModifiedFiles(this.props.repository, false) this.props.dispatcher.setFilterDeletedFiles(this.props.repository, false) - - this.closeFilterOptions() } private onChangedFileFocus = (changeListItem: IChangesListItem) => { diff --git a/app/src/ui/changes/filter-changes-logic.ts b/app/src/ui/changes/filter-changes-logic.ts index fec2d433a81..6c30cdf5393 100644 --- a/app/src/ui/changes/filter-changes-logic.ts +++ b/app/src/ui/changes/filter-changes-logic.ts @@ -59,17 +59,13 @@ export function applyFilterOptions( */ export const isCommittingFileHiddenByFilter = memoizeOne( ( - filterText: string, fileIdsIncludedInCommit: ReadonlyArray, filteredItems: Map, fileCount: number, filters: IFileListFilterState ): boolean => { // All possible files are present in the list (no active filters or all files match active filters) - if ( - !hasActiveFilters(filterText, filters) || - filteredItems.size === fileCount - ) { + if (!hasActiveFilters(filters) || filteredItems.size === fileCount) { return false } @@ -90,17 +86,16 @@ export const isCommittingFileHiddenByFilter = memoizeOne( * Generate message when no files match filters */ export function getNoResultsMessage( - filterText: string, filters: IFileListFilterState ): string | undefined { - if (!hasActiveFilters(filterText, filters)) { + if (!hasActiveFilters(filters)) { return undefined } const activeFilters: string[] = [] - if (filterText) { - activeFilters.push(`"${filterText}"`) + if (filters.filterText) { + activeFilters.push(`"${filters.filterText}"`) } if (filters.isIncludedInCommit) { @@ -160,11 +155,8 @@ export function countActiveFilterOptions( /** * Check if there are any active filters */ -export function hasActiveFilters( - filterText: string, - filters: IFileListFilterState -): boolean { - return filterText !== '' || countActiveFilterOptions(filters) > 0 +export function hasActiveFilters(filters: IFileListFilterState): boolean { + return filters.filterText !== '' || countActiveFilterOptions(filters) > 0 } /** diff --git a/app/test/unit/filter-changes-logic-test.ts b/app/test/unit/filter-changes-logic-test.ts index 07c88333d4d..217f5cf5221 100644 --- a/app/test/unit/filter-changes-logic-test.ts +++ b/app/test/unit/filter-changes-logic-test.ts @@ -164,7 +164,7 @@ describe('filter-changes-logic', () => { ]) assert.equal( - isCommittingFileHiddenByFilter('', fileIds, filteredItems, 2, filters), + isCommittingFileHiddenByFilter(fileIds, filteredItems, 2, filters), false ) }) @@ -186,7 +186,7 @@ describe('filter-changes-logic', () => { ]) assert.equal( - isCommittingFileHiddenByFilter('', fileIds, filteredItems, 5, filters), + isCommittingFileHiddenByFilter(fileIds, filteredItems, 5, filters), true ) }) @@ -203,12 +203,12 @@ describe('filter-changes-logic', () => { isDeletedFile: false, } - assert.equal(getNoResultsMessage('', filters), undefined) + assert.equal(getNoResultsMessage(filters), undefined) }) it('should return message with text filter', () => { const filters: IFileListFilterState = { - filterText: '', + filterText: 'test', isIncludedInCommit: false, isExcludedFromCommit: false, isNewFile: false, @@ -216,7 +216,7 @@ describe('filter-changes-logic', () => { isDeletedFile: false, } - const message = getNoResultsMessage('test', filters) + const message = getNoResultsMessage(filters) assert(message?.includes('"test"')) }) @@ -230,7 +230,7 @@ describe('filter-changes-logic', () => { isDeletedFile: false, } - const message = getNoResultsMessage('', filters) + const message = getNoResultsMessage(filters) assert(message?.includes('Included in commit')) assert(message?.includes('New files')) }) From 228842ae8d8e8439484eb26a8a6604e742be428b Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:29:54 -0400 Subject: [PATCH 0498/1338] Refactor filter logic to use FileChange methods Replaces direct property checks and enum comparisons with method calls on the FileChange object for filtering changes. This improves encapsulation and readability by delegating status checks to the change object's methods. --- app/src/ui/changes/filter-changes-logic.ts | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/app/src/ui/changes/filter-changes-logic.ts b/app/src/ui/changes/filter-changes-logic.ts index 6c30cdf5393..bf82b00b0ab 100644 --- a/app/src/ui/changes/filter-changes-logic.ts +++ b/app/src/ui/changes/filter-changes-logic.ts @@ -1,5 +1,3 @@ -import { AppFileStatusKind } from '../../models/status' -import { DiffSelectionType } from '../../models/diff' import { IFileListFilterState } from '../../lib/app-state' import { IChangesListItem } from './filter-changes-list' import memoizeOne from 'memoize-one' @@ -18,34 +16,25 @@ export function applyFilterOptions( return true } - // Check staging status - const isStaged = - item.change.selection.getSelectionType() !== DiffSelectionType.None + const { change } = item - if (filters.isIncludedInCommit && !isStaged) { + if (filters.isIncludedInCommit && !change.isIncludedInCommit()) { return false } - if (filters.isExcludedFromCommit && isStaged) { + if (filters.isExcludedFromCommit && !change.isExcludedFromCommit()) { return false } - // Check file type - const status = item.change.status.kind - const isNewFile = - status === AppFileStatusKind.New || status === AppFileStatusKind.Untracked - const isModifiedFile = status === AppFileStatusKind.Modified - const isDeletedFile = status === AppFileStatusKind.Deleted - - if (filters.isNewFile && !isNewFile) { + if (filters.isNewFile && !change.isNew() && !change.isUntracked()) { return false } - if (filters.isModifiedFile && !isModifiedFile) { + if (filters.isModifiedFile && !change.isModified()) { return false } - if (filters.isDeletedFile && !isDeletedFile) { + if (filters.isDeletedFile && !change.isDeleted()) { return false } From dc83f7b18a2b9d7d4ae02b3b89c89a51f30be62b Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 11 Jul 2025 17:25:28 +0200 Subject: [PATCH 0499/1338] Fix iframe crash in SandboxedMarkdown with requestAnimationFrame Wraps iframe src assignment in requestAnimationFrame to prevent a crash in Electron 34 caused by layout changes during ResizeObserver callbacks. Addresses issue #20760. --- app/src/ui/lib/sandboxed-markdown.tsx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/ui/lib/sandboxed-markdown.tsx b/app/src/ui/lib/sandboxed-markdown.tsx index 2b8c1811828..684a7f1a2b7 100644 --- a/app/src/ui/lib/sandboxed-markdown.tsx +++ b/app/src/ui/lib/sandboxed-markdown.tsx @@ -360,16 +360,21 @@ export class SandboxedMarkdown extends React.PureComponent< // convert non-latin strings that existed in the markedjs. const b64src = Buffer.from(src, 'utf8').toString('base64') - if (this.frameRef === null) { - // If frame is destroyed before markdown parsing completes, frameref will be null. - return - } + // HACK OR NOT? This prevents a crash since Electron 34 where the layout + // changes during the ResizeObserver callback. See: + // https://github.com/desktop/desktop/issues/20760 + requestAnimationFrame(() => { + if (this.frameRef === null) { + // If frame is destroyed before markdown parsing completes, frameref will be null. + return + } - // We are using `src` and data uri as opposed to an html string in the - // `srcdoc` property because the `srcdoc` property renders the html in the - // parent dom and we want all rendering to be isolated to our sandboxed iframe. - // -- https://csplite.com/csp/test188/ - this.frameRef.src = `data:text/html;charset=utf-8;base64,${b64src}` + // We are using `src` and data uri as opposed to an html string in the + // `srcdoc` property because the `srcdoc` property renders the html in the + // parent dom and we want all rendering to be isolated to our sandboxed iframe. + // -- https://csplite.com/csp/test188/ + this.frameRef.src = `data:text/html;charset=utf-8;base64,${b64src}` + }) } public render() { From ffb2ea0ae1923cae47631636677d70f6ed416522 Mon Sep 17 00:00:00 2001 From: huanfe1 <41602338+huanfe1@users.noreply.github.com> Date: Mon, 14 Jul 2025 17:13:27 +0800 Subject: [PATCH 0500/1338] fix: link cursor error on description --- app/styles/ui/_button.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/_button.scss b/app/styles/ui/_button.scss index d95e71a10b2..72760467cee 100644 --- a/app/styles/ui/_button.scss +++ b/app/styles/ui/_button.scss @@ -61,7 +61,7 @@ .link-button-component { color: var(--link-button-color); text-decoration: none; - cursor: pointer; + cursor: pointer !important; display: inline-flex; align-items: center; From 7352907c6cf3ccff7910c1cb9c2db1e1b05e8786 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 14 Jul 2025 11:13:27 -0400 Subject: [PATCH 0501/1338] Release 3.5.2-beta2 --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index b10129a23f3..af28cf622b8 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.2-beta1", + "version": "3.5.2-beta2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 8db7453a967..920b2ee5aae 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.5.2-beta2": [ + "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761" + ], "3.5.2-beta1": [ "[Fixed] Use all changes to generate a commit message when amending commits - #20664", "[Fixed] Fix CmdOrCtrl+Enter in squash dialog - #20716", From 42bc34836221292b4032d7ec5552e9781033e353 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 15 Jul 2025 10:15:39 +0400 Subject: [PATCH 0502/1338] Update filter-changes-logic-test.ts --- app/test/unit/filter-changes-logic-test.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/test/unit/filter-changes-logic-test.ts b/app/test/unit/filter-changes-logic-test.ts index 217f5cf5221..3d0b5115942 100644 --- a/app/test/unit/filter-changes-logic-test.ts +++ b/app/test/unit/filter-changes-logic-test.ts @@ -15,7 +15,10 @@ import { IChangesListItem } from '../../src/ui/changes/filter-changes-list' // Helper function to create a test file function createTestFile( path: string, - status: AppFileStatusKind, + kind: + | AppFileStatusKind.New + | AppFileStatusKind.Modified + | AppFileStatusKind.Deleted, selectionType: DiffSelectionType ): WorkingDirectoryFileChange { const selection = @@ -26,18 +29,16 @@ function createTestFile( : DiffSelection.fromInitialSelection( selectionType as DiffSelectionType.All | DiffSelectionType.None ) - return { - id: path, - path, - status: { kind: status }, - selection, - } as WorkingDirectoryFileChange + return new WorkingDirectoryFileChange(path, { kind }, selection) } // Helper function to create a test changes list item function createTestItem( path: string, - status: AppFileStatusKind, + status: + | AppFileStatusKind.New + | AppFileStatusKind.Modified + | AppFileStatusKind.Deleted, selectionType: DiffSelectionType ): IChangesListItem { const change = createTestFile(path, status, selectionType) From e1887bf21d685e631128bb5b31421980630fc816 Mon Sep 17 00:00:00 2001 From: Mohammad Dohadwala Date: Tue, 15 Jul 2025 10:16:21 +0400 Subject: [PATCH 0503/1338] yarn lint --- app/src/ui/changes/changes-list-filter-options.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/changes-list-filter-options.tsx b/app/src/ui/changes/changes-list-filter-options.tsx index 83290ba8eda..24b6ada1db3 100644 --- a/app/src/ui/changes/changes-list-filter-options.tsx +++ b/app/src/ui/changes/changes-list-filter-options.tsx @@ -36,7 +36,7 @@ interface IChangesListFilterOptionsState { /** * Component to render filter options for the changes list. - * + * * Allows users to filter files based on their status (new, modified, deleted, etc.) * and includes a button to clear all filters. */ From 4a7e59cb1763955f779e77f79fa8767792fb0803 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 15 Jul 2025 09:01:32 -0400 Subject: [PATCH 0504/1338] Release 3.5.2-beta2 (more) --- changelog.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 920b2ee5aae..298f5f4e506 100644 --- a/changelog.json +++ b/changelog.json @@ -1,7 +1,9 @@ { "releases": { "3.5.2-beta2": [ - "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761" + "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761", + "[Fixed] Ensure the cursor type on links is pointer - #20766", + "[Improved] Add the ability to filter changed files by status (modified, new, deleted, untracked) as well as by file exclusion from commit - #20537" ], "3.5.2-beta1": [ "[Fixed] Use all changes to generate a commit message when amending commits - #20664", From a85a916536f655a20c50b95c0d122bb7620ba298 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 15 Jul 2025 09:04:50 -0400 Subject: [PATCH 0505/1338] Add acknowledgments for fixes and improvements --- changelog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.json b/changelog.json index 298f5f4e506..1d8f90d47ba 100644 --- a/changelog.json +++ b/changelog.json @@ -2,8 +2,8 @@ "releases": { "3.5.2-beta2": [ "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761", - "[Fixed] Ensure the cursor type on links is pointer - #20766", - "[Improved] Add the ability to filter changed files by status (modified, new, deleted, untracked) as well as by file exclusion from commit - #20537" + "[Fixed] Ensure the cursor type on links is pointer - #20766. Thanks @huanfe1!", + "[Improved] Add the ability to filter changed files by status (modified, new, deleted, untracked) as well as by file exclusion from commit - #20537. Thanks @Gr8z!" ], "3.5.2-beta1": [ "[Fixed] Use all changes to generate a commit message when amending commits - #20664", From 14087268d12b50b3614bec49a54cfddfdf0bd686 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:22:24 -0400 Subject: [PATCH 0506/1338] Release 3.5.2 --- app/package.json | 2 +- changelog.json | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index af28cf622b8..f56c168b65b 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.2-beta2", + "version": "3.5.2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 1d8f90d47ba..aa117011fd8 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,14 @@ { "releases": { + "3.5.2": [ + "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761", + "[Fixed] Ensure the cursor type on links is pointer - #20766. Thanks @huanfe1!", + "[Fixed] Fix CmdOrCtrl+Enter in squash dialog - #20716", + "[Fixed] Keyboard selection in the repository list now persists when the list of repositories update - #20672", + "[Fixed] Organization is no longer prefixed to repositories with aliases in the recent group - #20651", + "[Improved] Tutorial responsively adapts at high zoom levels - #20691", + "[Improved] Add the ability to filter changed files by status (modified, new, deleted, untracked) as well as by file exclusion from commit - #20537. Thanks @Gr8z!" + ], "3.5.2-beta2": [ "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761", "[Fixed] Ensure the cursor type on links is pointer - #20766. Thanks @huanfe1!", From e51b44d81e7cb6591c88047e8f90bb3117656cfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jul 2025 04:50:36 +0000 Subject: [PATCH 0507/1338] Bump form-data from 4.0.2 to 4.0.4 Bumps [form-data](https://github.com/form-data/form-data) from 4.0.2 to 4.0.4. - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v4.0.2...v4.0.4) --- updated-dependencies: - dependency-name: form-data dependency-version: 4.0.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 65aedf5ef8c..f7eb4271e68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3568,13 +3568,14 @@ foreground-child@^3.1.0: signal-exit "^4.0.1" form-data@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c" - integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w== + version "4.0.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4" + integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" es-set-tostringtag "^2.1.0" + hasown "^2.0.2" mime-types "^2.1.12" front-matter@^2.3.0: @@ -6304,7 +6305,7 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"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== @@ -6318,6 +6319,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +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== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" From a5b97e2a2944ee0a5179a4a6f8f5645721cffafd Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 23 Jul 2025 17:14:44 -0400 Subject: [PATCH 0508/1338] Add keyboard focus tooltips to list components Introduces optional keyboard focus tooltips for list rows in branch and repository lists, improving accessibility by exposing tooltip content to keyboard users. Updates SectionFilterList, SectionList, and ListRow to support a renderKeyboardFocusTooltip prop, and enhances Tooltip to allow tooltips that only show on keyboard focus. --- app/src/ui/branches/branch-list.tsx | 31 +++++++++ app/src/ui/lib/list/list-row.tsx | 53 ++++++++++++++- app/src/ui/lib/list/section-list.tsx | 13 ++++ app/src/ui/lib/section-filter-list.tsx | 21 ++++++ app/src/ui/lib/tooltip.tsx | 19 ++++-- .../repositories-list/repositories-list.tsx | 64 ++++++++++++++++++- .../repository-list-item.tsx | 2 +- 7 files changed, 193 insertions(+), 10 deletions(-) diff --git a/app/src/ui/branches/branch-list.tsx b/app/src/ui/branches/branch-list.tsx index 3b424bfba84..75cbdf2bdb4 100644 --- a/app/src/ui/branches/branch-list.tsx +++ b/app/src/ui/branches/branch-list.tsx @@ -23,6 +23,7 @@ import memoizeOne from 'memoize-one' import { getAuthors } from '../../lib/git/log' import { Repository } from '../../models/repository' import uuid from 'uuid' +import { formatDate } from '../../lib/format-date' const RowHeight = 30 @@ -251,6 +252,7 @@ export class BranchList extends React.Component< onFilterKeyDown={this.props.onFilterKeyDown} selectedItem={this.selectedItem} renderItem={this.renderItem} + renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} renderGroupHeader={this.renderGroupHeader} onItemClick={this.onItemClick} onSelectionChanged={this.onSelectionChanged} @@ -309,6 +311,35 @@ export class BranchList extends React.Component< ) } + private renderKeyboardFocusTooltip = ( + item: IBranchListItem + ): JSX.Element | string | null => { + const { tip, name } = item.branch + const authorDate = this.state.commitAuthorDates.get(tip.sha) + + const absoluteDate = authorDate + ? formatDate(authorDate, { + dateStyle: 'full', + timeStyle: 'short', + }) + : null + + return ( + <> +
    + Name: + {name} +
    + {absoluteDate && ( +
    + Date Authored: + {absoluteDate} +
    + )} + + ) + } + private parseHeader(label: string): BranchGroupIdentifier | null { switch (label) { case 'default': diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index fbef70275f3..19a645dc464 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -1,6 +1,8 @@ import * as React from 'react' import classNames from 'classnames' import { RowIndexPath } from './list-row-index-path' +import { Tooltip } from '../tooltip' +import { createObservableRef } from '../observable-ref' interface IListRowProps { /** whether or not the section to which this row belongs has a header */ @@ -114,6 +116,18 @@ interface IListRowProps { * with `listitem` as the role for the items so browse mode can navigate them. */ readonly role?: 'option' | 'listitem' | 'presentation' + + /** + * Optional render function for the keyboard focus tooltip + * + * This is used to render a tooltip when the row is focused via keyboard + * navigation. This should be provided if the row has tooltip content that is + * only accessible via the mouse. The content in the mouse tooltip(s) will + * need to be in the keyboard focus tooltip as well. + */ + readonly renderKeyboardFocusTooltip?: ( + indexPath: RowIndexPath + ) => JSX.Element | string | null } export class ListRow extends React.Component { @@ -124,9 +138,41 @@ export class ListRow extends React.Component { // event, with no keyDown events (since that keyDown event should've happened // in the component that previously had focus). private keyboardFocusDetectionState: 'ready' | 'failed' | 'focused' = 'ready' + private readonly listItemRef = createObservableRef() + + private renderKeyboardFocusTooltip() { + if ( + !this.props.renderKeyboardFocusTooltip || + !this.props.renderKeyboardFocusTooltip(this.props.rowIndex) + ) { + return null + } + + return ( + + {this.props.renderKeyboardFocusTooltip(this.props.rowIndex)} + + ) + } - private onRef = (elem: HTMLDivElement | null) => { - this.props.onRowRef?.(this.props.rowIndex, elem) + public componentDidMount() { + this.listItemRef.subscribe(elem => { + this.props.onRowRef?.(this.props.rowIndex, elem) + }) } private onRowMouseDown = (e: React.MouseEvent) => { @@ -234,7 +280,7 @@ export class ListRow extends React.Component { aria-label={this.props.ariaLabel} className={rowClassName} tabIndex={tabIndex} - ref={this.onRef} + ref={this.listItemRef} onMouseDown={this.onRowMouseDown} onMouseUp={this.onRowMouseUp} onClick={this.onRowClick} @@ -255,6 +301,7 @@ export class ListRow extends React.Component { className="list-item-content-wrapper" aria-hidden={this.props.ariaLabel !== undefined} > + {this.renderKeyboardFocusTooltip()} {children} } diff --git a/app/src/ui/lib/list/section-list.tsx b/app/src/ui/lib/list/section-list.tsx index e8cf95e1340..1313499a1f9 100644 --- a/app/src/ui/lib/list/section-list.tsx +++ b/app/src/ui/lib/list/section-list.tsx @@ -67,6 +67,18 @@ interface ISectionListProps { */ readonly rowRenderer: (indexPath: RowIndexPath) => JSX.Element | null + /** + * Optional render function for the keyboard focus tooltip + * + * This is used to render a tooltip when the row is focused via keyboard + * navigation. This should be provided if the row has tooltip content that is + * only accessible via the mouse. The content in the mouse tooltip(s) will + * need to be in the keyboard focus tooltip as well. + */ + readonly renderKeyboardFocusTooltip?: ( + indexPath: RowIndexPath + ) => JSX.Element | string | null + /** * Whether or not a given section has a header row at the beginning. When * ommitted, it's assumed the section does NOT have a header row. @@ -1221,6 +1233,7 @@ export class SectionList extends React.Component< children={element} selectable={selectable} className={customClasses} + renderKeyboardFocusTooltip={this.props.renderKeyboardFocusTooltip} /> ) } diff --git a/app/src/ui/lib/section-filter-list.tsx b/app/src/ui/lib/section-filter-list.tsx index a2a32e4c1da..f4d735915c9 100644 --- a/app/src/ui/lib/section-filter-list.tsx +++ b/app/src/ui/lib/section-filter-list.tsx @@ -60,6 +60,16 @@ interface ISectionFilterListProps { /** Called to render each visible item. */ readonly renderItem: (item: T, matches: IMatches) => JSX.Element | null + /** + * Optional render function for the keyboard focus tooltip + * + * This is used to render a tooltip when the row is focused via keyboard + * navigation. This should be provided if the row has tooltip content that is + * only accessible via the mouse. The content in the mouse tooltip(s) will + * need to be in the keyboard focus tooltip as well. + */ + readonly renderKeyboardFocusTooltip?: (item: T) => JSX.Element | string | null + /** Called to render header for the group with the given identifier. */ readonly renderGroupHeader?: ( identifier: GroupIdentifier @@ -371,6 +381,7 @@ export class SectionFilterList< ref={this.onListRef} rowCount={this.state.rows.map(r => r.length)} rowRenderer={this.renderRow} + renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} sectionHasHeader={this.sectionHasHeader} getRowAriaLabel={this.getRowAriaLabel} getSectionAriaLabel={this.getSectionAriaLabel} @@ -439,6 +450,16 @@ export class SectionFilterList< } } + private renderKeyboardFocusTooltip = ( + index: RowIndexPath + ): JSX.Element | string | null => { + const row = this.state.rows[index.section][index.row] + if (row.kind !== 'item' || !this.props.renderKeyboardFocusTooltip) { + return null + } + return this.props.renderKeyboardFocusTooltip(row.item) + } + private onTextBoxRef = (component: TextBox | null) => { this.filterTextBox = component } diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 956b1d9ab2b..6c49ed92fcb 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -157,6 +157,8 @@ export interface ITooltipProps { * Default: true * */ readonly applyAriaDescribedBy?: boolean + + readonly onlyShowOnKeyboardFocus?: boolean } interface ITooltipState { @@ -398,10 +400,13 @@ export class Tooltip extends React.Component< } private installTooltip(elem: TooltipTarget) { - elem.addEventListener('mouseenter', this.onTargetMouseEnter) - elem.addEventListener('mouseleave', this.onTargetMouseLeave) - elem.addEventListener('mousemove', this.onTargetMouseMove) - elem.addEventListener('mousedown', this.onTargetMouseDown) + if (this.props.onlyShowOnKeyboardFocus !== true) { + elem.addEventListener('mouseenter', this.onTargetMouseEnter) + elem.addEventListener('mouseleave', this.onTargetMouseLeave) + elem.addEventListener('mousemove', this.onTargetMouseMove) + elem.addEventListener('mousedown', this.onTargetMouseDown) + } + elem.addEventListener('focus', this.onTargetFocus) elem.addEventListener('focusin', this.onTargetFocusIn) elem.addEventListener('focusout', this.onTargetBlur) @@ -464,6 +469,8 @@ export class Tooltip extends React.Component< ) { this.beginShowTooltip() } + + console.log('onTargetFocus', this.props.target.current) } private onTargetClick = (event: FocusEvent) => { @@ -574,7 +581,9 @@ export class Tooltip extends React.Component< const { direction, tooltipOffset } = this.props return offsetRect( - direction === undefined ? this.mouseRect : target.getBoundingClientRect(), + direction === undefined && this.props.onlyShowOnKeyboardFocus !== true + ? this.mouseRect + : target.getBoundingClientRect(), tooltipOffset?.x ?? 0, tooltipOffset?.y ?? 0 ) diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx index d5e6a10273b..aec68ce9eba 100644 --- a/app/src/ui/repositories-list/repositories-list.tsx +++ b/app/src/ui/repositories-list/repositories-list.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { RepositoryListItem } from './repository-list-item' +import { commitGrammar, RepositoryListItem } from './repository-list-item' import { groupRepositories, IRepositoryListItem, @@ -26,6 +26,7 @@ import { generateRepositoryListContextMenu } from '../repositories-list/reposito import { SectionFilterList } from '../lib/section-filter-list' import { assertNever } from '../../lib/fatal-error' import { enableMultipleEnterpriseAccounts } from '../../lib/feature-flag' +import { IAheadBehind } from '../../models/branch' const BlankSlateImage = encodePathAsUrl(__dirname, 'static/empty-no-repo.svg') @@ -166,6 +167,66 @@ export class RepositoriesList extends React.Component< ) } + private getAheadBehindTooltip = (aheadBehind: IAheadBehind | null) => { + if (aheadBehind === null) { + return null + } + + const { ahead, behind } = aheadBehind + + if (behind === 0 && ahead === 0) { + return null + } + + return ( + 'The currently checked out branch is' + + (behind ? ` ${commitGrammar(behind)} behind ` : '') + + (behind && ahead ? 'and' : '') + + (ahead ? ` ${commitGrammar(ahead)} ahead of ` : '') + + 'its tracked branch.' + ) + } + + private renderKeyboardFocusTooltip = ( + item: IRepositoryListItem + ): JSX.Element | string | null => { + const { repository, aheadBehind, changedFilesCount } = item + const gitHubRepo = + repository instanceof Repository ? repository.gitHubRepository : null + const alias = repository instanceof Repository ? repository.alias : null + const realName = gitHubRepo ? gitHubRepo.fullName : repository.name + const aheadBehindTooltip = this.getAheadBehindTooltip(aheadBehind) + const hasChanges = changedFilesCount > 0 + const uncommittedChangesTooltip = hasChanges + ? `There are uncommitted changes in this repository.` + : null + + return ( + <> +
    + {realName} + {alias && <> ({alias})} +
    +
    + Path: + {repository.path} +
    + {aheadBehindTooltip && ( +
    + Ahead/Behind: + {aheadBehindTooltip} +
    + )} + {uncommittedChangesTooltip && ( +
    + Uncommitted Changes: + {uncommittedChangesTooltip} +
    + )} + + ) + } + private getGroupLabel(group: RepositoryListGroup) { const { kind } = group if (kind === 'enterprise') { @@ -265,6 +326,7 @@ export class RepositoriesList extends React.Component< filterText={this.props.filterText} onFilterTextChanged={this.props.onFilterTextChanged} renderItem={this.renderItem} + renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} renderGroupHeader={this.renderGroupHeader} onItemClick={this.onItemClick} renderPostFilter={this.renderPostFilter} diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx index a41b3675993..1566496eed0 100644 --- a/app/src/ui/repositories-list/repository-list-item.tsx +++ b/app/src/ui/repositories-list/repository-list-item.tsx @@ -158,5 +158,5 @@ const renderChangesIndicator = () => { ) } -const commitGrammar = (commitNum: number) => +export const commitGrammar = (commitNum: number) => `${commitNum} commit${commitNum > 1 ? 's' : ''}` // english is hard From 3b751558025f6a5c9c5cfdc7e8c894c9698ee5db Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:11:12 -0400 Subject: [PATCH 0509/1338] Remove only show on keyboard focus --- app/src/ui/lib/list/list-row.tsx | 1 - app/src/ui/lib/tooltip.tsx | 19 +++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 19a645dc464..3f1b15846de 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -153,7 +153,6 @@ export class ListRow extends React.Component { ancestorFocused={this.props.selected} target={this.listItemRef} openOnFocus={true} - onlyShowOnKeyboardFocus={true} delay={1000} tooltipOffset={ new DOMRect( diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 6c49ed92fcb..956b1d9ab2b 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -157,8 +157,6 @@ export interface ITooltipProps { * Default: true * */ readonly applyAriaDescribedBy?: boolean - - readonly onlyShowOnKeyboardFocus?: boolean } interface ITooltipState { @@ -400,13 +398,10 @@ export class Tooltip extends React.Component< } private installTooltip(elem: TooltipTarget) { - if (this.props.onlyShowOnKeyboardFocus !== true) { - elem.addEventListener('mouseenter', this.onTargetMouseEnter) - elem.addEventListener('mouseleave', this.onTargetMouseLeave) - elem.addEventListener('mousemove', this.onTargetMouseMove) - elem.addEventListener('mousedown', this.onTargetMouseDown) - } - + elem.addEventListener('mouseenter', this.onTargetMouseEnter) + elem.addEventListener('mouseleave', this.onTargetMouseLeave) + elem.addEventListener('mousemove', this.onTargetMouseMove) + elem.addEventListener('mousedown', this.onTargetMouseDown) elem.addEventListener('focus', this.onTargetFocus) elem.addEventListener('focusin', this.onTargetFocusIn) elem.addEventListener('focusout', this.onTargetBlur) @@ -469,8 +464,6 @@ export class Tooltip extends React.Component< ) { this.beginShowTooltip() } - - console.log('onTargetFocus', this.props.target.current) } private onTargetClick = (event: FocusEvent) => { @@ -581,9 +574,7 @@ export class Tooltip extends React.Component< const { direction, tooltipOffset } = this.props return offsetRect( - direction === undefined && this.props.onlyShowOnKeyboardFocus !== true - ? this.mouseRect - : target.getBoundingClientRect(), + direction === undefined ? this.mouseRect : target.getBoundingClientRect(), tooltipOffset?.x ?? 0, tooltipOffset?.y ?? 0 ) From 71a32d51f9e519f5a7a05c217fc439d2a1a08f6e Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:37:30 -0400 Subject: [PATCH 0510/1338] Revert "Remove only show on keyboard focus" This reverts commit 3b751558025f6a5c9c5cfdc7e8c894c9698ee5db. --- app/src/ui/lib/list/list-row.tsx | 1 + app/src/ui/lib/tooltip.tsx | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 3f1b15846de..19a645dc464 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -153,6 +153,7 @@ export class ListRow extends React.Component { ancestorFocused={this.props.selected} target={this.listItemRef} openOnFocus={true} + onlyShowOnKeyboardFocus={true} delay={1000} tooltipOffset={ new DOMRect( diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 956b1d9ab2b..6c49ed92fcb 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -157,6 +157,8 @@ export interface ITooltipProps { * Default: true * */ readonly applyAriaDescribedBy?: boolean + + readonly onlyShowOnKeyboardFocus?: boolean } interface ITooltipState { @@ -398,10 +400,13 @@ export class Tooltip extends React.Component< } private installTooltip(elem: TooltipTarget) { - elem.addEventListener('mouseenter', this.onTargetMouseEnter) - elem.addEventListener('mouseleave', this.onTargetMouseLeave) - elem.addEventListener('mousemove', this.onTargetMouseMove) - elem.addEventListener('mousedown', this.onTargetMouseDown) + if (this.props.onlyShowOnKeyboardFocus !== true) { + elem.addEventListener('mouseenter', this.onTargetMouseEnter) + elem.addEventListener('mouseleave', this.onTargetMouseLeave) + elem.addEventListener('mousemove', this.onTargetMouseMove) + elem.addEventListener('mousedown', this.onTargetMouseDown) + } + elem.addEventListener('focus', this.onTargetFocus) elem.addEventListener('focusin', this.onTargetFocusIn) elem.addEventListener('focusout', this.onTargetBlur) @@ -464,6 +469,8 @@ export class Tooltip extends React.Component< ) { this.beginShowTooltip() } + + console.log('onTargetFocus', this.props.target.current) } private onTargetClick = (event: FocusEvent) => { @@ -574,7 +581,9 @@ export class Tooltip extends React.Component< const { direction, tooltipOffset } = this.props return offsetRect( - direction === undefined ? this.mouseRect : target.getBoundingClientRect(), + direction === undefined && this.props.onlyShowOnKeyboardFocus !== true + ? this.mouseRect + : target.getBoundingClientRect(), tooltipOffset?.x ?? 0, tooltipOffset?.y ?? 0 ) From 5ff39b78f1d4ea36fa186e793840bb50a08d57d2 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:38:33 -0400 Subject: [PATCH 0511/1338] Update tooltip.tsx --- app/src/ui/lib/tooltip.tsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 6c49ed92fcb..aedc3e0d18f 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -400,13 +400,10 @@ export class Tooltip extends React.Component< } private installTooltip(elem: TooltipTarget) { - if (this.props.onlyShowOnKeyboardFocus !== true) { - elem.addEventListener('mouseenter', this.onTargetMouseEnter) - elem.addEventListener('mouseleave', this.onTargetMouseLeave) - elem.addEventListener('mousemove', this.onTargetMouseMove) - elem.addEventListener('mousedown', this.onTargetMouseDown) - } - + elem.addEventListener('mouseenter', this.onTargetMouseEnter) + elem.addEventListener('mouseleave', this.onTargetMouseLeave) + elem.addEventListener('mousemove', this.onTargetMouseMove) + elem.addEventListener('mousedown', this.onTargetMouseDown) elem.addEventListener('focus', this.onTargetFocus) elem.addEventListener('focusin', this.onTargetFocusIn) elem.addEventListener('focusout', this.onTargetBlur) @@ -469,8 +466,6 @@ export class Tooltip extends React.Component< ) { this.beginShowTooltip() } - - console.log('onTargetFocus', this.props.target.current) } private onTargetClick = (event: FocusEvent) => { From de9a29a8b4069c27e824bc5f6cc552a019407408 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:43:11 -0400 Subject: [PATCH 0512/1338] positionRelativeToTarget --- app/src/ui/lib/list/list-row.tsx | 2 +- app/src/ui/lib/tooltip.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 19a645dc464..5faa93af190 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -153,7 +153,7 @@ export class ListRow extends React.Component { ancestorFocused={this.props.selected} target={this.listItemRef} openOnFocus={true} - onlyShowOnKeyboardFocus={true} + positionRelativeToTarget={true} delay={1000} tooltipOffset={ new DOMRect( diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index aedc3e0d18f..70f744a497e 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -158,7 +158,7 @@ export interface ITooltipProps { * */ readonly applyAriaDescribedBy?: boolean - readonly onlyShowOnKeyboardFocus?: boolean + readonly positionRelativeToTarget?: boolean } interface ITooltipState { @@ -576,7 +576,7 @@ export class Tooltip extends React.Component< const { direction, tooltipOffset } = this.props return offsetRect( - direction === undefined && this.props.onlyShowOnKeyboardFocus !== true + direction === undefined && this.props.positionRelativeToTarget !== true ? this.mouseRect : target.getBoundingClientRect(), tooltipOffset?.x ?? 0, From 1c07d290c4d5f343c2345089d57bfc43c46be637 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:17:06 -0400 Subject: [PATCH 0513/1338] wip --- app/src/ui/branches/branch-list-item.tsx | 10 +++------- app/src/ui/relative-time.tsx | 9 +++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx index 7b5282ea755..e94c58ed2d4 100644 --- a/app/src/ui/branches/branch-list-item.tsx +++ b/app/src/ui/branches/branch-list-item.tsx @@ -110,19 +110,15 @@ export class BranchListItem extends React.Component< onMouseUp={this.onMouseUp} > - +
    - +
    {authorDate && ( )} diff --git a/app/src/ui/relative-time.tsx b/app/src/ui/relative-time.tsx index 728668dcea9..cc892dedaf2 100644 --- a/app/src/ui/relative-time.tsx +++ b/app/src/ui/relative-time.tsx @@ -18,6 +18,9 @@ interface IRelativeTimeProps { readonly onlyRelative?: boolean readonly className?: string + + /** Whether to show a tooltip with the absolute date on hover - Default = true */ + readonly tooltip?: boolean } interface IRelativeTimeState { @@ -177,6 +180,12 @@ export class RelativeTime extends React.Component< } public render() { + if (this.props.tooltip === false) { + return ( + {this.state.relativeText} + ) + } + return ( Date: Mon, 11 Aug 2025 13:36:26 -0400 Subject: [PATCH 0514/1338] Update branch-list-item.tsx --- app/src/ui/branches/branch-list-item.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx index e94c58ed2d4..d98163a69e8 100644 --- a/app/src/ui/branches/branch-list-item.tsx +++ b/app/src/ui/branches/branch-list-item.tsx @@ -7,7 +7,6 @@ import * as octicons from '../octicons/octicons.generated' import { HighlightText } from '../lib/highlight-text' import { dragAndDropManager } from '../../lib/drag-and-drop-manager' import { DragType, DropTargetType } from '../../models/drag-drop' -import { TooltippedContent } from '../lib/tooltipped-content' import { RelativeTime } from '../relative-time' import classNames from 'classnames' From e856ef68ae2a147fef86cd942ed4bd542e3d6186 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 14:42:00 -0400 Subject: [PATCH 0515/1338] Refactor repository list tooltips and focus handling Replaces custom tooltip logic in repository list items with a unified tooltip container and updates visual indicators for ahead/behind and uncommitted changes. Refactors list row components to use a new hasKeyboardFocus prop for improved keyboard navigation feedback. Updates related styles for tooltip layout. --- app/src/ui/lib/list/list-row.tsx | 4 +- app/src/ui/lib/list/list.tsx | 1 + app/src/ui/lib/list/section-list.tsx | 5 +++ .../repositories-list/repositories-list.tsx | 16 +++++-- .../repository-list-item.tsx | 42 ++----------------- app/styles/ui/_repository-list.scss | 8 ++++ 6 files changed, 33 insertions(+), 43 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 5faa93af190..20ce0b11ebf 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -128,6 +128,8 @@ interface IListRowProps { readonly renderKeyboardFocusTooltip?: ( indexPath: RowIndexPath ) => JSX.Element | string | null + + readonly hasKeyboardFocus: boolean } export class ListRow extends React.Component { @@ -150,7 +152,7 @@ export class ListRow extends React.Component { return ( { children={element} selectable={selectable} className={customClasses} + hasKeyboardFocus={this.focusRow === rowIndex} /> ) } diff --git a/app/src/ui/lib/list/section-list.tsx b/app/src/ui/lib/list/section-list.tsx index 1313499a1f9..adab06dfaa3 100644 --- a/app/src/ui/lib/list/section-list.tsx +++ b/app/src/ui/lib/list/section-list.tsx @@ -1234,6 +1234,11 @@ export class SectionList extends React.Component< selectable={selectable} className={customClasses} renderKeyboardFocusTooltip={this.props.renderKeyboardFocusTooltip} + hasKeyboardFocus={ + this.focusRow !== InvalidRowIndexPath && + this.focusRow.section === section && + this.focusRow.row === indexPath.row + } /> ) } diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx index aec68ce9eba..48a5d62caee 100644 --- a/app/src/ui/repositories-list/repositories-list.tsx +++ b/app/src/ui/repositories-list/repositories-list.tsx @@ -201,8 +201,11 @@ export class RepositoriesList extends React.Component< ? `There are uncommitted changes in this repository.` : null + const ahead = aheadBehind?.ahead ?? 0 + const behind = aheadBehind?.behind ?? 0 + return ( - <> +
    {realName} {alias && <> ({alias})} @@ -213,17 +216,22 @@ export class RepositoriesList extends React.Component<
    {aheadBehindTooltip && (
    - Ahead/Behind: +
    + {ahead > 0 && } + {behind > 0 && } +
    {aheadBehindTooltip}
    )} {uncommittedChangesTooltip && (
    - Uncommitted Changes: + + + {uncommittedChangesTooltip}
    )} - +
    ) } diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx index 1566496eed0..5472ffbfe53 100644 --- a/app/src/ui/repositories-list/repository-list-item.tsx +++ b/app/src/ui/repositories-list/repository-list-item.tsx @@ -9,8 +9,6 @@ import { IMatches } from '../../lib/fuzzy-find' import { IAheadBehind } from '../../models/branch' import classNames from 'classnames' import { createObservableRef } from '../lib/observable-ref' -import { Tooltip } from '../lib/tooltip' -import { TooltippedContent } from '../lib/tooltipped-content' interface IRepositoryListItemProps { readonly repository: Repositoryish @@ -55,8 +53,6 @@ export class RepositoryListItem extends React.Component< return (
    - {this.renderTooltip()} - ) } - private renderTooltip() { - const repo = this.props.repository - const gitHubRepo = repo instanceof Repository ? repo.gitHubRepository : null - const alias = repo instanceof Repository ? repo.alias : null - const realName = gitHubRepo ? gitHubRepo.fullName : repo.name - - return ( - <> -
    - {realName} - {alias && <> ({alias})} -
    -
    {repo.path}
    - - ) - } public shouldComponentUpdate(nextProps: IRepositoryListItemProps): boolean { if ( @@ -128,33 +108,19 @@ const renderAheadBehindIndicator = (aheadBehind: IAheadBehind) => { return null } - const aheadBehindTooltip = - 'The currently checked out branch is' + - (behind ? ` ${commitGrammar(behind)} behind ` : '') + - (behind && ahead ? 'and' : '') + - (ahead ? ` ${commitGrammar(ahead)} ahead of ` : '') + - 'its tracked branch.' - return ( - +
    {ahead > 0 && } {behind > 0 && } - +
    ) } const renderChangesIndicator = () => { return ( - + - + ) } diff --git a/app/styles/ui/_repository-list.scss b/app/styles/ui/_repository-list.scss index 6adfa2d5b65..cde3e30f662 100644 --- a/app/styles/ui/_repository-list.scss +++ b/app/styles/ui/_repository-list.scss @@ -114,6 +114,14 @@ } } + .repository-list-item-tooltip { + > div { + display: flex; + flex-direction: row; + align-items: center; + } + } + .filter-list-group-header { padding-top: var(--spacing); text-overflow: ellipsis; From 41a28c8bef27830072173e8641719b47a2b948bd Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 16:19:55 -0400 Subject: [PATCH 0516/1338] Tidying --- app/src/ui/branches/branch-list.tsx | 12 +- app/src/ui/lib/list/list-row.tsx | 25 ++-- app/src/ui/lib/list/list.tsx | 1 - app/src/ui/lib/list/section-list.tsx | 4 +- app/src/ui/lib/section-filter-list.tsx | 10 +- .../repositories-list/repositories-list.tsx | 27 ++-- app/styles/ui/_repository-list.scss | 122 ++++++++++-------- app/styles/ui/window/_tooltips.scss | 14 ++ 8 files changed, 121 insertions(+), 94 deletions(-) diff --git a/app/src/ui/branches/branch-list.tsx b/app/src/ui/branches/branch-list.tsx index 75cbdf2bdb4..b60194738cb 100644 --- a/app/src/ui/branches/branch-list.tsx +++ b/app/src/ui/branches/branch-list.tsx @@ -252,7 +252,7 @@ export class BranchList extends React.Component< onFilterKeyDown={this.props.onFilterKeyDown} selectedItem={this.selectedItem} renderItem={this.renderItem} - renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} + renderRowFocusTooltip={this.renderRowFocusTooltip} renderGroupHeader={this.renderGroupHeader} onItemClick={this.onItemClick} onSelectionChanged={this.onSelectionChanged} @@ -311,7 +311,7 @@ export class BranchList extends React.Component< ) } - private renderKeyboardFocusTooltip = ( + private renderRowFocusTooltip = ( item: IBranchListItem ): JSX.Element | string | null => { const { tip, name } = item.branch @@ -325,18 +325,18 @@ export class BranchList extends React.Component< : null return ( - <> +
    - Name: +
    Full Name:
    {name}
    {absoluteDate && (
    - Date Authored: +
    Last Modified:
    {absoluteDate}
    )} - +
    ) } diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 20ce0b11ebf..da75f2d74a5 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -3,6 +3,7 @@ import classNames from 'classnames' import { RowIndexPath } from './list-row-index-path' import { Tooltip } from '../tooltip' import { createObservableRef } from '../observable-ref' +import { AriaLiveContainer } from '../../accessibility/aria-live-container' interface IListRowProps { /** whether or not the section to which this row belongs has a header */ @@ -118,18 +119,17 @@ interface IListRowProps { readonly role?: 'option' | 'listitem' | 'presentation' /** - * Optional render function for the keyboard focus tooltip - * - * This is used to render a tooltip when the row is focused via keyboard - * navigation. This should be provided if the row has tooltip content that is - * only accessible via the mouse. The content in the mouse tooltip(s) will - * need to be in the keyboard focus tooltip as well. + * Optional render function for tooltip that appears on keyboard and mouse focus */ - readonly renderKeyboardFocusTooltip?: ( + readonly renderRowFocusTooltip?: ( indexPath: RowIndexPath ) => JSX.Element | string | null - readonly hasKeyboardFocus: boolean + /** Used in conjuction with the above renderRowFocus to communcate keyboard + * focus This must be provided if providing a tooltip on a the list row as it + * enables access to the tooltip for keyboard and screenreader users. + */ + readonly hasKeyboardFocus?: boolean } export class ListRow extends React.Component { @@ -144,8 +144,8 @@ export class ListRow extends React.Component { private renderKeyboardFocusTooltip() { if ( - !this.props.renderKeyboardFocusTooltip || - !this.props.renderKeyboardFocusTooltip(this.props.rowIndex) + !this.props.renderRowFocusTooltip || + !this.props.renderRowFocusTooltip(this.props.rowIndex) ) { return null } @@ -166,7 +166,8 @@ export class ListRow extends React.Component { ) } > - {this.props.renderKeyboardFocusTooltip(this.props.rowIndex)} + + {this.props.renderRowFocusTooltip(this.props.rowIndex)} ) } @@ -294,6 +295,7 @@ export class ListRow extends React.Component { onBlur={this.onBlur} onContextMenu={this.onContextMenu} > + {this.renderKeyboardFocusTooltip()} { // HACK: When we have an ariaLabel we need to make sure that the // child elements are not exposed to the screen reader, otherwise @@ -303,7 +305,6 @@ export class ListRow extends React.Component { className="list-item-content-wrapper" aria-hidden={this.props.ariaLabel !== undefined} > - {this.renderKeyboardFocusTooltip()} {children}
    } diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx index dae610f7c99..1813151d63b 100644 --- a/app/src/ui/lib/list/list.tsx +++ b/app/src/ui/lib/list/list.tsx @@ -1214,7 +1214,6 @@ export class List extends React.Component { children={element} selectable={selectable} className={customClasses} - hasKeyboardFocus={this.focusRow === rowIndex} /> ) } diff --git a/app/src/ui/lib/list/section-list.tsx b/app/src/ui/lib/list/section-list.tsx index adab06dfaa3..06c15569c51 100644 --- a/app/src/ui/lib/list/section-list.tsx +++ b/app/src/ui/lib/list/section-list.tsx @@ -75,7 +75,7 @@ interface ISectionListProps { * only accessible via the mouse. The content in the mouse tooltip(s) will * need to be in the keyboard focus tooltip as well. */ - readonly renderKeyboardFocusTooltip?: ( + readonly renderRowFocusTooltip?: ( indexPath: RowIndexPath ) => JSX.Element | string | null @@ -1233,7 +1233,7 @@ export class SectionList extends React.Component< children={element} selectable={selectable} className={customClasses} - renderKeyboardFocusTooltip={this.props.renderKeyboardFocusTooltip} + renderRowFocusTooltip={this.props.renderRowFocusTooltip} hasKeyboardFocus={ this.focusRow !== InvalidRowIndexPath && this.focusRow.section === section && diff --git a/app/src/ui/lib/section-filter-list.tsx b/app/src/ui/lib/section-filter-list.tsx index f4d735915c9..014eb3dde13 100644 --- a/app/src/ui/lib/section-filter-list.tsx +++ b/app/src/ui/lib/section-filter-list.tsx @@ -68,7 +68,7 @@ interface ISectionFilterListProps { * only accessible via the mouse. The content in the mouse tooltip(s) will * need to be in the keyboard focus tooltip as well. */ - readonly renderKeyboardFocusTooltip?: (item: T) => JSX.Element | string | null + readonly renderRowFocusTooltip?: (item: T) => JSX.Element | string | null /** Called to render header for the group with the given identifier. */ readonly renderGroupHeader?: ( @@ -381,7 +381,7 @@ export class SectionFilterList< ref={this.onListRef} rowCount={this.state.rows.map(r => r.length)} rowRenderer={this.renderRow} - renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} + renderRowFocusTooltip={this.renderRowFocusTooltip} sectionHasHeader={this.sectionHasHeader} getRowAriaLabel={this.getRowAriaLabel} getSectionAriaLabel={this.getSectionAriaLabel} @@ -450,14 +450,14 @@ export class SectionFilterList< } } - private renderKeyboardFocusTooltip = ( + private renderRowFocusTooltip = ( index: RowIndexPath ): JSX.Element | string | null => { const row = this.state.rows[index.section][index.row] - if (row.kind !== 'item' || !this.props.renderKeyboardFocusTooltip) { + if (row.kind !== 'item' || !this.props.renderRowFocusTooltip) { return null } - return this.props.renderKeyboardFocusTooltip(row.item) + return this.props.renderRowFocusTooltip(row.item) } private onTextBoxRef = (component: TextBox | null) => { diff --git a/app/src/ui/repositories-list/repositories-list.tsx b/app/src/ui/repositories-list/repositories-list.tsx index 48a5d62caee..4e089bb4bac 100644 --- a/app/src/ui/repositories-list/repositories-list.tsx +++ b/app/src/ui/repositories-list/repositories-list.tsx @@ -187,7 +187,7 @@ export class RepositoriesList extends React.Component< ) } - private renderKeyboardFocusTooltip = ( + private renderRowFocusTooltip = ( item: IRepositoryListItem ): JSX.Element | string | null => { const { repository, aheadBehind, changedFilesCount } = item @@ -205,29 +205,34 @@ export class RepositoriesList extends React.Component< const behind = aheadBehind?.behind ?? 0 return ( -
    +
    - {realName} +
    Full Name:
    + {realName} {alias && <> ({alias})}
    - Path: +
    Path:
    {repository.path}
    {aheadBehindTooltip && (
    -
    - {ahead > 0 && } - {behind > 0 && } +
    +
    + {ahead > 0 && } + {behind > 0 && } +
    {aheadBehindTooltip}
    )} {uncommittedChangesTooltip && (
    - - - +
    + + + +
    {uncommittedChangesTooltip}
    )} @@ -334,7 +339,7 @@ export class RepositoriesList extends React.Component< filterText={this.props.filterText} onFilterTextChanged={this.props.onFilterTextChanged} renderItem={this.renderItem} - renderKeyboardFocusTooltip={this.renderKeyboardFocusTooltip} + renderRowFocusTooltip={this.renderRowFocusTooltip} renderGroupHeader={this.renderGroupHeader} onItemClick={this.onItemClick} renderPostFilter={this.renderPostFilter} diff --git a/app/styles/ui/_repository-list.scss b/app/styles/ui/_repository-list.scss index cde3e30f662..655e21870ea 100644 --- a/app/styles/ui/_repository-list.scss +++ b/app/styles/ui/_repository-list.scss @@ -65,61 +65,6 @@ .alias { font-style: italic; } - - .repo-indicators { - margin-left: auto; - display: flex; - justify-content: flex-end; - align-items: center; - margin-right: var(--spacing-half); - } - - .change-indicator-wrapper { - display: flex; - min-width: 12px; - justify-content: center; - align-items: center; - margin-left: var(--spacing-half); - - .octicon { - color: var(--tab-bar-active-color); - width: auto; - } - } - - .ahead-behind { - height: 16px; - background: var(--list-item-badge-background-color); - color: var(--list-item-badge-color); - align-items: center; - margin-left: auto; - - // Perfectly round semi circle ends with real tight - // padding on either side. Now in two flavors! - @include darwin { - height: 12px; - line-height: 12px; - } - - @include win32 { - height: 13px; - line-height: 13px; - } - - .octicon { - margin: 0; - height: 20px; - width: 12px; - } - } - } - - .repository-list-item-tooltip { - > div { - display: flex; - flex-direction: row; - align-items: center; - } } .filter-list-group-header { @@ -185,7 +130,8 @@ .list-focus-container { /** Ahead/behind badge colors when list item is selected but not focused */ .list-item.selected { - .repository-list-item { + .repository-list-item, + .repository-list-item-tooltip { .ahead-behind { background: var(--list-item-selected-badge-background-color); color: var(--list-item-selected-badge-color); @@ -196,7 +142,8 @@ &.focus-within { /** Ahead/behind badge colors when list item is selected and focused */ .list-item.selected { - .repository-list-item { + .repository-list-item, + .repository-list-item-tooltip { .ahead-behind { background: var(--list-item-selected-active-badge-background-color); color: var(--list-item-selected-active-badge-color); @@ -215,3 +162,64 @@ } } } + +.repository-list, +.repository-list-item-tooltip { + .repo-indicators { + margin-left: auto; + display: flex; + justify-content: flex-end; + align-items: center; + margin-right: var(--spacing-half); + } + + .change-indicator-wrapper { + display: flex; + min-width: 12px; + justify-content: center; + align-items: center; + margin-left: var(--spacing-half); + + .octicon { + color: var(--tab-bar-active-color); + width: auto; + } + } + + .ahead-behind { + height: 16px; + background: var(--list-item-badge-background-color); + color: var(--list-item-badge-color); + align-items: center; + margin-left: auto; + + // Perfectly round semi circle ends with real tight + // padding on either side. Now in two flavors! + @include darwin { + height: 12px; + line-height: 12px; + } + + @include win32 { + height: 13px; + line-height: 13px; + } + + .octicon { + margin: 0; + height: 20px; + width: 12px; + } + } +} + +.repository-list-item-tooltip { + .ahead-behind { + display: inline-flex; + margin: unset; + } + + .change-indicator-wrapper { + justify-content: unset; + } +} diff --git a/app/styles/ui/window/_tooltips.scss b/app/styles/ui/window/_tooltips.scss index ffcb020ebf1..3e76b9ca5ab 100644 --- a/app/styles/ui/window/_tooltips.scss +++ b/app/styles/ui/window/_tooltips.scss @@ -220,6 +220,20 @@ body > .tooltip, border-bottom-color: var(--toolbar-tooltip-background-color); } } + + .list-item-tooltip { + > div { + display: flex; + flex-direction: row; + margin-bottom: var(--spacing-half); + } + + .label { + min-width: 60px; + margin-right: var(--spacing-half); + font-weight: bold; + } + } } .tooltip-host { From ebe3625fd2a4ceb25bf0dbd60139652dc02732bd Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:14:53 -0400 Subject: [PATCH 0517/1338] Tidying --- app/src/ui/lib/list/list-row.tsx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index da75f2d74a5..ef0f48a5d5a 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import classNames from 'classnames' import { RowIndexPath } from './list-row-index-path' import { Tooltip } from '../tooltip' -import { createObservableRef } from '../observable-ref' +import { createObservableRef, ObservableRef } from '../observable-ref' import { AriaLiveContainer } from '../../accessibility/aria-live-container' interface IListRowProps { @@ -140,10 +140,11 @@ export class ListRow extends React.Component { // event, with no keyDown events (since that keyDown event should've happened // in the component that previously had focus). private keyboardFocusDetectionState: 'ready' | 'failed' | 'focused' = 'ready' - private readonly listItemRef = createObservableRef() + private listItemRef: ObservableRef | null = null - private renderKeyboardFocusTooltip() { + private renderFocusTooltip() { if ( + !this.listItemRef || !this.props.renderRowFocusTooltip || !this.props.renderRowFocusTooltip(this.props.rowIndex) ) { @@ -172,10 +173,11 @@ export class ListRow extends React.Component { ) } - public componentDidMount() { - this.listItemRef.subscribe(elem => { - this.props.onRowRef?.(this.props.rowIndex, elem) - }) + private onRowRef = (elem: HTMLDivElement | null) => { + if (elem) { + this.listItemRef = createObservableRef(elem) + } + this.props.onRowRef?.(this.props.rowIndex, elem) } private onRowMouseDown = (e: React.MouseEvent) => { @@ -283,7 +285,7 @@ export class ListRow extends React.Component { aria-label={this.props.ariaLabel} className={rowClassName} tabIndex={tabIndex} - ref={this.listItemRef} + ref={this.onRowRef} onMouseDown={this.onRowMouseDown} onMouseUp={this.onRowMouseUp} onClick={this.onRowClick} @@ -295,7 +297,7 @@ export class ListRow extends React.Component { onBlur={this.onBlur} onContextMenu={this.onContextMenu} > - {this.renderKeyboardFocusTooltip()} + {this.renderFocusTooltip()} { // HACK: When we have an ariaLabel we need to make sure that the // child elements are not exposed to the screen reader, otherwise From 9309f32c45cc45e5cfe12a142800e9f7524d9140 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:28:33 -0400 Subject: [PATCH 0518/1338] Update list-row.tsx --- app/src/ui/lib/list/list-row.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index ef0f48a5d5a..191e0560c0f 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -157,7 +157,6 @@ export class ListRow extends React.Component { target={this.listItemRef} openOnFocus={true} positionRelativeToTarget={true} - delay={1000} tooltipOffset={ new DOMRect( this.listItemRef.current From 7a089fba7fa8ae8e565a3f04406c53f5af2a5e13 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 21:11:02 -0400 Subject: [PATCH 0519/1338] Commit list wip --- app/src/ui/history/commit-list.tsx | 89 +++++++++++++++++++++++++ app/src/ui/lib/list/list.tsx | 9 +++ app/styles/ui/history/_commit-list.scss | 7 ++ 3 files changed, 105 insertions(+) diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx index fcd47c84c3b..a683013654b 100644 --- a/app/src/ui/history/commit-list.tsx +++ b/app/src/ui/history/commit-list.tsx @@ -28,6 +28,11 @@ import { import { KeyboardShortcut } from '../keyboard-shortcut/keyboard-shortcut' import { Account } from '../../models/account' import { Emoji } from '../../lib/emoji' +import { getAvatarUsersForCommit, IAvatarUser } from '../../models/avatar' +import { formatDate } from '../../lib/format-date' +import { Avatar } from '../lib/avatar' +import { Octicon } from '../octicons' +import * as octicons from '../octicons/octicons.generated' const RowHeight = 50 @@ -464,6 +469,89 @@ export class CommitList extends React.Component< return rowClassMap } + private renderExpandedAuthor(user: IAvatarUser): string | JSX.Element { + if (!user) { + return 'Unknown user' + } + + if (user.name) { + return ( + <> + {user.name} + {' <'} + {user.email} + {'>'} + + ) + } + + return user.email + } + + private renderRowFocusTooltip = (indexPath: RowIndexPath | undefined) => { + if (!indexPath) { + return null + } + const row = indexPath.row + const sha = this.props.commitSHAs[row] + const commit = this.props.commitLookup.get(sha) + if (!commit) { + return null + } + + const avatarUsers = getAvatarUsersForCommit( + this.props.gitHubRepository, + commit + ) + + const { + author: { date }, + } = commit + + const absoluteDate = formatDate(date, { + dateStyle: 'full', + timeStyle: 'short', + }) + + const authorList = avatarUsers.map((user, i) => { + return ( +
    +
    + +
    +
    {this.renderExpandedAuthor(user)}
    +
    + ) + }) + + const isLocal = this.isLocalCommit(commit.sha) + const unpushedTags = this.getUnpushedTags(commit) + + const showUnpushedIndicator = + (isLocal || unpushedTags.length > 0) && + this.props.isLocalRepository === false + + return ( +
    + {authorList} +
    +
    Date:
    + {absoluteDate} +
    + {showUnpushedIndicator ? ( +
    +
    + +
    +
    + {this.getUnpushedIndicatorTitle(isLocal, unpushedTags.length)} +
    +
    + ) : null} +
    + ) + } + public focus() { this.listRef.current?.focus() } @@ -533,6 +621,7 @@ export class CommitList extends React.Component< }} setScrollTop={this.props.compareListScrollTop} rowCustomClassNameMap={this.getRowCustomClassMap()} + renderRowFocusTooltip={this.renderRowFocusTooltip} />
    diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx index 1813151d63b..43b3f0d492c 100644 --- a/app/src/ui/lib/list/list.tsx +++ b/app/src/ui/lib/list/list.tsx @@ -341,6 +341,13 @@ interface IListProps { indexPath: RowIndexPath, data: KeyboardInsertionData ) => void + + /** + * Optional render function for the keyboard focus tooltip + */ + readonly renderRowFocusTooltip?: ( + indexPath: RowIndexPath + ) => JSX.Element | string | null } interface IListState { @@ -1214,6 +1221,8 @@ export class List extends React.Component { children={element} selectable={selectable} className={customClasses} + hasKeyboardFocus={this.focusRow === rowIndex} + renderRowFocusTooltip={this.props.renderRowFocusTooltip} /> ) } diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss index 0178698725c..eb05c061675 100644 --- a/app/styles/ui/history/_commit-list.scss +++ b/app/styles/ui/history/_commit-list.scss @@ -187,3 +187,10 @@ display: none; } } + +.commit-list-item-tooltip { + .avatar { + width: 16px; + height: 16px; + } +} From 7eaae36de1769f1459c66b440157acc9b4c1eb6a Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 21:44:52 -0400 Subject: [PATCH 0520/1338] Tidying --- app/src/ui/history/commit-list-item.tsx | 12 +++------ app/src/ui/history/commit-list.tsx | 18 ++++++-------- app/src/ui/lib/avatar.tsx | 33 ++++++++++++++++++------- app/src/ui/lib/list/list-row.tsx | 1 + app/styles/ui/history/_commit-list.scss | 27 +++++++++++++++++--- 5 files changed, 59 insertions(+), 32 deletions(-) diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx index 3584c8fcb17..776cf1697fb 100644 --- a/app/src/ui/history/commit-list-item.tsx +++ b/app/src/ui/history/commit-list-item.tsx @@ -22,7 +22,6 @@ import { DropTargetType, } from '../../models/drag-drop' import classNames from 'classnames' -import { TooltippedContent } from '../lib/tooltipped-content' import { Account } from '../../models/account' import { Emoji } from '../../lib/emoji' @@ -44,7 +43,6 @@ interface ICommitProps { */ readonly isDraggable?: boolean readonly showUnpushedIndicator: boolean - readonly unpushedIndicatorTitle?: string readonly disableSquashing?: boolean readonly accounts: ReadonlyArray } @@ -198,13 +196,9 @@ export class CommitListItem extends React.PureComponent< } return ( - +
    - +
    ) } @@ -237,7 +231,7 @@ function renderRelativeTime(date: Date) { return ( <> {` • `} - + ) } diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx index a683013654b..04bafcf5766 100644 --- a/app/src/ui/history/commit-list.tsx +++ b/app/src/ui/history/commit-list.tsx @@ -296,10 +296,6 @@ export class CommitList extends React.Component< key={commit.sha} gitHubRepository={this.props.gitHubRepository} showUnpushedIndicator={showUnpushedIndicator} - unpushedIndicatorTitle={this.getUnpushedIndicatorTitle( - isLocal, - unpushedTags.length - )} commit={commit} emoji={this.props.emoji} isDraggable={ @@ -477,10 +473,8 @@ export class CommitList extends React.Component< if (user.name) { return ( <> - {user.name} - {' <'} - {user.email} - {'>'} +
    {user.name}
    +
    {user.email}
    ) } @@ -515,7 +509,7 @@ export class CommitList extends React.Component< const authorList = avatarUsers.map((user, i) => { return ( -
    +
    @@ -539,9 +533,11 @@ export class CommitList extends React.Component< {absoluteDate}
    {showUnpushedIndicator ? ( -
    +
    - + + +
    {this.getUnpushedIndicatorTitle(isLocal, unpushedTags.length)} diff --git a/app/src/ui/lib/avatar.tsx b/app/src/ui/lib/avatar.tsx index b879415d3dc..60bd9189bf8 100644 --- a/app/src/ui/lib/avatar.tsx +++ b/app/src/ui/lib/avatar.tsx @@ -168,6 +168,9 @@ interface IAvatarProps { readonly size?: number readonly accounts: ReadonlyArray + + /** Defaults true */ + readonly tooltip?: boolean } interface IAvatarState { @@ -371,11 +374,29 @@ export class Avatar extends React.Component { public render() { const title = this.getTitle() + + if (this.props.tooltip === false) { + return
    {this.renderAvatar()}
    + } + + return ( + + {this.renderAvatar()} + + ) + } + + private renderAvatar = () => { const { imageError, user } = this.state const alt = user ? `Avatar for ${user.name || user.email}` : `Avatar for unknown user` - const now = Date.now() const src = this.state.candidates.find(c => { const lastFailed = FailingAvatars.get(c) @@ -383,13 +404,7 @@ export class Avatar extends React.Component { }) return ( - + <> {(!src || imageError) && ( )} @@ -407,7 +422,7 @@ export class Avatar extends React.Component { style={{ display: imageError ? 'none' : undefined }} /> )} - + ) } diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 191e0560c0f..530cd12d40a 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -157,6 +157,7 @@ export class ListRow extends React.Component { target={this.listItemRef} openOnFocus={true} positionRelativeToTarget={true} + delay={this.props.hasKeyboardFocus ? 1000 : undefined} tooltipOffset={ new DOMRect( this.listItemRef.current diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss index eb05c061675..fada8459a7b 100644 --- a/app/styles/ui/history/_commit-list.scss +++ b/app/styles/ui/history/_commit-list.scss @@ -189,8 +189,29 @@ } .commit-list-item-tooltip { - .avatar { - width: 16px; - height: 16px; + &.list-item-tooltip { + .label { + min-width: 35px !important; + } + + .author { + align-items: center; + + .avatar { + width: 24px; + height: 24px; + } + } + + .unpushed-indicator { + display: inline-flex; + flex: 0 0 auto; + border-radius: 8px; + padding: 0 var(--spacing-half); + color: var(--list-item-badge-color); + align-items: center; + background: var(--list-item-selected-badge-background-color); + margin-top: 3px; + } } } From a69d6c33ac03bc90d900cbfc099ead4687a8c48d Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 11 Aug 2025 21:45:05 -0400 Subject: [PATCH 0521/1338] Removing avatar stack tooltip --- app/src/ui/history/commit-list-item.tsx | 1 + app/src/ui/lib/avatar-stack.tsx | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx index 776cf1697fb..ad2a376a487 100644 --- a/app/src/ui/history/commit-list-item.tsx +++ b/app/src/ui/history/commit-list-item.tsx @@ -158,6 +158,7 @@ export class CommitListItem extends React.PureComponent<
    readonly accounts: ReadonlyArray + /** Defaults: true */ + readonly tooltip?: boolean } /** @@ -24,7 +26,7 @@ interface IAvatarStackProps { export class AvatarStack extends React.Component { public render() { const elems = [] - const { users, accounts } = this.props + const { users, accounts, tooltip } = this.props for (let i = 0; i < this.props.users.length; i++) { if ( @@ -34,7 +36,14 @@ export class AvatarStack extends React.Component { elems.push(
    ) } - elems.push() + elems.push( + + ) } const className = classNames('AvatarStack', { From 18e83537aff28dc78e4af6528329e3b83d279a54 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 12 Aug 2025 06:35:55 -0400 Subject: [PATCH 0522/1338] Tidying --- app/src/ui/lib/list/list-row.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 530cd12d40a..cbce78a30a6 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -120,16 +120,19 @@ interface IListRowProps { /** * Optional render function for tooltip that appears on keyboard and mouse focus + * + * See other prop `hasKeyboardFocus` if using this method. */ readonly renderRowFocusTooltip?: ( indexPath: RowIndexPath ) => JSX.Element | string | null - /** Used in conjuction with the above renderRowFocus to communcate keyboard - * focus This must be provided if providing a tooltip on a the list row as it - * enables access to the tooltip for keyboard and screenreader users. + /** + * Used in conjunction with the above renderRowFocus to communicate keyboard + * focus This must be provided if providing a tooltip on a the list row as it + * enables access to the tooltip for keyboard and screenreader users. */ - readonly hasKeyboardFocus?: boolean + readonly hasKeyboardFocus: boolean } export class ListRow extends React.Component { From 70d03e70525caeb287eebe7e956cd3a6877de4cd Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 12 Aug 2025 06:41:44 -0400 Subject: [PATCH 0523/1338] Tidying --- app/src/ui/lib/tooltip.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 70f744a497e..03c623e8f71 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -158,6 +158,9 @@ export interface ITooltipProps { * */ readonly applyAriaDescribedBy?: boolean + /** Usually the position of the tooltip is relative to the mouse pointer, this + * forces it to be relative to the target's position. Useful for tooltips + * rendered by keyboard focus of the item. */ readonly positionRelativeToTarget?: boolean } From 914339a3cfb6888fdc8bc8f578f7f3b26c14f213 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 12 Aug 2025 06:59:45 -0400 Subject: [PATCH 0524/1338] Tidying --- app/src/ui/lib/list/list-row.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index cbce78a30a6..68403f31230 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -3,7 +3,6 @@ import classNames from 'classnames' import { RowIndexPath } from './list-row-index-path' import { Tooltip } from '../tooltip' import { createObservableRef, ObservableRef } from '../observable-ref' -import { AriaLiveContainer } from '../../accessibility/aria-live-container' interface IListRowProps { /** whether or not the section to which this row belongs has a header */ @@ -170,7 +169,6 @@ export class ListRow extends React.Component { ) } > - {this.props.renderRowFocusTooltip(this.props.rowIndex)} ) From d933f869d3f19f4f2a5c752bd0549f46364a5a49 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 12 Aug 2025 08:04:16 -0400 Subject: [PATCH 0525/1338] Fix keyboard focus management in conflict resolution dialogs - Addresses accessibility issue where keyboard focus was not landing on the first interactive element in 'Resolve conflicts before Cherry pick' and 'Resolve conflicts before Merge' dialogs - Added DialogPreferredFocusClassName to the first interactive control in conflict lists - For manual conflicts: applies to the 'Resolve' button - For conflicts with markers: applies to the 'Open in editor' button - Ensures compliance with WCAG 2.4.3 Focus Order guidelines - Improves user experience for keyboard-only users Fixes: Focus now lands on first interactive control instead of 'Continue' button --- app/src/ui/lib/conflicts/unmerged-file.tsx | 19 +++++++- .../dialog/conflicts-dialog.tsx | 43 +++++++++++-------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/app/src/ui/lib/conflicts/unmerged-file.tsx b/app/src/ui/lib/conflicts/unmerged-file.tsx index 9a2dbf1f483..be19a9b0a8c 100644 --- a/app/src/ui/lib/conflicts/unmerged-file.tsx +++ b/app/src/ui/lib/conflicts/unmerged-file.tsx @@ -28,6 +28,7 @@ import { getLabelForManualResolutionOption, } from '../../../lib/status' import { revealInFileManager } from '../../../lib/app-shell' +import { DialogPreferredFocusClassName } from '../../dialog' const defaultConflictsResolvedMessage = 'No conflicts remaining' @@ -78,6 +79,8 @@ export const renderUnmergedFile: React.FunctionComponent<{ readonly setIsFileResolutionOptionsMenuOpen: ( isFileResolutionOptionsMenuOpen: boolean ) => void + /** whether this is the first conflicted file in the dialog (for focus management) */ + readonly isFirstConflictedFile?: boolean }> = props => { if ( isConflictWithMarkers(props.status) && @@ -96,6 +99,7 @@ export const renderUnmergedFile: React.FunctionComponent<{ isFileResolutionOptionsMenuOpen: props.isFileResolutionOptionsMenuOpen, setIsFileResolutionOptionsMenuOpen: props.setIsFileResolutionOptionsMenuOpen, + isFirstConflictedFile: props.isFirstConflictedFile, }) } if ( @@ -109,6 +113,7 @@ export const renderUnmergedFile: React.FunctionComponent<{ dispatcher: props.dispatcher, ourBranch: props.ourBranch, theirBranch: props.theirBranch, + isFirstConflictedFile: props.isFirstConflictedFile, }) } return renderResolvedFile({ @@ -174,6 +179,7 @@ const renderManualConflictedFile: React.FunctionComponent<{ readonly ourBranch?: string readonly theirBranch?: string readonly dispatcher: Dispatcher + readonly isFirstConflictedFile?: boolean }> = props => { const onDropdownClick = makeManualConflictDropdownClickHandler( props.path, @@ -210,6 +216,10 @@ const renderManualConflictedFile: React.FunctionComponent<{ conflictTypeString = `File does not exist on ${targetBranch}.` } + const resolveButtonClassName = props.isFirstConflictedFile + ? `small-button button-group-item resolve-arrow-menu ${DialogPreferredFocusClassName}` + : 'small-button button-group-item resolve-arrow-menu' + const content = ( <>
    @@ -218,7 +228,7 @@ const renderManualConflictedFile: React.FunctionComponent<{
    diff --git a/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx index c9f29583375..ff8bdf994ef 100644 --- a/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx +++ b/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx @@ -146,27 +146,32 @@ export class ConflictsDialog extends React.Component< private renderUnmergedFiles( files: ReadonlyArray ) { + let isFirstUnmergedFile = true return (
      - {files.map(f => - isConflictedFile(f.status) - ? renderUnmergedFile({ - path: f.path, - status: f.status, - resolvedExternalEditor: this.props.resolvedExternalEditor, - openFileInExternalEditor: this.props.openFileInExternalEditor, - repository: this.props.repository, - dispatcher: this.props.dispatcher, - manualResolution: this.props.manualResolutions.get(f.path), - ourBranch: this.props.ourBranch, - theirBranch: this.props.theirBranch, - isFileResolutionOptionsMenuOpen: - this.state.isFileResolutionOptionsMenuOpen, - setIsFileResolutionOptionsMenuOpen: - this.setIsFileResolutionOptionsMenuOpen, - }) - : null - )} + {files.map(f => { + if (isConflictedFile(f.status)) { + const isFirst = isFirstUnmergedFile + isFirstUnmergedFile = false + return renderUnmergedFile({ + path: f.path, + status: f.status, + resolvedExternalEditor: this.props.resolvedExternalEditor, + openFileInExternalEditor: this.props.openFileInExternalEditor, + repository: this.props.repository, + dispatcher: this.props.dispatcher, + manualResolution: this.props.manualResolutions.get(f.path), + ourBranch: this.props.ourBranch, + theirBranch: this.props.theirBranch, + isFileResolutionOptionsMenuOpen: + this.state.isFileResolutionOptionsMenuOpen, + setIsFileResolutionOptionsMenuOpen: + this.setIsFileResolutionOptionsMenuOpen, + isFirstConflictedFile: isFirst, + }) + } + return null + })}
    ) } From 84277e15c85c483a5cfe98273d4b4e815aab3ae2 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 14 Aug 2025 15:40:32 -0400 Subject: [PATCH 0526/1338] Release 3.5.3-beta1 --- app/package.json | 2 +- changelog.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index f56c168b65b..61548066fd1 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.2", + "version": "3.5.3-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index aa117011fd8..d6eeedfe246 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,9 @@ { "releases": { + "3.5.3-beta1": [ + "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804", + "[Fixed] Focus lands on first interactive control instead of 'Continue' button in the conflict resolution dialog - #20880" + ], "3.5.2": [ "[Fixed] Fix the crash that sometimes occurs when opening Pull Request-related notifications - #20761", "[Fixed] Ensure the cursor type on links is pointer - #20766. Thanks @huanfe1!", From ce2f21f1da9d104973ccd30f65e5464968b1a46a Mon Sep 17 00:00:00 2001 From: Melissa Xie Date: Fri, 15 Aug 2025 17:48:55 -0400 Subject: [PATCH 0527/1338] Fix luminosity ratio for conflicted file error text - Change --color-conflicted from orange-600 (#e36209) to orange-800 (#c24e00) - Improves contrast ratio from 3.49:1 to 4.79:1 against white background - Meets WCAG 2.1 AA compliance requirement of 4.5:1 for normal text - Addresses accessibility audit issue github/accessibility-audits#12464 --- app/styles/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index 8ad90375ab9..1207787723a 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -16,7 +16,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); --color-deleted: #{$red-600}; --color-modified: #{darken($yellow-700, 10%)}; --color-renamed: #{$blue}; - --color-conflicted: #{$orange-600}; + --color-conflicted: #{$orange-800}; --text-color: #{$gray-900}; --text-secondary-color: #{$gray-500}; From 59352097594917f1ad7d3498132bd556d82e35fd Mon Sep 17 00:00:00 2001 From: Robbie Rotman Date: Wed, 27 Aug 2025 17:52:57 +1000 Subject: [PATCH 0528/1338] fix - added css gap property to the no-changes panel #7500 --- app/styles/ui/_repository.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/ui/_repository.scss b/app/styles/ui/_repository.scss index b5f60ac6fc1..fef83695321 100644 --- a/app/styles/ui/_repository.scss +++ b/app/styles/ui/_repository.scss @@ -13,6 +13,10 @@ display: flex; } + #no-changes { + gap: var(--spacing); + } + &-sidebar { display: flex; flex-direction: column; From 9ddebd72ac7ed038187ab0b1e10caa279c47bac3 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 2 Sep 2025 09:18:11 -0400 Subject: [PATCH 0529/1338] Add accessible list tooltips feature flag Introduces the enableAccessibleListToolTips feature flag to control tooltip accessibility in list components. Updates branch, commit, and repository list items to conditionally render tooltips based on the flag, improving keyboard navigation and accessibility. Refactors tooltip logic to support disabling tooltips and adds contextual tooltips to repository indicators. --- app/src/lib/feature-flag.ts | 4 ++ app/src/ui/branches/branch-list-item.tsx | 14 ++++- app/src/ui/history/commit-list-item.tsx | 14 ++++- app/src/ui/history/commit-list.tsx | 4 ++ app/src/ui/lib/list/list-row.tsx | 5 ++ app/src/ui/lib/tooltip.tsx | 7 +++ .../repository-list-item.tsx | 56 ++++++++++++++++--- 7 files changed, 90 insertions(+), 14 deletions(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 2832f8037be..d249d067484 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -116,3 +116,7 @@ export const enableCommitMessageGeneration = (account: Account) => { account.isCopilotDesktopEnabled ) } + +export function enableAccessibleListToolTips(): boolean { + return enableBetaFeatures() +} diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx index d98163a69e8..41da890f2f3 100644 --- a/app/src/ui/branches/branch-list-item.tsx +++ b/app/src/ui/branches/branch-list-item.tsx @@ -9,6 +9,8 @@ import { dragAndDropManager } from '../../lib/drag-and-drop-manager' import { DragType, DropTargetType } from '../../models/drag-drop' import { RelativeTime } from '../relative-time' import classNames from 'classnames' +import { TooltippedContent } from '../lib/tooltipped-content' +import { enableAccessibleListToolTips } from '../../lib/feature-flag' interface IBranchListItemProps { /** The name of the branch */ @@ -109,15 +111,21 @@ export class BranchListItem extends React.Component< onMouseUp={this.onMouseUp} > -
    + -
    + {authorDate && ( )}
    diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx index ad2a376a487..301b4ed9842 100644 --- a/app/src/ui/history/commit-list-item.tsx +++ b/app/src/ui/history/commit-list-item.tsx @@ -24,6 +24,8 @@ import { import classNames from 'classnames' import { Account } from '../../models/account' import { Emoji } from '../../lib/emoji' +import { enableAccessibleListToolTips } from '../../lib/feature-flag' +import { TooltippedContent } from '../lib/tooltipped-content' interface ICommitProps { readonly gitHubRepository: GitHubRepository | null @@ -44,6 +46,7 @@ interface ICommitProps { readonly isDraggable?: boolean readonly showUnpushedIndicator: boolean readonly disableSquashing?: boolean + readonly unpushedIndicatorTitle?: string readonly accounts: ReadonlyArray } @@ -158,7 +161,7 @@ export class CommitListItem extends React.PureComponent<
    + -
    + ) } diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx index 04bafcf5766..de7a2f01098 100644 --- a/app/src/ui/history/commit-list.tsx +++ b/app/src/ui/history/commit-list.tsx @@ -296,6 +296,10 @@ export class CommitList extends React.Component< key={commit.sha} gitHubRepository={this.props.gitHubRepository} showUnpushedIndicator={showUnpushedIndicator} + unpushedIndicatorTitle={this.getUnpushedIndicatorTitle( + isLocal, + unpushedTags.length + )} commit={commit} emoji={this.props.emoji} isDraggable={ diff --git a/app/src/ui/lib/list/list-row.tsx b/app/src/ui/lib/list/list-row.tsx index 68403f31230..ae72e9bd3e4 100644 --- a/app/src/ui/lib/list/list-row.tsx +++ b/app/src/ui/lib/list/list-row.tsx @@ -3,6 +3,7 @@ import classNames from 'classnames' import { RowIndexPath } from './list-row-index-path' import { Tooltip } from '../tooltip' import { createObservableRef, ObservableRef } from '../observable-ref' +import { enableAccessibleListToolTips } from '../../../lib/feature-flag' interface IListRowProps { /** whether or not the section to which this row belongs has a header */ @@ -145,6 +146,10 @@ export class ListRow extends React.Component { private listItemRef: ObservableRef | null = null private renderFocusTooltip() { + if (!enableAccessibleListToolTips()) { + return null + } + if ( !this.listItemRef || !this.props.renderRowFocusTooltip || diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index 03c623e8f71..f4417bf93d9 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -162,6 +162,9 @@ export interface ITooltipProps { * forces it to be relative to the target's position. Useful for tooltips * rendered by keyboard focus of the item. */ readonly positionRelativeToTarget?: boolean + + /** Whether to show the tooltip when the target is focused */ + readonly disabled?: boolean } interface ITooltipState { @@ -528,6 +531,10 @@ export class Tooltip extends React.Component< } private beginShowTooltip() { + if (this.props.disabled) { + return + } + this.cancelShowTooltip() this.showTooltipTimeout = window.setTimeout( this.showTooltip, diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx index 5472ffbfe53..a0419390c7b 100644 --- a/app/src/ui/repositories-list/repository-list-item.tsx +++ b/app/src/ui/repositories-list/repository-list-item.tsx @@ -9,6 +9,9 @@ import { IMatches } from '../../lib/fuzzy-find' import { IAheadBehind } from '../../models/branch' import classNames from 'classnames' import { createObservableRef } from '../lib/observable-ref' +import { Tooltip } from '../lib/tooltip' +import { enableAccessibleListToolTips } from '../../lib/feature-flag' +import { TooltippedContent } from '../lib/tooltipped-content' interface IRepositoryListItemProps { readonly repository: Repositoryish @@ -27,10 +30,7 @@ interface IRepositoryListItemProps { } /** A repository item. */ -export class RepositoryListItem extends React.Component< - IRepositoryListItemProps, - {} -> { +export class RepositoryListItem extends React.Component { private readonly listItemRef = createObservableRef() public render() { @@ -53,6 +53,13 @@ export class RepositoryListItem extends React.Component< return (
    + + {this.renderTooltip()} + + +
    + {realName} + {alias && <> ({alias})} +
    +
    {repo.path}
    + + ) + } + public shouldComponentUpdate(nextProps: IRepositoryListItemProps): boolean { if ( nextProps.repository instanceof Repository && @@ -108,19 +132,35 @@ const renderAheadBehindIndicator = (aheadBehind: IAheadBehind) => { return null } + const aheadBehindTooltip = + 'The currently checked out branch is' + + (behind ? ` ${commitGrammar(behind)} behind ` : '') + + (behind && ahead ? 'and' : '') + + (ahead ? ` ${commitGrammar(ahead)} ahead of ` : '') + + 'its tracked branch.' + return ( -
    + {ahead > 0 && } {behind > 0 && } -
    + ) } const renderChangesIndicator = () => { return ( - + - + ) } From 9ccbd6b5cc5aace4925cf1d2b5c7861786769e7d Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 2 Sep 2025 09:31:28 -0400 Subject: [PATCH 0530/1338] Fix tooltip accessibility logic in commit list Corrects the logic for enabling tooltips based on accessibility settings in commit-list-item and relative time components. Also refines the tooltip disabled check to explicitly compare against true. --- app/src/ui/history/commit-list-item.tsx | 4 ++-- app/src/ui/lib/tooltip.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx index 301b4ed9842..d2586881cc3 100644 --- a/app/src/ui/history/commit-list-item.tsx +++ b/app/src/ui/history/commit-list-item.tsx @@ -161,7 +161,7 @@ export class CommitListItem extends React.PureComponent<
    {` • `} - + ) } diff --git a/app/src/ui/lib/tooltip.tsx b/app/src/ui/lib/tooltip.tsx index f4417bf93d9..fac0dae1a1e 100644 --- a/app/src/ui/lib/tooltip.tsx +++ b/app/src/ui/lib/tooltip.tsx @@ -531,7 +531,7 @@ export class Tooltip extends React.Component< } private beginShowTooltip() { - if (this.props.disabled) { + if (this.props.disabled === true) { return } From b6cbc5eb7ab09941d572a8724f8097c8ca41f654 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 2 Sep 2025 09:38:59 -0400 Subject: [PATCH 0531/1338] Lint:fix --- app/src/ui/repositories-list/repository-list-item.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx index a0419390c7b..54cbe675bbc 100644 --- a/app/src/ui/repositories-list/repository-list-item.tsx +++ b/app/src/ui/repositories-list/repository-list-item.tsx @@ -30,7 +30,10 @@ interface IRepositoryListItemProps { } /** A repository item. */ -export class RepositoryListItem extends React.Component { +export class RepositoryListItem extends React.Component< + IRepositoryListItemProps, + {} +> { private readonly listItemRef = createObservableRef() public render() { From 4b6ef90a6c5eafe260e8933145cb9274083f483e Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 2 Sep 2025 11:22:41 -0400 Subject: [PATCH 0532/1338] Release 3.5.3-beta2 --- app/package.json | 2 +- changelog.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 61548066fd1..5484e8650c9 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.3-beta1", + "version": "3.5.3-beta2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index d6eeedfe246..63577d30beb 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,8 @@ { "releases": { + "3.5.3-beta2": [ + "[Improved] The text color of the \"File does not exist“ merge conflict warning meets 4.5:1 contrast requirements - #20902" + ], "3.5.3-beta1": [ "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804", "[Fixed] Focus lands on first interactive control instead of 'Continue' button in the conflict resolution dialog - #20880" From d57d5ab907a4bde673dbecf72a0192064d460a6f Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 2 Sep 2025 11:29:31 -0400 Subject: [PATCH 0533/1338] Apply suggestion from @tidy-dev --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 63577d30beb..bc18413ff01 100644 --- a/changelog.json +++ b/changelog.json @@ -1,7 +1,7 @@ { "releases": { "3.5.3-beta2": [ - "[Improved] The text color of the \"File does not exist“ merge conflict warning meets 4.5:1 contrast requirements - #20902" + "[Improved] The text color of the 'File does not exist' merge conflict warning meets 4.5:1 contrast requirements - #20902" ], "3.5.3-beta1": [ "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804", From 94238a5b21b096b0890b35daedf1575de73e1c6e Mon Sep 17 00:00:00 2001 From: logonoff Date: Wed, 3 Sep 2025 08:47:15 -0400 Subject: [PATCH 0534/1338] feat(linux): add Ptyxis shell integration --- app/src/lib/shells/linux.ts | 15 +++++++++++++++ docs/technical/shell-integration.md | 1 + 2 files changed, 16 insertions(+) diff --git a/app/src/lib/shells/linux.ts b/app/src/lib/shells/linux.ts index b6dbb806f92..683313ffd56 100644 --- a/app/src/lib/shells/linux.ts +++ b/app/src/lib/shells/linux.ts @@ -13,6 +13,7 @@ import { export enum Shell { Gnome = 'GNOME Terminal', GnomeConsole = 'GNOME Console', + Ptyxis = 'Ptyxis', Mate = 'MATE Terminal', Tilix = 'Tilix', Terminator = 'Terminator', @@ -46,6 +47,8 @@ function getShellPath(shell: Shell): Promise { return getPathIfAvailable('/usr/bin/gnome-terminal') case Shell.GnomeConsole: return getPathIfAvailable('/usr/bin/kgx') + case Shell.Ptyxis: + return getPathIfAvailable('/usr/bin/ptyxis') case Shell.Mate: return getPathIfAvailable('/usr/bin/mate-terminal') case Shell.Tilix: @@ -87,6 +90,7 @@ export async function getAvailableShells(): Promise< const [ gnomeTerminalPath, gnomeConsolePath, + ptyxisPath, mateTerminalPath, tilixPath, terminatorPath, @@ -105,6 +109,7 @@ export async function getAvailableShells(): Promise< ] = await Promise.all([ getShellPath(Shell.Gnome), getShellPath(Shell.GnomeConsole), + getShellPath(Shell.Ptyxis), getShellPath(Shell.Mate), getShellPath(Shell.Tilix), getShellPath(Shell.Terminator), @@ -131,6 +136,10 @@ export async function getAvailableShells(): Promise< shells.push({ shell: Shell.GnomeConsole, path: gnomeConsolePath }) } + if (ptyxisPath) { + shells.push({ shell: Shell.Ptyxis, path: ptyxisPath }) + } + if (mateTerminalPath) { shells.push({ shell: Shell.Mate, path: mateTerminalPath }) } @@ -208,6 +217,12 @@ export function launch( case Shell.XFCE: case Shell.Alacritty: return spawn(foundShell.path, ['--working-directory', path]) + case Shell.Ptyxis: + return spawn(foundShell.path, [ + '--new-window', + '--working-directory', + path, + ]) case Shell.Urxvt: return spawn(foundShell.path, ['-cd', path]) case Shell.Konsole: diff --git a/docs/technical/shell-integration.md b/docs/technical/shell-integration.md index 29852c997b2..631bcf118ff 100644 --- a/docs/technical/shell-integration.md +++ b/docs/technical/shell-integration.md @@ -235,6 +235,7 @@ The source for the Linux shell integration is found in [`app/src/lib/shells/linu These shells are currently supported: - [GNOME Terminal](https://help.gnome.org/users/gnome-terminal/stable/) + - [Ptyxis](https://gitlab.gnome.org/chergert/ptyxis/) - [MATE Terminal](https://github.com/mate-desktop/mate-terminal) - [Tilix](https://github.com/gnunn1/tilix) - [Terminator](https://gnometerminator.blogspot.com) From e00d6e858b63f9bbb62e47739c185f346e2fd156 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 5 Sep 2025 16:40:05 +0200 Subject: [PATCH 0535/1338] Only sanitize characters forbidden in the filesystem --- .../ui/add-repository/create-repository.tsx | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/app/src/ui/add-repository/create-repository.tsx b/app/src/ui/add-repository/create-repository.tsx index b04e0f689e0..48bbf168288 100644 --- a/app/src/ui/add-repository/create-repository.tsx +++ b/app/src/ui/add-repository/create-repository.tsx @@ -104,6 +104,22 @@ interface ICreateRepositoryState { readonly readMeExists: boolean } +// We use this instead of sanitizedRepositoryName because it deals with +// valid repository names on GitHub.com but here we only care about whether +// we'll be able to create a directory with the given name. If a user +// creates a repository with a name that GitHub.com doesn't like here it'll +// get sanitized in the Publish dialog later on. +// +// Note that we don't sanitize `\` or `/` here since we use `Path.join` to +// create the full path and that will handle those characters appropriately +// letting users type something like OrgA\RepoB and have the new repo be +// created in the OrgA folder. +// +// macOS and Linux allow are way more allowing so there's no need to sanitize +const safeDirectoryName = (name: string) => { + return __WIN32__ ? name.replace(/[<>:"|?*]/g, '-').replace(/\s+$/, '') : name +} + /** The Create New Repository component. */ export class CreateRepository extends React.Component< ICreateRepositoryProps, @@ -132,7 +148,7 @@ export class CreateRepository extends React.Component< : null const name = this.props.initialPath - ? sanitizedRepositoryName(Path.basename(this.props.initialPath)) + ? safeDirectoryName(Path.basename(this.props.initialPath)) : '' this.state = { @@ -204,7 +220,7 @@ export class CreateRepository extends React.Component< } private async updateIsRepository(path: string, name: string) { - const fullPath = Path.join(path, sanitizedRepositoryName(name)) + const fullPath = Path.join(path, safeDirectoryName(name)) const type = await getRepositoryType(fullPath).catch(e => { log.error(`Unable to determine repository type`, e) @@ -259,7 +275,7 @@ export class CreateRepository extends React.Component< return } - const fullPath = Path.join(path, sanitizedRepositoryName(name), 'README.md') + const fullPath = Path.join(path, safeDirectoryName(name), 'README.md') const readMeExists = await pathExists(fullPath) // Only update readMeExists if the path is still the same @@ -281,7 +297,7 @@ export class CreateRepository extends React.Component< } catch {} } - return Path.join(currentPath, sanitizedRepositoryName(this.state.name)) + return Path.join(currentPath, safeDirectoryName(this.state.name)) } private createRepository = async () => { @@ -455,7 +471,7 @@ export class CreateRepository extends React.Component< } private renderSanitizedName() { - const sanitizedName = sanitizedRepositoryName(this.state.name) + const sanitizedName = safeDirectoryName(this.state.name) if (this.state.name === sanitizedName) { return null } @@ -559,7 +575,7 @@ export class CreateRepository extends React.Component< return null } - const fullPath = Path.join(path, sanitizedRepositoryName(name)) + const fullPath = Path.join(path, safeDirectoryName(name)) return ( @@ -586,7 +602,7 @@ export class CreateRepository extends React.Component< return null } - const fullPath = Path.join(path, sanitizedRepositoryName(name)) + const fullPath = Path.join(path, safeDirectoryName(name)) return ( @@ -639,7 +655,7 @@ export class CreateRepository extends React.Component< return null } - const fullPath = Path.join(path, sanitizedRepositoryName(name)) + const fullPath = Path.join(path, safeDirectoryName(name)) return (
    @@ -657,7 +673,7 @@ export class CreateRepository extends React.Component< if (path !== null) { this.props.dispatcher.showPopup({ type: PopupType.AddRepository, - path: Path.join(path, sanitizedRepositoryName(name)), + path: Path.join(path, safeDirectoryName(name)), }) } } From 616dfce10f72100741042e7ce0025eb45c07c8e5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 5 Sep 2025 16:40:24 +0200 Subject: [PATCH 0536/1338] Don't allow creating with just spaces --- app/src/ui/add-repository/create-repository.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/ui/add-repository/create-repository.tsx b/app/src/ui/add-repository/create-repository.tsx index 48bbf168288..c372e2aad3f 100644 --- a/app/src/ui/add-repository/create-repository.tsx +++ b/app/src/ui/add-repository/create-repository.tsx @@ -10,7 +10,6 @@ import { getRepositoryType, RepositoryType, } from '../../lib/git' -import { sanitizedRepositoryName } from './sanitized-repository-name' import { TextBox } from '../lib/text-box' import { Button } from '../lib/button' import { Row } from '../lib/row' @@ -651,7 +650,12 @@ export class CreateRepository extends React.Component< private renderPathMessage = () => { const { path, name, isRepository } = this.state - if (path === null || path === '' || name === '' || isRepository) { + if ( + path === null || + path.trim().length === 0 || + name.trim().length === 0 || + isRepository + ) { return null } @@ -682,7 +686,7 @@ export class CreateRepository extends React.Component< const disabled = this.state.path === null || this.state.path.length === 0 || - this.state.name.length === 0 || + this.state.name.trim().length === 0 || this.state.creating || this.state.isRepository From b8b5c8e63c1db1f970feab203cda7d657400c710 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:20:37 -0400 Subject: [PATCH 0537/1338] Improve accessibility for commit message generation Adds AriaLiveContainer to provide live region updates when generating commit messages, enhancing accessibility for screen reader users. Also updates ariaLabel to reflect generation status. --- app/src/ui/changes/commit-message.tsx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 4dcbfda0dc2..68815f043dc 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -63,6 +63,7 @@ import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' import { isDotCom } from '../../lib/endpoint-capabilities' import { WorkingDirectoryFileChange } from '../../models/status' import { enableCommitMessageGeneration } from '../../lib/feature-flag' +import { AriaLiveContainer } from '../accessibility/aria-live-container' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -906,11 +907,12 @@ export class CommitMessage extends React.Component< const noFilesSelected = filesSelected.length === 0 const noChangesAvailable = !commitToAmend && noFilesSelected - const ariaLabel = - 'Generate commit message with Copilot' + - (noChangesAvailable - ? '. Files must be selected to generate a commit message.' - : '') + const ariaLabel = isGeneratingCommitMessage + ? "Generating commit details…'" + : 'Generate commit message with Copilot' + + (noChangesAvailable + ? '. Files must be selected to generate a commit message.' + : '') return ( <> @@ -926,6 +928,11 @@ export class CommitMessage extends React.Component< noChangesAvailable } > + {shouldShowGenerateCommitMessageCallOut && ( New From 45a00c8dbdc7318286b9846a490c404d5b70d2d8 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 16 Sep 2025 10:35:51 +0200 Subject: [PATCH 0538/1338] Bump Electron to v38.1.0 --- package.json | 2 +- yarn.lock | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 798fdc51186..eac6bc3d385 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", "diff": "^7.0.0", - "electron": "36.1.0", + "electron": "38.1.0", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", diff --git a/yarn.lock b/yarn.lock index f7eb4271e68..37104e5ec30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,10 +2730,10 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@36.1.0: - version "36.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-36.1.0.tgz#9919b77e61cd1400acc6dd24f9db8451fba5f8eb" - integrity sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg== +electron@38.1.0: + version "38.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-38.1.0.tgz#caebed7f3d7b1d43a9d01811db1f62744a753aa4" + integrity sha512-ypA8GF8RU4HD5pA1sa0/2U8k+92EPP2c7pX+3XbgB760F7OmqrFXtYkOilVw6HfV4+lk88XxqigmsUKTACQYoQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^22.7.7" @@ -6305,7 +6305,7 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -"strip-ansi-cjs@npm: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== @@ -6319,13 +6319,6 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -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== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" From 005610f4ade2f0e49e3e7bb6bdce85d0247f04e5 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 16 Sep 2025 10:36:48 +0200 Subject: [PATCH 0539/1338] Bump node to v22.19.0 --- .github/workflows/ci.yml | 2 +- .node-version | 2 +- .nvmrc | 2 +- .tool-versions | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba644b5afb5..50c0ff2305d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ on: APPLE_APPLICATION_CERT_PASSWORD: env: - NODE_VERSION: 22.14.0 + NODE_VERSION: 22.19.0 jobs: lint: diff --git a/.node-version b/.node-version index 7d41c735d71..e2228113dd0 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -22.14.0 +22.19.0 diff --git a/.nvmrc b/.nvmrc index 517f38666b4..2c6984e9467 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v22.14.0 +v22.19.0 diff --git a/.tool-versions b/.tool-versions index 175418896e3..8b85185889b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ python 3.9.5 -nodejs 22.14.0 +nodejs 22.19.0 From e9ce28a2d087ea686fccc237f407af1c06ce2c86 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 17 Sep 2025 09:25:33 +0200 Subject: [PATCH 0540/1338] Bump changelog and version to v3.5.3-beta3 --- app/package.json | 2 +- changelog.json | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 5484e8650c9..c1019b07e75 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.3-beta2", + "version": "3.5.3-beta3", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index bc18413ff01..ac23cc160ff 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,11 @@ { "releases": { + "3.5.3-beta3": [ + "[Fixed] Copilot message generation in progress message is announced to screen readers - #21008", + "[Fixed] Add Ptyxis shell integration - #20963. Thanks @logonoff!", + "[Fixed] Fix: Improve spacing between graphic and text - #7500. Thanks @robbierotman!", + "[Improved] Upgrade Electron to v38.1.0 - #21012" + ], "3.5.3-beta2": [ "[Improved] The text color of the 'File does not exist' merge conflict warning meets 4.5:1 contrast requirements - #20902" ], From 1e6fd2f72637579cd859ca9216c3cd93a418fc07 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 17 Sep 2025 09:59:38 +0200 Subject: [PATCH 0541/1338] Update beta Electron version to 38.1.0 Changed the valid Electron version for the beta channel from 36.1.0 to 38.1.0 to reflect the latest release. --- script/validate-electron-version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index 4e3e26b1e3a..3c0d1aecae0 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -19,7 +19,7 @@ type ChannelToValidate = 'production' | 'beta' */ const ValidElectronVersions: Record = { production: '36.1.0', - beta: '36.1.0', + beta: '38.1.0', } // Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment. From d05580507a8811120eec368558e27ca959ccb8eb Mon Sep 17 00:00:00 2001 From: Ilyasse Date: Fri, 19 Sep 2025 14:01:58 +0100 Subject: [PATCH 0542/1338] Add prompt to confirm commit message override Add a new user preference to control whether a confirmation dialog appears before overriding a manually entered commit message with a generated one. --- app/src/lib/app-state.ts | 3 ++ app/src/lib/stores/app-store.ts | 28 ++++++++++++ app/src/ui/app.tsx | 3 ++ app/src/ui/dispatcher/dispatcher.ts | 4 ++ ...nerate-commit-message-override-warning.tsx | 45 ++++++++++++++++--- app/src/ui/preferences/preferences.tsx | 17 +++++++ app/src/ui/preferences/prompts.tsx | 22 +++++++++ 7 files changed, 117 insertions(+), 5 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 70a339a157d..1ea5a6d160a 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -236,6 +236,9 @@ export interface IAppState { /** Should the app prompt the user to confirm they want to commit with changes are hidden by filter? */ readonly askForConfirmationOnCommitFilteredChanges: boolean + /** Should the app prompt the user to confirm commit message override? */ + readonly askForConfirmationOnCommitMessageOverride: boolean + /** How the app should handle uncommitted changes when switching branches */ readonly uncommittedChangesStrategy: UncommittedChangesStrategy diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 69598dedc8e..7180325c3fd 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -387,6 +387,7 @@ const confirmCheckoutCommitDefault: boolean = true const askForConfirmationOnForcePushDefault = true const confirmUndoCommitDefault: boolean = true const confirmCommitFilteredChangesDefault: boolean = true +const confirmCommitMessageOverrideDefault: boolean = true const askToMoveToApplicationsFolderKey: string = 'askToMoveToApplicationsFolder' const confirmRepoRemovalKey: string = 'confirmRepoRemoval' const showCommitLengthWarningKey: string = 'showCommitLengthWarning' @@ -399,6 +400,7 @@ const confirmForcePushKey: string = 'confirmForcePush' const confirmUndoCommitKey: string = 'confirmUndoCommit' const confirmCommitFilteredChangesKey: string = 'confirmCommitFilteredChangesKey' +const confirmCommitMessageOverrideKey: string = 'confirmCommitMessageOverride' const uncommittedChangesStrategyKey = 'uncommittedChangesStrategyKind' @@ -539,6 +541,8 @@ export class AppStore extends TypedBaseStore { private confirmUndoCommit: boolean = confirmUndoCommitDefault private confirmCommitFilteredChanges: boolean = confirmCommitFilteredChangesDefault + private confirmCommitMessageOverride: boolean = + confirmCommitMessageOverrideDefault private imageDiffType: ImageDiffType = imageDiffTypeDefault private hideWhitespaceInChangesDiff: boolean = hideWhitespaceInChangesDiffDefault @@ -1073,6 +1077,8 @@ export class AppStore extends TypedBaseStore { askForConfirmationOnUndoCommit: this.confirmUndoCommit, askForConfirmationOnCommitFilteredChanges: this.confirmCommitFilteredChanges, + askForConfirmationOnCommitMessageOverride: + this.confirmCommitMessageOverride, uncommittedChangesStrategy: this.uncommittedChangesStrategy, selectedExternalEditor: this.selectedExternalEditor, imageDiffType: this.imageDiffType, @@ -2254,6 +2260,11 @@ export class AppStore extends TypedBaseStore { confirmCommitFilteredChangesDefault ) + this.confirmCommitMessageOverride = getBoolean( + confirmCommitMessageOverrideKey, + confirmCommitMessageOverrideDefault + ) + this.uncommittedChangesStrategy = getEnum(uncommittedChangesStrategyKey, UncommittedChangesStrategy) ?? defaultUncommittedChangesStrategy @@ -5444,6 +5455,12 @@ export class AppStore extends TypedBaseStore { repository: Repository, filesSelected: ReadonlyArray ): Promise { + if (!this.confirmCommitMessageOverride) { + // If user has disabled the confirmation, directly generate commit message + await this._generateCommitMessage(repository, filesSelected) + return + } + return this._showPopup({ type: PopupType.GenerateCommitMessageOverrideWarning, repository, @@ -5980,6 +5997,17 @@ export class AppStore extends TypedBaseStore { return Promise.resolve() } + public _setConfirmCommitMessageOverrideSetting( + value: boolean + ): Promise { + this.confirmCommitMessageOverride = value + setBoolean(confirmCommitMessageOverrideKey, value) + + this.emitUpdate() + + return Promise.resolve() + } + public _setUncommittedChangesStrategySetting( value: UncommittedChangesStrategy ): Promise { diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 520f0d45a88..c410163ccf2 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -1579,6 +1579,9 @@ export class App extends React.Component { askForConfirmationOnCommitFilteredChanges={ this.state.askForConfirmationOnCommitFilteredChanges } + confirmCommitMessageOverride={ + this.state.askForConfirmationOnCommitMessageOverride + } uncommittedChangesStrategy={this.state.uncommittedChangesStrategy} selectedExternalEditor={this.state.selectedExternalEditor} useWindowsOpenSSH={this.state.useWindowsOpenSSH} diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 2a4671c45f0..e1c17b39cab 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -2466,6 +2466,10 @@ export class Dispatcher { return this.appStore._setConfirmCommitFilteredChanges(value) } + public setConfirmCommitMessageOverrideSetting(value: boolean) { + return this.appStore._setConfirmCommitMessageOverrideSetting(value) + } + /** * Converts a local repository to use the given fork * as its default remote and associated `GitHubRepository`. diff --git a/app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx b/app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx index 06ef2ce2d6e..71f7b5b8b3a 100644 --- a/app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx +++ b/app/src/ui/generate-commit-message/generate-commit-message-override-warning.tsx @@ -1,4 +1,6 @@ import * as React from 'react' +import { Repository } from '../../models/repository' +import { WorkingDirectoryFileChange } from '../../models/status' import { Dialog, DialogContent, @@ -6,8 +8,8 @@ import { OkCancelButtonGroup, } from '../dialog' import { Dispatcher } from '../dispatcher' -import { Repository } from '../../models/repository' -import { WorkingDirectoryFileChange } from '../../models/status' +import { Checkbox, CheckboxValue } from '../lib/checkbox' +import { Row } from '../lib/row' interface IGenerateCommitMessageOverrideWarningProps { readonly dispatcher: Dispatcher @@ -20,9 +22,20 @@ interface IGenerateCommitMessageOverrideWarningProps { readonly onDismissed: () => void } -export class GenerateCommitMessageOverrideWarning extends React.Component { +interface IGenerateCommitMessageOverrideWarningState { + readonly confirmCommitMessageOverride: boolean +} + +export class GenerateCommitMessageOverrideWarning extends React.Component< + IGenerateCommitMessageOverrideWarningProps, + IGenerateCommitMessageOverrideWarningState +> { public constructor(props: IGenerateCommitMessageOverrideWarningProps) { super(props) + + this.state = { + confirmCommitMessageOverride: true, + } } public render() { @@ -37,10 +50,21 @@ export class GenerateCommitMessageOverrideWarning extends React.Component -

    + The commit message you have entered will be overridden by the generated commit message. -

    + + + +     @@ -49,7 +73,18 @@ export class GenerateCommitMessageOverrideWarning extends React.Component + ) => { + const value = !event.currentTarget.checked + this.setState({ confirmCommitMessageOverride: value }) + } + private onOverride = async () => { + if (!this.state.confirmCommitMessageOverride) { + await this.props.dispatcher.setConfirmCommitMessageOverrideSetting(false) + } + this.props.dispatcher.generateCommitMessage( this.props.repository, this.props.filesSelected diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx index 64e84a957ff..5fadb15e0d8 100644 --- a/app/src/ui/preferences/preferences.tsx +++ b/app/src/ui/preferences/preferences.tsx @@ -67,6 +67,7 @@ interface IPreferencesProps { readonly confirmForcePush: boolean readonly confirmUndoCommit: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean + readonly confirmCommitMessageOverride: boolean readonly uncommittedChangesStrategy: UncommittedChangesStrategy readonly selectedExternalEditor: string | null readonly selectedShell: Shell @@ -104,6 +105,7 @@ interface IPreferencesState { readonly confirmForcePush: boolean readonly confirmUndoCommit: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean + readonly confirmCommitMessageOverride: boolean readonly uncommittedChangesStrategy: UncommittedChangesStrategy readonly availableEditors: ReadonlyArray readonly useCustomEditor: boolean @@ -179,6 +181,7 @@ export class Preferences extends React.Component< confirmForcePush: false, confirmUndoCommit: false, askForConfirmationOnCommitFilteredChanges: false, + confirmCommitMessageOverride: true, uncommittedChangesStrategy: defaultUncommittedChangesStrategy, selectedExternalEditor: this.props.selectedExternalEditor, availableShells: [], @@ -248,6 +251,7 @@ export class Preferences extends React.Component< confirmUndoCommit: this.props.confirmUndoCommit, askForConfirmationOnCommitFilteredChanges: this.props.askForConfirmationOnCommitFilteredChanges, + confirmCommitMessageOverride: this.props.confirmCommitMessageOverride, uncommittedChangesStrategy: this.props.uncommittedChangesStrategy, availableShells, availableEditors, @@ -482,6 +486,9 @@ export class Preferences extends React.Component< askForConfirmationOnCommitFilteredChanges={ this.state.askForConfirmationOnCommitFilteredChanges } + confirmCommitMessageOverride={ + this.state.confirmCommitMessageOverride + } onConfirmRepositoryRemovalChanged={ this.onConfirmRepositoryRemovalChanged } @@ -496,6 +503,9 @@ export class Preferences extends React.Component< onAskForConfirmationOnCommitFilteredChanges={ this.onAskForConfirmationOnCommitFilteredChanges } + onConfirmCommitMessageOverrideChanged={ + this.onConfirmCommitMessageOverrideChanged + } uncommittedChangesStrategy={this.state.uncommittedChangesStrategy} onUncommittedChangesStrategyChanged={ this.onUncommittedChangesStrategyChanged @@ -620,6 +630,10 @@ export class Preferences extends React.Component< this.setState({ askForConfirmationOnCommitFilteredChanges: value }) } + private onConfirmCommitMessageOverrideChanged = (value: boolean) => { + this.setState({ confirmCommitMessageOverride: value }) + } + private onUncommittedChangesStrategyChanged = ( uncommittedChangesStrategy: UncommittedChangesStrategy ) => { @@ -806,6 +820,9 @@ export class Preferences extends React.Component< await dispatcher.setConfirmCommitFilteredChanges( this.state.askForConfirmationOnCommitFilteredChanges ) + await dispatcher.setConfirmCommitMessageOverrideSetting( + this.state.confirmCommitMessageOverride + ) if (this.state.selectedExternalEditor) { await dispatcher.setExternalEditor(this.state.selectedExternalEditor) diff --git a/app/src/ui/preferences/prompts.tsx b/app/src/ui/preferences/prompts.tsx index a3a64f0e0ac..2acf96deae7 100644 --- a/app/src/ui/preferences/prompts.tsx +++ b/app/src/ui/preferences/prompts.tsx @@ -15,6 +15,7 @@ interface IPromptsPreferencesProps { readonly confirmForcePush: boolean readonly confirmUndoCommit: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean + readonly confirmCommitMessageOverride: boolean readonly showCommitLengthWarning: boolean readonly uncommittedChangesStrategy: UncommittedChangesStrategy readonly onConfirmDiscardChangesChanged: (checked: boolean) => void @@ -29,6 +30,7 @@ interface IPromptsPreferencesProps { value: UncommittedChangesStrategy ) => void readonly onAskForConfirmationOnCommitFilteredChanges: (value: boolean) => void + readonly onConfirmCommitMessageOverrideChanged: (checked: boolean) => void } interface IPromptsPreferencesState { @@ -40,6 +42,7 @@ interface IPromptsPreferencesState { readonly confirmForcePush: boolean readonly confirmUndoCommit: boolean readonly askForConfirmationOnCommitFilteredChanges: boolean + readonly confirmCommitMessageOverride: boolean readonly uncommittedChangesStrategy: UncommittedChangesStrategy } @@ -62,6 +65,7 @@ export class Prompts extends React.Component< uncommittedChangesStrategy: this.props.uncommittedChangesStrategy, askForConfirmationOnCommitFilteredChanges: this.props.askForConfirmationOnCommitFilteredChanges, + confirmCommitMessageOverride: this.props.confirmCommitMessageOverride, } } @@ -128,6 +132,15 @@ export class Prompts extends React.Component< this.props.onAskForConfirmationOnCommitFilteredChanges(value) } + private onConfirmCommitMessageOverrideChanged = ( + event: React.FormEvent + ) => { + const value = event.currentTarget.checked + + this.setState({ confirmCommitMessageOverride: value }) + this.props.onConfirmCommitMessageOverrideChanged(value) + } + private onConfirmRepositoryRemovalChanged = ( event: React.FormEvent ) => { @@ -280,6 +293,15 @@ export class Prompts extends React.Component< } onChange={this.onConfirmUndoCommitChanged} /> + {this.renderCommittingFilteredChangesPrompt()}
    From 510301c56385521b5e3bcb67094f7c1a4f7ba660 Mon Sep 17 00:00:00 2001 From: zeki <153834382+zekariasasaminew@users.noreply.github.com> Date: Mon, 22 Sep 2025 11:29:15 -0500 Subject: [PATCH 0543/1338] Add Copilot commit message generation to context menu --- app/src/ui/changes/commit-message.tsx | 61 ++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 68815f043dc..93a04ea34e5 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -825,6 +825,44 @@ export class CommitMessage extends React.Component< } } + private getGenerateCommitMessageMenuItem(): IMenuItem | null { + const { + accounts, + onGenerateCommitMessage, + filesSelected, + isCommitting, + isGeneratingCommitMessage, + commitToAmend, + } = this.props + + if ( + !accounts.some(enableCommitMessageGeneration) || + onGenerateCommitMessage === undefined + ) { + return null + } + + const noFilesSelected = filesSelected.length === 0 + const noChangesAvailable = !commitToAmend && noFilesSelected + + return { + label: __DARWIN__ + ? 'Generate Commit Message with Copilot' + : 'Generate commit message with Copilot', + action: () => { + const { commitMessage } = this.state + onGenerateCommitMessage( + filesSelected, + !!commitMessage.summary || !!commitMessage.description + ) + }, + enabled: + isCommitting !== true && + !isGeneratingCommitMessage && + !noChangesAvailable, + } + } + private onContextMenu = (event: React.MouseEvent) => { if ( event.target instanceof HTMLTextAreaElement || @@ -833,16 +871,29 @@ export class CommitMessage extends React.Component< return } - showContextualMenu([this.getAddRemoveCoAuthorsMenuItem()]) + const items: IMenuItem[] = [this.getAddRemoveCoAuthorsMenuItem()] + + const generateMenuItem = this.getGenerateCommitMessageMenuItem() + if (generateMenuItem) { + items.push(generateMenuItem) + } + + showContextualMenu(items) } private onAutocompletingInputContextMenu = () => { - const items: IMenuItem[] = [ - this.getAddRemoveCoAuthorsMenuItem(), + const items: IMenuItem[] = [this.getAddRemoveCoAuthorsMenuItem()] + + const generateMenuItem = this.getGenerateCommitMessageMenuItem() + if (generateMenuItem) { + items.push(generateMenuItem) + } + + items.push( { type: 'separator' }, { role: 'editMenu' }, - { type: 'separator' }, - ] + { type: 'separator' } + ) items.push( this.getCommitSpellcheckEnabilityMenuItem( From 0e233855018b1c4834c0a826f500cf353fc2e42c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 19:47:49 +0000 Subject: [PATCH 0544/1338] Bump tar-fs from 2.1.3 to 2.1.4 in /app Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.3 to 2.1.4. - [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.3...v2.1.4) --- updated-dependencies: - dependency-name: tar-fs dependency-version: 2.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index db6b072be7b..e8ceb3d72d4 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1337,9 +1337,9 @@ tabbable@^5.1.0: integrity sha512-Y3nSukchqM5UchuZjhj/WyE79Qb4RM/Vx3x3oHO3UYKKpf70Hy3iVRxb61MzCavN74aZsKzvPl4KNG8tQUAjFQ== tar-fs@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92" - integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg== + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930" + integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ== dependencies: chownr "^1.1.1" mkdirp-classic "^0.5.2" From 85e4205364870bb39defbe503f084948b9fae1d8 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 29 Sep 2025 15:06:11 +0200 Subject: [PATCH 0545/1338] Upgrade Electron to version 38.2.0 Updated the Electron dependency from 38.1.0 to 38.2.0 in package.json and yarn.lock to incorporate the latest fixes and improvements. --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index eac6bc3d385..f03fa1d8483 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@types/webpack-bundle-analyzer": "^4.7.0", "@types/webpack-hot-middleware": "^2.25.9", "diff": "^7.0.0", - "electron": "38.1.0", + "electron": "38.2.0", "electron-packager": "^17.1.1", "electron-winstaller": "^5.0.0", "eslint-plugin-github": "^5.1.5", diff --git a/yarn.lock b/yarn.lock index 37104e5ec30..02fc6d45d52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,10 +2730,10 @@ electron-winstaller@*, electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@38.1.0: - version "38.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-38.1.0.tgz#caebed7f3d7b1d43a9d01811db1f62744a753aa4" - integrity sha512-ypA8GF8RU4HD5pA1sa0/2U8k+92EPP2c7pX+3XbgB760F7OmqrFXtYkOilVw6HfV4+lk88XxqigmsUKTACQYoQ== +electron@38.2.0: + version "38.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-38.2.0.tgz#fc6bb321923320cc76aa036c7677642ab0239d70" + integrity sha512-Cw5Mb+N5NxsG0Hc1qr8I65Kt5APRrbgTtEEn3zTod30UNJRnAE1xbGk/1NOaDn3ODzI/MYn6BzT9T9zreP7xWA== dependencies: "@electron/get" "^2.0.0" "@types/node" "^22.7.7" From 9830713e4b138037b1f7c33c4559ee6c3351da1a Mon Sep 17 00:00:00 2001 From: Neel Bhalla Date: Mon, 29 Sep 2025 23:22:18 -0400 Subject: [PATCH 0546/1338] feat: pull from paginated local vs head-n based on last commit --- app/src/lib/stores/app-store.ts | 22 ++++++++++++++++++--- app/src/lib/stores/git-store.ts | 34 +++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 69598dedc8e..505ff85136d 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -1717,13 +1717,29 @@ export class AppStore extends TypedBaseStore { if (formState.kind === HistoryTabMode.History) { const commits = state.compareState.commitSHAs - const newCommits = await gitStore.loadCommitBatch('HEAD', commits.length) - if (newCommits == null) { + const tip = state.branchesState.tip + + let newCommits: string[] | null = null + + // Prioritize pulling from the local commits if the last one we pulled is local + if ( + commits.length > 0 && + tip.kind === TipState.Valid && + gitStore.localCommitSHAs.includes(commits[commits.length - 1]) + ) { + newCommits = await gitStore.loadLocalCommits(tip.branch, commits.length) + } + + if (!newCommits || newCommits.length === 0) { + newCommits = await gitStore.loadCommitBatch('HEAD', commits.length) + } + + if (!newCommits) { return } this.repositoryStateCache.updateCompareState(repository, () => ({ - commitSHAs: commits.concat(newCommits), + commitSHAs: commits.concat(newCommits ?? []), })) this.emitUpdate() } diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index fb13690856d..4c669e55baf 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -597,26 +597,31 @@ export class GitStore extends BaseStore { * Load local commits into memory for the current repository. * * @param branch The branch to query for unpublished commits. + * @param skip The amount of commits to skip to support pagination loading of local commits. If skip is undefined, + * this will reset the local commits cache and treat it as a pagination reset. * * If the tip of the repository does not have commits (i.e. is unborn), this * should be invoked with `null`, which clears any existing commits from the * store. */ - public async loadLocalCommits(branch: Branch | null): Promise { + public async loadLocalCommits( + branch: Branch | null, + skip?: number + ): Promise { if (branch === null) { this._localCommitSHAs = [] - return + return null } let localCommits: ReadonlyArray | undefined if (branch.upstream) { const range = revRange(branch.upstream, branch.name) localCommits = await this.performFailableOperation(() => - getCommits(this.repository, range, CommitBatchSize) + getCommits(this.repository, range, CommitBatchSize, skip) ) } else { localCommits = await this.performFailableOperation(() => - getCommits(this.repository, 'HEAD', CommitBatchSize, undefined, [ + getCommits(this.repository, 'HEAD', CommitBatchSize, skip, [ '--not', '--remotes', ]) @@ -624,12 +629,29 @@ export class GitStore extends BaseStore { } if (!localCommits) { - return + return null } this.storeCommits(localCommits) - this._localCommitSHAs = localCommits.map(c => c.sha) + + let newCommitSHAs: string[] + + if (skip !== undefined) { + // perform a soft ammend to the list of local commits + const previousSHAs = new Set(this._localCommitSHAs) + newCommitSHAs = localCommits + .map(c => c.sha) + .filter(sha => !previousSHAs.has(sha)) + this._localCommitSHAs = [...this._localCommitSHAs, ...newCommitSHAs] + } else { + // reset the local commits since its a page reset + newCommitSHAs = localCommits.map(c => c.sha) + this._localCommitSHAs = Array.from(newCommitSHAs) + } + this.emitUpdate() + + return newCommitSHAs } /** From 18031f8325750c07a41fd2d7303d90f562735118 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 30 Sep 2025 09:07:03 -0400 Subject: [PATCH 0547/1338] Release 3.5.3-beta4 --- app/package.json | 2 +- changelog.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index c1019b07e75..2b70ab778fd 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.3-beta3", + "version": "3.5.3-beta4", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index ac23cc160ff..fe6a87c9b1e 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,6 @@ { "releases": { + "3.5.3-beta4": ["[Improved] Upgrade Electron to v38.2.0 - #21060"], "3.5.3-beta3": [ "[Fixed] Copilot message generation in progress message is announced to screen readers - #21008", "[Fixed] Add Ptyxis shell integration - #20963. Thanks @logonoff!", From caebf6d843db5f4b7930c015d137b891ee7ccafd Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Tue, 30 Sep 2025 09:41:50 -0400 Subject: [PATCH 0548/1338] Update validate-electron-version.ts --- script/validate-electron-version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index 3c0d1aecae0..fe9d8f79ff1 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -19,7 +19,7 @@ type ChannelToValidate = 'production' | 'beta' */ const ValidElectronVersions: Record = { production: '36.1.0', - beta: '38.1.0', + beta: '38.2.0', } // Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment. From 510179b43ec0d3b6b00f6974c10dae071c915df6 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 7 Oct 2025 14:26:10 +0200 Subject: [PATCH 0549/1338] Bump changelog and version to v3.5.3 --- app/package.json | 2 +- changelog.json | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 2b70ab778fd..fd64a2c1ea9 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.3-beta4", + "version": "3.5.3", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index fe6a87c9b1e..bb4089e3154 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,14 @@ { "releases": { + "3.5.3": [ + "[Added] Add Ptyxis shell integration - #20963. Thanks @logonoff!", + "[Fixed] Copilot message generation in progress message is announced to screen readers - #21008", + "[Fixed] Fix: Improve spacing between graphic and text - #7500. Thanks @robbierotman!", + "[Fixed] Focus lands on first interactive control instead of 'Continue' button in the conflict resolution dialog - #20880", + "[Improved] Upgrade Electron to v38.2.0 - #21060", + "[Improved] The text color of the 'File does not exist' merge conflict warning meets 4.5:1 contrast requirements - #20902", + "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804" + ], "3.5.3-beta4": ["[Improved] Upgrade Electron to v38.2.0 - #21060"], "3.5.3-beta3": [ "[Fixed] Copilot message generation in progress message is announced to screen readers - #21008", From 35988e37d3e8284aa1df743dc4e69dd60aa8a620 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 7 Oct 2025 14:26:23 +0200 Subject: [PATCH 0550/1338] Update production Electron version to 38.2.0 Bumps the Electron version for the production channel from 36.1.0 to 38.2.0 to align with the beta channel and ensure compatibility with the latest Electron features and fixes. --- script/validate-electron-version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/validate-electron-version.ts b/script/validate-electron-version.ts index fe9d8f79ff1..d124c7a095e 100644 --- a/script/validate-electron-version.ts +++ b/script/validate-electron-version.ts @@ -18,7 +18,7 @@ type ChannelToValidate = 'production' | 'beta' * to a previous version of GitHub Desktop without losing all settings. */ const ValidElectronVersions: Record = { - production: '36.1.0', + production: '38.2.0', beta: '38.2.0', } From 849ad0174b8e568ed342c7e5f6bada062230b838 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Wed, 8 Oct 2025 10:49:03 +0200 Subject: [PATCH 0551/1338] =?UTF-8?q?Update=20Electron=20target=20version?= =?UTF-8?q?=20in=20.npmrc=20file=20too=20=F0=9F=98=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/.npmrc b/app/.npmrc index 6b1f40f4d4e..921785a5c71 100644 --- a/app/.npmrc +++ b/app/.npmrc @@ -1,3 +1,3 @@ runtime = electron disturl = https://electronjs.org/headers -target = 36.1.0 +target = 38.2.0 From 34fe61047eedc03c8ff1c4bd22d40d90b5b090be Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Oct 2025 14:51:55 +0200 Subject: [PATCH 0552/1338] Add accent-color CSS variable and apply to body Introduces a new --accent-color CSS variable in both default and dark themes, and applies it to the body element using the accent-color property. This enables consistent accent coloring for form controls and other UI elements. --- app/styles/_globals.scss | 1 + app/styles/_variables.scss | 1 + app/styles/themes/_dark.scss | 1 + 3 files changed, 3 insertions(+) diff --git a/app/styles/_globals.scss b/app/styles/_globals.scss index 827f78a7b79..7e9bf45f046 100644 --- a/app/styles/_globals.scss +++ b/app/styles/_globals.scss @@ -56,6 +56,7 @@ body { color: var(--text-color); background-color: var(--background-color); + accent-color: var(--accent-color); } :not(input, textarea) { diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index 1207787723a..d48b4c14b5a 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -367,6 +367,7 @@ $overlay-background-color: rgba(0, 0, 0, 0.4); /** The highlight color used for focus rings and focus box shadows */ --focus-color: #{$blue}; + --accent-color: #{$blue-400}; --diff-linenumber-focus-color: #{$blue-600}; /** diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss index a03d76ddab0..f3fbfd8e18a 100644 --- a/app/styles/themes/_dark.scss +++ b/app/styles/themes/_dark.scss @@ -273,6 +273,7 @@ body.theme-dark { /** The highlight color used for focus rings and focus box shadows */ --focus-color: #{$blue}; + --accent-color: #{$blue-200}; --diff-linenumber-focus-color: #{$blue-200}; /** From d2a2d3e46fe56b863a33d39d2aba2972ba781f4a Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Oct 2025 15:37:10 +0200 Subject: [PATCH 0553/1338] Update macOS support check for Changed the minimum supported macOS version from 11.0 to 12.0 for Electron compatibility checks. --- app/src/lib/get-os.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/get-os.ts b/app/src/lib/get-os.ts index b442774754f..50f548b43c7 100644 --- a/app/src/lib/get-os.ts +++ b/app/src/lib/get-os.ts @@ -94,7 +94,7 @@ export const isWindowsAndNoLongerSupportedByElectron = memoizeOne( ) export const isMacOSAndNoLongerSupportedByElectron = memoizeOne( - () => __DARWIN__ && systemVersionLessThan('11.0') + () => __DARWIN__ && systemVersionLessThan('12.0') ) export const isOSNoLongerSupportedByElectron = memoizeOne( From c17f42ba1aaa67472786781a89634111745fddac Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Oct 2025 15:40:43 +0200 Subject: [PATCH 0554/1338] Update changelog to note removal of macOS 11 support Added an entry to the changelog indicating that support for macOS 11 has been removed as part of issue #21060. --- changelog.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index bb4089e3154..5cc06885a96 100644 --- a/changelog.json +++ b/changelog.json @@ -7,7 +7,8 @@ "[Fixed] Focus lands on first interactive control instead of 'Continue' button in the conflict resolution dialog - #20880", "[Improved] Upgrade Electron to v38.2.0 - #21060", "[Improved] The text color of the 'File does not exist' merge conflict warning meets 4.5:1 contrast requirements - #20902", - "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804" + "[Improved] Provides the tooltips for list items in a single condensed tooltip that allows keyboard users and screen reader users access upon navigation of a list item - #20804", + "[Removed] Remove support for macOS 11 - #21060" ], "3.5.3-beta4": ["[Improved] Upgrade Electron to v38.2.0 - #21060"], "3.5.3-beta3": [ From d7335e4f28f9a2271627b58f0ab980f6e51bbc06 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Oct 2025 16:51:01 +0200 Subject: [PATCH 0555/1338] Create validate-macos-version.ts --- script/validate-macos-version.ts | 108 +++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 script/validate-macos-version.ts diff --git a/script/validate-macos-version.ts b/script/validate-macos-version.ts new file mode 100644 index 00000000000..2b2cc2f865c --- /dev/null +++ b/script/validate-macos-version.ts @@ -0,0 +1,108 @@ +/* eslint-disable no-sync */ +/// + +import { readFileSync, existsSync } from 'fs-extra' +import { join } from 'path' + +import * as distInfo from './dist-info' + +type ChannelToValidate = 'production' | 'beta' + +/** + * This object states the valid/expected minimum macOS versions for each publishable + * channel of GitHub Desktop. + * + * The purpose of this is to ensure that we don't accidentally publish a + * production/beta/test build with the wrong minimum macOS version, which could + * cause compatibility issues or prevent users from running the application. + */ +const ValidMacOSVersions: Record = { + production: '12.0', + beta: '12.0', +} + +// Only when we get a RELEASE_CHANNEL we know we're in the middle of a deployment. +// In that case, we want to error out if the macOS version is not what we expect. +const errorOnMismatch = (process.env.RELEASE_CHANNEL ?? '').length > 0 + +function handleError(message: string): never { + if (errorOnMismatch) { + console.error(message) + process.exit(1) + } else { + console.warn(message) + process.exit(0) + } +} + +const channel = + process.env.RELEASE_CHANNEL || distInfo.getChannelFromReleaseBranch() + +if (!isChannelToValidate(channel)) { + console.log(`No need to validate the macOS version of a ${channel} build.`) + process.exit(0) +} + +const expectedVersion = ValidMacOSVersions[channel] + +function validateMacOSVersion() { + try { + const actualVersion = resolveVersionInInfoPlist() + + if (actualVersion !== expectedVersion) { + handleError( + `The minimum macOS version for the ${channel} channel is incorrect. Expected ${expectedVersion} but found ${actualVersion}.` + ) + } + + console.log( + `The minimum macOS version for the ${channel} channel is correct: ${actualVersion}.` + ) + } catch (error) { + handleError( + `Failed to validate macOS version: ${ + error instanceof Error ? error.message : String(error) + }` + ) + } +} + +function isChannelToValidate(channel: string): channel is ChannelToValidate { + return Object.keys(ValidMacOSVersions).includes(channel) +} + +function resolveVersionInInfoPlist(): string { + const infoPlistPath = join( + __dirname, + '..', + 'node_modules', + 'electron', + 'dist', + 'Electron.app', + 'Contents', + 'Info.plist' + ) + + if (!existsSync(infoPlistPath)) { + throw new Error( + `Info.plist file not found at ${infoPlistPath}. Make sure Electron is installed.` + ) + } + + const plistContent = readFileSync(infoPlistPath, 'utf-8') + + // Simple regex-based parsing for LSMinimumSystemVersion + // Look for the pattern: LSMinimumSystemVersion\s*version + const versionMatch = plistContent.match( + /LSMinimumSystemVersion<\/key>\s*([^<]+)<\/string>/ + ) + + if (!versionMatch || !versionMatch[1]) { + throw new Error('LSMinimumSystemVersion not found in Info.plist') + } + + return versionMatch[1].trim() +} + +// Run the validation +validateMacOSVersion() From dd3c2070349170afb81ebb74ca6966ec2a9f770d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 9 Oct 2025 16:51:45 +0200 Subject: [PATCH 0556/1338] Add macOS version validation to CI workflow Introduces a new 'validate-macos-version' script and integrates it into the CI pipeline to ensure macOS version requirements are checked during continuous integration. --- .github/workflows/ci.yml | 1 + package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50c0ff2305d..43e3ddb75fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,6 +58,7 @@ jobs: cache: yarn - run: yarn - run: yarn validate-electron-version + - run: yarn validate-macos-version - run: yarn lint - run: yarn validate-changelog - name: Ensure a clean working directory diff --git a/package.json b/package.json index f03fa1d8483..3231e638980 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "eslint": "eslint --cache --rulesdir ./eslint-rules \"./eslint-rules/**/*.js\" \"./script/**/*.ts{,x}\" \"./app/{src,typings,test}/**/*.{j,t}s{,x}\" \"./changelog.json\"", "eslint-check": "eslint --print-config .eslintrc.* | eslint-config-prettier-check", "validate-electron-version": "ts-node -P script/tsconfig.json script/validate-electron-version.ts", + "validate-macos-version": "ts-node -P script/tsconfig.json script/validate-macos-version.ts", "clean-slate": "rimraf out node_modules app/node_modules && yarn", "rebuild-hard:dev": "yarn clean-slate && yarn build:dev", "rebuild-hard:prod": "yarn clean-slate && yarn build:prod", From 81910bd79ea44b11e195d3f30107dda611f341d0 Mon Sep 17 00:00:00 2001 From: Mola Adedeji Date: Fri, 17 Oct 2025 13:41:38 -0300 Subject: [PATCH 0557/1338] Display line change count in PR Preview Dialog --- .../open-pull-request-dialog.tsx | 3 +- .../pull-request-files-changed.tsx | 29 +++++++++++++++---- .../ui/_pull-request-files-changed.scss | 18 +++++++++++- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/app/src/ui/open-pull-request/open-pull-request-dialog.tsx b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx index e6433daf8e4..447c5f5e942 100644 --- a/app/src/ui/open-pull-request/open-pull-request-dialog.tsx +++ b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx @@ -160,7 +160,6 @@ export class OpenPullRequestDialog extends React.Component + /** The changeset data associated with the selected commit */ + readonly changesetData: IChangesetData /** The diff that should be rendered */ readonly diff: IDiff | null @@ -232,7 +233,7 @@ export class PullRequestFilesChanged extends React.Component< } private onRowDoubleClick = (row: number) => { - const files = this.props.files + const files = this.props.changesetData.files const file = files[row] this.props.onOpenInExternalEditor(file.path) @@ -246,6 +247,8 @@ export class PullRequestFilesChanged extends React.Component<
    Showing changes from all commits
    + {this.renderLinesChanged()} +
    +
    +{changesetData.linesAdded}
    +
    -{changesetData.linesDeleted}
    +
    + ) + } + private renderFileList() { - const { files, selectedFile, fileListWidth } = this.props + const { changesetData, selectedFile, fileListWidth } = this.props return ( Date: Mon, 20 Oct 2025 10:58:39 -0400 Subject: [PATCH 0558/1338] Fix column type for added rows in side-by-side diff Always use DiffColumn.After for added rows instead of conditionally using DiffColumn.Before when side-by-side diffs are disabled. This ensures consistent rendering of added lines in the diff view. --- app/src/ui/diff/side-by-side-diff.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/ui/diff/side-by-side-diff.tsx b/app/src/ui/diff/side-by-side-diff.tsx index 48947369fe6..71810da89eb 100644 --- a/app/src/ui/diff/side-by-side-diff.tsx +++ b/app/src/ui/diff/side-by-side-diff.tsx @@ -2092,8 +2092,7 @@ function* enumerateColumnContents( if (row.type === DiffRowType.Hunk) { yield { type: DiffColumn.Before, content: row.content } } else if (row.type === DiffRowType.Added) { - const type = showSideBySideDiffs ? DiffColumn.After : DiffColumn.Before - yield { type, content: row.data.content } + yield { type: DiffColumn.After, content: row.data.content } } else if (row.type === DiffRowType.Deleted) { yield { type: DiffColumn.Before, content: row.data.content } } else if (row.type === DiffRowType.Context) { From 8dd93b357a075a542efafacbd3acbf20acb23bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berk=20C=CC=A7ebi?= Date: Tue, 21 Oct 2025 13:49:01 +0900 Subject: [PATCH 0559/1338] Increase title bar height on macOS Tahoe --- app/src/lib/get-os.ts | 5 +++++ app/src/ui/window/title-bar.tsx | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/lib/get-os.ts b/app/src/lib/get-os.ts index b442774754f..b575c624f31 100644 --- a/app/src/lib/get-os.ts +++ b/app/src/lib/get-os.ts @@ -84,6 +84,11 @@ export const isMacOSBigSurOrLater = memoizeOne( () => __DARWIN__ && systemVersionGreaterThanOrEqualTo('10.16') ) +/** We're currently running macOS and it is at least Tahoe. */ +export const isMacOSTahoeOrLater = memoizeOne( + () => __DARWIN__ && systemVersionGreaterThanOrEqualTo('26') +) + /** We're currently running Windows 10 and it is at least 1809 Preview Build 17666. */ export const isWindows10And1809Preview17666OrLater = memoizeOne( () => __WIN32__ && systemVersionGreaterThanOrEqualTo('10.0.17666') diff --git a/app/src/ui/window/title-bar.tsx b/app/src/ui/window/title-bar.tsx index b6fe9b7c041..461cd4eac70 100644 --- a/app/src/ui/window/title-bar.tsx +++ b/app/src/ui/window/title-bar.tsx @@ -4,7 +4,7 @@ import { WindowState } from '../../lib/window-state' import { WindowControls } from './window-controls' import { Octicon } from '../octicons/octicon' import * as octicons from '../octicons/octicons.generated' -import { isMacOSBigSurOrLater } from '../../lib/get-os' +import { isMacOSBigSurOrLater, isMacOSTahoeOrLater } from '../../lib/get-os' import { getAppleActionOnDoubleClick, isWindowMaximized, @@ -16,8 +16,15 @@ import { /** Get the height (in pixels) of the title bar depending on the platform */ export function getTitleBarHeight() { if (__DARWIN__) { - // Big Sur has taller title bars, see #10980 - return isMacOSBigSurOrLater() ? 26 : 22 + if (isMacOSTahoeOrLater()) { + // Tahoe also has taller title bars, see #21135 + return 32 + } else if (isMacOSBigSurOrLater()) { + // Big Sur has taller title bars, see #10980 + return 26 + } else { + return 22 + } } return 28 From 025abf17141d128c0ce71f98957d819c6a584cc6 Mon Sep 17 00:00:00 2001 From: Mola Adedeji Date: Wed, 22 Oct 2025 13:45:47 -0300 Subject: [PATCH 0560/1338] Move text to Dialog Header --- .../open-pull-request-dialog.tsx | 13 +++++++-- .../open-pull-request-header.tsx | 16 ++++++++++ .../pull-request-files-changed.tsx | 29 ++++--------------- app/styles/_ui.scss | 1 + app/styles/ui/_open-pull-request-header.scss | 12 ++++++++ .../ui/_pull-request-files-changed.scss | 18 +----------- 6 files changed, 46 insertions(+), 43 deletions(-) create mode 100644 app/styles/ui/_open-pull-request-header.scss diff --git a/app/src/ui/open-pull-request/open-pull-request-dialog.tsx b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx index 447c5f5e942..e30f803d255 100644 --- a/app/src/ui/open-pull-request/open-pull-request-dialog.tsx +++ b/app/src/ui/open-pull-request/open-pull-request-dialog.tsx @@ -116,7 +116,14 @@ export class OpenPullRequestDialog extends React.Component @@ -160,6 +168,7 @@ export class OpenPullRequestDialog extends React.Component void @@ -64,6 +68,7 @@ export class OpenPullRequestDialogHeader extends React.Component 1 ? 's' : ''}` return ( @@ -99,6 +105,16 @@ export class OpenPullRequestDialogHeader extends React.Component{' '} from {currentBranch.name}.
    +
    +
    Lines changed:
    + + , + +
    ) } diff --git a/app/src/ui/open-pull-request/pull-request-files-changed.tsx b/app/src/ui/open-pull-request/pull-request-files-changed.tsx index 90ee8edec5d..afdbfa4b481 100644 --- a/app/src/ui/open-pull-request/pull-request-files-changed.tsx +++ b/app/src/ui/open-pull-request/pull-request-files-changed.tsx @@ -25,7 +25,6 @@ import { clamp } from '../../lib/clamp' import { getDotComAPIEndpoint } from '../../lib/api' import { createCommitURL } from '../../lib/commit-url' import { DiffOptions } from '../diff/diff-options' -import { IChangesetData } from '../../lib/git' interface IPullRequestFilesChangedProps { readonly repository: Repository @@ -34,8 +33,8 @@ interface IPullRequestFilesChangedProps { /** The file whose diff should be displayed. */ readonly selectedFile: CommittedFileChange | null - /** The changeset data associated with the selected commit */ - readonly changesetData: IChangesetData + /** The files changed in the pull request. */ + readonly files: ReadonlyArray /** The diff that should be rendered */ readonly diff: IDiff | null @@ -233,7 +232,7 @@ export class PullRequestFilesChanged extends React.Component< } private onRowDoubleClick = (row: number) => { - const files = this.props.changesetData.files + const files = this.props.files const file = files[row] this.props.onOpenInExternalEditor(file.path) @@ -247,8 +246,6 @@ export class PullRequestFilesChanged extends React.Component<
    Showing changes from all commits
    - {this.renderLinesChanged()} -
    -
    +{changesetData.linesAdded}
    -
    -{changesetData.linesDeleted}
    -
    - ) - } - private renderFileList() { - const { changesetData, selectedFile, fileListWidth } = this.props + const { files, selectedFile, fileListWidth } = this.props return ( Date: Wed, 22 Oct 2025 18:59:54 -0500 Subject: [PATCH 0561/1338] Improve dialog dismissal and sign-in button state handling --- app/src/ui/dialog/dialog.tsx | 19 ++++++++++--------- app/src/ui/sign-in/sign-in.tsx | 7 +++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/ui/dialog/dialog.tsx b/app/src/ui/dialog/dialog.tsx index 48999d7258d..0eb89af0ada 100644 --- a/app/src/ui/dialog/dialog.tsx +++ b/app/src/ui/dialog/dialog.tsx @@ -657,16 +657,17 @@ export class Dialog extends React.Component { return } - // Ignore the first click right after the window's been focused. It could - // be the click that focused the window, in which case we don't wanna - // dismiss the dialog. - if (this.disableClickDismissal) { - this.disableClickDismissal = false - this.clearClickDismissalTimer() - return - } - if (!this.mouseEventIsInsideDialog(e)) { + // Ignore the first backdrop click right after the window's been focused. + // It could be the click that focused the window, in which case we don't + // want to dismiss the dialog. Only ignore backdrop clicks, not clicks on + // interactive elements like buttons. + if (this.disableClickDismissal) { + this.disableClickDismissal = false + this.clearClickDismissalTimer() + return + } + // The user has pressed down on their pointer device outside of the // dialog (i.e. on the backdrop). Now we subscribe to the global // mouse up event where we can make sure that they release the pointer diff --git a/app/src/ui/sign-in/sign-in.tsx b/app/src/ui/sign-in/sign-in.tsx index d9ab5d2d542..bd5de941cd2 100644 --- a/app/src/ui/sign-in/sign-in.tsx +++ b/app/src/ui/sign-in/sign-in.tsx @@ -143,7 +143,8 @@ export class SignIn extends React.Component { @@ -226,8 +227,6 @@ export class SignIn extends React.Component { return null } - const disabled = state.loading - const errors = state.error ? ( {state.error.message} ) : null @@ -241,7 +240,7 @@ export class SignIn extends React.Component { Date: Fri, 24 Oct 2025 09:22:04 -0500 Subject: [PATCH 0562/1338] Fix: Show whitespace hint on context menu in diff row When "Hide whitespace changes" is enabled, right-clicking on diff lines or hunk handles now properly shows the whitespace hint popover with the option to disable whitespace hiding, matching the existing left-click behavior. - Updated onContextMenuLineNumber to show whitespace hint when hideWhitespaceInDiff is true - Updated onContextMenuHunk to show whitespace hint when hideWhitespaceInDiff is true - Ensures consistent UX between left-click and right-click interactions --- app/src/ui/diff/side-by-side-diff-row.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/ui/diff/side-by-side-diff-row.tsx b/app/src/ui/diff/side-by-side-diff-row.tsx index 0677247b648..e8a9e3219ad 100644 --- a/app/src/ui/diff/side-by-side-diff-row.tsx +++ b/app/src/ui/diff/side-by-side-diff-row.tsx @@ -1019,6 +1019,10 @@ export class SideBySideDiffRow extends React.Component< private onContextMenuLineNumber = (evt: React.MouseEvent) => { if (this.props.hideWhitespaceInDiff) { + const column = this.getDiffColumn(evt.currentTarget) + if (column !== null) { + this.setState({ showWhitespaceHint: column }) + } return } @@ -1030,6 +1034,13 @@ export class SideBySideDiffRow extends React.Component< private onContextMenuHunk = () => { if (this.props.hideWhitespaceInDiff) { + const { row } = this.props + // Prefer left hand side popovers when clicking hunk except for when + // the left hand side doesn't have a gutter + const column = + row.type === DiffRowType.Added ? DiffColumn.After : DiffColumn.Before + + this.setState({ showWhitespaceHint: column }) return } From 443ca9288322634667eb4bf2c2c3565df2abde95 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Mon, 27 Oct 2025 15:20:06 +0100 Subject: [PATCH 0563/1338] Release 3.5.4-beta1 with new features and fixes Bump version to 3.5.4-beta1 and update changelog with new features, improvements, and bug fixes, including PR preview enhancements, commit message options, Copilot support for non-GitHub repos, and UI improvements. --- app/package.json | 2 +- changelog.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index fd64a2c1ea9..f492873dab0 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.3", + "version": "3.5.4-beta1", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 5cc06885a96..0884d7d6f2f 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,15 @@ { "releases": { + "3.5.4-beta1": [ + "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", + "[Added] Allow users to skip commit message override confirmation - #21025. Thanks @ilyassesalama!", + "[Added] Allow generating commits with Copilot in non-GitHub repositories - #20698. Thanks @schroedermarius!", + "[Fixed] Improve host discovery when using authenticating proxies - #19039 #19120", + "[Fixed] Fix diff search results highlights not visible on addition hunks - #21134", + "[Fixed] Add Copilot commit message generation to context menu - #21000. Thanks @zekariasasaminew!", + "[Fixed] Override system accent color for checkboxes and radio buttons - #21088", + "[Improved] Increased title bar height on macOS Tahoe - #21135. Thanks @berkcebi!" + ], "3.5.3": [ "[Added] Add Ptyxis shell integration - #20963. Thanks @logonoff!", "[Fixed] Copilot message generation in progress message is announced to screen readers - #21008", From 6c2f43f323a564ee41b636f540066ac847acaa2f Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 28 Oct 2025 15:54:54 +0100 Subject: [PATCH 0564/1338] Sync accountEmail state with preferredAccountEmail prop Updates the accountEmail state when the preferredAccountEmail prop changes and matches the previous state, ensuring the component reflects the latest preferred account email. --- app/src/ui/changes/commit-message-avatar.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/ui/changes/commit-message-avatar.tsx b/app/src/ui/changes/commit-message-avatar.tsx index 65824c195ee..9a785962096 100644 --- a/app/src/ui/changes/commit-message-avatar.tsx +++ b/app/src/ui/changes/commit-message-avatar.tsx @@ -123,6 +123,13 @@ export class CommitMessageAvatar extends React.Component< ) { this.determineGitConfigLocation() } + + if ( + this.props.preferredAccountEmail !== prevProps.preferredAccountEmail && + this.state.accountEmail === prevProps.preferredAccountEmail + ) { + this.setState({ accountEmail: this.props.preferredAccountEmail }) + } } private async determineGitConfigLocation() { From 65efca80383868631092e9836e171933602a9648 Mon Sep 17 00:00:00 2001 From: zeki <153834382+zekariasasaminew@users.noreply.github.com> Date: Wed, 29 Oct 2025 15:06:54 -0500 Subject: [PATCH 0565/1338] Fix: menu bar flickering when profile modal is open by adding capture phase click listener --- app/src/ui/changes/commit-message-avatar.tsx | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/src/ui/changes/commit-message-avatar.tsx b/app/src/ui/changes/commit-message-avatar.tsx index 9a785962096..60f00f65da4 100644 --- a/app/src/ui/changes/commit-message-avatar.tsx +++ b/app/src/ui/changes/commit-message-avatar.tsx @@ -104,6 +104,7 @@ export class CommitMessageAvatar extends React.Component< > { private avatarButtonRef: HTMLButtonElement | null = null private warningBadgeRef = React.createRef() + private documentClickListener: (event: MouseEvent) => void public constructor(props: ICommitMessageAvatarProps) { super(props) @@ -114,6 +115,31 @@ export class CommitMessageAvatar extends React.Component< isGitConfigLocal: false, } this.determineGitConfigLocation() + + // Create the document click listener + this.documentClickListener = (event: MouseEvent) => { + if (this.state.isPopoverOpen && event.target instanceof Element) { + // Check if click is on app menu bar or its descendants + const appMenuBar = document.getElementById('app-menu-bar') + if ( + appMenuBar && + (appMenuBar.contains(event.target) || appMenuBar === event.target) + ) { + // Close popover when clicking on app menu + this.closePopover() + } + } + } + } + + public componentDidMount() { + // Add global click listener to detect app menu clicks + document.addEventListener('click', this.documentClickListener, true) // Use capture phase + } + + public componentWillUnmount() { + // Remove global click listener + document.removeEventListener('click', this.documentClickListener, true) } public componentDidUpdate(prevProps: ICommitMessageAvatarProps) { From 47ba2217f5cc0d0dd9865d37ea4dc7a241b1c938 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 30 Oct 2025 11:48:47 +0100 Subject: [PATCH 0566/1338] Add test for initializing uninitialized submodules on checkout Introduces a helper to set up a repository with an uninitialized submodule and adds a unit test to verify that checking out a branch with such a submodule correctly initializes it. This ensures proper handling of submodules that have not been initialized when switching branches. --- app/test/helpers/repositories.ts | 48 ++++++++++++++++++++++++++++++ app/test/unit/git/checkout-test.ts | 45 ++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/app/test/helpers/repositories.ts b/app/test/helpers/repositories.ts index 699d979d73b..daf118a27f9 100644 --- a/app/test/helpers/repositories.ts +++ b/app/test/helpers/repositories.ts @@ -298,3 +298,51 @@ export async function setupLocalForkOfRepository( await git(['clone', '--local', `${upstream.path}`, path], path, 'clone') return new Repository(path, -1, null, false) } + +/** + * Setup a repository with an uninitialized submodule in a branch + * + * @returns the new local repository + * + * The repository will have: + * - Two commits on the main branch + * - A branch named 'branch-with-submodule' with a submodule added + * - The submodule is uninitialized (its .git/modules entry is removed) + * + * This simulates a scenario where a submodule exists in a branch but + * hasn't been initialized yet when checking out that branch. + */ +export async function setupRepositoryWithUninitializedSubmodule( + t: TestContext +): Promise { + const repo = await setupTwoCommitRepo(t) + + // Create a submodule repository + const submoduleRepo = await setupTwoCommitRepo(t) + + // Create a new branch and add the submodule + await exec(['checkout', '-b', 'branch-with-submodule'], repo.path) + + await exec( + [ + '-c', + 'protocol.file.allow=always', + 'submodule', + 'add', + submoduleRepo.path, + 'test-submodule', + ], + repo.path + ) + await exec(['commit', '-m', 'Add submodule'], repo.path) + + // Go back to main branch + await exec(['checkout', 'master'], repo.path) + + // Remove the .git/modules directory for the submodule to make it uninitialized + const modulesPath = Path.join(repo.path, '.git', 'modules', 'test-submodule') + await FSE.remove(modulesPath) + await FSE.remove(Path.join(repo.path, 'test-submodule')) + + return repo +} diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index d507958de2a..b25a3a79224 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -1,9 +1,12 @@ import { describe, it } from 'node:test' import assert from 'node:assert' +import * as Path from 'path' +import * as FSE from 'fs-extra' import { shell } from '../../helpers/test-app-shell' import { setupEmptyRepository, setupFixtureRepository, + setupRepositoryWithUninitializedSubmodule, } from '../../helpers/repositories' import { Repository } from '../../../src/models/repository' @@ -167,5 +170,47 @@ describe('git/checkout', () => { const status = await getStatusOrThrow(repository) assert.equal(status.workingDirectory.files.length, 0) }) + + it('initializes an uninitialized submodule when checking out a branch', async t => { + const repository = await setupRepositoryWithUninitializedSubmodule(t) + + const branches = await getBranches(repository) + const branchWithSubmodule = branches.find(b => b.name !== 'master') + + if (branchWithSubmodule == null) { + throw new Error(`Could not find branch other than 'master'`) + } + + await checkoutBranch(repository, branchWithSubmodule, null) + + // Verify we're on the correct branch + const statusOutput = await exec(['status'], repository.path) + assert.ok( + statusOutput.stdout.includes(`On branch ${branchWithSubmodule.name}`) + ) + + // Verify the submodule is initialized and has the correct commits + const submodulePath = Path.join(repository.path, 'test-submodule') + const submoduleGitPath = Path.join(submodulePath, '.git') + + // Check that submodule .git exists (either as file or directory) + const submoduleGitExists = await FSE.pathExists(submoduleGitPath) + assert.equal( + submoduleGitExists, + true, + 'Submodule .git should exist after checkout' + ) + + // Verify submodule has two commits + const submoduleLog = await exec(['log', '--oneline'], submodulePath) + assert.equal(submoduleLog.stdout.split('\n').length, 2) + + // Verify submodule is in branch 'master' + const submoduleStatus = await exec(['status'], submodulePath) + assert.ok( + submoduleStatus.stdout.includes('On branch master'), + 'Submodule should be on branch master after checkout' + ) + }) }) }) From b0e3a9667f475c7eb75fb4c4153bb34340a1037c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 30 Oct 2025 14:17:06 +0100 Subject: [PATCH 0567/1338] (WIP) Use `git submodule update --init --recursive` instead of `--recurse-submodule` --- app/src/lib/git/checkout.ts | 121 +++++++++++++++++++++++++++-- app/test/unit/git/checkout-test.ts | 17 ++-- 2 files changed, 124 insertions(+), 14 deletions(-) diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index 7a026ccd80e..b7ce70231c9 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -5,6 +5,8 @@ import { ICheckoutProgress } from '../../models/progress' import { CheckoutProgressParser, executionOptionsWithProgress, + GitProgressParser, + IProgressStep, } from '../progress' import { AuthenticationErrors } from './authentication' import { enableRecurseSubmodulesFlag } from '../feature-flag' @@ -17,6 +19,19 @@ import { ManualConflictResolution } from '../../models/manual-conflict-resolutio import { CommitOneLine, shortenSHA } from '../../models/commit' import { IRemote } from '../../models/remote' +/** + * A progress parser that handles both checkout and submodule update steps. + */ +class CheckoutWithSubmodulesProgressParser extends GitProgressParser { + public constructor() { + const steps: ReadonlyArray = [ + { title: 'Checking out files', weight: 0.5 }, + { title: 'Updating files', weight: 0.5 }, + ] + super(steps) + } +} + export type ProgressCallback = (progress: ICheckoutProgress) => void function getCheckoutArgs(progressCallback?: ProgressCallback) { @@ -29,7 +44,6 @@ async function getBranchCheckoutArgs(branch: Branch) { ...(branch.type === BranchType.Remote ? ['-b', branch.nameWithoutRemote] : []), - ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []), '--', ] } @@ -84,6 +98,79 @@ async function getCheckoutOpts( ) } +/** + * Update submodules after a checkout operation. + * + * @param repository - The repository in which to update submodules + * @param title - The title to use for progress reporting + * @param target - The target branch/commit being checked out + * @param currentRemote - The current remote for environment setup + * @param progressCallback - An optional function which will be invoked + * with information about the current progress + * of the submodule update operation. + */ +async function updateSubmodulesAfterCheckout( + repository: Repository, + title: string, + target: string, + currentRemote: IRemote | null, + progressCallback: ProgressCallback | undefined, + allowFileProtocol: boolean +): Promise { + if (!enableRecurseSubmodulesFlag()) { + return + } + + const opts: IGitStringExecutionOptions = { + env: await envForRemoteOperation( + getFallbackUrlForProxyResolve(repository, currentRemote) + ), + expectedErrors: AuthenticationErrors, + } + + const args = [ + ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []), + 'submodule', + 'update', + '--init', + '--recursive', + ] + + if (!progressCallback) { + await git(args, repository.path, 'updateSubmodules', opts) + return + } + + const kind = 'checkout' + + const progressOpts = await executionOptionsWithProgress( + { ...opts, trackLFSProgress: true }, + new CheckoutWithSubmodulesProgressParser(), + progress => { + if (progress.kind === 'progress') { + const description = progress.details.text + // Scale progress from 50% to 100% (second half of checkout operation) + const value = 0.5 + progress.percent * 0.5 + + progressCallback({ + kind, + title, + description, + value, + target, + }) + } + } + ) + + await git( + [...args, '--progress'], + repository.path, + 'updateSubmodules', + progressOpts + ) +} + /** * Check out the given branch. * @@ -102,11 +189,13 @@ export async function checkoutBranch( repository: Repository, branch: Branch, currentRemote: IRemote | null, - progressCallback?: ProgressCallback + progressCallback?: ProgressCallback, + allowFileProtocol: boolean = false ): Promise { + const title = `Checking out branch ${branch.name}` const opts = await getCheckoutOpts( repository, - `Checking out branch ${branch.name}`, + title, branch.name, currentRemote, progressCallback, @@ -118,6 +207,16 @@ export async function checkoutBranch( await git(args, repository.path, 'checkoutBranch', opts) + // Update submodules after checkout + await updateSubmodulesAfterCheckout( + repository, + title, + branch.name, + currentRemote, + progressCallback, + allowFileProtocol + ) + // we return `true` here so `GitStore.performFailableGitOperation` // will return _something_ differentiable from `undefined` if this succeeds return true @@ -142,13 +241,15 @@ export async function checkoutCommit( repository: Repository, commit: CommitOneLine, currentRemote: IRemote | null, - progressCallback?: ProgressCallback + progressCallback?: ProgressCallback, + allowFileProtocol: boolean = false ): Promise { const title = `Checking out ${__DARWIN__ ? 'Commit' : 'commit'}` + const target = shortenSHA(commit.sha) const opts = await getCheckoutOpts( repository, title, - shortenSHA(commit.sha), + target, currentRemote, progressCallback ) @@ -158,6 +259,16 @@ export async function checkoutCommit( await git(args, repository.path, 'checkoutCommit', opts) + // Update submodules after checkout + await updateSubmodulesAfterCheckout( + repository, + title, + target, + currentRemote, + progressCallback, + allowFileProtocol + ) + // we return `true` here so `GitStore.performFailableGitOperation` // will return _something_ differentiable from `undefined` if this succeeds return true diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index b25a3a79224..f34c3ff551d 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -181,7 +181,13 @@ describe('git/checkout', () => { throw new Error(`Could not find branch other than 'master'`) } - await checkoutBranch(repository, branchWithSubmodule, null) + await checkoutBranch( + repository, + branchWithSubmodule, + null, + undefined, + true + ) // Verify we're on the correct branch const statusOutput = await exec(['status'], repository.path) @@ -203,14 +209,7 @@ describe('git/checkout', () => { // Verify submodule has two commits const submoduleLog = await exec(['log', '--oneline'], submodulePath) - assert.equal(submoduleLog.stdout.split('\n').length, 2) - - // Verify submodule is in branch 'master' - const submoduleStatus = await exec(['status'], submodulePath) - assert.ok( - submoduleStatus.stdout.includes('On branch master'), - 'Submodule should be on branch master after checkout' - ) + assert.equal(submoduleLog.stdout.trim().split('\n').length, 2) }) }) }) From 399baac6c1edf67f1e4098d50cb06bd2275ef37b Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 30 Oct 2025 16:00:36 +0100 Subject: [PATCH 0568/1338] Refactor checkout progress and submodule update handling Replaces CheckoutWithSubmodulesProgressParser with a more flexible IGitProgressParser interface and updates submodule progress reporting logic. Adjusts progress value scaling for submodule updates in branch and commit checkout functions to improve accuracy and user feedback. Cleans up parser usage in progress-related modules for consistency. Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com> --- app/src/lib/git/checkout.ts | 112 ++++++++++++++++++--------- app/src/lib/progress/from-process.ts | 6 +- app/src/lib/progress/git.ts | 20 ++++- 3 files changed, 97 insertions(+), 41 deletions(-) diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index b7ce70231c9..2a861a61ec2 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -5,8 +5,7 @@ import { ICheckoutProgress } from '../../models/progress' import { CheckoutProgressParser, executionOptionsWithProgress, - GitProgressParser, - IProgressStep, + IGitOutput, } from '../progress' import { AuthenticationErrors } from './authentication' import { enableRecurseSubmodulesFlag } from '../feature-flag' @@ -19,21 +18,10 @@ import { ManualConflictResolution } from '../../models/manual-conflict-resolutio import { CommitOneLine, shortenSHA } from '../../models/commit' import { IRemote } from '../../models/remote' -/** - * A progress parser that handles both checkout and submodule update steps. - */ -class CheckoutWithSubmodulesProgressParser extends GitProgressParser { - public constructor() { - const steps: ReadonlyArray = [ - { title: 'Checking out files', weight: 0.5 }, - { title: 'Updating files', weight: 0.5 }, - ] - super(steps) - } -} - export type ProgressCallback = (progress: ICheckoutProgress) => void +const SubmoduleUpdateStepWeight = 0.1 + function getCheckoutArgs(progressCallback?: ProgressCallback) { return ['checkout', ...(progressCallback ? ['--progress'] : [])] } @@ -141,34 +129,54 @@ async function updateSubmodulesAfterCheckout( return } + // Initial progress + progressCallback({ + kind: 'checkout', + title, + description: 'Updating submodules', + value: 0, + target, + }) + const kind = 'checkout' const progressOpts = await executionOptionsWithProgress( { ...opts, trackLFSProgress: true }, - new CheckoutWithSubmodulesProgressParser(), + { + parse(line: string): IGitOutput { + return { + kind: 'context', + text: `Updating submodules: ${line}`, + percent: 0.5, + } + }, + }, progress => { - if (progress.kind === 'progress') { - const description = progress.details.text - // Scale progress from 50% to 100% (second half of checkout operation) - const value = 0.5 + progress.percent * 0.5 + const description = + progress.kind === 'progress' ? progress.details.text : progress.text - progressCallback({ - kind, - title, - description, - value, - target, - }) - } + const value = progress.percent + + progressCallback({ + kind, + title, + description, + value, + target, + }) } ) - await git( - [...args, '--progress'], - repository.path, - 'updateSubmodules', - progressOpts - ) + await git(args, repository.path, 'updateSubmodules', progressOpts) + + // Final progress + progressCallback({ + kind, + title, + description: 'Submodules updated', + value: 1, + target, + }) } /** @@ -198,7 +206,13 @@ export async function checkoutBranch( title, branch.name, currentRemote, - progressCallback, + progressCallback + ? progress => + progressCallback({ + ...progress, + value: progress.value * (1 - SubmoduleUpdateStepWeight), + }) + : undefined, `Switching to ${__DARWIN__ ? 'Branch' : 'branch'}` ) @@ -213,7 +227,16 @@ export async function checkoutBranch( title, branch.name, currentRemote, - progressCallback, + progressCallback + ? progress => + progressCallback({ + ...progress, + value: + 1 - + SubmoduleUpdateStepWeight + + progress.value * SubmoduleUpdateStepWeight, + }) + : undefined, allowFileProtocol ) @@ -252,6 +275,12 @@ export async function checkoutCommit( target, currentRemote, progressCallback + ? progress => + progressCallback({ + ...progress, + value: progress.value * (1 - SubmoduleUpdateStepWeight), + }) + : undefined ) const baseArgs = getCheckoutArgs(progressCallback) @@ -265,7 +294,16 @@ export async function checkoutCommit( title, target, currentRemote, - progressCallback, + progressCallback + ? progress => + progressCallback({ + ...progress, + value: + 1 - + SubmoduleUpdateStepWeight + + progress.value * SubmoduleUpdateStepWeight, + }) + : undefined, allowFileProtocol ) diff --git a/app/src/lib/progress/from-process.ts b/app/src/lib/progress/from-process.ts index 4c19dc8284e..675379c611d 100644 --- a/app/src/lib/progress/from-process.ts +++ b/app/src/lib/progress/from-process.ts @@ -3,7 +3,7 @@ import * as Fs from 'fs' import * as Path from 'path' import byline from 'byline' -import { GitProgressParser, IGitProgress, IGitOutput } from './git' +import { IGitProgress, IGitOutput, IGitProgressParser } from './git' import { IGitExecutionOptions } from '../git/core' import { merge } from '../merge' import { GitLFSProgressParser, createLFSProgressFile } from './lfs' @@ -20,7 +20,7 @@ export async function executionOptionsWithProgress< T extends IGitExecutionOptions >( options: T, - parser: GitProgressParser, + parser: IGitProgressParser, progressCallback: (progress: IGitProgress | IGitOutput) => void ): Promise { let lfsProgressPath = null @@ -51,7 +51,7 @@ export async function executionOptionsWithProgress< * process and parsing its contents using the provided parser. */ function createProgressProcessCallback( - parser: GitProgressParser, + parser: IGitProgressParser, lfsProgressPath: string | null, progressCallback: (progress: IGitProgress | IGitOutput) => void ): (process: ChildProcess) => void { diff --git a/app/src/lib/progress/git.ts b/app/src/lib/progress/git.ts index 3fe10246491..a27a0e51466 100644 --- a/app/src/lib/progress/git.ts +++ b/app/src/lib/progress/git.ts @@ -137,6 +137,24 @@ export interface IGitProgressInfo { readonly text: string } +/** + * Interface for classes interpreting progress output from `git` + * and turning that into a percentage value estimating the overall progress + * of the an operation. An operation could be something like `git fetch` + * which contains multiple steps, each individually reported by Git as + * progress events between 0 and 100%. + */ +export interface IGitProgressParser { + /** + * Parse the given line of output from Git, returns either an `IGitProgress` + * instance if the line could successfully be parsed as a Git progress + * event whose title was registered with this parser or an `IGitOutput` + * instance if the line couldn't be parsed or if the title wasn't + * registered with the parser. + */ + parse(line: string): IGitProgress | IGitOutput +} + /** * A utility class for interpreting progress output from `git` * and turning that into a percentage value estimating the overall progress @@ -147,7 +165,7 @@ export interface IGitProgressInfo { * A parser cannot be reused, it's mean to parse a single stderr stream * for Git. */ -export class GitProgressParser { +export class GitProgressParser implements IGitProgressParser { private readonly steps: ReadonlyArray /* The provided steps should always occur in order but some From 2438c6e99e547140dfc9f03d561ae23d7c040645 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 30 Oct 2025 16:11:10 +0100 Subject: [PATCH 0569/1338] Refactor progress calculation in checkout operations Introduced clampProgress helper to standardize progress value scaling during branch and commit checkout. Replaced manual progress calculations with clampProgress for improved readability and maintainability. Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com> --- app/src/lib/git/checkout.ts | 44 ++++++++++++++----------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index 2a861a61ec2..910f2aa23ae 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -20,7 +20,19 @@ import { IRemote } from '../../models/remote' export type ProgressCallback = (progress: ICheckoutProgress) => void -const SubmoduleUpdateStepWeight = 0.1 +const CheckoutStepWeight = 0.9 + +function clampProgress( + minimum: number, + maximum: number, + progressCallback: ProgressCallback +): ProgressCallback { + return (progress: ICheckoutProgress) => + progressCallback({ + ...progress, + value: minimum + progress.value * (maximum - minimum), + }) +} function getCheckoutArgs(progressCallback?: ProgressCallback) { return ['checkout', ...(progressCallback ? ['--progress'] : [])] @@ -207,11 +219,7 @@ export async function checkoutBranch( branch.name, currentRemote, progressCallback - ? progress => - progressCallback({ - ...progress, - value: progress.value * (1 - SubmoduleUpdateStepWeight), - }) + ? clampProgress(0, CheckoutStepWeight, progressCallback) : undefined, `Switching to ${__DARWIN__ ? 'Branch' : 'branch'}` ) @@ -228,14 +236,7 @@ export async function checkoutBranch( branch.name, currentRemote, progressCallback - ? progress => - progressCallback({ - ...progress, - value: - 1 - - SubmoduleUpdateStepWeight + - progress.value * SubmoduleUpdateStepWeight, - }) + ? clampProgress(CheckoutStepWeight, 1, progressCallback) : undefined, allowFileProtocol ) @@ -275,11 +276,7 @@ export async function checkoutCommit( target, currentRemote, progressCallback - ? progress => - progressCallback({ - ...progress, - value: progress.value * (1 - SubmoduleUpdateStepWeight), - }) + ? clampProgress(0, CheckoutStepWeight, progressCallback) : undefined ) @@ -295,14 +292,7 @@ export async function checkoutCommit( target, currentRemote, progressCallback - ? progress => - progressCallback({ - ...progress, - value: - 1 - - SubmoduleUpdateStepWeight + - progress.value * SubmoduleUpdateStepWeight, - }) + ? clampProgress(CheckoutStepWeight, 1, progressCallback) : undefined, allowFileProtocol ) From f5d2436a6effff86c60db456b85a6b63ae5248ed Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Thu, 30 Oct 2025 16:33:52 +0100 Subject: [PATCH 0570/1338] Improve submodule progress calculation in checkout Progress reporting for submodule updates during checkout now uses an exponential function based on detected submodule events, providing a more realistic and gradual progress indication when the number of submodules is unknown. Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com> --- app/src/lib/git/checkout.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index 910f2aa23ae..b4a8888e39e 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -152,14 +152,28 @@ async function updateSubmodulesAfterCheckout( const kind = 'checkout' + let submoduleEventCount = 0 + const progressOpts = await executionOptionsWithProgress( { ...opts, trackLFSProgress: true }, { parse(line: string): IGitOutput { + if ( + line.match(/^Submodule path (.)+?: checked out /) || + line.startsWith('Cloning into ') + ) { + submoduleEventCount += 1 + } + return { kind: 'context', text: `Updating submodules: ${line}`, - percent: 0.5, + // Math taken from https://math.stackexchange.com/a/2323106 + // We do this to fake a progress that slows down as we process more + // events, as we don't know how many submodules there are upfront, or + // what does git have to do with them (cloning, just checking them + // out...) + percent: 1 - Math.exp(-submoduleEventCount * 0.25), } }, }, From c9580742602606020ef37c3cf6929af08066b954 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 30 Oct 2025 13:23:22 -0400 Subject: [PATCH 0571/1338] Update pull request badge styling Changed the background to none and added a border for .pr-badge in both open and closed dropdown states. Increased badge height from 18px to 22px for improved visibility. --- app/styles/ui/_pull-request-badge.scss | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/styles/ui/_pull-request-badge.scss b/app/styles/ui/_pull-request-badge.scss index ac755898081..328c0ab26a8 100644 --- a/app/styles/ui/_pull-request-badge.scss +++ b/app/styles/ui/_pull-request-badge.scss @@ -1,13 +1,14 @@ -.toolbar-dropdown.open .pr-badge { - background: var(--toolbar-badge-active-background-color); -} +.toolbar-dropdown .pr-badge { + border: 1px solid var(--toolbar-badge-background-color); + background: var(--toolbar-background-color); -.toolbar-dropdown:not(.open) .pr-badge { - background: var(--toolbar-badge-background-color); + &:hover { + background-color: var(--toolbar-button-hover-background-color); + } } .pr-badge { - --height: 18px; + --height: 22px; display: flex; flex-direction: row; From bd5e1eb2d577afb0c8d4c4f16c66dbccec0e5456 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 30 Oct 2025 13:43:48 -0400 Subject: [PATCH 0572/1338] Update _pull-request-badge.scss --- app/styles/ui/_pull-request-badge.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/ui/_pull-request-badge.scss b/app/styles/ui/_pull-request-badge.scss index 328c0ab26a8..c4fe225ec55 100644 --- a/app/styles/ui/_pull-request-badge.scss +++ b/app/styles/ui/_pull-request-badge.scss @@ -7,6 +7,10 @@ } } +.toolbar-dropdown.open .pr-badge { + background: none; +} + .pr-badge { --height: 22px; From b16b6ca737e248a006a692a9e4a0d2120b773659 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 30 Oct 2025 13:55:57 -0400 Subject: [PATCH 0573/1338] Add status tooltip to CI check run list items Introduces a 'hasStatusTooltip' prop to CI check run list components, enabling tooltips that display the check run conclusion adjective. Updates related components to support and utilize this new prop for improved status visibility. --- app/src/ui/check-runs/ci-check-run-list-item.tsx | 15 +++++++++++++-- app/src/ui/check-runs/ci-check-run-list.tsx | 4 ++++ .../ui/check-runs/ci-check-run-rerun-dialog.tsx | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/ui/check-runs/ci-check-run-list-item.tsx b/app/src/ui/check-runs/ci-check-run-list-item.tsx index 791df662f91..aec26d224cf 100644 --- a/app/src/ui/check-runs/ci-check-run-list-item.tsx +++ b/app/src/ui/check-runs/ci-check-run-list-item.tsx @@ -1,5 +1,8 @@ import * as React from 'react' -import { IRefCheck } from '../../lib/ci-checks/ci-checks' +import { + getCheckRunConclusionAdjective, + IRefCheck, +} from '../../lib/ci-checks/ci-checks' import { Octicon } from '../octicons' import { getClassNameForCheck, getSymbolForCheck } from '../branches/ci-status' import classNames from 'classnames' @@ -39,6 +42,9 @@ interface ICICheckRunListItemProps { **/ readonly isHeader?: false + /** Whether the check run status has a tooltip */ + readonly hasStatusTooltip?: boolean + /** Callback for when a check run is clicked */ readonly onCheckRunExpansionToggleClick: (checkRun: IRefCheck) => void @@ -78,7 +84,7 @@ export class CICheckRunListItem extends React.PureComponent { - const { checkRun } = this.props + const { checkRun, hasStatusTooltip } = this.props return (
    @@ -88,6 +94,11 @@ export class CICheckRunListItem extends React.PureComponent
    ) diff --git a/app/src/ui/check-runs/ci-check-run-list.tsx b/app/src/ui/check-runs/ci-check-run-list.tsx index 2e9d7657ecb..33c2450b353 100644 --- a/app/src/ui/check-runs/ci-check-run-list.tsx +++ b/app/src/ui/check-runs/ci-check-run-list.tsx @@ -23,6 +23,9 @@ interface ICICheckRunListProps { /** Showing a condensed view */ readonly isCondensedView?: boolean + /** Whether the check run status has a tooltip */ + readonly hasStatusTooltip?: boolean + /** Callback to opens check runs target url (maybe GitHub, maybe third party) */ readonly onViewCheckDetails?: (checkRun: IRefCheck) => void @@ -167,6 +170,7 @@ export class CICheckRunList extends React.PureComponent< onRerunJob={this.props.onRerunJob} isCondensedView={this.props.isCondensedView} isHeader={false} + hasStatusTooltip={this.props.hasStatusTooltip} /> ) }) diff --git a/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx b/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx index 31b5459110a..7aa9b4fc333 100644 --- a/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx +++ b/app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx @@ -142,6 +142,7 @@ export class CICheckRunRerunDialog extends React.Component< checkRuns={this.state.rerunnable} notExpandable={true} isCondensedView={true} + hasStatusTooltip={true} />
    ) From 625ed5eaef99babaa5dc912408f8c974ac77f1ea Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 30 Oct 2025 14:22:32 -0400 Subject: [PATCH 0574/1338] Replace external link button with LinkButton in test notifications Refactored TestNotificationItemRowContent to use LinkButton instead of a custom Button for external links, improving accessibility and consistency. Added linkButtonDescription prop for better context, and updated styles to inherit color for the link button. --- .../test-notifications/test-notifications.tsx | 26 +++++++++---------- .../ui/dialogs/_test-notifications.scss | 4 +++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/ui/test-notifications/test-notifications.tsx b/app/src/ui/test-notifications/test-notifications.tsx index c4eaa82797c..a38f18ed231 100644 --- a/app/src/ui/test-notifications/test-notifications.tsx +++ b/app/src/ui/test-notifications/test-notifications.tsx @@ -121,9 +121,11 @@ class TestNotificationItemRowContent extends React.Component<{ readonly leftAccessory?: JSX.Element readonly html_url?: string readonly dispatcher: Dispatcher + readonly linkButtonDescription: string }> { public render() { - const { leftAccessory, html_url, children } = this.props + const { leftAccessory, html_url, children, linkButtonDescription } = + this.props return (
    @@ -131,25 +133,18 @@ class TestNotificationItemRowContent extends React.Component<{
    {children}
    {html_url && (
    - +
    )}
    ) } - - private onExternalLinkClick = (e: React.MouseEvent) => { - const { dispatcher, html_url } = this.props - - if (html_url === undefined) { - return - } - - e.stopPropagation() - dispatcher.openInBrowser(html_url) - } } export class TestNotifications extends React.Component< @@ -657,6 +652,7 @@ export class TestNotifications extends React.Component< {comment.body} @@ -673,6 +669,7 @@ export class TestNotifications extends React.Component< {review.body || Review without body} @@ -703,6 +700,7 @@ export class TestNotifications extends React.Component< diff --git a/app/styles/ui/dialogs/_test-notifications.scss b/app/styles/ui/dialogs/_test-notifications.scss index 00cb1cfa012..e97aeaefaa4 100644 --- a/app/styles/ui/dialogs/_test-notifications.scss +++ b/app/styles/ui/dialogs/_test-notifications.scss @@ -72,4 +72,8 @@ .pr-draft-icon { color: var(--pr-draft-icon-color); } + + .link-button-component { + color: inherit; + } } From c91ddd2c8600f394334beba500766c32cc4c4f63 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Thu, 30 Oct 2025 14:26:25 -0400 Subject: [PATCH 0575/1338] Update _test-notifications.scss --- app/styles/ui/dialogs/_test-notifications.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/ui/dialogs/_test-notifications.scss b/app/styles/ui/dialogs/_test-notifications.scss index e97aeaefaa4..d4924fbc101 100644 --- a/app/styles/ui/dialogs/_test-notifications.scss +++ b/app/styles/ui/dialogs/_test-notifications.scss @@ -74,6 +74,6 @@ } .link-button-component { - color: inherit; + color: inherit; } } From 299eedd316c6f70f9f590cb4fdff89b0c357fb43 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Fri, 31 Oct 2025 08:34:59 -0400 Subject: [PATCH 0576/1338] Restore focus to parent menu pane on submenu close Adds refs to menu pane elements to restore focus to the parent pane when navigating back from a submenu with the left arrow key. This prevents the menu bar from detecting focus loss and closing the entire menu unexpectedly. --- app/src/ui/app-menu/app-menu.tsx | 18 ++++++++++++++++++ app/src/ui/app-menu/menu-pane.tsx | 8 ++++++++ 2 files changed, 26 insertions(+) diff --git a/app/src/ui/app-menu/app-menu.tsx b/app/src/ui/app-menu/app-menu.tsx index 5c91db04296..b51841463b4 100644 --- a/app/src/ui/app-menu/app-menu.tsx +++ b/app/src/ui/app-menu/app-menu.tsx @@ -77,6 +77,12 @@ export class AppMenu extends React.Component { */ private expandCollapseTimer: number | null = null + /** + * Refs to the menu pane elements, indexed by depth. Used to restore + * focus when navigating back from a submenu with the left arrow key. + */ + private menuPaneRefs: Map = new Map() + private onItemClicked = ( depth: number, item: MenuItem, @@ -127,6 +133,13 @@ export class AppMenu extends React.Component { menu.withClosedMenu(this.props.state[depth]) ) + // Restore focus to the parent menu pane to prevent the menu bar + // from detecting focus loss and closing the entire menu + const parentPane = this.menuPaneRefs.get(depth - 1) + if (parentPane) { + parentPane.focus() + } + event.preventDefault() } } else if (event.key === 'ArrowRight') { @@ -211,6 +224,10 @@ export class AppMenu extends React.Component { } } + private onMenuPaneRef = (depth: number, element: HTMLDivElement | null) => { + this.menuPaneRefs.set(depth, element) + } + private renderMenuPane(depth: number, menu: IMenu): JSX.Element { // If the menu doesn't have an id it's the root menu const key = menu.id || '@' @@ -230,6 +247,7 @@ export class AppMenu extends React.Component { enableAccessKeyNavigation={this.props.enableAccessKeyNavigation} onClearSelection={this.onClearSelection} ariaLabelledby={this.props.ariaLabelledby} + onRef={this.onMenuPaneRef} /> ) } diff --git a/app/src/ui/app-menu/menu-pane.tsx b/app/src/ui/app-menu/menu-pane.tsx index 5c3397b912f..154855c9b14 100644 --- a/app/src/ui/app-menu/menu-pane.tsx +++ b/app/src/ui/app-menu/menu-pane.tsx @@ -98,9 +98,16 @@ interface IMenuPaneProps { readonly allowFirstCharacterNavigation?: boolean readonly renderLabel?: (item: MenuItem) => JSX.Element | undefined + + /** Optional callback for capturing a ref to the menu pane element */ + readonly onRef?: (depth: number, element: HTMLDivElement | null) => void } export class MenuPane extends React.Component { + private onMenuPaneRef = (element: HTMLDivElement | null) => { + this.props.onRef?.(this.props.depth, element) + } + private onRowClick = ( item: MenuItem, event: React.MouseEvent @@ -258,6 +265,7 @@ export class MenuPane extends React.Component { */ // eslint-disable-next-line jsx-a11y/no-static-element-interactions
    Date: Fri, 31 Oct 2025 14:13:28 +0100 Subject: [PATCH 0577/1338] Remove feature flag for recurse submodules Eliminated the enableRecurseSubmodulesFlag feature flag and updated fetch and pull operations to always use the --recurse-submodules option. This simplifies submodule handling and removes unnecessary conditional logic. --- app/src/lib/feature-flag.ts | 5 ----- app/src/lib/git/checkout.ts | 5 ----- app/src/lib/git/fetch.ts | 5 +---- app/src/lib/git/pull.ts | 3 +-- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index d249d067484..bce5002ade3 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -41,11 +41,6 @@ function enableBetaFeatures(): boolean { export const enableTestMenuItems = () => enableDevelopmentFeatures() || __RELEASE_CHANNEL__ === 'test' -/** Should git pass `--recurse-submodules` when performing operations? */ -export function enableRecurseSubmodulesFlag(): boolean { - return true -} - export function enableReadmeOverwriteWarning(): boolean { return enableBetaFeatures() } diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index b4a8888e39e..3cd2ff2d999 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -8,7 +8,6 @@ import { IGitOutput, } from '../progress' import { AuthenticationErrors } from './authentication' -import { enableRecurseSubmodulesFlag } from '../feature-flag' import { envForRemoteOperation, getFallbackUrlForProxyResolve, @@ -117,10 +116,6 @@ async function updateSubmodulesAfterCheckout( progressCallback: ProgressCallback | undefined, allowFileProtocol: boolean ): Promise { - if (!enableRecurseSubmodulesFlag()) { - return - } - const opts: IGitStringExecutionOptions = { env: await envForRemoteOperation( getFallbackUrlForProxyResolve(repository, currentRemote) diff --git a/app/src/lib/git/fetch.ts b/app/src/lib/git/fetch.ts index 408b29015a3..dc131ed6146 100644 --- a/app/src/lib/git/fetch.ts +++ b/app/src/lib/git/fetch.ts @@ -2,7 +2,6 @@ import { git, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' import { IFetchProgress } from '../../models/progress' import { FetchProgressParser, executionOptionsWithProgress } from '../progress' -import { enableRecurseSubmodulesFlag } from '../feature-flag' import { IRemote } from '../../models/remote' import { ITrackingBranch } from '../../models/branch' import { envForRemoteOperation } from './environment' @@ -15,9 +14,7 @@ async function getFetchArgs( 'fetch', ...(progressCallback ? ['--progress'] : []), '--prune', - ...(enableRecurseSubmodulesFlag() - ? ['--recurse-submodules=on-demand'] - : []), + '--recurse-submodules=on-demand', remote, ] } diff --git a/app/src/lib/git/pull.ts b/app/src/lib/git/pull.ts index 3be7ab34ec2..d71dbf3d03d 100644 --- a/app/src/lib/git/pull.ts +++ b/app/src/lib/git/pull.ts @@ -2,7 +2,6 @@ import { git, gitRebaseArguments, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' import { IPullProgress } from '../../models/progress' import { PullProgressParser, executionOptionsWithProgress } from '../progress' -import { enableRecurseSubmodulesFlag } from '../feature-flag' import { IRemote } from '../../models/remote' import { envForRemoteOperation } from './environment' import { getConfigValue } from './config' @@ -16,7 +15,7 @@ async function getPullArgs( ...gitRebaseArguments(), 'pull', ...(await getDefaultPullDivergentBranchArguments(repository)), - ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []), + '--recurse-submodules', ...(progressCallback ? ['--progress'] : []), remote, ] From 7c623542b7d1b9bd276097d1ab459a746965b238 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 31 Oct 2025 14:44:25 +0100 Subject: [PATCH 0578/1338] Remove obsolete submodule cleanup test Deleted the test for cleaning up submodules that no longer exist from checkout-test.ts. This test is no longer needed or relevant to current functionality. --- app/test/unit/git/checkout-test.ts | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts index f34c3ff551d..ae130604959 100644 --- a/app/test/unit/git/checkout-test.ts +++ b/app/test/unit/git/checkout-test.ts @@ -127,30 +127,6 @@ describe('git/checkout', () => { }) describe('with submodules', () => { - it('cleans up an submodule that no longer exists', async t => { - const path = await setupFixtureRepository(t, 'test-submodule-checkouts') - const repository = new Repository(path, -1, null, false) - - // put the repository into a known good state - await exec( - ['checkout', 'add-private-repo', '-f', '--recurse-submodules'], - path - ) - - const branches = await getBranches(repository) - const masterBranch = branches.find(b => b.name === 'master') - - if (masterBranch == null) { - throw new Error(`Could not find branch: 'master'`) - } - - await checkoutBranch(repository, masterBranch, null) - - const status = await getStatusOrThrow(repository) - - assert.equal(status.workingDirectory.files.length, 0) - }) - it('updates a changed submodule reference', async t => { const path = await setupFixtureRepository(t, 'test-submodule-checkouts') const repository = new Repository(path, -1, null, false) From 92b0dbe2d0d67267daeab453ae25760c3416d04d Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 31 Oct 2025 14:55:48 +0100 Subject: [PATCH 0579/1338] Add submodule update after pull and related tests Enhances the pull logic to update submodules after pulling from a remote, including progress reporting and file protocol support. Adds unit tests to verify submodule initialization, reference updates, and handling of pulls with no submodule changes. --- app/src/lib/git/pull.ts | 148 +++++++++++++++++++- app/test/unit/git/pull/pull-test.ts | 204 ++++++++++++++++++++++++++++ 2 files changed, 345 insertions(+), 7 deletions(-) create mode 100644 app/test/unit/git/pull/pull-test.ts diff --git a/app/src/lib/git/pull.ts b/app/src/lib/git/pull.ts index d71dbf3d03d..4d571cb894e 100644 --- a/app/src/lib/git/pull.ts +++ b/app/src/lib/git/pull.ts @@ -1,11 +1,32 @@ import { git, gitRebaseArguments, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' import { IPullProgress } from '../../models/progress' -import { PullProgressParser, executionOptionsWithProgress } from '../progress' +import { + PullProgressParser, + executionOptionsWithProgress, + IGitOutput, +} from '../progress' import { IRemote } from '../../models/remote' -import { envForRemoteOperation } from './environment' +import { + envForRemoteOperation, + getFallbackUrlForProxyResolve, +} from './environment' import { getConfigValue } from './config' +const PullStepWeight = 0.9 + +function clampProgress( + minimum: number, + maximum: number, + progressCallback: (progress: IPullProgress) => void +): (progress: IPullProgress) => void { + return (progress: IPullProgress) => + progressCallback({ + ...progress, + value: minimum + progress.value * (maximum - minimum), + }) +} + async function getPullArgs( repository: Repository, remote: string, @@ -15,12 +36,110 @@ async function getPullArgs( ...gitRebaseArguments(), 'pull', ...(await getDefaultPullDivergentBranchArguments(repository)), - '--recurse-submodules', ...(progressCallback ? ['--progress'] : []), remote, ] } +/** + * Update submodules after a pull operation. + * + * @param repository - The repository in which to update submodules + * @param remote - The remote that was pulled from + * @param progressCallback - An optional function which will be invoked + * with information about the current progress + * of the submodule update operation. + */ +async function updateSubmodulesAfterPull( + repository: Repository, + remote: IRemote, + progressCallback: ((progress: IPullProgress) => void) | undefined, + allowFileProtocol: boolean +): Promise { + const opts: IGitStringExecutionOptions = { + env: await envForRemoteOperation( + getFallbackUrlForProxyResolve(repository, remote) + ), + } + + const args = [ + ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []), + 'submodule', + 'update', + '--init', + '--recursive', + ] + + if (!progressCallback) { + await git(args, repository.path, 'updateSubmodules', opts) + return + } + + // Initial progress + const title = `Pulling ${remote.name}` + progressCallback({ + kind: 'pull', + title, + description: 'Updating submodules', + value: 0, + remote: remote.name, + }) + + const kind = 'pull' + + let submoduleEventCount = 0 + + const progressOpts = await executionOptionsWithProgress( + { ...opts, trackLFSProgress: true }, + { + parse(line: string): IGitOutput { + if ( + line.match(/^Submodule path (.)+?: checked out /) || + line.startsWith('Cloning into ') + ) { + submoduleEventCount += 1 + } + + return { + kind: 'context', + text: `Updating submodules: ${line}`, + // Math taken from https://math.stackexchange.com/a/2323106 + // We do this to fake a progress that slows down as we process more + // events, as we don't know how many submodules there are upfront, or + // what does git have to do with them (cloning, just checking them + // out...) + percent: 1 - Math.exp(-submoduleEventCount * 0.25), + } + }, + }, + progress => { + const description = + progress.kind === 'progress' ? progress.details.text : progress.text + + const value = progress.percent + + progressCallback({ + kind, + title, + description, + value, + remote: remote.name, + }) + } + ) + + await git(args, repository.path, 'updateSubmodules', progressOpts) + + // Final progress + progressCallback({ + kind, + title, + description: 'Submodules updated', + value: 1, + remote: remote.name, + }) +} + /** * Pull from the specified remote. * @@ -37,16 +156,21 @@ async function getPullArgs( export async function pull( repository: Repository, remote: IRemote, - progressCallback?: (progress: IPullProgress) => void + progressCallback?: (progress: IPullProgress) => void, + allowFileProtocol: boolean = false ): Promise { let opts: IGitStringExecutionOptions = { - env: await envForRemoteOperation(remote.url), + env: await envForRemoteOperation( + getFallbackUrlForProxyResolve(repository, remote) + ), } if (progressCallback) { const title = `Pulling ${remote.name}` const kind = 'pull' + const clampedCallback = clampProgress(0, PullStepWeight, progressCallback) + opts = await executionOptionsWithProgress( { ...opts, trackLFSProgress: true }, new PullProgressParser(), @@ -66,7 +190,7 @@ export async function pull( const value = progress.percent - progressCallback({ + clampedCallback({ kind, title, description, @@ -77,11 +201,21 @@ export async function pull( ) // Initial progress - progressCallback({ kind, title, value: 0, remote: remote.name }) + clampedCallback({ kind, title, value: 0, remote: remote.name }) } const args = await getPullArgs(repository, remote.name, progressCallback) await git(args, repository.path, 'pull', opts) + + // Update submodules after pull + await updateSubmodulesAfterPull( + repository, + remote, + progressCallback + ? clampProgress(PullStepWeight, 1, progressCallback) + : undefined, + allowFileProtocol + ) } /** diff --git a/app/test/unit/git/pull/pull-test.ts b/app/test/unit/git/pull/pull-test.ts new file mode 100644 index 00000000000..6dc5378076a --- /dev/null +++ b/app/test/unit/git/pull/pull-test.ts @@ -0,0 +1,204 @@ +import { describe, it, TestContext } from 'node:test' +import assert from 'node:assert' +import * as Path from 'path' +import * as FSE from 'fs-extra' +import { setupEmptyRepository } from '../../../helpers/repositories' +import { pull } from '../../../../src/lib/git' +import { IRemote } from '../../../../src/models/remote' +import { exec } from 'dugite' +import { Repository } from '../../../../src/models/repository' +import { + cloneRepository, + makeCommit, +} from '../../../helpers/repository-scaffolding' + +async function setupRepositoryWithSubmodule( + t: TestContext +): Promise<{ parent: Repository; submodule: Repository }> { + const parent = await setupEmptyRepository(t) + const submodule = await setupEmptyRepository(t) + + // Add commits to submodule + await makeCommit(submodule, { + commitMessage: 'Initial commit in submodule', + entries: [{ path: 'submodule-file.txt', contents: 'hello from submodule' }], + }) + + await makeCommit(submodule, { + commitMessage: 'Second commit in submodule', + entries: [{ path: 'submodule-file.txt', contents: 'updated content' }], + }) + + // Add commits to parent + await makeCommit(parent, { + commitMessage: 'Initial commit in parent', + entries: [{ path: 'README.md', contents: '# Parent repo' }], + }) + + // Add submodule to parent + await exec( + [ + '-c', + 'protocol.file.allow=always', + 'submodule', + 'add', + submodule.path, + 'test-submodule', + ], + parent.path + ) + + await exec(['commit', '-m', 'Add submodule'], parent.path) + + return { parent, submodule } +} + +describe('git/pull', () => { + describe('with submodules', () => { + it('initializes an uninitialized submodule when pulling from a remote with changes', async t => { + // Setup: Create a parent repo with a submodule, then clone it + const { parent } = await setupRepositoryWithSubmodule(t) + + // Clone the parent repository + const cloned = await cloneRepository(t, parent) + + // Make a change in the parent (original) repo + await makeCommit(parent, { + commitMessage: 'Update README', + entries: [{ path: 'README.md', contents: '# Updated Parent repo' }], + }) + + const remote: IRemote = { + name: 'origin', + url: parent.path, + } + + // Deinitialize the submodule in the cloned repo + const submodulePath = Path.join(cloned.path, 'test-submodule') + await exec(['submodule', 'deinit', '-f', 'test-submodule'], cloned.path) + + // Remove the submodule directory + await FSE.remove(submodulePath) + + // Verify the submodule is not initialized + const submoduleStatus = await exec(['submodule', 'status'], cloned.path) + assert.ok( + submoduleStatus.stdout.includes('-'), + 'Submodule should be uninitialized (starts with -)' + ) + + // Now pull with allowFileProtocol=true + await pull(cloned, remote, undefined, true) + + // Verify the submodule is initialized and has the correct commits + const submoduleGitPath = Path.join(submodulePath, '.git') + + // Check that submodule .git exists (either as file or directory) + const submoduleGitExists = await FSE.pathExists(submoduleGitPath) + assert.equal( + submoduleGitExists, + true, + 'Submodule .git should exist after pull' + ) + + // Verify submodule has two commits + const submoduleLog = await exec(['log', '--oneline'], submodulePath) + assert.equal( + submoduleLog.stdout.trim().split('\n').length, + 2, + 'Submodule should have two commits' + ) + }) + + it('updates submodule references after pulling changes', async t => { + // Setup: Create parent with submodule, clone it + const { parent, submodule } = await setupRepositoryWithSubmodule(t) + + const cloned = await cloneRepository(t, parent) + + // Initialize submodules in the cloned repo + await exec( + ['-c', 'protocol.file.allow=always', 'submodule', 'update', '--init'], + cloned.path + ) + + const submodulePath = Path.join(cloned.path, 'test-submodule') + + // Verify initial state + const initialLog = await exec(['log', '--oneline'], submodulePath) + const initialCommitCount = initialLog.stdout.trim().split('\n').length + assert.equal(initialCommitCount, 2, 'Should start with 2 commits') + + // Add a new commit to the submodule + await makeCommit(submodule, { + commitMessage: 'Third commit in submodule', + entries: [{ path: 'another-file.txt', contents: 'more content' }], + }) + + // Update the submodule reference in parent and commit + await exec( + ['-c', 'protocol.file.allow=always', 'submodule', 'update', '--remote'], + parent.path + ) + await exec(['add', 'test-submodule'], parent.path) + await exec(['commit', '-m', 'Update submodule reference'], parent.path) + + const remote: IRemote = { + name: 'origin', + url: parent.path, + } + + // Pull the changes + await pull(cloned, remote, undefined, true) + + // Verify submodule was updated to the new reference + const finalLog = await exec(['log', '--oneline'], submodulePath) + const finalCommitCount = finalLog.stdout.trim().split('\n').length + + assert.equal( + finalCommitCount, + 3, + 'Submodule should now have 3 commits after update' + ) + }) + + it('handles pull when there are no submodule changes', async t => { + const { parent } = await setupRepositoryWithSubmodule(t) + const cloned = await cloneRepository(t, parent) + + // Initialize submodules + await exec( + ['-c', 'protocol.file.allow=always', 'submodule', 'update', '--init'], + cloned.path + ) + + // Make a change that doesn't affect submodules + await makeCommit(parent, { + commitMessage: 'Update README again', + entries: [{ path: 'README.md', contents: '# Another update' }], + }) + + const remote: IRemote = { + name: 'origin', + url: parent.path, + } + + const submodulePath = Path.join(cloned.path, 'test-submodule') + const beforeLog = await exec(['log', '--oneline'], submodulePath) + const beforeCount = beforeLog.stdout.trim().split('\n').length + + // Pull should succeed without errors + await pull(cloned, remote, undefined, true) + + // Submodule should remain unchanged + const afterLog = await exec(['log', '--oneline'], submodulePath) + const afterCount = afterLog.stdout.trim().split('\n').length + + assert.equal( + afterCount, + beforeCount, + 'Submodule commits should remain unchanged' + ) + }) + }) +}) From a9a378eafca146c3142d38ae9983074d53f10f3c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 31 Oct 2025 15:18:36 +0100 Subject: [PATCH 0580/1338] Refactor submodule update logic for git operations Consolidates submodule update logic into a generic updateSubmodulesAfterOperation function in submodule.ts, replacing operation-specific implementations in checkout.ts and pull.ts. Also moves and generalizes clampProgress to progress.ts for reuse. This improves code maintainability and reduces duplication. --- app/src/lib/git/checkout.ts | 145 +++++------------------------------ app/src/lib/git/pull.ts | 126 ++---------------------------- app/src/lib/git/submodule.ts | 121 ++++++++++++++++++++++++++++- app/src/models/progress.ts | 16 ++++ 4 files changed, 164 insertions(+), 244 deletions(-) diff --git a/app/src/lib/git/checkout.ts b/app/src/lib/git/checkout.ts index 3cd2ff2d999..6b2a1a1b604 100644 --- a/app/src/lib/git/checkout.ts +++ b/app/src/lib/git/checkout.ts @@ -1,11 +1,10 @@ import { git, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' import { Branch, BranchType } from '../../models/branch' -import { ICheckoutProgress } from '../../models/progress' +import { clampProgress, ICheckoutProgress } from '../../models/progress' import { CheckoutProgressParser, executionOptionsWithProgress, - IGitOutput, } from '../progress' import { AuthenticationErrors } from './authentication' import { @@ -16,23 +15,12 @@ import { WorkingDirectoryFileChange } from '../../models/status' import { ManualConflictResolution } from '../../models/manual-conflict-resolution' import { CommitOneLine, shortenSHA } from '../../models/commit' import { IRemote } from '../../models/remote' +import { updateSubmodulesAfterOperation } from './submodule' export type ProgressCallback = (progress: ICheckoutProgress) => void const CheckoutStepWeight = 0.9 -function clampProgress( - minimum: number, - maximum: number, - progressCallback: ProgressCallback -): ProgressCallback { - return (progress: ICheckoutProgress) => - progressCallback({ - ...progress, - value: minimum + progress.value * (maximum - minimum), - }) -} - function getCheckoutArgs(progressCallback?: ProgressCallback) { return ['checkout', ...(progressCallback ? ['--progress'] : [])] } @@ -97,109 +85,6 @@ async function getCheckoutOpts( ) } -/** - * Update submodules after a checkout operation. - * - * @param repository - The repository in which to update submodules - * @param title - The title to use for progress reporting - * @param target - The target branch/commit being checked out - * @param currentRemote - The current remote for environment setup - * @param progressCallback - An optional function which will be invoked - * with information about the current progress - * of the submodule update operation. - */ -async function updateSubmodulesAfterCheckout( - repository: Repository, - title: string, - target: string, - currentRemote: IRemote | null, - progressCallback: ProgressCallback | undefined, - allowFileProtocol: boolean -): Promise { - const opts: IGitStringExecutionOptions = { - env: await envForRemoteOperation( - getFallbackUrlForProxyResolve(repository, currentRemote) - ), - expectedErrors: AuthenticationErrors, - } - - const args = [ - ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []), - 'submodule', - 'update', - '--init', - '--recursive', - ] - - if (!progressCallback) { - await git(args, repository.path, 'updateSubmodules', opts) - return - } - - // Initial progress - progressCallback({ - kind: 'checkout', - title, - description: 'Updating submodules', - value: 0, - target, - }) - - const kind = 'checkout' - - let submoduleEventCount = 0 - - const progressOpts = await executionOptionsWithProgress( - { ...opts, trackLFSProgress: true }, - { - parse(line: string): IGitOutput { - if ( - line.match(/^Submodule path (.)+?: checked out /) || - line.startsWith('Cloning into ') - ) { - submoduleEventCount += 1 - } - - return { - kind: 'context', - text: `Updating submodules: ${line}`, - // Math taken from https://math.stackexchange.com/a/2323106 - // We do this to fake a progress that slows down as we process more - // events, as we don't know how many submodules there are upfront, or - // what does git have to do with them (cloning, just checking them - // out...) - percent: 1 - Math.exp(-submoduleEventCount * 0.25), - } - }, - }, - progress => { - const description = - progress.kind === 'progress' ? progress.details.text : progress.text - - const value = progress.percent - - progressCallback({ - kind, - title, - description, - value, - target, - }) - } - ) - - await git(args, repository.path, 'updateSubmodules', progressOpts) - - // Final progress - progressCallback({ - kind, - title, - description: 'Submodules updated', - value: 1, - target, - }) -} - /** * Check out the given branch. * @@ -239,14 +124,19 @@ export async function checkoutBranch( await git(args, repository.path, 'checkoutBranch', opts) // Update submodules after checkout - await updateSubmodulesAfterCheckout( + await updateSubmodulesAfterOperation( repository, - title, - branch.name, currentRemote, progressCallback - ? clampProgress(CheckoutStepWeight, 1, progressCallback) + ? clampProgress( + CheckoutStepWeight, + 1, + progressCallback + ) : undefined, + 'checkout', + title, + branch.name, allowFileProtocol ) @@ -295,14 +185,19 @@ export async function checkoutCommit( await git(args, repository.path, 'checkoutCommit', opts) // Update submodules after checkout - await updateSubmodulesAfterCheckout( + await updateSubmodulesAfterOperation( repository, - title, - target, currentRemote, progressCallback - ? clampProgress(CheckoutStepWeight, 1, progressCallback) + ? clampProgress( + CheckoutStepWeight, + 1, + progressCallback + ) : undefined, + 'checkout', + title, + target, allowFileProtocol ) diff --git a/app/src/lib/git/pull.ts b/app/src/lib/git/pull.ts index 4d571cb894e..4a88fc7a6b3 100644 --- a/app/src/lib/git/pull.ts +++ b/app/src/lib/git/pull.ts @@ -1,32 +1,17 @@ import { git, gitRebaseArguments, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' -import { IPullProgress } from '../../models/progress' -import { - PullProgressParser, - executionOptionsWithProgress, - IGitOutput, -} from '../progress' +import { clampProgress, IPullProgress } from '../../models/progress' +import { PullProgressParser, executionOptionsWithProgress } from '../progress' import { IRemote } from '../../models/remote' import { envForRemoteOperation, getFallbackUrlForProxyResolve, } from './environment' import { getConfigValue } from './config' +import { updateSubmodulesAfterOperation } from './submodule' const PullStepWeight = 0.9 -function clampProgress( - minimum: number, - maximum: number, - progressCallback: (progress: IPullProgress) => void -): (progress: IPullProgress) => void { - return (progress: IPullProgress) => - progressCallback({ - ...progress, - value: minimum + progress.value * (maximum - minimum), - }) -} - async function getPullArgs( repository: Repository, remote: string, @@ -41,105 +26,6 @@ async function getPullArgs( ] } -/** - * Update submodules after a pull operation. - * - * @param repository - The repository in which to update submodules - * @param remote - The remote that was pulled from - * @param progressCallback - An optional function which will be invoked - * with information about the current progress - * of the submodule update operation. - */ -async function updateSubmodulesAfterPull( - repository: Repository, - remote: IRemote, - progressCallback: ((progress: IPullProgress) => void) | undefined, - allowFileProtocol: boolean -): Promise { - const opts: IGitStringExecutionOptions = { - env: await envForRemoteOperation( - getFallbackUrlForProxyResolve(repository, remote) - ), - } - - const args = [ - ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []), - 'submodule', - 'update', - '--init', - '--recursive', - ] - - if (!progressCallback) { - await git(args, repository.path, 'updateSubmodules', opts) - return - } - - // Initial progress - const title = `Pulling ${remote.name}` - progressCallback({ - kind: 'pull', - title, - description: 'Updating submodules', - value: 0, - remote: remote.name, - }) - - const kind = 'pull' - - let submoduleEventCount = 0 - - const progressOpts = await executionOptionsWithProgress( - { ...opts, trackLFSProgress: true }, - { - parse(line: string): IGitOutput { - if ( - line.match(/^Submodule path (.)+?: checked out /) || - line.startsWith('Cloning into ') - ) { - submoduleEventCount += 1 - } - - return { - kind: 'context', - text: `Updating submodules: ${line}`, - // Math taken from https://math.stackexchange.com/a/2323106 - // We do this to fake a progress that slows down as we process more - // events, as we don't know how many submodules there are upfront, or - // what does git have to do with them (cloning, just checking them - // out...) - percent: 1 - Math.exp(-submoduleEventCount * 0.25), - } - }, - }, - progress => { - const description = - progress.kind === 'progress' ? progress.details.text : progress.text - - const value = progress.percent - - progressCallback({ - kind, - title, - description, - value, - remote: remote.name, - }) - } - ) - - await git(args, repository.path, 'updateSubmodules', progressOpts) - - // Final progress - progressCallback({ - kind, - title, - description: 'Submodules updated', - value: 1, - remote: remote.name, - }) -} - /** * Pull from the specified remote. * @@ -208,12 +94,16 @@ export async function pull( await git(args, repository.path, 'pull', opts) // Update submodules after pull - await updateSubmodulesAfterPull( + const title = `Pulling ${remote.name}` + await updateSubmodulesAfterOperation( repository, remote, progressCallback ? clampProgress(PullStepWeight, 1, progressCallback) : undefined, + 'pull', + title, + remote.name, allowFileProtocol ) } diff --git a/app/src/lib/git/submodule.ts b/app/src/lib/git/submodule.ts index 7cdaef26d9b..6b68b8413e8 100644 --- a/app/src/lib/git/submodule.ts +++ b/app/src/lib/git/submodule.ts @@ -1,9 +1,128 @@ import * as Path from 'path' -import { git } from './core' +import { git, IGitStringExecutionOptions } from './core' import { Repository } from '../../models/repository' import { SubmoduleEntry } from '../../models/submodule' import { pathExists } from '../../ui/lib/path-exists' +import { executionOptionsWithProgress, IGitOutput } from '../progress' +import { + envForRemoteOperation, + getFallbackUrlForProxyResolve, +} from './environment' +import { AuthenticationErrors } from './authentication' +import { IRemote } from '../../models/remote' +import { Progress } from '../../models/progress' + +/** + * Update submodules after a git operation. + * + * @param repository - The repository in which to update submodules + * @param remote - The remote for environment setup (can be null) + * @param progressCallback - An optional function which will be invoked + * with information about the current progress + * of the submodule update operation. + * @param progressKind - The kind of progress event ('checkout', 'pull', etc.) + * @param title - The title to use for progress reporting + * @param targetOrRemote - The target (for checkout) or remote name (for pull) + * @param allowFileProtocol - Whether to allow file:// protocol for submodules + */ +export async function updateSubmodulesAfterOperation( + repository: Repository, + remote: IRemote | null, + progressCallback: ((progress: T) => void) | undefined, + progressKind: T['kind'], + title: string, + targetOrRemote: string, + allowFileProtocol: boolean +): Promise { + const opts: IGitStringExecutionOptions = { + env: await envForRemoteOperation( + getFallbackUrlForProxyResolve(repository, remote) + ), + expectedErrors: AuthenticationErrors, + } + + const args = [ + ...(allowFileProtocol ? ['-c', 'protocol.file.allow=always'] : []), + 'submodule', + 'update', + '--init', + '--recursive', + ] + + if (!progressCallback) { + await git(args, repository.path, 'updateSubmodules', opts) + return + } + + // Initial progress + progressCallback({ + kind: progressKind, + title, + description: 'Updating submodules', + value: 0, + // Add the target or remote field based on the progress kind + ...(progressKind === 'checkout' + ? { target: targetOrRemote } + : { remote: targetOrRemote }), + } as T) + + let submoduleEventCount = 0 + + const progressOpts = await executionOptionsWithProgress( + { ...opts, trackLFSProgress: true }, + { + parse(line: string): IGitOutput { + if ( + line.match(/^Submodule path (.)+?: checked out /) || + line.startsWith('Cloning into ') + ) { + submoduleEventCount += 1 + } + + return { + kind: 'context', + text: `Updating submodules: ${line}`, + // Math taken from https://math.stackexchange.com/a/2323106 + // We do this to fake a progress that slows down as we process more + // events, as we don't know how many submodules there are upfront, or + // what does git have to do with them (cloning, just checking them + // out...) + percent: 1 - Math.exp(-submoduleEventCount * 0.25), + } + }, + }, + progress => { + const description = + progress.kind === 'progress' ? progress.details.text : progress.text + + const value = progress.percent + + progressCallback({ + kind: progressKind, + title, + description, + value, + ...(progressKind === 'checkout' + ? { target: targetOrRemote } + : { remote: targetOrRemote }), + } as T) + } + ) + + await git(args, repository.path, 'updateSubmodules', progressOpts) + + // Final progress + progressCallback({ + kind: progressKind, + title, + description: 'Submodules updated', + value: 1, + ...(progressKind === 'checkout' + ? { target: targetOrRemote } + : { remote: targetOrRemote }), + } as T) +} export async function listSubmodules( repository: Repository diff --git a/app/src/models/progress.ts b/app/src/models/progress.ts index 28802559d4e..14e9c2a5614 100644 --- a/app/src/models/progress.ts +++ b/app/src/models/progress.ts @@ -122,3 +122,19 @@ export type Progress = | IPushProgress | IRevertProgress | IMultiCommitOperationProgress + +/** + * Clamps progress values between minimum and maximum. + * Useful for reserving portions of progress reporting for different stages. + */ +export function clampProgress( + minimum: number, + maximum: number, + progressCallback: (progress: T) => void +): (progress: T) => void { + return (progress: T) => + progressCallback({ + ...progress, + value: minimum + progress.value * (maximum - minimum), + }) +} From f244a199229c245723b8e7b3d40edf04fb63cc21 Mon Sep 17 00:00:00 2001 From: zeki <153834382+zekariasasaminew@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:38:03 -0500 Subject: [PATCH 0581/1338] Refactor popover close logic in CommitMessageAvatar --- app/src/ui/changes/commit-message-avatar.tsx | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/app/src/ui/changes/commit-message-avatar.tsx b/app/src/ui/changes/commit-message-avatar.tsx index 60f00f65da4..8b71afecc19 100644 --- a/app/src/ui/changes/commit-message-avatar.tsx +++ b/app/src/ui/changes/commit-message-avatar.tsx @@ -104,7 +104,6 @@ export class CommitMessageAvatar extends React.Component< > { private avatarButtonRef: HTMLButtonElement | null = null private warningBadgeRef = React.createRef() - private documentClickListener: (event: MouseEvent) => void public constructor(props: ICommitMessageAvatarProps) { super(props) @@ -115,31 +114,6 @@ export class CommitMessageAvatar extends React.Component< isGitConfigLocal: false, } this.determineGitConfigLocation() - - // Create the document click listener - this.documentClickListener = (event: MouseEvent) => { - if (this.state.isPopoverOpen && event.target instanceof Element) { - // Check if click is on app menu bar or its descendants - const appMenuBar = document.getElementById('app-menu-bar') - if ( - appMenuBar && - (appMenuBar.contains(event.target) || appMenuBar === event.target) - ) { - // Close popover when clicking on app menu - this.closePopover() - } - } - } - } - - public componentDidMount() { - // Add global click listener to detect app menu clicks - document.addEventListener('click', this.documentClickListener, true) // Use capture phase - } - - public componentWillUnmount() { - // Remove global click listener - document.removeEventListener('click', this.documentClickListener, true) } public componentDidUpdate(prevProps: ICommitMessageAvatarProps) { @@ -450,6 +424,7 @@ export class CommitMessageAvatar extends React.Component< } anchorPosition={PopoverAnchorPosition.RightBottom} decoration={PopoverDecoration.Balloon} + onMousedownOutside={this.closePopover} onClickOutside={this.closePopover} ariaLabelledby="commit-avatar-popover-header" > From d153ac2be8f9948a69df482b33e4c7409af48244 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Nov 2025 13:56:56 +0100 Subject: [PATCH 0582/1338] Proof of concept hook runner --- app/src/lib/feature-flag.ts | 2 + app/src/lib/git/core.ts | 194 +++++++++++++++------------- app/src/lib/hooks/get-repo-hooks.ts | 43 ++++++ app/src/lib/hooks/with-hooks-env.ts | 192 +++++++++++++++++++++++++++ package.json | 1 + script/build.ts | 10 ++ tsconfig.json | 2 +- yarn.lock | 5 + 8 files changed, 357 insertions(+), 92 deletions(-) create mode 100644 app/src/lib/hooks/get-repo-hooks.ts create mode 100644 app/src/lib/hooks/with-hooks-env.ts diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index d249d067484..5325758459f 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -120,3 +120,5 @@ export const enableCommitMessageGeneration = (account: Account) => { export function enableAccessibleListToolTips(): boolean { return enableBetaFeatures() } + +export const enableHooksEnvironment = enableDevelopmentFeatures diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 11e9036c075..5eec52a182c 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -12,11 +12,11 @@ import { assertNever } from '../fatal-error' import * as GitPerf from '../../ui/lib/git-perf' import * as Path from 'path' import { isErrnoException } from '../errno-exception' -import { merge } from '../merge' import { withTrampolineEnv } from '../trampoline/trampoline-environment' import { createTailStream } from './create-tail-stream' import { createTerminalStream } from '../create-terminal-stream' import { kStringMaxLength } from 'buffer' +import { withHooksEnv } from '../hooks/with-hooks-env' export const coerceToString = ( value: string | Buffer, @@ -239,102 +239,114 @@ export async function git( options?.processCallback?.(process) } - return withTrampolineEnv( - async env => { - const combinedEnv = merge(opts.env, env) - - // Explicitly set TERM to 'dumb' so that if Desktop was launched - // from a terminal or if the system environment variables - // have TERM set Git won't consider us as a smart terminal. - // See https://github.com/git/git/blob/a7312d1a2/editor.c#L11-L15 - opts.env = { TERM: 'dumb', ...combinedEnv } - - const commandName = `${name}: git ${args.join(' ')}` - - const result = await GitPerf.measure(commandName, () => - exec(args, path, opts) - ).catch(err => { - // If this is an exception thrown by Node.js (as opposed to - // dugite) let's keep the salient details but include the name of - // the operation. - if (isErrnoException(err)) { - throw new Error(`Failed to execute ${name}: ${err.code}`) - } - - if (isMaxBufferExceededError(err)) { - throw new ExecError( - `${err.message} for ${name}`, - err.stdout, - err.stderr, - // Dugite stores the original Node error in the cause property, by - // passing that along we ensure that all we're doing here is - // changing the error message (and capping the stack but that's - // okay since we know exactly where this error is coming from). - // The null coalescing here is a safety net in case dugite's - // behavior changes from underneath us. - err.cause ?? err + return withHooksEnv( + hooksEnv => + withTrampolineEnv( + async env => { + const commandName = `${name}: git ${args.join(' ')}` + + const result = await GitPerf.measure(commandName, () => + exec(args, path, { + ...opts, + env: { + // Explicitly set TERM to 'dumb' so that if Desktop was launched + // from a terminal or if the system environment variables + // have TERM set Git won't consider us as a smart terminal. + // See https://github.com/git/git/blob/a7312d1a2/editor.c#L11-L15 + TERM: 'dumb', + ...opts.env, + ...hooksEnv, + ...env, + }, + }) + ).catch(err => { + // If this is an exception thrown by Node.js (as opposed to + // dugite) let's keep the salient details but include the name of + // the operation. + if (isErrnoException(err)) { + throw new Error(`Failed to execute ${name}: ${err.code}`) + } + + if (isMaxBufferExceededError(err)) { + throw new ExecError( + `${err.message} for ${name}`, + err.stdout, + err.stderr, + // Dugite stores the original Node error in the cause property, by + // passing that along we ensure that all we're doing here is + // changing the error message (and capping the stack but that's + // okay since we know exactly where this error is coming from). + // The null coalescing here is a safety net in case dugite's + // behavior changes from underneath us. + err.cause ?? err + ) + } + + throw err + }) + + const exitCode = result.exitCode + + let gitError: DugiteError | null = null + const acceptableExitCode = opts.successExitCodes + ? opts.successExitCodes.has(exitCode) + : false + if (!acceptableExitCode) { + gitError = parseError(coerceToString(result.stderr)) + if (gitError === null) { + gitError = parseError(coerceToString(result.stdout)) + } + } + + const gitErrorDescription = + gitError !== null + ? getDescriptionForError(gitError, coerceToString(result.stderr)) + : null + const gitResult = { + ...result, + gitError, + gitErrorDescription, + path, + } + + let acceptableError = true + if (gitError !== null && opts.expectedErrors) { + acceptableError = opts.expectedErrors.has(gitError) + } + + if ((gitError !== null && acceptableError) || acceptableExitCode) { + return gitResult + } + + // The caller should either handle this error, or expect that exit code. + const errorMessage = new Array() + errorMessage.push( + `\`git ${args.join( + ' ' + )}\` exited with an unexpected code: ${exitCode}.` ) - } - - throw err - }) - - const exitCode = result.exitCode - - let gitError: DugiteError | null = null - const acceptableExitCode = opts.successExitCodes - ? opts.successExitCodes.has(exitCode) - : false - if (!acceptableExitCode) { - gitError = parseError(coerceToString(result.stderr)) - if (gitError === null) { - gitError = parseError(coerceToString(result.stdout)) - } - } - - const gitErrorDescription = - gitError !== null - ? getDescriptionForError(gitError, coerceToString(result.stderr)) - : null - const gitResult = { - ...result, - gitError, - gitErrorDescription, - path, - } - - let acceptableError = true - if (gitError !== null && opts.expectedErrors) { - acceptableError = opts.expectedErrors.has(gitError) - } - if ((gitError !== null && acceptableError) || acceptableExitCode) { - return gitResult - } - - // The caller should either handle this error, or expect that exit code. - const errorMessage = new Array() - errorMessage.push( - `\`git ${args.join(' ')}\` exited with an unexpected code: ${exitCode}.` - ) - - if (terminalOutput.length > 0) { - // Leave even less of the combined output in the log - errorMessage.push(terminalOutput.slice(-1024)) - } + if (terminalOutput.length > 0) { + // Leave even less of the combined output in the log + errorMessage.push(terminalOutput.slice(-1024)) + } - if (gitError !== null) { - errorMessage.push( - `(The error was parsed as ${gitError}: ${gitErrorDescription})` - ) - } + if (gitError !== null) { + errorMessage.push( + `(The error was parsed as ${gitError}: ${gitErrorDescription})` + ) + } - log.error(errorMessage.join('\n')) + log.error(errorMessage.join('\n')) - throw new GitError(gitResult, args, terminalOutput) - }, + throw new GitError(gitResult, args, terminalOutput) + }, + path, + options?.isBackgroundTask ?? false, + hooksEnv + ), path, - options?.isBackgroundTask ?? false, + options?.isBackgroundTask, options?.env ) } diff --git a/app/src/lib/hooks/get-repo-hooks.ts b/app/src/lib/hooks/get-repo-hooks.ts new file mode 100644 index 00000000000..da7f74685a8 --- /dev/null +++ b/app/src/lib/hooks/get-repo-hooks.ts @@ -0,0 +1,43 @@ +import { exec } from 'dugite' +import { access, constants, readdir } from 'fs/promises' +import { join, resolve } from 'path' + +const isExecutable = (path: string) => + access(path, constants.X_OK) + .then(() => true) + .catch(() => false) + +export async function* getRepoHooks(path: string) { + // TODO: Could we cache this? For just a little while? + // Probably not because we need to react to changes to core.hooksPath on the + // fly but it sure would be nice. + const { exitCode, stdout } = await exec( + ['config', '-z', '--get', 'core.hooksPath'], + path + ) + + const hooksPath = + exitCode === 0 + ? resolve(path, stdout.split('\0')[0]) + : join(path, '.git', 'hooks') + + const files = await readdir(hooksPath, { withFileTypes: true }) + .then(entries => entries.filter(x => x.isFile())) + .catch(() => []) + + for (const hook of files) { + const hookPath = join(hook.parentPath, hook.name) + + if (__WIN32__) { + if (hook.name.endsWith('.exe')) { + continue + } + } else { + if (!(await isExecutable(hookPath))) { + continue + } + } + + yield hookPath + } +} diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts new file mode 100644 index 00000000000..2433a769f3b --- /dev/null +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -0,0 +1,192 @@ +import { tmpdir } from 'os' +import { enableHooksEnvironment } from '../feature-flag' +import { getRepoHooks } from './get-repo-hooks' +import { cp, mkdtemp, rm } from 'fs/promises' +import { join, basename } from 'path' +import { createProxyProcessServer, ProcessProxyConnection } from 'process-proxy' +import { AddressInfo } from 'net' +import { spawn } from 'child_process' +import { Readable, Writable } from 'stream' + +const debug = (message: string, error?: Error) => { + log.debug(`hooks: ${message}`, error) +} + +const waitForWritableFinished = (stream: Writable) => { + return new Promise(resolve => { + if (stream.writableFinished) { + resolve() + } else { + stream.once('finish', () => resolve()) + } + }) +} + +const exitWithError = ( + connection: ProcessProxyConnection, + message: string, + exitCode = 1 +) => { + return new Promise((resolve, reject) => { + connection.stderr.end(`${message}\n`, () => { + connection.exit(exitCode).then(resolve, err => { + debug( + `failed to exit proxy: ${ + err instanceof Error ? err.message : String(err) + }` + ) + resolve() + }) + }) + }) +} + +export async function withHooksEnv( + fn: (env: Record | undefined) => Promise, + path: string, + isBackgroundTask = false, + customEnv?: Record +): Promise { + if (!enableHooksEnvironment()) { + return fn(customEnv) + } + + const repoHooks = await Array.fromAsync(getRepoHooks(path)) + + if (repoHooks.length === 0) { + return fn(customEnv) + } + + const ext = __WIN32__ ? '.exe' : '' + const processProxyPath = join(__dirname, `process-proxy${ext}`) + + const token = crypto.randomUUID() + const server = createProxyProcessServer( + async connection => { + const abortController = new AbortController() + const args = await connection.getArgs() + const env = await connection.getEnv() + const cwd = await connection.getCwd() + + const hookName = __WIN32__ + ? basename(args[0]).replace(/\.exe$/i, '') + : basename(args[0]) + + const excludedEnvVars = new Set([ + // Dugite sets this to point to a custom git config file which + // we don't want to leak into the hook's environment + 'GIT_SYSTEM_CONFIG', + // We set this to point to a custom hooks path which we don't want + // leaking into the hook's environment. Initially I thought we would have + // to sanitize this to strip out the custom config we set and leave any + // user-configured but since we're executing the hook in a separate + // shell with login it would just get re-initialized there anyway. + 'GIT_CONFIG_PARAMETERS', + ]) + + const safeEnv = Object.fromEntries( + Object.entries(env).filter( + ([k]) => k.startsWith('GIT_') && excludedEnvVars.has(k) + ) + ) + + const hooksExecutable = + repoHooks.find(hook => hook.endsWith(hookName)) ?? + (__WIN32__ + ? repoHooks.find(hook => hook.endsWith(`${hookName}.exe`)) + : undefined) + + if (!hooksExecutable) { + debug(`hook executable not found for ${hookName}`) + await exitWithError( + connection, + `Error: hook executable not found for ${hookName}` + ) + return + } + + // TODO!!! Escape args properly!!! + const cmd = `"${hooksExecutable}" ${args.join(' ')}` + const child = spawn(process.env.SHELL ?? '/bin/bash', ['-ilc', cmd], { + cwd, + env: safeEnv, + signal: abortController.signal, + }) + .on('spawn', () => { + const pipe = (from: Readable, to: Writable, name: string) => { + from.pipe(to).on('error', err => { + debug(`${name} pipe error:`, err) + abortController.abort() + }) + } + + pipe(connection.stdin, child.stdin, 'stdin') + pipe(child.stdout, connection.stdout, 'stdout') + pipe(child.stderr, connection.stderr, 'stderr') + + child.on('close', async (code, signal) => { + // Ensure all data is flushed to the copilot before exiting + // the connection + await Promise.all([ + waitForWritableFinished(connection.stdout), + waitForWritableFinished(connection.stderr), + ]) + + if (code !== 0) { + debug(`exiting proxy with code ${code}`) + } + await connection.exit(code ?? 0).catch(err => { + debug(`failed to exit proxy:`, err) + }) + }) + }) + .on('error', async err => { + debug(`child error:`, err) + await exitWithError( + connection, + `Error: command failed: ${err.message}` + ) + }) + }, + { + validateConnection: async receivedToken => receivedToken === token, + } + ) + const port = await new Promise((resolve, reject) => { + server.listen(0, '127.0.0.1', () => { + resolve((server.address() as AddressInfo).port) + }) + }) + const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) + try { + for (const hook of repoHooks) { + const cleanHooksName = __WIN32__ + ? basename(hook).replace(/\.exe$/i, '') + : basename(hook) + + await cp(processProxyPath, join(tmpHooksDir, `${cleanHooksName}${ext}`)) + } + + const existingGitEnvConfig = + customEnv?.['GIT_CONFIG_PARAMETERS'] ?? + process.env['GIT_CONFIG_PARAMETERS'] ?? + '' + + const gitEnvConfigPrefix = + existingGitEnvConfig.length > 0 ? `${existingGitEnvConfig} ` : '' + + return await fn({ + ...customEnv, + // TODO: Do we need to escape tmpHooksDir? Could it possibly include a single quote? + // probably not? + GIT_CONFIG_PARAMETERS: `${gitEnvConfigPrefix}'core.hooksPath=${tmpHooksDir}'`, + PROCESS_PROXY_PORT: `${port}`, + PROCESS_PROXY_TOKEN: token, + }) + } finally { + // Clean up the temporary directory + await rm(tmpHooksDir, { recursive: true, force: true }).catch(() => { + // Ignore errors + }) + } +} diff --git a/package.json b/package.json index 3231e638980..aea56a105c2 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "parallel-webpack": "^2.6.0", "parse-dds": "^1.2.1", "prettier": "^2.6.0", + "process-proxy": "^0.3.0", "rimraf": "^6.0.1", "sass": "^1.27.0", "sass-loader": "^16.0.0", diff --git a/script/build.ts b/script/build.ts index b51060b27d3..42af025260f 100755 --- a/script/build.ts +++ b/script/build.ts @@ -7,6 +7,7 @@ import * as os from 'os' import packager, { OfficialArch, OsxNotarizeOptions } from 'electron-packager' import frontMatter from 'front-matter' import { externals } from '../app/webpack.common' +import { getProxyCommandPath } from 'process-proxy' interface IChooseALicense { readonly title: string @@ -364,6 +365,15 @@ function copyDependencies() { appPathMain ) } + + console.log(' Copying process-proxy binary') + copySync( + getProxyCommandPath(), + path.resolve( + outRoot, + process.platform === 'win32' ? 'process-proxy.exe' : 'process-proxy' + ) + ) } function generateLicenseMetadata(outRoot: string) { diff --git a/tsconfig.json b/tsconfig.json index 2fbed057219..ea6e0287778 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,7 @@ "strict": true, "outDir": "./out", "useUnknownInCatchVariables": false, - "lib": ["ES2023", "DOM", "DOM.Iterable"], + "lib": ["ES2023", "DOM", "DOM.Iterable", "ESNext.Array"], "types": ["node"] }, "include": ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.tsx"], diff --git a/yarn.lock b/yarn.lock index 02fc6d45d52..12c3efb7bca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5629,6 +5629,11 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" +process-proxy@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/process-proxy/-/process-proxy-0.3.0.tgz#5bdb0cf430214868d395b3a9a5b74f12f519afbb" + integrity sha512-DNyLMjWYgf8K2zT54XQkTCcoyQfOcWihRRamofYdlV8vOxSik+KcXYwwogrT+DQsJRfEJWFx7/s8te2BsHfmQw== + progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" From e1fd5c19633087e8780e6cbe45f7f025e3b8b985 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:35:50 -0500 Subject: [PATCH 0583/1338] Release 3.5.4-beta2 --- app/package.json | 2 +- changelog.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index f492873dab0..756314b9b3a 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.4-beta1", + "version": "3.5.4-beta2", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 0884d7d6f2f..26f266c824a 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,12 @@ { "releases": { + "3.5.4-beta2": [ + "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189", + "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", + "[Fixed] Fix: Show whitespace hint on context menu in diff row - #20848. Thanks @zekariasasaminew!", + "[Fixed] Improve dialog dismissal and sign-in button state handling - #21144. Thanks @zekariasasaminew!", + "[Fixed] Fix \"Update Email\" button after login into a different account - #21176" + ], "3.5.4-beta1": [ "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", "[Added] Allow users to skip commit message override confirmation - #21025. Thanks @ilyassesalama!", From b9ffe29cdaafa37eaafcc17925dce60fb828869f Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:36:28 -0500 Subject: [PATCH 0584/1338] Update changelog.json --- changelog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.json b/changelog.json index 26f266c824a..a7a21606ccc 100644 --- a/changelog.json +++ b/changelog.json @@ -1,11 +1,11 @@ { "releases": { "3.5.4-beta2": [ - "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189", "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", "[Fixed] Fix: Show whitespace hint on context menu in diff row - #20848. Thanks @zekariasasaminew!", "[Fixed] Improve dialog dismissal and sign-in button state handling - #21144. Thanks @zekariasasaminew!", - "[Fixed] Fix \"Update Email\" button after login into a different account - #21176" + "[Fixed] Fix \"Update Email\" button after login into a different account - #21176", + "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189" ], "3.5.4-beta1": [ "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", From fe93874ae11d2affb3def3d1a5fa423dc7732013 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:39:43 -0500 Subject: [PATCH 0585/1338] Update changelog.json --- changelog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.json b/changelog.json index a7a21606ccc..a01aa931ec4 100644 --- a/changelog.json +++ b/changelog.json @@ -2,8 +2,8 @@ "releases": { "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", - "[Fixed] Fix: Show whitespace hint on context menu in diff row - #20848. Thanks @zekariasasaminew!", - "[Fixed] Improve dialog dismissal and sign-in button state handling - #21144. Thanks @zekariasasaminew!", + "[Fixed] Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", + "[Fixed] The cancel button in the sign-in dialog is enabled - #21144. Thanks @zekariasasaminew!", "[Fixed] Fix \"Update Email\" button after login into a different account - #21176", "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189" ], From 4f2a00bcc0cf7502145e59ac4f9c1cabc9ee69cf Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:39:58 -0500 Subject: [PATCH 0586/1338] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index a01aa931ec4..736a8de2b44 100644 --- a/changelog.json +++ b/changelog.json @@ -2,7 +2,7 @@ "releases": { "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", - "[Fixed] Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", + "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", "[Fixed] The cancel button in the sign-in dialog is enabled - #21144. Thanks @zekariasasaminew!", "[Fixed] Fix \"Update Email\" button after login into a different account - #21176", "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189" From 9fb8ab6df930f5a2e416fe4aa39e0b3d0c9fa147 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:42:05 -0500 Subject: [PATCH 0587/1338] Update changelog.json --- changelog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.json b/changelog.json index 736a8de2b44..8a7d0dc276b 100644 --- a/changelog.json +++ b/changelog.json @@ -3,8 +3,8 @@ "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", - "[Fixed] The cancel button in the sign-in dialog is enabled - #21144. Thanks @zekariasasaminew!", - "[Fixed] Fix \"Update Email\" button after login into a different account - #21176", + "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!", + "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176", "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189" ], "3.5.4-beta1": [ From 5919433f172759426983653183262e18ddf01f5f Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:42:18 -0500 Subject: [PATCH 0588/1338] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 8a7d0dc276b..11ef2957b52 100644 --- a/changelog.json +++ b/changelog.json @@ -5,7 +5,7 @@ "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!", "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176", - "[Improved] The contrast on the pull request check run button icons now meet minimum 3:1 contrast requirements - #21189" + "[Improved] The contrast on the pull request check run button icons meets minimum 3:1 contrast requirements - #21189" ], "3.5.4-beta1": [ "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", From 9f4e9c9d41f639bd1baf49c38f3533bf5685d0b5 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 08:43:16 -0500 Subject: [PATCH 0589/1338] Update changelog.json --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 11ef2957b52..480c5acb2bf 100644 --- a/changelog.json +++ b/changelog.json @@ -5,7 +5,7 @@ "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!", "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176", - "[Improved] The contrast on the pull request check run button icons meets minimum 3:1 contrast requirements - #21189" + "[Improved] The icon contrast on the pull request check run button meets minimum 3:1 contrast requirements - #21189" ], "3.5.4-beta1": [ "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", From 2f776bab0956960906f2ecf40f22b3a2d61f5950 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Nov 2025 16:41:13 +0100 Subject: [PATCH 0590/1338] Safety++ --- app/package.json | 1 + app/src/lib/hooks/with-hooks-env.ts | 58 ++++++++++++++++++++++++----- app/yarn.lock | 19 ++++++++++ 3 files changed, 68 insertions(+), 10 deletions(-) diff --git a/app/package.json b/app/package.json index f492873dab0..6902684b531 100644 --- a/app/package.json +++ b/app/package.json @@ -59,6 +59,7 @@ "react-transition-group": "^4.4.1", "react-virtualized": "^9.20.0", "registry-js": "^1.16.0", + "shescape": "^2.1.6", "source-map-support": "^0.4.15", "split2": "^4.2.0", "string-argv": "^0.3.2", diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 2433a769f3b..d24a20e97c8 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -7,11 +7,46 @@ import { createProxyProcessServer, ProcessProxyConnection } from 'process-proxy' import { AddressInfo } from 'net' import { spawn } from 'child_process' import { Readable, Writable } from 'stream' +import { Shescape } from 'shescape' +import memoizeOne from 'memoize-one' const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) } +const getShell = () => { + // TODO: Windows: + if (__WIN32__) { + throw new Error('Not implemented') + } + + if (process.env.SHELL) { + try { + return { + shell: process.env.SHELL, + args: ['-ilc'], + ...getQuoteFn(process.env.SHELL), + } + } catch (err) { + debug('Failed resolving shell', err) + } + } + + return { + shell: '/bin/sh', + args: ['-ilc'], + ...getQuoteFn('/bin/sh'), + } +} + +const getQuoteFn = memoizeOne((shell: string) => { + const shescape = new Shescape({ shell, flagProtection: false }) + return { + escape: shescape.escape.bind(shescape), + quote: shescape.quote.bind(shescape), + } +}) + const waitForWritableFinished = (stream: Writable) => { return new Promise(resolve => { if (stream.writableFinished) { @@ -64,13 +99,13 @@ export async function withHooksEnv( const server = createProxyProcessServer( async connection => { const abortController = new AbortController() - const args = await connection.getArgs() - const env = await connection.getEnv() - const cwd = await connection.getCwd() + const proxyArgs = await connection.getArgs() + const proxyEnv = await connection.getEnv() + const proxyCwd = await connection.getCwd() const hookName = __WIN32__ - ? basename(args[0]).replace(/\.exe$/i, '') - : basename(args[0]) + ? basename(proxyArgs[0]).replace(/\.exe$/i, '') + : basename(proxyArgs[0]) const excludedEnvVars = new Set([ // Dugite sets this to point to a custom git config file which @@ -85,7 +120,7 @@ export async function withHooksEnv( ]) const safeEnv = Object.fromEntries( - Object.entries(env).filter( + Object.entries(proxyEnv).filter( ([k]) => k.startsWith('GIT_') && excludedEnvVars.has(k) ) ) @@ -105,10 +140,13 @@ export async function withHooksEnv( return } - // TODO!!! Escape args properly!!! - const cmd = `"${hooksExecutable}" ${args.join(' ')}` - const child = spawn(process.env.SHELL ?? '/bin/bash', ['-ilc', cmd], { - cwd, + const { shell, args: shellArgs, quote } = getShell() + + const cmdArgs = [hooksExecutable, ...proxyArgs.slice(1)] + const cmd = cmdArgs.map(quote).join(' ') + + const child = spawn(shell, [...shellArgs, cmd], { + cwd: proxyCwd, env: safeEnv, signal: abortController.signal, }) diff --git a/app/yarn.lock b/app/yarn.lock index e8ceb3d72d4..9745139aaac 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -597,6 +597,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +isexe@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" + integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== + js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -1196,6 +1201,13 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= +shescape@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/shescape/-/shescape-2.1.6.tgz#6185c81049e7e2d510d5b33cabf820b1eaa0b743" + integrity sha512-c9Ns1I+Tl0TC+cpsOT1FeZcvFalfd0WfHeD/CMccJH20xwochmJzq6AqtenndlyAw/BUi3BMcv92dYLVrqX+dw== + dependencies: + which "^3.0.0 || ^4.0.0 || ^5.0.0" + signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -1466,6 +1478,13 @@ which@^1.2.9: dependencies: isexe "^2.0.0" +"which@^3.0.0 || ^4.0.0 || ^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" + integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ== + dependencies: + isexe "^3.1.1" + wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" From 1b5d6e44386254d10e423987c9cdb50452ecda1e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Nov 2025 17:11:13 +0100 Subject: [PATCH 0591/1338] What even is that comment --- app/src/lib/hooks/with-hooks-env.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index d24a20e97c8..7947661d347 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -163,8 +163,6 @@ export async function withHooksEnv( pipe(child.stderr, connection.stderr, 'stderr') child.on('close', async (code, signal) => { - // Ensure all data is flushed to the copilot before exiting - // the connection await Promise.all([ waitForWritableFinished(connection.stdout), waitForWritableFinished(connection.stderr), From 8e8e08266745cffb9a24c3373901035eb691b15c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Nov 2025 17:25:22 +0100 Subject: [PATCH 0592/1338] Only intercept hooks when requested --- app/src/lib/git/commit.ts | 1 + app/src/lib/git/core.ts | 5 +- app/src/lib/hooks/hooks-proxy.ts | 159 ++++++++++++++++++++++++ app/src/lib/hooks/with-hooks-env.ts | 181 ++-------------------------- 4 files changed, 174 insertions(+), 172 deletions(-) create mode 100644 app/src/lib/hooks/hooks-proxy.ts diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index a54b701f87d..44a49b2ce48 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -37,6 +37,7 @@ export async function createCommit( 'createCommit', { stdin: message, + interceptHooks: true, } ) return parseCommitSHA(result) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 5eec52a182c..4b581df300f 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -64,6 +64,8 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { * This affects error handling and UI such as credential prompts. */ readonly isBackgroundTask?: boolean + + readonly interceptHooks?: boolean } /** @@ -346,8 +348,7 @@ export async function git( hooksEnv ), path, - options?.isBackgroundTask, - options?.env + options ) } diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts new file mode 100644 index 00000000000..bec70fec32c --- /dev/null +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -0,0 +1,159 @@ +import { spawn } from 'child_process' +import memoizeOne from 'memoize-one' +import { basename } from 'path' +import { ProcessProxyConnection } from 'process-proxy' +import { Shescape } from 'shescape' +import { Readable, Writable } from 'stream' + +const debug = (message: string, error?: Error) => { + log.debug(`hooks: ${message}`, error) +} + +const getShell = () => { + // TODO: Windows: + if (__WIN32__) { + throw new Error('Not implemented') + } + + if (process.env.SHELL) { + try { + return { + shell: process.env.SHELL, + args: ['-ilc'], + ...getQuoteFn(process.env.SHELL), + } + } catch (err) { + debug('Failed resolving shell', err) + } + } + + return { + shell: '/bin/sh', + args: ['-ilc'], + ...getQuoteFn('/bin/sh'), + } +} + +const getQuoteFn = memoizeOne((shell: string) => { + const shescape = new Shescape({ shell, flagProtection: false }) + return { + escape: shescape.escape.bind(shescape), + quote: shescape.quote.bind(shescape), + } +}) + +const waitForWritableFinished = (stream: Writable) => { + return new Promise(resolve => { + if (stream.writableFinished) { + resolve() + } else { + stream.once('finish', () => resolve()) + } + }) +} + +const exitWithError = ( + connection: ProcessProxyConnection, + message: string, + exitCode = 1 +) => { + return new Promise((resolve, reject) => { + connection.stderr.end(`${message}\n`, () => { + connection.exit(exitCode).then(resolve, err => { + debug( + `failed to exit proxy: ${ + err instanceof Error ? err.message : String(err) + }` + ) + resolve() + }) + }) + }) +} + +export const createHooksProxy = (repoHooks: string[]) => { + return async (connection: ProcessProxyConnection) => { + const abortController = new AbortController() + const proxyArgs = await connection.getArgs() + const proxyEnv = await connection.getEnv() + const proxyCwd = await connection.getCwd() + + const hookName = __WIN32__ + ? basename(proxyArgs[0]).replace(/\.exe$/i, '') + : basename(proxyArgs[0]) + + const excludedEnvVars = new Set([ + // Dugite sets this to point to a custom git config file which + // we don't want to leak into the hook's environment + 'GIT_SYSTEM_CONFIG', + // We set this to point to a custom hooks path which we don't want + // leaking into the hook's environment. Initially I thought we would have + // to sanitize this to strip out the custom config we set and leave any + // user-configured but since we're executing the hook in a separate + // shell with login it would just get re-initialized there anyway. + 'GIT_CONFIG_PARAMETERS', + ]) + + const safeEnv = Object.fromEntries( + Object.entries(proxyEnv).filter( + ([k]) => k.startsWith('GIT_') && excludedEnvVars.has(k) + ) + ) + + const hooksExecutable = + repoHooks.find(hook => hook.endsWith(hookName)) ?? + (__WIN32__ + ? repoHooks.find(hook => hook.endsWith(`${hookName}.exe`)) + : undefined) + + if (!hooksExecutable) { + debug(`hook executable not found for ${hookName}`) + await exitWithError( + connection, + `Error: hook executable not found for ${hookName}` + ) + return + } + + const { shell, args: shellArgs, quote } = getShell() + + const cmdArgs = [hooksExecutable, ...proxyArgs.slice(1)] + const cmd = cmdArgs.map(quote).join(' ') + + const child = spawn(shell, [...shellArgs, cmd], { + cwd: proxyCwd, + env: safeEnv, + signal: abortController.signal, + }) + .on('spawn', () => { + const pipe = (from: Readable, to: Writable, name: string) => { + from.pipe(to).on('error', err => { + debug(`${name} pipe error:`, err) + abortController.abort() + }) + } + + pipe(connection.stdin, child.stdin, 'stdin') + pipe(child.stdout, connection.stdout, 'stdout') + pipe(child.stderr, connection.stderr, 'stderr') + + child.on('close', async (code, signal) => { + await Promise.all([ + waitForWritableFinished(connection.stdout), + waitForWritableFinished(connection.stderr), + ]) + + if (code !== 0) { + debug(`exiting proxy with code ${code}`) + } + await connection.exit(code ?? 0).catch(err => { + debug(`failed to exit proxy:`, err) + }) + }) + }) + .on('error', async err => { + debug(`child error:`, err) + await exitWithError(connection, `Error: command failed: ${err.message}`) + }) + } +} diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 7947661d347..66b6bd28006 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -3,191 +3,33 @@ import { enableHooksEnvironment } from '../feature-flag' import { getRepoHooks } from './get-repo-hooks' import { cp, mkdtemp, rm } from 'fs/promises' import { join, basename } from 'path' -import { createProxyProcessServer, ProcessProxyConnection } from 'process-proxy' +import { createProxyProcessServer } from 'process-proxy' import { AddressInfo } from 'net' -import { spawn } from 'child_process' -import { Readable, Writable } from 'stream' -import { Shescape } from 'shescape' -import memoizeOne from 'memoize-one' - -const debug = (message: string, error?: Error) => { - log.debug(`hooks: ${message}`, error) -} - -const getShell = () => { - // TODO: Windows: - if (__WIN32__) { - throw new Error('Not implemented') - } - - if (process.env.SHELL) { - try { - return { - shell: process.env.SHELL, - args: ['-ilc'], - ...getQuoteFn(process.env.SHELL), - } - } catch (err) { - debug('Failed resolving shell', err) - } - } - - return { - shell: '/bin/sh', - args: ['-ilc'], - ...getQuoteFn('/bin/sh'), - } -} - -const getQuoteFn = memoizeOne((shell: string) => { - const shescape = new Shescape({ shell, flagProtection: false }) - return { - escape: shescape.escape.bind(shescape), - quote: shescape.quote.bind(shescape), - } -}) - -const waitForWritableFinished = (stream: Writable) => { - return new Promise(resolve => { - if (stream.writableFinished) { - resolve() - } else { - stream.once('finish', () => resolve()) - } - }) -} - -const exitWithError = ( - connection: ProcessProxyConnection, - message: string, - exitCode = 1 -) => { - return new Promise((resolve, reject) => { - connection.stderr.end(`${message}\n`, () => { - connection.exit(exitCode).then(resolve, err => { - debug( - `failed to exit proxy: ${ - err instanceof Error ? err.message : String(err) - }` - ) - resolve() - }) - }) - }) -} +import type { IGitExecutionOptions } from '../git/core' +import { createHooksProxy } from './hooks-proxy' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, path: string, - isBackgroundTask = false, - customEnv?: Record + options: IGitExecutionOptions | undefined ): Promise { - if (!enableHooksEnvironment()) { - return fn(customEnv) + if (options?.interceptHooks !== true || !enableHooksEnvironment()) { + return fn(options?.env) } const repoHooks = await Array.fromAsync(getRepoHooks(path)) if (repoHooks.length === 0) { - return fn(customEnv) + return fn(options?.env) } const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) const token = crypto.randomUUID() - const server = createProxyProcessServer( - async connection => { - const abortController = new AbortController() - const proxyArgs = await connection.getArgs() - const proxyEnv = await connection.getEnv() - const proxyCwd = await connection.getCwd() - - const hookName = __WIN32__ - ? basename(proxyArgs[0]).replace(/\.exe$/i, '') - : basename(proxyArgs[0]) - - const excludedEnvVars = new Set([ - // Dugite sets this to point to a custom git config file which - // we don't want to leak into the hook's environment - 'GIT_SYSTEM_CONFIG', - // We set this to point to a custom hooks path which we don't want - // leaking into the hook's environment. Initially I thought we would have - // to sanitize this to strip out the custom config we set and leave any - // user-configured but since we're executing the hook in a separate - // shell with login it would just get re-initialized there anyway. - 'GIT_CONFIG_PARAMETERS', - ]) - - const safeEnv = Object.fromEntries( - Object.entries(proxyEnv).filter( - ([k]) => k.startsWith('GIT_') && excludedEnvVars.has(k) - ) - ) - - const hooksExecutable = - repoHooks.find(hook => hook.endsWith(hookName)) ?? - (__WIN32__ - ? repoHooks.find(hook => hook.endsWith(`${hookName}.exe`)) - : undefined) - - if (!hooksExecutable) { - debug(`hook executable not found for ${hookName}`) - await exitWithError( - connection, - `Error: hook executable not found for ${hookName}` - ) - return - } - - const { shell, args: shellArgs, quote } = getShell() - - const cmdArgs = [hooksExecutable, ...proxyArgs.slice(1)] - const cmd = cmdArgs.map(quote).join(' ') - - const child = spawn(shell, [...shellArgs, cmd], { - cwd: proxyCwd, - env: safeEnv, - signal: abortController.signal, - }) - .on('spawn', () => { - const pipe = (from: Readable, to: Writable, name: string) => { - from.pipe(to).on('error', err => { - debug(`${name} pipe error:`, err) - abortController.abort() - }) - } - - pipe(connection.stdin, child.stdin, 'stdin') - pipe(child.stdout, connection.stdout, 'stdout') - pipe(child.stderr, connection.stderr, 'stderr') - - child.on('close', async (code, signal) => { - await Promise.all([ - waitForWritableFinished(connection.stdout), - waitForWritableFinished(connection.stderr), - ]) - - if (code !== 0) { - debug(`exiting proxy with code ${code}`) - } - await connection.exit(code ?? 0).catch(err => { - debug(`failed to exit proxy:`, err) - }) - }) - }) - .on('error', async err => { - debug(`child error:`, err) - await exitWithError( - connection, - `Error: command failed: ${err.message}` - ) - }) - }, - { - validateConnection: async receivedToken => receivedToken === token, - } - ) + const server = createProxyProcessServer(createHooksProxy(repoHooks), { + validateConnection: async receivedToken => receivedToken === token, + }) const port = await new Promise((resolve, reject) => { server.listen(0, '127.0.0.1', () => { resolve((server.address() as AddressInfo).port) @@ -204,7 +46,7 @@ export async function withHooksEnv( } const existingGitEnvConfig = - customEnv?.['GIT_CONFIG_PARAMETERS'] ?? + options?.env?.['GIT_CONFIG_PARAMETERS'] ?? process.env['GIT_CONFIG_PARAMETERS'] ?? '' @@ -212,7 +54,6 @@ export async function withHooksEnv( existingGitEnvConfig.length > 0 ? `${existingGitEnvConfig} ` : '' return await fn({ - ...customEnv, // TODO: Do we need to escape tmpHooksDir? Could it possibly include a single quote? // probably not? GIT_CONFIG_PARAMETERS: `${gitEnvConfigPrefix}'core.hooksPath=${tmpHooksDir}'`, From 92cc2dd17d6f5454cc455eeb59a55701825f8883 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 3 Nov 2025 17:40:00 +0100 Subject: [PATCH 0593/1338] Filter hooks --- app/src/lib/git/commit.ts | 9 ++++++++- app/src/lib/git/core.ts | 2 +- app/src/lib/hooks/get-repo-hooks.ts | 6 +++++- app/src/lib/hooks/with-hooks-env.ts | 11 +++++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index 44a49b2ce48..d84be370f2b 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -37,7 +37,14 @@ export async function createCommit( 'createCommit', { stdin: message, - interceptHooks: true, + // https://git-scm.com/docs/githooks/2.46.1 + interceptHooks: [ + 'pre-commit', + 'prepare-commit-msg', + 'commit-msg', + 'post-commit', + 'post-rewrite', + ], } ) return parseCommitSHA(result) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 4b581df300f..423b523a5e7 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -65,7 +65,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { */ readonly isBackgroundTask?: boolean - readonly interceptHooks?: boolean + readonly interceptHooks?: boolean | string[] } /** diff --git a/app/src/lib/hooks/get-repo-hooks.ts b/app/src/lib/hooks/get-repo-hooks.ts index da7f74685a8..f28dac0cb36 100644 --- a/app/src/lib/hooks/get-repo-hooks.ts +++ b/app/src/lib/hooks/get-repo-hooks.ts @@ -7,7 +7,7 @@ const isExecutable = (path: string) => .then(() => true) .catch(() => false) -export async function* getRepoHooks(path: string) { +export async function* getRepoHooks(path: string, filter?: string[]) { // TODO: Could we cache this? For just a little while? // Probably not because we need to react to changes to core.hooksPath on the // fly but it sure would be nice. @@ -26,6 +26,10 @@ export async function* getRepoHooks(path: string) { .catch(() => []) for (const hook of files) { + if (filter && !filter.includes(hook.name)) { + continue + } + const hookPath = join(hook.parentPath, hook.name) if (__WIN32__) { diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 66b6bd28006..8911eaf7152 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -13,11 +13,18 @@ export async function withHooksEnv( path: string, options: IGitExecutionOptions | undefined ): Promise { - if (options?.interceptHooks !== true || !enableHooksEnvironment()) { + const interceptHooks = options?.interceptHooks ?? false + + if (!interceptHooks || !enableHooksEnvironment()) { return fn(options?.env) } - const repoHooks = await Array.fromAsync(getRepoHooks(path)) + const repoHooks = await Array.fromAsync( + getRepoHooks( + path, + typeof interceptHooks === 'object' ? interceptHooks : undefined + ) + ) if (repoHooks.length === 0) { return fn(options?.env) From 6069a85ed1ad33c66a3ff89177c8eb711b192b80 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:10:04 -0500 Subject: [PATCH 0594/1338] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43e3ddb75fe..e759efb8a36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,6 @@ jobs: cache: yarn - run: yarn - run: yarn validate-electron-version - - run: yarn validate-macos-version - run: yarn lint - run: yarn validate-changelog - name: Ensure a clean working directory @@ -101,6 +100,9 @@ jobs: env: npm_config_arch: ${{ matrix.arch }} TARGET_ARCH: ${{ matrix.arch }} + - name: Validate macOS version + if: runner.os == 'macOS' + run: yarn validate-macos-version - name: Run desktop-trampoline tests run: | cd vendor/desktop-trampoline From 309dc5a16cf9e7c51e78fe3005382cedaa6f4c9c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 09:34:55 +0100 Subject: [PATCH 0595/1338] Update dugite to version 3.0.0 Bumped dugite from 3.0.0-rc12 to the stable 3.0.0 release in package.json and yarn.lock for improved stability and compatibility. --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index 756314b9b3a..faa175bed32 100644 --- a/app/package.json +++ b/app/package.json @@ -33,7 +33,7 @@ "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10", "dexie": "^3.2.3", "dompurify": "^3.2.4", - "dugite": "3.0.0-rc12", + "dugite": "^3.0.0", "electron-window-state": "^5.0.3", "event-kit": "^2.0.0", "focus-trap-react": "^8.1.0", diff --git a/app/yarn.lock b/app/yarn.lock index e8ceb3d72d4..8377665b989 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -377,10 +377,10 @@ dompurify@^3.2.4: optionalDependencies: "@types/trusted-types" "^2.0.7" -dugite@3.0.0-rc12: - version "3.0.0-rc12" - resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc12.tgz#e4ea9b34f3d542c4d66796e68f309b31edc5d03a" - integrity sha512-U3nlYkfcC7y8PM+87TGWCEzyNoaHkZoPXQodZYHF0SmFM4RrcnKNaxIcN5Gi6RwOvFe6hejJXvMc8oYIJRp7hw== +dugite@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0.tgz#56621ad397579d9a58c10c6a4f5e646b35937046" + integrity sha512-+q2i3y5TvlC2YaZofkdELHtmvHbT6yuBODimItxU6xEGtHqRt6rpApJzf6lAqtpo+y1gokhfsHyULH0yNZuTWQ== dependencies: progress "^2.0.3" tar-stream "^3.1.7" From 11188ddc6d6f7a2b805d903a3c8d7912aca88c47 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 13:05:26 +0100 Subject: [PATCH 0596/1338] Refactor hooks proxy to support stdin file handling Updated hooks-proxy to write stdin to a temporary file for hooks that require it, and refactored process spawning logic for improved error handling and resource management. The with-hooks-env module now creates a temporary directory for hook execution and passes it to the proxy. --- app/src/lib/hooks/hooks-proxy.ts | 108 +++++++++++++++++----------- app/src/lib/hooks/with-hooks-env.ts | 11 +-- 2 files changed, 75 insertions(+), 44 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index bec70fec32c..479d6d581b0 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -1,9 +1,14 @@ import { spawn } from 'child_process' +import { randomBytes } from 'crypto' +import { createWriteStream } from 'fs' import memoizeOne from 'memoize-one' -import { basename } from 'path' +import { basename, join } from 'path' import { ProcessProxyConnection } from 'process-proxy' import { Shescape } from 'shescape' -import { Readable, Writable } from 'stream' +import { Writable } from 'stream' +import { pipeline } from 'stream/promises' + +const hooksUsingStdin = ['post-rewrite'] const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) @@ -71,9 +76,8 @@ const exitWithError = ( }) } -export const createHooksProxy = (repoHooks: string[]) => { +export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { return async (connection: ProcessProxyConnection) => { - const abortController = new AbortController() const proxyArgs = await connection.getArgs() const proxyEnv = await connection.getEnv() const proxyCwd = await connection.getCwd() @@ -96,7 +100,7 @@ export const createHooksProxy = (repoHooks: string[]) => { const safeEnv = Object.fromEntries( Object.entries(proxyEnv).filter( - ([k]) => k.startsWith('GIT_') && excludedEnvVars.has(k) + ([k]) => k.startsWith('GIT_') && !excludedEnvVars.has(k) ) ) @@ -115,45 +119,69 @@ export const createHooksProxy = (repoHooks: string[]) => { return } + // We don't have to clean this up since it's in the tmpdir created by the + // hooks env. + const stdinFilePath = join( + tmpDir, + `${hookName}-stdin-${randomBytes(8).toString('hex')}` + ) + + const hasStdin = hooksUsingStdin.includes(hookName) + + if (hasStdin) { + await pipeline( + connection.stdin, + createWriteStream(stdinFilePath, { mode: 0o600 }) + ) + } + const { shell, args: shellArgs, quote } = getShell() - const cmdArgs = [hooksExecutable, ...proxyArgs.slice(1)] + const cmdArgs = [ + 'git', + 'hook', + 'run', + hookName, + ...(hasStdin ? ['--to-stdin', stdinFilePath] : []), + '--', + ...proxyArgs.slice(1), + ] const cmd = cmdArgs.map(quote).join(' ') - const child = spawn(shell, [...shellArgs, cmd], { - cwd: proxyCwd, - env: safeEnv, - signal: abortController.signal, - }) - .on('spawn', () => { - const pipe = (from: Readable, to: Writable, name: string) => { - from.pipe(to).on('error', err => { - debug(`${name} pipe error:`, err) - abortController.abort() - }) - } - - pipe(connection.stdin, child.stdin, 'stdin') - pipe(child.stdout, connection.stdout, 'stdout') - pipe(child.stderr, connection.stderr, 'stderr') - - child.on('close', async (code, signal) => { - await Promise.all([ - waitForWritableFinished(connection.stdout), - waitForWritableFinished(connection.stderr), - ]) - - if (code !== 0) { - debug(`exiting proxy with code ${code}`) - } - await connection.exit(code ?? 0).catch(err => { - debug(`failed to exit proxy:`, err) - }) - }) - }) - .on('error', async err => { - debug(`child error:`, err) - await exitWithError(connection, `Error: command failed: ${err.message}`) + const { code } = await new Promise<{ + code: number | null + signal: NodeJS.Signals | null + }>((resolve, reject) => { + const abortController = new AbortController() + connection.on('close', () => abortController.abort()) + + const child = spawn(shell, [...shellArgs, cmd], { + cwd: proxyCwd, + env: safeEnv, + signal: abortController.signal, }) + .on('spawn', () => { + // TODO: Do hooks ever write to stdout? Probably not? + // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 + child.stdout.pipe(connection.stdout).on('error', reject) + child.stderr.pipe(connection.stderr).on('error', reject) + child.on('close', (code, signal) => resolve({ code, signal })) + }) + .on('error', reject) + }) + + await Promise.all([ + waitForWritableFinished(connection.stdout), + waitForWritableFinished(connection.stderr), + ]).catch(e => { + debug(`waiting for writable to finish failed`, e) + }) + + if (code !== 0) { + debug(`exiting proxy with code ${code}`) + } + await connection + .exit(code ?? 0) + .catch(err => debug(`failed to exit proxy:`, err)) } } diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 8911eaf7152..efd494c68d5 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -34,15 +34,18 @@ export async function withHooksEnv( const processProxyPath = join(__dirname, `process-proxy${ext}`) const token = crypto.randomUUID() - const server = createProxyProcessServer(createHooksProxy(repoHooks), { - validateConnection: async receivedToken => receivedToken === token, - }) + const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) + const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir) + + const server = createProxyProcessServer( + conn => hooksProxy(conn).catch(e => conn.exit(1).catch(() => {})), + { validateConnection: async receivedToken => receivedToken === token } + ) const port = await new Promise((resolve, reject) => { server.listen(0, '127.0.0.1', () => { resolve((server.address() as AddressInfo).port) }) }) - const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) try { for (const hook of repoHooks) { const cleanHooksName = __WIN32__ From 14ee6bc7258f4fcd373ace4195e5fc8cb29d20ba Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 14:10:23 +0100 Subject: [PATCH 0597/1338] Refactor hook proxy output handling and add timing Simplifies hook process output handling by only piping stderr, as Git hooks only write to stderr. Adds execution timing and improved debug logging for hook completion, including exit code and duration. --- app/src/lib/hooks/hooks-proxy.ts | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 479d6d581b0..d46a42402db 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -78,6 +78,7 @@ const exitWithError = ( export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { return async (connection: ProcessProxyConnection) => { + const startTime = Date.now() const proxyArgs = await connection.getArgs() const proxyEnv = await connection.getEnv() const proxyCwd = await connection.getCwd() @@ -160,26 +161,22 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { env: safeEnv, signal: abortController.signal, }) - .on('spawn', () => { - // TODO: Do hooks ever write to stdout? Probably not? - // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 - child.stdout.pipe(connection.stdout).on('error', reject) - child.stderr.pipe(connection.stderr).on('error', reject) - child.on('close', (code, signal) => resolve({ code, signal })) - }) .on('error', reject) + .on('close', (code, signal) => resolve({ code, signal })) + + // Git hooks only write to stderr + // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 + child.stderr.pipe(connection.stderr).on('error', reject) }) - await Promise.all([ - waitForWritableFinished(connection.stdout), - waitForWritableFinished(connection.stderr), - ]).catch(e => { - debug(`waiting for writable to finish failed`, e) + await waitForWritableFinished(connection.stderr).catch(e => { + debug(`waiting for stderr to finish failed`, e) }) - if (code !== 0) { - debug(`exiting proxy with code ${code}`) - } + const elapsedSeconds = (Date.now() - startTime) / 1000 + debug( + `executed ${hookName}: exited with code ${code} in ${elapsedSeconds}s` + ) await connection .exit(code ?? 0) .catch(err => debug(`failed to exit proxy:`, err)) From 715281a3f0fc1870bf43feb0dc098d4db1a4ddb0 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 14:14:15 +0100 Subject: [PATCH 0598/1338] Bump version and changelog --- app/package.json | 2 +- changelog.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index faa175bed32..2c6243edf89 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.4-beta2", + "version": "3.5.4-beta3", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 480c5acb2bf..4987c31734e 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,9 @@ { "releases": { + "3.5.4-beta3": [ + "[Fixed] Updated Git LFS to 3.7.1 to address CVE-2025-26625 - #21223", + "[Fixed] Fix: menu bar flickering when profile modal is open by adding capture phase click listener - #21150. Thanks @zekariasasaminew!" + ], "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", From 9dfb8d8dc1039ecbde24bc01e2502a814b94687c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 14:16:54 +0100 Subject: [PATCH 0599/1338] Bump version and add changelog --- app/package.json | 2 +- changelog.json | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index faa175bed32..3353980ac2c 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "GitHub Desktop", "bundleID": "com.github.GitHubClient", "companyName": "GitHub, Inc.", - "version": "3.5.4-beta2", + "version": "3.5.4", "main": "./main.js", "repository": { "type": "git", diff --git a/changelog.json b/changelog.json index 480c5acb2bf..9363c3ef607 100644 --- a/changelog.json +++ b/changelog.json @@ -1,5 +1,21 @@ { "releases": { + "3.5.4": [ + "[Fixed] Update Git LFS to 3.7.1 to address CVE-2025-26625", + "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", + "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", + "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!", + "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176", + "[Fixed] Improve host discovery when using authenticating proxies - #19039 #19120", + "[Fixed] Fix diff search results highlights not visible on addition hunks - #21134", + "[Fixed] Add Copilot commit message generation to context menu - #21000. Thanks @zekariasasaminew!", + "[Fixed] Override system accent color for checkboxes and radio buttons - #21088", + "[Improved] The icon contrast on the pull request check run button meets minimum 3:1 contrast requirements - #21189", + "[Improved] Increased title bar height on macOS Tahoe - #21135. Thanks @berkcebi!", + "[Improved] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!", + "[Improved] Allow users to skip commit message override confirmation - #21025. Thanks @ilyassesalama!", + "[Improved] Allow generating commits with Copilot in non-GitHub repositories - #20698. Thanks @schroedermarius!" + ], "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!", From f26dd5d5b834d97a48bb32ed76ad48318cfba5b0 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 14:43:35 +0100 Subject: [PATCH 0600/1338] Update changelog.json Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com> --- changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.json b/changelog.json index 4987c31734e..41f78458b9a 100644 --- a/changelog.json +++ b/changelog.json @@ -2,7 +2,7 @@ "releases": { "3.5.4-beta3": [ "[Fixed] Updated Git LFS to 3.7.1 to address CVE-2025-26625 - #21223", - "[Fixed] Fix: menu bar flickering when profile modal is open by adding capture phase click listener - #21150. Thanks @zekariasasaminew!" + "[Fixed] Menu bar does not flicker when profile modal is open - #21150. Thanks @zekariasasaminew!" ], "3.5.4-beta2": [ "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191", From a0ec77c5a4f82e8709d14c7fc6963f160d980b77 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 15:29:31 +0100 Subject: [PATCH 0601/1338] Exclude more Git env vars from hook environment Added 'GIT_EXEC_PATH' and 'GIT_TEMPLATE_DIR' to the set of excluded environment variables to prevent leaking Dugite-specific settings into hook environments. --- app/src/lib/hooks/hooks-proxy.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index d46a42402db..b51e0ff8f2a 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -88,9 +88,10 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { : basename(proxyArgs[0]) const excludedEnvVars = new Set([ - // Dugite sets this to point to a custom git config file which - // we don't want to leak into the hook's environment + // Dugite sets these, we don't want to leak them into the hook environment 'GIT_SYSTEM_CONFIG', + 'GIT_EXEC_PATH', + 'GIT_TEMPLATE_DIR', // We set this to point to a custom hooks path which we don't want // leaking into the hook's environment. Initially I thought we would have // to sanitize this to strip out the custom config we set and leave any From 1d172ce0619c435baf847e38de2f3f11434cb194 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 15:29:58 +0100 Subject: [PATCH 0602/1338] The temp dir is already 0o600 --- app/src/lib/hooks/hooks-proxy.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index b51e0ff8f2a..723f0a0126c 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -123,18 +123,11 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { // We don't have to clean this up since it's in the tmpdir created by the // hooks env. - const stdinFilePath = join( - tmpDir, - `${hookName}-stdin-${randomBytes(8).toString('hex')}` - ) - + const stdinFilePath = join(tmpDir, `in-${randomBytes(8).toString('hex')}`) const hasStdin = hooksUsingStdin.includes(hookName) if (hasStdin) { - await pipeline( - connection.stdin, - createWriteStream(stdinFilePath, { mode: 0o600 }) - ) + await pipeline(connection.stdin, createWriteStream(stdinFilePath)) } const { shell, args: shellArgs, quote } = getShell() From 5295099fa5d4f21af628a5466233cfc39c42e533 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 15:44:01 +0100 Subject: [PATCH 0603/1338] Update hooks-proxy.ts --- app/src/lib/hooks/hooks-proxy.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 723f0a0126c..ecad412176c 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -121,8 +121,7 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { return } - // We don't have to clean this up since it's in the tmpdir created by the - // hooks env. + // tmpdir is deleted when the Git call completes, so we can leave the file const stdinFilePath = join(tmpDir, `in-${randomBytes(8).toString('hex')}`) const hasStdin = hooksUsingStdin.includes(hookName) From ec1c342c6488fce3e051c173c54cf8b118a4badb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 13:52:01 +0100 Subject: [PATCH 0604/1338] Add printenvz native module and build artifacts Introduces the vendor/printenvz directory containing a minimal Node.js native module for printing environment variables separated by null bytes. Includes C++ source, node-gyp build configuration, build scripts, TypeScript definitions, package metadata, and prebuilt binaries for cross-platform support. --- vendor/printenvz/README.md | 87 ++ vendor/printenvz/binding.gyp | 23 + vendor/printenvz/build/Makefile | 347 +++++ .../obj.target/printenvz/src/printenvz.o.d | 3 + .../build/Release/.deps/Release/printenvz.d | 1 + .../obj.target/printenvz/src/printenvz.o | Bin 0 -> 101496 bytes vendor/printenvz/build/Release/printenvz | Bin 0 -> 51976 bytes vendor/printenvz/build/binding.Makefile | 6 + vendor/printenvz/build/config.gypi | 522 +++++++ vendor/printenvz/build/gyp-mac-tool | 772 ++++++++++ vendor/printenvz/build/printenvz.target.mk | 184 +++ vendor/printenvz/index.d.ts | 4 + vendor/printenvz/index.js | 22 + vendor/printenvz/package-lock.json | 1269 +++++++++++++++++ vendor/printenvz/package.json | 23 + vendor/printenvz/src/printenvz.cc | 15 + 16 files changed, 3278 insertions(+) create mode 100644 vendor/printenvz/README.md create mode 100644 vendor/printenvz/binding.gyp create mode 100644 vendor/printenvz/build/Makefile create mode 100644 vendor/printenvz/build/Release/.deps/Release/obj.target/printenvz/src/printenvz.o.d create mode 100644 vendor/printenvz/build/Release/.deps/Release/printenvz.d create mode 100644 vendor/printenvz/build/Release/obj.target/printenvz/src/printenvz.o create mode 100755 vendor/printenvz/build/Release/printenvz create mode 100644 vendor/printenvz/build/binding.Makefile create mode 100644 vendor/printenvz/build/config.gypi create mode 100755 vendor/printenvz/build/gyp-mac-tool create mode 100644 vendor/printenvz/build/printenvz.target.mk create mode 100644 vendor/printenvz/index.d.ts create mode 100644 vendor/printenvz/index.js create mode 100644 vendor/printenvz/package-lock.json create mode 100644 vendor/printenvz/package.json create mode 100644 vendor/printenvz/src/printenvz.cc diff --git a/vendor/printenvz/README.md b/vendor/printenvz/README.md new file mode 100644 index 00000000000..73150b73eb3 --- /dev/null +++ b/vendor/printenvz/README.md @@ -0,0 +1,87 @@ +# printenvz + +A minimal Node.js native module that provides a compiled executable to output all environment variables to stdout, separated by null bytes (`\0`). + +## Features + +- **Native Executable**: Compiled C++ binary using node-gyp +- **Environment Variable Output**: Prints all environment variables separated by null bytes +- **JavaScript Interface**: Simple function to get the path to the compiled binary +- **TypeScript Support**: Includes TypeScript declaration file +- **Cross-platform**: Works on macOS, Linux, and Windows + +## Installation + +```bash +npm install +``` + +This will automatically build the native executable using node-gyp. + +## Usage + +### JavaScript/Node.js + +```javascript +const { getPrintenvzPath } = require('printenvz'); + +// Get the path to the compiled native executable +const executablePath = getPrintenvzPath(); +console.log(executablePath); +// Output: /path/to/printenvz/build/Release/printenvz + +// Use with child_process to run the executable +const { execSync } = require('child_process'); +const output = execSync(executablePath, { encoding: 'buffer' }); + +// Parse environment variables (split by null bytes) +const envVars = output.toString('utf8').split('\0').filter(s => s.length > 0); +console.log(envVars); +``` + +### TypeScript + +```typescript +import { getPrintenvzPath } from 'printenvz'; + +const executablePath: string = getPrintenvzPath(); +``` + +### Direct Executable Usage + +```bash +./build/Release/printenvz | hexdump -C +``` + +## API + +### `getPrintenvzPath(): string` + +Returns the absolute path to the compiled native `printenvz` executable. + +**Returns:** `string` - The path to the executable + +## Build Commands + +- `npm run build` - Build the native module +- `npm run rebuild` - Clean and rebuild the native module +- `npm run clean` - Clean build artifacts + +## Files + +- `src/printenvz.cc` - C++ source code for the native executable +- `binding.gyp` - node-gyp build configuration +- `index.js` - JavaScript module with `getPrintenvzPath` function +- `index.d.ts` - TypeScript declaration file +- `package.json` - npm package configuration + +## How it Works + +1. The C++ source (`src/printenvz.cc`) iterates through the global `environ` variable +2. Each environment variable is printed to stdout followed by a null byte (`\0`) +3. node-gyp compiles this into a native executable during `npm install` +4. The JavaScript module provides a helper function to locate the executable path + +## License + +MIT diff --git a/vendor/printenvz/binding.gyp b/vendor/printenvz/binding.gyp new file mode 100644 index 00000000000..03777d3988e --- /dev/null +++ b/vendor/printenvz/binding.gyp @@ -0,0 +1,23 @@ +{ + "targets": [ + { + "target_name": "printenvz", + "type": "executable", + "sources": [ + "src/printenvz.cc" + ], + "include_dirs": [], + "cflags": ["-std=c++11"], + "cflags_cc": ["-std=c++11"], + "conditions": [ + ["OS=='mac'", { + "xcode_settings": { + "OTHER_CPLUSPLUSFLAGS": ["-std=c++11", "-stdlib=libc++"], + "OTHER_LDFLAGS": ["-stdlib=libc++"], + "MACOSX_DEPLOYMENT_TARGET": "10.7" + } + }] + ] + } + ] +} diff --git a/vendor/printenvz/build/Makefile b/vendor/printenvz/build/Makefile new file mode 100644 index 00000000000..4036c577663 --- /dev/null +++ b/vendor/printenvz/build/Makefile @@ -0,0 +1,347 @@ +# We borrow heavily from the kernel build setup, though we are simpler since +# we don't have Kconfig tweaking settings on us. + +# The implicit make rules have it looking for RCS files, among other things. +# We instead explicitly write all the rules we care about. +# It's even quicker (saves ~200ms) to pass -r on the command line. +MAKEFLAGS=-r + +# The source directory tree. +srcdir := .. +abs_srcdir := $(abspath $(srcdir)) + +# The name of the builddir. +builddir_name ?= . + +# The V=1 flag on command line makes us verbosely print command lines. +ifdef V + quiet= +else + quiet=quiet_ +endif + +# Specify BUILDTYPE=Release on the command line for a release build. +BUILDTYPE ?= Release + +# Directory all our build output goes into. +# Note that this must be two directories beneath src/ for unit tests to pass, +# as they reach into the src/ directory for data with relative paths. +builddir ?= $(builddir_name)/$(BUILDTYPE) +abs_builddir := $(abspath $(builddir)) +depsdir := $(builddir)/.deps + +# Object output directory. +obj := $(builddir)/obj +abs_obj := $(abspath $(obj)) + +# We build up a list of every single one of the targets so we can slurp in the +# generated dependency rule Makefiles in one pass. +all_deps := + + + +CC.target ?= $(CC) +CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) +CXX.target ?= $(CXX) +CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) +LINK.target ?= $(LINK) +LDFLAGS.target ?= $(LDFLAGS) +AR.target ?= $(AR) +PLI.target ?= pli + +# C++ apps need to be linked with g++. +LINK ?= $(CXX.target) + +# TODO(evan): move all cross-compilation logic to gyp-time so we don't need +# to replicate this environment fallback in make as well. +CC.host ?= gcc +CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) +CXX.host ?= g++ +CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) +LINK.host ?= $(CXX.host) +LDFLAGS.host ?= $(LDFLAGS_host) +AR.host ?= ar +PLI.host ?= pli + +# Define a dir function that can handle spaces. +# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions +# "leading spaces cannot appear in the text of the first argument as written. +# These characters can be put into the argument value by variable substitution." +empty := +space := $(empty) $(empty) + +# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces +replace_spaces = $(subst $(space),?,$1) +unreplace_spaces = $(subst ?,$(space),$1) +dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1))) + +# Flags to make gcc output dependency info. Note that you need to be +# careful here to use the flags that ccache and distcc can understand. +# We write to a dep file on the side first and then rename at the end +# so we can't end up with a broken dep file. +depfile = $(depsdir)/$(call replace_spaces,$@).d +DEPFLAGS = -MMD -MF $(depfile).raw + +# We have to fixup the deps output in a few ways. +# (1) the file output should mention the proper .o file. +# ccache or distcc lose the path to the target, so we convert a rule of +# the form: +# foobar.o: DEP1 DEP2 +# into +# path/to/foobar.o: DEP1 DEP2 +# (2) we want missing files not to cause us to fail to build. +# We want to rewrite +# foobar.o: DEP1 DEP2 \ +# DEP3 +# to +# DEP1: +# DEP2: +# DEP3: +# so if the files are missing, they're just considered phony rules. +# We have to do some pretty insane escaping to get those backslashes +# and dollar signs past make, the shell, and sed at the same time. +# Doesn't work with spaces, but that's fine: .d files have spaces in +# their names replaced with other characters. +define fixup_dep +# The depfile may not exist if the input file didn't have any #includes. +touch $(depfile).raw +# Fixup path as in (1). +sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) +# Add extra rules as in (2). +# We remove slashes and replace spaces with new lines; +# remove blank lines; +# delete the first line and append a colon to the remaining lines. +sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\ + grep -v '^$$' |\ + sed -e 1d -e 's|$$|:|' \ + >> $(depfile) +rm $(depfile).raw +endef + +# Command definitions: +# - cmd_foo is the actual command to run; +# - quiet_cmd_foo is the brief-output summary of the command. + +quiet_cmd_cc = CC($(TOOLSET)) $@ +cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c + +quiet_cmd_cxx = CXX($(TOOLSET)) $@ +cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c + +quiet_cmd_objc = CXX($(TOOLSET)) $@ +cmd_objc = $(CC.$(TOOLSET)) $(GYP_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $< + +quiet_cmd_objcxx = CXX($(TOOLSET)) $@ +cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $< + +# Commands for precompiled header files. +quiet_cmd_pch_c = CXX($(TOOLSET)) $@ +cmd_pch_c = $(CC.$(TOOLSET)) $(GYP_PCH_CFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $< +quiet_cmd_pch_cc = CXX($(TOOLSET)) $@ +cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $< +quiet_cmd_pch_m = CXX($(TOOLSET)) $@ +cmd_pch_m = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $< +quiet_cmd_pch_mm = CXX($(TOOLSET)) $@ +cmd_pch_mm = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $< + +# gyp-mac-tool is written next to the root Makefile by gyp. +# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd +# already. +quiet_cmd_mac_tool = MACTOOL $(4) $< +cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@" + +quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@ +cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@" $(4) + +quiet_cmd_infoplist = INFOPLIST $@ +cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@" + +quiet_cmd_touch = TOUCH $@ +cmd_touch = touch $@ + +quiet_cmd_copy = COPY $@ +# send stderr to /dev/null to ignore messages when linking directories. +cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") + +quiet_cmd_symlink = SYMLINK $@ +cmd_symlink = ln -sf "$<" "$@" + +quiet_cmd_alink = LIBTOOL-STATIC $@ +cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) + +quiet_cmd_link = LINK($(TOOLSET)) $@ +cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) + +quiet_cmd_solink = SOLINK($(TOOLSET)) $@ +cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) + +quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ +cmd_solink_module = $(LINK.$(TOOLSET)) -bundle $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS) + + +# Define an escape_quotes function to escape single quotes. +# This allows us to handle quotes properly as long as we always use +# use single quotes and escape_quotes. +escape_quotes = $(subst ','\'',$(1)) +# This comment is here just to include a ' to unconfuse syntax highlighting. +# Define an escape_vars function to escape '$' variable syntax. +# This allows us to read/write command lines with shell variables (e.g. +# $LD_LIBRARY_PATH), without triggering make substitution. +escape_vars = $(subst $$,$$$$,$(1)) +# Helper that expands to a shell command to echo a string exactly as it is in +# make. This uses printf instead of echo because printf's behaviour with respect +# to escape sequences is more portable than echo's across different shells +# (e.g., dash, bash). +exact_echo = printf '%s\n' '$(call escape_quotes,$(1))' + +# Helper to compare the command we're about to run against the command +# we logged the last time we ran the command. Produces an empty +# string (false) when the commands match. +# Tricky point: Make has no string-equality test function. +# The kernel uses the following, but it seems like it would have false +# positives, where one string reordered its arguments. +# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ +# $(filter-out $(cmd_$@), $(cmd_$(1)))) +# We instead substitute each for the empty string into the other, and +# say they're equal if both substitutions produce the empty string. +# .d files contain ? instead of spaces, take that into account. +command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\ + $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1)))) + +# Helper that is non-empty when a prerequisite changes. +# Normally make does this implicitly, but we force rules to always run +# so we can check their command lines. +# $? -- new prerequisites +# $| -- order-only dependencies +prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?)) + +# Helper that executes all postbuilds until one fails. +define do_postbuilds + @E=0;\ + for p in $(POSTBUILDS); do\ + eval $$p;\ + E=$$?;\ + if [ $$E -ne 0 ]; then\ + break;\ + fi;\ + done;\ + if [ $$E -ne 0 ]; then\ + rm -rf "$@";\ + exit $$E;\ + fi +endef + +# do_cmd: run a command via the above cmd_foo names, if necessary. +# Should always run for a given target to handle command-line changes. +# Second argument, if non-zero, makes it do asm/C/C++ dependency munging. +# Third argument, if non-zero, makes it do POSTBUILDS processing. +# Note: We intentionally do NOT call dirx for depfile, since it contains ? for +# spaces already and dirx strips the ? characters. +define do_cmd +$(if $(or $(command_changed),$(prereq_changed)), + @$(call exact_echo, $($(quiet)cmd_$(1))) + @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))" + $(if $(findstring flock,$(word 2,$(cmd_$1))), + @$(cmd_$(1)) + @echo " $(quiet_cmd_$(1)): Finished", + @$(cmd_$(1)) + ) + @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile) + @$(if $(2),$(fixup_dep)) + $(if $(and $(3), $(POSTBUILDS)), + $(call do_postbuilds) + ) +) +endef + +# Declare the "all" target first so it is the default, +# even though we don't have the deps yet. +.PHONY: all +all: + +# make looks for ways to re-generate included makefiles, but in our case, we +# don't have a direct way. Explicitly telling make that it has nothing to do +# for them makes it go faster. +%.d: ; + +# Use FORCE_DO_CMD to force a target to run. Should be coupled with +# do_cmd. +.PHONY: FORCE_DO_CMD +FORCE_DO_CMD: + +TOOLSET := target +# Suffix rules, putting all outputs into $(obj). +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.m FORCE_DO_CMD + @$(call do_cmd,objc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.mm FORCE_DO_CMD + @$(call do_cmd,objcxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +# Try building from generated source, too. +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.m FORCE_DO_CMD + @$(call do_cmd,objc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.mm FORCE_DO_CMD + @$(call do_cmd,objcxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.m FORCE_DO_CMD + @$(call do_cmd,objc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.mm FORCE_DO_CMD + @$(call do_cmd,objcxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + + +ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ + $(findstring $(join ^,$(prefix)),\ + $(join ^,printenvz.target.mk)))),) + include printenvz.target.mk +endif + +quiet_cmd_regen_makefile = ACTION Regenerating $@ +cmd_regen_makefile = cd $(srcdir); /Users/markus/GitHub/desktop/vendor/printenvz/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/markus/Library/Caches/node-gyp/24.9.0" "-Dnode_gyp_dir=/Users/markus/GitHub/desktop/vendor/printenvz/node_modules/node-gyp" "-Dnode_lib_file=/Users/markus/Library/Caches/node-gyp/24.9.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/markus/GitHub/desktop/vendor/printenvz" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/markus/GitHub/desktop/vendor/printenvz/build/config.gypi -I/Users/markus/GitHub/desktop/vendor/printenvz/node_modules/node-gyp/addon.gypi -I/Users/markus/Library/Caches/node-gyp/24.9.0/include/node/common.gypi "--toplevel-dir=." binding.gyp +Makefile: $(srcdir)/../../../../Library/Caches/node-gyp/24.9.0/include/node/common.gypi $(srcdir)/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp + $(call do_cmd,regen_makefile) + +# "all" is a concatenation of the "all" targets from all the included +# sub-makefiles. This is just here to clarify. +all: + +# Add in dependency-tracking rules. $(all_deps) is the list of every single +# target in our tree. Only consider the ones with .d (dependency) info: +d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d)) +ifneq ($(d_files),) + include $(d_files) +endif diff --git a/vendor/printenvz/build/Release/.deps/Release/obj.target/printenvz/src/printenvz.o.d b/vendor/printenvz/build/Release/.deps/Release/obj.target/printenvz/src/printenvz.o.d new file mode 100644 index 00000000000..75ff6c1adf1 --- /dev/null +++ b/vendor/printenvz/build/Release/.deps/Release/obj.target/printenvz/src/printenvz.o.d @@ -0,0 +1,3 @@ +cmd_Release/obj.target/printenvz/src/printenvz.o := c++ -o Release/obj.target/printenvz/src/printenvz.o ../src/printenvz.cc '-DNODE_GYP_MODULE_NAME=printenvz' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_FILE_OFFSET_BITS=64' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' -I/Users/markus/Library/Caches/node-gyp/24.9.0/include/node -I/Users/markus/Library/Caches/node-gyp/24.9.0/src -I/Users/markus/Library/Caches/node-gyp/24.9.0/deps/openssl/config -I/Users/markus/Library/Caches/node-gyp/24.9.0/deps/openssl/openssl/include -I/Users/markus/Library/Caches/node-gyp/24.9.0/deps/uv/include -I/Users/markus/Library/Caches/node-gyp/24.9.0/deps/zlib -I/Users/markus/Library/Caches/node-gyp/24.9.0/deps/v8/include -O3 -gdwarf-2 -fno-strict-aliasing -mmacosx-version-min=10.7 -arch arm64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++20 -stdlib=libc++ -fno-rtti -fno-exceptions -std=c++11 -stdlib=libc++ -MMD -MF ./Release/.deps/Release/obj.target/printenvz/src/printenvz.o.d.raw -c +Release/obj.target/printenvz/src/printenvz.o: ../src/printenvz.cc +../src/printenvz.cc: diff --git a/vendor/printenvz/build/Release/.deps/Release/printenvz.d b/vendor/printenvz/build/Release/.deps/Release/printenvz.d new file mode 100644 index 00000000000..c3dd91cac25 --- /dev/null +++ b/vendor/printenvz/build/Release/.deps/Release/printenvz.d @@ -0,0 +1 @@ +cmd_Release/printenvz := c++ -stdlib=libc++ -Wl,-search_paths_first -mmacosx-version-min=10.7 -arch arm64 -L./Release -stdlib=libc++ -o "Release/printenvz" ./Release/obj.target/printenvz/src/printenvz.o diff --git a/vendor/printenvz/build/Release/obj.target/printenvz/src/printenvz.o b/vendor/printenvz/build/Release/obj.target/printenvz/src/printenvz.o new file mode 100644 index 0000000000000000000000000000000000000000..0efb42aa79f06fcf09d858c8a4a4cf6dca228d82 GIT binary patch literal 101496 zcmdqK2Y6Lg);_-XNp1)v#CVe!A|ZrC0gVEohKLj)N)uA(3LzCDX`}!KMFfSYNU@DN zb{rLSY-0guR4kvpjLz6*9NXw8wy_ti|My+z?0e5W_Xhn)zVG)u|2)q|NSRF$19~3{>nfT!^4Zm3G9sFH-hGbQ{92=u|gFS!nEq|q@Emf;p z90j7ZbXLKT(xdDY{aHvBo~2a^p=h<1!u*w%R#ug_E-9^Ts1T^Mbkf`j#m5_3 z89ysxZ0PR{CiIW)1AoR}S$TO=)e6QJ>hFT?w&@+Qww#&}$Z8T1{ngZ0H_*WAZ=&DM zmVS{fe>lXJ-=V(sb~2*Brn34aRn6i4N^h_;?XiVQz1c|wMMQtiElpzKjj!*GcE;*k zZ28Ks`YUT}tgR}oFRNpCVf8(`#2zPqaoX|NdA4qQm#rs0+h0TZDbm5-_$Dm0^B?9o z*jM)3{7HO`Wffk3RgOP1MEjKgHh(RrHb$)PYmUF}Np^tSe$}5no~xVCfXL#FZ*QX= z&n~CF*R*QIsj{?PV`|8sr~RDyQBzNMVg9aJZu|SLr=5A;3R`c7Kd0s){)WP=7k)Mu zht#2xaS*nN_-#c#N@k+nHPBi0zn-JjO#qpr5I_FW2Y-y4`eu>gAd^1u8mq_e<1d*%OWl>yPi;dSTbr%%``(I5-U+uCy%VK&z7>_U z^KD1}WtdyZ88=m3m&^Gu86%tcxz+eZlzMu|d-P`eNBtCHS|Iz;OFPE@a*|Bg!C z`L5#&op85_XEEZ5%^bgb2kNYK_ao_>@ry(qep-Dz>REvLPC~sW?)ZMmaXZiszuF#b z2h~H}^<9(??GnB7o2aOrU!#rMfAurpH*h8q- z%T~(MZzBF2PaWSzf4qY}vg>)sM`ftX)d^}JrcH8^TKgi~VSnw(vii)#6sf60Z+!!T>(e4 zO)}WvOT!&44R~-8k2(&X2{@YfS0@>aXi2!EC0<8QIJr!BX*J(#@^{B1J7DTQ8Sw{eKc<2;Tun*Jk2?lO#VD<(;Dju?ACOTvEA;h8LaCU;R8+#) zxHur)n2d`Xi)8F*9fh;Q?iA-}Tub(_bf2V=apd6+7I8gcJS8cw$8fOmw!(tO#gB;} z8kc^MQaukr0Z|D0S;gPknBhIj|0qjmFou*C-&H(@Pygv*(WWMdu~DJZ3KTsZ=j zQ0getpr-hvgUw}+he584uBIAnGTLKp$Y2?IO6AAgjNz?F`{!%5lJEH$e?{(T+g`pIA$5;G>gv(hpn3zj50WCl^X3a9U4dDe3x;cD~<`an{m96 z^KeYGHk0PqAyP?JWUMPr^wc<4W>@QuxBF7538p6l#T{q+%7~}8iAgFjtkDRQJW(rE z5NHP(=*)AxD-R+#A!uO_p2>mf4t9!6cTA3{(HQ<_k1}l#_GErNzK5Bx7{xN(m74BT zR*XznU`m}hTvWn@*H;Gy2#m$eK3;#2HDi>yj$kl_1BA0=W2E{&=-jhrT9W#OJ zhV+A&m^~OFDK#fJ73?83*VRj|F+MboqkNu=oRSnq&o`53I?7%Uv~^EYj)aqfRB+hX zgXH8ugZk_SUC17@`)g5vGy5HMNNLcQX~#^IzSxKAaW}?xEDPG8JZWp%lsh)Sl&T0g zcXsVcRStLgs0#W(>DW2bL-odW8oO7emT>-Iu>>9F>c5&k=pT27of4;KW4&-0`)PKJ z>BicCDxFqGC+wp7I2kBPH4Jw;t&szQ)N+?+$<*Wx53`67HpeQqLNDZLk))5w)`KM6 z6%-7AWs2yl(4Okl6dX_65(QY@AHZqHN&55@Ij*i5q)$kq=QGSOHtp<;;kDYfs6;tu zYBsTb{8|SbBc7Q_t%rJy&uC|9r>&(g&epg}R~ukqPm~j2zfp6SW#&*jI8$z5a-X9I z1v)GMo~yafF!|04m^cQqv)QD%0(^eJr<>bs(BMc_YK!I))K+aD^OV|V+`5faFD$*< z=S}uy-=S(Sa!tfyb>RysZk?jNUOY5w(m2I-!_H1zmvL*krCYb$<$ z(W9wH#~*EUANAPyT%*TOPmIqudN=Bs@#BmhOMQI&M5A}7zE;OiF+dLitoT_5h!Y?> zo~xP?Z@d7p@kdpiWMB%&1$T79RXJsME+^gvup+0PSFAy%glUgfETlWl$FAO5vT@Mj7guAZ2HzrSdNZ zzkylD1bHXxCPN(?q}*BW0RJkpj@Lz|RGS}NLDw&pEA<6_)`TE$yFO$e;1n2Hlk^@W z8L&Sc`Y2)r`sGTe61F>M|1$!gx`^Bq%#cL!$6cP?NGfG1sOw43U`eL! zKCy7oB))rb*Ju^G$+u91^526@TNA+*X)Z>(GTZzM0KcW<5?$u-$xJAJH{>6TpEX-^ z{zy){@+qSL|Mf^vbKC{eN~IKoYh$*#VVr+G@SDiZ4-{rb;2!~R=PXzdM!f*)8|FGG zjQRm^-zrcihf&#pXOdbJ7XAW5m4=0wayGd8nXSylsgySX^}+(3RUQH#1E`*Gr3+4$ zhOm32mbhhl@l2RrLGxA@oXq`?@?Q)5adIm(0m8@MyvoUB);tOoZiZl+pm!?{brJ&d1))51W_>?$1e4De{H zzfSx+5-RakY;|H0&bSaw+6Z)RPb91#(*A||^+GZ#IjskV+8sznCm;GR2;DpSjc6SD zeIwG}gFF(fZvx6ueK^WL1f+dq)4w#-af~7T2e*m?kk83THa5M7Q71x8O!vFh%=A>Z z8l9eL)JZTNmvI=>!Hi)k&NTWCf~GSWpYH_FI%zm4t!!j+5J{GuM?W#dYz|l^PlUa) z@u_ZnGI86@G?zKuNS@>x?&xfT>0Se7b{ov}8i*U)!-II%YdKm?1QcCSQfBpbwmT03l@W257t6X7pacC9PB;J z+pvY+w9a`D+IvKBuUrtPg)RcGj`Dp93L$OC_yUQhVX)hXz%phc=sRKIYsb0G(F=`s zuGX2%;X5C$b<+JTLk(I2TDos@5KVrV{%zweUN~z#a$Jp{?*g_?kj6sJ9{@Z}YWXwt zj#BI%m3UR!Hy8oKF$EHiPUG^0og5s^1;JkWCu<1L-#0?Z%{^SH8_||J*BYSIV`xD= z^aX5hWGl4sM7-zS192ixLdQl8+YQIF;8EWYh4U6T-UFbQzBVf1F(ghWb6pgOgrkvs zh3a;yYJ~48F|3G6coB&^=)O`6--G%QiqKV5N5&)1{bZ}7bT<@{Ix@>3OArpmL#pb@ z@c)5)TKl3#_;O*;OE0iJABOb}eUf;lt5NvrlcC0r%rol3sMvAvoG6~fU{MqQ2w`Q3>OaLmdI-2J!b#s59wa)Shgxg%Sj=vEK!k5ipG(3^QrMkJ*I3m_I#g zIP>2{P$xagY9^0Cu4G1${3LXhw*VHqX!Tswe^CSsSu@r1c$hyS_{^xh_mG%|3ugUh z)aQ=v-^A(9VmlqSWu$dsRL?h2GoN&0&!}D!#(!L4sL=x9R=z7V3COnn*=3vjF9vGk zv2tzZRE4-*3!C)2$#;U826%CIrm1d{dtqrDr?|q1Wb*q#-*em+(ySaTPWBczDbb3B zY+OE0k8I|$*yFaaFb|yq9`)i*XtQx()la!doW=usp739zcTljSrSnwJV)WaGf<;C7 z59(*{HuOu;L+q(;MvioYf3D%*@$%B*{+kT{zL%G{{qb3j|Bt-<2=1HwCma5AFaH#$ zhyNPzeHrYR(av~v;#2-F4E0U4GdxWd{RP=rA7rk5VYx0g)Q@4g{u@-RAGwt8UpNp3 zhpOs%XD$|c4RV7Ba|$Q>I7(fk#6Jc5pX*|P zrG`;gf;xk9JuQs-5)>AKmCp83DaC-VAT>Z1Se!{MlS8^XWxFvL=rvF&-+&vBajTCE z=OzQcncVPj?jhikZi1I%Mf>ZbcrwG#J<(=WnSK%m_Hl7%FEjmbNbPa|7Bj@p7^(e?=}eK zH+p${$C3a}_%)Gu`;aBg;$LVi&+%F^QoEu3JB-n}k&Kl8E5o1X|mv?#ZRB_ z>VKzzdx1;5*LxjEeN!@rC{>G}-r>$`kL(q|pC-4{#VP;a0S(4ttiHw5h05O_`w^k; z@btd&p9*RnTJ1IV@NDP^Dh*A=ew;@a^tsHvGT6yuF`)((rq|eCUBr`Fr8~ zRZ9BYYw7B)N@MgzBqQa&&G27(`CxbX_Zg#}F`glA55e-`O5KN_PV(~N#IE>5#;AXX zM()9Q@Ce7}fQaU4N6-Dx-{9hWrI1(?>EC0egrS8QKcZ@t;DKWeH z>p^2#wtvfzP8;obU)FIRSI;dr=C%7bSN>a#WnIUXu15dCm^XUOr4MCekILG7C*spP zwsb}Ox-nn3e{)|MVKU0(%-pFZ4!W zZ+MMdfgLr$F?!EySw{#yf?lF0Cym?q-<&T=|lzx<#50-9Q78}b!`?qxF z{B1 z0(u9TCCrq}&~=SIVP=E;*E zRixAk{PZ^xw!QdvaRqvc8k;*SK{74rsbBOx_ zm47q%xY;OVyo(PMqVf+1w}O0$ix1Ah2q~4n7WN-A&w}5cCuR-?GJd-3x8_Nf`JaC} zGQGx(jh>7ue=pz@=7L)3p_~RT2lqJnQ(ZiF%PRk$hFasHk{`$=|KdC+>m^>k*HH3* znvW~Y1#o@2i|6@Ovdte0PWUUlyzPHC_&z5g|MebT<>vwx>Shn+g!U)H-|pq5=)4gp zE42wfeP^t5G2raeq&@SlGW4G!(00S+eFK|m3*q9Pj%^lzzn?abdTatGtm>E-zz>1;D)j^+K$WI(ZY zh-$2FGq1;E?hV{7Is6&`ymXFv7-c0FGs9eVb{h5&>QxfEa^8Wka8!(W+&MZVpL{s% zxKTMhKny4OR0MJq2p&&kUT_Yl$$XT+-pCEFoMy0G^NV?(I%A-P%Gm*o=f^Q0Q#ZKW zC9?y}c?&G>A;)}K=U7m>eW!rs^+C*c9a!W|1uL~zI>dyr*!9b6gUL;F;?t-1wVW8Y%%uMNy#iNA?MJKIf`>3qG zK&BBbKh171hp}%x4w?n(Y|<^kOv$vg`K+zr?kC^AX@JyGC!I+@$(KS^eP}87nYyj% za~{&Ns@QF9)+;94d5?r2^k+tw_ttWw$f4vU@neZix`AeJsip_v*_aQHNb?JdmAow?0>{2Ar7~;Qm|o@#`e^_&j#bE#D0@si|lOj*rOSyot1u^{A@6`P3#xA+xQu5wf^3cN&O2Hyf)yQiNlrdK6MCh zU_OiAajeJR32LxkIV=nJvJ-t1_=}c%p*^unkK1M8=4bG}W?Z^X;O$FAZa28tUU~2zHz zyw4N2M9)9cahfA>^sI(1_Zj2*>z;uj8keE{ZzB_L^TgG7Gx_@;Y~MwRTNXyOg5q72 zxaKfw4`ANeiCeAT^h9w>u5)K6?g;HKfDP~L#GT=_^KS*r8!>U~!>G3b^F~bE#xQCS zVBUy{+l2QtL#pp@0mYqi+~zRqFQ7Q*;*}GIa zcj_M4A;slrfA3U#p(^eP&8ZlSQjF~!{$()YQ8n(bfv5lMhE8T4<-f)7uX*`Ev5w_F zWBJDZE#0M0?&XyJjyI1ztu8eD`(8d+x^4NEvHW=dmQJ+?rP-$habI|wl+|{ORvM#k zy+(y-8pr4XWAvlfh=I8)8;g}No`%F(mZuv7mRO8|5tq#3dU%aofn95i61_&Qz&dW~Fx4M}%A4fYy&13SxDj_A-* z`Cow%m(1dh^%}VX8wmq3n&dTd1-8K$P4OCe1AEO_&g{@q`ExSt)v&m^UL#jv7a5~c zuaPUT4~$Wz*T@^#1gwN{nJ(^>4lR}cQW$Z`EUw9G3BNBYvc`V zr?EV{LrXPDj^cOmfi(Ldp8N+KwOohaLsdWQ$5h|`I1=f;QxD_zd2Z95gyAAwGWP5{ z*0&T=_e>eW^B11R$_d#9f(7SdI|IARo_tdvXDhTv@#~ouKNKuVEdi%h8gudqs-CGT zEgRHqTx|Bt9P3*Q8PT%}@vL&rfT8WV+VQ+F%=7WS%S++zpk6)XxxSyEBqkmo7r$5q z-UvCN9~3^_mN*S3Io1TRk<-ZKbeFsWTa_~uMm(WOoV=DOs^MY>&H|e_-8==zqHJ0n zQ3>V(vNJ9FDL@z5Pm03FKZ5S$8N@-`k>M3)nir&0*1JH`%Ye>j)47?Wfi5Cb7I;eU zY-tLd0)G!Y_TZrf(Wv2N01rMEr<(F0Z5)t;^9xc9F%~WhGL1IQ{m|G6M*==)80?S3 zNn+FlIz4z8!@f$&v4PEmm~TA~rd7+G)tjKb#rKpRRl10(_za zzl@CD)hs&gu8~UZfqBMZ(=l#Tw@rqdemyguN0sww`lnEb-a?fJ`V*}!v3#yDBdg#z z4C{D=db<>%)Lo9u$nHKf6}XyFg6%E`eZsK)4=U6Zbzo);j6nC!D+7HT>5H*>)RVh+ z-n>FxbsdXsFxf+s8Eo;l9DJbDRv9_T;J*e_ z#3!;1{jOtX-ESq%dD$Y#9w&?RIN`2>8*{^w_!**Fc zX2wsYlRDTKINdneWsNN1yHl&g&3bHMc`<}3#srJvdd|ECM4_&^SzlLf+0#4!znL*e7c$hW{0&O2!LRqYP+DcR1AT_fcrWvcVJ3t!_FExYy*DaV zgO94@n*JHtJT0y3OWZfA#{VD!Hk{Mjh`P1EEunPx~5XTaZ4q z*BmCJFGG5K>dHvhrg6`LGw|N6re18`q+!5GpQ2E#!5ju= zCD}{Oqvtl`Jh;9V6kqvCy*faDWoLX0OyV*y*ZoX@y(cb{S({{e7b)vd@NKlYF>iE; z%_OMFJ<$rueDOi``KZ6Wn50v;^!Wy9t|sZ!tyzyl9#IPiw|E>-wew~T2j51U+npsn zClHmj4(O9)?h3p_<<$B`qILM)_i#vHst=dRxQM1xH)mzQqJma?JXTq!0KJvWV_xPi zpx={uCbUdDlLq95^zEjs6)L}N;2Siq~rxpQ!EFdN?8Q_dUEnUr{QEq zq}&4hOLCcL7Sjjz*kHJ7?sp*h4qoa&(DGV^6`Zd2q?|Xl8H)<|rRHdvdsZSJ9e3MF z)uqIF>tOhI8Xu))4q1tOM%r!cnT+#ZhxL#aftk=B)sI7fnXkuN_*6yptDV@&M=`Xfn!}@YaIM#5H~9S*_UB;+HyI%QUbO`L?mk zSk0RX`Yf89XiWJ2afr#epr4@0EMvkql3garbgt&T2%AJ4$WrH;&^QX+cEQ;-FBOKf zXuQlgJ)1?k5$(@oHy&~`4KTw6{tt0dPQCf5WfR|q|5FKF&S(kHrd(o$s| zwHBW-z%PBer@YgJUSsGY4}HGSFB^J}hrUke0cSeSH+g7Ybf~P841K8q^qhTi6(<*F&G#n2acXx>#*SvMK_LJ!TMrLtZ( z^hF+ekI>ocozO1!(2onf(9oB7=;wsK)X=~4&@T!7s-Z9S&~ghuE8#4s>}x!{q4w_?;Yzc5Ih#J65`GC7smMEw3BtTM&&fgqCn9SyVE zU?{WtK?_$uUV6c9&|G~;f5=>o>!fZpMBX$$61EGwrL;rm;51Z4{{`twt&bz^q6W|a z;p>DCVKlG`N~;x>-L4ZphkoYq&`*QDRi89}m0hAW$qE)Z0U7W{{zc%P!_PV)z$H1< ztAGbrf|_jcO=GEuO{MfY)p;>{3YUX)(lk1=-$zcF4NhLno*KsaF9s(sW={(%?L|=A z(TUddFe;(Vc`^IMFlrhoc`gfPVx(Yq2%6AjGxYtdpxDYlP*0!q}As?QB2Hru@;TJ6|uT zumaaAHqTdJmH$NW=i_HpS%uJpRY+$3WMUX+FnEzh)xkn!Fxh-BY4#d6yXCZM%BwJ! zx7h1kuzjda8N3EF8CMflgPUVBsFZrcHM+S{;r^@AYXzMU5aDjjFkt^}mXn)ub;tkNK{E^W4ERuCN^CumR0=3FJ9Vqt(R)1?K5yLpo z4Lk_CJLlh#W&kIRvNQUD@(o%m$6_hWXfs$@sND!4Y0nTIpm;gG(4NJ>MyLw8^WGq*f&LOGwOSyo@LbkhN>5BG3xuGUS`yf z#rSHY{)cM%ZBV0e2uS*rYWAO@evMz!GwV)}{ZOF<4nWsIeV@=f0qAR}qs{~LZv&~)9NZfxl+yhgCi;2V0EIRl0=gKhE&EUQZP! zI_0m2(Is>;BC?aK3_of=PM(4h4-LL!yiV*x$7hB=*5ZJ2MM~Aa0mYbkJj#3UG{nisRpu`9D1%~@D**#&!G-cc}~fuFD3IF&U8m$7u` zy!pni!Z?-X1ecx5=@~G-icTwyQ(0JW85g3t)w~;xU6tLGR-&vfxa>SVH1ApD_zyi- z+dbqgF}QLBdurZy#(0TwFN+N><48TG2K%1I4ng~l((x}N(I36$t6{&bU8{TMKzm*2 z3LXEUp--{t#Q4t)vP_WZ_-_nQYnxc{KN_S?kj!`sb507W7r=^-H9&&^vGEB8XcS<4 ze6j(S3$QjizPCY6wUOBPegp;N+!7;GR9zk1G zx)&x#T@1a*d1%jLR#Z3~d+JGI!5o#-nJl(5mmvKjeuodtpD8mc@R;3V>k`7(or26P z?(l(jj!eKs_#GA~j>Yx>BBwxyGQlA!2dtF=L-BD~5l>wfpCKq8KT@R|k-mred=vez zxf4U%-Ta`t`Qoms>38^Q8GhL(pku0Qky=83YVorIO1kRrNRPS{MpZBh23tg^`k7@; zg|n-J4Obm(xFymIV|{aBt^210vdgo(JS*#eh?-{ZVJ1eQZ2alEKf-(!epyHHCZ^WY z`AtCHl*~Gs!1NoS9(xPaK@$=0^f#a$M|H5M11vm0PIZW=XG5J%HCNI2IjF@{hqB?9 zrlQcfR7Y}kbm?NKCsQ3E>UyYURF9!ra}b8%9u&qu^Qrf&k-cXO1kR86@y~p*J?q#* zaG!G+m_l7NRz%Gd2!%0X-(}6CwJV)o1rkuLcJ2kx(#xEBeHEVVa5 zTMQFDC%Sazy`;_r^)M6Dka!M>+S%A_wQb5~mXk^W#T!*6Z=xorB2jm|4|i6OC`y3W zWHbiY~)sJj~ZFJk@~;0sxXX3d-c0{pX>Qh5$O$?%Qc(`N1kQK(P(5@N<`*m{i)KO$-72H>#S z1~Fr61V`O!aC`KWo59S|_h8$oPkD&`Y9iQXpOg;Uv%v6g`Hk>t;+byZYU%DPdJ2RA zOzY@owBJh-OwC&msMjadoP3K-{*~RM&`iIG;nFxvqM{iXjb1Yx>3lHT0BXiBh{wwx zwxCBzHrjU-4Dh$S7iXhWM5QTeRd@8fnz0m|!B#n3)}($jn^|~K1XAyg$(VUE*%2Rvoo&ZZ^0;n06Bcn0A%Vd}wHFF1xJ0k*#@3`d6 za8?_mPP1BJLe3V%M=Ec25>@Ux|pnED~{li--r$5V7Z6ienDBnBv$|t`V{9IT5u# zil{rXkzD;a5e>6MG}ee%zD7jTH6oht7t!*Hh}LgJtVmhT>??yLXMO+-yf(Jjoyb=#GeUDA%RXD89bXH!I zU#h|o$vFbpbmB`w@nT@D#Lo!DR|C72_ywW(PGHaBH)$08VjznDWZpc)vO>XPy=xw2 znf|NDa=lk%h5R3smV#Pc0LzwwI$bETL9;np3YzpuqPJ+?f@~>Rp*M=75XcYSLq%r$X}~7MQ+z4Mc$yNi`=2hMc%AeiTtD9Eb=yey~sQDeIoDHFNwTY zeWPLW^gJtDu-FN^$Ie=PDFZDC2grQloLN91>U zn8Yqc_M$(*NXgE|3&04`W2DN`a-0(VzG$bQeasbBBQL)BBQNY zB7N2=B4ezzBD-0ai0p3NBC?0|u*f*;Rgv-5e?<1QqOoY*QgD!UsK|q@5hDE-pXh5T zNV3XACR-~-rda2TJjA+5WU9qQ@0NmI*1tujSwD+B)JnrbL`y+$Yp}?4t3YHQ>m-pG z)^d@3t&Jixtt&q4G9&W|0q2K;ie~|;M2_gqtCyPA7I!)w} z)&(MSteZq0Wj!MDXzLA;gRHM0n

    tft$R|lbf7bs%(zv=%*R9&z9FLM8xh3` zXEI+&e-X3BikLk|#GHB&b2o^Xca@0w_lQ{VoQRV?5^=IxM=uL|iC8p5MCnwD!n5V5 zTDYN9w2cyAVSChia_9VV7R9-lXH%RvM#QFtBF^6?V)NZ1w!9!>>t`ai9khWNE;vlY zg%d?wv{1ywD@9zgO~mhR5OL`q5tsc##O3=${5}bnV9kYB94+F?=_0OLCgSRIMO?E( z#I=uzxb7Vh+kX^seeZT=|HB9oH_Q}qW4(x*&KI#`r-+@8i@5n+5x3}bnD39-B5pla z#BIeQZm$(_$9W>|+$rKuPl~u}uZX+5oy+X^k`5w#{v1f{ihblxo(k9~3Eh7GF2gTgtJt9ip6fx^(5wm-3A~$E0h`B`~<~53# zzeU7?9U@M8Ld41Mh*+qx$k9A^QMQQE@gf#45K*>LMEOM`DsB}~$yJf&xmE9psE*!D zZAm)C{8ch~=AU{kN6-A#xdNVcyol3J60v5vh%+t`vGz_8XFexl-De`!_uRtlXB{cx z?AanVw2Ihxv55BjM4a;v5$Ap?;=F{d%(rQvi1WEH**t&qNg}qa5V3Weh;4U^xZrgW z7jhM`dHzL*Zlkz(tcXiWMEtH&#HB4FE;~oW|8J6ma9bk@oo{fJ}u(5w<#7*`cXuI|3YfV%S>H3b)aa| z@8B4(T?V&*j>3Lg|v^mh@(A5bhFk$929{dwQH3An20F;><-u0=ZI57_X8 zyT>@LWAT+ku9EZ^k9DjGw}R_&9L|T5K8A(17l~yNB~vK->&3#UtOsGt_v3mL(SoP* zNuM*9%K98AUmWaF!h+n);XsSX%=R!if4j3B9}W03HlHH!m3%@a<`<-V(LPj2#T=sX zXi>C}_tbs8EC5;9_+nSJ@-yqLpThjqWPVsXnd>a}(|Bz)$k-~Lc7f>@+sY?bTDe5m znh7hP@Z9)nP=(fyx#7*)wy|WHYMlnQ?L?~l#&R3qPHsDyDpN7O7~Ck)tpr*Lv`!d^ z4c{kiEo9jnXi2q=Y8#!kUJh)v`!!qnEMwbF~jCo(aAJE1J;&C2h|KTi7{&d}fO_;jQH*xBd9T+Vpe@nR?bPFuH|Gp7R3md1X zz`tPS_~u{VxTF$9p|*p=a=>j6Mcu1|cH?P;zw|%p5#SF3HDj^M&v;=G=iYeGtHI!J z#$V{oVNP~r-?-j*o#0h6)|P|bwJlo<*gHSLt4~tgv{GHGpGH#i#gQ|$!a*$?DQ$D> zv=6|S2wRT|@H5Cull9KaM&qhhw(dGzZcNKNHeIXv;RMb1MC`)0(wV)}S+B3KUYi8< zx&V8t&2mhw*UxGGD-X>VNZfhX>er43%r`@9_}_LWj@9-0FV^q^uzah;W^I@2^}W_Z zB>29Fi;$bfc&0>})W^G_X?*1GZB(sa-&WrJZIxRy+<&z4#!>4`IPghoK2yBi)XIFV zOtq0+t6!gnlK4uA6E{*?O2RElDM`Gn)%UR?*97c#iCsGmfq2+MJ_{jJalQUY`(t4F zRKW5bvD`$E%vyc(MA&^1u;afY(&b_|Ri0u}t(v;i{qoe`QCxZq+Q*p*0WX~%Bm99H&GvW>^awR%Y=$U6hJcGacqr|iJi z>MLl%wQYCo(y}kf$D7oe3H@Oq;lNQaKEz-bi_6&rr zR2<*W;Ac0=X^1pGp&^Zfw0wzUz5Y^P#hJm?Tidfe*Xl0CT>DaFWjES#TS0F4g}4=jMDqB!>D{Aew1(Ov;=an8_;>mXVAoMFsyyU~W@ zj5gx|qv1ud#Ei#{HWH7oWV~XuQC4x_o>nU`^w(T=yW=Vv@-v=glC1sSgyZL*bpQpU$d zn_^|3objX4rdrtxRlAP=JwD5m$2P^uyPQkQrGPp|9|9()aB;mbtz4;3YlPAd@Su#C zfec&9BRRZp8khJNAvvN? z8khN(F`1FZrT$Zy?3>2r{*6p#rg6#tVkY~gaoK-6lUZq8`oELO>@+U_Kg8r=;`gsi z4ivwyGkJvg{ea0M#qT#v=7`^@E08=&{3bGawD`?na*+5vipjxgH4S(c2+5I|@;`GX zA~|rNyy`m}$x&H?mLi##Dd+@+{59`D+%fy-|!((cVwPmxfY%cIJp*!qHxRsnCAq+x30_Ty0WjwdV7rOm?{=HaQ%BV* z6Lt^SCus2iAL}{JD3pqzezvN=Mh3m zG`asn`YDdf2=qDnThjMAZ8G6UYJ89+S>BnzKef9Ow;MV)8?PaqWbz2<2{Lyu3q$faY1c21{+ppC zDo+OO0`*kNVL$4enxbb7yX9lybv_m zaq|+lyurjkDYpG~x9pbyG-&WFL2# zoAuG8t`DWy9iWDj+7v*QM?-n1?WU1h96}*O zA<5~54JXg$$dFWO49(Tko&^ebQ>oirOEYYQhP$e zFx11OZZV&IGU$^;UkS;85?&zsvo?D`XBfOj)UrJ2J47$_dia3oMPBq%qE~p)uZe!D z%}&@U?MI^DdeP`>fTmmS!$0DUCE7dCB62|4ta}oD-&YpJL8f7Wb zZXt02Z6G>Bha3hs>sF%0UUW6lIbQTkq6xsVSMQMCy1_4~K+d9G*z(*1-PN>DpODUkk~A5>6(n0((-&wvuSH7p)_Dxz|Gr z(M!B&8_}!0=vtzm2lk{+X&Z^|^P*db_6gM8*^^#G^aHQotBLjt*wU|QjGd$ok4W7^ z>fngfL!?r|DKkl*B>#ywjOU4d?L}WEdQS*y_M~r;x-*n==KA}j{uM%@yFMk_JtQub z^9?}jIy{;E8uJFugmZcTJB0X~p?C(cBZDsiGLA_F923e{JT)R z9#|XkpF{Axb-*?gj}DAY8mPQW0A5F;hlkh+@E#J09^wIjPmwspL%ay^O%i=P#9n}W zFX@CMJj7QZ@<|L1CDLlwBDU@Lj##GLx$B1Hz=pJSKvR*NZlnE>oQCxjpu>?o5$k_Q z9!qqP+;^CXPd4LK>x9kdX)&bi>{0g=tal1t?1@;Hx*M;Ei`c{B5 zPjiFGD{c3?$gH6fa6i_!2Vh>&jEqMh8B@_rE-gJ}v_dRfWxQatBCf~2X0&1}J3ixW zqm^)VcCXQ9S=q@MpBZg7*J{5r+8ir8JwyG$DQ~WYmD}#ncsg1%k1MxH(0GAdG#@Ls zDlK6>o`L{WeBD@ICgi2X>oW#I4m}IlSqwJ^8iOxBn*k0o+6D%g3yrIp#rWsHi5YoD z!$1G^XN-k5ieAoPfU}{Amvb4!B4}LNC_bOd$JNmI)rjKFTt2RYR!40MmyesFZKSr9 z%g2{NdzjibE+1b5O-i_ki@VoDd!5|HR`$}2yP!#Vmsr`28M~mpPwp}+yCvfRXkSvh z+{#{=@hCL$a;25MD&q;0?;3veAmat7e2k~~T7L6DwQ`YmtnWCWiN$3ZQy`_G%Gppe zP1Xu78Mc-qo4vBbn&NhTh;Dzzml3MgO=MV#z1$-yVbX2^cq-f$&q=!%$+bw9l*pp- z79z(VQnv9wZ0AJ(3@eUqZqW@6^K&7w8orx4fL#K%+5jE`)p+9vdI=y zl#ejA>vw1n*d4eH+VzLz0#jd>WVqa7JhbaCX>eMY_vF)1j!N5z?N6{6Sh`hnJSN=0 z0yD9l71(ctI<+&l>mzB?X8g)Jj}vvf9!l;J!vz91S&t$8Uxp53HS{FXm1WK(W^RNu zjbJrHVIxUMbRf+Ix|sA*lZUHJhM7;MCZsUOWnwXyq4e!1Ge=h`BhbLP|tAvq79m@}>~d&Up@qdr1B%gtT+s58^|T4}_31#3ZVA{RQY* z?Ivhxs0kF!RotyHf~WZE8RgmNN-9 z8*rsKI*pF_*m1j_OS-`nE4yzh$=8UXZL^3r%Z-hM<}t*6gEnUx8(9FC3W}e0T~E5j z(BdNgJX1xxEV^vht7v$cF%&-|JcjJFbM!hI);lfGuFs?TxT&V}tL*06^@U{ab~8A< zwCl?WuQV+vL$zIRC%D#aYxc~ykh#mvh?lzn&zZsFD|c3u_H7ha0EPUSbWw-&BcxAe zC7D|)%T_?fr^qY~W6VT;k@TD}8W~?BWBxx%(51=vHtA`m8liWEkb5ub`G%HGb^`j8 zOjQ_T{C-P1aQg4g_zRiFkPa1ES}3R64%}qMZ(dbMBe5LYbxuCmDq0kVRF@VAxE9Qu zMaFxu+?*B=*D>4NkZe+$oSh(ECb=ktbbP)6W=>rMpYMV2??krRkZj_!U8jMW(-4Wt zBr~g{3Jw69ON&yI*NG#a;9_?isPF`U#UIduL&iBiPbT~+ll#i^7PlceuqCYz&^<^l>MKv@JWh1wk*`3!fnQN0-^4)G z+x5Fto6PkE-^@tnM&*10;%kyCsI!^)Wf0YBpE&t_U`{p624SeR>mQjXu>Y1bu67-L z3&7=O!rm?B_hIX^^YkFyLjNpB=yrWD!PXEkr#G;}iLW$s#N9gk4jM9ONajF6 zkIo%A1lpjXBL@vXLJb-;xVfofaAQ+VeM?pSinc)&6>9MGn)0Tyrc(z`s#;N1+t66m zGTUYxCd} zYFZ|@mJhD1YF^gT&^UNSRefbcQ?R_j<*hZfm8xQCS(7R)olsmnVSZ`Jlm!K)v*s5T zl$NUImP+8cs-~g2w7d*243w^DY-u_ysFtp1DX%RBR@!oEW0gWRR5>Cnt8H9brmE{& zs%y)ZG^^J7=9(q-Rh60KE2}D0bPZQ_ZS*Sxw_g`mbpzZ>?6XjcBb3##vT*N^5gVbxjp& z$Gmo`y0)P#09KaQw6J0=Wi3^zs-c={by-a<<&uU5q01T@6?&k)uAve>VOL&LkFG(~ zs-d+-wKTQXSD=ARMN5%xY^tiLVZXEWnySj`nrqss6k4dVrn{Rkj%61q~E6OBuW5CQw88b(<%@)jJfE6l$Mu;L}mfA?p zN61hLaV$s#r(vez(A%0ah6;+O%_u1yiLqB!TUB6>D~w%gs=lGVN>yMwENQ@8sA#CI z<HFBENU`}9~)>M?* z${6mEj>^RDCqEy9B0rycX-iXCO-r+IW8Ea2BCwW*CY#E{=$r`qS+ZXX$rWsq++3H- zDHR1H%bK~5ay4UdMe(!>Wy6jq?&1O?%j;oi)$#)DzN?nY9&kT)wJokvkfXMxW8+a3 z4Rx3(RjwR`(<(}amDZu%h3Po&$l9vu;X0At1;U{^VAiW3@ybzyB-Gv zGx@x=A70n6A|%QR#960^?k5v>QSP$rOhh}*6y8&X6?m_r!^lR}H((#w;GX+67{Y?_ z@M9mjI?SFsw56fc9xLd6SFkn8O>|s-ZZ7OhIj;Pe8bN%2*{haE%3f20p%x%I&Oa=) z>MMAtQ>C+HDseixXAba2Oi#>j%$k}NHD$G>HPvHql&ku+>DIupF}uEIc`Lfx;~-c{ zFv`(^k}>!49L3$bbtac<_=IH29a32pAs@y9&M*wY0-c?4Naj&xm6c7{C%L)ozCe>6`UDZ@oUm+p+$fw8wlp<_PChi8fU0zY85ihGoHEvw)t6S6RbUTmdZi(-HxBNj zokn->hQ&{?*KAvZ~S=TyOAP!8LCRc@7^!Dq{s=WfM+hsY~dY zN1|NU(*$~)YjuBFdt5z$NAp6TR411f99MIJocZYYn^($6z z#Ef$LEL~AkwQ@=Yb_E3mA*J)`n}a1Y%o>f@Tvb~wIh`|DI~`^z4evgFx=uXpPQeLl zST0u6K1@UmHPWCjC@XOVUpx(GiM)7~3LNWhwn%l4=rBSLy2k!*b`#dA2jXO8Mfh;C zp#!Sg@CxrpBXB^jMmB{K;h*49AH|=*%H-K=m0_ z5urj3c0dkCRD=a5$N@PE-wz!~bA?|UxzDtI`;?1(8g?KNji};L)-{1~rfwg1gGZa+ zJmYFsxg6C6_5vp@JfJ2YTIRlD#d(-qusSEizrC$SR5vx$yFFn=hsXiNG@J`yu1ezA z!WFRtY5Czi!3%LkfUf?hJK)@5O;x<&-svJVIROa9@*Slj!P0(U~pt(2jtHzrxdVy2NIBR5E4;WJ3GL} ziVz#tV7jiFUG40^hJ<&03XR`2j(8Dx07KLp50|~V&eH*fG@{9~h9_+#VAuFNz@`d| z>%iM8qN@X{T<$P7R%vxj6V_}(RtcrmLdY&I-~gMk&<92np zu62K)t=dtzooLkkxje8+k8+Jiu3_(Yz}g1?3k4l$6Yn?rPPFr{`aQ5V7#SSE`)O+# z#GPsC{S|YdExkXVooMJ^bBk3G+%UtPzfvrh*2v|ja}Iq#3uR>`xD8n{LQd5>=f`!v zHnXc8mb64%Fyol(vY^pto%dJJX&?Jv5IUefj_k5C4Y$ALrUMEwlEcmf7;(YqSJ#Mw zEB+DIq>WM@4_T*~XL z(+JCXoprh2MZE(X&0!Bege>qKkk4OT>^m^8xbs(5QR7+rGhk=;`Xh1k5cg>c@Pve& z>LQ1(1FBr@c4oehLS$7ay0_7Cb3Y<6e72(2*=UTd=8$ zt9fMHb*6c8hcz$76H?1c@w`ZNNF`R_K}Z+V+2BW1)K-kFd7g zS(l#GRk-U+6Nh{2RDH2vjw;c4VTC-ycR;%t?)B}K z-``$8f<+g#hHI+*FO9d+jjhc~@g#o5GF;0A(wz-Iud$&~oVqH2r;{D9v)&`z_Ur7< zKeEft%#HBdiJgrxqQ}mJ82;RAm#mG1yX}ev631)T?YiXY?1HY@bp?ENc4(Vgc7E3t z-V6Urdk{R@g){7sGhure*?6a0#CB6qCr-QIm}UHRNzc2Sby-Ebpzocq@+E`mw z;eKMg&Yq{Z>=vf8bulHN54vdnyF7Nq9w5|R7go3PlgEVis{;-rp-T?@|C0hs^6ZB! zI&=Q=KP<1SI_I~v=l^Z*?PvGbsa1#JeCnzIFEhy1U8h_{eD11~>lxvXnAtb>Iu+;$ zd1KJk$5^uBJA@oPopK!hP+(_0<_=p@)ndOx;d%dHg$iLhA3N_`yV}Iw7k7ebyb^(7t&P?AMUx!TYtYr zbVV2J?}?VdE_x~c=h9Cvy9@2`X|X#NO~oJ*s3`cNLhvAI_5?0J}R9eR=4se@*~ zB@Pi?R&~VJ_3k=<=9W7YZ!p)dC~Lw?;VteL=y9LhMX(tMDMV#Z`{|-n+cKh*yMdy3+;XBR+UYp&3J=w7I##RT|sR#dNwL)C`~CvES17ehESP zDunEGPvxRKUZ%-c0lejLIEIp)t{&c3XZ7Su0iIW{P3;0)=PQTO7=OT{tKUrB0$iu7 zHpJ;UJeTAu$JENaR^F+-$8cBc;Zdpx#YlBPb-wLTR-o-d%L-{ar>ss@3p>TYpm4q~ z;;Nc_$H2>Xy0=hfpnBnDhE&mf@}#qeXzu*?UuGu{F4*nTzde^bu2cx$`GNB5rFODf z*!Qwp9apH!I%t0-b#mox7@y*(#|stss2Dzff{y?$X>Dk2mSh>efarce4IjuU8O1M> z>^DQ_dk#}PP(ppxO4pp@Udv5&zN}F$hm}>eRW0tFB&S=TIGgQ!i5QmwpEdP(H6Py- z?5K){?|iB5dWN0fg*2*L ze4(>tDL(Sa4aB3?Tg^~Eq7MqK`oZLC*gT~==#7%X! zsG*oAwm)8Gam+{?mhuw`s3tnJBet_8=VJ88h_yfLXy1=DCp#g4bPHHCb8kSFxv23=Py&tMv=OPlaPdiObfuvoW&TH}1- zInbfb2cYd2v4^<7nd30S>&xn@@NI4iM(rGJ92TEM#sL-i%u6T7x<5qc7}dK23pMZO zdPl{v9=W8pp&aL!wxO*Ao69j8g>UU+Kvf_xCxvFlSN2yp*OYidq*YE?L%uBOWafDg z9?5LMH!J15)-I}W2I?^aUqP*EDd1;2-4-}P0S4HNk1yh*l@$%G{H&FHE8hzmn}(IR zl;wxs19Jz(y7LFxd`&3caSkp~;?uotRZR_!C)D2y?I$}{_VM{rCu_(l!T;CWmB2?; zB>hJw6B1B@2!e`$CuazOge1r+R}cb9I2G0~PUc7kCYfPoazR9lq9{aE4)H_<5fvA& zRY7r4RJ<>Ay>Hz`^iw>RMZCU$b=5m&GMJgbZ}Uq{y{@jVuC6{`zdo!Ue5|j4AYKTx)jFMnbwS{7F-FT99oImmH5W`ASOk9%4MrJvRF2IEq z&M+N)i%g$F1z@nxU8ET_jgB~Q(6RI=;W#H)J<>VIn1s_DQ`HOxpBP($@iZNB?ih{p zTxk1w`_LsgcQ2rw)Au3qQnR$@A3)Lhd4;rf@ulpfD(` zEz~auh{KwL^@Zg)=hPE2?nfvp8H=+%QESz021Qfw=tE@9_~J-2b3iXPM!ItH!u3@y zeqX_McweBXOpBqAz*vjr%S8`S1zKov6yUv>Me*()C_w2_Wyc~)-DaSO@#4;<`z$Qn z$Tbk+aW*?GJWfh->6VNrX+(%Ct;`u6E!^?=at4`KUqlHu$rOxdf6R=CA1a>7hG1w+ z6XS><*Lz^Li`r;hO5#Ro33*iit7=CJJaLr3Da}f<+#K@fqW_F3j%=C+*Yg@@sw*`u z=0QT6dB>5G%M(&H>a<_-k1d&bAvbOsu?Viw6eW(VW~?P>Jey|>`T@G5#Hfg29LQ`` zLueiC8Ak#>sH?k6q?Z?097c8RfU4Q?Jm~<#gLxKGUdN^!$uY=y^2~MnLUd@c=BlQX zyK$yXc@?G)aZwE2B!gXsRe?|?8uEJFiXjdxy+rdaV@#dsEDKX8VW9)PO(7u+7SQP` z8T=eAf@zUJtuy3SeY>Vp&>dj75yq7{N`$cZs<8YM#|cDJt32fxvWO4f)$n;%eUNgX zzor!FW0vu_@CKtJ+*?Dp&*&%CCUl0e!E7E9g281F15n+^f#KGGUNr%qyZP@KbfZoz zGx|%6*wi&6jxlK5o$4_D61oEj=kq(Jm+o&GIIv0z@E7QuT^RtUZ#yM zAYbYz`bm=+J6FRzTg2HT0H5^j-K6ltnxi6F}Eo zih6twrgV+Si%fM%H=_Yf)H3;$R*XR`5n;P7(~_4~fTqA%6WgWh#N_1-4bvz!S~(`Q zMpjvMWiUpTA|)>?FN~pTj3}bCQj+zmAS&r3y()QGg<-ULw4vLo8SXsOsmV*s4_D(| zKQ^UIOI}(YY0_M`R#^>_qO3N7%tpl6);W1KdA!bt`pQSb1RGbiEd_&w=mUWh44mg_ zb_}(mPy&){hjYtuM_g2mCPFI&<$0P(Qk3M4npaL$&7zY}Qae%MO4XEyS#X}%q86u4n^b`bYRmPS`zix3LDWF0^NVn!A2J1-%82o z;psY>gA4;mcB{q!xikR4J1e2&H7mqCdo8XMtyd!S=j7!KtyA5evOhm2FQX8zKb{a? zsA`cM<2iXbdDXfM!pVm(L<{1YORwmdBQl4z2#c^6zgkC!eXMX%<)k^={-@xA}~pV#oB0n zqID5st3>jAZL~Z?vqFApL_QtlburEdZb?*&L1V7x(7)Q8Xh}tjGU85j8ZCQ^!J8dI zXPM7yF>w5;Q8QOt6wrL8G>O1}GI`o^#MJP#Hphp=&a)<=^g-ud6VI}Ph?rxxDEbv% z)XXHI+YmG{Q8s~_!t+q0MVrP1#}_%3ou>vfkkrpH8L7*jvqi3~}C@Dj6EjPZhTSVbv zU8W_KxwtvmV|_<;X^N7JJz~10!<56Z_v`8}tO-_y*x-}oeK*nI@va9-yduV*Yp3dX z(4w!tok!Kx=uwT{qUb{&Lz!kZJnrxz&U`^^%W$x8(WXl*y5?tJL`_vB6t&+vu~;&e z3IN`qi;Sfe!-t!tG%>AWB_hSvDytfysY4M(lE#fA*O;*_!a}fC2*fwmq?ITN<9J+k zg{$6UBx;tT2wp_!I&hD>S8GM6!KAzsCz!w1ue}MYYH6zz4r5)hm8foYt;m3S(~LB& z9y_<5Xw+W*+|~*O+?qR3U51Zy$rm0Ee-3DMc)7bd$r6xQZ;@C=55a4wIwn-D_((>P zyxI^x+3_2!dQ8@Sd0sybD#iP}!byjYc>Mk#LMxnfXf>yD&^Z_NS=TyYl~5_nW1;b< zh%6cwN`GYiczTf6w5V54%cv}8UF{EG>wq&D)-Xd;UxnMmaRIb95c0?p0bYAxG?9a`SSGGz$5*O-2t$xM z%Rn2q&igDMzFH3Lv|fyV67G_9-^XWQsOf5J;AUKWg|+6&=QxDlf$bn znlI?J&=VJjuduv0BT6fsn7EumqxeJ#GN_45!nFg|vKJ*T$|nhtgQUd9mLQXC3R5RQ z(8V&SEFn764J)WkC2%8o5zfb$Ml+CVpNxe|&0k_O2n90bSx2Su=M-s)XY(0?X}A;| zqhQ*0rMIuchqpMnY5lH$h%uvYaJbMep_b9Ip-?^Cfw`3MK-i%z)M?2La`EMaMDcqN zKE$E+>ocDTb%+u^cCIl};j=DiNTQ)1J=o0L_!$v1DUwV-IXWjX;Vx?GrTD04tQf>s z#V{^t@gN7nbG2%HF)mhdaw*Z7NUaZBh(;uvGa(99?8CB>X>Qr~4mHC}j zxS$y84a+@s4qDd=UUXd=_Id>?;1O|_QKn*7uS3JLAB(7QLV_h{@{~#_`GbAdcfmO> zwDT>qp#bBRu|!R$N>&>J^TRG@6=tk0R+_{7n)t+%U!eT3F!5l);1w@iek7nQW(nrf zgq9$GiHqu^S!m6aL;@-wVq|mPB*uSG*?G-phvG_m98qplL~*m|C6~3 zY~j=6z~(*dsKeF57Hgo86^ef##08Jaof*n3Lu&jt)L?et?FcV{<1y6Bmm^ZB)MBcV zv}_iqrPdiDSa((P6istXQp=ggqsGy3zxY5dojE54Uyap=bL)^6dk|szX$}l@P&ZKR zX*Z9sNvR*uE9UK%>Kf&@y1yD2-_xrt%{t?v?wA{PX#NNC^RdT^Ji7Tl*dnA{(&Y#`-D>j* z)|{i6RvZI*nJe)vZ8C?Bx~3DWDWbz$Q$;#AZ_`!PiZ|P(H|+GvgoYhQ$K#)R0LwQ3 ze&OJn(Bc+Z^qxpxWw=~3R#3z3c7|#(X3V$q4J=NcXH z5yo~PTEG#+NF1XX+NOu0y#rf5&{x)1mf;WtdPbL7ue&SJ8$}BuO0+Pd7y_}z%NOz0 z(2%~oO2cLh^k}+^BJ-kecF0te^*QKpg|Ttfws2THao(QQ z6TFBD$qXYt%QM9mEtM$IqL?R295Xc|Sz{3vBUUVlk?q8cl=;C_fUS(A8$Pa3sU%}# z$7Y1^&|F}8#UdWU%7Y%14=}g-fk*7g~N1iAtfe;Xj3@IPKn^B;g z_TH4|4DzZNz1YB0i?T=Z@dG*Gd7+3GZ?GWX2Lw`q5POpnaJkBei}ngq>w?%r*wcd_ zmr?}!A-2jK=-~EMk|s{|Q%AoPRYiR;fbf_ZE-!;V<<3gt@cU_=M`4;%XGM`Ja6zK* z3X7Wf^8RvI4)96@F9; zMuBoXQ&#v@R$v2HpceI<&ZdE~p<6R93JK}1V=b%73Z)42 zQ(1x7krkwgQ~lJ@FGZ!Y!p~U&eN>u(RaPiWS;2~u?#K%DTZUgUA0g&IHu%kKphw9D ze&lRG^QC8ldPFt=D>))YvH_{5{GgteQq78qX&xJ~bL38c!c8nwlykn#>teST#RFG<~83G&MO%G@hkYVbx@$qN!O) zMN{JlqVa%2(bRkn(RfzVF$)a|Phk>KCNse)6K(WiPoL29VYL)GS4$rzZnUcC9Iz|T z>=#TDo@lTf?Wa?y?^C^{(xcWeGCv`1XoqJpGd~H{Fm$bMY2r0Z%}>H>7`s-tHt`zf z<|pAb3|^~SoOlhB^ONuzMz7_$VAj_#d#!GFl3*B~pCF+SRMYhGD3X=Yd~=W`Y(MI` zU^MbYu@)WmC!tCVpmN^gfis2zQwC{~O8jFWiTT({+9XT}L*$Thx}Eh3V_pX2dbDnY zYlU1d7zGwvlHpNai2(<=@>JP+PluuPv$&%j$8UO}Nd8eVYV z<2fGHb{?Jq@Rxb{!4(M1r6r&)eDVasKmz9p(5HE|!P8oV)b>sYL-A3=D~GIOsK!Df zGy)-1MporK%|Uy+t5u{`>emmRGXGqT5`r+0)x4ao=qzf{2vCcx6KV`EW6V?I#Csx) zfN7X&pC2Dx@mkK58Y5U(<66|tD*vZ&c8B|O(>{DFquJeX4H8N``g|Dz| zTbu4I^i-*D7e4R!^Z3}hlG<7&q5@`~m5&g?vXJF0_xM3dCa6HfDxom;ODrN{6x}dT zHHTDx8WA{EJe8ixMB=H`YME1|EF7#NOv6baaYX`inTae$%w%U^Iwnm$P_c4=-%H1` zQ$T*u$D@&e8ivwxQVd7w>n9UT}3R zy6LLH5~M1SDiY*GQBY1`Vn%|9%BV_r%8P+sGKjIo46E@~Dv6w7B(%jKE}x1VA&8x9 zjY5UT1PYbsShn=|z)8wdfq+$1w!^6w4iMdVpe*)s)8^%c zQ{b(kCdsRM7hq|7s>IFxI~pTtLUcZ(xsd=hIzw0wS)&J~W`-LZZfo%BMokVoRB@u4 zrokdRh%sQKM%T;jsg59owy~k9q_!ApD;KTb!r%&n05`rW(P0&#kmmJZl0p|mb0MH-N z+GuI&IR(F|0CN3-zqY{XfOY`l?*KR&Kz_#n9}756+$R9{0GtRo8E`7#G(cZKKR^~B z2T%YQ1|S)K0X|cnM*@!mj21WfkHK>hU;-l``+Adq>T=?ucOKux+ZP}%_)Hmj596x4Cq(f)_wvPt%{Bmt@ zk^lag->t}*IQpiazvz4a=}k?~JpQ+J9q%4>?}-KHcbVR4_5Mx=26{$(^h^I2yKb2K z%^Mr$Wj=o2%r3L{k2trn)Aszc(|b>T_v1lxhP-f8)9x8#SKocs;vW`V`ax;NMK8~5 zcTVoY(dXusJFZ#Pkp1KBmu#5u%(j;^{o7Xbt$4C@)YC8jzNobQJAtts)6RNp>1P}J z-|~;wH>a(wbab5bSw@#5@0&Bsc3^$v=3U=je^;8#bPM>h)cQ3tk(T5A>yi&Pk|B7?J?b_|G+oyz|p7_Vc_ipaK@3&*eOj$7G z*NdNy40v&M!)g5&uD-g@sk?UW$!dSced{`2(f!13ZA%Y4TldzelO|rW^T4B%ZvC~s z`lAI8U36Oh1?~5a>|s0k;?l9(3Lf0O-~Yn$Q4ha9dhxLD9{K*R-m|ZK^ii9pJqLIP zup6)+kd8vr4bTTr02l{24^RQ911tfo0c-?34tNRh0pJ^eX4kZifL?%Hz!<=JfC@kz zU3pU?pHZ;32?s zfOi190s8^z8PFTh2T%YQ2RIMl2Q&bd0d4|p0$hQ@Pj&Q0D*X7HwT#`pyzIWdgxwpa zvDbW694lO ze!wdB4@>y6CU$?E%lu!gX7`Zk>|S&ZyWbc7ZW4bxaeuT_)2JPCK)xQwWepr=k?8b~ zT6V7$cj!8Hr&7a!zc(&q8Bf69CVF3i#)i^$h1lsrk)fw+zMI2L1Ao1Qae|k^REh2O zj%S{yL7yz?=@7$HiuyodE)d=9VvpZ*LB!vkG5M9hhWS4fdDkNS6rR#ge|xHs2H<~9 z*0e7XSAR+4?v>1^+r1~s3Wb{_c6=T6gY1}sFqHuMo1V$EV-S~~A8)MUaQ!6QgjhLJ zp3ci<8P9fMe%+4!t`|N0>|a{LaZvv2Y3?KWL-EqzV#GnZErh<(#bZC^8C&kV~W^)+Q2{Ur)Z~fWK z^OWS()K%=(^R7fw%b*@#oy zCa>NUo%H(k!gA)<+l6s4Hubk>e=3{wS0iPpSjx~N3)r8^A^qhZ$vRRQ(|Ph^+JKBY z4x_hM%cR`uXXP=s zdzQ4n_qNJ!#(+lIiLBOk0Voa^fc{340b+C%`QiK-bD11fs605on!Q=we| zARAG0Fb7Zt2mnF=bSoN)h=!uCEd(qAGy*OGTn4xta0TE>Koej&;A+6NfK>n#SM3JC zjR2Ti>piE>#tv)tH=Pl@|F#i@lb5E~S8UkX@t9BZ{s{i}*Uc-s?|*yN`hE|({yD$& zlYYDRj$gZ@{O-*o9shh~*Z5bqVZhjaM(2S?Ex-T$#(!V-ZszKb{^(bHM&t2!JaB2l z@h|U6ZTzNgc-M^|_S?N-Zf4`Q9z!z6Zd~l@_U*CzKJ9)%#`BLY8(cS2duzwJTd#R= zWkcI;j}6>(^&N{}pY_L)rMssdHF?g9y|2yqs`RwJuRpe7_oB`pZJt`Q=OjnNm;aiw zv}Dne_RkhCdAI4732Pe$R`0LQJ?6~DoRX!rolm=S{f+nKzVqPO52sJfKDNi^)Dc5B zq|NX5)ws3CIZM9zrO(979($+GvNdd3mc9DX?SKE|wD0De^i790PrbYB)IRf?E}wjC z`}#Ls8+^MX->0meepI3R*JV$xd1vH+$2*_>M>h&f%rY z)(mdD?UshWhL?R1dib@U*M2hPsFzm^f8fA#JKpMgQc1@F~2pwblhiM z&-DL(;?h|odY<~u^TQ@y{I;vMW68reKC|TK@U2Zh)qVcP{-%o0PW3+SnbFkY$>4*Z z|ED75p7~=U@0VTH^utMazS_3CC-ad3UCyk}xMcpVcfR=Z1CFxXyzCnquKE1Ar6o`9 z`|YOko9j;>SFyOw+i9yhkM45k`fta+yZOw0`R5cDjX1ib@|&r9gWs(9;kDy;ZPw1X zf6)yMH-0)VbH&o7i_SXGqsLpDKk9d&^xnRE`*z9>XI(pg!<*?hKlr%s^tblT>gejV zs$s+C)$QI|^?CQXoAx#AnK1a#tt)qx&sno!@rL@D+92dbufP7~=bt{V?zi;UIp^H| z?yCDfxU;ZyUd_ulr6J@Dku-zz+a>JG3K!{(v(8 zlL2l(Enov+3*aTd$ABLIb~I7l0Q~`H044+6fLg$nfO`N>0A2@t0r)SV9U9mZ0D}Od z0W$zTKm%Yo;C8^@0j~l+1N;Y&j=th}z(Bw_z+VAXfQtbu0e1qn0^SFF3uuD|vNNDJ zU>M+Rzy*LX;6}jT08awm1pFIt0B~fcru7000gMG)00;vv16&W-1b7zkF5nx$AAn96 z16&HY4sbVM8{jp-=YV~H z3^elH0oj02fa!n=zyiQkfZG6%0bT)o3Mhq*sqdczJD^{BV- zp#56G%v+($(L~U+w*e#)TB<-m`$U)C0Yl{UGUj@~ZIBK)nG_mg$XbHJiF&5xqwpZ& zTsFer89g&V5pP6KM5>#DE~{ZdCFti!ZTx+d%B0EZ2I+Je9JYaM;o4o!TpiG9A^`o} zBsTjHHj@PYWgT;^S!Ag0SjMEHQHHGJ#f&y|e54-!P82g>?n)>9=HP$}1{(oC5U!(4 zWBpgS*1;U2YDb7AD{uGkkN}SZZer3@GvFRcwhze`B`Pp>p@7fl7zuJnz>Ca)-$`B! zlTwHP_f>Gf64N+#sC|NW=Td0vPX*W<6_GnVM`$`5?TL-s$$Cw z8FODZ&me6_p`@&uhML=zQi$epE*FA*rzx&6g$nhCWD&Cs3>3!ZF^X!FX!(k%;LdxPbixXQG+m6a&NRX>ku}?tb%B)Llg%=AB$7!=^n)=(FaPCC>Ts4}gc8I= zT*D?AIlf)8Z~=h%_4By%?+Mg;7JS|Q;d zlkn#POLcx!G;U|s@QIT8HD>CML97(<5Z4Vle*_zWCUC+<>hNGF9lp) z-Wh2yTrVZ@KPc6r|4Wy!TSQjGAiakeDOoSTzTmnY<^?)}TSzY>cx%h0BtLSg5p=Xz*=NT2a}7su z@mNFuDnw6e8~_&ktrKOxG_8E3D2t-1E8AIee4ANRp1+u7Z80r&l8FDX%*a=oVFp#Z zkn`dx&I=HW+G0Mylh-#L_A4I>rB!-Nmo1M9?V03FK2KpqmEXjHN6d=7p3RP zI>*TB=g^ms5uV{bg~Cr4>qSiKuB`5Ht5oYjqoZP;raeX zm@yKj$;|2(P~ylI7n-SDa6OaO`Hg@MB$2rO4_M+~F1i1JsrbX-Ag&U?DFFO!7RB3| ziaR^7#lC0j&+KQ2?685uU%uENRfsNYOkKK4fv8<%aP<(2jWcbreLc%^G#Xj;2lOHJ zwwD>|T_e_i#Y{x5h;K5*Pl9bIAkE6a0QC0{$;oc$h=p_|(nVY;5HF;WNFtGjBOvmG z{;sk!Dd$v!^x#}34Ko{%*^*IzGczg$BNviYYATW0iDR-Kr7ZEWX~|x9Fmnf_Pa^Ik zBC$L`&m4M@OohnbIVW~-dHEQv9rD;~N+Z2_%8jOw+GuU+dK}SH7s8(SZIGvFN1V{{ zmNqx1tgx+2U1eXLHbCgQe@A6XjBjH2u4}s{{rZd>+UfkugzwT8_`8ezjy8TkW~sk% zBL63(E=Bu=%6Xe#Ivk1LHY5?yCVQfHVFy6A+5r_l zWKmp*QTp^dNe-Vx{V2MD1GB>+*CES2+zD1IQ9RgW6gp(p3?pLS=;0IQ^y8uzT)JF& z$ReFsoOp;uSj!$64ElXo`i5Pj;q3EV0k>zMGZ;jZiMwa2B4JA_N=+x$7~w`h<{RVj zI)|7h>vPWv3D>Vo9nB}vvY>(t?HrbnJs&24l%jXxT9XE%`As14HXtMmE0Vo z>!D*`fv|^()=oJh11o6Ez&nHZ85=7DSX=KQHr|P&S~hs1pOdYYfe@VN!40Qu+hr;) zaHo5f!nl4h==2FIEuQ2fpF+I;7UEegM~x3mfqZ7db7m_3Q z3PA)6O`Qxs!5_&n{Mi|2$0o~(I%^Xoj39)U17iJLoHGQNQLU=OVz&7MT`u}qX&%Vq za(HRC0o5U}A}<~Kf_^wLREgeo3L1u$lD{6fGBGk!8<_Eo5uxs5?EVHB_ElY>zSkBc zm0Q@*;_?I|WD9Od;enB(z8zFIKNi(R+)+ddz=aVZFy^F1e^N57WXeVC3Iq=_k%lsG ztH^+9hah|C>(9kSiRVB_yE28a>P}j#4qiA}BA%fFNl_aBEn=*0c&p8T98$@(x+#em zXrXEwTLr<1k#aNvRgyT-N^z`|C^%H2xRn9DGclvE>MdkulY!S{fpFc;VPIh{-p)X|!J9}xCQHjU2clEHQ?a6uvVlRj9=X*P z5_pqs9YQd<;mZz4r1hanAXaP&2h!prMM<_E58e|X2Fy&?A1Nd^Dk6{_B+($_S(TB1 zibs~`f}JeLYf>dHS%}JBypmMc%qUZoOW2vNZz=#U@{+`ZNbylwl6W-nCu& z8TMXjTkZDZ)L!;>X||z1q;|Lcl(N+}`iIn>_FlFX7s4;CIBil|`{L9db}h};F@3l_ zuU$%?V^X`@N7~l5*$Q%o?X!i&smI%=*}4>`rr3wto=DkhpJIDQqcA7f-fL*IXQq)) zL7J^Gb*sItZAF`6`+y5m?e>1QpB8MjkFqVd{Q!TP?KchbkFtHYun|Gq+kRhAoR+@H zo{=^MzLRXP*|yqer8U~eli)UKwnrO^)7o!MJqe1X-(_#xF8#|i+u0ORahmOWNIc1Y zobBm`Vtd<(_Tw(Ix1EsM)qaF+W1B{JWZ2$ah^X3Lo@RUEqQ+DR`>Ip%V*By7XBryQ zY_A3z?LE?L>pK?PM_p;pm|#EKwj-r6^<;ZH+s?}3)HdK-ow?QC&6d%adWyY+?YCfY zY8pKEYCpiUtL?TUixE>3V(M!9ao$!%TXbZ41kvuE59J=Jfq$Cq{miY9X|sJB1nrTF zilJAg?Rl-y-ZqVOy+L&S_rmlDlGVv}w+-4YZJ-oDpVYCZ+17M|p)}hb29*+SRO0!06<%Fk?&2dDb|=n7608k~Ihzh1x%W zacMVTwA_BQ8-z<2`IUZY*y~4nrg;RH3jU{;>8}WWNbn}XD+MnT>=%rknM&R`!6O9s z6?~##?+oUfEx17NAi+lo&Jer@Yeq=V&jjxf{FvaI1g{i)q2Ox4vjxu(JVJ1R;FAR( zFZhRP9N!+nuM2)&@PmTy5xiRPRf6XW4hfzi_#DAQ1rHRQDY&iR-BUUKPXxazc&Fe^ zg4YXPB)CqnEKyCHChmN}*@C+Y&J?_Rio_@Q1;I}V-YEE1!9PxB{;vhUFL;;WEWxJ= zzHBJ-FBI$)JX7#6!Gi^N6r3*j`#cW+mEacz?-0C6@Or^bf)@*}6zmZ^Uhqi4{RE#R zxV>PT;BRs{{x1Z-BKTRsPQfz;XQQ4`dByCO!nXLu~f(g(t+w$9zUr>6`U zl%BG`&97~=o2k8khyGWOhn{V=Yx=y?)$k*?K5vyFZhhYCC-7%l!q0|0i<8=jD0hb# zf6-r$UOPL+e{qc46(cW#$gJ_vv(=pv*vi8Tc!Me7WjhT?i!b{a><#N(XJ-~d zAc;vFM2f272&FBm0!gYiyJ{;+ov2i*;xr^hAyrFSku-{0Ln9SJqd*?SMsnQWnVH=k zZ$MN?Q55N1`RqOC-h0kH=bPPo{~Gx(mp=Srln{zQb3w*I>I;Qrxd7Hi$4l67oGbx@J6B(el3loQEnu(b_!$+Q&S&f1t2w&s`^~rC``=<&g|Tu7Qbwb!CY!qX ze2czYKsguFl-*{deu_iCZ)c-@sa~3+Iz;VX@ko_iF32Y|Z(fDB0!c-JW}el~_2MoZ zH$&GqZqp5|tzxO|LQ%ym2<6iUzQliyZ4+N=H$rIs{4wNWCPJg!m;e)C0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>N;G0BXP*qM`yhllWy2h0n*si7qUKL$tgqj# z`1&W1xJ38$Q$^Q!jO#96f3G?r{k9PMPOBo_tBy~ff_)wA!CFyss#bJO6CDl1VR!HH z^>u$S_#$4HYZ%zR40|k1UA$*W3VU|-sPg3CtICN>Ev{6bR54zF`9kC{EH&`B()GFO zN`I;<=}%~n>7wft_IVC5&rJ8#>@E}wTakx*XLDcD<=*pBiLd{K5xyhCOFA0d%J30C za+U5W+bJICbM4!I^hH%oe+EXo zNBR0ALOG7Q&y~J%VE?_)QSXJ3ifA%(^3wAfpFXWlN>g2BV$!*1i$v4lFmd5{A((vh z@Zmw1``k1)#+t>2$AoD5{83TUkDT#LC!G2C;iueq_Gd@<4%coF7u?E|`zIF?$I0nc zsEIh$t4j`lK3z%m776S%35+IUztZ$d%-3#STz%%zo|>~ozWy>rJa7har~YR5{-L>* znz{8M7OmYa`WBa|rRM^8W_TfTLN9zhh(%+spstgy>yQ5n`OnL%@f4oNX*?sV&XRKh z)N)|7=*KIN6UK{Jrl07lcqk*p^tFrqaFG< zhmP+h`Qly7L&f%bQ+KYP>{x%3L!V~pUif;aDP8B6znn6C?U-xvYG?o8U@4t7q+f*o zEnEKt`Z`-b5B+Id{}B2+w*CS1Pi_4_&`VG}#d#n4bXz|K-3uLm;syvcXHTz|(mSv| z^d$6tIyIm9nfsvkXh$JRu^A~h&KeV70!)AjFaajO1egF5U;<2l2`~XBzyz286JP>N zfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XBzyz286JP>N zfC(@GCcp%k025#WOn?b60VeSE6S&R(|MB&9-(>e2?LKPv588dF-S4&gpW6M`UkPWx z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!-kWOJMAD zaW7>*)+gnCs~e34QhFDL;z`3V)+NMV$LK8~V_UnnBIK`%g#Fe`IJ$O=rNy?kiM``| zQj2YgB;qj)hPOq-Qa6%88H~ij8e*A{D4^-KE>UboH$8>W?F?30DJ+V{LxHGPlhif2 zDG<^Of5Ym=N@;B^bhnkRy|_9O*JUuEYl~Vm1CD+qCG=uvN!|sRkA!4gHxgQ)ZAEBx zqx5=1t$~Cz5`l=Jqb|RHk*>vz#I|K#e?#K}NkJxFbC5c(l}5QUf?ZZ-ZnkqSTg5G* zs1`{0@2CAM!88zzCk!&GVYF#&x@KBFSg0ndfi}=8Qj8Pu1-~KRfM=n=@8;Jgn;X5+b+J{vNs|g&F{OzvR{Qgx=4t6 zxX^l%Fn!qVEzE~A2Kv$JP^m)+$}roiJo`I&c5|M+DbJpQC{*)}keeV=A=4n!A;fhi6m@`jv^mLHhXI1tZ$Q)OhgX&9{LN0dILMhvmhNLq&5Hhrc)U^kaS}de3 zt&YX2Dl5H}l~*{n>28quRGVZ|rS$t77t6IP8y8CCmc8G+i?CH7ECaEy#7&1?uf7HC zP-EX7!Q>_xL52Y%o>-CDXOXo}W3|K|C6tBb$M(+MtE{UCXLlsla`}?rUK5DY9Y|Zy z)l^j}rO}#*Z1Z zC#>n4jd;6fixvyV6CSLM8Mw0_@&uESXxLLx;n5QzkI0T!ghJO8s6oRWrfZ&f@cs%T zkifm{*o(Hv?GSgc`O3cp;?h4y_26oxV-+Wj*(P8N=atJPTm^K0(%BV+thc7=wmf#e z+?74T?cpnRDjiqUlx&S+`#a70tq(7l``H_HqWk&VDi%NIn*99CpL90MwKt#o)A!uJ zdi0lv*T-K!yQ!z(?Gq<9yVk5P9Nf{pE{o8 "0700": + args.extend(["--auto-activate-custom-fonts"]) + if "IPHONEOS_DEPLOYMENT_TARGET" in os.environ: + args.extend( + [ + "--target-device", + "iphone", + "--target-device", + "ipad", + "--minimum-deployment-target", + os.environ["IPHONEOS_DEPLOYMENT_TARGET"], + ] + ) + else: + args.extend( + [ + "--target-device", + "mac", + "--minimum-deployment-target", + os.environ["MACOSX_DEPLOYMENT_TARGET"], + ] + ) + + args.extend( + ["--output-format", "human-readable-text", "--compile", dest, source] + ) + + ibtool_section_re = re.compile(r"/\*.*\*/") + ibtool_re = re.compile(r".*note:.*is clipping its content") + try: + stdout = subprocess.check_output(args) + except subprocess.CalledProcessError as e: + print(e.output) + raise + current_section_header = None + for line in stdout.splitlines(): + if ibtool_section_re.match(line): + current_section_header = line + elif not ibtool_re.match(line): + if current_section_header: + print(current_section_header) + current_section_header = None + print(line) + return 0 + + def _ConvertToBinary(self, dest): + subprocess.check_call( + ["xcrun", "plutil", "-convert", "binary1", "-o", dest, dest] + ) + + def _CopyStringsFile(self, source, dest): + """Copies a .strings file using iconv to reconvert the input into UTF-16.""" + input_code = self._DetectInputEncoding(source) or "UTF-8" + + # Xcode's CpyCopyStringsFile / builtin-copyStrings seems to call + # CFPropertyListCreateFromXMLData() behind the scenes; at least it prints + # CFPropertyListCreateFromXMLData(): Old-style plist parser: missing + # semicolon in dictionary. + # on invalid files. Do the same kind of validation. + import CoreFoundation + + with open(source, "rb") as in_file: + s = in_file.read() + d = CoreFoundation.CFDataCreate(None, s, len(s)) + _, error = CoreFoundation.CFPropertyListCreateFromXMLData(None, d, 0, None) + if error: + return + + with open(dest, "wb") as fp: + fp.write(s.decode(input_code).encode("UTF-16")) + + def _DetectInputEncoding(self, file_name): + """Reads the first few bytes from file_name and tries to guess the text + encoding. Returns None as a guess if it can't detect it.""" + with open(file_name, "rb") as fp: + try: + header = fp.read(3) + except Exception: + return None + if header.startswith(b"\xFE\xFF"): + return "UTF-16" + elif header.startswith(b"\xFF\xFE"): + return "UTF-16" + elif header.startswith(b"\xEF\xBB\xBF"): + return "UTF-8" + else: + return None + + def ExecCopyInfoPlist(self, source, dest, convert_to_binary, *keys): + """Copies the |source| Info.plist to the destination directory |dest|.""" + # Read the source Info.plist into memory. + with open(source) as fd: + lines = fd.read() + + # Insert synthesized key/value pairs (e.g. BuildMachineOSBuild). + plist = plistlib.readPlistFromString(lines) + if keys: + plist.update(json.loads(keys[0])) + lines = plistlib.writePlistToString(plist) + + # Go through all the environment variables and replace them as variables in + # the file. + IDENT_RE = re.compile(r"[_/\s]") + for key in os.environ: + if key.startswith("_"): + continue + evar = "${%s}" % key + evalue = os.environ[key] + lines = lines.replace(lines, evar, evalue) + + # Xcode supports various suffices on environment variables, which are + # all undocumented. :rfc1034identifier is used in the standard project + # template these days, and :identifier was used earlier. They are used to + # convert non-url characters into things that look like valid urls -- + # except that the replacement character for :identifier, '_' isn't valid + # in a URL either -- oops, hence :rfc1034identifier was born. + evar = "${%s:identifier}" % key + evalue = IDENT_RE.sub("_", os.environ[key]) + lines = lines.replace(lines, evar, evalue) + + evar = "${%s:rfc1034identifier}" % key + evalue = IDENT_RE.sub("-", os.environ[key]) + lines = lines.replace(lines, evar, evalue) + + # Remove any keys with values that haven't been replaced. + lines = lines.splitlines() + for i in range(len(lines)): + if lines[i].strip().startswith("${"): + lines[i] = None + lines[i - 1] = None + lines = "\n".join(line for line in lines if line is not None) + + # Write out the file with variables replaced. + with open(dest, "w") as fd: + fd.write(lines) + + # Now write out PkgInfo file now that the Info.plist file has been + # "compiled". + self._WritePkgInfo(dest) + + if convert_to_binary == "True": + self._ConvertToBinary(dest) + + def _WritePkgInfo(self, info_plist): + """This writes the PkgInfo file from the data stored in Info.plist.""" + plist = plistlib.readPlist(info_plist) + if not plist: + return + + # Only create PkgInfo for executable types. + package_type = plist["CFBundlePackageType"] + if package_type != "APPL": + return + + # The format of PkgInfo is eight characters, representing the bundle type + # and bundle signature, each four characters. If that is missing, four + # '?' characters are used instead. + signature_code = plist.get("CFBundleSignature", "????") + if len(signature_code) != 4: # Wrong length resets everything, too. + signature_code = "?" * 4 + + dest = os.path.join(os.path.dirname(info_plist), "PkgInfo") + with open(dest, "w") as fp: + fp.write(f"{package_type}{signature_code}") + + def ExecFlock(self, lockfile, *cmd_list): + """Emulates the most basic behavior of Linux's flock(1).""" + # Rely on exception handling to report errors. + fd = os.open(lockfile, os.O_RDONLY | os.O_NOCTTY | os.O_CREAT, 0o666) + fcntl.flock(fd, fcntl.LOCK_EX) + return subprocess.call(cmd_list) + + def ExecFilterLibtool(self, *cmd_list): + """Calls libtool and filters out '/path/to/libtool: file: foo.o has no + symbols'.""" + libtool_re = re.compile( + r"^.*libtool: (?:for architecture: \S* )?" r"file: .* has no symbols$" + ) + libtool_re5 = re.compile( + r"^.*libtool: warning for library: " + + r".* the table of contents is empty " + + r"\(no object file members in the library define global symbols\)$" + ) + env = os.environ.copy() + # Ref: + # http://www.opensource.apple.com/source/cctools/cctools-809/misc/libtool.c + # The problem with this flag is that it resets the file mtime on the file to + # epoch=0, e.g. 1970-1-1 or 1969-12-31 depending on timezone. + env["ZERO_AR_DATE"] = "1" + libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env) + err = libtoolout.communicate()[1].decode("utf-8") + for line in err.splitlines(): + if not libtool_re.match(line) and not libtool_re5.match(line): + print(line, file=sys.stderr) + # Unconditionally touch the output .a file on the command line if present + # and the command succeeded. A bit hacky. + if not libtoolout.returncode: + for i in range(len(cmd_list) - 1): + if cmd_list[i] == "-o" and cmd_list[i + 1].endswith(".a"): + os.utime(cmd_list[i + 1], None) + break + return libtoolout.returncode + + def ExecPackageIosFramework(self, framework): + # Find the name of the binary based on the part before the ".framework". + binary = os.path.basename(framework).split(".")[0] + module_path = os.path.join(framework, "Modules") + if not os.path.exists(module_path): + os.mkdir(module_path) + module_template = ( + "framework module %s {\n" + ' umbrella header "%s.h"\n' + "\n" + " export *\n" + " module * { export * }\n" + "}\n" % (binary, binary) + ) + + with open(os.path.join(module_path, "module.modulemap"), "w") as module_file: + module_file.write(module_template) + + def ExecPackageFramework(self, framework, version): + """Takes a path to Something.framework and the Current version of that and + sets up all the symlinks.""" + # Find the name of the binary based on the part before the ".framework". + binary = os.path.basename(framework).split(".")[0] + + CURRENT = "Current" + RESOURCES = "Resources" + VERSIONS = "Versions" + + if not os.path.exists(os.path.join(framework, VERSIONS, version, binary)): + # Binary-less frameworks don't seem to contain symlinks (see e.g. + # chromium's out/Debug/org.chromium.Chromium.manifest/ bundle). + return + + # Move into the framework directory to set the symlinks correctly. + pwd = os.getcwd() + os.chdir(framework) + + # Set up the Current version. + self._Relink(version, os.path.join(VERSIONS, CURRENT)) + + # Set up the root symlinks. + self._Relink(os.path.join(VERSIONS, CURRENT, binary), binary) + self._Relink(os.path.join(VERSIONS, CURRENT, RESOURCES), RESOURCES) + + # Back to where we were before! + os.chdir(pwd) + + def _Relink(self, dest, link): + """Creates a symlink to |dest| named |link|. If |link| already exists, + it is overwritten.""" + if os.path.lexists(link): + os.remove(link) + os.symlink(dest, link) + + def ExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers): + framework_name = os.path.basename(framework).split(".")[0] + all_headers = [os.path.abspath(header) for header in all_headers] + filelist = {} + for header in all_headers: + filename = os.path.basename(header) + filelist[filename] = header + filelist[os.path.join(framework_name, filename)] = header + WriteHmap(out, filelist) + + def ExecCopyIosFrameworkHeaders(self, framework, *copy_headers): + header_path = os.path.join(framework, "Headers") + if not os.path.exists(header_path): + os.makedirs(header_path) + for header in copy_headers: + shutil.copy(header, os.path.join(header_path, os.path.basename(header))) + + def ExecCompileXcassets(self, keys, *inputs): + """Compiles multiple .xcassets files into a single .car file. + + This invokes 'actool' to compile all the inputs .xcassets files. The + |keys| arguments is a json-encoded dictionary of extra arguments to + pass to 'actool' when the asset catalogs contains an application icon + or a launch image. + + Note that 'actool' does not create the Assets.car file if the asset + catalogs does not contains imageset. + """ + command_line = [ + "xcrun", + "actool", + "--output-format", + "human-readable-text", + "--compress-pngs", + "--notices", + "--warnings", + "--errors", + ] + is_iphone_target = "IPHONEOS_DEPLOYMENT_TARGET" in os.environ + if is_iphone_target: + platform = os.environ["CONFIGURATION"].split("-")[-1] + if platform not in ("iphoneos", "iphonesimulator"): + platform = "iphonesimulator" + command_line.extend( + [ + "--platform", + platform, + "--target-device", + "iphone", + "--target-device", + "ipad", + "--minimum-deployment-target", + os.environ["IPHONEOS_DEPLOYMENT_TARGET"], + "--compile", + os.path.abspath(os.environ["CONTENTS_FOLDER_PATH"]), + ] + ) + else: + command_line.extend( + [ + "--platform", + "macosx", + "--target-device", + "mac", + "--minimum-deployment-target", + os.environ["MACOSX_DEPLOYMENT_TARGET"], + "--compile", + os.path.abspath(os.environ["UNLOCALIZED_RESOURCES_FOLDER_PATH"]), + ] + ) + if keys: + keys = json.loads(keys) + for key, value in keys.items(): + arg_name = "--" + key + if isinstance(value, bool): + if value: + command_line.append(arg_name) + elif isinstance(value, list): + for v in value: + command_line.append(arg_name) + command_line.append(str(v)) + else: + command_line.append(arg_name) + command_line.append(str(value)) + # Note: actool crashes if inputs path are relative, so use os.path.abspath + # to get absolute path name for inputs. + command_line.extend(map(os.path.abspath, inputs)) + subprocess.check_call(command_line) + + def ExecMergeInfoPlist(self, output, *inputs): + """Merge multiple .plist files into a single .plist file.""" + merged_plist = {} + for path in inputs: + plist = self._LoadPlistMaybeBinary(path) + self._MergePlist(merged_plist, plist) + plistlib.writePlist(merged_plist, output) + + def ExecCodeSignBundle(self, key, entitlements, provisioning, path, preserve): + """Code sign a bundle. + + This function tries to code sign an iOS bundle, following the same + algorithm as Xcode: + 1. pick the provisioning profile that best match the bundle identifier, + and copy it into the bundle as embedded.mobileprovision, + 2. copy Entitlements.plist from user or SDK next to the bundle, + 3. code sign the bundle. + """ + substitutions, overrides = self._InstallProvisioningProfile( + provisioning, self._GetCFBundleIdentifier() + ) + entitlements_path = self._InstallEntitlements( + entitlements, substitutions, overrides + ) + + args = ["codesign", "--force", "--sign", key] + if preserve == "True": + args.extend(["--deep", "--preserve-metadata=identifier,entitlements"]) + else: + args.extend(["--entitlements", entitlements_path]) + args.extend(["--timestamp=none", path]) + subprocess.check_call(args) + + def _InstallProvisioningProfile(self, profile, bundle_identifier): + """Installs embedded.mobileprovision into the bundle. + + Args: + profile: string, optional, short name of the .mobileprovision file + to use, if empty or the file is missing, the best file installed + will be used + bundle_identifier: string, value of CFBundleIdentifier from Info.plist + + Returns: + A tuple containing two dictionary: variables substitutions and values + to overrides when generating the entitlements file. + """ + source_path, provisioning_data, team_id = self._FindProvisioningProfile( + profile, bundle_identifier + ) + target_path = os.path.join( + os.environ["BUILT_PRODUCTS_DIR"], + os.environ["CONTENTS_FOLDER_PATH"], + "embedded.mobileprovision", + ) + shutil.copy2(source_path, target_path) + substitutions = self._GetSubstitutions(bundle_identifier, team_id + ".") + return substitutions, provisioning_data["Entitlements"] + + def _FindProvisioningProfile(self, profile, bundle_identifier): + """Finds the .mobileprovision file to use for signing the bundle. + + Checks all the installed provisioning profiles (or if the user specified + the PROVISIONING_PROFILE variable, only consult it) and select the most + specific that correspond to the bundle identifier. + + Args: + profile: string, optional, short name of the .mobileprovision file + to use, if empty or the file is missing, the best file installed + will be used + bundle_identifier: string, value of CFBundleIdentifier from Info.plist + + Returns: + A tuple of the path to the selected provisioning profile, the data of + the embedded plist in the provisioning profile and the team identifier + to use for code signing. + + Raises: + SystemExit: if no .mobileprovision can be used to sign the bundle. + """ + profiles_dir = os.path.join( + os.environ["HOME"], "Library", "MobileDevice", "Provisioning Profiles" + ) + if not os.path.isdir(profiles_dir): + print( + "cannot find mobile provisioning for %s" % (bundle_identifier), + file=sys.stderr, + ) + sys.exit(1) + provisioning_profiles = None + if profile: + profile_path = os.path.join(profiles_dir, profile + ".mobileprovision") + if os.path.exists(profile_path): + provisioning_profiles = [profile_path] + if not provisioning_profiles: + provisioning_profiles = glob.glob( + os.path.join(profiles_dir, "*.mobileprovision") + ) + valid_provisioning_profiles = {} + for profile_path in provisioning_profiles: + profile_data = self._LoadProvisioningProfile(profile_path) + app_id_pattern = profile_data.get("Entitlements", {}).get( + "application-identifier", "" + ) + for team_identifier in profile_data.get("TeamIdentifier", []): + app_id = f"{team_identifier}.{bundle_identifier}" + if fnmatch.fnmatch(app_id, app_id_pattern): + valid_provisioning_profiles[app_id_pattern] = ( + profile_path, + profile_data, + team_identifier, + ) + if not valid_provisioning_profiles: + print( + "cannot find mobile provisioning for %s" % (bundle_identifier), + file=sys.stderr, + ) + sys.exit(1) + # If the user has multiple provisioning profiles installed that can be + # used for ${bundle_identifier}, pick the most specific one (ie. the + # provisioning profile whose pattern is the longest). + selected_key = max(valid_provisioning_profiles, key=lambda v: len(v)) + return valid_provisioning_profiles[selected_key] + + def _LoadProvisioningProfile(self, profile_path): + """Extracts the plist embedded in a provisioning profile. + + Args: + profile_path: string, path to the .mobileprovision file + + Returns: + Content of the plist embedded in the provisioning profile as a dictionary. + """ + with tempfile.NamedTemporaryFile() as temp: + subprocess.check_call( + ["security", "cms", "-D", "-i", profile_path, "-o", temp.name] + ) + return self._LoadPlistMaybeBinary(temp.name) + + def _MergePlist(self, merged_plist, plist): + """Merge |plist| into |merged_plist|.""" + for key, value in plist.items(): + if isinstance(value, dict): + merged_value = merged_plist.get(key, {}) + if isinstance(merged_value, dict): + self._MergePlist(merged_value, value) + merged_plist[key] = merged_value + else: + merged_plist[key] = value + else: + merged_plist[key] = value + + def _LoadPlistMaybeBinary(self, plist_path): + """Loads into a memory a plist possibly encoded in binary format. + + This is a wrapper around plistlib.readPlist that tries to convert the + plist to the XML format if it can't be parsed (assuming that it is in + the binary format). + + Args: + plist_path: string, path to a plist file, in XML or binary format + + Returns: + Content of the plist as a dictionary. + """ + try: + # First, try to read the file using plistlib that only supports XML, + # and if an exception is raised, convert a temporary copy to XML and + # load that copy. + return plistlib.readPlist(plist_path) + except Exception: + pass + with tempfile.NamedTemporaryFile() as temp: + shutil.copy2(plist_path, temp.name) + subprocess.check_call(["plutil", "-convert", "xml1", temp.name]) + return plistlib.readPlist(temp.name) + + def _GetSubstitutions(self, bundle_identifier, app_identifier_prefix): + """Constructs a dictionary of variable substitutions for Entitlements.plist. + + Args: + bundle_identifier: string, value of CFBundleIdentifier from Info.plist + app_identifier_prefix: string, value for AppIdentifierPrefix + + Returns: + Dictionary of substitutions to apply when generating Entitlements.plist. + """ + return { + "CFBundleIdentifier": bundle_identifier, + "AppIdentifierPrefix": app_identifier_prefix, + } + + def _GetCFBundleIdentifier(self): + """Extracts CFBundleIdentifier value from Info.plist in the bundle. + + Returns: + Value of CFBundleIdentifier in the Info.plist located in the bundle. + """ + info_plist_path = os.path.join( + os.environ["TARGET_BUILD_DIR"], os.environ["INFOPLIST_PATH"] + ) + info_plist_data = self._LoadPlistMaybeBinary(info_plist_path) + return info_plist_data["CFBundleIdentifier"] + + def _InstallEntitlements(self, entitlements, substitutions, overrides): + """Generates and install the ${BundleName}.xcent entitlements file. + + Expands variables "$(variable)" pattern in the source entitlements file, + add extra entitlements defined in the .mobileprovision file and the copy + the generated plist to "${BundlePath}.xcent". + + Args: + entitlements: string, optional, path to the Entitlements.plist template + to use, defaults to "${SDKROOT}/Entitlements.plist" + substitutions: dictionary, variable substitutions + overrides: dictionary, values to add to the entitlements + + Returns: + Path to the generated entitlements file. + """ + source_path = entitlements + target_path = os.path.join( + os.environ["BUILT_PRODUCTS_DIR"], os.environ["PRODUCT_NAME"] + ".xcent" + ) + if not source_path: + source_path = os.path.join(os.environ["SDKROOT"], "Entitlements.plist") + shutil.copy2(source_path, target_path) + data = self._LoadPlistMaybeBinary(target_path) + data = self._ExpandVariables(data, substitutions) + if overrides: + for key in overrides: + if key not in data: + data[key] = overrides[key] + plistlib.writePlist(data, target_path) + return target_path + + def _ExpandVariables(self, data, substitutions): + """Expands variables "$(variable)" in data. + + Args: + data: object, can be either string, list or dictionary + substitutions: dictionary, variable substitutions to perform + + Returns: + Copy of data where each references to "$(variable)" has been replaced + by the corresponding value found in substitutions, or left intact if + the key was not found. + """ + if isinstance(data, str): + for key, value in substitutions.items(): + data = data.replace("$(%s)" % key, value) + return data + if isinstance(data, list): + return [self._ExpandVariables(v, substitutions) for v in data] + if isinstance(data, dict): + return {k: self._ExpandVariables(data[k], substitutions) for k in data} + return data + + +def NextGreaterPowerOf2(x): + return 2 ** (x).bit_length() + + +def WriteHmap(output_name, filelist): + """Generates a header map based on |filelist|. + + Per Mark Mentovai: + A header map is structured essentially as a hash table, keyed by names used + in #includes, and providing pathnames to the actual files. + + The implementation below and the comment above comes from inspecting: + http://www.opensource.apple.com/source/distcc/distcc-2503/distcc_dist/include_server/headermap.py?txt + while also looking at the implementation in clang in: + https://llvm.org/svn/llvm-project/cfe/trunk/lib/Lex/HeaderMap.cpp + """ + magic = 1751998832 + version = 1 + _reserved = 0 + count = len(filelist) + capacity = NextGreaterPowerOf2(count) + strings_offset = 24 + (12 * capacity) + max_value_length = max(len(value) for value in filelist.values()) + + out = open(output_name, "wb") + out.write( + struct.pack( + "=12" + } + }, + "node_modules/@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "dev": true, + "license": "ISC", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/cacache": { + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true, + "license": "MIT" + }, + "node_modules/exponential-backoff": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", + "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ip-address": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", + "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/make-fetch-happen": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-gyp": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", + "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^4.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/semver": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", + "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ip-address": "^10.0.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dev": true, + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + } + } +} diff --git a/vendor/printenvz/package.json b/vendor/printenvz/package.json new file mode 100644 index 00000000000..440c40a5ed8 --- /dev/null +++ b/vendor/printenvz/package.json @@ -0,0 +1,23 @@ +{ + "name": "printenvz", + "version": "1.0.0", + "description": "A native module that prints environment variables to stdout", + "main": "index.js", + "types": "index.d.ts", + "scripts": { + "install": "node-gyp rebuild", + "build": "node-gyp build", + "clean": "node-gyp clean", + "rebuild": "node-gyp rebuild" + }, + "gypfile": true, + "dependencies": { + "node-gyp": "^10.0.1" + }, + "devDependencies": { + "node-gyp": "^10.0.1" + }, + "keywords": ["native", "environment", "variables", "executable"], + "author": "", + "license": "MIT" +} diff --git a/vendor/printenvz/src/printenvz.cc b/vendor/printenvz/src/printenvz.cc new file mode 100644 index 00000000000..8521eb5de17 --- /dev/null +++ b/vendor/printenvz/src/printenvz.cc @@ -0,0 +1,15 @@ +#include +#include +#include + +extern char **environ; + +int main() { + // Iterate through all environment variables + for (char **env = environ; *env != nullptr; ++env) { + // Print the environment variable followed by null terminator + std::cout << *env << '\0'; + } + + return 0; +} From 163a15845dd8483f97dd317fd9a4f316a907f334 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 14:00:59 +0100 Subject: [PATCH 0605/1338] Get clean shell env --- app/package.json | 1 + app/src/lib/hooks/hooks-proxy.ts | 46 +++- app/src/lib/hooks/with-hooks-env.ts | 23 +- app/yarn.lock | 2 +- package.json | 2 + script/build.ts | 35 ++- yarn.lock | 366 +++++++++++++++++++++++++++- 7 files changed, 444 insertions(+), 31 deletions(-) diff --git a/app/package.json b/app/package.json index 6902684b531..a61e952a7dc 100644 --- a/app/package.json +++ b/app/package.json @@ -69,6 +69,7 @@ "tslib": "^2.0.0", "untildify": "^3.0.2", "uuid": "^3.0.1", + "which": "^5.0.0", "windows-argv-parser": "file:../vendor/windows-argv-parser", "winston": "^3.6.0" }, diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index ecad412176c..f5a2658b33c 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -7,6 +7,7 @@ import { ProcessProxyConnection } from 'process-proxy' import { Shescape } from 'shescape' import { Writable } from 'stream' import { pipeline } from 'stream/promises' +import { execFile } from '../exec-file' const hooksUsingStdin = ['post-rewrite'] @@ -76,7 +77,35 @@ const exitWithError = ( }) } -export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { +const getCleanShellEnv = async (): Promise> => { + const ext = __WIN32__ ? '.exe' : '' + const printenvzPath = join(__dirname, `printenvz${ext}`) + + const { shell, args, quote } = getShell() + const { stdout } = await execFile(shell, [...args, quote(printenvzPath)], { + env: {}, + }) + + return Object.fromEntries( + stdout.split('\0').map(line => { + const eqIndex = line.indexOf('=') + if (eqIndex === -1) { + throw new Error(`Invalid env var line: ${line}`) + } + const key = line.substring(0, eqIndex) + const value = line.substring(eqIndex + 1) + return [key, value] + }) + ) +} + +export const createHooksProxy = ( + repoHooks: string[], + tmpDir: string, + gitPath: string +) => { + const cleanShellEnv = memoizeOne(getCleanShellEnv) + return async (connection: ProcessProxyConnection) => { const startTime = Date.now() const proxyArgs = await connection.getArgs() @@ -129,10 +158,7 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { await pipeline(connection.stdin, createWriteStream(stdinFilePath)) } - const { shell, args: shellArgs, quote } = getShell() - - const cmdArgs = [ - 'git', + const args = [ 'hook', 'run', hookName, @@ -140,7 +166,7 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { '--', ...proxyArgs.slice(1), ] - const cmd = cmdArgs.map(quote).join(' ') + const shellEnv = await cleanShellEnv() const { code } = await new Promise<{ code: number | null @@ -149,15 +175,15 @@ export const createHooksProxy = (repoHooks: string[], tmpDir: string) => { const abortController = new AbortController() connection.on('close', () => abortController.abort()) - const child = spawn(shell, [...shellArgs, cmd], { + const child = spawn(gitPath, args, { cwd: proxyCwd, - env: safeEnv, + env: { ...shellEnv, ...safeEnv }, signal: abortController.signal, }) - .on('error', reject) .on('close', (code, signal) => resolve({ code, signal })) + .on('error', reject) - // Git hooks only write to stderr + // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 child.stderr.pipe(connection.stderr).on('error', reject) }) diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index efd494c68d5..25a8a3d7ec7 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -1,11 +1,12 @@ -import { tmpdir } from 'os' -import { enableHooksEnvironment } from '../feature-flag' -import { getRepoHooks } from './get-repo-hooks' import { cp, mkdtemp, rm } from 'fs/promises' -import { join, basename } from 'path' -import { createProxyProcessServer } from 'process-proxy' import { AddressInfo } from 'net' +import { tmpdir } from 'os' +import { basename, join } from 'path' +import { createProxyProcessServer } from 'process-proxy' +import which from 'which' +import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' +import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' export async function withHooksEnv( @@ -30,15 +31,22 @@ export async function withHooksEnv( return fn(options?.env) } + const gitPath = await which('git', { nothrow: true }) + + if (gitPath === null) { + log.info(`Git executable not found in PATH, skipping hook interception.`) + return fn(options?.env) + } + const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) const token = crypto.randomUUID() const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) - const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir) + const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir, gitPath) const server = createProxyProcessServer( - conn => hooksProxy(conn).catch(e => conn.exit(1).catch(() => {})), + conn => hooksProxy(conn).catch(() => conn.exit(1).catch(() => {})), { validateConnection: async receivedToken => receivedToken === token } ) const port = await new Promise((resolve, reject) => { @@ -71,6 +79,7 @@ export async function withHooksEnv( PROCESS_PROXY_TOKEN: token, }) } finally { + server.close() // Clean up the temporary directory await rm(tmpHooksDir, { recursive: true, force: true }).catch(() => { // Ignore errors diff --git a/app/yarn.lock b/app/yarn.lock index 9745139aaac..80a27df2997 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1478,7 +1478,7 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -"which@^3.0.0 || ^4.0.0 || ^5.0.0": +"which@^3.0.0 || ^4.0.0 || ^5.0.0", which@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ== diff --git a/package.json b/package.json index aea56a105c2..09d243c8e6f 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@primer/octicons": "^19.0.0", "@types/diff": "^7.0.2", + "@types/which": "^3.0.4", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/experimental-utils": "^5.62.0", "@typescript-eslint/parser": "^6.13.2", @@ -86,6 +87,7 @@ "parallel-webpack": "^2.6.0", "parse-dds": "^1.2.1", "prettier": "^2.6.0", + "printenvz": "file:./vendor/printenvz", "process-proxy": "^0.3.0", "rimraf": "^6.0.1", "sass": "^1.27.0", diff --git a/script/build.ts b/script/build.ts index 42af025260f..5200852787b 100755 --- a/script/build.ts +++ b/script/build.ts @@ -1,13 +1,14 @@ /* eslint-disable no-sync */ /// -import * as path from 'path' import * as cp from 'child_process' -import * as os from 'os' import packager, { OfficialArch, OsxNotarizeOptions } from 'electron-packager' import frontMatter from 'front-matter' -import { externals } from '../app/webpack.common' +import * as os from 'os' +import * as path from 'path' +import { getPrintenvzPath } from 'printenvz' import { getProxyCommandPath } from 'process-proxy' +import { externals } from '../app/webpack.common' interface IChooseALicense { readonly title: string @@ -29,18 +30,16 @@ import { getProductName, } from '../app/package-info' +import { isGitHubActions } from './build-platforms' import { getChannel, + getDistArchitecture, getDistRoot, getExecutableName, - isPublishable, getIconFileName, - getDistArchitecture, + isPublishable, } from './dist-info' -import { isGitHubActions } from './build-platforms' -import { updateLicenseDump } from './licenses/update-license-dump' -import { verifyInjectedSassVariables } from './validate-sass/validate-all' import { existsSync, mkdirSync, @@ -51,6 +50,8 @@ import { writeFileSync, } from 'fs' import { copySync } from 'fs-extra' +import { updateLicenseDump } from './licenses/update-license-dump' +import { verifyInjectedSassVariables } from './validate-sass/validate-all' const isPublishableBuild = isPublishable() const isDevelopmentBuild = getChannel() === 'development' @@ -374,6 +375,24 @@ function copyDependencies() { process.platform === 'win32' ? 'process-proxy.exe' : 'process-proxy' ) ) + + console.log(' Copying process-proxy binary') + copySync( + getProxyCommandPath(), + path.resolve( + outRoot, + process.platform === 'win32' ? 'process-proxy.exe' : 'process-proxy' + ) + ) + + console.log(' Copying printenvz binary') + copySync( + getPrintenvzPath(), + path.resolve( + outRoot, + process.platform === 'win32' ? 'printenvz.exe' : 'printenvz' + ) + ) } function generateLicenseMetadata(outRoot: string) { diff --git a/yarn.lock b/yarn.lock index 12c3efb7bca..0f51d9579f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -811,6 +811,24 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/agent@^2.0.0": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" + integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== + dependencies: + agent-base "^7.1.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.1" + lru-cache "^10.0.1" + socks-proxy-agent "^8.0.3" + +"@npmcli/fs@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" + integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== + dependencies: + semver "^7.3.5" + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -1319,6 +1337,11 @@ tapable "^2.2.0" webpack "^5" +"@types/which@^3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/which/-/which-3.0.4.tgz#2c3a89be70c56a84a6957a7264639f39ae4340a1" + integrity sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w== + "@types/yauzl@^2.9.1": version "2.9.1" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" @@ -1683,6 +1706,11 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== + 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" @@ -1727,6 +1755,14 @@ agent-base@^7.1.2: resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1" integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-formats@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" @@ -2124,6 +2160,24 @@ builtin-modules@^1.0.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= +cacache@^18.0.0: + version "18.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5" + integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^10.0.1" + minipass "^7.0.3" + minipass-collect "^2.0.1" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + p-map "^4.0.0" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.0.0" + cacheable-lookup@^5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" @@ -2241,6 +2295,11 @@ chalk@^5.3.0: optionalDependencies: fsevents "~2.1.2" +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + chrome-trace-event@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" @@ -2258,6 +2317,11 @@ clean-css@^5.2.2: dependencies: source-map "~0.6.0" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -2754,6 +2818,13 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -2797,6 +2868,11 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + errno@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" @@ -3403,6 +3479,11 @@ events@^3.0.0, events@^3.2.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== +exponential-backoff@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6" + integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA== + extract-zip@^2.0.0, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -3631,6 +3712,20 @@ fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^1.0.0" +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs-minipass@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" + integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw== + dependencies: + minipass "^7.0.3" + fs-monkey@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788" @@ -3804,6 +3899,18 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +glob@^10.2.2, glob@^10.3.10: + version "10.4.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" + integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + package-json-from-dist "^1.0.0" + path-scurry "^1.11.1" + glob@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e" @@ -3962,7 +4069,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4: +graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -4144,6 +4251,11 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== +http-cache-semantics@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5" + integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ== + http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" @@ -4168,7 +4280,7 @@ https-proxy-agent@^7.0.0: agent-base "^7.0.2" debug "4" -https-proxy-agent@^7.0.6: +https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.6: version "7.0.6" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== @@ -4176,7 +4288,7 @@ https-proxy-agent@^7.0.6: agent-base "^7.1.2" debug "4" -iconv-lite@0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -4216,6 +4328,11 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -4257,6 +4374,11 @@ interpret@^1.0.1: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" integrity sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= +ip-address@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.0.1.tgz#a8180b783ce7788777d796286d61bce4276818ed" + integrity sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA== + is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -4389,6 +4511,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-map@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" @@ -4528,6 +4655,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +isexe@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d" + integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ== + isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" @@ -4544,6 +4676,15 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" +jackspeak@^3.1.2: + version "3.4.3" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a" + integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jackspeak@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.0.1.tgz#9fca4ce961af6083e259c376e9e3541431f5287b" @@ -4936,7 +5077,7 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^10.4.3: +lru-cache@^10.0.1, lru-cache@^10.2.0, lru-cache@^10.4.3: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== @@ -4965,6 +5106,24 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96" integrity sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= +make-fetch-happen@^13.0.0: + version "13.0.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" + integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== + dependencies: + "@npmcli/agent" "^2.0.0" + cacache "^18.0.0" + http-cache-semantics "^4.1.1" + is-lambda "^1.0.1" + minipass "^7.0.2" + minipass-fetch "^3.0.0" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + proc-log "^4.2.0" + promise-retry "^2.0.1" + ssri "^10.0.0" + markdown-it@13.0.1: version "13.0.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430" @@ -5121,11 +5280,70 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -minipass@^7.1.2: +minipass-collect@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863" + integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw== + dependencies: + minipass "^7.0.3" + +minipass-fetch@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" + integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== + dependencies: + minipass "^7.0.3" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -5133,6 +5351,11 @@ mkdirp@^0.5.1: dependencies: minimist "0.0.8" +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mrmime@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" @@ -5163,6 +5386,11 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +negotiator@^0.6.3: + version "0.6.4" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -5176,6 +5404,22 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" +node-gyp@^10.0.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.3.1.tgz#1dd1a1a1c6c5c59da1a76aea06a062786b2c8a1a" + integrity sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^10.3.10" + graceful-fs "^4.2.6" + make-fetch-happen "^13.0.0" + nopt "^7.0.0" + proc-log "^4.1.0" + semver "^7.3.5" + tar "^6.2.1" + which "^4.0.0" + node-ipc@^9.1.0: version "9.1.3" resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.3.tgz#1df3f069d103184ae9127fa885dbdaea56a4436f" @@ -5205,6 +5449,13 @@ node-test-parser@^2.2.1: resolved "https://registry.yarnpkg.com/node-test-parser/-/node-test-parser-2.2.2.tgz#486f0d0c08e31e6b341eadf6a9f574e8c53d8259" integrity sha512-Cbe0pabtJaZOrjvCguHe9kZLDrHZpRr+4+JO29hNf143qFUhGn6Xn5HxwQmh4vmyyLFlF2YmnJGIwfEX+aQ7mw== +nopt@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== + dependencies: + abbrev "^2.0.0" + normalize-package-data@^2.0.0, normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" @@ -5386,6 +5637,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + package-json-from-dist@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" @@ -5491,6 +5749,14 @@ path-parse@^1.0.5, path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580" @@ -5629,6 +5895,16 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" +"printenvz@file:./vendor/printenvz": + version "1.0.0" + dependencies: + node-gyp "^10.0.1" + +proc-log@^4.1.0, proc-log@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" + integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== + process-proxy@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/process-proxy/-/process-proxy-0.3.0.tgz#5bdb0cf430214868d395b3a9a5b74f12f519afbb" @@ -5639,6 +5915,14 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" @@ -5868,6 +6152,11 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -6025,6 +6314,11 @@ semver@^7.1.3, semver@^7.3.2, semver@^7.3.4: dependencies: lru-cache "^6.0.0" +semver@^7.3.5: + version "7.7.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" + integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== + semver@^7.3.7, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" @@ -6132,6 +6426,28 @@ slide@~1.1.3: resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^8.0.3: + version "8.0.5" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee" + integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw== + dependencies: + agent-base "^7.1.2" + debug "^4.3.4" + socks "^2.8.3" + +socks@^2.8.3: + version "2.8.7" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea" + integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A== + dependencies: + ip-address "^10.0.1" + smart-buffer "^4.2.0" + source-map-js@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" @@ -6195,6 +6511,13 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +ssri@^10.0.0: + version "10.0.6" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" + integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== + dependencies: + minipass "^7.0.3" + stack-utils@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" @@ -6426,6 +6749,18 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +tar@^6.1.11, tar@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + temp@^0.9.0: version "0.9.1" resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697" @@ -6756,6 +7091,20 @@ undici@^5.25.4: dependencies: "@fastify/busboy" "^2.0.0" +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== + dependencies: + unique-slug "^4.0.0" + +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== + dependencies: + imurmurhash "^0.1.4" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -7029,6 +7378,13 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" +which@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a" + integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg== + dependencies: + isexe "^3.1.1" + wildcard@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" From 51e96d88e10a19b3b4e6201243ec638d103f16c4 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 16:10:02 +0100 Subject: [PATCH 0606/1338] Execute Git directly after having obtained a clean shell environment Extracted shell and environment logic into get-shell and get-shell-env modules. Updated hooks-proxy and with-hooks-env to use the new shellEnv, improving reliability and separation of concerns. Added support for passing shell environment to hook proxy and locating git executable using the correct PATH. --- app/src/lib/hooks/get-shell-env.ts | 18 +++++++ app/src/lib/hooks/get-shell.ts | 31 ++++++++++++ app/src/lib/hooks/hooks-proxy.ts | 74 ++++------------------------- app/src/lib/hooks/with-hooks-env.ts | 20 +++++--- 4 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 app/src/lib/hooks/get-shell-env.ts create mode 100644 app/src/lib/hooks/get-shell.ts diff --git a/app/src/lib/hooks/get-shell-env.ts b/app/src/lib/hooks/get-shell-env.ts new file mode 100644 index 00000000000..14e85f09aa5 --- /dev/null +++ b/app/src/lib/hooks/get-shell-env.ts @@ -0,0 +1,18 @@ +import { join } from 'path' +import { getShell } from './get-shell' +import { execFile } from '../exec-file' + +export const getShellEnv = async (): Promise< + Record +> => { + const ext = __WIN32__ ? '.exe' : '' + const printenvzPath = join(__dirname, `printenvz${ext}`) + + const { shell, args, quote } = getShell() + const { stdout } = await execFile(shell, [...args, quote(printenvzPath)], { + env: {}, + }) + + const matches = stdout.matchAll(/([^=]+)=([^\0]*)\0/g) + return Object.fromEntries(Array.from(matches, m => [m[1], m[2]])) +} diff --git a/app/src/lib/hooks/get-shell.ts b/app/src/lib/hooks/get-shell.ts new file mode 100644 index 00000000000..ebf2ba3a872 --- /dev/null +++ b/app/src/lib/hooks/get-shell.ts @@ -0,0 +1,31 @@ +import memoizeOne from 'memoize-one' +import { Shescape } from 'shescape' + +const getQuoteFn = memoizeOne((shell: string) => { + const shescape = new Shescape({ shell, flagProtection: false }) + return { + escape: shescape.escape.bind(shescape), + quote: shescape.quote.bind(shescape), + } +}) + +export const getShell = () => { + // TODO: Windows: + if (__WIN32__) { + throw new Error('Not implemented') + } + + if (process.env.SHELL) { + return { + shell: process.env.SHELL, + args: ['-ilc'], + ...getQuoteFn(process.env.SHELL), + } + } + + return { + shell: '/bin/sh', + args: ['-ilc'], + ...getQuoteFn('/bin/sh'), + } +} diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index f5a2658b33c..2c7eb8a0249 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -1,13 +1,10 @@ import { spawn } from 'child_process' import { randomBytes } from 'crypto' import { createWriteStream } from 'fs' -import memoizeOne from 'memoize-one' import { basename, join } from 'path' import { ProcessProxyConnection } from 'process-proxy' -import { Shescape } from 'shescape' import { Writable } from 'stream' import { pipeline } from 'stream/promises' -import { execFile } from '../exec-file' const hooksUsingStdin = ['post-rewrite'] @@ -15,39 +12,6 @@ const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) } -const getShell = () => { - // TODO: Windows: - if (__WIN32__) { - throw new Error('Not implemented') - } - - if (process.env.SHELL) { - try { - return { - shell: process.env.SHELL, - args: ['-ilc'], - ...getQuoteFn(process.env.SHELL), - } - } catch (err) { - debug('Failed resolving shell', err) - } - } - - return { - shell: '/bin/sh', - args: ['-ilc'], - ...getQuoteFn('/bin/sh'), - } -} - -const getQuoteFn = memoizeOne((shell: string) => { - const shescape = new Shescape({ shell, flagProtection: false }) - return { - escape: shescape.escape.bind(shescape), - quote: shescape.quote.bind(shescape), - } -}) - const waitForWritableFinished = (stream: Writable) => { return new Promise(resolve => { if (stream.writableFinished) { @@ -77,35 +41,12 @@ const exitWithError = ( }) } -const getCleanShellEnv = async (): Promise> => { - const ext = __WIN32__ ? '.exe' : '' - const printenvzPath = join(__dirname, `printenvz${ext}`) - - const { shell, args, quote } = getShell() - const { stdout } = await execFile(shell, [...args, quote(printenvzPath)], { - env: {}, - }) - - return Object.fromEntries( - stdout.split('\0').map(line => { - const eqIndex = line.indexOf('=') - if (eqIndex === -1) { - throw new Error(`Invalid env var line: ${line}`) - } - const key = line.substring(0, eqIndex) - const value = line.substring(eqIndex + 1) - return [key, value] - }) - ) -} - export const createHooksProxy = ( repoHooks: string[], tmpDir: string, - gitPath: string + gitPath: string, + shellEnv: Record ) => { - const cleanShellEnv = memoizeOne(getCleanShellEnv) - return async (connection: ProcessProxyConnection) => { const startTime = Date.now() const proxyArgs = await connection.getArgs() @@ -127,6 +68,10 @@ export const createHooksProxy = ( // user-configured but since we're executing the hook in a separate // shell with login it would just get re-initialized there anyway. 'GIT_CONFIG_PARAMETERS', + + 'GIT_ASKPASS', + 'GIT_SSH_COMMAND', + 'GIT_USER_AGENT', ]) const safeEnv = Object.fromEntries( @@ -166,8 +111,6 @@ export const createHooksProxy = ( '--', ...proxyArgs.slice(1), ] - const shellEnv = await cleanShellEnv() - const { code } = await new Promise<{ code: number | null signal: NodeJS.Signals | null @@ -181,7 +124,10 @@ export const createHooksProxy = ( signal: abortController.signal, }) .on('close', (code, signal) => resolve({ code, signal })) - .on('error', reject) + .on('error', err => { + debug(`failed to spawn hook process:`, err) + reject(err) + }) // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 25a8a3d7ec7..bcb8c8d4ee5 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -8,6 +8,7 @@ import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' +import { getShellEnv } from './get-shell-env' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, @@ -31,22 +32,27 @@ export async function withHooksEnv( return fn(options?.env) } - const gitPath = await which('git', { nothrow: true }) + const shellEnv = await getShellEnv() - if (gitPath === null) { - log.info(`Git executable not found in PATH, skipping hook interception.`) - return fn(options?.env) - } + // TODO: will throw + const gitPath = await which('git', { + path: shellEnv.PATH, + pathExt: shellEnv.PATHEXT, + }) const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) const token = crypto.randomUUID() const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) - const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir, gitPath) + const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir, gitPath, shellEnv) const server = createProxyProcessServer( - conn => hooksProxy(conn).catch(() => conn.exit(1).catch(() => {})), + conn => + hooksProxy(conn).catch(err => { + log.error(`hooks proxy failed:`, err) + conn.exit(1).catch(() => {}) + }), { validateConnection: async receivedToken => receivedToken === token } ) const port = await new Promise((resolve, reject) => { From 948f5cbad0fc6192b31ea91d2785259558f750bf Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 16:26:50 +0100 Subject: [PATCH 0607/1338] Use hooks subcommand from embedded Git --- app/src/lib/hooks/with-hooks-env.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index bcb8c8d4ee5..11fe62a51b1 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -1,14 +1,14 @@ import { cp, mkdtemp, rm } from 'fs/promises' import { AddressInfo } from 'net' import { tmpdir } from 'os' -import { basename, join } from 'path' +import { basename, join, resolve } from 'path' import { createProxyProcessServer } from 'process-proxy' -import which from 'which' import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' import { getShellEnv } from './get-shell-env' +import { resolveGitBinary } from 'dugite' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, @@ -32,13 +32,16 @@ export async function withHooksEnv( return fn(options?.env) } + const shellEnvStartTime = Date.now() const shellEnv = await getShellEnv() + log.debug( + `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` + ) // TODO: will throw - const gitPath = await which('git', { - path: shellEnv.PATH, - pathExt: shellEnv.PATHEXT, - }) + const gitPathStartTime = Date.now() + const gitPath = resolveGitBinary(resolve(__dirname, 'git')) + log.debug(`hooks: located git in ${Date.now() - gitPathStartTime}ms`) const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) From c6e667f29bdc4880a70f06b122fc2a0528bc1d78 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 16:26:56 +0100 Subject: [PATCH 0608/1338] Update get-shell-env.ts --- app/src/lib/hooks/get-shell-env.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/lib/hooks/get-shell-env.ts b/app/src/lib/hooks/get-shell-env.ts index 14e85f09aa5..90f19d4c558 100644 --- a/app/src/lib/hooks/get-shell-env.ts +++ b/app/src/lib/hooks/get-shell-env.ts @@ -11,6 +11,7 @@ export const getShellEnv = async (): Promise< const { shell, args, quote } = getShell() const { stdout } = await execFile(shell, [...args, quote(printenvzPath)], { env: {}, + maxBuffer: Infinity, }) const matches = stdout.matchAll(/([^=]+)=([^\0]*)\0/g) From 3748b280e878e63fe1372b8690bb187100b3692a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 5 Nov 2025 16:40:58 +0100 Subject: [PATCH 0609/1338] Filter and validate known Git hooks in getRepoHooks Introduces a list of known Git hook names and updates getRepoHooks to filter out unknown hooks, .sample files, and handle Windows-specific executable checks. This improves accuracy and reliability when listing repository hooks. --- app/src/lib/hooks/get-repo-hooks.ts | 58 +++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/app/src/lib/hooks/get-repo-hooks.ts b/app/src/lib/hooks/get-repo-hooks.ts index f28dac0cb36..574726cd1a4 100644 --- a/app/src/lib/hooks/get-repo-hooks.ts +++ b/app/src/lib/hooks/get-repo-hooks.ts @@ -7,6 +7,37 @@ const isExecutable = (path: string) => .then(() => true) .catch(() => false) +const knownHooks = [ + 'applypatch-msg', + 'pre-applypatch', + 'post-applypatch', + 'pre-commit', + 'pre-merge-commit', + 'prepare-commit-msg', + 'commit-msg', + 'post-commit', + 'pre-rebase', + 'post-checkout', + 'post-merge', + 'pre-push', + 'pre-receive', + 'update', + 'proc-receive', + 'post-receive', + 'post-update', + 'reference-transaction', + 'push-to-checkout', + 'pre-auto-gc', + 'post-rewrite', + 'sendemail-validate', + 'fsmonitor-watchman', + 'p4-changelist', + 'p4-prepare-changelist', + 'p4-post-changelist', + 'p4-pre-submit', + 'post-index-change', +] + export async function* getRepoHooks(path: string, filter?: string[]) { // TODO: Could we cache this? For just a little while? // Probably not because we need to react to changes to core.hooksPath on the @@ -26,22 +57,33 @@ export async function* getRepoHooks(path: string, filter?: string[]) { .catch(() => []) for (const hook of files) { - if (filter && !filter.includes(hook.name)) { + const hookName = hook.name.endsWith('.exe') + ? hook.name.slice(0, -4) + : hook.name + + if (filter && !filter.includes(hookName)) { + continue + } + + if (!knownHooks.includes(hookName)) { + continue + } + + if (hookName.endsWith('.sample')) { continue } const hookPath = join(hook.parentPath, hook.name) if (__WIN32__) { - if (hook.name.endsWith('.exe')) { - continue - } + // On Windows we have to assume that any valid hook name is executable + // because the executable bit is not used there. Git looks for a shebang + // but that seems expensive to check here :shrug: + yield hookPath } else { - if (!(await isExecutable(hookPath))) { - continue + if (await isExecutable(hookPath)) { + yield hookPath } } - - yield hookPath } } From e6098b0228fd768e1e97a19f5ce5b382fe8218cf Mon Sep 17 00:00:00 2001 From: Leonardo Manrique Date: Wed, 5 Nov 2025 20:50:38 +0100 Subject: [PATCH 0610/1338] Add ARM64 Cursor editor detection Add support for detecting the ARM64 version of Cursor editor on Windows by including its registry key in the list of uninstall keys to check. --- app/src/lib/editors/win32.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts index 41d7e601bd6..733d1ed324a 100644 --- a/app/src/lib/editors/win32.ts +++ b/app/src/lib/editors/win32.ts @@ -482,6 +482,8 @@ const editors: WindowsExternalEditor[] = [ registryKeys: [ CurrentUserUninstallKey('62625861-8486-5be9-9e46-1da50df5f8ff'), CurrentUserUninstallKey('{DADADADA-ADAD-ADAD-ADAD-ADADADADADAD}}_is1'), + // ARM64 version of Cursor + CurrentUserUninstallKey('{DBDBDBDB-BDBD-BDBD-BDBD-BDBDBDBDBDBD}}_is1'), ], installLocationRegistryKey: 'DisplayIcon', displayNamePrefixes: ['Cursor', 'Cursor (User)'], From 1b05c925320f5f54c635c903be439738335de547 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 08:47:32 +0100 Subject: [PATCH 0611/1338] Eh, this is fast enough --- app/src/lib/hooks/get-repo-hooks.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/lib/hooks/get-repo-hooks.ts b/app/src/lib/hooks/get-repo-hooks.ts index 574726cd1a4..edde20cbfec 100644 --- a/app/src/lib/hooks/get-repo-hooks.ts +++ b/app/src/lib/hooks/get-repo-hooks.ts @@ -39,9 +39,6 @@ const knownHooks = [ ] export async function* getRepoHooks(path: string, filter?: string[]) { - // TODO: Could we cache this? For just a little while? - // Probably not because we need to react to changes to core.hooksPath on the - // fly but it sure would be nice. const { exitCode, stdout } = await exec( ['config', '-z', '--get', 'core.hooksPath'], path From 3631f231cb5883a411695fba1685c31bca5b8e2c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 10:57:20 +0100 Subject: [PATCH 0612/1338] Add commit hook progress UI and state tracking Introduces HookProgress type and tracks hook execution status in repository state. Updates UI components to display commit hook progress and repository optimization status during commit operations. Enhances user feedback for commit hooks and git garbage collection events. --- app/src/lib/app-state.ts | 6 +- app/src/lib/git/commit.ts | 7 ++- app/src/lib/git/core.ts | 14 +++++ app/src/lib/hooks/hooks-proxy.ts | 41 +++++++++++-- app/src/lib/hooks/with-hooks-env.ts | 8 ++- app/src/lib/stores/app-store.ts | 22 ++++++- app/src/lib/stores/repository-state-cache.ts | 2 + app/src/ui/changes/changes-list.tsx | 7 +++ app/src/ui/changes/commit-message.tsx | 58 +++++++++++++++++++ app/src/ui/changes/filter-changes-list.tsx | 7 +++ app/src/ui/changes/sidebar.tsx | 5 ++ .../commit-message/commit-message-dialog.tsx | 3 + app/src/ui/repository.tsx | 2 + app/styles/ui/changes/_commit-message.scss | 12 ++++ 14 files changed, 185 insertions(+), 9 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 1ea5a6d160a..200cf85fae2 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -44,7 +44,7 @@ import { MultiCommitOperationDetail, MultiCommitOperationStep, } from '../models/multi-commit-operation' -import { IChangesetData } from './git' +import type { HookProgress, IChangesetData } from './git' import { Popup } from '../models/popup' import { RepoRulesInfo } from '../models/repo-rules' import { IAPIRepoRuleset } from './api' @@ -549,6 +549,10 @@ export interface IRepositoryState { /** The date the repository was last fetched. */ readonly lastFetched: Date | null + readonly isRunningGitGC: boolean + + readonly hookProgress: HookProgress | null + /** * If we're currently working on switching to a new branch this * provides insight into the progress of that operation. diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index d84be370f2b..6298b38fffa 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -1,4 +1,4 @@ -import { git, parseCommitSHA } from './core' +import { git, HookProgress, parseCommitSHA } from './core' import { stageFiles } from './update-index' import { Repository } from '../../models/repository' import { WorkingDirectoryFileChange } from '../../models/status' @@ -16,7 +16,8 @@ export async function createCommit( repository: Repository, message: string, files: ReadonlyArray, - amend: boolean = false + amend: boolean = false, + onHookProgress?: (progress: HookProgress) => void ): Promise { // Clear the staging area, our diffs reflect the difference between the // working directory and the last commit (if any) so our commits should @@ -44,7 +45,9 @@ export async function createCommit( 'commit-msg', 'post-commit', 'post-rewrite', + 'pre-auto-gc', ], + onHookProgress, } ) return parseCommitSHA(result) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 423b523a5e7..da3105690b8 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -37,6 +37,19 @@ export const isMaxBufferExceededError = ( ) } +export type HookProgress = + | { + readonly hookName: string + } & ( + | { + readonly status: 'started' + readonly abort: () => void + } + | { + readonly status: 'finished' | 'failed' + } + ) + /** * An extension of the execution options in dugite that * allows us to piggy-back our own configuration options in the @@ -66,6 +79,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly isBackgroundTask?: boolean readonly interceptHooks?: boolean | string[] + readonly onHookProgress?: (progress: HookProgress) => void } /** diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 2c7eb8a0249..5faafbf10c7 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -5,6 +5,7 @@ import { basename, join } from 'path' import { ProcessProxyConnection } from 'process-proxy' import { Writable } from 'stream' import { pipeline } from 'stream/promises' +import type { HookProgress } from '../git' const hooksUsingStdin = ['post-rewrite'] @@ -45,7 +46,8 @@ export const createHooksProxy = ( repoHooks: string[], tmpDir: string, gitPath: string, - shellEnv: Record + shellEnv: Record, + onHookProgress?: (progress: HookProgress) => void ) => { return async (connection: ProcessProxyConnection) => { const startTime = Date.now() @@ -57,6 +59,14 @@ export const createHooksProxy = ( ? basename(proxyArgs[0]).replace(/\.exe$/i, '') : basename(proxyArgs[0]) + const abortController = new AbortController() + + onHookProgress?.({ + hookName, + status: 'started', + abort: () => abortController.abort(), + }) + const excludedEnvVars = new Set([ // Dugite sets these, we don't want to leak them into the hook environment 'GIT_SYSTEM_CONFIG', @@ -103,6 +113,12 @@ export const createHooksProxy = ( await pipeline(connection.stdin, createWriteStream(stdinFilePath)) } + if (abortController.signal.aborted) { + debug(`hook ${hookName} aborted before execution`) + await exitWithError(connection, `Hook ${hookName} aborted`) + return + } + const args = [ 'hook', 'run', @@ -111,11 +127,10 @@ export const createHooksProxy = ( '--', ...proxyArgs.slice(1), ] - const { code } = await new Promise<{ + const { code, signal } = await new Promise<{ code: number | null signal: NodeJS.Signals | null }>((resolve, reject) => { - const abortController = new AbortController() connection.on('close', () => abortController.abort()) const child = spawn(gitPath, args, { @@ -132,8 +147,18 @@ export const createHooksProxy = ( // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 child.stderr.pipe(connection.stderr).on('error', reject) + child.stderr.on('data', data => + console.log('hooks stderr:', data.toString()) + ) }) + if (signal !== null) { + debug(`hook ${hookName} was killed by signal ${signal}`) + connection.stderr.write( + `error: ${hookName} hook received signal ${signal}\n` + ) + } + await waitForWritableFinished(connection.stderr).catch(e => { debug(`waiting for stderr to finish failed`, e) }) @@ -142,8 +167,16 @@ export const createHooksProxy = ( debug( `executed ${hookName}: exited with code ${code} in ${elapsedSeconds}s` ) + + const exitCode = code ?? 1 await connection - .exit(code ?? 0) + .exit(exitCode) .catch(err => debug(`failed to exit proxy:`, err)) + .then(() => + onHookProgress?.({ + hookName, + status: exitCode === 0 ? 'finished' : 'failed', + }) + ) } } diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 11fe62a51b1..4f293e5c629 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -48,7 +48,13 @@ export async function withHooksEnv( const token = crypto.randomUUID() const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) - const hooksProxy = createHooksProxy(repoHooks, tmpHooksDir, gitPath, shellEnv) + const hooksProxy = createHooksProxy( + repoHooks, + tmpHooksDir, + gitPath, + shellEnv, + options?.onHookProgress + ) const server = createProxyProcessServer( conn => diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 7180325c3fd..a3d56dab0bc 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3309,7 +3309,23 @@ export class AppStore extends TypedBaseStore { return this.withIsCommitting(repository, async () => { const result = await gitStore.performFailableOperation(async () => { const message = await formatCommitMessage(repository, context) - return createCommit(repository, message, selectedFiles, context.amend) + return createCommit( + repository, + message, + selectedFiles, + context.amend, + hookProgress => { + this.repositoryStateCache.update(repository, state => ({ + ...state, + ...(hookProgress?.hookName === 'pre-auto-gc' && + hookProgress?.status === 'finished' + ? { isRunningGitGC: true } + : undefined), + hookProgress, + })) + this.emitUpdate() + } + ) }) if (result !== undefined) { @@ -4762,6 +4778,8 @@ export class AppStore extends TypedBaseStore { this.repositoryStateCache.update(repository, () => ({ isCommitting: true, + hookProgress: null, + isRunningGitGC: false, })) this.emitUpdate() @@ -4770,6 +4788,8 @@ export class AppStore extends TypedBaseStore { } finally { this.repositoryStateCache.update(repository, () => ({ isCommitting: false, + hookProgress: null, + isRunningGitGC: false, })) this.emitUpdate() } diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index bc2dd5e958f..4b95b448cab 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -363,6 +363,8 @@ function getInitialRepositoryState(): IRepositoryState { remote: null, isPushPullFetchInProgress: false, isCommitting: false, + isRunningGitGC: false, + hookProgress: null, isGeneratingCommitMessage: false, commitToAmend: null, lastFetched: null, diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 0b849b30b46..65cea2cd167 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -59,6 +59,7 @@ import { RepoRulesInfo } from '../../models/repo-rules' import { IAheadBehind } from '../../models/branch' import { StashDiffViewerId } from '../stashing' import { enableFilteredChangesList } from '../../lib/feature-flag' +import { HookProgress } from '../../lib/git' const RowHeight = 29 const StashIcon: OcticonSymbolVariant = { @@ -174,6 +175,8 @@ interface IChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean + readonly isRunningGitGC: boolean + readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -768,6 +771,8 @@ export class ChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, + isRunningGitGC, + hookProgress, isGeneratingCommitMessage, commitToAmend, currentBranchProtected, @@ -839,6 +844,8 @@ export class ChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} + isRunningGitGC={isRunningGitGC} + hookProgress={hookProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index a3fd8e69050..0951cca1456 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -64,6 +64,8 @@ import { isDotCom } from '../../lib/endpoint-capabilities' import { WorkingDirectoryFileChange } from '../../models/status' import { enableCommitMessageGeneration } from '../../lib/feature-flag' import { AriaLiveContainer } from '../accessibility/aria-live-container' +import { HookProgress } from '../../lib/git' +import { assertNever } from '../../lib/fatal-error' const addAuthorIcon: OcticonSymbolVariant = { w: 18, @@ -107,6 +109,8 @@ interface ICommitMessageProps { readonly repositoryAccount: Account | null readonly autocompletionProviders: ReadonlyArray> readonly isCommitting?: boolean + readonly isRunningGitGC: boolean + readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage?: boolean readonly shouldShowGenerateCommitMessageCallOut?: boolean readonly commitToAmend: Commit | null @@ -1546,6 +1550,59 @@ export class CommitMessage extends React.Component< ) } + private renderCommitProgress() { + const { isCommitting, isRunningGitGC, hookProgress } = this.props + if (!isCommitting) { + // return ( + //

    + // + // pre-commit hook finished + //
    + // ) + return null + } + + if (isRunningGitGC) { + return ( +
    + + Optimizing repository… +
    + ) + } + + if (!hookProgress) { + return null + } + + const { status, hookName } = hookProgress + + // const icon = + // status === 'started' ? ( + // + // ) : status === 'finished' ? ( + // + // ) : status === 'failed' ? ( + // + // ) : null + + const text = + status === 'started' + ? `${hookName} hook running…` + : status === 'finished' + ? `${hookName} hook finished` + : status === 'failed' + ? `${hookName} hook failed` + : assertNever(status, `Unknown hook status: ${status}`) + + return ( +
    + + {text} +
    + ) + } + public render() { const className = classNames('commit-message-component', { 'with-action-bar': this.isActionBarEnabled, @@ -1660,6 +1717,7 @@ export class CommitMessage extends React.Component< {this.renderBranchProtectionsRepoRulesCommitWarning()} {this.renderSubmitButton()} + {this.renderCommitProgress()} {this.state.isCommittingStatusMessage} diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 15b2c72dc7e..e9de1782d88 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -73,6 +73,7 @@ import { applyFilters, } from './filter-changes-logic' import { ChangesListFilterOptions } from './changes-list-filter-options' +import { HookProgress } from '../../lib/git' export interface IChangesListItem extends IFilterListItem { readonly id: string @@ -157,6 +158,8 @@ interface IFilterChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean + readonly isRunningGitGC: boolean + readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -865,6 +868,8 @@ export class FilterChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, + isRunningGitGC, + hookProgress, isGeneratingCommitMessage, commitToAmend, currentBranchProtected, @@ -941,6 +946,8 @@ export class FilterChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} + isRunningGitGC={isRunningGitGC} + hookProgress={hookProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index a5510108fbf..1a039f49649 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -33,6 +33,7 @@ import { IAheadBehind } from '../../models/branch' import { Emoji } from '../../lib/emoji' import { enableFilteredChangesList } from '../../lib/feature-flag' import { FilterChangesList } from './filter-changes-list' +import { HookProgress } from '../../lib/git' /** * The timeout for the animation of the enter/leave animation for Undo. @@ -56,6 +57,8 @@ interface IChangesSidebarProps { readonly issuesStore: IssuesStore readonly availableWidth: number readonly isCommitting: boolean + readonly isRunningGitGC: boolean + readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -439,6 +442,8 @@ export class ChangesSidebar extends React.Component { onIgnoreFile={this.onIgnoreFile} onIgnorePattern={this.onIgnorePattern} isCommitting={this.props.isCommitting} + isRunningGitGC={this.props.isRunningGitGC} + hookProgress={this.props.hookProgress} isGeneratingCommitMessage={this.props.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ this.props.shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 245161402ec..66308b249cf 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -164,6 +164,9 @@ export class CommitMessageDialog extends React.Component< onStopAmending={this.onStopAmending} onShowCreateForkDialog={this.onShowCreateForkDialog} accounts={this.props.accounts} + isCommitting={false} + isRunningGitGC={false} + hookProgress={null} /> diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 135df802cce..e38662caee4 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -249,6 +249,8 @@ export class RepositoryView extends React.Component< availableWidth={availableWidth} gitHubUserStore={this.props.gitHubUserStore} isCommitting={this.props.state.isCommitting} + isRunningGitGC={this.props.state.isRunningGitGC} + hookProgress={this.props.state.hookProgress} isGeneratingCommitMessage={this.props.state.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ this.props.shouldShowGenerateCommitMessageCallOut diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index d1d69997750..aec224953e1 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -12,6 +12,18 @@ padding: var(--spacing); + .commit-progress { + color: var(--text-secondary-color); + + display: flex; + align-items: center; + margin-top: var(--spacing-half); + svg.octicon { + margin-right: 3px; + height: 12px; + } + } + .copilot-disclaimer-popover-header { display: flex; From bff6f7492b780775c742900a81cf7e59d0c1cceb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 11:29:29 +0100 Subject: [PATCH 0613/1338] Remove isRunningGitGC state and refactor commit progress UI Eliminates the isRunningGitGC property and related logic from repository state, store, and UI components. Commit progress rendering now relies solely on hookProgress, and the commit message progress UI is updated for improved clarity and styling. --- app/src/lib/app-state.ts | 2 - app/src/lib/stores/app-store.ts | 6 --- app/src/lib/stores/repository-state-cache.ts | 1 - app/src/ui/changes/changes-list.tsx | 3 -- app/src/ui/changes/commit-message.tsx | 47 ++++++------------- app/src/ui/changes/filter-changes-list.tsx | 3 -- app/src/ui/changes/sidebar.tsx | 2 - .../commit-message/commit-message-dialog.tsx | 1 - app/src/ui/repository.tsx | 1 - app/styles/ui/changes/_commit-message.scss | 36 +++++++++++++- 10 files changed, 49 insertions(+), 53 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index 200cf85fae2..c57ce7f0275 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -549,8 +549,6 @@ export interface IRepositoryState { /** The date the repository was last fetched. */ readonly lastFetched: Date | null - readonly isRunningGitGC: boolean - readonly hookProgress: HookProgress | null /** diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index a3d56dab0bc..d6ba24b6c29 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3317,10 +3317,6 @@ export class AppStore extends TypedBaseStore { hookProgress => { this.repositoryStateCache.update(repository, state => ({ ...state, - ...(hookProgress?.hookName === 'pre-auto-gc' && - hookProgress?.status === 'finished' - ? { isRunningGitGC: true } - : undefined), hookProgress, })) this.emitUpdate() @@ -4779,7 +4775,6 @@ export class AppStore extends TypedBaseStore { this.repositoryStateCache.update(repository, () => ({ isCommitting: true, hookProgress: null, - isRunningGitGC: false, })) this.emitUpdate() @@ -4789,7 +4784,6 @@ export class AppStore extends TypedBaseStore { this.repositoryStateCache.update(repository, () => ({ isCommitting: false, hookProgress: null, - isRunningGitGC: false, })) this.emitUpdate() } diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 4b95b448cab..96a973b2eac 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -363,7 +363,6 @@ function getInitialRepositoryState(): IRepositoryState { remote: null, isPushPullFetchInProgress: false, isCommitting: false, - isRunningGitGC: false, hookProgress: null, isGeneratingCommitMessage: false, commitToAmend: null, diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 65cea2cd167..6e0cc4b198a 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -175,7 +175,6 @@ interface IChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean - readonly isRunningGitGC: boolean readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean @@ -771,7 +770,6 @@ export class ChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, - isRunningGitGC, hookProgress, isGeneratingCommitMessage, commitToAmend, @@ -844,7 +842,6 @@ export class ChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} - isRunningGitGC={isRunningGitGC} hookProgress={hookProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 0951cca1456..3e8df728400 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -109,7 +109,6 @@ interface ICommitMessageProps { readonly repositoryAccount: Account | null readonly autocompletionProviders: ReadonlyArray> readonly isCommitting?: boolean - readonly isRunningGitGC: boolean readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage?: boolean readonly shouldShowGenerateCommitMessageCallOut?: boolean @@ -1551,43 +1550,25 @@ export class CommitMessage extends React.Component< } private renderCommitProgress() { - const { isCommitting, isRunningGitGC, hookProgress } = this.props - if (!isCommitting) { + const { isCommitting, hookProgress } = this.props + if (!isCommitting || !hookProgress) { + return null // return ( - //
    - // - // pre-commit hook finished + //
    + //
    Optimizing repository...
    + // //
    // ) - return null - } - - if (isRunningGitGC) { - return ( -
    - - Optimizing repository… -
    - ) - } - - if (!hookProgress) { - return null } const { status, hookName } = hookProgress - // const icon = - // status === 'started' ? ( - // - // ) : status === 'finished' ? ( - // - // ) : status === 'failed' ? ( - // - // ) : null - const text = - status === 'started' + hookName === 'pre-auto-gc' && status === 'finished' + ? 'Optimizing repository…' + : status === 'started' ? `${hookName} hook running…` : status === 'finished' ? `${hookName} hook finished` @@ -1597,8 +1578,10 @@ export class CommitMessage extends React.Component< return (
    - - {text} +
    {text}
    +
    ) } diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index e9de1782d88..5da924e92d6 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -158,7 +158,6 @@ interface IFilterChangesListProps { readonly dispatcher: Dispatcher readonly availableWidth: number readonly isCommitting: boolean - readonly isRunningGitGC: boolean readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean @@ -868,7 +867,6 @@ export class FilterChangesList extends React.Component< repositoryAccount, dispatcher, isCommitting, - isRunningGitGC, hookProgress, isGeneratingCommitMessage, commitToAmend, @@ -946,7 +944,6 @@ export class FilterChangesList extends React.Component< focusCommitMessage={this.props.focusCommitMessage} autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} - isRunningGitGC={isRunningGitGC} hookProgress={hookProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 1a039f49649..ffd6b7ccdf9 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -57,7 +57,6 @@ interface IChangesSidebarProps { readonly issuesStore: IssuesStore readonly availableWidth: number readonly isCommitting: boolean - readonly isRunningGitGC: boolean readonly hookProgress: HookProgress | null readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean @@ -442,7 +441,6 @@ export class ChangesSidebar extends React.Component { onIgnoreFile={this.onIgnoreFile} onIgnorePattern={this.onIgnorePattern} isCommitting={this.props.isCommitting} - isRunningGitGC={this.props.isRunningGitGC} hookProgress={this.props.hookProgress} isGeneratingCommitMessage={this.props.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 66308b249cf..1d7d012702b 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -165,7 +165,6 @@ export class CommitMessageDialog extends React.Component< onShowCreateForkDialog={this.onShowCreateForkDialog} accounts={this.props.accounts} isCommitting={false} - isRunningGitGC={false} hookProgress={null} /> diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index e38662caee4..0c9cbfe0691 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -249,7 +249,6 @@ export class RepositoryView extends React.Component< availableWidth={availableWidth} gitHubUserStore={this.props.gitHubUserStore} isCommitting={this.props.state.isCommitting} - isRunningGitGC={this.props.state.isRunningGitGC} hookProgress={this.props.state.hookProgress} isGeneratingCommitMessage={this.props.state.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index aec224953e1..40a9f6e94dc 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -13,14 +13,46 @@ padding: var(--spacing); .commit-progress { - color: var(--text-secondary-color); + // color: var(--text-secondary-color); display: flex; align-items: center; margin-top: var(--spacing-half); - svg.octicon { + + .description { + flex-grow: 1; + @include ellipsis; + padding: var(--spacing-half) var(--spacing); + + border: var(--base-border); + border-radius: var(--button-border-radius); + border-color: var(--secondary-button-border-color); + border-right: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + button { + flex-shrink: 0; + padding: var(--spacing-third); + height: 100%; + border-left-width: 1px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + padding: 0 var(--spacing-half); + > svg.octicon { + height: 12px; + } + + &:hover { + background-color: var(--secondary-button-hover-background); + } + } + + > svg.octicon { margin-right: 3px; height: 12px; + flex-shrink: 0; } } From 5d5c3ddac6b2a46ca8eecb3a6108e8b622e42021 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 12:22:30 +0100 Subject: [PATCH 0614/1338] Add UI and logic for handling failed Git hooks Introduces a new popup and flow to handle failed Git hooks, allowing users to choose whether to abort or ignore the failure. Updates commit, core, hooks, and app store logic to support the new onHookFailure callback, and adds the HookFailed dialog component for user interaction. --- app/src/lib/git/commit.ts | 4 +- app/src/lib/git/core.ts | 1 + app/src/lib/hooks/hooks-proxy.ts | 68 ++++++++++++++++---------- app/src/lib/hooks/with-hooks-env.ts | 3 +- app/src/lib/stores/app-store.ts | 6 ++- app/src/models/popup.ts | 7 ++- app/src/ui/app.tsx | 11 +++++ app/src/ui/hook-failed/hook-failed.tsx | 54 ++++++++++++++++++++ 8 files changed, 124 insertions(+), 30 deletions(-) create mode 100644 app/src/ui/hook-failed/hook-failed.tsx diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index 6298b38fffa..d68fcb7f1a1 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -17,7 +17,8 @@ export async function createCommit( message: string, files: ReadonlyArray, amend: boolean = false, - onHookProgress?: (progress: HookProgress) => void + onHookProgress?: (progress: HookProgress) => void, + onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> ): Promise { // Clear the staging area, our diffs reflect the difference between the // working directory and the last commit (if any) so our commits should @@ -48,6 +49,7 @@ export async function createCommit( 'pre-auto-gc', ], onHookProgress, + onHookFailure, } ) return parseCommitSHA(result) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index da3105690b8..c756c7674f7 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -80,6 +80,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly interceptHooks?: boolean | string[] readonly onHookProgress?: (progress: HookProgress) => void + readonly onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> } /** diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 5faafbf10c7..05465e9e4f4 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -23,10 +23,10 @@ const waitForWritableFinished = (stream: Writable) => { }) } -const exitWithError = ( +const exitWithMessage = ( connection: ProcessProxyConnection, message: string, - exitCode = 1 + exitCode = 0 ) => { return new Promise((resolve, reject) => { connection.stderr.end(`${message}\n`, () => { @@ -42,18 +42,25 @@ const exitWithError = ( }) } +const exitWithError = ( + connection: ProcessProxyConnection, + message: string, + exitCode = 1 +) => exitWithMessage(connection, message, exitCode) + export const createHooksProxy = ( repoHooks: string[], tmpDir: string, gitPath: string, shellEnv: Record, - onHookProgress?: (progress: HookProgress) => void + onHookProgress?: (progress: HookProgress) => void, + onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> ) => { - return async (connection: ProcessProxyConnection) => { + return async (conn: ProcessProxyConnection) => { const startTime = Date.now() - const proxyArgs = await connection.getArgs() - const proxyEnv = await connection.getEnv() - const proxyCwd = await connection.getCwd() + const proxyArgs = await conn.getArgs() + const proxyEnv = await conn.getEnv() + const proxyCwd = await conn.getCwd() const hookName = __WIN32__ ? basename(proxyArgs[0]).replace(/\.exe$/i, '') @@ -99,7 +106,7 @@ export const createHooksProxy = ( if (!hooksExecutable) { debug(`hook executable not found for ${hookName}`) await exitWithError( - connection, + conn, `Error: hook executable not found for ${hookName}` ) return @@ -110,12 +117,12 @@ export const createHooksProxy = ( const hasStdin = hooksUsingStdin.includes(hookName) if (hasStdin) { - await pipeline(connection.stdin, createWriteStream(stdinFilePath)) + await pipeline(conn.stdin, createWriteStream(stdinFilePath)) } if (abortController.signal.aborted) { debug(`hook ${hookName} aborted before execution`) - await exitWithError(connection, `Hook ${hookName} aborted`) + await exitWithError(conn, `Hook ${hookName} aborted`) return } @@ -131,7 +138,7 @@ export const createHooksProxy = ( code: number | null signal: NodeJS.Signals | null }>((resolve, reject) => { - connection.on('close', () => abortController.abort()) + conn.on('close', () => abortController.abort()) const child = spawn(gitPath, args, { cwd: proxyCwd, @@ -146,7 +153,7 @@ export const createHooksProxy = ( // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 - child.stderr.pipe(connection.stderr).on('error', reject) + child.stderr.pipe(conn.stderr).on('error', reject) child.stderr.on('data', data => console.log('hooks stderr:', data.toString()) ) @@ -154,12 +161,9 @@ export const createHooksProxy = ( if (signal !== null) { debug(`hook ${hookName} was killed by signal ${signal}`) - connection.stderr.write( - `error: ${hookName} hook received signal ${signal}\n` - ) } - await waitForWritableFinished(connection.stderr).catch(e => { + await waitForWritableFinished(conn.stderr).catch(e => { debug(`waiting for stderr to finish failed`, e) }) @@ -168,15 +172,27 @@ export const createHooksProxy = ( `executed ${hookName}: exited with code ${code} in ${elapsedSeconds}s` ) - const exitCode = code ?? 1 - await connection - .exit(exitCode) - .catch(err => debug(`failed to exit proxy:`, err)) - .then(() => - onHookProgress?.({ - hookName, - status: exitCode === 0 ? 'finished' : 'failed', - }) - ) + const ignoreError = + code !== null && code !== 0 && onHookFailure + ? (await onHookFailure(hookName)) === 'ignore' + : false + + if (ignoreError) { + debug(`ignoring error from hook ${hookName} as per onHookFailure result`) + } + + const exitCode = ignoreError ? 0 : code ?? 1 + const terminationReason = signal + ? `${hookName} received signal ${signal}` + : `${hookName} exited with code ${exitCode}${ + ignoreError ? ' (ignored by user)' : '' + }` + + await exitWithMessage(conn, terminationReason, exitCode) + + onHookProgress?.({ + hookName, + status: exitCode === 0 ? 'finished' : 'failed', + }) } } diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 4f293e5c629..a2383ed06f5 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -53,7 +53,8 @@ export async function withHooksEnv( tmpHooksDir, gitPath, shellEnv, - options?.onHookProgress + options?.onHookProgress, + options?.onHookFailure ) const server = createProxyProcessServer( diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index d6ba24b6c29..370314670f5 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3320,7 +3320,11 @@ export class AppStore extends TypedBaseStore { hookProgress, })) this.emitUpdate() - } + }, + hookName => + new Promise(resolve => { + this._showPopup({ type: PopupType.HookFailed, hookName, resolve }) + }) ) }) diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 61ca273d8c0..fd58aaa6823 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -103,6 +103,7 @@ export enum PopupType { BypassPushProtection = 'BypassPushProtection', GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', GenerateCommitMessageDisclaimer = 'GenerateCommitMessageDisclaimer', + HookFailed = 'HookFailed', } interface IBasePopup { @@ -464,5 +465,9 @@ export type PopupDetail = repository: Repository filesSelected: ReadonlyArray } - + | { + type: PopupType.HookFailed + hookName: string + resolve: (value: 'abort' | 'ignore') => void + } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index c410163ccf2..89237631505 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -198,6 +198,7 @@ import { BypassReason, BypassReasonType, } from './secret-scanning/bypass-push-protection-dialog' +import { HookFailed } from './hook-failed/hook-failed' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2575,6 +2576,16 @@ export class App extends React.Component { /> ) } + case PopupType.HookFailed: { + return ( + + ) + } default: return assertNever(popup, `Unknown popup type: ${popup}`) } diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx new file mode 100644 index 00000000000..3857d286e3c --- /dev/null +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -0,0 +1,54 @@ +import * as React from 'react' + +import { Dialog, DialogContent, DialogFooter } from '../dialog' +import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' + +interface IHookFailedProps { + readonly hookName: string + readonly resolve: (value: 'abort' | 'ignore') => void + readonly onDismissed: () => void +} + +/** A component to confirm and then discard changes. */ +export class HookFailed extends React.Component { + private getDialogTitle() { + return `${this.props.hookName} ${__DARWIN__ ? 'Failed' : 'failed'}` + } + + private onDismissed = () => { + this.props.resolve('abort') + this.props.onDismissed() + } + + private onIgnore = () => { + this.props.resolve('ignore') + this.props.onDismissed() + } + + public render() { + return ( + + +

    + The {this.props.hookName} hook failed. What would you like to do? +

    +     + + + + +     + ) + } +} From ca60fc14399cdb603f6642746e97a2d710f199c1 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 12:48:18 +0100 Subject: [PATCH 0615/1338] Improve hook failure handling and dialog UI Added a list of hooks whose failures should be ignored, refined error handling logic in hooks-proxy, and updated the hook failure dialog to clarify the cancel action as 'Abort commit'. --- app/src/lib/hooks/hooks-proxy.ts | 57 +++++++++++++------------- app/src/ui/hook-failed/hook-failed.tsx | 1 + 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 05465e9e4f4..8c44feb5209 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -3,41 +3,41 @@ import { randomBytes } from 'crypto' import { createWriteStream } from 'fs' import { basename, join } from 'path' import { ProcessProxyConnection } from 'process-proxy' -import { Writable } from 'stream' import { pipeline } from 'stream/promises' import type { HookProgress } from '../git' const hooksUsingStdin = ['post-rewrite'] +const ignoredOnFailureHooks = [ + 'post-applypatch', + 'post-commit', + // The exit code from post-checkout doesn't stop the checkout but it does set + // the overall command's exit code. I don't believe we want to show an error + // to the user if this hook fails though. + 'post-checkout', + 'post-merge', + // Again, the exit code here does affect Git in so far that it won't run + // git-gc but it's not something we should alert the user about. + 'pre-auto-gc', +] const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) } -const waitForWritableFinished = (stream: Writable) => { - return new Promise(resolve => { - if (stream.writableFinished) { - resolve() - } else { - stream.once('finish', () => resolve()) - } - }) -} - const exitWithMessage = ( connection: ProcessProxyConnection, message: string, exitCode = 0 ) => { - return new Promise((resolve, reject) => { - connection.stderr.end(`${message}\n`, () => { - connection.exit(exitCode).then(resolve, err => { - debug( - `failed to exit proxy: ${ - err instanceof Error ? err.message : String(err) - }` - ) - resolve() - }) + return new Promise(resolve => { + connection.stderr.end(`${message}\n`) + connection.exit(exitCode).then(resolve, err => { + debug( + `failed to exit proxy: ${ + err instanceof Error ? err.message : String(err) + }` + ) + resolve() }) }) } @@ -153,7 +153,7 @@ export const createHooksProxy = ( // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 - child.stderr.pipe(conn.stderr).on('error', reject) + child.stderr.pipe(conn.stderr, { end: false }).on('error', reject) child.stderr.on('data', data => console.log('hooks stderr:', data.toString()) ) @@ -163,17 +163,16 @@ export const createHooksProxy = ( debug(`hook ${hookName} was killed by signal ${signal}`) } - await waitForWritableFinished(conn.stderr).catch(e => { - debug(`waiting for stderr to finish failed`, e) - }) - const elapsedSeconds = (Date.now() - startTime) / 1000 debug( `executed ${hookName}: exited with code ${code} in ${elapsedSeconds}s` ) const ignoreError = - code !== null && code !== 0 && onHookFailure + code !== null && + code !== 0 && + !ignoredOnFailureHooks.includes(hookName) && + onHookFailure ? (await onHookFailure(hookName)) === 'ignore' : false @@ -183,8 +182,8 @@ export const createHooksProxy = ( const exitCode = ignoreError ? 0 : code ?? 1 const terminationReason = signal - ? `${hookName} received signal ${signal}` - : `${hookName} exited with code ${exitCode}${ + ? `${hookName} hook killed by signal ${signal}` + : `${hookName} hook exited with code ${exitCode}${ ignoreError ? ' (ignored by user)' : '' }` diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 3857d286e3c..7a2b4bc67b8 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -46,6 +46,7 @@ export class HookFailed extends React.Component { From b0aeb11cb806956b98a46c2f663076d371ea0d68 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 13:34:50 +0100 Subject: [PATCH 0616/1338] Update hooks-proxy.ts --- app/src/lib/hooks/hooks-proxy.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 8c44feb5209..68077d6b4e4 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -68,6 +68,8 @@ export const createHooksProxy = ( const abortController = new AbortController() + conn.stderr.write(`Running ${hookName} hook...\n`) + onHookProgress?.({ hookName, status: 'started', From deca57baad22366279d091a424dd3490cdab79be Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 14:17:22 +0100 Subject: [PATCH 0617/1338] Add commit progress dialog with live terminal output Introduces a CommitProgress popup that displays live terminal output during commit operations. Refactors commit logic to support subscribing to commit output, updates state management to track output listeners, and wires up UI components to show the progress dialog when requested. --- app/src/lib/app-state.ts | 7 +- app/src/lib/git/commit.ts | 23 ++++-- app/src/lib/git/core.ts | 22 ++++++ app/src/lib/stores/app-store.ts | 23 +++--- app/src/lib/stores/repository-state-cache.ts | 1 + app/src/models/popup.ts | 6 ++ app/src/ui/app.tsx | 10 +++ app/src/ui/changes/changes-list.tsx | 2 + app/src/ui/changes/commit-message.tsx | 12 ++- app/src/ui/changes/filter-changes-list.tsx | 2 + app/src/ui/changes/sidebar.tsx | 2 + .../commit-message/commit-message-dialog.tsx | 1 + .../ui/commit-progress/commit-progress.tsx | 79 +++++++++++++++++++ app/src/ui/repository.tsx | 17 ++++ 14 files changed, 187 insertions(+), 20 deletions(-) create mode 100644 app/src/ui/commit-progress/commit-progress.tsx diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index c57ce7f0275..abc42cae942 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -44,7 +44,11 @@ import { MultiCommitOperationDetail, MultiCommitOperationStep, } from '../models/multi-commit-operation' -import type { HookProgress, IChangesetData } from './git' +import type { + HookProgress, + IChangesetData, + TerminalOutputListener, +} from './git' import { Popup } from '../models/popup' import { RepoRulesInfo } from '../models/repo-rules' import { IAPIRepoRuleset } from './api' @@ -550,6 +554,7 @@ export interface IRepositoryState { readonly lastFetched: Date | null readonly hookProgress: HookProgress | null + readonly subscribeToCommitOutput: TerminalOutputListener | null /** * If we're currently working on switching to a new branch this diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index d68fcb7f1a1..166e5350fe5 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -1,4 +1,9 @@ -import { git, HookProgress, parseCommitSHA } from './core' +import { + git, + HookProgress, + parseCommitSHA, + TerminalOutputCallback, +} from './core' import { stageFiles } from './update-index' import { Repository } from '../../models/repository' import { WorkingDirectoryFileChange } from '../../models/status' @@ -16,9 +21,12 @@ export async function createCommit( repository: Repository, message: string, files: ReadonlyArray, - amend: boolean = false, - onHookProgress?: (progress: HookProgress) => void, - onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + options?: { + amend?: boolean + onHookProgress?: (progress: HookProgress) => void + onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + onTerminalOutputAvailable?: TerminalOutputCallback + } ): Promise { // Clear the staging area, our diffs reflect the difference between the // working directory and the last commit (if any) so our commits should @@ -29,7 +37,7 @@ export async function createCommit( const args = ['-F', '-'] - if (amend) { + if (options?.amend) { args.push('--amend') } @@ -48,8 +56,9 @@ export async function createCommit( 'post-rewrite', 'pre-auto-gc', ], - onHookProgress, - onHookFailure, + onHookProgress: options?.onHookProgress, + onHookFailure: options?.onHookFailure, + onTerminalOutputAvailable: options?.onTerminalOutputAvailable, } ) return parseCommitSHA(result) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index c756c7674f7..2b7713c57d3 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -37,6 +37,12 @@ export const isMaxBufferExceededError = ( ) } +export type TerminalOutputListener = (cb: (chunk: Buffer | string) => void) => { + unsubscribe: () => void +} + +export type TerminalOutputCallback = (subscribe: TerminalOutputListener) => void + export type HookProgress = | { readonly hookName: string @@ -81,6 +87,8 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly interceptHooks?: boolean | string[] readonly onHookProgress?: (progress: HookProgress) => void readonly onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + + readonly onTerminalOutputAvailable?: TerminalOutputCallback } /** @@ -242,6 +250,20 @@ export async function git( // Keep at most 256kb of combined stderr and stdout output. This is used // to provide more context in error messages. opts.processCallback = process => { + if (options?.onTerminalOutputAvailable) { + options.onTerminalOutputAvailable(function (cb) { + process.stdout?.on('data', cb) + process.stderr?.on('data', cb) + + return { + unsubscribe: () => { + process.stdout?.off('data', cb) + process.stderr?.off('data', cb) + }, + } + }) + } + const terminalStream = createTerminalStream() const tailStream = createTailStream(256 * 1024, { encoding: 'utf8' }) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 370314670f5..39441ea6d2f 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3309,23 +3309,26 @@ export class AppStore extends TypedBaseStore { return this.withIsCommitting(repository, async () => { const result = await gitStore.performFailableOperation(async () => { const message = await formatCommitMessage(repository, context) - return createCommit( - repository, - message, - selectedFiles, - context.amend, - hookProgress => { + return createCommit(repository, message, selectedFiles, { + amend: context.amend, + onHookProgress: hookProgress => { this.repositoryStateCache.update(repository, state => ({ ...state, hookProgress, })) this.emitUpdate() }, - hookName => + onHookFailure: hookName => new Promise(resolve => { this._showPopup({ type: PopupType.HookFailed, hookName, resolve }) - }) - ) + }), + onTerminalOutputAvailable: subscribeToCommitOutput => { + this.repositoryStateCache.update(repository, state => ({ + ...state, + subscribeToCommitOutput, + })) + }, + }) }) if (result !== undefined) { @@ -4779,6 +4782,7 @@ export class AppStore extends TypedBaseStore { this.repositoryStateCache.update(repository, () => ({ isCommitting: true, hookProgress: null, + subscribeToCommitOutput: null, })) this.emitUpdate() @@ -4788,6 +4792,7 @@ export class AppStore extends TypedBaseStore { this.repositoryStateCache.update(repository, () => ({ isCommitting: false, hookProgress: null, + subscribeToCommitOutput: null, })) this.emitUpdate() } diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 96a973b2eac..76bd1a7dd6f 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -364,6 +364,7 @@ function getInitialRepositoryState(): IRepositoryState { isPushPullFetchInProgress: false, isCommitting: false, hookProgress: null, + subscribeToCommitOutput: null, isGeneratingCommitMessage: false, commitToAmend: null, lastFetched: null, diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index fd58aaa6823..5774a88fdc1 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -25,6 +25,7 @@ import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog' import { IAPIComment } from '../lib/api' import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error-dialog' import { BypassReasonType } from '../ui/secret-scanning/bypass-push-protection-dialog' +import { TerminalOutputListener } from '../lib/git' export enum PopupType { RenameBranch = 'RenameBranch', @@ -104,6 +105,7 @@ export enum PopupType { GenerateCommitMessageOverrideWarning = 'GenerateCommitMessageOverrideWarning', GenerateCommitMessageDisclaimer = 'GenerateCommitMessageDisclaimer', HookFailed = 'HookFailed', + CommitProgress = 'CommitProgress', } interface IBasePopup { @@ -470,4 +472,8 @@ export type PopupDetail = hookName: string resolve: (value: 'abort' | 'ignore') => void } + | { + type: PopupType.CommitProgress + subscribeToCommitOutput: TerminalOutputListener + } export type Popup = IBasePopup & PopupDetail diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 89237631505..e17f4a72f4c 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -199,6 +199,7 @@ import { BypassReasonType, } from './secret-scanning/bypass-push-protection-dialog' import { HookFailed } from './hook-failed/hook-failed' +import { CommitProgress } from './commit-progress/commit-progress' const MinuteInMilliseconds = 1000 * 60 const HourInMilliseconds = MinuteInMilliseconds * 60 @@ -2586,6 +2587,15 @@ export class App extends React.Component { /> ) } + case PopupType.CommitProgress: { + return ( + + ) + } default: return assertNever(popup, `Unknown popup type: ${popup}`) } diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 6e0cc4b198a..6f38aaab071 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -176,6 +176,7 @@ interface IChangesListProps { readonly availableWidth: number readonly isCommitting: boolean readonly hookProgress: HookProgress | null + readonly onShowCommitProgress: (() => void) | undefined readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -843,6 +844,7 @@ export class ChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} hookProgress={hookProgress} + onShowCommitProgress={this.props.onShowCommitProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 3e8df728400..7cf60fa016f 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -110,6 +110,7 @@ interface ICommitMessageProps { readonly autocompletionProviders: ReadonlyArray> readonly isCommitting?: boolean readonly hookProgress: HookProgress | null + readonly onShowCommitProgress: (() => void) | undefined readonly isGeneratingCommitMessage?: boolean readonly shouldShowGenerateCommitMessageCallOut?: boolean readonly commitToAmend: Commit | null @@ -1579,9 +1580,14 @@ export class CommitMessage extends React.Component< return (
    {text}
    - + {this.props.onShowCommitProgress && ( + + )}
    ) } diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 5da924e92d6..c56e9981cea 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -159,6 +159,7 @@ interface IFilterChangesListProps { readonly availableWidth: number readonly isCommitting: boolean readonly hookProgress: HookProgress | null + readonly onShowCommitProgress?: () => void readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -945,6 +946,7 @@ export class FilterChangesList extends React.Component< autocompletionProviders={this.props.autocompletionProviders} isCommitting={isCommitting} hookProgress={hookProgress} + onShowCommitProgress={this.props.onShowCommitProgress} isGeneratingCommitMessage={isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index ffd6b7ccdf9..258cb1b701c 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -58,6 +58,7 @@ interface IChangesSidebarProps { readonly availableWidth: number readonly isCommitting: boolean readonly hookProgress: HookProgress | null + readonly onShowCommitProgress: (() => void) | undefined readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null @@ -442,6 +443,7 @@ export class ChangesSidebar extends React.Component { onIgnorePattern={this.onIgnorePattern} isCommitting={this.props.isCommitting} hookProgress={this.props.hookProgress} + onShowCommitProgress={this.props.onShowCommitProgress} isGeneratingCommitMessage={this.props.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ this.props.shouldShowGenerateCommitMessageCallOut diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 1d7d012702b..684b50890ec 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -166,6 +166,7 @@ export class CommitMessageDialog extends React.Component< accounts={this.props.accounts} isCommitting={false} hookProgress={null} + onShowCommitProgress={undefined} /> diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx new file mode 100644 index 00000000000..cf64d9def0b --- /dev/null +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -0,0 +1,79 @@ +import * as React from 'react' + +import { Dialog, DialogContent, DialogFooter } from '../dialog' +import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' +import { TerminalOutputListener } from '../../lib/git' + +interface ICommitProgressProps { + readonly subscribeToCommitOutput: TerminalOutputListener + readonly onDismissed: () => void +} + +interface ICommitProgressState { + readonly output: ReadonlyArray +} + +/** A component to confirm and then discard changes. */ +export class CommitProgress extends React.Component< + ICommitProgressProps, + ICommitProgressState +> { + private unsubscribe?: () => void | null + + public constructor(props: ICommitProgressProps) { + super(props) + this.state = { + output: [], + } + } + + private onDismissed = () => { + this.unsubscribe?.() + this.unsubscribe = undefined + this.props.onDismissed() + } + + public componentDidMount() { + const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => { + this.setState(prevState => ({ + output: [...prevState.output, chunk.toString()], + })) + }) + this.unsubscribe = unsubscribe + } + + public componentWillUnmount() { + this.unsubscribe?.() + this.unsubscribe = undefined + } + + public render() { + return ( + + + 
    +            {this.state.output.join('')}
+
    +     + + + + +     + ) + } +} diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 0c9cbfe0691..597aa3f7da7 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -34,6 +34,7 @@ import { DragType } from '../models/drag-drop' import { PullRequestSuggestedNextAction } from '../models/pull-request' import { clamp } from '../lib/clamp' import { Emoji } from '../lib/emoji' +import { PopupType } from '../models/popup' interface IRepositoryViewProps { readonly repository: Repository @@ -206,6 +207,17 @@ export class RepositoryView extends React.Component< ) } + private onShowCommitProgress = () => { + if (!this.props.state.subscribeToCommitOutput) { + return + } + + this.props.dispatcher.showPopup({ + type: PopupType.CommitProgress, + subscribeToCommitOutput: this.props.state.subscribeToCommitOutput, + }) + } + private renderChangesSidebar(): JSX.Element { const tip = this.props.state.branchesState.tip @@ -250,6 +262,11 @@ export class RepositoryView extends React.Component< gitHubUserStore={this.props.gitHubUserStore} isCommitting={this.props.state.isCommitting} hookProgress={this.props.state.hookProgress} + onShowCommitProgress={ + this.props.state.subscribeToCommitOutput + ? this.onShowCommitProgress + : undefined + } isGeneratingCommitMessage={this.props.state.isGeneratingCommitMessage} shouldShowGenerateCommitMessageCallOut={ this.props.shouldShowGenerateCommitMessageCallOut From 88f7a79b61b0028bdd7cbf733bf72fef0ab54a6a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 15:01:35 +0100 Subject: [PATCH 0618/1338] Integrate xterm.js for commit progress output Replaces the custom terminal output rendering in the commit progress dialog with xterm.js for improved display and performance. Adds @xterm/xterm as a dependency, updates styles to support the new terminal, and refactors related logic in the commit progress component and git core. --- app/package.json | 1 + app/src/lib/git/core.ts | 7 +++ .../ui/commit-progress/commit-progress.tsx | 50 ++++++++----------- app/styles/_vendor.scss | 5 +- app/styles/ui/_dialog.scss | 1 + app/styles/ui/dialogs/_commit_progress.scss | 8 +++ app/yarn.lock | 10 ++++ 7 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 app/styles/ui/dialogs/_commit_progress.scss diff --git a/app/package.json b/app/package.json index a61e952a7dc..bb6a5fbb74c 100644 --- a/app/package.json +++ b/app/package.json @@ -19,6 +19,7 @@ "dependencies": { "@floating-ui/react-dom": "^2.1.2", "@github/alive-client": "^1.2.0", + "@xterm/xterm": "^5.5.0", "app-path": "^3.3.0", "byline": "^5.0.0", "chalk": "^2.3.0", diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 2b7713c57d3..883a9a0966a 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -246,12 +246,15 @@ export async function git( // this property is to provide "terminal-like" output to the user when a Git // command fails. let terminalOutput = '' + const terminalChunks: string[] = [] // Keep at most 256kb of combined stderr and stdout output. This is used // to provide more context in error messages. opts.processCallback = process => { if (options?.onTerminalOutputAvailable) { options.onTerminalOutputAvailable(function (cb) { + terminalChunks.forEach(chunk => cb(chunk)) + process.stdout?.on('data', cb) process.stderr?.on('data', cb) @@ -274,6 +277,10 @@ export async function git( process.stdout?.pipe(terminalStream, { end: false }) process.stderr?.pipe(terminalStream, { end: false }) + + process.stdout?.on('data', chunk => terminalChunks.push(chunk)) + process.stderr?.on('data', chunk => terminalChunks.push(chunk)) + process.on('close', () => terminalStream.end()) options?.processCallback?.(process) } diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index cf64d9def0b..ccb7d00e5fb 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -3,29 +3,18 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { TerminalOutputListener } from '../../lib/git' +import { Terminal } from '@xterm/xterm' interface ICommitProgressProps { readonly subscribeToCommitOutput: TerminalOutputListener readonly onDismissed: () => void } -interface ICommitProgressState { - readonly output: ReadonlyArray -} - /** A component to confirm and then discard changes. */ -export class CommitProgress extends React.Component< - ICommitProgressProps, - ICommitProgressState -> { +export class CommitProgress extends React.Component { private unsubscribe?: () => void | null - - public constructor(props: ICommitProgressProps) { - super(props) - this.state = { - output: [], - } - } + private terminalRef = React.createRef() + private terminal: Terminal | null = null private onDismissed = () => { this.unsubscribe?.() @@ -34,11 +23,24 @@ export class CommitProgress extends React.Component< } public componentDidMount() { + if (this.terminalRef.current) { + this.terminal = new Terminal({ + disableStdin: true, + convertEol: true, + rows: 20, + cols: 80, + fontSize: 12, + fontFamily: + "SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'", + }) + + this.terminal.open(this.terminalRef.current) + } + const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => { - this.setState(prevState => ({ - output: [...prevState.output, chunk.toString()], - })) + this.terminal?.write(chunk) }) + this.unsubscribe = unsubscribe } @@ -50,21 +52,13 @@ export class CommitProgress extends React.Component< public render() { return ( - 
    -            {this.state.output.join('')}
-
    +
    diff --git a/app/styles/_vendor.scss b/app/styles/_vendor.scss index 3793cbbeb9e..00687d537fa 100644 --- a/app/styles/_vendor.scss +++ b/app/styles/_vendor.scss @@ -1,5 +1,2 @@ @import '~react-virtualized/styles.css'; -@import '~codemirror/lib/codemirror.css'; -@import '~codemirror/addon/dialog/dialog.css'; -@import '~codemirror/theme/solarized.css'; -@import '~codemirror/addon/scroll/simplescrollbars.css'; +@import '~@xterm/xterm/css/xterm.css'; diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 9e04fd72144..079365ba73a 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -25,6 +25,7 @@ @import 'dialogs/unknown-authors'; @import 'dialogs/icon_preview'; @import 'dialogs/push-protection'; +@import 'dialogs/commit_progress'; // The styles herein attempt to follow a flow where margins are only applied // to the bottom of elements (with the exception of the last child). This to diff --git a/app/styles/ui/dialogs/_commit_progress.scss b/app/styles/ui/dialogs/_commit_progress.scss new file mode 100644 index 00000000000..e0d3f13dc3e --- /dev/null +++ b/app/styles/ui/dialogs/_commit_progress.scss @@ -0,0 +1,8 @@ +#commit-progress-dialog { + // Make sure 80 cols fit comfortably + max-width: 800px; + + .xterm { + padding: var(--spacing); + } +} diff --git a/app/yarn.lock b/app/yarn.lock index 80a27df2997..fb9f41d24a2 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -73,6 +73,16 @@ resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== +"@xterm/addon-fit@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@xterm/addon-fit/-/addon-fit-0.10.0.tgz#bebf87fadd74e3af30fdcdeef47030e2592c6f55" + integrity sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ== + +"@xterm/xterm@^5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0.tgz#275fb8f6e14afa6e8a0c05d4ebc94523ff775396" + integrity sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A== + ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" From a5feb9676551fcf82d4b1adb9ab728485de382f1 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 15:02:20 +0100 Subject: [PATCH 0619/1338] Update yarn.lock --- app/yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index fb9f41d24a2..a7df44be8f8 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -73,11 +73,6 @@ resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== -"@xterm/addon-fit@^0.10.0": - version "0.10.0" - resolved "https://registry.yarnpkg.com/@xterm/addon-fit/-/addon-fit-0.10.0.tgz#bebf87fadd74e3af30fdcdeef47030e2592c6f55" - integrity sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ== - "@xterm/xterm@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0.tgz#275fb8f6e14afa6e8a0c05d4ebc94523ff775396" From d6cbfe577b541b584a0506468db44af627785371 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 16:02:40 +0100 Subject: [PATCH 0620/1338] Show hook failure terminal output in dialog Adds support for displaying the terminal output from failed Git hooks in the hook failure dialog using xterm.js. Updates relevant types, popup models, and UI components to pass and render the output, and introduces new styles for the dialog. --- app/src/lib/git/commit.ts | 5 +++- app/src/lib/git/core.ts | 5 +++- app/src/lib/hooks/hooks-proxy.ts | 18 +++++++++--- app/src/lib/stores/app-store.ts | 9 ++++-- app/src/models/popup.ts | 1 + app/src/ui/app.tsx | 1 + .../ui/commit-progress/commit-progress.tsx | 2 ++ app/src/ui/hook-failed/hook-failed.tsx | 29 ++++++++++++++++++- app/styles/ui/_dialog.scss | 1 + app/styles/ui/dialogs/_hook-failed.scss | 8 +++++ 10 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 app/styles/ui/dialogs/_hook-failed.scss diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index 166e5350fe5..b2e245b5100 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -24,7 +24,10 @@ export async function createCommit( options?: { amend?: boolean onHookProgress?: (progress: HookProgress) => void - onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + onHookFailure?: ( + hookName: string, + terminalOutput: string + ) => Promise<'abort' | 'ignore'> onTerminalOutputAvailable?: TerminalOutputCallback } ): Promise { diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 883a9a0966a..7bd9da26f9f 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -86,7 +86,10 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly interceptHooks?: boolean | string[] readonly onHookProgress?: (progress: HookProgress) => void - readonly onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + readonly onHookFailure?: ( + hookName: string, + terminalOutput: string + ) => Promise<'abort' | 'ignore'> readonly onTerminalOutputAvailable?: TerminalOutputCallback } diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 68077d6b4e4..b3c00f0bcaa 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -54,7 +54,10 @@ export const createHooksProxy = ( gitPath: string, shellEnv: Record, onHookProgress?: (progress: HookProgress) => void, - onHookFailure?: (hookName: string) => Promise<'abort' | 'ignore'> + onHookFailure?: ( + hookName: string, + terminalOutput: string + ) => Promise<'abort' | 'ignore'> ) => { return async (conn: ProcessProxyConnection) => { const startTime = Date.now() @@ -136,6 +139,9 @@ export const createHooksProxy = ( '--', ...proxyArgs.slice(1), ] + + const terminalOutput: Buffer[] = [] + const { code, signal } = await new Promise<{ code: number | null signal: NodeJS.Signals | null @@ -156,9 +162,10 @@ export const createHooksProxy = ( // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 child.stderr.pipe(conn.stderr, { end: false }).on('error', reject) - child.stderr.on('data', data => + child.stderr.on('data', data => { + terminalOutput.push(data) console.log('hooks stderr:', data.toString()) - ) + }) }) if (signal !== null) { @@ -175,7 +182,10 @@ export const createHooksProxy = ( code !== 0 && !ignoredOnFailureHooks.includes(hookName) && onHookFailure - ? (await onHookFailure(hookName)) === 'ignore' + ? (await onHookFailure( + hookName, + Buffer.concat(terminalOutput).toString() + )) === 'ignore' : false if (ignoreError) { diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 39441ea6d2f..cf5bcd039d7 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3318,9 +3318,14 @@ export class AppStore extends TypedBaseStore { })) this.emitUpdate() }, - onHookFailure: hookName => + onHookFailure: (hookName, terminalOutput) => new Promise(resolve => { - this._showPopup({ type: PopupType.HookFailed, hookName, resolve }) + this._showPopup({ + type: PopupType.HookFailed, + hookName, + terminalOutput, + resolve, + }) }), onTerminalOutputAvailable: subscribeToCommitOutput => { this.repositoryStateCache.update(repository, state => ({ diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 5774a88fdc1..9977e6d8c32 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -470,6 +470,7 @@ export type PopupDetail = | { type: PopupType.HookFailed hookName: string + terminalOutput: string resolve: (value: 'abort' | 'ignore') => void } | { diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index e17f4a72f4c..57e13cafaeb 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -2582,6 +2582,7 @@ export class App extends React.Component { diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index ccb7d00e5fb..2dae760c37d 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -47,6 +47,8 @@ export class CommitProgress extends React.Component { public componentWillUnmount() { this.unsubscribe?.() this.unsubscribe = undefined + this.terminal?.dispose() + this.terminal = null } public render() { diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 7a2b4bc67b8..34dcd7599d6 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -2,15 +2,20 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' +import { Terminal } from '@xterm/xterm' interface IHookFailedProps { readonly hookName: string + readonly terminalOutput: string readonly resolve: (value: 'abort' | 'ignore') => void readonly onDismissed: () => void } /** A component to confirm and then discard changes. */ export class HookFailed extends React.Component { + private terminalRef = React.createRef() + private terminal: Terminal | null = null + private getDialogTitle() { return `${this.props.hookName} ${__DARWIN__ ? 'Failed' : 'failed'}` } @@ -25,10 +30,31 @@ export class HookFailed extends React.Component { this.props.onDismissed() } + public componentDidMount(): void { + if (this.terminalRef.current) { + this.terminal = new Terminal({ + disableStdin: true, + convertEol: true, + rows: 10, + cols: 80, + fontSize: 12, + fontFamily: + "SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'", + }) + this.terminal.open(this.terminalRef.current) + this.terminal.write(this.props.terminalOutput) + } + } + + public componentWillUnmount(): void { + this.terminal?.dispose() + this.terminal = null + } + public render() { return ( {

    The {this.props.hookName} hook failed. What would you like to do?

    +
    diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 079365ba73a..469d08dc402 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -25,6 +25,7 @@ @import 'dialogs/unknown-authors'; @import 'dialogs/icon_preview'; @import 'dialogs/push-protection'; +@import 'dialogs/hook-failed'; @import 'dialogs/commit_progress'; // The styles herein attempt to follow a flow where margins are only applied diff --git a/app/styles/ui/dialogs/_hook-failed.scss b/app/styles/ui/dialogs/_hook-failed.scss new file mode 100644 index 00000000000..969ea7d0e73 --- /dev/null +++ b/app/styles/ui/dialogs/_hook-failed.scss @@ -0,0 +1,8 @@ +#hook-failed-dialog { + // Make sure 80 cols fit comfortably + max-width: 800px; + + .xterm { + padding: var(--spacing); + } +} From afa4b9bc3cb91dd74c057e5ba0ade7f9cfc3c331 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 16:06:04 +0100 Subject: [PATCH 0621/1338] Handle commit hook abort resolution in AppStore Introduces logic to track if a commit hook was aborted and prevents error propagation when aborted. This ensures that aborting a commit hook does not result in unnecessary error handling. --- app/src/lib/stores/app-store.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index cf5bcd039d7..7083bc23db2 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3309,6 +3309,7 @@ export class AppStore extends TypedBaseStore { return this.withIsCommitting(repository, async () => { const result = await gitStore.performFailableOperation(async () => { const message = await formatCommitMessage(repository, context) + let aborted = false return createCommit(repository, message, selectedFiles, { amend: context.amend, onHookProgress: hookProgress => { @@ -3324,7 +3325,12 @@ export class AppStore extends TypedBaseStore { type: PopupType.HookFailed, hookName, terminalOutput, - resolve, + resolve: resolution => { + if (resolution === 'abort') { + aborted = true + } + resolve(resolution) + }, }) }), onTerminalOutputAvailable: subscribeToCommitOutput => { @@ -3333,7 +3339,7 @@ export class AppStore extends TypedBaseStore { subscribeToCommitOutput, })) }, - }) + }).catch(err => (aborted ? undefined : Promise.reject(err))) }) if (result !== undefined) { From 3a2f6a08c3d6113755714f65d71fcb2522de779e Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 16:06:06 +0100 Subject: [PATCH 0622/1338] Update hook-failed.tsx --- app/src/ui/hook-failed/hook-failed.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 34dcd7599d6..80e5620b24e 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -35,7 +35,7 @@ export class HookFailed extends React.Component { this.terminal = new Terminal({ disableStdin: true, convertEol: true, - rows: 10, + rows: 12, cols: 80, fontSize: 12, fontFamily: From 8063130bb090dfc58fc97929cb1c8c09264b8015 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:53:59 +0100 Subject: [PATCH 0623/1338] Add commit error context for improved error handling Introduces a new 'commit' kind to GitErrorContext, passes commit context to failable operations in AppStore, and updates AppError UI to display commit-specific error messages. This enhances error reporting and handling for commit operations. --- app/src/lib/git-error-context.ts | 6 +++ app/src/lib/stores/app-store.ts | 71 +++++++++++++++++--------------- app/src/ui/app-error.tsx | 2 + 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/src/lib/git-error-context.ts b/app/src/lib/git-error-context.ts index f6e7a376000..c44b641e54b 100644 --- a/app/src/lib/git-error-context.ts +++ b/app/src/lib/git-error-context.ts @@ -23,8 +23,14 @@ type CreateRepositoryErrorContext = { readonly kind: 'create-repository' } +type CommitErrorContext = { + /** The Git operation that triggered the error */ + readonly kind: 'commit' +} + /** A custom shape of data for actions to provide to help with error handling */ export type GitErrorContext = | MergeOrPullConflictsErrorContext | CheckoutBranchErrorContext | CreateRepositoryErrorContext + | CommitErrorContext diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 7083bc23db2..56623fc4969 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3307,40 +3307,43 @@ export class AppStore extends TypedBaseStore { const gitStore = this.gitStoreCache.get(repository) return this.withIsCommitting(repository, async () => { - const result = await gitStore.performFailableOperation(async () => { - const message = await formatCommitMessage(repository, context) - let aborted = false - return createCommit(repository, message, selectedFiles, { - amend: context.amend, - onHookProgress: hookProgress => { - this.repositoryStateCache.update(repository, state => ({ - ...state, - hookProgress, - })) - this.emitUpdate() - }, - onHookFailure: (hookName, terminalOutput) => - new Promise(resolve => { - this._showPopup({ - type: PopupType.HookFailed, - hookName, - terminalOutput, - resolve: resolution => { - if (resolution === 'abort') { - aborted = true - } - resolve(resolution) - }, - }) - }), - onTerminalOutputAvailable: subscribeToCommitOutput => { - this.repositoryStateCache.update(repository, state => ({ - ...state, - subscribeToCommitOutput, - })) - }, - }).catch(err => (aborted ? undefined : Promise.reject(err))) - }) + const result = await gitStore.performFailableOperation( + async () => { + const message = await formatCommitMessage(repository, context) + let aborted = false + return createCommit(repository, message, selectedFiles, { + amend: context.amend, + onHookProgress: hookProgress => { + this.repositoryStateCache.update(repository, state => ({ + ...state, + hookProgress, + })) + this.emitUpdate() + }, + onHookFailure: (hookName, terminalOutput) => + new Promise(resolve => { + this._showPopup({ + type: PopupType.HookFailed, + hookName, + terminalOutput, + resolve: resolution => { + if (resolution === 'abort') { + aborted = true + } + resolve(resolution) + }, + }) + }), + onTerminalOutputAvailable: subscribeToCommitOutput => { + this.repositoryStateCache.update(repository, state => ({ + ...state, + subscribeToCommitOutput, + })) + }, + }).catch(err => (aborted ? undefined : Promise.reject(err))) + }, + { gitContext: { kind: 'commit' }, repository } + ) if (result !== undefined) { await this._recordCommitStats( diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx index 10dc4301933..b3cbbfd521d 100644 --- a/app/src/ui/app-error.tsx +++ b/app/src/ui/app-error.tsx @@ -164,6 +164,8 @@ export class AppError extends React.Component { switch (gitContext?.kind) { case 'create-repository': return `Failed creating repository` + case 'commit': + return `Commit failed` } } From 65996f62af205ae0c20060003ea32ba598359881 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:55:50 +0100 Subject: [PATCH 0624/1338] Refactor hook failure terminal to StaticTerminal component Replaces direct xterm usage in HookFailed with a new StaticTerminal component for improved encapsulation and reusability. Adds static-terminal.tsx to handle terminal rendering and output display, simplifying HookFailed and centralizing terminal logic. --- app/src/ui/get-monospace-font-family.ts | 6 +++ app/src/ui/hook-failed/hook-failed.tsx | 32 +++---------- app/src/ui/static-terminal.tsx | 60 +++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 app/src/ui/get-monospace-font-family.ts create mode 100644 app/src/ui/static-terminal.tsx diff --git a/app/src/ui/get-monospace-font-family.ts b/app/src/ui/get-monospace-font-family.ts new file mode 100644 index 00000000000..11cd2cc82ba --- /dev/null +++ b/app/src/ui/get-monospace-font-family.ts @@ -0,0 +1,6 @@ +export const getMonospaceFontFamily = (): string => { + // TODO: This is the same as the --font-family-monospace defined in + // variables.scss but we could be more clever here and only pick + // platform-specific fonts. Not sure if it matters. + return "SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'" +} diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 80e5620b24e..617039ef751 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' -import { Terminal } from '@xterm/xterm' +import { StaticTerminal } from '../static-terminal' interface IHookFailedProps { readonly hookName: string @@ -13,9 +13,6 @@ interface IHookFailedProps { /** A component to confirm and then discard changes. */ export class HookFailed extends React.Component { - private terminalRef = React.createRef() - private terminal: Terminal | null = null - private getDialogTitle() { return `${this.props.hookName} ${__DARWIN__ ? 'Failed' : 'failed'}` } @@ -30,27 +27,6 @@ export class HookFailed extends React.Component { this.props.onDismissed() } - public componentDidMount(): void { - if (this.terminalRef.current) { - this.terminal = new Terminal({ - disableStdin: true, - convertEol: true, - rows: 12, - cols: 80, - fontSize: 12, - fontFamily: - "SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'", - }) - this.terminal.open(this.terminalRef.current) - this.terminal.write(this.props.terminalOutput) - } - } - - public componentWillUnmount(): void { - this.terminal?.dispose() - this.terminal = null - } - public render() { return ( {

    The {this.props.hookName} hook failed. What would you like to do?

    -
    + diff --git a/app/src/ui/static-terminal.tsx b/app/src/ui/static-terminal.tsx new file mode 100644 index 00000000000..4a0d1c61c93 --- /dev/null +++ b/app/src/ui/static-terminal.tsx @@ -0,0 +1,60 @@ +import { + ITerminalOptions, + ITerminalInitOnlyOptions, + Terminal, +} from '@xterm/xterm' +import React from 'react' +import { getMonospaceFontFamily } from './get-monospace-font-family' + +export const defaultTerminalOptions: Readonly = { + convertEol: true, + fontFamily: getMonospaceFontFamily(), + fontSize: 12, + screenReaderMode: true, +} + +export type StaticTerminalProps = ITerminalOptions & + ITerminalInitOnlyOptions & { + readonly terminalOutput: string + readonly hideCursor?: boolean + } + +export class StaticTerminal extends React.Component { + private terminalRef = React.createRef() + private terminal: Terminal | null = null + + public componentDidMount() { + const { terminalOutput, ...initOpts } = this.props + this.terminal = new Terminal({ + ...defaultTerminalOptions, + ...initOpts, + + rows: this.props.rows ?? 20, + cols: this.props.cols ?? 80, + }) + + this.terminal.onKey(({ key, domEvent }) => { + if (domEvent.key === 'ArrowUp' || domEvent.key === 'ArrowDown') { + this.terminal?.scrollLines(domEvent.key === 'ArrowUp' ? -1 : 1) + return + } + }) + + if (this.terminalRef.current) { + this.terminal.open(this.terminalRef.current) + + if (this.terminal.textarea) { + this.terminal.textarea.disabled = true + } + + if (this.props.hideCursor !== false) { + this.terminal.write('\x1b[?25l') // hide cursor + this.terminal.write(terminalOutput.trimEnd()) + } + } + } + + public render() { + return
    + } +} From df821789e8004fdc61aa01a282af518a07d25f31 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:56:01 +0100 Subject: [PATCH 0625/1338] Refactor terminal options in CommitProgress Replaces inline terminal configuration with defaultTerminalOptions from static-terminal for consistency and maintainability. --- app/src/ui/commit-progress/commit-progress.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index 2dae760c37d..00cf528e82a 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -4,6 +4,7 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { TerminalOutputListener } from '../../lib/git' import { Terminal } from '@xterm/xterm' +import { defaultTerminalOptions } from '../static-terminal' interface ICommitProgressProps { readonly subscribeToCommitOutput: TerminalOutputListener @@ -25,13 +26,9 @@ export class CommitProgress extends React.Component { public componentDidMount() { if (this.terminalRef.current) { this.terminal = new Terminal({ - disableStdin: true, - convertEol: true, + ...defaultTerminalOptions, rows: 20, cols: 80, - fontSize: 12, - fontFamily: - "SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace, 'Apple Color Emoji', 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol'", }) this.terminal.open(this.terminalRef.current) From 367bf24f49539e22d8dcdef960a68cbb568e031d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:56:10 +0100 Subject: [PATCH 0626/1338] Remove commented-out commit progress UI code --- app/src/ui/changes/commit-message.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 7cf60fa016f..c4cdc24b5fc 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -1554,14 +1554,6 @@ export class CommitMessage extends React.Component< const { isCommitting, hookProgress } = this.props if (!isCommitting || !hookProgress) { return null - // return ( - //
    - //
    Optimizing repository...
    - // - //
    - // ) } const { status, hookName } = hookProgress From 6e91b7883bc9e5e37aee29b605454f0d7c37a236 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:56:29 +0100 Subject: [PATCH 0627/1338] Improve raw git error display in dialogs Replaces monospace paragraph with StaticTerminal for raw git errors in AppError component, providing better formatting. Increases max-width of raw git error dialogs and adds padding to static terminal output for improved readability. --- app/src/ui/app-error.tsx | 3 ++- app/styles/ui/_dialog.scss | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx index b3cbbfd521d..6acaf2ccc85 100644 --- a/app/src/ui/app-error.tsx +++ b/app/src/ui/app-error.tsx @@ -17,6 +17,7 @@ import { GitError as DugiteError } from 'dugite' import { LinkButton } from './lib/link-button' import { getFileFromExceedsError } from '../lib/helpers/regex' import { CopilotError } from '../lib/copilot-error' +import { StaticTerminal } from './static-terminal' interface IAppErrorProps { /** The error to be displayed */ @@ -95,7 +96,7 @@ export class AppError extends React.Component { // If the error message is just the raw git output, display it in // fixed-width font if (isRawGitError(e)) { - return

    {e.message}

    + return } if ( diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 469d08dc402..79e534bead8 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -356,7 +356,11 @@ dialog { // Use wider dialogs for raw git errors, to make sure we can display lines // up to 80 characters long without wrapping them. &.raw-git-error { - max-width: 700px; + max-width: 750px; + + .static-terminal .xterm { + padding: var(--spacing); + } } .dialog-content { From 83310746b9489198cec3f366e0a29d00934ff3ae Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:56:42 +0100 Subject: [PATCH 0628/1338] Refactor terminal output handling in git core Replaces usage of createTailStream and createTerminalStream with a custom buffer management for terminal output. This change simplifies the logic for capturing and limiting combined stdout and stderr output to 256kb, improving maintainability and performance. --- app/src/lib/git/core.ts | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 7bd9da26f9f..45fac74658f 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -13,8 +13,6 @@ import * as GitPerf from '../../ui/lib/git-perf' import * as Path from 'path' import { isErrnoException } from '../errno-exception' import { withTrampolineEnv } from '../trampoline/trampoline-environment' -import { createTailStream } from './create-tail-stream' -import { createTerminalStream } from '../create-terminal-stream' import { kStringMaxLength } from 'buffer' import { withHooksEnv } from '../hooks/with-hooks-env' @@ -248,8 +246,8 @@ export async function git( // Note: The output is capped at a maximum of 256kb and the sole intent of // this property is to provide "terminal-like" output to the user when a Git // command fails. - let terminalOutput = '' const terminalChunks: string[] = [] + let terminalOutputLength = 0 // Keep at most 256kb of combined stderr and stdout output. This is used // to provide more context in error messages. @@ -270,21 +268,28 @@ export async function git( }) } - const terminalStream = createTerminalStream() - const tailStream = createTailStream(256 * 1024, { encoding: 'utf8' }) - - terminalStream - .pipe(tailStream) - .on('data', (data: string) => (terminalOutput = data)) - .on('error', e => log.error(`Terminal output error`, e)) - - process.stdout?.pipe(terminalStream, { end: false }) - process.stderr?.pipe(terminalStream, { end: false }) + const capacity = 256 * 1024 + const push = (chunk: Buffer | string) => { + terminalChunks.push(coerceToString(chunk)) + terminalOutputLength += chunk.length + + while (terminalOutputLength > capacity) { + const firstChunk = terminalChunks[0] + const overrun = terminalOutputLength - capacity + + if (overrun >= firstChunk.length) { + terminalChunks.shift() + terminalOutputLength -= firstChunk.length + } else { + terminalChunks[0] = firstChunk.substring(overrun) + terminalOutputLength -= overrun + } + } + } - process.stdout?.on('data', chunk => terminalChunks.push(chunk)) - process.stderr?.on('data', chunk => terminalChunks.push(chunk)) + process.stdout?.on('data', push) + process.stderr?.on('data', push) - process.on('close', () => terminalStream.end()) options?.processCallback?.(process) } @@ -375,6 +380,8 @@ export async function git( )}\` exited with an unexpected code: ${exitCode}.` ) + const terminalOutput = terminalChunks.join('') + if (terminalOutput.length > 0) { // Leave even less of the combined output in the log errorMessage.push(terminalOutput.slice(-1024)) From ea584af54c6c8fa54c57ec1f8e004c2ee06138ea Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 18:56:46 +0100 Subject: [PATCH 0629/1338] Remove console logging from hooks stderr handler Eliminated the console.log statement in the child.stderr 'data' event handler to prevent unnecessary logging of hook stderr output. This change keeps terminal output collection without printing to the console. --- app/src/lib/hooks/hooks-proxy.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index b3c00f0bcaa..8700823dbd3 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -162,10 +162,7 @@ export const createHooksProxy = ( // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 child.stderr.pipe(conn.stderr, { end: false }).on('error', reject) - child.stderr.on('data', data => { - terminalOutput.push(data) - console.log('hooks stderr:', data.toString()) - }) + child.stderr.on('data', data => terminalOutput.push(data)) }) if (signal !== null) { From f1e6fc40e38a1f282c76ba351c237b10aa6b98b2 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 19:35:22 +0100 Subject: [PATCH 0630/1338] Refactor StaticTerminal to Terminal and update usage Renamed StaticTerminal to Terminal and updated all references in the UI components. Refactored Terminal to support both static output and dynamic writing, simplifying terminal integration and improving code maintainability. --- app/src/ui/app-error.tsx | 4 +- .../ui/commit-progress/commit-progress.tsx | 32 ++++++---------- app/src/ui/hook-failed/hook-failed.tsx | 4 +- .../ui/{static-terminal.tsx => terminal.tsx} | 37 ++++++++++--------- app/styles/ui/_dialog.scss | 2 +- 5 files changed, 36 insertions(+), 43 deletions(-) rename app/src/ui/{static-terminal.tsx => terminal.tsx} (56%) diff --git a/app/src/ui/app-error.tsx b/app/src/ui/app-error.tsx index 6acaf2ccc85..089e645caea 100644 --- a/app/src/ui/app-error.tsx +++ b/app/src/ui/app-error.tsx @@ -17,7 +17,7 @@ import { GitError as DugiteError } from 'dugite' import { LinkButton } from './lib/link-button' import { getFileFromExceedsError } from '../lib/helpers/regex' import { CopilotError } from '../lib/copilot-error' -import { StaticTerminal } from './static-terminal' +import { Terminal } from './terminal' interface IAppErrorProps { /** The error to be displayed */ @@ -96,7 +96,7 @@ export class AppError extends React.Component { // If the error message is just the raw git output, display it in // fixed-width font if (isRawGitError(e)) { - return + return } if ( diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index 00cf528e82a..19542972460 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -3,9 +3,7 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { TerminalOutputListener } from '../../lib/git' -import { Terminal } from '@xterm/xterm' -import { defaultTerminalOptions } from '../static-terminal' - +import { Terminal } from '../terminal' interface ICommitProgressProps { readonly subscribeToCommitOutput: TerminalOutputListener readonly onDismissed: () => void @@ -14,8 +12,7 @@ interface ICommitProgressProps { /** A component to confirm and then discard changes. */ export class CommitProgress extends React.Component { private unsubscribe?: () => void | null - private terminalRef = React.createRef() - private terminal: Terminal | null = null + private terminalRef = React.createRef() private onDismissed = () => { this.unsubscribe?.() @@ -24,19 +21,9 @@ export class CommitProgress extends React.Component { } public componentDidMount() { - if (this.terminalRef.current) { - this.terminal = new Terminal({ - ...defaultTerminalOptions, - rows: 20, - cols: 80, - }) - - this.terminal.open(this.terminalRef.current) - } - - const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => { - this.terminal?.write(chunk) - }) + const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => + this.terminalRef.current?.write(chunk) + ) this.unsubscribe = unsubscribe } @@ -44,8 +31,6 @@ export class CommitProgress extends React.Component { public componentWillUnmount() { this.unsubscribe?.() this.unsubscribe = undefined - this.terminal?.dispose() - this.terminal = null } public render() { @@ -57,7 +42,12 @@ export class CommitProgress extends React.Component { onSubmit={this.onDismissed} > -
    +     diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 617039ef751..f8d1f8ba1a1 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' -import { StaticTerminal } from '../static-terminal' +import { Terminal } from '../terminal' interface IHookFailedProps { readonly hookName: string @@ -42,7 +42,7 @@ export class HookFailed extends React.Component {

    The {this.props.hookName} hook failed. What would you like to do?

    - = { screenReaderMode: true, } -export type StaticTerminalProps = ITerminalOptions & +export type TerminalProps = ITerminalOptions & ITerminalInitOnlyOptions & { - readonly terminalOutput: string + readonly terminalOutput?: string readonly hideCursor?: boolean } -export class StaticTerminal extends React.Component { +export class Terminal extends React.Component { private terminalRef = React.createRef() - private terminal: Terminal | null = null + private terminal: XTermTerminal | null = null + + public get Terminal() { + return this.terminal + } + + public write(data: string | Buffer) { + this.terminal?.write(data) + } public componentDidMount() { - const { terminalOutput, ...initOpts } = this.props - this.terminal = new Terminal({ + const { terminalOutput, hideCursor, ...initOpts } = this.props + this.terminal = new XTermTerminal({ ...defaultTerminalOptions, ...initOpts, @@ -33,13 +41,6 @@ export class StaticTerminal extends React.Component { cols: this.props.cols ?? 80, }) - this.terminal.onKey(({ key, domEvent }) => { - if (domEvent.key === 'ArrowUp' || domEvent.key === 'ArrowDown') { - this.terminal?.scrollLines(domEvent.key === 'ArrowUp' ? -1 : 1) - return - } - }) - if (this.terminalRef.current) { this.terminal.open(this.terminalRef.current) @@ -47,14 +48,16 @@ export class StaticTerminal extends React.Component { this.terminal.textarea.disabled = true } - if (this.props.hideCursor !== false) { + if (hideCursor !== false) { this.terminal.write('\x1b[?25l') // hide cursor - this.terminal.write(terminalOutput.trimEnd()) + if (terminalOutput) { + this.terminal.write(terminalOutput.trimEnd()) + } } } } public render() { - return
    + return
    } } diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss index 79e534bead8..cc931bd817d 100644 --- a/app/styles/ui/_dialog.scss +++ b/app/styles/ui/_dialog.scss @@ -358,7 +358,7 @@ dialog { &.raw-git-error { max-width: 750px; - .static-terminal .xterm { + .xterm { padding: var(--spacing); } } From 9ba48b609515787887604312ffb9e61a55725be6 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 6 Nov 2025 19:40:01 +0100 Subject: [PATCH 0631/1338] Avoid aria warning due to path descendant of svg being focusable --- app/styles/ui/changes/_commit-message.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 40a9f6e94dc..98df2973647 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -42,6 +42,7 @@ padding: 0 var(--spacing-half); > svg.octicon { height: 12px; + pointer-events: none; } &:hover { From 619be5d1ab2a6dff6c4122eb5de20514d99234c3 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Nov 2025 09:21:21 +0000 Subject: [PATCH 0632/1338] Remove duplicate process-proxy binary copy step --- script/build.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/script/build.ts b/script/build.ts index 5200852787b..bbc4628a555 100755 --- a/script/build.ts +++ b/script/build.ts @@ -376,15 +376,6 @@ function copyDependencies() { ) ) - console.log(' Copying process-proxy binary') - copySync( - getProxyCommandPath(), - path.resolve( - outRoot, - process.platform === 'win32' ? 'process-proxy.exe' : 'process-proxy' - ) - ) - console.log(' Copying printenvz binary') copySync( getPrintenvzPath(), From 0f03a1a9b3818a744a9ee8611cef8eabd0bb7ec5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Nov 2025 14:04:32 +0000 Subject: [PATCH 0633/1338] Initial GitBash support Replaces execFile with spawn in get-shell-env for improved control over process execution and output handling. Refactors get-shell to support async shell detection and custom quoting for Windows and Unix shells, moving shell quoting logic to a new shell-escape module. This improves cross-platform compatibility and quoting reliability for shell commands. --- app/src/lib/hooks/get-shell-env.ts | 39 ++++++++++--- app/src/lib/hooks/get-shell.ts | 92 +++++++++++++++++++++++------- app/src/lib/hooks/shell-escape.ts | 42 ++++++++++++++ 3 files changed, 144 insertions(+), 29 deletions(-) create mode 100644 app/src/lib/hooks/shell-escape.ts diff --git a/app/src/lib/hooks/get-shell-env.ts b/app/src/lib/hooks/get-shell-env.ts index 90f19d4c558..fedade6d3ef 100644 --- a/app/src/lib/hooks/get-shell-env.ts +++ b/app/src/lib/hooks/get-shell-env.ts @@ -1,6 +1,6 @@ import { join } from 'path' import { getShell } from './get-shell' -import { execFile } from '../exec-file' +import { spawn } from 'child_process' export const getShellEnv = async (): Promise< Record @@ -8,12 +8,35 @@ export const getShellEnv = async (): Promise< const ext = __WIN32__ ? '.exe' : '' const printenvzPath = join(__dirname, `printenvz${ext}`) - const { shell, args, quote } = getShell() - const { stdout } = await execFile(shell, [...args, quote(printenvzPath)], { - env: {}, - maxBuffer: Infinity, - }) + const { shell, args, quoteCommand, windowsVerbatimArguments, argv0 } = + await getShell() + + return await new Promise((resolve, reject) => { + const child = spawn(shell, [...args, quoteCommand(printenvzPath)], { + env: {}, + windowsVerbatimArguments, + argv0, + stdio: 'pipe', + }) + + const chunks: Buffer[] = [] - const matches = stdout.matchAll(/([^=]+)=([^\0]*)\0/g) - return Object.fromEntries(Array.from(matches, m => [m[1], m[2]])) + child.stdout + .on('data', chunk => chunks.push(chunk)) + .on('end', () => { + const stdout = Buffer.concat(chunks).toString('utf8') + const matches = stdout.matchAll(/([^=]+)=([^\0]*)\0/g) + resolve(Object.fromEntries(Array.from(matches, m => [m[1], m[2]]))) + }) + + child.on('error', err => reject(err)) + + child.on('close', (code, signal) => { + if (code !== 0) { + return reject( + new Error(`child exited with code ${code} and signal ${signal}`) + ) + } + }) + }) } diff --git a/app/src/lib/hooks/get-shell.ts b/app/src/lib/hooks/get-shell.ts index ebf2ba3a872..29f0bb77a14 100644 --- a/app/src/lib/hooks/get-shell.ts +++ b/app/src/lib/hooks/get-shell.ts @@ -1,31 +1,81 @@ -import memoizeOne from 'memoize-one' -import { Shescape } from 'shescape' - -const getQuoteFn = memoizeOne((shell: string) => { - const shescape = new Shescape({ shell, flagProtection: false }) - return { - escape: shescape.escape.bind(shescape), - quote: shescape.quote.bind(shescape), +import { pathExists } from 'fs-extra' +import { join } from 'path' +import which from 'which' +import { bash, cmd } from './shell-escape' + +type Shell = { + shell: string + args: string[] + quoteCommand: (cmd: string, ...args: string[]) => string + windowsVerbatimArguments?: boolean + argv0?: string +} + +export const findGitBash = async () => { + const gitPath = await which('git', { nothrow: true }) + + if (!gitPath) { + return null } -}) -export const getShell = () => { - // TODO: Windows: - if (__WIN32__) { - throw new Error('Not implemented') + if (!gitPath.toLowerCase().endsWith('\\cmd\\git.exe')) { + return null } - if (process.env.SHELL) { + const bashPath = join(gitPath, '../../usr/bin/bash.exe') + return (await pathExists(bashPath)) ? bashPath : null +} + +// // https://github.com/git-for-windows/git/blob/bd2ecbae58213046a468256b95fc4864de25bdf5/compat/mingw.c#L1690-L1718 +// const quoteArgMsys2 = (arg: string) => { +// return /[\s\\"'{?*~]/.test(arg) ? `"${arg.replace(/(["\\])/g, '\\$1')}"` : arg +// } + +const findWindowsShell = async (): Promise => { + const gitBashPath = await findGitBash() + + if (gitBashPath) { + const { args, quoteCommand } = bash return { - shell: process.env.SHELL, - args: ['-ilc'], - ...getQuoteFn(process.env.SHELL), + shell: gitBashPath, + args, + quoteCommand: (cmd, ...args) => `"${quoteCommand(cmd, ...args)}"`, + // MSYS2 doesn't use the argv it's given, instead it re-parses the + // commandline from GetCommandLineW and it doesn't comform to the + // usual Windows quoting rules. So we need to opt out of Node.js's + // quoting behavior and do it ourselves. + // + // See https://github.com/git-for-windows/git/commit/9e9da23c27650 + windowsVerbatimArguments: true, + // With windowsVerbatimArguments set to true the filename passed to + // spawn won't get quoted by Node.js so he msys2 custom argument parser + // will blow up so we'll just hardcode argv[0] as bash.exe which is + // what it would be set to if a user ran bash.exe in a terminal and it + // was on PATH. The technically correct way would be to set quote it + // as msys2 expects it to be quoted but I'm too deep into Dantes nine + // circles of quoting already. + argv0: 'bash.exe', } } - return { - shell: '/bin/sh', - args: ['-ilc'], - ...getQuoteFn('/bin/sh'), + const { COMSPEC } = process.env + // https://github.com/nodejs/node/blob/5f77aebdfb3ea4d60cda79045d29afb244d6bcb1/lib/child_process.js#L660C31-L660C58 + const shell = + COMSPEC && /^(?:.*\\)?cmd(?:\.exe)?$/i.test(COMSPEC) ? COMSPEC : 'cmd.exe' + const { args, quoteCommand } = cmd + return { shell, args, quoteCommand } +} + +export const getShell = async (): Promise => { + if (__WIN32__) { + return findWindowsShell() } + + // For our purposes quoting using bash rules should be sufficient, + // we only need to pass a path to an executable that we control. + // Should we start using this to quote commands that Git gives us + // those are quite innocuous as well (like shas and paths). There + // shouldn't be any user input in there. + const { args, quoteCommand } = bash + return { shell: process.env.SHELL ?? '/bin/sh', args, quoteCommand } } diff --git a/app/src/lib/hooks/shell-escape.ts b/app/src/lib/hooks/shell-escape.ts new file mode 100644 index 00000000000..237ba49a2d0 --- /dev/null +++ b/app/src/lib/hooks/shell-escape.ts @@ -0,0 +1,42 @@ +type Shell = { + args: string[] + quoteCommand: (cmd: string, ...args: string[]) => string +} + +// https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/unix/bash.js#L39 +const bashEscape = (arg: string) => arg + .replace(/[\0\u0008\u001B\u009B]/gu, "") + .replace(/\r(?!\n)/gu, "") + .replace(/'/gu, "'\\''"); + +const shQuoteCommand = (escapeFn: (arg: string) => string, cmd: string, ...args: string[]) => + [cmd, ...args].map(a => `'${escapeFn(a)}'`).join(' '); + +export const bash: Shell = { + args: ['-ilc'], + quoteCommand: shQuoteCommand.bind(null, bashEscape), +} + +// https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/unix/zsh.js#L37 +// At time of writing zsh escapeArgForQuoted was identical to bash's +const zshEscape = bashEscape + +export const zsh: Shell = { + args: ['-ilc'], + quoteCommand: shQuoteCommand.bind(null, zshEscape), +} + +// https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/win/cmd.js#L35 +const cmdEscape = (arg: string) => arg + .replace(/[\0\u0008\r\u001B\u009B]/gu, "") + .replace(/\n/gu, " ") + .replace(/"/gu, '""') + .replace(/([%&<>^|])/gu, '"^$1"') + .replace(/(? + `"${[cmd, ...args].map(a => `"${cmdEscape(a)}"`).join(' ')}"` + , +} From a3137f7c170da171f9837aaf790c08219bc40ee3 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 07:59:29 +0000 Subject: [PATCH 0634/1338] Enable MSYS2 argument quoting for Git Bash shell Uncommented and applied the MSYS2 argument quoting function to ensure proper command quoting for Git Bash on Windows. This change improves compatibility with MSYS2's command line parsing. --- app/src/lib/hooks/get-shell.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/lib/hooks/get-shell.ts b/app/src/lib/hooks/get-shell.ts index 29f0bb77a14..ad3b95f9a8d 100644 --- a/app/src/lib/hooks/get-shell.ts +++ b/app/src/lib/hooks/get-shell.ts @@ -26,10 +26,10 @@ export const findGitBash = async () => { return (await pathExists(bashPath)) ? bashPath : null } -// // https://github.com/git-for-windows/git/blob/bd2ecbae58213046a468256b95fc4864de25bdf5/compat/mingw.c#L1690-L1718 -// const quoteArgMsys2 = (arg: string) => { -// return /[\s\\"'{?*~]/.test(arg) ? `"${arg.replace(/(["\\])/g, '\\$1')}"` : arg -// } +// https://github.com/git-for-windows/git/blob/bd2ecbae58213046a468256b95fc4864de25bdf5/compat/mingw.c#L1690-L1718 +const quoteArgMsys2 = (arg: string) => { + return /[\s\\"'{?*~]/.test(arg) ? `"${arg.replace(/(["\\])/g, '\\$1')}"` : arg +} const findWindowsShell = async (): Promise => { const gitBashPath = await findGitBash() @@ -39,7 +39,7 @@ const findWindowsShell = async (): Promise => { return { shell: gitBashPath, args, - quoteCommand: (cmd, ...args) => `"${quoteCommand(cmd, ...args)}"`, + quoteCommand: (cmd, ...args) => quoteArgMsys2(quoteCommand(cmd, ...args)), // MSYS2 doesn't use the argv it's given, instead it re-parses the // commandline from GetCommandLineW and it doesn't comform to the // usual Windows quoting rules. So we need to opt out of Node.js's From b3c987cb5f22e15069fa6f55038b2071fc5e6a88 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 07:59:51 +0000 Subject: [PATCH 0635/1338] Auto-approve garbage collection if pre-auto-gc hook missing Adds logic to automatically approve garbage collection when the 'pre-auto-gc' hook is not found in the repository, providing a debug message and exiting with a success code. This prevents unnecessary errors when the hook is absent. --- app/src/lib/hooks/hooks-proxy.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 8700823dbd3..8f1834b5c21 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -109,6 +109,16 @@ export const createHooksProxy = ( : undefined) if (!hooksExecutable) { + if (hookName === 'pre-auto-gc') { + debug(`no pre-auto-gc hook found, auto-approving garbage collection`) + await exitWithMessage( + conn, + `No pre-auto-gc hook found in repository, auto-approving garbage collection.`, + 0 + ) + return + } + debug(`hook executable not found for ${hookName}`) await exitWithError( conn, From 85ecb11dc6a3ec303f5837ebf9ca4457cd1e0c50 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 08:25:03 +0000 Subject: [PATCH 0636/1338] Improve commit progress UI with button styling Adds conditional styling for the commit progress component when the 'Show commit progress' button is present. Updates SCSS to adjust border and layout for better visual integration of the button. --- app/src/ui/changes/commit-message.tsx | 14 +++++++------- app/styles/ui/changes/_commit-message.scss | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index c4cdc24b5fc..d216a34d152 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -1551,7 +1551,7 @@ export class CommitMessage extends React.Component< } private renderCommitProgress() { - const { isCommitting, hookProgress } = this.props + const { isCommitting, hookProgress, onShowCommitProgress } = this.props if (!isCommitting || !hookProgress) { return null } @@ -1569,14 +1569,14 @@ export class CommitMessage extends React.Component< ? `${hookName} hook failed` : assertNever(status, `Unknown hook status: ${status}`) + const cn = classNames('commit-progress', { + 'with-button': onShowCommitProgress !== undefined, + }) return ( -
    +
    {text}
    - {this.props.onShowCommitProgress && ( - )} diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 98df2973647..747aa9c7ab6 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -13,8 +13,6 @@ padding: var(--spacing); .commit-progress { - // color: var(--text-secondary-color); - display: flex; align-items: center; margin-top: var(--spacing-half); @@ -27,14 +25,24 @@ border: var(--base-border); border-radius: var(--button-border-radius); border-color: var(--secondary-button-border-color); - border-right: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; + } + + &.with-button { + .description { + border-right: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } } button { + display: flex; + align-items: center; + justify-content: center; + width: 30px; + padding: 0; + flex-shrink: 0; - padding: var(--spacing-third); height: 100%; border-left-width: 1px; border-top-left-radius: 0; From 92d83c2300281d254c6c0bc813fa5a71164a4c86 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 09:31:41 +0100 Subject: [PATCH 0637/1338] Refactor git binary resolution in hooks proxy Moved git binary resolution from with-hooks-env.ts to hooks-proxy.ts, simplifying the function signatures and centralizing the logic. This change improves maintainability and reduces redundant code. --- app/src/lib/hooks/hooks-proxy.ts | 5 +++-- app/src/lib/hooks/with-hooks-env.ts | 9 +-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 8f1834b5c21..25de293a016 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -1,10 +1,11 @@ import { spawn } from 'child_process' import { randomBytes } from 'crypto' import { createWriteStream } from 'fs' -import { basename, join } from 'path' +import { basename, join, resolve } from 'path' import { ProcessProxyConnection } from 'process-proxy' import { pipeline } from 'stream/promises' import type { HookProgress } from '../git' +import { resolveGitBinary } from 'dugite' const hooksUsingStdin = ['post-rewrite'] const ignoredOnFailureHooks = [ @@ -51,7 +52,6 @@ const exitWithError = ( export const createHooksProxy = ( repoHooks: string[], tmpDir: string, - gitPath: string, shellEnv: Record, onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( @@ -151,6 +151,7 @@ export const createHooksProxy = ( ] const terminalOutput: Buffer[] = [] + const gitPath = resolveGitBinary(resolve(__dirname, 'git')) const { code, signal } = await new Promise<{ code: number | null diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index a2383ed06f5..488f44be050 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -1,14 +1,13 @@ import { cp, mkdtemp, rm } from 'fs/promises' import { AddressInfo } from 'net' import { tmpdir } from 'os' -import { basename, join, resolve } from 'path' +import { basename, join } from 'path' import { createProxyProcessServer } from 'process-proxy' import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' import { getShellEnv } from './get-shell-env' -import { resolveGitBinary } from 'dugite' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, @@ -38,11 +37,6 @@ export async function withHooksEnv( `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` ) - // TODO: will throw - const gitPathStartTime = Date.now() - const gitPath = resolveGitBinary(resolve(__dirname, 'git')) - log.debug(`hooks: located git in ${Date.now() - gitPathStartTime}ms`) - const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) @@ -51,7 +45,6 @@ export async function withHooksEnv( const hooksProxy = createHooksProxy( repoHooks, tmpHooksDir, - gitPath, shellEnv, options?.onHookProgress, options?.onHookFailure From 3d0c4f5bc0670479fafe91f9d6d4208e2bc52899 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 09:37:19 +0100 Subject: [PATCH 0638/1338] Memoize shell environment loading for hooks Replaces direct shell environment loading with a memoized async function in hooks-proxy and with-hooks-env. This optimizes repeated environment retrievals and improves performance when running multiple hooks. --- app/src/lib/hooks/hooks-proxy.ts | 3 ++- app/src/lib/hooks/with-hooks-env.ts | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 25de293a016..b6fd8b26790 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -52,7 +52,7 @@ const exitWithError = ( export const createHooksProxy = ( repoHooks: string[], tmpDir: string, - shellEnv: Record, + getShellEnv: () => Promise>, onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( hookName: string, @@ -152,6 +152,7 @@ export const createHooksProxy = ( const terminalOutput: Buffer[] = [] const gitPath = resolveGitBinary(resolve(__dirname, 'git')) + const shellEnv = await getShellEnv() const { code, signal } = await new Promise<{ code: number | null diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 488f44be050..8391203c039 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -8,6 +8,7 @@ import type { IGitExecutionOptions } from '../git/core' import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' import { getShellEnv } from './get-shell-env' +import memoizeOne from 'memoize-one' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, @@ -31,11 +32,14 @@ export async function withHooksEnv( return fn(options?.env) } - const shellEnvStartTime = Date.now() - const shellEnv = await getShellEnv() - log.debug( - `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` - ) + const memoizedGetShellEnv = memoizeOne(async () => { + const shellEnvStartTime = Date.now() + const shellEnv = await getShellEnv() + log.debug( + `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` + ) + return shellEnv + }) const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) @@ -45,7 +49,7 @@ export async function withHooksEnv( const hooksProxy = createHooksProxy( repoHooks, tmpHooksDir, - shellEnv, + memoizedGetShellEnv, options?.onHookProgress, options?.onHookFailure ) From ae03f5ff3ea7ce56ac4f075972809db106b91ee7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 09:48:51 +0100 Subject: [PATCH 0639/1338] Refactor hook execution to use --ignore-missing for pre-auto-gc Removes manual check for pre-auto-gc hook existence and always runs the hook with --ignore-missing. This simplifies logic and ensures Git handles missing pre-auto-gc hooks gracefully, improving user messaging during garbage collection. --- app/src/lib/hooks/hooks-proxy.ts | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index b6fd8b26790..c16882bf5cd 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -102,31 +102,6 @@ export const createHooksProxy = ( ) ) - const hooksExecutable = - repoHooks.find(hook => hook.endsWith(hookName)) ?? - (__WIN32__ - ? repoHooks.find(hook => hook.endsWith(`${hookName}.exe`)) - : undefined) - - if (!hooksExecutable) { - if (hookName === 'pre-auto-gc') { - debug(`no pre-auto-gc hook found, auto-approving garbage collection`) - await exitWithMessage( - conn, - `No pre-auto-gc hook found in repository, auto-approving garbage collection.`, - 0 - ) - return - } - - debug(`hook executable not found for ${hookName}`) - await exitWithError( - conn, - `Error: hook executable not found for ${hookName}` - ) - return - } - // tmpdir is deleted when the Git call completes, so we can leave the file const stdinFilePath = join(tmpDir, `in-${randomBytes(8).toString('hex')}`) const hasStdin = hooksUsingStdin.includes(hookName) @@ -145,6 +120,12 @@ export const createHooksProxy = ( 'hook', 'run', hookName, + // We always copy our pre-auto-gc hook in order to be able to tell the + // user that the reason their commit is taking so long is because Git is + // performing garbage collection, but it's unlikely that the user has a + // pre-auto-gc hook configured themselves, so we tell Git to ignore + // missing hooks here. + ...(hookName === 'pre-auto-gc' ? ['--ignore-missing'] : []), ...(hasStdin ? ['--to-stdin', stdinFilePath] : []), '--', ...proxyArgs.slice(1), From 23fbd46c71c004592cd844110a931505c3cbcc79 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:17:13 +0100 Subject: [PATCH 0640/1338] Dispose terminal on component unmount Adds a componentWillUnmount lifecycle method to dispose of the XTermTerminal instance when the Terminal component is unmounted, ensuring proper cleanup of resources. --- app/src/ui/terminal.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/ui/terminal.tsx b/app/src/ui/terminal.tsx index 1e52332d0e4..e4138e0cbb8 100644 --- a/app/src/ui/terminal.tsx +++ b/app/src/ui/terminal.tsx @@ -31,6 +31,10 @@ export class Terminal extends React.Component { this.terminal?.write(data) } + public componentWillUnmount(): void { + this.terminal?.dispose() + } + public componentDidMount() { const { terminalOutput, hideCursor, ...initOpts } = this.props this.terminal = new XTermTerminal({ From 9aa520a6e827bcaaed97726b6376e450160423ed Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:18:24 +0100 Subject: [PATCH 0641/1338] Refactor excluded environment variables in hooks-proxy Moves the excluded environment variables to a top-level constant for reuse and clarity. Simplifies the hook progress callback by extracting the abort function. --- app/src/lib/hooks/hooks-proxy.ts | 42 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index c16882bf5cd..29bde888972 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -21,6 +21,23 @@ const ignoredOnFailureHooks = [ 'pre-auto-gc', ] +const excludedEnvVars: ReadonlySet = new Set([ + // Dugite sets these, we don't want to leak them into the hook environment + 'GIT_SYSTEM_CONFIG', + 'GIT_EXEC_PATH', + 'GIT_TEMPLATE_DIR', + // We set this to point to a custom hooks path which we don't want + // leaking into the hook's environment. Initially I thought we would have + // to sanitize this to strip out the custom config we set and leave any + // user-configured but since we're executing the hook in a separate + // shell with login it would just get re-initialized there anyway. + 'GIT_CONFIG_PARAMETERS', + + 'GIT_ASKPASS', + 'GIT_SSH_COMMAND', + 'GIT_USER_AGENT', +]) + const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) } @@ -70,31 +87,10 @@ export const createHooksProxy = ( : basename(proxyArgs[0]) const abortController = new AbortController() + const abort = () => abortController.abort() conn.stderr.write(`Running ${hookName} hook...\n`) - - onHookProgress?.({ - hookName, - status: 'started', - abort: () => abortController.abort(), - }) - - const excludedEnvVars = new Set([ - // Dugite sets these, we don't want to leak them into the hook environment - 'GIT_SYSTEM_CONFIG', - 'GIT_EXEC_PATH', - 'GIT_TEMPLATE_DIR', - // We set this to point to a custom hooks path which we don't want - // leaking into the hook's environment. Initially I thought we would have - // to sanitize this to strip out the custom config we set and leave any - // user-configured but since we're executing the hook in a separate - // shell with login it would just get re-initialized there anyway. - 'GIT_CONFIG_PARAMETERS', - - 'GIT_ASKPASS', - 'GIT_SSH_COMMAND', - 'GIT_USER_AGENT', - ]) + onHookProgress?.({ hookName, status: 'started', abort }) const safeEnv = Object.fromEntries( Object.entries(proxyEnv).filter( From 3a5bf4098529dbff7f3bbe1469a5caf20a29b329 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:18:37 +0100 Subject: [PATCH 0642/1338] Remove debug logging from hook process error handler Eliminates the debug log statement in the error handler for spawned hook processes, streamlining error handling by directly rejecting the promise. --- app/src/lib/hooks/hooks-proxy.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 29bde888972..b1988a52097 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -143,10 +143,7 @@ export const createHooksProxy = ( signal: abortController.signal, }) .on('close', (code, signal) => resolve({ code, signal })) - .on('error', err => { - debug(`failed to spawn hook process:`, err) - reject(err) - }) + .on('error', err => reject(err)) // hooks never write to stdout // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 From 03b9f6dd5c5fa532b9c340564858f61d3fe8e1d7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:18:42 +0100 Subject: [PATCH 0643/1338] Update hooks-proxy.ts --- app/src/lib/hooks/hooks-proxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index b1988a52097..fed26025eb9 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -145,7 +145,7 @@ export const createHooksProxy = ( .on('close', (code, signal) => resolve({ code, signal })) .on('error', err => reject(err)) - // hooks never write to stdout + // git-hook run takes care of ensuring we only get hook output on stderr // https://github.com/git/git/blob/4cf919bd7b946477798af5414a371b23fd68bf93/hook.c#L73C6-L73C22 child.stderr.pipe(conn.stderr, { end: false }).on('error', reject) child.stderr.on('data', data => terminalOutput.push(data)) From 1e5ae68691b8aec8f907f4406e8d4dd82416b512 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:18:51 +0100 Subject: [PATCH 0644/1338] Fix process abort handling on connection close Replaces abortController.abort() with direct abort function call when the connection closes, ensuring proper process termination. --- app/src/lib/hooks/hooks-proxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index fed26025eb9..4fefb602f50 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -135,7 +135,7 @@ export const createHooksProxy = ( code: number | null signal: NodeJS.Signals | null }>((resolve, reject) => { - conn.on('close', () => abortController.abort()) + conn.on('close', abort) const child = spawn(gitPath, args, { cwd: proxyCwd, From c288eabcf08beca279954a37bc83717ad44b2847 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:19:52 +0100 Subject: [PATCH 0645/1338] Support Buffer output for git hook failures Updated hook failure handling to accept terminal output as string, Buffer, or array of Buffers across core, commit, hooks-proxy, popup model, and UI components. Added bufferTrimEnd utility and adjusted terminal rendering logic to properly display Buffer-based output. --- app/src/lib/git/commit.ts | 2 +- app/src/lib/git/core.ts | 2 +- app/src/lib/hooks/hooks-proxy.ts | 2 +- app/src/models/popup.ts | 2 +- app/src/ui/hook-failed/hook-failed.tsx | 2 +- app/src/ui/terminal.tsx | 32 ++++++++++++++++++++++++-- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index b2e245b5100..fe792ed364c 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -26,7 +26,7 @@ export async function createCommit( onHookProgress?: (progress: HookProgress) => void onHookFailure?: ( hookName: string, - terminalOutput: string + terminalOutput: ReadonlyArray ) => Promise<'abort' | 'ignore'> onTerminalOutputAvailable?: TerminalOutputCallback } diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 45fac74658f..8f9d79afbe1 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -86,7 +86,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly onHookProgress?: (progress: HookProgress) => void readonly onHookFailure?: ( hookName: string, - terminalOutput: string + terminalOutput: ReadonlyArray ) => Promise<'abort' | 'ignore'> readonly onTerminalOutputAvailable?: TerminalOutputCallback diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 4fefb602f50..e3c5288a4c5 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -73,7 +73,7 @@ export const createHooksProxy = ( onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( hookName: string, - terminalOutput: string + terminalOutput: ReadonlyArray ) => Promise<'abort' | 'ignore'> ) => { return async (conn: ProcessProxyConnection) => { diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index 9977e6d8c32..f1671c319db 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -470,7 +470,7 @@ export type PopupDetail = | { type: PopupType.HookFailed hookName: string - terminalOutput: string + terminalOutput: string | Buffer | ReadonlyArray resolve: (value: 'abort' | 'ignore') => void } | { diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index f8d1f8ba1a1..294b92b6089 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -6,7 +6,7 @@ import { Terminal } from '../terminal' interface IHookFailedProps { readonly hookName: string - readonly terminalOutput: string + readonly terminalOutput: string | Buffer | ReadonlyArray readonly resolve: (value: 'abort' | 'ignore') => void readonly onDismissed: () => void } diff --git a/app/src/ui/terminal.tsx b/app/src/ui/terminal.tsx index e4138e0cbb8..40c0266559d 100644 --- a/app/src/ui/terminal.tsx +++ b/app/src/ui/terminal.tsx @@ -13,9 +13,25 @@ export const defaultTerminalOptions: Readonly = { screenReaderMode: true, } +const bufferTrimEnd = (value: Buffer): Buffer => { + let i + for (i = value.length - 1; i >= 0; i--) { + switch (value[i]) { + case 0x20: // space + case 0x09: // tab + case 0x0a: // LF + case 0x0d: // CR + continue + default: + break + } + } + return i === value.length ? value : value.subarray(0, i) +} + export type TerminalProps = ITerminalOptions & ITerminalInitOnlyOptions & { - readonly terminalOutput?: string + readonly terminalOutput?: string | Buffer | ReadonlyArray readonly hideCursor?: boolean } @@ -55,7 +71,19 @@ export class Terminal extends React.Component { if (hideCursor !== false) { this.terminal.write('\x1b[?25l') // hide cursor if (terminalOutput) { - this.terminal.write(terminalOutput.trimEnd()) + if (typeof terminalOutput === 'string') { + this.terminal.write(terminalOutput.trimEnd()) + } else if (Buffer.isBuffer(terminalOutput)) { + this.terminal.write(bufferTrimEnd(terminalOutput)) + } else { + for (let i = 0; i < terminalOutput.length; i++) { + this.terminal.write( + i === terminalOutput.length - 1 + ? bufferTrimEnd(terminalOutput[i]) + : terminalOutput[i] + ) + } + } } } } From a544320a10e27bf3e674d008646147d2fedfee2b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:20:09 +0100 Subject: [PATCH 0646/1338] Remove unused repoHooks argument from createHooksProxy Eliminated the repoHooks parameter from the createHooksProxy call in withHooksEnv, as it is no longer needed. --- app/src/lib/hooks/hooks-proxy.ts | 1 - app/src/lib/hooks/with-hooks-env.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index e3c5288a4c5..36cab547fff 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -67,7 +67,6 @@ const exitWithError = ( ) => exitWithMessage(connection, message, exitCode) export const createHooksProxy = ( - repoHooks: string[], tmpDir: string, getShellEnv: () => Promise>, onHookProgress?: (progress: HookProgress) => void, diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 8391203c039..4442c808b84 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -47,7 +47,6 @@ export async function withHooksEnv( const token = crypto.randomUUID() const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) const hooksProxy = createHooksProxy( - repoHooks, tmpHooksDir, memoizedGetShellEnv, options?.onHookProgress, From 081aa191c53984f2c63d0549a2a256a5930e0b5d Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:21:13 +0100 Subject: [PATCH 0647/1338] Expand terminalOutput type for hook failure handlers Updated the onHookFailure callback signature in commit, core, and hooks-proxy modules to accept terminalOutput as string, Buffer, or ReadonlyArray instead of only ReadonlyArray. This change increases flexibility for handling hook output in different formats. --- app/src/lib/git/commit.ts | 2 +- app/src/lib/git/core.ts | 2 +- app/src/lib/hooks/hooks-proxy.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index fe792ed364c..c28f7e4d212 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -26,7 +26,7 @@ export async function createCommit( onHookProgress?: (progress: HookProgress) => void onHookFailure?: ( hookName: string, - terminalOutput: ReadonlyArray + terminalOutput: string | Buffer | ReadonlyArray ) => Promise<'abort' | 'ignore'> onTerminalOutputAvailable?: TerminalOutputCallback } diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 8f9d79afbe1..c27ab7716fb 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -86,7 +86,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly onHookProgress?: (progress: HookProgress) => void readonly onHookFailure?: ( hookName: string, - terminalOutput: ReadonlyArray + terminalOutput: string | Buffer | ReadonlyArray ) => Promise<'abort' | 'ignore'> readonly onTerminalOutputAvailable?: TerminalOutputCallback diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 36cab547fff..5ecc00a475d 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -72,7 +72,7 @@ export const createHooksProxy = ( onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( hookName: string, - terminalOutput: ReadonlyArray + terminalOutput: string | Buffer | ReadonlyArray ) => Promise<'abort' | 'ignore'> ) => { return async (conn: ProcessProxyConnection) => { From 4340ccbcaf7292fe4fc34b5dda799014cfc3ec5b Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:24:28 +0100 Subject: [PATCH 0648/1338] Refactor TerminalOutput type usage across codebase Unified the TerminalOutput type to replace various string/Buffer/Buffer[] usages in hook, commit, and terminal-related interfaces and components. This improves type consistency and simplifies handling of terminal output data throughout the application. --- app/src/lib/git/commit.ts | 3 ++- app/src/lib/git/core.ts | 6 ++++-- app/src/lib/hooks/hooks-proxy.ts | 4 ++-- app/src/models/popup.ts | 4 ++-- app/src/ui/commit-progress/commit-progress.tsx | 4 +++- app/src/ui/hook-failed/hook-failed.tsx | 3 ++- app/src/ui/terminal.tsx | 11 ++++++++--- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index c28f7e4d212..627cc5a3ec5 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -2,6 +2,7 @@ import { git, HookProgress, parseCommitSHA, + TerminalOutput, TerminalOutputCallback, } from './core' import { stageFiles } from './update-index' @@ -26,7 +27,7 @@ export async function createCommit( onHookProgress?: (progress: HookProgress) => void onHookFailure?: ( hookName: string, - terminalOutput: string | Buffer | ReadonlyArray + terminalOutput: TerminalOutput ) => Promise<'abort' | 'ignore'> onTerminalOutputAvailable?: TerminalOutputCallback } diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index c27ab7716fb..15c9bcf4ab6 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -35,7 +35,9 @@ export const isMaxBufferExceededError = ( ) } -export type TerminalOutputListener = (cb: (chunk: Buffer | string) => void) => { +export type TerminalOutput = string | Buffer | Buffer[] + +export type TerminalOutputListener = (cb: (chunk: TerminalOutput) => void) => { unsubscribe: () => void } @@ -86,7 +88,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { readonly onHookProgress?: (progress: HookProgress) => void readonly onHookFailure?: ( hookName: string, - terminalOutput: string | Buffer | ReadonlyArray + terminalOutput: TerminalOutput ) => Promise<'abort' | 'ignore'> readonly onTerminalOutputAvailable?: TerminalOutputCallback diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 5ecc00a475d..69c9ab8bd55 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -4,7 +4,7 @@ import { createWriteStream } from 'fs' import { basename, join, resolve } from 'path' import { ProcessProxyConnection } from 'process-proxy' import { pipeline } from 'stream/promises' -import type { HookProgress } from '../git' +import type { HookProgress, TerminalOutput } from '../git' import { resolveGitBinary } from 'dugite' const hooksUsingStdin = ['post-rewrite'] @@ -72,7 +72,7 @@ export const createHooksProxy = ( onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( hookName: string, - terminalOutput: string | Buffer | ReadonlyArray + terminalOutput: TerminalOutput ) => Promise<'abort' | 'ignore'> ) => { return async (conn: ProcessProxyConnection) => { diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts index f1671c319db..e36224591a5 100644 --- a/app/src/models/popup.ts +++ b/app/src/models/popup.ts @@ -25,7 +25,7 @@ import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog' import { IAPIComment } from '../lib/api' import { ISecretScanResult } from '../ui/secret-scanning/push-protection-error-dialog' import { BypassReasonType } from '../ui/secret-scanning/bypass-push-protection-dialog' -import { TerminalOutputListener } from '../lib/git' +import { TerminalOutput, TerminalOutputListener } from '../lib/git' export enum PopupType { RenameBranch = 'RenameBranch', @@ -470,7 +470,7 @@ export type PopupDetail = | { type: PopupType.HookFailed hookName: string - terminalOutput: string | Buffer | ReadonlyArray + terminalOutput: TerminalOutput resolve: (value: 'abort' | 'ignore') => void } | { diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index 19542972460..da9b846e69c 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -22,7 +22,9 @@ export class CommitProgress extends React.Component { public componentDidMount() { const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => - this.terminalRef.current?.write(chunk) + Array.isArray(chunk) + ? chunk.forEach(c => this.terminalRef.current?.write(c)) + : this.terminalRef.current?.write(chunk) ) this.unsubscribe = unsubscribe diff --git a/app/src/ui/hook-failed/hook-failed.tsx b/app/src/ui/hook-failed/hook-failed.tsx index 294b92b6089..e97104bbafa 100644 --- a/app/src/ui/hook-failed/hook-failed.tsx +++ b/app/src/ui/hook-failed/hook-failed.tsx @@ -3,10 +3,11 @@ import * as React from 'react' import { Dialog, DialogContent, DialogFooter } from '../dialog' import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group' import { Terminal } from '../terminal' +import { TerminalOutput } from '../../lib/git' interface IHookFailedProps { readonly hookName: string - readonly terminalOutput: string | Buffer | ReadonlyArray + readonly terminalOutput: TerminalOutput readonly resolve: (value: 'abort' | 'ignore') => void readonly onDismissed: () => void } diff --git a/app/src/ui/terminal.tsx b/app/src/ui/terminal.tsx index 40c0266559d..a53f0d50c4c 100644 --- a/app/src/ui/terminal.tsx +++ b/app/src/ui/terminal.tsx @@ -5,6 +5,7 @@ import { } from '@xterm/xterm' import React from 'react' import { getMonospaceFontFamily } from './get-monospace-font-family' +import { TerminalOutput } from '../lib/git' export const defaultTerminalOptions: Readonly = { convertEol: true, @@ -31,7 +32,7 @@ const bufferTrimEnd = (value: Buffer): Buffer => { export type TerminalProps = ITerminalOptions & ITerminalInitOnlyOptions & { - readonly terminalOutput?: string | Buffer | ReadonlyArray + readonly terminalOutput?: TerminalOutput readonly hideCursor?: boolean } @@ -43,8 +44,12 @@ export class Terminal extends React.Component { return this.terminal } - public write(data: string | Buffer) { - this.terminal?.write(data) + public write(data: TerminalOutput) { + if (Array.isArray(data)) { + data.forEach(chunk => this.terminal?.write(chunk)) + } else { + this.terminal?.write(data) + } } public componentWillUnmount(): void { From 35597af4356d0e0e7060be3fe397621fbc5c972a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 10 Nov 2025 14:26:45 +0100 Subject: [PATCH 0649/1338] Refactor terminal output writing logic Removed custom bufferTrimEnd function and simplified terminal output handling by delegating to the write method. This improves code clarity and maintainability. --- app/src/ui/terminal.tsx | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/app/src/ui/terminal.tsx b/app/src/ui/terminal.tsx index a53f0d50c4c..7ca37fdbc71 100644 --- a/app/src/ui/terminal.tsx +++ b/app/src/ui/terminal.tsx @@ -14,22 +14,6 @@ export const defaultTerminalOptions: Readonly = { screenReaderMode: true, } -const bufferTrimEnd = (value: Buffer): Buffer => { - let i - for (i = value.length - 1; i >= 0; i--) { - switch (value[i]) { - case 0x20: // space - case 0x09: // tab - case 0x0a: // LF - case 0x0d: // CR - continue - default: - break - } - } - return i === value.length ? value : value.subarray(0, i) -} - export type TerminalProps = ITerminalOptions & ITerminalInitOnlyOptions & { readonly terminalOutput?: TerminalOutput @@ -76,19 +60,7 @@ export class Terminal extends React.Component { if (hideCursor !== false) { this.terminal.write('\x1b[?25l') // hide cursor if (terminalOutput) { - if (typeof terminalOutput === 'string') { - this.terminal.write(terminalOutput.trimEnd()) - } else if (Buffer.isBuffer(terminalOutput)) { - this.terminal.write(bufferTrimEnd(terminalOutput)) - } else { - for (let i = 0; i < terminalOutput.length; i++) { - this.terminal.write( - i === terminalOutput.length - 1 - ? bufferTrimEnd(terminalOutput[i]) - : terminalOutput[i] - ) - } - } + this.write(terminalOutput) } } } From bf86dba788a46d55e4559c290a7656253461a8a5 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 11 Nov 2025 13:28:55 +0100 Subject: [PATCH 0650/1338] Update commit-progress.tsx --- app/src/ui/commit-progress/commit-progress.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/ui/commit-progress/commit-progress.tsx b/app/src/ui/commit-progress/commit-progress.tsx index da9b846e69c..19542972460 100644 --- a/app/src/ui/commit-progress/commit-progress.tsx +++ b/app/src/ui/commit-progress/commit-progress.tsx @@ -22,9 +22,7 @@ export class CommitProgress extends React.Component { public componentDidMount() { const { unsubscribe } = this.props.subscribeToCommitOutput(chunk => - Array.isArray(chunk) - ? chunk.forEach(c => this.terminalRef.current?.write(c)) - : this.terminalRef.current?.write(chunk) + this.terminalRef.current?.write(chunk) ) this.unsubscribe = unsubscribe From 695449cd707043b010a69e7bc7348beb99223014 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 11 Nov 2025 19:15:33 +0100 Subject: [PATCH 0651/1338] Refactor Git hook interception and filtering logic Changed IGitExecutionOptions.interceptHooks to accept only string arrays. Updated getRepoHooks to yield hook names instead of paths and improved filtering logic. Refactored withHooksEnv to use the new hook name interface and simplified environment handling for intercepted hooks. --- app/src/lib/git/core.ts | 2 +- app/src/lib/hooks/get-repo-hooks.ts | 34 ++++++++++++------------ app/src/lib/hooks/with-hooks-env.ts | 41 +++++++++++------------------ 3 files changed, 33 insertions(+), 44 deletions(-) diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts index 15c9bcf4ab6..69dc5f7ce57 100644 --- a/app/src/lib/git/core.ts +++ b/app/src/lib/git/core.ts @@ -84,7 +84,7 @@ export interface IGitExecutionOptions extends DugiteExecutionOptions { */ readonly isBackgroundTask?: boolean - readonly interceptHooks?: boolean | string[] + readonly interceptHooks?: string[] readonly onHookProgress?: (progress: HookProgress) => void readonly onHookFailure?: ( hookName: string, diff --git a/app/src/lib/hooks/get-repo-hooks.ts b/app/src/lib/hooks/get-repo-hooks.ts index edde20cbfec..782ab389eab 100644 --- a/app/src/lib/hooks/get-repo-hooks.ts +++ b/app/src/lib/hooks/get-repo-hooks.ts @@ -1,6 +1,6 @@ import { exec } from 'dugite' import { access, constants, readdir } from 'fs/promises' -import { join, resolve } from 'path' +import { basename, join, resolve } from 'path' const isExecutable = (path: string) => access(path, constants.X_OK) @@ -38,6 +38,14 @@ const knownHooks = [ 'post-index-change', ] +/** + * Returns the names of executable Git hooks found in the given repository. + * + * @param path The file system path to the Git repository (root of working + * directory). + * @param filter An optional array of hook names to filter the results. + * Including '*' will return all hooks. + */ export async function* getRepoHooks(path: string, filter?: string[]) { const { exitCode, stdout } = await exec( ['config', '-z', '--get', 'core.hooksPath'], @@ -53,34 +61,26 @@ export async function* getRepoHooks(path: string, filter?: string[]) { .then(entries => entries.filter(x => x.isFile())) .catch(() => []) - for (const hook of files) { - const hookName = hook.name.endsWith('.exe') - ? hook.name.slice(0, -4) - : hook.name + const matchAll = filter?.includes('*') - if (filter && !filter.includes(hookName)) { - continue - } + for (const file of files) { + const hookName = basename(file.name, '.exe') - if (!knownHooks.includes(hookName)) { + if (matchAll || filter?.includes(hookName) === false) { continue } - if (hookName.endsWith('.sample')) { + if (!knownHooks.includes(hookName)) { continue } - const hookPath = join(hook.parentPath, hook.name) - if (__WIN32__) { // On Windows we have to assume that any valid hook name is executable // because the executable bit is not used there. Git looks for a shebang // but that seems expensive to check here :shrug: - yield hookPath - } else { - if (await isExecutable(hookPath)) { - yield hookPath - } + yield hookName + } else if (await isExecutable(join(file.parentPath, file.name))) { + yield hookName } } } diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index 4442c808b84..ce2c23a135a 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -1,7 +1,7 @@ import { cp, mkdtemp, rm } from 'fs/promises' import { AddressInfo } from 'net' import { tmpdir } from 'os' -import { basename, join } from 'path' +import { join } from 'path' import { createProxyProcessServer } from 'process-proxy' import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' @@ -13,23 +13,16 @@ import memoizeOne from 'memoize-one' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, path: string, - options: IGitExecutionOptions | undefined + opts: IGitExecutionOptions | undefined ): Promise { - const interceptHooks = options?.interceptHooks ?? false - - if (!interceptHooks || !enableHooksEnvironment()) { - return fn(options?.env) + if (!opts?.interceptHooks || !enableHooksEnvironment()) { + return fn(opts?.env) } - const repoHooks = await Array.fromAsync( - getRepoHooks( - path, - typeof interceptHooks === 'object' ? interceptHooks : undefined - ) - ) + const hooks = await Array.fromAsync(getRepoHooks(path, opts.interceptHooks)) - if (repoHooks.length === 0) { - return fn(options?.env) + if (hooks.length === 0) { + return fn(opts?.env) } const memoizedGetShellEnv = memoizeOne(async () => { @@ -49,8 +42,8 @@ export async function withHooksEnv( const hooksProxy = createHooksProxy( tmpHooksDir, memoizedGetShellEnv, - options?.onHookProgress, - options?.onHookFailure + opts?.onHookProgress, + opts?.onHookFailure ) const server = createProxyProcessServer( @@ -61,22 +54,18 @@ export async function withHooksEnv( }), { validateConnection: async receivedToken => receivedToken === token } ) - const port = await new Promise((resolve, reject) => { - server.listen(0, '127.0.0.1', () => { + const port = await new Promise(resolve => { + server.listen(0, '127.0.0.1', () => resolve((server.address() as AddressInfo).port) - }) + ) }) try { - for (const hook of repoHooks) { - const cleanHooksName = __WIN32__ - ? basename(hook).replace(/\.exe$/i, '') - : basename(hook) - - await cp(processProxyPath, join(tmpHooksDir, `${cleanHooksName}${ext}`)) + for (const hook of hooks) { + await cp(processProxyPath, join(tmpHooksDir, `${hook}${ext}`)) } const existingGitEnvConfig = - options?.env?.['GIT_CONFIG_PARAMETERS'] ?? + opts?.env?.['GIT_CONFIG_PARAMETERS'] ?? process.env['GIT_CONFIG_PARAMETERS'] ?? '' From 8f6d365fb16087005493fb3a72ffa727fee15c29 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 11 Nov 2025 19:31:05 +0100 Subject: [PATCH 0652/1338] Refactor hooks-proxy for improved readability Renamed ProcessProxyConnection to Connection for brevity, simplified function signatures, and streamlined hook name extraction. Enhanced debug logging to include elapsed time and signal information, and passed terminalOutput directly to onHookFailure for consistency. --- app/src/lib/hooks/hooks-proxy.ts | 49 +++++++++++--------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 69c9ab8bd55..3a2c76e1c62 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -2,7 +2,7 @@ import { spawn } from 'child_process' import { randomBytes } from 'crypto' import { createWriteStream } from 'fs' import { basename, join, resolve } from 'path' -import { ProcessProxyConnection } from 'process-proxy' +import { ProcessProxyConnection as Connection } from 'process-proxy' import { pipeline } from 'stream/promises' import type { HookProgress, TerminalOutput } from '../git' import { resolveGitBinary } from 'dugite' @@ -42,14 +42,10 @@ const debug = (message: string, error?: Error) => { log.debug(`hooks: ${message}`, error) } -const exitWithMessage = ( - connection: ProcessProxyConnection, - message: string, - exitCode = 0 -) => { +const exitWithMessage = (conn: Connection, msg: string, exitCode = 0) => { return new Promise(resolve => { - connection.stderr.end(`${message}\n`) - connection.exit(exitCode).then(resolve, err => { + conn.stderr.end(`${msg}\n`) + conn.exit(exitCode).then(resolve, err => { debug( `failed to exit proxy: ${ err instanceof Error ? err.message : String(err) @@ -60,11 +56,8 @@ const exitWithMessage = ( }) } -const exitWithError = ( - connection: ProcessProxyConnection, - message: string, - exitCode = 1 -) => exitWithMessage(connection, message, exitCode) +const exitWithError = (conn: Connection, msg: string, exitCode = 1) => + exitWithMessage(conn, msg, exitCode) export const createHooksProxy = ( tmpDir: string, @@ -75,15 +68,13 @@ export const createHooksProxy = ( terminalOutput: TerminalOutput ) => Promise<'abort' | 'ignore'> ) => { - return async (conn: ProcessProxyConnection) => { + return async (conn: Connection) => { const startTime = Date.now() const proxyArgs = await conn.getArgs() const proxyEnv = await conn.getEnv() const proxyCwd = await conn.getCwd() - const hookName = __WIN32__ - ? basename(proxyArgs[0]).replace(/\.exe$/i, '') - : basename(proxyArgs[0]) + const hookName = basename(proxyArgs[0], __WIN32__ ? '.exe' : undefined) const abortController = new AbortController() const abort = () => abortController.abort() @@ -106,15 +97,13 @@ export const createHooksProxy = ( } if (abortController.signal.aborted) { - debug(`hook ${hookName} aborted before execution`) - await exitWithError(conn, `Hook ${hookName} aborted`) + debug(`${hookName}: aborted before execution`) + await exitWithError(conn, `hook ${hookName} aborted`) return } const args = [ - 'hook', - 'run', - hookName, + ...['hook', 'run', hookName], // We always copy our pre-auto-gc hook in order to be able to tell the // user that the reason their commit is taking so long is because Git is // performing garbage collection, but it's unlikely that the user has a @@ -150,24 +139,20 @@ export const createHooksProxy = ( child.stderr.on('data', data => terminalOutput.push(data)) }) + const elapsedSeconds = (Date.now() - startTime) / 1000 + if (signal !== null) { - debug(`hook ${hookName} was killed by signal ${signal}`) + debug(`${hookName}: killed by signal ${signal} after ${elapsedSeconds}s`) + } else { + debug(`${hookName}: exited with code ${code} after ${elapsedSeconds}s`) } - const elapsedSeconds = (Date.now() - startTime) / 1000 - debug( - `executed ${hookName}: exited with code ${code} in ${elapsedSeconds}s` - ) - const ignoreError = code !== null && code !== 0 && !ignoredOnFailureHooks.includes(hookName) && onHookFailure - ? (await onHookFailure( - hookName, - Buffer.concat(terminalOutput).toString() - )) === 'ignore' + ? (await onHookFailure(hookName, terminalOutput)) === 'ignore' : false if (ignoreError) { From 70b76d67e49142e4c5dbd4a2590694fcdba25347 Mon Sep 17 00:00:00 2001 From: Rainymy <48211766+Rainymy@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:23:43 +0100 Subject: [PATCH 0653/1338] Add Windows support for Zed --- app/src/lib/editors/win32.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts index 41d7e601bd6..d813f1f796b 100644 --- a/app/src/lib/editors/win32.ts +++ b/app/src/lib/editors/win32.ts @@ -496,6 +496,15 @@ const editors: WindowsExternalEditor[] = [ displayNamePrefixes: ['Windsurf', 'Windsurf (User)'], publishers: ['Codeium'], }, + { + name: 'Zed', + registryKeys: [ + CurrentUserUninstallKey('{2DB0DA96-CA55-49BB-AF4F-64AF36A86712}_is1'), + ], + installLocationRegistryKey: 'DisplayIcon', + displayNamePrefixes: ['Zed'], + publishers: ['Zed Industries'], + }, ] function getKeyOrEmpty( From 8291ec350abd260c518de7365fb42580fed46cc1 Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Thu, 13 Nov 2025 14:00:15 -0800 Subject: [PATCH 0654/1338] Add 'View Branch on GitHub' to branch context menu Introduces a new context menu item allowing users to view the current branch on GitHub if an upstream remote is set. Implements the handler in BranchDropdown and updates the context menu item generation logic. --- .../branch-list-item-context-menu.tsx | 9 +++++++ app/src/ui/toolbar/branch-dropdown.tsx | 24 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/app/src/ui/branches/branch-list-item-context-menu.tsx b/app/src/ui/branches/branch-list-item-context-menu.tsx index c937379adfa..281c0847276 100644 --- a/app/src/ui/branches/branch-list-item-context-menu.tsx +++ b/app/src/ui/branches/branch-list-item-context-menu.tsx @@ -5,6 +5,7 @@ interface IBranchContextMenuConfig { name: string isLocal: boolean onRenameBranch?: (branchName: string) => void + onViewBranchOnGitHub?: () => void onViewPullRequestOnGitHub?: () => void onDeleteBranch?: (branchName: string) => void } @@ -16,6 +17,7 @@ export function generateBranchContextMenuItems( name, isLocal, onRenameBranch, + onViewBranchOnGitHub, onViewPullRequestOnGitHub, onDeleteBranch, } = config @@ -34,6 +36,13 @@ export function generateBranchContextMenuItems( action: () => clipboard.writeText(name), }) + if (onViewBranchOnGitHub !== undefined) { + items.push({ + label: 'View Branch on GitHub', + action: () => onViewBranchOnGitHub(), + }) + } + if (onViewPullRequestOnGitHub !== undefined) { items.push({ label: 'View Pull Request on GitHub', diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index 7ad501d08b2..35c68b4e72d 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -309,6 +309,9 @@ export class BranchDropdown extends React.Component { name: tip.branch.name, isLocal: tip.branch.type === BranchType.Local, onRenameBranch: this.onRenameBranch, + onViewBranchOnGitHub: tip.branch.upstreamRemoteName + ? this.onViewBranchOnGithub + : undefined, onViewPullRequestOnGitHub: this.props.currentPullRequest ? this.onViewPullRequestOnGithub : undefined, @@ -338,6 +341,27 @@ export class BranchDropdown extends React.Component { }) } + private onViewBranchOnGithub = () => { + const { repository } = this.props + const { tip } = this.props.repositoryState.branchesState + + if (tip.kind !== TipState.Valid) { + return + } + + const gitHubRepository = repository.gitHubRepository + if (!gitHubRepository || gitHubRepository.htmlURL === null) { + return + } + + const branchName = tip.branch.upstreamWithoutRemote ?? tip.branch.name + const url = `${gitHubRepository.htmlURL}/tree/${encodeURIComponent( + branchName + )}` + + this.props.dispatcher.openInBrowser(url) + } + private onViewPullRequestOnGithub = () => { const pr = this.props.currentPullRequest From a56f5354d450afc3c3b98096f3518dc408b74b77 Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Thu, 13 Nov 2025 14:02:54 -0800 Subject: [PATCH 0655/1338] Fix typo in branch dropdown handler name Renamed onViewBranchOnGithub to onViewBranchOnGitHub for consistency and to fix a typo in the branch dropdown component. --- app/src/ui/toolbar/branch-dropdown.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index 35c68b4e72d..c4582e110e5 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -310,7 +310,7 @@ export class BranchDropdown extends React.Component { isLocal: tip.branch.type === BranchType.Local, onRenameBranch: this.onRenameBranch, onViewBranchOnGitHub: tip.branch.upstreamRemoteName - ? this.onViewBranchOnGithub + ? this.onViewBranchOnGitHub : undefined, onViewPullRequestOnGitHub: this.props.currentPullRequest ? this.onViewPullRequestOnGithub @@ -341,7 +341,7 @@ export class BranchDropdown extends React.Component { }) } - private onViewBranchOnGithub = () => { + private onViewBranchOnGitHub = () => { const { repository } = this.props const { tip } = this.props.repositoryState.branchesState From 5e59ca8f1b69da4b0771629064f75f99e9b63b65 Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Thu, 13 Nov 2025 14:06:16 -0800 Subject: [PATCH 0656/1338] Refactor branch dropdown GitHub view logic Simplified variable usage in onViewBranchOnGitHub by directly accessing props and removing redundant assignments. --- app/src/ui/toolbar/branch-dropdown.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index c4582e110e5..02bafbc5ef7 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -342,14 +342,13 @@ export class BranchDropdown extends React.Component { } private onViewBranchOnGitHub = () => { - const { repository } = this.props - const { tip } = this.props.repositoryState.branchesState + const tip = this.props.repositoryState.branchesState.tip + const gitHubRepository = this.props.repository.gitHubRepository if (tip.kind !== TipState.Valid) { return } - const gitHubRepository = repository.gitHubRepository if (!gitHubRepository || gitHubRepository.htmlURL === null) { return } From 5d1e195b4c9d11e1ef5558808d09b6feb8857ca3 Mon Sep 17 00:00:00 2001 From: Neel Bhalla Date: Sat, 15 Nov 2025 12:47:23 -0500 Subject: [PATCH 0657/1338] fix: address comments --- app/src/lib/stores/app-store.ts | 2 +- app/src/lib/stores/git-store.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index fcff810ea35..881893d7525 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -1745,7 +1745,7 @@ export class AppStore extends TypedBaseStore { } this.repositoryStateCache.updateCompareState(repository, () => ({ - commitSHAs: commits.concat(newCommits ?? []), + commitSHAs: commits.concat(newCommits), })) this.emitUpdate() } diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts index 4c669e55baf..95aad627b62 100644 --- a/app/src/lib/stores/git-store.ts +++ b/app/src/lib/stores/git-store.ts @@ -603,6 +603,8 @@ export class GitStore extends BaseStore { * If the tip of the repository does not have commits (i.e. is unborn), this * should be invoked with `null`, which clears any existing commits from the * store. + * + * @returns The list of commit SHAs that were ammended to the list of commits, or null if not applicable */ public async loadLocalCommits( branch: Branch | null, From 4c735e53b7e904952c9e38e8dc5370407b036e4d Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Thu, 20 Nov 2025 13:41:58 +0100 Subject: [PATCH 0658/1338] check-runs: set max-height to enabling scroll of ci-check-run-list --- app/styles/ui/check-runs/_ci-check-run-list.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/styles/ui/check-runs/_ci-check-run-list.scss b/app/styles/ui/check-runs/_ci-check-run-list.scss index 9fdbcd03dab..17420c34f7b 100644 --- a/app/styles/ui/check-runs/_ci-check-run-list.scss +++ b/app/styles/ui/check-runs/_ci-check-run-list.scss @@ -1,4 +1,7 @@ .ci-check-run-list { + + max-height: 70vh; + :first-child { &.ci-check-run-list-group { :first-child { From d59ebae08466177a3028b14ad8f03a0942e9499b Mon Sep 17 00:00:00 2001 From: Arjun Suresh <123arjunsuresh@gmail.com> Date: Thu, 20 Nov 2025 13:57:26 +0100 Subject: [PATCH 0659/1338] fix lint --- app/styles/ui/check-runs/_ci-check-run-list.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/styles/ui/check-runs/_ci-check-run-list.scss b/app/styles/ui/check-runs/_ci-check-run-list.scss index 17420c34f7b..9891e471161 100644 --- a/app/styles/ui/check-runs/_ci-check-run-list.scss +++ b/app/styles/ui/check-runs/_ci-check-run-list.scss @@ -1,5 +1,4 @@ .ci-check-run-list { - max-height: 70vh; :first-child { From 413ff50e11f984ef36a0f0bf40b8cbed9f1c5ec8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 09:00:26 +0000 Subject: [PATCH 0660/1338] Initial plan From c8c673a20729ed5ef6da9bbae0aa1a8e30b4463f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 09:02:39 +0000 Subject: [PATCH 0661/1338] Add permissions to lint job in CI workflow Co-authored-by: niik <634063+niik@users.noreply.github.com> --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e759efb8a36..feb45c52b1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,8 @@ jobs: lint: name: Lint runs-on: ubuntu-latest + permissions: + contents: read env: RELEASE_CHANNEL: ${{ inputs.environment }} steps: From 61743784cde097a58f7f9289f0ec6d81b541771e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 09:14:45 +0000 Subject: [PATCH 0662/1338] Initial plan From 345634a2c8fc80ceaabfa87c33341628243249e4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 09:20:25 +0000 Subject: [PATCH 0663/1338] Add Copilot instructions for repository Co-authored-by: niik <634063+niik@users.noreply.github.com> --- .github/copilot-instructions.md | 224 ++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 .github/copilot-instructions.md diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 00000000000..6b7287ba6c8 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,224 @@ +# GitHub Desktop - Copilot Instructions + +This repository contains GitHub Desktop, an open-source Electron-based GitHub application written in TypeScript and React. + +## Technology Stack + +- **Language**: TypeScript (strict mode enabled) +- **UI Framework**: React 16.x +- **Runtime**: Electron 38.x +- **Build Tool**: Webpack with parallel builds +- **Package Manager**: Yarn (>= 1.9) +- **Node Version**: >= 10 (see `.node-version` for specific version) +- **Testing**: Node.js built-in test runner + +## Code Style & Conventions + +### TypeScript Style + +- **Use strict TypeScript** with all strict mode checks enabled +- **Naming conventions**: + - PascalCase for classes + - camelCase for methods and properties + - Interfaces MUST start with `I` prefix (e.g., `IRepository`, `ICommit`) + - Avoid reserved keywords as variable names (`any`, `Number`, `String`, `Boolean`, `Undefined`, etc.) +- **Type safety**: + - Prefer `as` for type assertions + - Use the `assertNever` helper for exhaustiveness checks in switch statements + - Write custom type definitions when none exist + - Avoid `any` unless absolutely necessary +- **Member ordering in classes**: + 1. Static fields + 2. Static methods + 3. Instance fields + 4. Abstract methods + 5. Constructor + 6. Instance methods +- **Visibility modifiers**: Always use explicit member accessibility (`public`, `private`, `protected`) +- **Avoid default exports**: Use named exports only + +### React Conventions + +- **Props and State**: Always use `readonly` for props and state types to prevent accidental mutation +- **JSX**: Always use explicit boolean values (e.g., `` instead of ``) +- **No binding in JSX**: Use arrow functions or pre-bind methods instead of binding in render +- **No string refs**: Use React refs API instead +- **Accessibility**: Autofocus is allowed when used appropriately in dialogs and focused contexts + +### Immutability & Pure Functions + +- **Prefer `const` over `let`**: Use `const` whenever possible to enforce immutability +- **Prefer ternary over reassignment**: Use `const a = condition ? value : otherValue` instead of `let` with conditional reassignment +- **Pure functions**: Write functions that operate only on their parameters when possible +- **Lift computation logic**: Separate data gathering from data processing into different functions +- **Use readonly arrays**: Mark arrays and objects as `readonly` in interfaces and function parameters + +### Import Restrictions + +- **Never import `ipcRenderer` directly** from `electron` or `electron/renderer` - use `import * as ipcRenderer from 'ipc-renderer'` for strongly typed IPC methods +- **Never import `ipcMain` directly** from `electron` or `electron/main` - use `import * as ipcMain from 'ipc-main'` for strongly typed IPC methods + +### Code Quality + +- **Curly braces**: Always use curly braces for control structures +- **Strict equality**: Use `===` and `!==` (smart equality checking allowed) +- **No `eval`**: Never use `eval()` +- **No `var`**: Use `const` or `let` +- **Async operations**: Use async/await, avoid synchronous Node.js APIs in application code (use `Sync` suffix when necessary) +- **For scripts**: Synchronous APIs are preferred for readability + +### Documentation + +- **Use JSDoc format** for documentation with `/**` opener (exactly two stars) +- **Document public APIs**: All public classes, methods, and properties should have JSDoc comments +- **Format**: Use a short title line followed by blank line before detailed description +- **AppStore methods**: Internal methods called by Dispatcher should be prefixed with `_` and include comment: `/** This shouldn't be called directly. See 'Dispatcher'. */` + +### ESLint Rules + +The codebase uses comprehensive ESLint rules. Key custom rules: +- `insecure-random`: Prevents use of insecure random number generation +- `react-no-unbound-dispatcher-props`: Enforces proper dispatcher prop handling +- `react-readonly-props-and-state`: Prevents mutation of React props and state +- `react-proper-lifecycle-methods`: Enforces correct React lifecycle usage +- `no-loosely-typed-webcontents-ipc`: Ensures type-safe IPC communication + +## Building & Testing + +### Development Workflow + +```bash +# Install dependencies +yarn + +# Development build +yarn build:dev + +# Start the application (changes compile in background, reload with Ctrl/Cmd+Alt+R) +yarn start + +# Production build +yarn build:prod + +# Clean rebuild +yarn clean-slate && yarn build:dev +``` + +### Testing + +```bash +# Run all unit tests +yarn test + +# Run specific test file +yarn test + +# Run tests in directory +yarn test + +# Run tests matching pattern +yarn test --test-name-pattern + +# Run script tests +yarn test:script + +# Run ESLint tests +yarn test:eslint +``` + +**Test Conventions**: +- Use Node.js built-in test runner (not Jest or Mocha) +- Test files should be in `app/test/unit/` directory +- Use `.ts` or `.tsx` extensions +- Synchronous methods are acceptable in tests for readability + +### Linting + +```bash +# Run all linters +yarn lint + +# Fix auto-fixable issues +yarn lint:fix + +# Lint source code +yarn lint:src + +# Check Markdown files +yarn markdownlint + +# Format with Prettier +yarn prettier + +# Fix Prettier issues +yarn prettier --write +``` + +## Security & Quality + +### Security + +- **Never commit secrets, passwords, or sensitive data** +- **Validate and sanitize user input** +- **Use secure cookie settings**: Set `httpOnly`, `secure`, and `sameSite: strict` for cookies +- **Follow secure coding practices**: Review code for XSS, injection, and other vulnerabilities +- **Report security issues**: Use private vulnerability reporting, not public issues + +### Git Practices + +- **No force push**: Repository does not support `git reset` or `git rebase` with force push +- **Follow commit message conventions**: Clear, descriptive commit messages +- **Reference issues**: Include issue numbers in commits when applicable + +## Project Structure + +- **`app/`**: Application source code and assets + - `app/src/`: TypeScript source files + - `app/test/`: Test files + - `app/static/`: Static assets + - `app/styles/`: SASS stylesheets +- **`script/`**: Build and utility scripts +- **`docs/`**: Documentation + - `docs/contributing/`: Contributor guides + - `docs/process/`: Process documentation + - `docs/technical/`: Technical documentation +- **`eslint-rules/`**: Custom ESLint rules +- **`.github/`**: GitHub-specific files (workflows, issue templates, contributing guide) + +## Development Tips + +- **Use the Dispatcher**: Route state-changing interactions through the `Dispatcher` to the `AppStore` +- **Avoid direct AppStore manipulation**: Methods in AppStore should be called via Dispatcher +- **Leverage TypeScript**: Use type system for compile-time verification of exhaustiveness and correctness +- **React Dev Tools**: Automatically available in development mode +- **Debugging**: Use Chrome Dev Tools (View → Toggle Developer Tools) +- **Hot reload**: Press Ctrl/Cmd+Alt+R to reload the app after changes + +## Contributing + +- See [CONTRIBUTING.md](.github/CONTRIBUTING.md) for detailed contribution guidelines +- Follow the [Engineering Values](docs/contributing/engineering-values.md) +- Check [help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22) label for good first issues +- Review [Style Guide](docs/contributing/styleguide.md) before submitting code +- Setup instructions: [docs/contributing/setup.md](docs/contributing/setup.md) + +## Code of Conduct + +This project adheres to the Contributor Covenant Code of Conduct. All interactions must be respectful and professional. + +## Resources + +- [Official website](https://desktop.github.com) +- [Getting started docs](https://docs.github.com/en/desktop/overview/getting-started-with-github-desktop) +- [Release notes](https://desktop.github.com/release-notes/) +- [Known issues](docs/known-issues.md) + +## When Making Changes + +1. **Keep changes minimal**: Make the smallest possible changes to achieve the goal +2. **Run tests frequently**: Test after each meaningful change +3. **Lint before committing**: Ensure code passes all linting checks +4. **Update documentation**: Update docs if changes affect documented behavior +5. **Follow existing patterns**: Match the style and patterns already in the codebase +6. **Don't remove working code**: Only modify what's necessary for the task +7. **Verify in the running app**: Build and run the application to manually verify changes work as expected From 647c5b940d7061cb8c72e248a16ef58e69e041ba Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Nov 2025 11:51:52 +0100 Subject: [PATCH 0664/1338] Use ubuntu-slim for automation workflows --- .github/workflows/feature-request-comment.yml | 2 +- .github/workflows/on-issue-close.yml | 2 +- .github/workflows/pr-is-external.yml | 2 +- .github/workflows/release-pr.yml | 2 +- .github/workflows/remove-triage-label.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/triage-issues.yml | 4 ++-- .github/workflows/unable-to-reproduce-comment.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/feature-request-comment.yml b/.github/workflows/feature-request-comment.yml index 9c65d4cc9c8..45a3f69deed 100644 --- a/.github/workflows/feature-request-comment.yml +++ b/.github/workflows/feature-request-comment.yml @@ -10,7 +10,7 @@ permissions: jobs: add-comment-to-feature-request-issues: if: github.event.label.name == 'feature-request' - runs-on: ubuntu-latest + runs-on: ubuntu-slim env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_REPO: ${{ github.repository }} diff --git a/.github/workflows/on-issue-close.yml b/.github/workflows/on-issue-close.yml index e768226d088..ab0f1c01e64 100644 --- a/.github/workflows/on-issue-close.yml +++ b/.github/workflows/on-issue-close.yml @@ -5,7 +5,7 @@ on: - closed jobs: label_issues: - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: issues: write steps: diff --git a/.github/workflows/pr-is-external.yml b/.github/workflows/pr-is-external.yml index 55355c65cba..1e4de067644 100644 --- a/.github/workflows/pr-is-external.yml +++ b/.github/workflows/pr-is-external.yml @@ -9,7 +9,7 @@ jobs: label_issues: # pull_request.head.label = {owner}:{branch} if: startsWith(github.event.pull_request.head.label, 'desktop:') == false - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: pull-requests: write repository-projects: read diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index f03f1f074f3..5f1cba58558 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -5,7 +5,7 @@ on: create jobs: build: name: Create Release Pull Request - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: pull-requests: write steps: diff --git a/.github/workflows/remove-triage-label.yml b/.github/workflows/remove-triage-label.yml index b4834e051d4..eec13793963 100644 --- a/.github/workflows/remove-triage-label.yml +++ b/.github/workflows/remove-triage-label.yml @@ -12,7 +12,7 @@ jobs: if: github.event.label.name != 'triage' && github.event.label.name != 'more-info-needed' - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - run: gh issue edit "$NUMBER" --remove-label "$LABELS" env: diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 9c8ebbd91a5..838ad6f68e8 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -8,7 +8,7 @@ permissions: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - uses: actions/stale@v9 with: diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml index f73bb297a68..60594cb4d31 100644 --- a/.github/workflows/triage-issues.yml +++ b/.github/workflows/triage-issues.yml @@ -11,7 +11,7 @@ permissions: jobs: label_incoming_issues: - runs-on: ubuntu-latest + runs-on: ubuntu-slim if: github.event.action == 'opened' || github.event.action == 'reopened' steps: - run: gh issue edit "$NUMBER" --add-label "$LABELS" @@ -24,7 +24,7 @@ jobs: if: github.event.action == 'unlabeled' && github.event.label.name == 'more-info-needed' - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - run: gh issue edit "$NUMBER" --add-label "$LABELS" env: diff --git a/.github/workflows/unable-to-reproduce-comment.yml b/.github/workflows/unable-to-reproduce-comment.yml index 9c13e43ee4c..9f0fb605056 100644 --- a/.github/workflows/unable-to-reproduce-comment.yml +++ b/.github/workflows/unable-to-reproduce-comment.yml @@ -10,7 +10,7 @@ permissions: jobs: add-comment-to-unable-to-reproduce-issues: if: github.event.label.name == 'unable-to-reproduce' - runs-on: ubuntu-latest + runs-on: ubuntu-slim env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_REPO: ${{ github.repository }} From af1d980fd6463b949f69a5bf7e25d2bb4d52d713 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Nov 2025 13:16:14 +0100 Subject: [PATCH 0665/1338] Update coding and contribution guidelines Revised runtime, package manager, and Node.js version requirements. Clarified TypeScript style, import restrictions, and testing practices. Removed outdated instructions and added context for code style and conventions. --- .github/copilot-instructions.md | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 6b7287ba6c8..06c0d5f180d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -6,16 +6,19 @@ This repository contains GitHub Desktop, an open-source Electron-based GitHub ap - **Language**: TypeScript (strict mode enabled) - **UI Framework**: React 16.x -- **Runtime**: Electron 38.x +- **Runtime**: Electron > 38.x (see `.npmrc` for specific version) - **Build Tool**: Webpack with parallel builds -- **Package Manager**: Yarn (>= 1.9) -- **Node Version**: >= 10 (see `.node-version` for specific version) -- **Testing**: Node.js built-in test runner +- **Package Manager**: Yarn (>= 1.21.1) +- **Node Version**: >= 22 (see `.nvmrc` for specific version) +- **Testing**: Node.js built-in test runner (run using `yarn test`, optionally providing one or more test files e.g `yarn test app/test/unit/repository-list-test.ts`) ## Code Style & Conventions +GitHub Desktop has been developed for many years through many iterations of technologies and coding styles, there may be conflicting styles in different parts of the codebase. When contributing new code or refactoring existing code, please follow the conventions outlined below. + ### TypeScript Style +- Avoid creating new classes unless necessary; prefer functions and interfaces/types, sticking to more idiomatic TypeScript/JavaScript patterns. - **Use strict TypeScript** with all strict mode checks enabled - **Naming conventions**: - PascalCase for classes @@ -23,8 +26,9 @@ This repository contains GitHub Desktop, an open-source Electron-based GitHub ap - Interfaces MUST start with `I` prefix (e.g., `IRepository`, `ICommit`) - Avoid reserved keywords as variable names (`any`, `Number`, `String`, `Boolean`, `Undefined`, etc.) - **Type safety**: - - Prefer `as` for type assertions - - Use the `assertNever` helper for exhaustiveness checks in switch statements + - Avoid using `as` for type assertions, prefer proper type narrowing and guards. + - Use the `assertNever` helper (from `app/src/lib/fatal-error.ts`) for exhaustiveness checks in switch statements or conditional logic + - Avoid non-null assertions (`!`) unless absolutely necessary - Write custom type definitions when none exist - Avoid `any` unless absolutely necessary - **Member ordering in classes**: @@ -55,8 +59,8 @@ This repository contains GitHub Desktop, an open-source Electron-based GitHub ap ### Import Restrictions -- **Never import `ipcRenderer` directly** from `electron` or `electron/renderer` - use `import * as ipcRenderer from 'ipc-renderer'` for strongly typed IPC methods -- **Never import `ipcMain` directly** from `electron` or `electron/main` - use `import * as ipcMain from 'ipc-main'` for strongly typed IPC methods +- **Never import `ipcRenderer` directly** from `electron` or `electron/renderer` - use `import * as ipcRenderer from 'ipc-renderer'` (app/src/lib/ipc-renderer.ts) for strongly typed IPC methods +- **Never import `ipcMain` directly** from `electron` or `electron/main` - use `import * as ipcMain from 'ipc-main'` (app/src/lib/ipc-main.ts) for strongly typed IPC methods ### Code Quality @@ -65,7 +69,6 @@ This repository contains GitHub Desktop, an open-source Electron-based GitHub ap - **No `eval`**: Never use `eval()` - **No `var`**: Use `const` or `let` - **Async operations**: Use async/await, avoid synchronous Node.js APIs in application code (use `Sync` suffix when necessary) -- **For scripts**: Synchronous APIs are preferred for readability ### Documentation @@ -116,9 +119,6 @@ yarn test # Run tests in directory yarn test -# Run tests matching pattern -yarn test --test-name-pattern - # Run script tests yarn test:script @@ -130,7 +130,7 @@ yarn test:eslint - Use Node.js built-in test runner (not Jest or Mocha) - Test files should be in `app/test/unit/` directory - Use `.ts` or `.tsx` extensions -- Synchronous methods are acceptable in tests for readability +- Avoid synchronous tests; use async/await. ### Linting @@ -160,13 +160,11 @@ yarn prettier --write - **Never commit secrets, passwords, or sensitive data** - **Validate and sanitize user input** -- **Use secure cookie settings**: Set `httpOnly`, `secure`, and `sameSite: strict` for cookies - **Follow secure coding practices**: Review code for XSS, injection, and other vulnerabilities - **Report security issues**: Use private vulnerability reporting, not public issues ### Git Practices -- **No force push**: Repository does not support `git reset` or `git rebase` with force push - **Follow commit message conventions**: Clear, descriptive commit messages - **Reference issues**: Include issue numbers in commits when applicable @@ -221,4 +219,3 @@ This project adheres to the Contributor Covenant Code of Conduct. All interactio 4. **Update documentation**: Update docs if changes affect documented behavior 5. **Follow existing patterns**: Match the style and patterns already in the codebase 6. **Don't remove working code**: Only modify what's necessary for the task -7. **Verify in the running app**: Build and run the application to manually verify changes work as expected From 387eb3af1bd0b188ba5db395d24c5db29942d927 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 24 Nov 2025 13:17:20 +0100 Subject: [PATCH 0666/1338] Update TypeScript style guide to discourage enums Added a guideline to prefer union types of string literals over enums in the TypeScript style section for more idiomatic code. --- .github/copilot-instructions.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 06c0d5f180d..aa14592b9d5 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -19,6 +19,7 @@ GitHub Desktop has been developed for many years through many iterations of tech ### TypeScript Style - Avoid creating new classes unless necessary; prefer functions and interfaces/types, sticking to more idiomatic TypeScript/JavaScript patterns. +- Avoid using enums; prefer union types of string literals instead. - **Use strict TypeScript** with all strict mode checks enabled - **Naming conventions**: - PascalCase for classes From 8c83eec57d0960251d7bec4072b3634a57860a86 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Nov 2025 10:44:43 +0100 Subject: [PATCH 0667/1338] Update type for onShowCommitProgress prop Refines the type of the onShowCommitProgress prop to explicitly allow undefined, improving type clarity in IFilterChangesListProps. --- app/src/ui/changes/filter-changes-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index c56e9981cea..108654457f7 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -159,7 +159,7 @@ interface IFilterChangesListProps { readonly availableWidth: number readonly isCommitting: boolean readonly hookProgress: HookProgress | null - readonly onShowCommitProgress?: () => void + readonly onShowCommitProgress?: (() => void) | undefined readonly isGeneratingCommitMessage: boolean readonly shouldShowGenerateCommitMessageCallOut: boolean readonly commitToAmend: Commit | null From 828ee6cbd17fe0effd2ee315814ecdd29d19d699 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Nov 2025 13:12:02 +0100 Subject: [PATCH 0668/1338] Initial wire-up of preferences --- app/src/ui/preferences/git.tsx | 192 +++++++++++++++++++--- app/src/ui/preferences/preferences.tsx | 8 + app/styles/_ui.scss | 1 + app/styles/ui/_call-to-action-bubble.scss | 11 ++ app/styles/ui/_preferences.scss | 22 ++- 5 files changed, 213 insertions(+), 21 deletions(-) create mode 100644 app/styles/ui/_call-to-action-bubble.scss diff --git a/app/src/ui/preferences/git.tsx b/app/src/ui/preferences/git.tsx index e51b053ef3f..163734b67f7 100644 --- a/app/src/ui/preferences/git.tsx +++ b/app/src/ui/preferences/git.tsx @@ -5,6 +5,10 @@ import { Ref } from '../lib/ref' import { LinkButton } from '../lib/link-button' import { Account } from '../../models/account' import { GitConfigUserForm } from '../lib/git-config-user-form' +import { TabBar } from '../tab-bar' +import { ISegmentedItem } from '../lib/vertical-segmented-control' +import { Checkbox, CheckboxValue } from '../lib/checkbox' +import { Select } from '../lib/select' interface IGitProps { readonly name: string @@ -19,28 +23,172 @@ interface IGitProps { readonly onDefaultBranchChanged: (defaultBranch: string) => void readonly onEditGlobalGitConfig: () => void + + readonly selectedTabIndex?: number + readonly onSelectedTabIndexChanged: (index: number) => void +} + +interface IGitState { + readonly selectedTabIndex: number + readonly enableGitHookEnv: boolean + readonly cacheGitHookEnv: boolean + readonly selectedShell: string } -export class Git extends React.Component { +const windowsShells: ReadonlyArray> = [ + { + key: 'g4w-bash', + title: 'Git Bash (Git for Windows)', + }, + { + key: 'pwsh', + title: 'PowerShell Core', + }, + { + key: 'powershell', + title: 'PowerShell', + }, + { + key: 'cmd', + title: 'Command Prompt', + }, +] + +export class Git extends React.Component { + public constructor(props: IGitProps) { + super(props) + + this.state = { + selectedTabIndex: this.props.selectedTabIndex ?? 0, + enableGitHookEnv: false, // TODO: load from props + cacheGitHookEnv: false, // TODO: load from props + selectedShell: windowsShells[0].key, // TODO: load from props + } + } + + private onTabClicked = (index: number) => { + this.setState({ selectedTabIndex: index }) + this.props.onSelectedTabIndexChanged?.(index) + } + + private onEnableGitHookEnvChanged = ( + event: React.FormEvent + ) => { + this.setState({ enableGitHookEnv: event.currentTarget.checked }) + } + + private onCacheGitHookEnvChanged = ( + event: React.FormEvent + ) => { + this.setState({ cacheGitHookEnv: event.currentTarget.checked }) + } + + private onSelectedShellChanged = ( + event: React.FormEvent + ) => { + this.setState({ selectedShell: event.currentTarget.value }) + } + + private renderHooksSettings() { + return ( + <> + +

    + When enabled, GitHub Desktop will attempt to load environment + variables from your shell when executing Git hooks. This is useful if + your Git hooks depend on environment variables set in your shell + configuration files, a common practive for version managers such as + nvm, rbenv, asdf, etc. +

    + + {this.state.enableGitHookEnv && __WIN32__ && ( + <> + + + )} + + {this.state.enableGitHookEnv && ( + <> + + +
    + Cache hook environment variables to improve performance. Disable + if your hooks rely on frequently changing environment variables. +
    + + )} + + ) + } + public render() { return ( - - {this.renderGitConfigAuthorInfo()} - {this.renderDefaultBranchSetting()} + + + Author + Default branch + Hooks + +
    {this.renderCurrentTab()}
     ) } + private renderCurrentTab() { + if (this.state.selectedTabIndex === 0) { + return this.renderGitConfigAuthorInfo() + } else if (this.state.selectedTabIndex === 1) { + return this.renderDefaultBranchSetting() + } else if (this.state.selectedTabIndex === 2) { + return this.renderHooksSettings() + } + + return null + } + private renderGitConfigAuthorInfo() { return ( - + <> + + {this.renderEditGlobalGitConfigInfo()} + ) } @@ -65,14 +213,20 @@ export class Git extends React.Component { still require the historical default branch name of master.

    -

    - These preferences will{' '} - - edit your global Git config file - - . -

    + {this.renderEditGlobalGitConfigInfo()}
    ) } + + private renderEditGlobalGitConfigInfo() { + return ( +

    + These preferences will{' '} + + edit your global Git config file + + . +

    + ) + } } diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx index 5fadb15e0d8..c467aefbb0f 100644 --- a/app/src/ui/preferences/preferences.tsx +++ b/app/src/ui/preferences/preferences.tsx @@ -134,6 +134,8 @@ interface IPreferencesState { readonly underlineLinks: boolean readonly showDiffCheckMarks: boolean + + readonly selectedGitTabIndex?: number } /** @@ -387,6 +389,10 @@ export class Preferences extends React.Component< } } + private onSelectedGitTabIndexChanged = (index: number) => { + this.setState({ selectedGitTabIndex: index }) + } + private renderActiveTab() { const index = this.state.selectedIndex let View @@ -448,6 +454,8 @@ export class Preferences extends React.Component< onDefaultBranchChanged={this.onDefaultBranchChanged} isLoadingGitConfig={this.state.isLoadingGitConfig} onEditGlobalGitConfig={this.props.onEditGlobalGitConfig} + selectedTabIndex={this.state.selectedGitTabIndex} + onSelectedTabIndexChanged={this.onSelectedGitTabIndexChanged} /> ) diff --git a/app/styles/_ui.scss b/app/styles/_ui.scss index 5da446f7503..bc19e0569be 100644 --- a/app/styles/_ui.scss +++ b/app/styles/_ui.scss @@ -110,3 +110,4 @@ @import 'ui/_input-description'; @import 'ui/repository-rules/_repo-rules-failure-list'; @import 'ui/account-picker'; +@import 'ui/call-to-action-bubble'; diff --git a/app/styles/ui/_call-to-action-bubble.scss b/app/styles/ui/_call-to-action-bubble.scss new file mode 100644 index 00000000000..dfdd57b1cd2 --- /dev/null +++ b/app/styles/ui/_call-to-action-bubble.scss @@ -0,0 +1,11 @@ +.call-to-action-bubble { + font-weight: var(--font-weight-semibold); + display: inline-block; + font-size: var(--font-size-xs); + border: 1px solid var(--call-to-action-bubble-border-color); + color: var(--call-to-action-bubble-color); + padding: 1px 5px; + border-radius: var(--border-radius); + margin-left: var(--spacing-third); + cursor: pointer; +} diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss index 244442c45b7..59b7aefdd10 100644 --- a/app/styles/ui/_preferences.scss +++ b/app/styles/ui/_preferences.scss @@ -1,4 +1,24 @@ #preferences { + .dialog-content.git-preferences { + padding: 0; + + .git-preferences-content { + padding: var(--spacing-double); + } + + .git-hook-shell-select { + margin-bottom: var(--spacing); + } + + .git-hooks-support-description, + .git-hooks-env-description, + .git-hooks-cache-description { + margin-top: var(--spacing); + font-size: var(--font-size-sm); + color: var(--text-secondary-color); + } + } + .preferences-container { display: flex; .tab-container { @@ -109,8 +129,6 @@ } .default-branch-component { - margin-top: var(--spacing-double); - .ref-name-text-box { margin-top: var(--spacing); } From edd75fe58978dc4c8a9d1b582dd6b2322c0135bb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Nov 2025 13:16:51 +0100 Subject: [PATCH 0669/1338] Apparently this is what it's called? https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_powershell_editions?view=powershell-7.5 --- app/src/ui/preferences/git.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/ui/preferences/git.tsx b/app/src/ui/preferences/git.tsx index 163734b67f7..4295a8ec3ef 100644 --- a/app/src/ui/preferences/git.tsx +++ b/app/src/ui/preferences/git.tsx @@ -46,7 +46,7 @@ const windowsShells: ReadonlyArray> = [ }, { key: 'powershell', - title: 'PowerShell', + title: 'PowerShell Desktop', }, { key: 'cmd', From 75b271362a5802ee80b7e06178f260861a874761 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 25 Nov 2025 16:17:29 +0100 Subject: [PATCH 0670/1338] Add and integrate Git hooks environment settings Introduces configuration utilities for Git hooks environment in a new config module, adds shell selection and caching options, and wires these settings into the preferences UI. Refactors related hooks logic to use the new config, and updates state management for preferences. Also adds a memoized setState utility for React components. --- app/src/lib/hooks/config.ts | 29 +++++++++ app/src/lib/hooks/get-shell-env.ts | 15 +++-- app/src/lib/hooks/get-shell.ts | 86 ++++++++++++++++++-------- app/src/lib/hooks/shell-escape.ts | 56 ++++++++++++----- app/src/lib/hooks/with-hooks-env.ts | 4 +- app/src/lib/set-state.ts | 36 +++++++++++ app/src/ui/preferences/git.tsx | 45 ++++++-------- app/src/ui/preferences/preferences.tsx | 52 ++++++++++++++++ 8 files changed, 251 insertions(+), 72 deletions(-) create mode 100644 app/src/lib/hooks/config.ts create mode 100644 app/src/lib/set-state.ts diff --git a/app/src/lib/hooks/config.ts b/app/src/lib/hooks/config.ts new file mode 100644 index 00000000000..8a602fd77c0 --- /dev/null +++ b/app/src/lib/hooks/config.ts @@ -0,0 +1,29 @@ +import { enableHooksEnvironment } from '../feature-flag' +import { getBoolean, setBoolean } from '../local-storage' + +export const defaultHooksEnvEnabledValue = false + +/** + * Whether the hooks environment is enabled, takes into account the + * `enableHooksEnvironment` feature flag. + */ +export const getHooksEnvEnabled = () => + enableHooksEnvironment() && + getBoolean('git-hooks-env-enabled', defaultHooksEnvEnabledValue) + +export const setHooksEnvEnabled = (enabled: boolean): void => + setBoolean('git-hooks-env-enabled', enabled) + +export const defaultCacheHooksEnvValue = true +export const getCacheHooksEnv = () => + getBoolean('git-cache-hooks-env', defaultCacheHooksEnvValue) +export const setCacheHooksEnv = (enabled: boolean): void => + setBoolean('git-cache-hooks-env', enabled) + +export const defaultGitHookEnvShell: SupportedHooksEnvShell = 'cmd' +export const getGitHookEnvShell = () => + localStorage.getItem('git-hook-env-shell') ?? defaultGitHookEnvShell +export const setGitHookEnvShell = (shell: string) => + localStorage.setItem('git-hook-env-shell', shell) + +export type SupportedHooksEnvShell = 'g4w-bash' | 'pwsh' | 'powershell' | 'cmd' diff --git a/app/src/lib/hooks/get-shell-env.ts b/app/src/lib/hooks/get-shell-env.ts index fedade6d3ef..69e3987c42b 100644 --- a/app/src/lib/hooks/get-shell-env.ts +++ b/app/src/lib/hooks/get-shell-env.ts @@ -1,15 +1,22 @@ import { join } from 'path' import { getShell } from './get-shell' import { spawn } from 'child_process' +import { SupportedHooksEnvShell } from './config' -export const getShellEnv = async (): Promise< - Record -> => { +export const getShellEnv = async ( + shellKind?: SupportedHooksEnvShell +): Promise> => { const ext = __WIN32__ ? '.exe' : '' const printenvzPath = join(__dirname, `printenvz${ext}`) + const shellInfo = await getShell(shellKind) + + if (!shellInfo) { + throw new Error('Could not determine shell to use for loading environment') + } + const { shell, args, quoteCommand, windowsVerbatimArguments, argv0 } = - await getShell() + shellInfo return await new Promise((resolve, reject) => { const child = spawn(shell, [...args, quoteCommand(printenvzPath)], { diff --git a/app/src/lib/hooks/get-shell.ts b/app/src/lib/hooks/get-shell.ts index ad3b95f9a8d..1a36fde3102 100644 --- a/app/src/lib/hooks/get-shell.ts +++ b/app/src/lib/hooks/get-shell.ts @@ -1,7 +1,9 @@ import { pathExists } from 'fs-extra' import { join } from 'path' import which from 'which' -import { bash, cmd } from './shell-escape' +import { bash, cmd, powershell } from './shell-escape' +import { SupportedHooksEnvShell } from './config' +import { assertNever } from '../fatal-error' type Shell = { shell: string @@ -31,33 +33,36 @@ const quoteArgMsys2 = (arg: string) => { return /[\s\\"'{?*~]/.test(arg) ? `"${arg.replace(/(["\\])/g, '\\$1')}"` : arg } -const findWindowsShell = async (): Promise => { +const findGitBashShell = async (): Promise => { const gitBashPath = await findGitBash() - if (gitBashPath) { - const { args, quoteCommand } = bash - return { - shell: gitBashPath, - args, - quoteCommand: (cmd, ...args) => quoteArgMsys2(quoteCommand(cmd, ...args)), - // MSYS2 doesn't use the argv it's given, instead it re-parses the - // commandline from GetCommandLineW and it doesn't comform to the - // usual Windows quoting rules. So we need to opt out of Node.js's - // quoting behavior and do it ourselves. - // - // See https://github.com/git-for-windows/git/commit/9e9da23c27650 - windowsVerbatimArguments: true, - // With windowsVerbatimArguments set to true the filename passed to - // spawn won't get quoted by Node.js so he msys2 custom argument parser - // will blow up so we'll just hardcode argv[0] as bash.exe which is - // what it would be set to if a user ran bash.exe in a terminal and it - // was on PATH. The technically correct way would be to set quote it - // as msys2 expects it to be quoted but I'm too deep into Dantes nine - // circles of quoting already. - argv0: 'bash.exe', - } + if (!gitBashPath) { + return undefined } + const { args, quoteCommand } = bash + return { + shell: gitBashPath, + args, + quoteCommand: (cmd, ...args) => quoteArgMsys2(quoteCommand(cmd, ...args)), + // MSYS2 doesn't use the argv it's given, instead it re-parses the + // commandline from GetCommandLineW and it doesn't comform to the + // usual Windows quoting rules. So we need to opt out of Node.js's + // quoting behavior and do it ourselves. + // + // See https://github.com/git-for-windows/git/commit/9e9da23c27650 + windowsVerbatimArguments: true, + // With windowsVerbatimArguments set to true the filename passed to + // spawn won't get quoted by Node.js so he msys2 custom argument parser + // will blow up so we'll just hardcode argv[0] as bash.exe which is + // what it would be set to if a user ran bash.exe in a terminal and it + // was on PATH. The technically correct way would be to set quote it + // as msys2 expects it to be quoted but I'm too deep into Dantes nine + // circles of quoting already. + argv0: 'bash.exe', + } +} +const findCmdShell = async (): Promise => { const { COMSPEC } = process.env // https://github.com/nodejs/node/blob/5f77aebdfb3ea4d60cda79045d29afb244d6bcb1/lib/child_process.js#L660C31-L660C58 const shell = @@ -66,9 +71,38 @@ const findWindowsShell = async (): Promise => { return { shell, args, quoteCommand } } -export const getShell = async (): Promise => { +const findPowerShellShell = async ( + shellKind: Extract +): Promise => { + const pwshPath = await which(`${shellKind}.exe`, { nothrow: true }) + if (!pwshPath) { + return undefined + } + const { args, quoteCommand } = powershell + return { shell: pwshPath, args, quoteCommand } +} + +const findWindowsShell = async ( + shellKind: SupportedHooksEnvShell = 'cmd' +): Promise => { + switch (shellKind) { + case 'g4w-bash': + return findGitBashShell() + case 'powershell': + case 'pwsh': + return findPowerShellShell(shellKind) + case 'cmd': + return findCmdShell() + default: + return assertNever(shellKind, `Unsupported shell kind: ${shellKind}`) + } +} + +export const getShell = async ( + shellKind?: SupportedHooksEnvShell +): Promise => { if (__WIN32__) { - return findWindowsShell() + return findWindowsShell(shellKind) } // For our purposes quoting using bash rules should be sufficient, diff --git a/app/src/lib/hooks/shell-escape.ts b/app/src/lib/hooks/shell-escape.ts index 237ba49a2d0..39d69660309 100644 --- a/app/src/lib/hooks/shell-escape.ts +++ b/app/src/lib/hooks/shell-escape.ts @@ -4,13 +4,17 @@ type Shell = { } // https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/unix/bash.js#L39 -const bashEscape = (arg: string) => arg - .replace(/[\0\u0008\u001B\u009B]/gu, "") - .replace(/\r(?!\n)/gu, "") - .replace(/'/gu, "'\\''"); +const bashEscape = (arg: string) => + arg + .replace(/[\0\u0008\u001B\u009B]/gu, '') + .replace(/\r(?!\n)/gu, '') + .replace(/'/gu, "'\\''") -const shQuoteCommand = (escapeFn: (arg: string) => string, cmd: string, ...args: string[]) => - [cmd, ...args].map(a => `'${escapeFn(a)}'`).join(' '); +const shQuoteCommand = ( + escapeFn: (arg: string) => string, + cmd: string, + ...args: string[] +) => [cmd, ...args].map(a => `'${escapeFn(a)}'`).join(' ') export const bash: Shell = { args: ['-ilc'], @@ -27,16 +31,40 @@ export const zsh: Shell = { } // https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/win/cmd.js#L35 -const cmdEscape = (arg: string) => arg - .replace(/[\0\u0008\r\u001B\u009B]/gu, "") - .replace(/\n/gu, " ") - .replace(/"/gu, '""') - .replace(/([%&<>^|])/gu, '"^$1"') - .replace(/(? + arg + .replace(/[\0\u0008\r\u001B\u009B]/gu, '') + .replace(/\n/gu, ' ') + .replace(/"/gu, '""') + .replace(/([%&<>^|])/gu, '"^$1"') + .replace(/(? - `"${[cmd, ...args].map(a => `"${cmdEscape(a)}"`).join(' ')}"` - , + `"${[cmd, ...args].map(a => `"${cmdEscape(a)}"`).join(' ')}"`, +} + +// https://github.com/ericcornelissen/shescape/blob/89072ba7de233f81f5553b52098671c94eb9bd0c/src/internal/win/powershell.js#L50 +const powershellEscape = (arg: string) => { + arg = arg + .replace(/[\0\u0008\u001B\u009B]/gu, '') + .replace(/\r(?!\n)/gu, '') + .replace(/(['‘’‚‛])/gu, '$1$1') + + if (/[\s\u0085]/u.test(arg)) { + arg = arg + .replace(/(? + `& {${[cmd, ...args].map(a => `'${powershellEscape(a)}'`).join(' ')}}`, } diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index ce2c23a135a..d49102c529c 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -3,19 +3,19 @@ import { AddressInfo } from 'net' import { tmpdir } from 'os' import { join } from 'path' import { createProxyProcessServer } from 'process-proxy' -import { enableHooksEnvironment } from '../feature-flag' import type { IGitExecutionOptions } from '../git/core' import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' import { getShellEnv } from './get-shell-env' import memoizeOne from 'memoize-one' +import { getHooksEnvEnabled } from './config' export async function withHooksEnv( fn: (env: Record | undefined) => Promise, path: string, opts: IGitExecutionOptions | undefined ): Promise { - if (!opts?.interceptHooks || !enableHooksEnvironment()) { + if (!opts?.interceptHooks || !getHooksEnvEnabled()) { return fn(opts?.env) } diff --git a/app/src/lib/set-state.ts b/app/src/lib/set-state.ts new file mode 100644 index 00000000000..724f692d89b --- /dev/null +++ b/app/src/lib/set-state.ts @@ -0,0 +1,36 @@ +const componentCache = new WeakMap< + React.Component, + Map void> +>() + +/** + * Returns a memoized setter for a specific state key of a React component + * + * This can safely be used in event handlers to avoid creating new + * closures on each render. + */ +export function setState( + component: T, + stateKey: K +) { + let setters = componentCache.get(component) + + if (!setters) { + setters = new Map() + componentCache.set(component, setters) + } + + const cachedSetter = setters.get(stateKey as string) + + if (cachedSetter) { + return cachedSetter + } + + const setter = (value: T['state'][K]) => { + component.setState({ [stateKey]: value }) + } + + setters.set(stateKey as string, setter) + + return setter +} diff --git a/app/src/ui/preferences/git.tsx b/app/src/ui/preferences/git.tsx index 4295a8ec3ef..205292d7a2f 100644 --- a/app/src/ui/preferences/git.tsx +++ b/app/src/ui/preferences/git.tsx @@ -26,10 +26,11 @@ interface IGitProps { readonly selectedTabIndex?: number readonly onSelectedTabIndexChanged: (index: number) => void -} -interface IGitState { - readonly selectedTabIndex: number + readonly onEnableGitHookEnvChanged: (enableGitHookEnv: boolean) => void + readonly onCacheGitHookEnvChanged: (cacheGitHookEnv: boolean) => void + readonly onSelectedShellChanged: (selectedShell: string) => void + readonly enableGitHookEnv: boolean readonly cacheGitHookEnv: boolean readonly selectedShell: string @@ -54,39 +55,31 @@ const windowsShells: ReadonlyArray> = [ }, ] -export class Git extends React.Component { - public constructor(props: IGitProps) { - super(props) - - this.state = { - selectedTabIndex: this.props.selectedTabIndex ?? 0, - enableGitHookEnv: false, // TODO: load from props - cacheGitHookEnv: false, // TODO: load from props - selectedShell: windowsShells[0].key, // TODO: load from props - } +export class Git extends React.Component { + private get selectedTabIndex() { + return this.props.selectedTabIndex ?? 0 } private onTabClicked = (index: number) => { - this.setState({ selectedTabIndex: index }) this.props.onSelectedTabIndexChanged?.(index) } private onEnableGitHookEnvChanged = ( event: React.FormEvent ) => { - this.setState({ enableGitHookEnv: event.currentTarget.checked }) + this.props.onEnableGitHookEnvChanged(event.currentTarget.checked) } private onCacheGitHookEnvChanged = ( event: React.FormEvent ) => { - this.setState({ cacheGitHookEnv: event.currentTarget.checked }) + this.props.onCacheGitHookEnvChanged(event.currentTarget.checked) } private onSelectedShellChanged = ( event: React.FormEvent ) => { - this.setState({ selectedShell: event.currentTarget.value }) + this.props.onSelectedShellChanged(event.currentTarget.value) } private renderHooksSettings() { @@ -96,7 +89,7 @@ export class Git extends React.Component { label="Load Git hook environment variables from shell" ariaDescribedBy="git-hooks-env-description" value={ - this.state.enableGitHookEnv ? CheckboxValue.On : CheckboxValue.Off + this.props.enableGitHookEnv ? CheckboxValue.On : CheckboxValue.Off } onChange={this.onEnableGitHookEnvChanged} /> @@ -108,12 +101,12 @@ export class Git extends React.Component { nvm, rbenv, asdf, etc.

    - {this.state.enableGitHookEnv && __WIN32__ && ( + {this.props.enableGitHookEnv && __WIN32__ && ( <> )} diff --git a/app/src/ui/preferences/preferences.tsx b/app/src/ui/preferences/preferences.tsx index 18886493a17..f0a2b209fac 100644 --- a/app/src/ui/preferences/preferences.tsx +++ b/app/src/ui/preferences/preferences.tsx @@ -48,6 +48,7 @@ import { isValidCustomIntegration, } from '../../lib/custom-integration' import { + defaultGitHookEnvShell, getCacheHooksEnv, getGitHookEnvShell, getHooksEnvEnabled, @@ -493,7 +494,9 @@ export class Preferences extends React.Component< onSelectedShellChanged={this.onSelectedGitHookEnvShellChanged} enableGitHookEnv={this.state.enableGitHookEnv ?? false} cacheGitHookEnv={this.state.cacheGitHookEnv ?? true} - selectedShell={this.state.selectedGitHookEnvShell ?? 'g4w-bash'} + selectedShell={ + this.state.selectedGitHookEnvShell ?? defaultGitHookEnvShell + } /> ) diff --git a/app/styles/ui/_preferences.scss b/app/styles/ui/_preferences.scss index 59b7aefdd10..f8047577f9d 100644 --- a/app/styles/ui/_preferences.scss +++ b/app/styles/ui/_preferences.scss @@ -10,6 +10,10 @@ margin-bottom: var(--spacing); } + .hooks-warning { + margin-bottom: var(--spacing); + } + .git-hooks-support-description, .git-hooks-env-description, .git-hooks-cache-description { From 8049ea4d50ae22611d5b3bf8833449175420fa55 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Wed, 26 Nov 2025 13:54:07 +0000 Subject: [PATCH 0677/1338] Refactor shell environment loading for hooks Introduces ShellEnvResult type to handle shell environment loading success and failure cases. Updates hooks-proxy and with-hooks-env to use the new result type, improving error handling and user messaging when the shell environment cannot be loaded. Adds memoization and context-aware caching for shell environment retrieval. --- app/src/lib/hooks/get-shell-env.ts | 21 ++++++++++++-- app/src/lib/hooks/hooks-proxy.ts | 45 +++++++++++++++++++++-------- app/src/lib/hooks/with-hooks-env.ts | 37 +++++++++++++++++------- 3 files changed, 77 insertions(+), 26 deletions(-) diff --git a/app/src/lib/hooks/get-shell-env.ts b/app/src/lib/hooks/get-shell-env.ts index 69e3987c42b..2c5557485cf 100644 --- a/app/src/lib/hooks/get-shell-env.ts +++ b/app/src/lib/hooks/get-shell-env.ts @@ -3,16 +3,27 @@ import { getShell } from './get-shell' import { spawn } from 'child_process' import { SupportedHooksEnvShell } from './config' +export type ShellEnvResult = + | { + kind: 'success' + env: Record + } + | { + kind: 'failure' + shellKind?: SupportedHooksEnvShell + } + export const getShellEnv = async ( + cwd?: string, shellKind?: SupportedHooksEnvShell -): Promise> => { +): Promise => { const ext = __WIN32__ ? '.exe' : '' const printenvzPath = join(__dirname, `printenvz${ext}`) const shellInfo = await getShell(shellKind) if (!shellInfo) { - throw new Error('Could not determine shell to use for loading environment') + return { kind: 'failure', shellKind } } const { shell, args, quoteCommand, windowsVerbatimArguments, argv0 } = @@ -24,6 +35,7 @@ export const getShellEnv = async ( windowsVerbatimArguments, argv0, stdio: 'pipe', + cwd, }) const chunks: Buffer[] = [] @@ -33,7 +45,10 @@ export const getShellEnv = async ( .on('end', () => { const stdout = Buffer.concat(chunks).toString('utf8') const matches = stdout.matchAll(/([^=]+)=([^\0]*)\0/g) - resolve(Object.fromEntries(Array.from(matches, m => [m[1], m[2]]))) + resolve({ + kind: 'success', + env: Object.fromEntries(Array.from(matches, m => [m[1], m[2]])), + }) }) child.on('error', err => reject(err)) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 3a2c76e1c62..62694f47a3c 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -6,6 +6,8 @@ import { ProcessProxyConnection as Connection } from 'process-proxy' import { pipeline } from 'stream/promises' import type { HookProgress, TerminalOutput } from '../git' import { resolveGitBinary } from 'dugite' +import { ShellEnvResult } from './get-shell-env' +import { shellFriendlyNames } from './config' const hooksUsingStdin = ['post-rewrite'] const ignoredOnFailureHooks = [ @@ -43,15 +45,16 @@ const debug = (message: string, error?: Error) => { } const exitWithMessage = (conn: Connection, msg: string, exitCode = 0) => { - return new Promise(resolve => { - conn.stderr.end(`${msg}\n`) - conn.exit(exitCode).then(resolve, err => { - debug( - `failed to exit proxy: ${ - err instanceof Error ? err.message : String(err) - }` - ) - resolve() + return new Promise(async resolve => { + conn.stderr.write(`${msg}\n`, () => { + conn.exit(exitCode).then(resolve, err => { + debug( + `failed to exit proxy: ${ + err instanceof Error ? err.message : String(err) + }` + ) + resolve() + }) }) }) } @@ -61,7 +64,7 @@ const exitWithError = (conn: Connection, msg: string, exitCode = 1) => export const createHooksProxy = ( tmpDir: string, - getShellEnv: () => Promise>, + getShellEnv: (cwd: string) => Promise, onHookProgress?: (progress: HookProgress) => void, onHookFailure?: ( hookName: string, @@ -117,7 +120,25 @@ export const createHooksProxy = ( const terminalOutput: Buffer[] = [] const gitPath = resolveGitBinary(resolve(__dirname, 'git')) - const shellEnv = await getShellEnv() + const shellEnv = await getShellEnv(proxyCwd) + + if (shellEnv.kind === 'failure') { + let errMsg = `Failed to load shell environment for hook ${hookName}.` + debug(errMsg) + + if (shellEnv.shellKind) { + const friendlyName = shellFriendlyNames[shellEnv.shellKind] + if (shellEnv.shellKind === 'git-bash') { + errMsg += `\n${friendlyName} not found. Please ensure Git for Windows is installed and added to your PATH.` + } else { + errMsg += `\n${friendlyName} not found. Please ensure it's installed and added to your PATH.` + } + } + + errMsg += '\n\nConfigure the shell to use in Preferences > Git > Hooks.' + + return exitWithError(conn, errMsg) + } const { code, signal } = await new Promise<{ code: number | null @@ -127,7 +148,7 @@ export const createHooksProxy = ( const child = spawn(gitPath, args, { cwd: proxyCwd, - env: { ...shellEnv, ...safeEnv }, + env: { ...shellEnv.env, ...safeEnv }, signal: abortController.signal, }) .on('close', (code, signal) => resolve({ code, signal })) diff --git a/app/src/lib/hooks/with-hooks-env.ts b/app/src/lib/hooks/with-hooks-env.ts index cf8bcc81bad..cac97a49d43 100644 --- a/app/src/lib/hooks/with-hooks-env.ts +++ b/app/src/lib/hooks/with-hooks-env.ts @@ -8,7 +8,23 @@ import { getRepoHooks } from './get-repo-hooks' import { createHooksProxy } from './hooks-proxy' import { getShellEnv } from './get-shell-env' import memoizeOne from 'memoize-one' -import { getGitHookEnvShell, getHooksEnvEnabled } from './config' +import { + getCacheHooksEnv, + getGitHookEnvShell, + getHooksEnvEnabled, + SupportedHooksEnvShell, +} from './config' + +const memoizedGetShellEnv = memoizeOne( + async (shellKind: SupportedHooksEnvShell, cwd: string, cacheKey: string) => { + const shellEnvStartTime = Date.now() + const shellEnv = await getShellEnv(cwd, shellKind) + log.debug( + `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` + ) + return shellEnv + } +) export async function withHooksEnv( fn: (env: Record | undefined) => Promise, @@ -25,15 +41,6 @@ export async function withHooksEnv( return fn(opts?.env) } - const memoizedGetShellEnv = memoizeOne(async () => { - const shellEnvStartTime = Date.now() - const shellEnv = await getShellEnv(getGitHookEnvShell()) - log.debug( - `hooks: loaded shell environment in ${Date.now() - shellEnvStartTime}ms` - ) - return shellEnv - }) - const ext = __WIN32__ ? '.exe' : '' const processProxyPath = join(__dirname, `process-proxy${ext}`) @@ -41,7 +48,15 @@ export async function withHooksEnv( const tmpHooksDir = await mkdtemp(join(tmpdir(), 'desktop-git-hooks-')) const hooksProxy = createHooksProxy( tmpHooksDir, - memoizedGetShellEnv, + cwd => + memoizedGetShellEnv( + getGitHookEnvShell(), + cwd, + // We always cache environment per token (i.e. per operation, e.g commit, apply, etc) + // but we can optionally cache it over multiple operations in the same repository if the user + // has enabled that setting. + getCacheHooksEnv() ? 'global' : token + ), opts?.onHookProgress, opts?.onHookFailure ) From 3f94f5b7d71f1bfb07322729620f3a8c45734c0a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Nov 2025 10:44:02 +0100 Subject: [PATCH 0678/1338] Allow bypassing commit hooks --- app/src/lib/app-state.ts | 8 +++ app/src/lib/git/commit.ts | 5 ++ app/src/lib/menu-item.ts | 4 +- app/src/lib/stores/app-store.ts | 22 ++++++ app/src/lib/stores/repository-state-cache.ts | 2 + .../main-process/menu/build-context-menu.ts | 1 + app/src/ui/app.tsx | 13 ++++ app/src/ui/changes/changes-list.tsx | 10 +++ app/src/ui/changes/commit-message.tsx | 68 ++++++++++++++++++- app/src/ui/changes/filter-changes-list.tsx | 10 +++ app/src/ui/changes/sidebar.tsx | 10 +++ .../commit-message/commit-message-dialog.tsx | 10 +++ app/src/ui/dispatcher/dispatcher.ts | 7 ++ app/src/ui/repository.tsx | 10 +++ app/styles/ui/changes/_commit-message.scss | 18 ++--- 15 files changed, 181 insertions(+), 17 deletions(-) diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts index abc42cae942..b481ab45415 100644 --- a/app/src/lib/app-state.ts +++ b/app/src/lib/app-state.ts @@ -589,6 +589,14 @@ export interface IRepositoryState { /** State associated with a multi commit operation such as rebase, * cherry-pick, squash, reorder... */ readonly multiCommitOperationState: IMultiCommitOperationState | null + + /** + * Whether there are any hooks in the repository that could be + * skipped during commit with the --no-verify flag + */ + readonly hasCommitHooks: boolean + + readonly skipCommitHooks: boolean } export interface IBranchesState { diff --git a/app/src/lib/git/commit.ts b/app/src/lib/git/commit.ts index 627cc5a3ec5..31d9ffc9ee1 100644 --- a/app/src/lib/git/commit.ts +++ b/app/src/lib/git/commit.ts @@ -30,6 +30,7 @@ export async function createCommit( terminalOutput: TerminalOutput ) => Promise<'abort' | 'ignore'> onTerminalOutputAvailable?: TerminalOutputCallback + skipCommitHooks?: boolean } ): Promise { // Clear the staging area, our diffs reflect the difference between the @@ -45,6 +46,10 @@ export async function createCommit( args.push('--amend') } + if (options?.skipCommitHooks) { + args.push('--no-verify') + } + const result = await git( ['commit', ...args], repository.path, diff --git a/app/src/lib/menu-item.ts b/app/src/lib/menu-item.ts index 7d3d97918bc..5f4ff3b1238 100644 --- a/app/src/lib/menu-item.ts +++ b/app/src/lib/menu-item.ts @@ -8,7 +8,9 @@ export interface IMenuItem { readonly action?: () => void /** The type of item. */ - readonly type?: 'separator' + readonly type?: 'separator' | 'checkbox' + + readonly checked?: boolean /** Is the menu item enabled? Defaults to true. */ readonly enabled?: boolean diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 56623fc4969..ca7d75f3215 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -349,6 +349,7 @@ import { } from '../custom-integration' import { updateStore } from '../../ui/lib/update-store' import { BypassReasonType } from '../../ui/secret-scanning/bypass-push-protection-dialog' +import { getRepoHooks } from '../hooks/get-repo-hooks' const LastSelectedRepositoryIDKey = 'last-selected-repository-id' @@ -3340,6 +3341,7 @@ export class AppStore extends TypedBaseStore { subscribeToCommitOutput, })) }, + skipCommitHooks: state.skipCommitHooks, }).catch(err => (aborted ? undefined : Promise.reject(err))) }, { gitContext: { kind: 'commit' }, repository } @@ -3635,6 +3637,7 @@ export class AppStore extends TypedBaseStore { gitStore.updateLastFetched(), gitStore.loadStashEntries(), this._refreshAuthor(repository), + this._refreshHasCommitHooks(repository), refreshSectionPromise, ]) @@ -3890,6 +3893,25 @@ export class AppStore extends TypedBaseStore { this.emitUpdate() } + public _updateSkipCommitHooks( + repository: Repository, + skipCommitHooks: boolean + ): void { + this.repositoryStateCache.update(repository, () => ({ skipCommitHooks })) + this.emitUpdate() + } + + private async _refreshHasCommitHooks(repository: Repository): Promise { + const hooks = ['pre-commit', 'commit-msg'] + // Break early if we find either one of the hooks + for await (const {} of getRepoHooks(repository.path, hooks)) { + const hasCommitHooks = true + this.repositoryStateCache.update(repository, () => ({ hasCommitHooks })) + this.emitUpdate() + return + } + } + /** This shouldn't be called directly. See `Dispatcher`. */ public async _showPopup(popup: Popup): Promise { // Always close the app menu when showing a pop up. This is only diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts index 76bd1a7dd6f..a15e9b2765c 100644 --- a/app/src/lib/stores/repository-state-cache.ts +++ b/app/src/lib/stores/repository-state-cache.ts @@ -373,5 +373,7 @@ function getInitialRepositoryState(): IRepositoryState { revertProgress: null, multiCommitOperationUndoState: null, multiCommitOperationState: null, + hasCommitHooks: false, + skipCommitHooks: false, } } diff --git a/app/src/main-process/menu/build-context-menu.ts b/app/src/main-process/menu/build-context-menu.ts index 0a673a277ea..d17ee8be156 100644 --- a/app/src/main-process/menu/build-context-menu.ts +++ b/app/src/main-process/menu/build-context-menu.ts @@ -83,6 +83,7 @@ function buildRecursiveContextMenu( new MenuItem({ label: item.label, type: item.type, + checked: item.checked, enabled: item.enabled, role: item.role, click: () => actionFn(indices), diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx index 57e13cafaeb..fac3edb5eb8 100644 --- a/app/src/ui/app.tsx +++ b/app/src/ui/app.tsx @@ -2178,6 +2178,9 @@ export class App extends React.Component { onSubmitCommitMessage={popup.onSubmitCommitMessage} repositoryAccount={repositoryAccount} accounts={this.state.accounts} + hasCommitHooks={repositoryState.hasCommitHooks} + skipCommitHooks={repositoryState.skipCommitHooks} + onSkipCommitHooksChanged={this.onSkipCommitHooksChanged} /> ) case PopupType.MultiCommitOperation: { @@ -2602,6 +2605,13 @@ export class App extends React.Component { } } + private onSkipCommitHooksChanged = ( + repository: Repository, + skipCommitHooks: boolean + ) => { + this.props.dispatcher.updateSkipCommitHooks(repository, skipCommitHooks) + } + private onSecretDelegatedBypassLinkClick = () => { this.props.dispatcher.incrementMetric( 'secretsDetectedOnPushDelegatedBypassLinkClickedCount' @@ -3453,6 +3463,9 @@ export class App extends React.Component { shouldShowGenerateCommitMessageCallOut={ !this.state.commitMessageGenerationButtonClicked } + hasCommitHooks={selectedState.state.hasCommitHooks} + skipCommitHooks={selectedState.state.skipCommitHooks} + onSkipCommitHooksChanged={this.onSkipCommitHooksChanged} /> ) } else if (selectedState.type === SelectionType.CloningRepository) { diff --git a/app/src/ui/changes/changes-list.tsx b/app/src/ui/changes/changes-list.tsx index 6f38aaab071..7e477c43b8f 100644 --- a/app/src/ui/changes/changes-list.tsx +++ b/app/src/ui/changes/changes-list.tsx @@ -233,6 +233,13 @@ interface IChangesListProps { readonly showCommitLengthWarning: boolean readonly accounts: ReadonlyArray + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } interface IChangesState { @@ -880,6 +887,9 @@ export class ChangesList extends React.Component< onStopAmending={this.onStopAmending} onShowCreateForkDialog={this.onShowCreateForkDialog} accounts={this.props.accounts} + hasCommitHooks={this.props.hasCommitHooks} + skipCommitHooks={this.props.skipCommitHooks} + onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} /> ) } diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index d216a34d152..4c18037fccd 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -62,7 +62,10 @@ import { formatCommitMessage } from '../../lib/format-commit-message' import { useRepoRulesLogic } from '../../lib/helpers/repo-rules' import { isDotCom } from '../../lib/endpoint-capabilities' import { WorkingDirectoryFileChange } from '../../models/status' -import { enableCommitMessageGeneration } from '../../lib/feature-flag' +import { + enableCommitMessageGeneration, + enableHooksEnvironment, +} from '../../lib/feature-flag' import { AriaLiveContainer } from '../accessibility/aria-live-container' import { HookProgress } from '../../lib/git' import { assertNever } from '../../lib/fatal-error' @@ -198,6 +201,13 @@ interface ICommitMessageProps { /** Optional to add an id to a message that should be provided as an aria * description of the submit button */ readonly submitButtonAriaDescribedBy?: string + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } interface ICommitMessageState { @@ -992,6 +1002,51 @@ export class CommitMessage extends React.Component< ) } + private renderCommitOptionsButton() { + if (!this.isCommitOptionsButtonEnabled) { + return null + } + + const ariaLabel = 'Configure commit options' + + return ( + <> + {(this.isCoAuthorInputEnabled || this.isCopilotButtonEnabled) && ( +
    + )} + + + ) + } + + private onCommitOptionsButtonClick = ( + e: React.MouseEvent + ) => { + e.preventDefault() + showContextualMenu([ + { + type: 'checkbox', + checked: this.props.skipCommitHooks, + label: __DARWIN__ + ? 'Bypass Hooks (--no-verify)' + : 'Bypass hooks (--no-verify)', + action: () => { + this.props.onSkipCommitHooksChanged( + this.props.repository, + !this.props.skipCommitHooks + ) + }, + }, + ]) + } + private renderCoAuthorToggleButton() { if (this.props.repository.gitHubRepository === null) { return null @@ -1080,11 +1135,19 @@ export class CommitMessage extends React.Component< ) } + private get isCommitOptionsButtonEnabled() { + return enableHooksEnvironment() && this.props.hasCommitHooks + } + /** * Whether or not there's anything to render in the action bar */ private get isActionBarEnabled() { - return this.isCoAuthorInputEnabled || this.isCopilotButtonEnabled + return ( + this.isCoAuthorInputEnabled || + this.isCopilotButtonEnabled || + this.isCommitOptionsButtonEnabled + ) } private renderActionBar() { @@ -1102,6 +1165,7 @@ export class CommitMessage extends React.Component<
    {this.renderCoAuthorToggleButton()} {this.renderCopilotButton()} + {this.renderCommitOptionsButton()}
    ) } diff --git a/app/src/ui/changes/filter-changes-list.tsx b/app/src/ui/changes/filter-changes-list.tsx index 108654457f7..209ab60ebc3 100644 --- a/app/src/ui/changes/filter-changes-list.tsx +++ b/app/src/ui/changes/filter-changes-list.tsx @@ -222,6 +222,13 @@ interface IFilterChangesListProps { /** Whether or not to show the changes filter */ readonly showChangesFilter: boolean + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } interface IFilterChangesListState { @@ -985,6 +992,9 @@ export class FilterChangesList extends React.Component< accounts={this.props.accounts} onSuccessfulCommitCreated={this.onSuccessfulCommitCreated} submitButtonAriaDescribedBy={'hidden-changes-warning'} + hasCommitHooks={this.props.hasCommitHooks} + skipCommitHooks={this.props.skipCommitHooks} + onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} /> ) } diff --git a/app/src/ui/changes/sidebar.tsx b/app/src/ui/changes/sidebar.tsx index 258cb1b701c..3d989239ad5 100644 --- a/app/src/ui/changes/sidebar.tsx +++ b/app/src/ui/changes/sidebar.tsx @@ -96,6 +96,13 @@ interface IChangesSidebarProps { /** Whether or not to show the changes filter */ readonly showChangesFilter: boolean + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } export class ChangesSidebar extends React.Component { @@ -466,6 +473,9 @@ export class ChangesSidebar extends React.Component { accounts={this.props.accounts} fileListFilter={this.props.changes.fileListFilter} showChangesFilter={this.props.showChangesFilter} + hasCommitHooks={this.props.hasCommitHooks} + skipCommitHooks={this.props.skipCommitHooks} + onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} /> {this.renderUndoCommit(rebaseConflictState)}
    diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 684b50890ec..5fcb7d9816b 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -95,6 +95,13 @@ interface ICommitMessageDialogProps { readonly repositoryAccount: Account | null readonly accounts: ReadonlyArray + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } interface ICommitMessageDialogState { @@ -167,6 +174,9 @@ export class CommitMessageDialog extends React.Component< isCommitting={false} hookProgress={null} onShowCommitProgress={undefined} + hasCommitHooks={this.props.hasCommitHooks} + skipCommitHooks={this.props.skipCommitHooks} + onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} />
    diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index e1c17b39cab..1e7965446a5 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -221,6 +221,13 @@ export class Dispatcher { return this.appStore._updateRepositoryMissing(repository, missing) } + public updateSkipCommitHooks( + repository: Repository, + skipCommitHooks: boolean + ) { + this.appStore._updateSkipCommitHooks(repository, skipCommitHooks) + } + /** Load the next batch of history for the repository. */ public loadNextCommitBatch(repository: Repository): Promise { return this.appStore._loadNextCommitBatch(repository) diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index 597aa3f7da7..f0666ede5f1 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -114,6 +114,13 @@ interface IRepositoryViewProps { /** Whether or not to show the changes filter */ readonly showChangesFilter: boolean + + readonly hasCommitHooks: boolean + readonly skipCommitHooks: boolean + readonly onSkipCommitHooksChanged: ( + repository: Repository, + skipCommitHooks: boolean + ) => void } interface IRepositoryViewState { @@ -293,6 +300,9 @@ export class RepositoryView extends React.Component< commitSpellcheckEnabled={this.props.commitSpellcheckEnabled} showCommitLengthWarning={this.props.showCommitLengthWarning} showChangesFilter={this.props.showChangesFilter} + hasCommitHooks={this.props.hasCommitHooks} + skipCommitHooks={this.props.skipCommitHooks} + onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} /> ) } diff --git a/app/styles/ui/changes/_commit-message.scss b/app/styles/ui/changes/_commit-message.scss index 747aa9c7ab6..aaa1ffd8cee 100644 --- a/app/styles/ui/changes/_commit-message.scss +++ b/app/styles/ui/changes/_commit-message.scss @@ -166,19 +166,8 @@ width: auto !important; } - .call-to-action-bubble { - font-weight: var(--font-weight-semibold); - display: inline-block; - font-size: var(--font-size-xs); - border: 1px solid var(--call-to-action-bubble-border-color); - color: var(--call-to-action-bubble-color); - padding: 1px 5px; - border-radius: var(--border-radius); - margin-left: var(--spacing-third); - cursor: pointer; - } - - .co-authors-toggle { + .co-authors-toggle, + .commit-options-button { color: var(--text-secondary-color); &:hover { @@ -290,7 +279,8 @@ } .co-authors-toggle, - .copilot-button { + .copilot-button, + .commit-options-button { // button reset styles border: none; border-radius: 0px; From 3892b5eb97772554567153aa1d1f015d0711715a Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Nov 2025 11:05:50 +0100 Subject: [PATCH 0679/1338] Update commit options button styling logic The commit options button now conditionally applies the 'default-options' class based on the skipCommitHooks prop. Corresponding SCSS changes ensure the button uses the appropriate text color for default and non-default states. --- app/src/ui/changes/commit-message.tsx | 4 +++- app/styles/ui/changes/_commit-message.scss | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/ui/changes/commit-message.tsx b/app/src/ui/changes/commit-message.tsx index 4c18037fccd..3a66c978bf6 100644 --- a/app/src/ui/changes/commit-message.tsx +++ b/app/src/ui/changes/commit-message.tsx @@ -1015,7 +1015,9 @@ export class CommitMessage extends React.Component<
    )}
    diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx index 5fcb7d9816b..7319a56190f 100644 --- a/app/src/ui/commit-message/commit-message-dialog.tsx +++ b/app/src/ui/commit-message/commit-message-dialog.tsx @@ -13,7 +13,7 @@ import { Author, UnknownAuthor } from '../../models/author' import { CommitMessage } from '../changes/commit-message' import noop from 'lodash/noop' import { Popup } from '../../models/popup' -import { Foldout } from '../../lib/app-state' +import { CommitOptions, Foldout } from '../../lib/app-state' import { Account } from '../../models/account' import { RepoRulesInfo } from '../../models/repo-rules' import { IAheadBehind } from '../../models/branch' @@ -98,9 +98,9 @@ interface ICommitMessageDialogProps { readonly hasCommitHooks: boolean readonly skipCommitHooks: boolean - readonly onSkipCommitHooksChanged: ( + readonly onUpdateCommitOptions: ( repository: Repository, - skipCommitHooks: boolean + options: CommitOptions ) => void } @@ -176,7 +176,7 @@ export class CommitMessageDialog extends React.Component< onShowCommitProgress={undefined} hasCommitHooks={this.props.hasCommitHooks} skipCommitHooks={this.props.skipCommitHooks} - onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} + onUpdateCommitOptions={this.props.onUpdateCommitOptions} />     diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts index 1e7965446a5..e9f66b02b47 100644 --- a/app/src/ui/dispatcher/dispatcher.ts +++ b/app/src/ui/dispatcher/dispatcher.ts @@ -22,6 +22,7 @@ import { CherryPickConflictState, MultiCommitOperationConflictState, IMultiCommitOperationState, + CommitOptions, } from '../../lib/app-state' import { assertNever, fatalError } from '../../lib/fatal-error' import { @@ -221,11 +222,8 @@ export class Dispatcher { return this.appStore._updateRepositoryMissing(repository, missing) } - public updateSkipCommitHooks( - repository: Repository, - skipCommitHooks: boolean - ) { - this.appStore._updateSkipCommitHooks(repository, skipCommitHooks) + public updateCommitOptions(repository: Repository, options: CommitOptions) { + this.appStore._updateCommitOptions(repository, options) } /** Load the next batch of history for the repository. */ diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx index f0666ede5f1..2acf590ff52 100644 --- a/app/src/ui/repository.tsx +++ b/app/src/ui/repository.tsx @@ -15,6 +15,7 @@ import { RepositorySectionTab, ChangesSelectionKind, IConstrainedValue, + CommitOptions, } from '../lib/app-state' import { Dispatcher } from './dispatcher' import { IssuesStore, GitHubUserStore } from '../lib/stores' @@ -117,9 +118,9 @@ interface IRepositoryViewProps { readonly hasCommitHooks: boolean readonly skipCommitHooks: boolean - readonly onSkipCommitHooksChanged: ( + readonly onUpdateCommitOptions: ( repository: Repository, - skipCommitHooks: boolean + options: CommitOptions ) => void } @@ -302,7 +303,7 @@ export class RepositoryView extends React.Component< showChangesFilter={this.props.showChangesFilter} hasCommitHooks={this.props.hasCommitHooks} skipCommitHooks={this.props.skipCommitHooks} - onSkipCommitHooksChanged={this.props.onSkipCommitHooksChanged} + onUpdateCommitOptions={this.props.onUpdateCommitOptions} /> ) } From 7d8c39c266c3b9d95c11682a2b7a51d34acc96e7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Nov 2025 11:14:01 +0100 Subject: [PATCH 0681/1338] Let hooks know they're being run in Desktop --- app/src/lib/hooks/hooks-proxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/hooks/hooks-proxy.ts b/app/src/lib/hooks/hooks-proxy.ts index 62694f47a3c..e993447a3e8 100644 --- a/app/src/lib/hooks/hooks-proxy.ts +++ b/app/src/lib/hooks/hooks-proxy.ts @@ -148,7 +148,7 @@ export const createHooksProxy = ( const child = spawn(gitPath, args, { cwd: proxyCwd, - env: { ...shellEnv.env, ...safeEnv }, + env: { ...shellEnv.env, ...safeEnv, GITHUB_DESKTOP: '1' }, signal: abortController.signal, }) .on('close', (code, signal) => resolve({ code, signal })) From 9a77424c7d5b0eeab5fe54edf98e5be0305f9605 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Thu, 27 Nov 2025 11:32:40 +0100 Subject: [PATCH 0682/1338] Update enableHooksEnvironment to use beta features Changed enableHooksEnvironment to reference enableBetaFeatures instead of enableDevelopmentFeatures for consistency with other feature flags. --- app/src/lib/feature-flag.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts index 5325758459f..738eea5bc79 100644 --- a/app/src/lib/feature-flag.ts +++ b/app/src/lib/feature-flag.ts @@ -121,4 +121,4 @@ export function enableAccessibleListToolTips(): boolean { return enableBetaFeatures() } -export const enableHooksEnvironment = enableDevelopmentFeatures +export const enableHooksEnvironment = enableBetaFeatures From 299febeaf3fe3579ffa3a2480ce9ca05a0ce7c38 Mon Sep 17 00:00:00 2001 From: Dylan Ravel <48571264+DylanDevelops@users.noreply.github.com> Date: Thu, 27 Nov 2025 08:43:42 -0700 Subject: [PATCH 0683/1338] Update app/src/ui/toolbar/branch-dropdown.tsx Co-authored-by: Markus Olsson --- app/src/ui/toolbar/branch-dropdown.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index 02bafbc5ef7..78613df9eb3 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -309,9 +309,11 @@ export class BranchDropdown extends React.Component { name: tip.branch.name, isLocal: tip.branch.type === BranchType.Local, onRenameBranch: this.onRenameBranch, - onViewBranchOnGitHub: tip.branch.upstreamRemoteName - ? this.onViewBranchOnGitHub - : undefined, + onViewBranchOnGitHub: + isRepositoryWithGitHubRepository(this.props.repository) && + tip.branch.upstreamRemoteName + ? this.onViewBranchOnGitHub + : undefined, onViewPullRequestOnGitHub: this.props.currentPullRequest ? this.onViewPullRequestOnGithub : undefined, From aadf1e23f5f58f8c050af0f332a7064a4195c723 Mon Sep 17 00:00:00 2001 From: Dylan Ravel <48571264+DylanDevelops@users.noreply.github.com> Date: Thu, 27 Nov 2025 08:43:49 -0700 Subject: [PATCH 0684/1338] Update app/src/ui/toolbar/branch-dropdown.tsx Co-authored-by: Markus Olsson --- app/src/ui/toolbar/branch-dropdown.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index 78613df9eb3..7ab92241f13 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -355,7 +355,13 @@ export class BranchDropdown extends React.Component { return } - const branchName = tip.branch.upstreamWithoutRemote ?? tip.branch.name + if (!tip.branch.upstreamWithoutRemote) { + return + } + + const url = `${gitHubRepository.htmlURL}/tree/${encodeURIComponent( + tip.branch.upstreamWithoutRemote + )}` const url = `${gitHubRepository.htmlURL}/tree/${encodeURIComponent( branchName )}` From bca33e14ed0cc23802baa2b66767a49e029803be Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Thu, 27 Nov 2025 08:49:11 -0700 Subject: [PATCH 0685/1338] Fix duplicate URL assignment in BranchDropdown Removed redundant assignment of the 'url' variable in the BranchDropdown component to ensure only the correct URL is used when opening a branch in the browser. --- app/src/ui/toolbar/branch-dropdown.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx index 7ab92241f13..ff74be26c0d 100644 --- a/app/src/ui/toolbar/branch-dropdown.tsx +++ b/app/src/ui/toolbar/branch-dropdown.tsx @@ -2,7 +2,10 @@ import * as React from 'react' import { Dispatcher } from '../dispatcher' import * as octicons from '../octicons/octicons.generated' import { OcticonSymbol, syncClockwise } from '../octicons' -import { Repository } from '../../models/repository' +import { + isRepositoryWithGitHubRepository, + Repository, +} from '../../models/repository' import { Resizable } from '../resizable' import { TipState } from '../../models/tip' import { ToolbarDropdown, DropdownState } from './dropdown' @@ -362,9 +365,6 @@ export class BranchDropdown extends React.Component { const url = `${gitHubRepository.htmlURL}/tree/${encodeURIComponent( tip.branch.upstreamWithoutRemote )}` - const url = `${gitHubRepository.htmlURL}/tree/${encodeURIComponent( - branchName - )}` this.props.dispatcher.openInBrowser(url) } From cd33d97d493f2f86adb83dd488004caec1336a1f Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 28 Nov 2025 10:28:49 +0100 Subject: [PATCH 0686/1338] Refresh repository after commit failure Adds a repository refresh when a commit fails to ensure the UI accurately reflects the repository state. Addresses issue #21229. --- app/src/lib/stores/app-store.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 7180325c3fd..760ca92ce71 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -3340,6 +3340,11 @@ export class AppStore extends TypedBaseStore { result, state.commitToAmend ) + } else { + // The commit failed, but we should still refresh to ensure we + // accurately reflect the repository state post failure. See + // https://github.com/desktop/desktop/issues/21229 + this._refreshRepository(repository) } return result !== undefined From 69764287d2ecf030b20f33c0f0137ee47e4e91a7 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 28 Nov 2025 12:01:38 +0100 Subject: [PATCH 0687/1338] Improve branch renaming to handle case-only changes Enhanced the renameBranch function to retry with force (-M) when a case-only branch rename fails due to case-insensitive filesystems. Added getBranchNames utility to verify branch existence and prevent unsafe renames. --- app/src/lib/git/branch.ts | 59 ++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/app/src/lib/git/branch.ts b/app/src/lib/git/branch.ts index d1988ee3d0c..2bf55079b4f 100644 --- a/app/src/lib/git/branch.ts +++ b/app/src/lib/git/branch.ts @@ -1,4 +1,4 @@ -import { git } from './core' +import { coerceToString, git, isGitError } from './core' import { Repository } from '../../models/repository' import { Branch } from '../../models/branch' import { formatAsLocalRef } from './refs' @@ -36,17 +36,62 @@ export async function createBranch( await git(args, repository.path, 'createBranch') } +export const getBranchNames = ({ path }: Repository): Promise => { + const parser = createForEachRefParser({ name: '%(refname:short)' }) + return git(['branch', ...parser.formatArgs], path, 'getBranchNames').then(x => + parser.parse(x.stdout).map(b => b.name) + ) +} + /** Rename the given branch to a new name. */ export async function renameBranch( repository: Repository, branch: Branch, - newName: string + newName: string, + force?: boolean ): Promise { - await git( - ['branch', '-m', branch.nameWithoutRemote, newName], - repository.path, - 'renameBranch' - ) + try { + await git( + ['branch', force ? '-m' : '-M', branch.nameWithoutRemote, newName], + repository.path, + 'renameBranch' + ) + } catch (error) { + // If we failed to rename and the branch name only differs by case, we + // we'll try again with the -M flag to force the rename. See + // https://github.com/desktop/desktop/issues/21320 + if ( + // Only retry if the caller hasn't explicitly asked us to force the rename + force === undefined && + isGitError(error) && + error.result.gitError === DugiteError.BranchAlreadyExists + ) { + const stderr = coerceToString(error.result.stderr) + const m = /fatal: a branch named '(.+?)' already exists/.exec(stderr) + + if (m && m[1].toLowerCase() === newName.toLowerCase()) { + // At this point we're almost certain that we are dealing with a + // case-only rename on a case insensitive filesystem, but we can't + // be 100% sure, NTFS can be configured to be case sensitive and macOS + // might have case sensitive file systems mounted so we have to list + // all branches and check the names. + return ( + getBranchNames(repository) + // Throw the original error if we fail to get the branch names + .catch(() => Promise.reject(error)) + .then(names => + // If we find the new name in the list of branches we can't + // safely assume it's a case-only rename and have to + // propagate the original error, otherwise try again with -M + names.includes(newName) + ? Promise.reject(error) + : renameBranch(repository, branch, newName, true) + ) + ) + } + } + throw error + } } /** From e57da234c30f307be01faa866d5f963153ae9059 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 28 Nov 2025 12:06:16 +0100 Subject: [PATCH 0688/1338] One day I will learn how to computer --- app/src/lib/git/branch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/git/branch.ts b/app/src/lib/git/branch.ts index 2bf55079b4f..930f54623a5 100644 --- a/app/src/lib/git/branch.ts +++ b/app/src/lib/git/branch.ts @@ -52,7 +52,7 @@ export async function renameBranch( ): Promise { try { await git( - ['branch', force ? '-m' : '-M', branch.nameWithoutRemote, newName], + ['branch', force ? '-M' : '-m', branch.nameWithoutRemote, newName], repository.path, 'renameBranch' ) From 769a8eaa77410b65795e9fd7c42ef15685ab37aa Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Mon, 1 Dec 2025 14:38:52 -0500 Subject: [PATCH 0689/1338] Refresh selected repo after account change Adds a method to refresh the GitHub repository information for the currently selected repository when the active account changes. This ensures permission and repository data are up to date after signing in or out. --- app/src/lib/stores/app-store.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts index 7180325c3fd..faa0d375077 100644 --- a/app/src/lib/stores/app-store.ts +++ b/app/src/lib/stores/app-store.ts @@ -910,6 +910,8 @@ export class AppStore extends TypedBaseStore { updateAccounts(endpointTokens) + this.refreshSelectedRepositoryAfterAccountChange() + this.emitUpdate() }) this.accountsStore.onDidError(error => this.emitError(error)) @@ -4333,6 +4335,25 @@ export class AppStore extends TypedBaseStore { return freshRepo } + /** + * Refreshes the GitHub repository information for the currently selected + * repository when the active account changes. This ensures that permission + * information is updated after signing in/out. + */ + private async refreshSelectedRepositoryAfterAccountChange() { + const repository = this.selectedRepository + + if (repository === null || repository instanceof CloningRepository) { + return + } + + if (!isRepositoryWithGitHubRepository(repository)) { + return + } + + await this.repositoryWithRefreshedGitHubRepository(repository) + } + private async updateBranchProtectionsFromAPI(repository: Repository) { if (repository.gitHubRepository === null) { return From 9c33461a13c82e0acff35a453783196b14516a70 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 09:37:33 +0000 Subject: [PATCH 0690/1338] Address feedback: simplify dev workflow, add CoC link, reduce dev tips Co-authored-by: niik <634063+niik@users.noreply.github.com> --- .github/copilot-instructions.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index aa14592b9d5..e0221c02bfd 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -97,15 +97,6 @@ yarn # Development build yarn build:dev - -# Start the application (changes compile in background, reload with Ctrl/Cmd+Alt+R) -yarn start - -# Production build -yarn build:prod - -# Clean rebuild -yarn clean-slate && yarn build:dev ``` ### Testing @@ -189,9 +180,6 @@ yarn prettier --write - **Use the Dispatcher**: Route state-changing interactions through the `Dispatcher` to the `AppStore` - **Avoid direct AppStore manipulation**: Methods in AppStore should be called via Dispatcher - **Leverage TypeScript**: Use type system for compile-time verification of exhaustiveness and correctness -- **React Dev Tools**: Automatically available in development mode -- **Debugging**: Use Chrome Dev Tools (View → Toggle Developer Tools) -- **Hot reload**: Press Ctrl/Cmd+Alt+R to reload the app after changes ## Contributing @@ -203,7 +191,7 @@ yarn prettier --write ## Code of Conduct -This project adheres to the Contributor Covenant Code of Conduct. All interactions must be respectful and professional. +This project adheres to the Contributor Covenant [Code of Conduct](../CODE_OF_CONDUCT.md). All interactions must be respectful and professional. ## Resources From b10bdeb509165514a2741290c2454c060bcf4105 Mon Sep 17 00:00:00 2001 From: tidy-dev <75402236+tidy-dev@users.noreply.github.com> Date: Wed, 3 Dec 2025 12:50:57 -0500 Subject: [PATCH 0691/1338] Update code signing account and signing tool --- .github/workflows/ci.yml | 2 +- script/package.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index feb45c52b1e..60a5c690d34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: run: | $acsZip = Join-Path $env:RUNNER_TEMP "acs.zip" $acsDir = Join-Path $env:RUNNER_TEMP "acs" - Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.52 -OutFile $acsZip -Verbose + Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.95 -OutFile $acsZip -Verbose Expand-Archive $acsZip -Destination $acsDir -Force -Verbose # Replace ancient signtool in electron-winstall with one that supports ACS Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose diff --git a/script/package.ts b/script/package.ts index 1b1df20ac63..48ca0744810 100644 --- a/script/package.ts +++ b/script/package.ts @@ -122,9 +122,9 @@ function packageWindows() { const metadataPath = join(acsPath, 'metadata.json') const acsMetadata = { - Endpoint: 'https://eus.codesigning.azure.net/', - CodeSigningAccountName: 'github-desktop', - CertificateProfileName: 'desktop', + Endpoint: 'https://wus.codesigning.azure.net/', + CodeSigningAccountName: 'GitHubInc', + CertificateProfileName: 'GitHubInc', CorrelationId: `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`, } writeFileSync(metadataPath, JSON.stringify(acsMetadata)) From b22509c6aa8fde232293735c916beb6ed5ddc424 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 9 Dec 2025 19:05:03 +0100 Subject: [PATCH 0692/1338] Don't call setState after unmount --- app/src/ui/lib/sandboxed-markdown.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/ui/lib/sandboxed-markdown.tsx b/app/src/ui/lib/sandboxed-markdown.tsx index 684a7f1a2b7..c96fb13b41e 100644 --- a/app/src/ui/lib/sandboxed-markdown.tsx +++ b/app/src/ui/lib/sandboxed-markdown.tsx @@ -75,6 +75,9 @@ export class SandboxedMarkdown extends React.PureComponent< private resizeDebounceId: number | null = null private onDocumentScroll = debounce(() => { + if (this.frameRef == null) { + return + } this.setState({ tooltipOffset: this.frameRef?.getBoundingClientRect() ?? new DOMRect(), }) From c7e5bb8853e573d8e66c596b185dc8b7827effc8 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Tue, 9 Dec 2025 19:06:26 +0100 Subject: [PATCH 0693/1338] Detect resize without using resize observer --- app/src/ui/lib/sandboxed-markdown.tsx | 166 +++++++++++++------------- 1 file changed, 82 insertions(+), 84 deletions(-) diff --git a/app/src/ui/lib/sandboxed-markdown.tsx b/app/src/ui/lib/sandboxed-markdown.tsx index c96fb13b41e..64853c63ebb 100644 --- a/app/src/ui/lib/sandboxed-markdown.tsx +++ b/app/src/ui/lib/sandboxed-markdown.tsx @@ -54,6 +54,10 @@ interface ISandboxedMarkdownState { readonly tooltipOffset?: DOMRect } +function once(node: T, event: string, fn: (e: Event) => void) { + node.addEventListener(event, fn, { once: true }) +} + /** * Parses and sanitizes markdown into html and outputs it inside a sandboxed * iframe. @@ -64,16 +68,8 @@ export class SandboxedMarkdown extends React.PureComponent< > { private frameRef: HTMLIFrameElement | null = null private frameContainingDivRef: HTMLDivElement | null = null - private contentDivRef: HTMLDivElement | null = null private markdownEmitter?: MarkdownEmitter - /** - * Resize observer used for tracking height changes in the markdown - * content and update the size of the iframe container. - */ - private readonly resizeObserver: ResizeObserver - private resizeDebounceId: number | null = null - private onDocumentScroll = debounce(() => { if (this.frameRef == null) { return @@ -95,31 +91,49 @@ export class SandboxedMarkdown extends React.PureComponent< { leading: true } ) + private lastContainerHeight = -Infinity + public constructor(props: ISandboxedMarkdownProps) { super(props) - this.resizeObserver = new ResizeObserver(this.scheduleResizeEvent) this.state = { tooltipElements: [] } } - private scheduleResizeEvent = () => { - if (this.resizeDebounceId !== null) { - cancelAnimationFrame(this.resizeDebounceId) - this.resizeDebounceId = null - } - this.resizeDebounceId = requestAnimationFrame(this.onContentResized) - } - - private onContentResized = () => { - if (this.frameRef === null) { + /** + * Iframes without much styling help will act like a block element that has a + * predetermiend height and width and scrolling. We want our iframe to feel a + * bit more like a div. Thus, we want to capture the scroll height, and set + * the container div to that height and with some additional css we can + * achieve a inline feel. + */ + private refreshHeight = () => { + if (this.frameRef === null || this.frameContainingDivRef === null) { return } - this.setFrameContainerHeight(this.frameRef) + const newHeight = + this.frameRef.contentDocument?.body?.firstElementChild?.clientHeight ?? + 400 + + if (newHeight !== this.lastContainerHeight) { + this.lastContainerHeight = newHeight + // Not sure why the content height != body height exactly. But we need to + // set the height explicitly to prevent scrollbar/content cut off. + // HACK: Add 1 to the new height to avoid UI glitches like the one shown + // in https://github.com/desktop/desktop/pull/18596 + this.frameContainingDivRef.style.height = `${newHeight + 1}px` + } } private onFrameRef = (frameRef: HTMLIFrameElement | null) => { this.frameRef = frameRef + this.frameRef?.addEventListener('error', e => { + console.error( + 'Error loading iframe contents. This may be due to a CSP violation.' + ) + e.preventDefault() + e.stopPropagation() + }) } private onFrameContainingDivRef = ( @@ -168,7 +182,6 @@ export class SandboxedMarkdown extends React.PureComponent< public componentWillUnmount() { this.markdownEmitter?.dispose() - this.resizeObserver.disconnect() document.removeEventListener('scroll', this.onDocumentScroll) } @@ -218,6 +231,11 @@ export class SandboxedMarkdown extends React.PureComponent< .markdown-body a { text-decoration: ${this.props.underlineLinks ? 'underline' : 'inherit'}; } + + img { + max-width: 100%; + height: auto; + } ` } @@ -226,11 +244,28 @@ export class SandboxedMarkdown extends React.PureComponent< * However, we want to intercept them an verify they are valid links first. */ private setupFrameLoadListeners(frameRef: HTMLIFrameElement): void { + const doc = frameRef.contentDocument + if (doc) { + once(doc, 'DOMContentLoaded', () => { + this.refreshHeight() + + Array.from(doc.querySelectorAll('img')).forEach(img => + once(img, 'load', this.refreshHeight) + ) + + Array.from(doc.querySelectorAll('details')).forEach(detail => + detail.addEventListener('toggle', this.refreshHeight) + ) + + this.setupLinkInterceptor(frameRef) + this.setupTooltips(frameRef) + + this.props.onMarkdownParsed?.() + }) + } + frameRef.addEventListener('load', () => { - this.setupContentDivRef(frameRef) - this.setupLinkInterceptor(frameRef) - this.setupTooltips(frameRef) - this.setFrameContainerHeight(frameRef) + this.refreshHeight() }) } @@ -255,52 +290,6 @@ export class SandboxedMarkdown extends React.PureComponent< }) } - private setupContentDivRef(frameRef: HTMLIFrameElement): void { - if (frameRef.contentDocument === null) { - return - } - - /* - * We added an additional wrapper div#content around the markdown to - * determine a more accurate scroll height as the iframe's document or body - * element was not adjusting it's height dynamically when new content was - * provided. - */ - this.contentDivRef = frameRef.contentDocument.documentElement.querySelector( - '#content' - ) as HTMLDivElement - - if (this.contentDivRef !== null) { - this.resizeObserver.disconnect() - this.resizeObserver.observe(this.contentDivRef) - } - } - - /** - * Iframes without much styling help will act like a block element that has a - * predetermiend height and width and scrolling. We want our iframe to feel a - * bit more like a div. Thus, we want to capture the scroll height, and set - * the container div to that height and with some additional css we can - * achieve a inline feel. - */ - private setFrameContainerHeight(frameRef: HTMLIFrameElement): void { - if ( - frameRef.contentDocument === null || - this.frameContainingDivRef === null || - this.contentDivRef === null - ) { - return - } - - // Not sure why the content height != body height exactly. But we need to - // set the height explicitly to prevent scrollbar/content cut off. - // HACK: Add 1 to the new height to avoid UI glitches like the one shown - // in https://github.com/desktop/desktop/pull/18596 - const divHeight = this.contentDivRef.clientHeight - this.frameContainingDivRef.style.height = `${divHeight + 1}px` - this.props.onMarkdownParsed?.() - } - /** * We still want to be able to navigate to links provided in the markdown. * However, we want to intercept them an verify they are valid links first. @@ -363,21 +352,30 @@ export class SandboxedMarkdown extends React.PureComponent< // convert non-latin strings that existed in the markedjs. const b64src = Buffer.from(src, 'utf8').toString('base64') - // HACK OR NOT? This prevents a crash since Electron 34 where the layout - // changes during the ResizeObserver callback. See: - // https://github.com/desktop/desktop/issues/20760 - requestAnimationFrame(() => { - if (this.frameRef === null) { - // If frame is destroyed before markdown parsing completes, frameref will be null. + if (this.frameRef === null) { + // If frame is destroyed before markdown parsing completes, frameref will be null. + return + } + + // We are using `src` and data uri as opposed to an html string in the + // `srcdoc` property because the `srcdoc` property renders the html in the + // parent dom and we want all rendering to be isolated to our sandboxed iframe. + // -- https://csplite.com/csp/test188/ + const oldDocument = this.frameRef.contentDocument + this.frameRef.src = `data:text/html;charset=utf-8;base64,${b64src}` + + const waitForNewDocument = () => { + if (!this.frameRef) { return } + if (this.frameRef.contentDocument === oldDocument) { + requestAnimationFrame(waitForNewDocument) + } else { + this.refreshHeight() + } + } - // We are using `src` and data uri as opposed to an html string in the - // `srcdoc` property because the `srcdoc` property renders the html in the - // parent dom and we want all rendering to be isolated to our sandboxed iframe. - // -- https://csplite.com/csp/test188/ - this.frameRef.src = `data:text/html;charset=utf-8;base64,${b64src}` - }) + requestAnimationFrame(waitForNewDocument) } public render() { @@ -391,7 +389,7 @@ export class SandboxedMarkdown extends React.PureComponent<