Skip to content

Commit d5e12c0

Browse files
authored
Merge pull request #86 from seopei/update-to-electron-builder
Update to electron-builder
2 parents 8194cc7 + 0e94b52 commit d5e12c0

File tree

6 files changed

+27
-74
lines changed

6 files changed

+27
-74
lines changed

electron-builder.json

+23-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
{
2-
"directories": {
3-
"app": "dist",
4-
"output": "app-builds"
5-
},
6-
"win": {
7-
"icon": "dist/favicon",
8-
"target": ["portable"]
9-
}
2+
"productName": "angular-electron",
3+
"directories": {
4+
"app": "dist",
5+
"output": "app-builds"
6+
},
7+
"win": {
8+
"icon": "dist/favicon",
9+
"target": [
10+
"portable"
11+
]
12+
},
13+
"mac": {
14+
"icon": "dist/favicon",
15+
"target": [
16+
"dmg"
17+
]
18+
},
19+
"linux": {
20+
"icon": "dist/favicon",
21+
"target": [
22+
"AppImage"
23+
]
24+
}
1025
}

package.js

-60
This file was deleted.

package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
"electron:test": "electron ./dist",
3030
"electron:dev": "npm run build && electron ./dist",
3131
"electron:prod": "npm run build:prod && electron ./dist",
32-
"electron:linux": "npm run build:prod && node package.js --asar --platform=linux --arch=x64",
33-
"electron:windows": "npm run build:prod && node package.js --asar --platform=win32 --arch=ia32",
34-
"electron:winportable": "npm run build:prod && npx electron-builder build --windows",
35-
"electron:mac": "npm run build:prod && node package.js --asar --platform=darwin --arch=x64",
32+
"electron:linux": "npm run build:prod && npx electron-builder build --linux",
33+
"electron:windows": "npm run build:prod && npx electron-builder build --windows",
34+
"electron:mac": "npm run build:prod && npx electron-builder build --mac",
3635
"test": "karma start ./karma.conf.js",
3736
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
3837
"e2e": "protractor ./protractor.conf.js"
@@ -68,7 +67,6 @@
6867
"cssnano": "3.10.0",
6968
"electron": "1.7.8",
7069
"electron-builder": "19.45.4",
71-
"electron-packager": "9.1.0",
7270
"electron-reload": "1.2.1",
7371
"exports-loader": "0.6.4",
7472
"file-loader": "1.1.5",

src/favicon.icns

83.7 KB
Binary file not shown.

src/favicon.png

14.1 KB
Loading

webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function getPlugins() {
111111
"context": "src",
112112
"to": "",
113113
"from": {
114-
"glob": "favicon.ico",
114+
"glob": "favicon.*",
115115
"dot": true
116116
}
117117
}

0 commit comments

Comments
 (0)