build(deps-dev): upgrade electron-forge to ^6.0.0-beta.52

.circleci/config.yml

@@ -0,0 +1,210 @@
+step-restore-cache: &step-restore-cache
+  restore_cache:
+    keys:
+      - v1-modules-{{ arch }}-{{ checksum "yarn.lock" }}
+      - v1-modules-{{ arch }}
+step-install: &step-install
+  run: npx yarn --frozen-lockfile && rm -rf node_modules/electron/dist
+step-save-cache: &step-save-cache
+  save_cache:
+    paths:
+      - node_modules
+    key: v1-modules-{{ arch }}-{{ checksum "yarn.lock" }}
+step-install-electron: &step-install-electron
+  run: cd node_modules/electron && node install.js
+
+steps-test: &steps-test
+  steps:
+    - checkout
+    - *step-restore-cache
+    - *step-install
+    - *step-save-cache
+    - *step-install-electron
+    - run: yarn lint
+    - run: yarn test --maxWorkers=4
+
+steps-build: &steps-build
+  steps:
+    - checkout
+    - *step-restore-cache
+    - *step-install
+    - *step-save-cache
+    - *step-install-electron
+    - when:
+        condition: <<parameters.on_linux>>
+        steps:
+          - run:
+              name: Install Linux Dependencies
+              command: sudo apt install -y rpm fakeroot
+    - when:
+        condition: <<parameters.on_mac>>
+        steps:
+          - run:
+              name: Import macOS Certificate
+              command: .circleci/import-macos-cert.sh
+    - when:
+        condition: <<parameters.on_win>>
+        steps:
+          - run:
+              name: Import Windows Certificate
+              command: |
+                if (Test-Path Env:\WINDOWS_CERTIFICATE_P12) {
+                  $workingDirectory = Convert-Path (Resolve-Path -path ".")
+                  $filename = "$workingDirectory\cert.p12"
+                  $bytes = [Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
+                  [IO.File]::WriteAllBytes($filename, $bytes)
+                }
+              shell: powershell.exe
+    - run:
+        name: Publish dry run
+        command: yarn run publish --dry-run --arch=$TARGET_ARCH
+    - store_artifacts:
+        path: out/make
+        destination: dist
+    - persist_to_workspace:
+        root: .
+        paths:
+            - out/make
+            - out/publish-dry-run
+
+version: 2.1
+orbs:
+  win: circleci/windows@1.0.0
+jobs:
+  test-linux:
+    docker:
+      - image: circleci/node:10
+    <<: *steps-test
+  build-linux:
+    docker:
+      - image: circleci/node:10-buster
+    environment:
+      TARGET_ARCH: x64
+    parameters:
+      on_linux:
+        type: boolean
+        default: true
+      on_mac:
+        type: boolean
+        default: false
+      on_win:
+        type: boolean
+        default: false
+    <<: *steps-build
+
+  test-mac:
+    macos:
+      xcode: "10.2.0"
+    <<: *steps-test
+  build-mac:
+    macos:
+      xcode: "10.2.0"
+    environment:
+      TARGET_ARCH: x64
+    parameters:
+      on_linux:
+        type: boolean
+        default: false
+      on_mac:
+        type: boolean
+        default: true
+      on_win:
+        type: boolean
+        default: false
+    <<: *steps-build
+
+  test-windows:
+    executor:
+      name: win/vs2019
+      shell: bash.exe
+    <<: *steps-test
+  build-windows-ia32:
+    executor:
+      name: win/vs2019
+      shell: bash.exe
+    environment:
+      TARGET_ARCH: ia32
+    parameters:
+      on_linux:
+        type: boolean
+        default: false
+      on_mac:
+        type: boolean
+        default: false
+      on_win:
+        type: boolean
+        default: true
+    <<: *steps-build
+  build-windows-x64:
+    executor:
+      name: win/vs2019
+      shell: bash.exe
+    environment:
+      TARGET_ARCH: x64
+    parameters:
+      on_linux:
+        type: boolean
+        default: false
+      on_mac:
+        type: boolean
+        default: false
+      on_win:
+        type: boolean
+        default: true
+    <<: *steps-build
+
+  finalize:
+    docker:
+      - image: circleci/node:10
+    steps:
+      - checkout
+      - *step-restore-cache
+      - *step-install
+      - attach_workspace:
+          at: .
+      - store_artifacts:
+          path: out/make
+          destination: dist
+
+  release:
+    docker:
+      - image: circleci/node:10
+    steps:
+      - checkout
+      - *step-restore-cache
+      - *step-install
+      - attach_workspace:
+          at: .
+      - run: yarn publish --from-dry-run
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - test-linux
+      - test-mac
+      - test-windows
+
+      - build-linux
+      - build-mac
+      - build-windows-ia32
+      - build-windows-x64
+
+      - finalize:
+          requires:
+            - build-linux
+            - build-mac
+            - build-windows-ia32
+            - build-windows-x64
+      - release:
+          requires:
+            - build-linux
+            - build-mac
+            - build-windows-ia32
+            - build-windows-x64
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /v.*/
+

.circleci/import-macos-cert.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+if [[ ! -z $MACOS_CERT_P12 ]]
+then
+
+  export CERTIFICATE_P12=cert.p12;
+  echo $MACOS_CERT_P12 | base64 --decode > $CERTIFICATE_P12;
+  export KEYCHAIN=build.keychain;
+
+  # Create the keychain with a password
+  security create-keychain -p travis $KEYCHAIN;
+
+  # Make the custom keychain default, so xcodebuild will use it for signing
+  security default-keychain -s $KEYCHAIN;
+
+  # Unlock the keychain
+  security unlock-keychain -p travis $KEYCHAIN;
+
+  # Add certificates to keychain and allow codesign to access them
+  # Apple Worldwide Developer Relations Certification Authority
+  security import ./tools/certs/apple.cer -k ~/Library/Keychains/$KEYCHAIN -T /usr/bin/codesign
+  # Developer Authentication Certification Authority
+  security import ./tools/certs/dac.cer -k ~/Library/Keychains/$KEYCHAIN -T /usr/bin/codesign
+  # Developer ID Felix
+  security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MACOS_CERT_PASSWORD -T /usr/bin/codesign 2>&1 >/dev/null;
+  rm $CERTIFICATE_P12;
+
+  security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEYCHAIN
+
+  # Echo the identity
+  security find-identity -v -p codesigning
+fi

.gitignore

@@ -21,7 +21,6 @@
 /out/
 node_modules/
 SHASUMS256.txt
-**/yarn.lock
 compile_commands.json
 .envrc
 .cache

.travis.yml

@@ -1,63 +0,0 @@
-language: node_js
-node_js: "12"
-os:
-- linux
-- osx
-dist: bionic
-osx_image: xcode10
-
-cache:
-  npm: true
-  directories:
-  - $HOME/.cache/electron
-
-addons:
-  apt:
-    packages:
-    - fakeroot
-    - rpm
-
-branches:
-  only:
-  - master
-  - /^v\d+\.\d+\.\d+/
-
-install:
-- npm ci
-- |
-  if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then
-    export CERTIFICATE_P12=cert.p12;
-    echo $MACOS_CERT_P12 | base64 --decode > $CERTIFICATE_P12;
-    export KEYCHAIN=build.keychain;
-
-    # Create the keychain with a password
-    security create-keychain -p travis $KEYCHAIN;
-
-    # Make the custom keychain default, so xcodebuild will use it for signing
-    security default-keychain -s $KEYCHAIN;
-
-    # Unlock the keychain
-    security unlock-keychain -p travis $KEYCHAIN;
-
-    # Add certificates to keychain and allow codesign to access them
-    # Apple Worldwide Developer Relations Certification Authority
-    security import ./tools/certs/apple.cer -k ~/Library/Keychains/$KEYCHAIN -T /usr/bin/codesign
-    # Developer Authentication Certification Authority
-    security import ./tools/certs/dac.cer -k ~/Library/Keychains/$KEYCHAIN -T /usr/bin/codesign
-    # Developer ID Felix
-    security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MACOS_CERT_PASSWORD -T /usr/bin/codesign 2>&1 >/dev/null;
-    rm $CERTIFICATE_P12;
-
-    security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEYCHAIN
-
-    # Echo the identity
-    security find-identity -v -p codesigning
-  fi
-
-script:
-- npm run lint
-- npm run test:ci
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run test:coverage; fi
-- if test -z "$TRAVIS_TAG"; then npm run make; fi
-
-after_success: if test -n "$TRAVIS_TAG"; then npm run publish; fi

appveyor.yml

@@ -1,37 +0,0 @@
-environment:
-  matrix:
-    - nodejs_version: "12"
-
-init:
-- git config --global core.symlinks true
-
-install:
-  # Setup the code signing certificate
-  - ps: >-
-      if (Test-Path Env:\WINDOWS_CERTIFICATE_P12) {
-        $workingDirectory = Convert-Path (Resolve-Path -path ".")
-        $filename = "$workingDirectory\cert.p12"
-        $bytes = [Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
-        [IO.File]::WriteAllBytes($filename, $bytes)
-      }
-  - ps: Install-Product node $env:nodejs_version x64
-  - node --version
-  - npm ci
-
-cache:
-  - '%APPDATA%\npm-cache -> appveyor.yml'
-
-test_script:
-  - node --version
-  - npm --version
-  - npm run lint
-  - npm run test
-
-artifacts:
-  - path: 'out\make\squirrel.windows\**\*.exe'
-
-build_script:
-  - if %APPVEYOR_REPO_TAG% EQU false npm run make
-  - if %APPVEYOR_REPO_TAG% EQU true npm run publish
-  - if %APPVEYOR_REPO_TAG% EQU true npm run publish -- --arch=ia32
-  - ps: Tree ./out/make /F

package.json

@@ -64,12 +64,12 @@
   },
   "devDependencies": {
     "@babel/core": "^7.8.6",
-    "@electron-forge/cli": "^6.0.0-beta.50",
-    "@electron-forge/maker-deb": "^6.0.0-beta.50",
-    "@electron-forge/maker-rpm": "^6.0.0-beta.50",
-    "@electron-forge/maker-squirrel": "^6.0.0-beta.50",
-    "@electron-forge/maker-zip": "^6.0.0-beta.50",
-    "@electron-forge/publisher-github": "^6.0.0-beta.50",
+    "@electron-forge/cli": "^6.0.0-beta.52",
+    "@electron-forge/maker-deb": "^6.0.0-beta.52",
+    "@electron-forge/maker-rpm": "^6.0.0-beta.52",
+    "@electron-forge/maker-squirrel": "^6.0.0-beta.52",
+    "@electron-forge/maker-zip": "^6.0.0-beta.52",
+    "@electron-forge/publisher-github": "^6.0.0-beta.52",
     "@octokit/action": "^2.0.0",
     "@types/classnames": "^2.2.9",
     "@types/enzyme": "^3.10.5",