Skip to content

Commit

Permalink
Update to electron-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Peischl committed Nov 24, 2017
1 parent 9552315 commit 0e94b52
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 74 deletions.
31 changes: 23 additions & 8 deletions electron-builder.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
{
"directories": {
"app": "dist",
"output": "app-builds"
},
"win": {
"icon": "dist/favicon",
"target": ["portable"]
}
"productName": "angular-electron",
"directories": {
"app": "dist",
"output": "app-builds"
},
"win": {
"icon": "dist/favicon",
"target": [
"portable"
]
},
"mac": {
"icon": "dist/favicon",
"target": [
"dmg"
]
},
"linux": {
"icon": "dist/favicon",
"target": [
"AppImage"
]
}
}
60 changes: 0 additions & 60 deletions package.js

This file was deleted.

8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
"electron:test": "electron ./dist",
"electron:dev": "npm run build && electron ./dist",
"electron:prod": "npm run build:prod && electron ./dist",
"electron:linux": "npm run build:prod && node package.js --asar --platform=linux --arch=x64",
"electron:windows": "npm run build:prod && node package.js --asar --platform=win32 --arch=ia32",
"electron:winportable": "npm run build:prod && npx electron-builder build --windows",
"electron:mac": "npm run build:prod && node package.js --asar --platform=darwin --arch=x64",
"electron:linux": "npm run build:prod && npx electron-builder build --linux",
"electron:windows": "npm run build:prod && npx electron-builder build --windows",
"electron:mac": "npm run build:prod && npx electron-builder build --mac",
"test": "karma start ./karma.conf.js",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
"e2e": "protractor ./protractor.conf.js"
Expand Down Expand Up @@ -68,7 +67,6 @@
"cssnano": "3.10.0",
"electron": "1.7.8",
"electron-builder": "19.45.4",
"electron-packager": "9.1.0",
"electron-reload": "1.2.1",
"exports-loader": "0.6.4",
"file-loader": "1.1.5",
Expand Down
Binary file added src/favicon.icns
Binary file not shown.
Binary file added src/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function getPlugins() {
"context": "src",
"to": "",
"from": {
"glob": "favicon.ico",
"glob": "favicon.*",
"dot": true
}
}
Expand Down

0 comments on commit 0e94b52

Please sign in to comment.