build: re-add electron builder stuff

.github/workflows/build.yml

@@ -81,7 +81,7 @@ jobs:
 
             ### Installation
             - **Windows**: Download the `.exe` installer
-            - **macOS**: Download the `.dmg` file  
+            - **macOS**: Download the `.dmg` file
             - **Linux**: Download the `.AppImage` file or install via Snap Store
             - **Android**: Download the `.apk` file or get it from Google Play Store
 
@@ -91,7 +91,7 @@ jobs:
             If you encounter any issues, please report them on our [GitHub Issues](https://github.com/johannesjo/super-productivity/issues) page.
 
       # rename to possibly fix release issue
-      - run: find ./app-builds -type f -name '*.snap' -exec sh -c 'x="{}"; mv "$x" "app-builds/sp.snap"' \;
+      - run: find ./.tmp/app-builds -type f -name '*.snap' -exec sh -c 'x="{}"; mv "$x" ".tmp/app-builds/sp.snap"' \;
       # Release to edge if no tag and to candidate if tag
       - #otherwise it would be executed twice
         if: false == startsWith(github.ref, 'refs/tags/v')
@@ -99,7 +99,7 @@ jobs:
         with:
           max_attempts: 2
           timeout_minutes: 11
-          command: snapcraft push app-builds/sp.snap --release edge
+          command: snapcraft push .tmp/app-builds/sp.snap --release edge
       #      - run: snapcraft push app-builds/sp.snap --release candidate
       #        if: startsWith(github.ref, 'refs/tags/v')
   #      - run: snapcraft promote superproductivity --from-channel latest/edge --to-channel latest/candidate --yes
@@ -191,7 +191,7 @@ jobs:
 
             ### Installation
             - **Windows**: Download the `.exe` installer
-            - **macOS**: Download the `.dmg` file  
+            - **macOS**: Download the `.dmg` file
             - **Linux**: Download the `.AppImage` file or install via Snap Store
             - **Android**: Download the `.apk` file or get it from Google Play Store
 
@@ -272,7 +272,7 @@ jobs:
 
             ### Installation
             - **Windows**: Download the `.exe` installer
-            - **macOS**: Download the `.dmg` file  
+            - **macOS**: Download the `.dmg` file
             - **Linux**: Download the `.AppImage` file or install via Snap Store
             - **Android**: Download the `.apk` file or get it from Google Play Store
 

angular.json

@@ -97,6 +97,7 @@
               "serviceWorker": "ngsw-config.json"
             },
             "productionWeb": {
+              "outputPath": "dist/browser",
               "budgets": [
                 {
                   "type": "anyComponentStyle",
@@ -154,6 +155,7 @@
               "serviceWorker": false
             },
             "stageWeb": {
+              "outputPath": "dist/browser",
               "budgets": [
                 {
                   "type": "anyComponentStyle",

build/electron-builder.mas-dev.yaml

@@ -0,0 +1,31 @@
+appId: com.super-productivity.app
+productName: Super Productivity
+artifactName: ${name}-${arch}.${ext}
+files:
+  - electron/**/*
+  - '!electron/**/*.ts'
+  - '!electron/**/*.js.map'
+  - dist/**/*
+  - 'embedded.provisionprofile'
+directories:
+  output: './app-builds'
+
+mac:
+  appId: com.super-productivity.app
+  type: development
+  category: public.app-category.productivity
+  #  entitlements: build/entitlements.mac.plist
+  #  entitlementsInherit: build/entitlements.mac.plist
+  icon: build/icon-mac.icns
+  hardenedRuntime: false
+  gatekeeperAssess: false
+  provisioningProfile: embedded.provisionprofile
+  #  darkModeSupport: true
+  target:
+    - mas-dev
+
+mas:
+  category: public.app-category.productivity
+  entitlements: build/entitlements.mas.plist
+  entitlementsInherit: build/entitlements.mas.inherit.plist
+  icon: build/icon-mac.icns

build/electron-builder.mas.yaml

@@ -0,0 +1,29 @@
+appId: com.super-productivity.app
+productName: Super Productivity
+artifactName: ${name}-${arch}.${ext}
+files:
+  - electron/**/*
+  - '!electron/**/*.ts'
+  - '!electron/**/*.js.map'
+  - dist/**/*
+  - 'embedded.provisionprofile'
+directories:
+  output: './app-builds'
+
+mac:
+  target:
+    - target: mas
+      arch:
+        - universal
+
+mas:
+  notarize: true
+  appId: com.super-productivity.app
+  category: public.app-category.productivity
+  icon: build/icon-mac.icns
+  gatekeeperAssess: false
+  darkModeSupport: true
+  hardenedRuntime: false
+  entitlements: build/entitlements.mas.plist
+  entitlementsInherit: build/entitlements.mas.inherit.plist
+  provisioningProfile: embedded.provisionprofile

build/entitlements.mac.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+</dict>
+</plist>

build/entitlements.mas.inherit.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.inherit</key>
+	<true/>
+</dict>
+</plist>

build/entitlements.mas.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+</dict>
+</plist>

build/info.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>com.apple.developer.team-identifier</key>
+  <string>363FAFK383</string>
+  <key>com.apple.application-identifier</key>
+  <string>363FAFK383.com.super-productivity.app</string>
+</dict>
+</plist>

build/linux/PKGBUILD_template

@@ -0,0 +1,26 @@
+# Maintainer & Owner: johannesjo <contact@super-productivity.com>
+# Maintainer: José Miguel Sarasola <jmsaraur@gmail.com>
+
+_pkgname='superproductivity'
+pkgname="${_pkgname}-bin"
+pkgver=PACKAGE_VERSION
+pkgrel=1
+pkgdesc="ToDo list and Time Tracking"
+arch=('x86_64')
+url="http://super-productivity.com/"
+license=('MIT')
+depends=('gtk3' 'nss')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}"
+		   "${_pkgname}-git")
+md5sums=('SKIP')
+source=("superproductivity-${pkgver}-amd64.deb::https://github.com/johannesjo/super-productivity/releases/download/v${pkgver}/superProductivity-amd64.deb")
+
+package() {
+	tar -xvf data.tar.xz -C "${pkgdir}"
+	rm -rf "${pkgdir}/usr/share/doc"
+    install -d "${pkgdir}/usr/bin"
+	ln -sf "/opt/Super Productivity/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" \
+    "${pkgdir}/opt/Super Productivity/"{'LICENSE.electron.txt','LICENSES.chromium.html'}
+}

build/release-notes.md

@@ -0,0 +1 @@
+[Window version is best downloaded from Microsoft Store](https://www.microsoft.com/de-de/p/super-productivity/9nhfvg8361tw?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)

electron-builder.yaml

@@ -11,7 +11,7 @@ files:
 #afterSign: ./tools/notarizeMacApp.js
 
 directories:
-  output: './.tmp/deploy'
+  output: './.tmp/app-builds'
 
 win:
   target:

package.json

@@ -71,11 +71,11 @@
     "lint:ts": "ng lint",
     "lint:scss": "stylelint \"**/*.scss\"",
     "lint:scss:ci": "npm run lint:scss -- --custom-formatter @csstools/stylelint-formatter-github",
-    "localInstall": "sudo echo 'Starting local install' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildAllElectron:stage && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
-    "localInstall:mac": "sudo echo 'Starting local install MAC. Don`t forget APPLEID & APPLEIDPASS !!' && npm run buildAllElectron:noTests:prod && sudo echo '' && electron-builder && sudo cp -rf .tmp/deploy/mac/superProductivity.app/ /Applications/superProductivity.app",
-    "localInstall:prod": "sudo echo 'Starting local install PROD' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildAllElectron:prod && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
-    "localInstall:quick": "sudo echo 'Starting local install QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
-    "localInstall:test:snap": "sudo echo 'Starting local install SNAP QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux snap && sudo snap install --dangerous .tmp/deploy/superProductivity*.snap",
+    "localInstall": "sudo echo 'Starting local install' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/app-builds/ && npm run buildAllElectron:stage && electron-builder --linux deb && sudo dpkg -i .tmp/app-builds/superProductivity*.deb",
+    "localInstall:mac": "sudo echo 'Starting local install MAC. Don`t forget APPLEID & APPLEIDPASS !!' && npm run buildAllElectron:noTests:prod && sudo echo '' && electron-builder && sudo cp -rf .tmp/app-builds/mac/superProductivity.app/ /Applications/superProductivity.app",
+    "localInstall:prod": "sudo echo 'Starting local install PROD' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/app-builds/ && npm run buildAllElectron:prod && electron-builder --linux deb && sudo dpkg -i .tmp/app-builds/superProductivity*.deb",
+    "localInstall:quick": "sudo echo 'Starting local install QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/app-builds/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux deb && sudo dpkg -i .tmp/app-builds/superProductivity*.deb",
+    "localInstall:test:snap": "sudo echo 'Starting local install SNAP QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/app-builds/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux snap && sudo snap install --dangerous .tmp/app-builds/superProductivity*.snap",
     "ng": "ng",
     "pack": "electron-builder --dir",
     "preCheck": "npm run lint && npm run test & npm run int:test && npm run e2e",