GitHub-Bitwarden
/
desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Bump electron dependencies (#1447) 

Co-authored-by: Micaiah Martin <mmartin@bitwarden.com>
pull/1476/head
Oscar Hinton 4 years ago committed by GitHub
parent
78986023e7
commit
be1ab221f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2901 additions and 1967 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .github/secrets/appstore-app-cert.p12.gpg
  2. BIN
      .github/secrets/bitwarden-desktop-key.p12.gpg
  3. BIN
      .github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg
  4. BIN
      .github/secrets/bitwarden_safari_appstore.provisionprofile.gpg
  5. 46
      .github/workflows/build.yml
  6. 4817
      package-lock.json
  7. 5
      package.json

BIN
.github/secrets/appstore-app-cert.p12.gpg
View File

Binary file not shown.

BIN
.github/secrets/bitwarden-desktop-key.p12.gpg
View File

Binary file not shown.

BIN
.github/secrets/bitwarden_desktop_appstore.provisionprofile.gpg
View File

Binary file not shown.

BIN
.github/secrets/bitwarden_safari_appstore.provisionprofile.gpg
View File

Binary file not shown.

46
.github/workflows/build.yml
Unescape View File

@ -452,6 +452,9 @@ jobs: @@ -452,6 +452,9 @@ 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
@ -460,6 +463,8 @@ jobs: @@ -460,6 +463,8 @@ 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: |
@ -467,13 +472,13 @@ jobs: @@ -467,13 +472,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 $DESKTOP_KEY_PASSWORD \
security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_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_CERT_PASSWORD \
security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_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
@ -484,8 +489,8 @@ jobs: @@ -484,8 +489,8 @@ jobs:
- name: Set up provisioning profiles
shell: bash
run: |
cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
$GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile
cp $HOME/secrets/*.provisionprofile \
$GITHUB_WORKSPACE/
- name: Increment version
shell: pwsh
@ -596,6 +601,9 @@ jobs: @@ -596,6 +601,9 @@ 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
@ -604,6 +612,8 @@ jobs: @@ -604,6 +612,8 @@ 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: |
@ -611,13 +621,13 @@ jobs: @@ -611,13 +621,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 $DESKTOP_KEY_PASSWORD \
security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_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_CERT_PASSWORD \
security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_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
@ -628,8 +638,8 @@ jobs: @@ -628,8 +638,8 @@ jobs:
- name: Set up provisioning profiles
shell: bash
run: |
cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
$GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile
cp $HOME/secrets/*.provisionprofile \
$GITHUB_WORKSPACE/
- name: Increment version
shell: pwsh
@ -783,6 +793,9 @@ jobs: @@ -783,6 +793,9 @@ 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
@ -791,6 +804,8 @@ jobs: @@ -791,6 +804,8 @@ 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: |
@ -798,13 +813,13 @@ jobs: @@ -798,13 +813,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 $DESKTOP_KEY_PASSWORD \
security import "$HOME/secrets/bitwarden-desktop-key.p12" -k build.keychain -P $APPSTORE_NEW_CERT_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_CERT_PASSWORD \
security import "$HOME/secrets/appstore-app-cert.p12" -k build.keychain -P $APPSTORE_NEW_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
@ -815,8 +830,8 @@ jobs: @@ -815,8 +830,8 @@ jobs:
- name: Set up provisioning profiles
shell: bash
run: |
cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
$GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile
cp $HOME/secrets/*.provisionprofile \
$GITHUB_WORKSPACE/
- name: Increment version
shell: pwsh
@ -962,6 +977,9 @@ jobs: @@ -962,6 +977,9 @@ 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
@ -994,8 +1012,8 @@ jobs: @@ -994,8 +1012,8 @@ jobs:
- name: Set up provisioning profiles
shell: bash
run: |
cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
$GITHUB_WORKSPACE/bitwarden_desktop_appstore.provisionprofile
cp $HOME/secrets/*.provisionprofile \
$GITHUB_WORKSPACE/
- name: Increment version
shell: pwsh

4817
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
Unescape View File

@ -272,7 +272,7 @@ @@ -272,7 +272,7 @@
"copy-webpack-plugin": "^10.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"electron-builder": "22.11.7",
"electron-builder": "22.14.13",
"electron-notarize": "^1.1.1",
"electron-rebuild": "^3.2.5",
"electron-reload": "^1.5.0",
@ -319,7 +319,8 @@ @@ -319,7 +319,8 @@
"nord": "^0.2.1",
"regedit": "^3.0.3",
"rxjs": "^7.4.0",
"sweetalert2": "^10.16.6"
"sweetalert2": "^10.16.6",
"zone.js": "0.11.4"
},
"engines": {
"node": "~16",

Write Preview
Loading…
Cancel
Save