Skip to content

Commit b2ad4b7

Browse files
authored
Fix electron-builder config for .desktop file (#228)
1 parent 75eace4 commit b2ad4b7

File tree

6 files changed

+42
-12
lines changed

6 files changed

+42
-12
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ jobs:
9494
ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
9595
ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
9696
GH_TOKEN: ${{ secrets.GH_TOKEN }}
97-
run: pnpm release --x64
97+
run: pnpm release:electron --x64
9898
- name: Release linux arm64 # to prevent unnecessary build locally
9999
if: matrix.os == 'ubuntu-latest'
100100
env:
101101
ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
102102
ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
103103
GH_TOKEN: ${{ secrets.GH_TOKEN }}
104-
run: pnpm release --arm64
104+
run: pnpm release:electron --arm64
105105

.npmrc

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
node-linker=hoisted
1+
# node-linker=hoisted
2+
# Do not remove, commenting out temporarily until electron-builder fixes build issue
3+
4+
public-hoist-pattern[]=*eslint*
5+
# Exclusively hoist eslint to avoid errors

electron-builder.json

+12-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,18 @@
2828
"rpm"
2929
],
3030
"desktop": {
31-
"Actions": "about;",
32-
"Categories": "AudioVideo",
33-
"Comment": "Advanced multi-source music streaming + discovery client",
34-
"MimeType": "x-scheme-handler/muffon;",
35-
"\n\n[Desktop Action about]\nName=About\nExec": "/opt/muffon/muffon --open-about-window\n\n"
31+
"entry": {
32+
"Actions": "about;",
33+
"Categories": "AudioVideo",
34+
"Comment": "Advanced multi-source music streaming + discovery client",
35+
"MimeType": "x-scheme-handler/muffon;"
36+
},
37+
"desktopActions": {
38+
"about": {
39+
"Name": "About",
40+
"Exec": "/opt/muffon/muffon --open-about-window"
41+
}
42+
}
3643
}
3744
},
3845
"artifactName": "${productName}-${version}-${os}-${arch}.${ext}",

eslint.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import js from '@eslint/js'
1+
import pluginJs from '@eslint/js'
22
import pluginVue from 'eslint-plugin-vue'
33
import {
44
FlatCompat
@@ -7,8 +7,10 @@ import {
77
fixupConfigRules
88
} from '@eslint/compat'
99

10+
// adding types for better IntelliSense in supported IDEs
11+
/** @type {import('eslint').Linter.Config[]} */
1012
export default [
11-
js.configs.recommended,
13+
pluginJs.configs.recommended,
1214
...pluginVue.configs[
1315
'flat/recommended'
1416
],

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"build": "vite build",
2020
"build:electron": "electron-builder --dir",
2121
"build:all": "pnpm build && pnpm build:electron",
22-
"package:electron": "electron-builder",
22+
"package:electron": "cross-env USE_HARD_LINKS=false electron-builder",
2323
"package:all": "pnpm build && pnpm package:electron",
24-
"release:electron": "electron-builder --publish always",
24+
"release:electron": "cross-env USE_HARD_LINKS=false electron-builder --publish always",
2525
"release": "pnpm build && pnpm release:electron",
2626
"preinstall": "npx only-allow pnpm",
2727
"postinstall": "electron-builder install-app-deps",
@@ -43,10 +43,12 @@
4343
},
4444
"devDependencies": {
4545
"@eslint/compat": "^1.2.6",
46+
"@eslint/js": "^9.20.0",
4647
"@rollup/plugin-inject": "^5.0.5",
4748
"@vitejs/plugin-vue": "^5.2.1",
4849
"axios": "^1.7.9",
4950
"change-case": "^5.4.4",
51+
"cross-env": "^7.0.3",
5052
"crypto-js": "^4.2.0",
5153
"deepmerge": "^4.3.1",
5254
"electron": "^34.2.0",

pnpm-lock.yaml

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)