.drone.yml

@@ -51,7 +51,8 @@ steps:
       - wget https://dl.vikunja.io/frontend/vikunja-frontend-$$VERSION.zip
       - unzip vikunja-frontend-$$VERSION.zip -d frontend
       - sed -i 's/\\/api\\/v1//g' frontend/index.html
-      - ./bumpp.sh
+      # Make sure that the -unstable suffix is added to release files
+      - sed -i "s/\$${version}/$$VERSION/g" package.json
       - yarn install
       - yarn dist --linux --windows
 
@@ -124,9 +125,9 @@ steps:
       - wget https://dl.vikunja.io/frontend/vikunja-frontend-$$VERSION.zip
       - unzip vikunja-frontend-$$VERSION.zip -d frontend
       - sed -i 's/\\/api\\/v1//g' frontend/index.html
-      - ./bumpp.sh
+      # Make sure that the -unstable suffix is added to release files
+      - sed -i "s/\$${version}/$$VERSION/g" package.json
       - yarn install
-      - cat package.json
       - yarn dist --linux --windows
 
   - name: rebuild-cache
@@ -230,6 +231,6 @@ steps:
 
 ---
 kind: signature
-hmac: 83cd065e5a1e4450318b3d730e38adbbaaebf18e3e62351e5b5579cbaf76b7ba
+hmac: f5aa08e285044e34b02b197a309bb8682b8cc9adf630dabaa18cc09cc6b50cf6
 
 ...

CHANGELOG.md

@@ -9,103 +9,6 @@ All releases can be found on https://code.vikunja.io/desktop/releases.
 
 The releases aim at the api and frontend versions which is why there are missing versions.
 
-## [0.22.1] - 2024-01-28
-
-### Dependencies
-
-* *(deps)* Update dependency electron-builder to v24.9.1 (#180)
-* *(deps)* Update dependency electron to v28 (#183)
-* *(deps)* Update dependency electron to v28.1.4 (#185)
-
-## [0.22.0] - 2023-12-19
-
-### Bug Fixes
-* Version in release files ([63519c1](63519c15d2d077a7dc5b95a964c77d0019cb555e))
-* Add script ([e5b4cc2](e5b4cc23e48010d6d6b414f6ca8c9e170ec8021c))
-* Properly replace version ([5977a93](5977a931d0be88d26073121e94053010b7ee93c6))
-* Read frontend version from release zip ([51376d0](51376d05dee332f1717fc01c3e7d8b1a61ee7773))
-
-
-### Dependencies
-
-* *(deps)* Update dependency electron to v25.3.0 (#163)
-* *(deps)* Update dependency electron to v25.3.1 (#165)
-* *(deps)* Update dependency electron to v25.6.0 (#167)
-* *(deps)* Update dependency electron to v25.7.0 (#169)
-* *(deps)* Update dependency electron-builder to v24.6.3 (#166)
-* *(deps)* Update dependency electron to v25.8.0 (#170)
-* *(deps)* Update dependency electron to v26 (#168)
-* *(deps)* Update lockfile
-* *(deps)* Update dependency electron to v26.2.2 (#174)
-* *(deps)* Update dependency electron-builder to v24.6.4 (#171)
-* *(deps)* Update dependency electron to v26.2.3 (#175)
-* *(deps)* Update dependency electron to v26.3.0 (#176)
-* *(deps)* Update dependency electron to v27 (#177)
-
-### Miscellaneous Tasks
-
-* *(ci)* Debug
-
-## [0.21.0] - 2023-07-07
-
-### Dependencies
-
-* *(deps)* Update dependency electron to v22.1.0 (#134)
-* *(deps)* Update dependency electron to v22.2.0 (#135)
-* *(deps)* Update dependency electron to v23 (#136)
-* *(deps)* Update dependency electron to v23.1.0 (#138)
-* *(deps)* Update dependency electron to v23.1.1 (#139)
-* *(deps)* Update dependency electron to v23.1.2 (#140)
-* *(deps)* Update dependency electron to v23.1.3 (#141)
-* *(deps)* Update dependency electron to v23.1.4 (#142)
-* *(deps)* Update dependency electron to v23.2.0 (#143)
-* *(deps)* Update dependency express to v4.18.2 (#144)
-* *(deps)* Update dependency electron to v23.2.1 (#145)
-* *(deps)* Update dependency electron to v23.2.2 (#146)
-* *(deps)* Update dependency electron to v24 (#147)
-* *(deps)* Update dependency electron to v24.1.1 (#148)
-* *(deps)* Update dependency electron to v24.1.2 (#149)
-* *(deps)* Update dependency electron to v24.1.3 (#150)
-* *(deps)* Update dependency electron to v24.3.1 (#151)
-* *(deps)* Update dependency electron to v24.4.0 (#152)
-* *(deps)* Update dependency electron to v25 (#153)
-* *(deps)* Update dependency electron to v25.0.1 (#155)
-* *(deps)* Update dependency electron to v25.1.0 (#156)
-* *(deps)* Update dependency electron to v25.1.1 (#158)
-* *(deps)* Update dependency electron to v25.2.0 (#159)
-* *(deps)* Update dependency electron-builder to v24 (#157)
-* *(deps)* Update dependency connect-history-api-fallback to v2 (#103)
-
-### Miscellaneous Tasks
-
-* Remove sponsor ([c02c5d0](c02c5d009ffcef7984c2feebf7df4f25444b24e1))
-
-## [0.20.3] - 2023-01-24
-
-### Bug Fixes
-
-* Open links in OS default browser ([9915318](99153187d77d5b2311bc2a87864f70b9d2563370))
-
-### Dependencies
-
-* *(deps)* Update dependency electron to v22.0.1 (#131)
-* *(deps)* Update dependency electron to v22.0.2 (#132)
-* *(deps)* Update dependency electron to v22.0.3 (#133)
-
-## [0.20.2] - 2022-12-18
-
-### Dependencies
-
-* *(deps)* Update dependency electron to v21.3.1 (#128)
-* *(deps)* Update dependency electron to v22 (#129)
-
-## [0.20.1] - 2022-11-11
-
-### Dependencies
-
-* *(deps)* Update dependency electron to v21.2.1 (#125)
-* *(deps)* Update dependency electron to v21.2.2 (#126)
-
 ## [0.20.0] - 2022-10-28
 
 ### Dependencies

README.md

@@ -1,12 +1,8 @@
-# This repository was merged with the api and is now archived
-
-You can find the new (old) code over on [vikunja/vikunja](https://kolaente.dev/vikunja/vikunja).
-
 # Vikunja desktop
 
 [![Build Status](https://drone.kolaente.de/api/badges/vikunja/desktop/status.svg)](https://drone.kolaente.de/vikunja/desktop)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.22.1-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.20.0-brightgreen.svg)](https://dl.vikunja.io)
 
 The Vikunja frontend all repackaged as an electron app to run as a desktop app!
 
@@ -29,3 +25,7 @@ sed -i 's/\/api\/v1//g' frontend/index.html # Make sure to trigger the "enter th
 3. `yarn install`
 4. `yarn dist --linux --windows`
 
+## Sponsors
+
+[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)
+

bumpp.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-frontend_version=$(sed -n 's/.*"VERSION": "\([^"]*\)".*/\1/p' ./frontend/version.json)
-
-sed -i "s/\${version}/$frontend_version/g" package.json
-
-sed -i "s/\"version\": \".*\"/\"version\": \"$frontend_version\"/" package.json
-

main.js

@@ -17,10 +17,10 @@ function createWindow() {
 	})
 
 	// Open external links in the browser
-	mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+	mainWindow.webContents.on('new-window', function (e, url) {
-  	shell.openExternal(url);
+		e.preventDefault()
-	  return { action: 'deny' };
+		shell.openExternal(url)
-	});
+	})
 
 	// Hide the toolbar
 	mainWindow.setMenuBarVisibility(false)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vikunja-desktop",
-  "version": "0.21.0",
+  "version": "0.16.0-dev",
   "description": "Vikunja's frontend as a standalone desktop application.",
   "main": "main.js",
   "repository": "https://code.vikunja.io/desktop",
@@ -51,11 +51,11 @@
     }
   },
   "devDependencies": {
-    "electron": "28.2.2",
+    "electron": "21.2.2",
-    "electron-builder": "24.9.1"
+    "electron-builder": "23.6.0"
   },
   "dependencies": {
-    "connect-history-api-fallback": "^2.0.0",
+    "connect-history-api-fallback": "^1.6.0",
     "express": "^4.17.1"
   }
-}
+}