From 6b6666cd0d289764d708fb3d31ac827bd329bd87 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 7 Apr 2022 22:13:58 +0200 Subject: [PATCH] Undo electron builder bump (#1477) --- .github/secrets/appstore-app-cert.p12.gpg | Bin 3332 -> 3378 bytes .github/secrets/bitwarden-desktop-key.p12.gpg | Bin 3341 -> 3375 bytes ...rden_desktop_appstore.provisionprofile.gpg | Bin 7698 -> 7712 bytes ...arden_safari_appstore.provisionprofile.gpg | Bin 7744 -> 0 bytes .github/workflows/build.yml | 46 +- package-lock.json | 1088 ++++------------- package.json | 2 +- 7 files changed, 280 insertions(+), 856 deletions(-) delete mode 100644 .github/secrets/bitwarden_safari_appstore.provisionprofile.gpg diff --git a/.github/secrets/appstore-app-cert.p12.gpg b/.github/secrets/appstore-app-cert.p12.gpg index 584a705744a9a46c0006b80767a98d38752dfd72..ef81792f3d3bce77a2610dbbad74c1b3847b02c6 100644 GIT binary patch literal 3378 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 I*rQsLKoatq*#H0l literal 3332 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 OuwJP4x_JX+Jf_Ul+IC$4 diff --git a/.github/secrets/bitwarden-desktop-key.p12.gpg b/.github/secrets/bitwarden-desktop-key.p12.gpg index 1bf8ea13d79cce11725bc3e62a238a7be4416059..84c7f00e2d3e495695f1e86ff4fdec3495504746 100644 GIT binary patch literal 3375 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 FPi)jCo|OOq literal 3341 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 a3G0r-vVtEYOoPA+E1UKxFe;4rw!7yT{smqD literal 7698 zcmV+t9_`_b4Fm}T0+pG0zT8k+2J_PF0kuqSw)1S-dCZ%L2G~S}B;i_x)>o&y4w-pM zVCl5$Q?$Ox`M^K7r{R7Q8H@N&1e%>ejnqA!+5ZzuXB!xO%kv%wP*J7wH`=~1^Zw!< zT?rI{m?iO0wz47l`zC*MRy>Fs5kSoBj1_*Myp{RyhATAR+|WKQ@e&0E9RDX}y~-i` zQnn5ApKkLs%p4US-b!3Z?sX5jsRYOXYXr#cn4s!7i|l2~ zQ?#4a`391!;6|@+s3R*GTeKpj@$z4<&rF@Yfh0LXgEg2{ABJ;6rk0EMmr{BKT5e=5 z#|fOBzA*(=%FL!#QC^@-{_Kl&uZd1cP81~fwko3G^esZ7Tk9Vf$qT;)!v%mBP+BXk z6n^~H5wp+y3MD!XY`por{g`lA94)T>s%l1x1I@t-(oFdb%)aLyW((#$KGggLJp5jA z#)_RlC#vT;27w5;_A+A^kcWq+B=D!+Bzn%8M?_|Fx3qH;Ft&`1>DKNFwT#v?M5_`n zsuf@NvO}`dlmj@V`wDRpCZYGhASV&Jk%b_a1S_-b>n*Sa*eg0G@F^$|>%2e|YifrD1ts`senIRbM&Z*i9ZP}5<2#y?wB~~XkqqAoxvVJe7F(pdiBsiRpSB@+_GX3^A|^i$`Jf}6t>&< z-Zz>;f^63y!Q{2*fj(qf6?X3=P{ZQlK1cQ#CWAwqLio43y{$?u@y= zUZ}=Z5Bdy8ZQN=geOehO*Wx zNL=3`dMD27HXq-%C5@{(H-L38Y6u$1^Aw&w98?~6lyT~#Rze%;kqE;-;3zG>I zbB$cPo2|tY#Qgw_e2iyv_y;%)3CSl#(L?*O-0)k7yi&AEvf3IsP=)24cU(<{Dpk

cny>5DXjH_k&Vc&U=>YCMAyY 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 MGk!y=dFo(cRJ^|i{r~^~ diff --git a/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg b/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg deleted file mode 100644 index e5d68bef1ddc060736fddb8f9ee5295aafc735d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7744 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 G+OPaB*Z55U diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b54a93d4..2ef3d73e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -452,9 +452,6 @@ jobs: gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ --output "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \ "$GITHUB_WORKSPACE/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg" - gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output "$HOME/secrets/bitwarden_safari_appstore.provisionprofile" \ - "$GITHUB_WORKSPACE/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg" - name: Set up keychain shell: bash @@ -463,8 +460,6 @@ jobs: DESKTOP_KEY_PASSWORD: ${{ secrets.DESKTOP_KEY_PASSWORD }} DEVID_CERT_PASSWORD: ${{ secrets.DEVID_CERT_PASSWORD }} APPSTORE_CERT_PASSWORD: ${{ secrets.APPSTORE_CERT_PASSWORD }} - # New certificate type - APPSTORE_NEW_CERT_PASSWORD: ${{ secrets.APPSTORE_NEW_CERT_PASSWORD }} MACDEV_CERT_PASSWORD: ${{ secrets.MACDEV_CERT_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} run: | @@ -472,13 +467,13 @@ jobs: security default-keychain -s build.keychain security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain security set-keychain-settings -lut 1200 build.keychain - security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $DESKTOP_KEY_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-app-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-installer-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild - security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/appstore-installer-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild @@ -489,8 +484,8 @@ jobs: - name: Set up provisioning profiles shell: bash run: | - cp $HOME/secrets/*.provisionprofile \ - $GITHUB_WORKSPACE/ + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile - name: Increment version shell: pwsh @@ -601,9 +596,6 @@ jobs: gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ --output "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \ "$GITHUB_WORKSPACE/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg" - gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output "$HOME/secrets/bitwarden_safari_appstore.provisionprofile" \ - "$GITHUB_WORKSPACE/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg" - name: Set up keychain shell: bash @@ -612,8 +604,6 @@ jobs: DESKTOP_KEY_PASSWORD: ${{ secrets.DESKTOP_KEY_PASSWORD }} DEVID_CERT_PASSWORD: ${{ secrets.DEVID_CERT_PASSWORD }} APPSTORE_CERT_PASSWORD: ${{ secrets.APPSTORE_CERT_PASSWORD }} - # New certificate type - APPSTORE_NEW_CERT_PASSWORD: ${{ secrets.APPSTORE_NEW_CERT_PASSWORD }} MACDEV_CERT_PASSWORD: ${{ secrets.MACDEV_CERT_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} run: | @@ -621,13 +611,13 @@ jobs: security default-keychain -s build.keychain security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain security set-keychain-settings -lut 1200 build.keychain - security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $DESKTOP_KEY_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-app-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-installer-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild - security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/appstore-installer-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild @@ -638,8 +628,8 @@ jobs: - name: Set up provisioning profiles shell: bash run: | - cp $HOME/secrets/*.provisionprofile \ - $GITHUB_WORKSPACE/ + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile - name: Increment version shell: pwsh @@ -793,9 +783,6 @@ jobs: gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ --output "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \ "$GITHUB_WORKSPACE/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg" - gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output "$HOME/secrets/bitwarden_safari_appstore.provisionprofile" \ - "$GITHUB_WORKSPACE/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg" - name: Set up keychain shell: bash @@ -804,8 +791,6 @@ jobs: DESKTOP_KEY_PASSWORD: ${{ secrets.DESKTOP_KEY_PASSWORD }} DEVID_CERT_PASSWORD: ${{ secrets.DEVID_CERT_PASSWORD }} APPSTORE_CERT_PASSWORD: ${{ secrets.APPSTORE_CERT_PASSWORD }} - # New certificate type - APPSTORE_NEW_CERT_PASSWORD: ${{ secrets.APPSTORE_NEW_CERT_PASSWORD }} MACDEV_CERT_PASSWORD: ${{ secrets.MACDEV_CERT_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} run: | @@ -813,13 +798,13 @@ jobs: security default-keychain -s build.keychain security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain security set-keychain-settings -lut 1200 build.keychain - security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $DESKTOP_KEY_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-app-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/devid-installer-cert.p12" -k build.keychain -P $DEVID_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild - security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_CERT_PASSWORD \ + security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild security import "$HOME/secrets/appstore-installer-cert.p12" -k build.keychain -P $APPSTORE_CERT_PASSWORD \ -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild @@ -830,8 +815,8 @@ jobs: - name: Set up provisioning profiles shell: bash run: | - cp $HOME/secrets/*.provisionprofile \ - $GITHUB_WORKSPACE/ + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile - name: Increment version shell: pwsh @@ -977,9 +962,6 @@ jobs: gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ --output "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \ "$GITHUB_WORKSPACE/.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg" - gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \ - --output "$HOME/secrets/bitwarden_safari_appstore.provisionprofile" \ - "$GITHUB_WORKSPACE/.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg" - name: Set up keychain shell: bash @@ -1012,8 +994,8 @@ jobs: - name: Set up provisioning profiles shell: bash run: | - cp $HOME/secrets/*.provisionprofile \ - $GITHUB_WORKSPACE/ + cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \ + $GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile - name: Increment version shell: pwsh diff --git a/package-lock.json b/package-lock.json index 04cd151d..134babd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "copy-webpack-plugin": "^10.0.0", "cross-env": "^7.0.3", "css-loader": "^6.5.1", - "electron-builder": "22.14.13", + "electron-builder": "22.11.7", "electron-notarize": "^1.1.1", "electron-rebuild": "^3.2.5", "electron-reload": "^1.5.0", @@ -87,7 +87,6 @@ } }, "jslib/angular": { - "name": "@bitwarden/jslib-common", "version": "0.0.0", "license": "GPL-3.0", "dependencies": { @@ -143,13 +142,10 @@ "license": "GPL-3.0", "dependencies": { "@bitwarden/jslib-common": "file:../common", - "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", "electron": "16.1.0", "electron-log": "4.4.6", "electron-store": "8.0.1", - "electron-updater": "5.0.0", - "forcefocus": "^1.1.0", - "keytar": "7.7.0" + "electron-updater": "5.0.0" }, "devDependencies": { "@types/node": "^16.11.12", @@ -369,25 +365,25 @@ } }, "node_modules/@babel/core": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz", - "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz", + "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.7", + "@babel/generator": "^7.17.9", "@babel/helper-compilation-targets": "^7.17.7", "@babel/helper-module-transforms": "^7.17.7", - "@babel/helpers": "^7.17.8", - "@babel/parser": "^7.17.8", + "@babel/helpers": "^7.17.9", + "@babel/parser": "^7.17.9", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", + "@babel/traverse": "^7.17.9", "@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", + "json5": "^2.2.1", "semver": "^6.3.0" }, "engines": { @@ -408,9 +404,9 @@ } }, "node_modules/@babel/generator": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", - "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz", + "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==", "dev": true, "dependencies": { "@babel/types": "^7.17.0", @@ -470,26 +466,13 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz", - "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", + "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", "dev": true, "dependencies": { - "@babel/helper-get-function-arity": "^7.16.7", "@babel/template": "^7.16.7", - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz", - "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.17.0" }, "engines": { "node": ">=6.9.0" @@ -581,13 +564,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz", - "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz", + "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==", "dev": true, "dependencies": { "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", + "@babel/traverse": "^7.17.9", "@babel/types": "^7.17.0" }, "engines": { @@ -595,9 +578,9 @@ } }, "node_modules/@babel/highlight": { - "version": "7.16.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", - "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", + "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.16.7", @@ -609,9 +592,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz", - "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz", + "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -635,18 +618,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz", + "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", + "@babel/generator": "^7.17.9", "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", + "@babel/helper-function-name": "^7.17.9", "@babel/helper-hoist-variables": "^7.16.7", "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.3", + "@babel/parser": "^7.17.9", "@babel/types": "^7.17.0", "debug": "^4.1.0", "globals": "^11.1.0" @@ -1231,12 +1214,12 @@ } }, "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true, "engines": { - "node": ">= 10" + "node": ">= 6" } }, "node_modules/@types/cacheable-request": { @@ -1440,9 +1423,9 @@ "optional": true }, "node_modules/@types/yargs": { - "version": "17.0.10", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", - "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -2049,15 +2032,15 @@ } }, "node_modules/app-builder-bin": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz", - "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==", + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", + "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", "dev": true }, "node_modules/app-builder-lib": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz", - "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", + "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", "dev": true, "dependencies": { "@develar/schema-utils": "~2.6.5", @@ -2066,14 +2049,12 @@ "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", - "electron-osx-sign": "^0.5.0", - "electron-publish": "22.14.13", - "form-data": "^4.0.0", + "electron-publish": "22.11.7", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", "is-ci": "^3.0.0", @@ -2228,12 +2209,6 @@ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -2530,22 +2505,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, - "dependencies": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "node_modules/buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true - }, "node_modules/buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -2563,35 +2522,26 @@ "node": ">=0.4.0" } }, - "node_modules/buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true - }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "node_modules/builder-util": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz", - "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", + "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", "dev": true, "dependencies": { - "@types/debug": "^4.1.6", + "@types/debug": "^4.1.5", "@types/fs-extra": "^9.0.11", "7zip-bin": "~5.1.1", - "app-builder-bin": "3.7.1", + "app-builder-bin": "3.5.13", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.9.2", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", - "cross-spawn": "^7.0.3", "debug": "^4.3.2", "fs-extra": "^10.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", @@ -2600,9 +2550,9 @@ } }, "node_modules/builder-util-runtime": { - "version": "8.9.2", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", - "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", + "version": "8.7.7", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", + "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", "dev": true, "dependencies": { "debug": "^4.3.2", @@ -3076,18 +3026,6 @@ "node": ">=0.1.90" } }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", @@ -3097,15 +3035,6 @@ "node": ">= 6" } }, - "node_modules/compare-version": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/compress-brotli": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.6.tgz", @@ -3802,15 +3731,6 @@ "rimraf": "bin.js" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -3903,14 +3823,14 @@ } }, "node_modules/dmg-builder": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz", - "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", + "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", "dev": true, "dependencies": { - "app-builder-lib": "22.14.13", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "app-builder-lib": "22.11.7", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.6", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" @@ -3919,6 +3839,19 @@ "dmg-license": "^1.0.9" } }, + "node_modules/dmg-builder/node_modules/builder-util-runtime": { + "version": "8.7.6", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", + "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", + "dev": true, + "dependencies": { + "debug": "^4.3.2", + "sax": "^1.2.4" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/dmg-license": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", @@ -3982,9 +3915,9 @@ } }, "node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, "funding": [ { @@ -4116,17 +4049,17 @@ } }, "node_modules/electron-builder": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz", - "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", + "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", "dev": true, "dependencies": { - "@types/yargs": "^17.0.1", - "app-builder-lib": "22.14.13", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "@types/yargs": "^16.0.2", + "app-builder-lib": "22.11.7", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", - "dmg-builder": "22.14.13", + "dmg-builder": "22.11.7", "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -4245,63 +4178,15 @@ "node": ">=10" } }, - "node_modules/electron-osx-sign": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", - "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", - "dev": true, - "dependencies": { - "bluebird": "^3.5.0", - "compare-version": "^0.1.2", - "debug": "^2.6.8", - "isbinaryfile": "^3.0.2", - "minimist": "^1.2.0", - "plist": "^3.0.1" - }, - "bin": { - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/electron-osx-sign/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/electron-osx-sign/node_modules/isbinaryfile": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", - "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true, - "dependencies": { - "buffer-alloc": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/electron-osx-sign/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "node_modules/electron-publish": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz", - "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", + "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", "dev": true, "dependencies": { "@types/fs-extra": "^9.0.11", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -4531,9 +4416,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.103", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz", - "integrity": "sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg==", + "version": "1.4.106", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz", + "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==", "dev": true }, "node_modules/electron-updater": { @@ -4886,9 +4771,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.25.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz", - "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", "dev": true, "dependencies": { "array-includes": "^3.1.4", @@ -4896,14 +4781,14 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.2", + "eslint-module-utils": "^2.7.3", "has": "^1.0.3", - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "is-glob": "^4.0.3", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "object.values": "^1.1.5", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.12.0" + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" }, "engines": { "node": ">=4" @@ -5479,20 +5364,6 @@ "node": ">=4" } }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -6020,12 +5891,12 @@ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "dependencies": { - "@tootallnate/once": "2", + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" }, @@ -6920,172 +6791,10 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/keytar": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", - "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", - "hasInstallScript": true, - "dependencies": { - "node-addon-api": "^3.0.0", - "prebuild-install": "^6.0.0" - } - }, - "node_modules/keytar/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/keytar/node_modules/aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "node_modules/keytar/node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "node_modules/keytar/node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "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" - } - }, - "node_modules/keytar/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/keytar/node_modules/node-abi": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", - "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", - "dependencies": { - "semver": "^5.4.1" - } - }, - "node_modules/keytar/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" - }, - "node_modules/keytar/node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "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" - } - }, - "node_modules/keytar/node_modules/prebuild-install": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz", - "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==", - "dependencies": { - "detect-libc": "^1.0.3", - "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": "^2.21.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/keytar/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "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" - } - }, - "node_modules/keytar/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/keytar/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/keytar/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/keytar/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/keyv": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz", - "integrity": "sha512-cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz", + "integrity": "sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==", "dev": true, "dependencies": { "compress-brotli": "^1.3.6", @@ -7596,6 +7305,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -7692,29 +7402,6 @@ "node": ">= 10" } }, - "node_modules/make-fetch-happen/node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/matcher": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", @@ -9051,6 +8738,7 @@ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz", "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==", "dev": true, + "optional": true, "dependencies": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" @@ -9064,6 +8752,7 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true, + "optional": true, "engines": { "node": ">=4.0" } @@ -9835,9 +9524,9 @@ } }, "node_modules/sass": { - "version": "1.49.11", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz", - "integrity": "sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz", + "integrity": "sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -9948,17 +9637,17 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", + "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", "dependencies": { - "lru-cache": "^6.0.0" + "lru-cache": "^7.4.0" }, "bin": { "semver": "bin/semver.js" }, "engines": { - "node": ">=10" + "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/semver-compare": { @@ -9988,6 +9677,14 @@ "semver": "bin/semver.js" } }, + "node_modules/semver/node_modules/lru-cache": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz", + "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==", + "engines": { + "node": ">=12" + } + }, "node_modules/serialize-error": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", @@ -11307,9 +11004,9 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "node_modules/webpack": { - "version": "5.71.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz", - "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==", + "version": "5.72.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz", + "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -11651,7 +11348,8 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/yaml": { "version": "1.10.2", @@ -11833,25 +11531,25 @@ "dev": true }, "@babel/core": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz", - "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz", + "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.7", + "@babel/generator": "^7.17.9", "@babel/helper-compilation-targets": "^7.17.7", "@babel/helper-module-transforms": "^7.17.7", - "@babel/helpers": "^7.17.8", - "@babel/parser": "^7.17.8", + "@babel/helpers": "^7.17.9", + "@babel/parser": "^7.17.9", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", + "@babel/traverse": "^7.17.9", "@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", + "json5": "^2.2.1", "semver": "^6.3.0" }, "dependencies": { @@ -11864,9 +11562,9 @@ } }, "@babel/generator": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", - "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz", + "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==", "dev": true, "requires": { "@babel/types": "^7.17.0", @@ -11912,23 +11610,13 @@ } }, "@babel/helper-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz", - "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", + "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.16.7", "@babel/template": "^7.16.7", - "@babel/types": "^7.16.7" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz", - "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==", - "dev": true, - "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.17.0" } }, "@babel/helper-hoist-variables": { @@ -11996,20 +11684,20 @@ "dev": true }, "@babel/helpers": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz", - "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz", + "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==", "dev": true, "requires": { "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", + "@babel/traverse": "^7.17.9", "@babel/types": "^7.17.0" } }, "@babel/highlight": { - "version": "7.16.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", - "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", + "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.16.7", @@ -12018,9 +11706,9 @@ } }, "@babel/parser": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz", - "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz", + "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==", "dev": true }, "@babel/template": { @@ -12035,18 +11723,18 @@ } }, "@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz", + "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==", "dev": true, "requires": { "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", + "@babel/generator": "^7.17.9", "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", + "@babel/helper-function-name": "^7.17.9", "@babel/helper-hoist-variables": "^7.16.7", "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.3", + "@babel/parser": "^7.17.9", "@babel/types": "^7.17.0", "debug": "^4.1.0", "globals": "^11.1.0" @@ -12118,14 +11806,11 @@ "version": "file:jslib/electron", "requires": { "@bitwarden/jslib-common": "file:../common", - "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", "@types/node": "^16.11.12", "electron": "16.1.0", "electron-log": "4.4.6", "electron-store": "8.0.1", "electron-updater": "5.0.0", - "forcefocus": "^1.1.0", - "keytar": "7.7.0", "rimraf": "^3.0.2", "typescript": "4.3.5" } @@ -12548,9 +12233,9 @@ } }, "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, "@types/cacheable-request": { @@ -12754,9 +12439,9 @@ "optional": true }, "@types/yargs": { - "version": "17.0.10", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", - "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -13208,15 +12893,15 @@ } }, "app-builder-bin": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz", - "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==", + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", + "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", "dev": true }, "app-builder-lib": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz", - "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", + "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", "dev": true, "requires": { "@develar/schema-utils": "~2.6.5", @@ -13225,14 +12910,12 @@ "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", - "electron-osx-sign": "^0.5.0", - "electron-publish": "22.14.13", - "form-data": "^4.0.0", + "electron-publish": "22.11.7", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", "is-ci": "^3.0.0", @@ -13346,12 +13029,6 @@ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, "at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -13555,22 +13232,6 @@ "ieee754": "^1.1.13" } }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true - }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -13582,35 +13243,26 @@ "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", "dev": true }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true - }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "builder-util": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz", - "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", + "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", "dev": true, "requires": { - "@types/debug": "^4.1.6", + "@types/debug": "^4.1.5", "@types/fs-extra": "^9.0.11", "7zip-bin": "~5.1.1", - "app-builder-bin": "3.7.1", + "app-builder-bin": "3.5.13", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.9.2", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", - "cross-spawn": "^7.0.3", "debug": "^4.3.2", "fs-extra": "^10.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", @@ -13670,9 +13322,9 @@ } }, "builder-util-runtime": { - "version": "8.9.2", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", - "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", + "version": "8.7.7", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", + "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", "dev": true, "requires": { "debug": "^4.3.2", @@ -13967,27 +13619,12 @@ "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", "dev": true }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", "dev": true }, - "compare-version": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", - "dev": true - }, "compress-brotli": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.6.tgz", @@ -14504,12 +14141,6 @@ } } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -14580,18 +14211,30 @@ } }, "dmg-builder": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz", - "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", + "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", "dev": true, "requires": { - "app-builder-lib": "22.14.13", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "app-builder-lib": "22.11.7", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.6", "dmg-license": "^1.0.9", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" + }, + "dependencies": { + "builder-util-runtime": { + "version": "8.7.6", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", + "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", + "dev": true, + "requires": { + "debug": "^4.3.2", + "sax": "^1.2.4" + } + } } }, "dmg-license": { @@ -14641,9 +14284,9 @@ } }, "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true }, "domhandler": { @@ -14744,17 +14387,17 @@ } }, "electron-builder": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz", - "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", + "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", "dev": true, "requires": { - "@types/yargs": "^17.0.1", - "app-builder-lib": "22.14.13", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "@types/yargs": "^16.0.2", + "app-builder-lib": "22.11.7", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", - "dmg-builder": "22.14.13", + "dmg-builder": "22.11.7", "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -14843,55 +14486,15 @@ } } }, - "electron-osx-sign": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", - "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", - "dev": true, - "requires": { - "bluebird": "^3.5.0", - "compare-version": "^0.1.2", - "debug": "^2.6.8", - "isbinaryfile": "^3.0.2", - "minimist": "^1.2.0", - "plist": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "isbinaryfile": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", - "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true, - "requires": { - "buffer-alloc": "^1.2.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, "electron-publish": { - "version": "22.14.13", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz", - "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==", + "version": "22.11.7", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", + "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", "dev": true, "requires": { "@types/fs-extra": "^9.0.11", - "builder-util": "22.14.13", - "builder-util-runtime": "8.9.2", + "builder-util": "22.11.7", + "builder-util-runtime": "8.7.7", "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -15057,9 +14660,9 @@ } }, "electron-to-chromium": { - "version": "1.4.103", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz", - "integrity": "sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg==", + "version": "1.4.106", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz", + "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==", "dev": true }, "electron-updater": { @@ -15440,9 +15043,9 @@ } }, "eslint-plugin-import": { - "version": "2.25.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz", - "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", "dev": true, "requires": { "array-includes": "^3.1.4", @@ -15450,14 +15053,14 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.2", + "eslint-module-utils": "^2.7.3", "has": "^1.0.3", - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "is-glob": "^4.0.3", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "object.values": "^1.1.5", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.12.0" + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" }, "dependencies": { "debug": { @@ -15799,17 +15402,6 @@ "prebuild-install": "^5.0.0" } }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -16194,12 +15786,12 @@ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { - "@tootallnate/once": "2", + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" } @@ -16824,152 +16416,10 @@ "universalify": "^2.0.0" } }, - "keytar": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", - "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", - "requires": { - "node-addon-api": "^3.0.0", - "prebuild-install": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "requires": { - "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" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "node-abi": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", - "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", - "requires": { - "semver": "^5.4.1" - } - }, - "node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "prebuild-install": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz", - "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==", - "requires": { - "detect-libc": "^1.0.3", - "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": "^2.21.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "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" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, "keyv": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz", - "integrity": "sha512-cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz", + "integrity": "sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==", "dev": true, "requires": { "compress-brotli": "^1.3.6", @@ -17333,6 +16783,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -17409,25 +16860,6 @@ "promise-retry": "^2.0.1", "socks-proxy-agent": "^6.0.0", "ssri": "^8.0.0" - }, - "dependencies": { - "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true - }, - "http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "requires": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - } - } } }, "matcher": { @@ -18432,6 +17864,7 @@ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz", "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==", "dev": true, + "optional": true, "requires": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" @@ -18441,7 +17874,8 @@ "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "dev": true + "dev": true, + "optional": true } } }, @@ -19024,9 +18458,9 @@ } }, "sass": { - "version": "1.49.11", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz", - "integrity": "sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz", + "integrity": "sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -19091,11 +18525,18 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", + "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", "requires": { - "lru-cache": "^6.0.0" + "lru-cache": "^7.4.0" + }, + "dependencies": { + "lru-cache": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz", + "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==" + } } }, "semver-compare": { @@ -20131,9 +19572,9 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "webpack": { - "version": "5.71.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz", - "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==", + "version": "5.72.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz", + "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -20379,7 +19820,8 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "yaml": { "version": "1.10.2", diff --git a/package.json b/package.json index 9f03a46b..6c1b1909 100644 --- a/package.json +++ b/package.json @@ -272,7 +272,7 @@ "copy-webpack-plugin": "^10.0.0", "cross-env": "^7.0.3", "css-loader": "^6.5.1", - "electron-builder": "22.14.13", + "electron-builder": "22.11.7", "electron-notarize": "^1.1.1", "electron-rebuild": "^3.2.5", "electron-reload": "^1.5.0",