From 10aba4c1160b266c225095bc9c04aa8e12e2cb53 Mon Sep 17 00:00:00 2001 From: Joel Worrall Date: Fri, 28 Apr 2017 11:45:08 -0400 Subject: [PATCH] Ember build fixes (#1069) * Corrections to the ember forge config and packaging * shrink the window * adding zip as an option --- ember-electron/electron-forge-config.js | 105 +++++++++--------------- package.json | 2 +- yarn.lock | 14 ++-- 3 files changed, 47 insertions(+), 74 deletions(-) diff --git a/ember-electron/electron-forge-config.js b/ember-electron/electron-forge-config.js index b60def7376..d4a4038b2e 100644 --- a/ember-electron/electron-forge-config.js +++ b/ember-electron/electron-forge-config.js @@ -1,72 +1,49 @@ -/* eslint quotes: ["error", "double"] */ -// const path = require("path"); +const path = require('path'); module.exports = { - "make_targets": { - "win32": [ - "squirrel" - ], - "darwin": [ - "zip", - "dmg" - ], - "linux": [ - "deb", - "rpm" - ] - }, - "electronPackagerConfig": { - "all": true, - "appCopyright": "Copyright (c) 2017 HospitalRun Foundation", - "icon": "assets/icons/icon", - "name": "HospitalRun", - "osxSign": true, - "overwrite": true - }, - "electronWinstallerConfig": { - "exe": "HospitalRun", - /* "certificateFile": "", - "certificatePassword": "", */ - "setupIcon": "assets/icons/favicon.ico", - "setupExe": "HospitalRun", - "name": "HospitalRun" + make_targets: { + win32: ['squirrel', 'zip'], + darwin: ['dmg', 'zip'] + }, + electronPackagerConfig: { + /* all: true, */ + appCategoryType: 'public.app-category.medical-software', + appCopyright: 'Copyright (c) 2017 HospitalRun Foundation', + icon: 'assets/icons/icon', + name: 'HospitalRun', + osxSign: true, + overwrite: true, + versionString: { + CompanyName: 'HospitalRun Foundation', + FileDescription: 'HospitalRun Desktop', + ProductName: 'HospitalRun', + InternalName: 'HospitalRun' + } }, - "electronInstallerDMG": { - "background": "assets/icons/bg-img-patients.png", - "icon": "assets/icons/favicon.icns", - "name": "HospitalRun", - "overwrite": true, - "window": { - "size": { - width: 600, - height: 600 + electronInstallerDMG: { + background: 'assets/icons/bg-img-patients.png', + debug: true, + icon: 'assets/icons/favicon.icns', + iconsize: 100, + overwrite: true, + title: 'HospitalRun', + window: { + size: { + width: 400, + height: 400 } } }, - "electronInstallerDebian": { - "productName": "HospitalRun" - }, - "electronInstallerRedhat": { - "productName": "HospitalRun" - }, - "electronInstallerFlatpak": { - "productName": "HospitalRun" - }, - "github_repository": { - "owner": "tangollama", - "name": "releases", - "draft": true, - "prerelease": true - }, - "publish_targets": { - "win32": [ - "github" - ], - "darwin": [ - "github" - ], - "linux": [ - "github" - ] + electronWinstallerConfig: { + authors: 'HospitalRun Foundation', + exe: 'HospitalRun.exe', + icon: 'assets/icons/favicon', + name: 'HospitalRun', + noMSI: true, + setupIcon: path.join(__dirname, '../../../assets/icons/favicon.ico'), + setupExe: 'HospitalRun.exe', + title: 'HospitalRun'/* , + certificateFile: '', + certificatePassword: '' */ } }; diff --git a/package.json b/package.json index bf951e23a7..460e62152e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "ember-concurrency": "0.8.1", "ember-concurrency-test-waiter": "0.2.0", "ember-data": "^2.10.0", - "ember-electron": "^2.0.1", + "ember-electron": "^2.1.0", "ember-export-application-global": "^1.0.5", "ember-fullcalendar": "1.7.0", "ember-i18n": "4.4.0", diff --git a/yarn.lock b/yarn.lock index 05204a7d97..1c43e2dbbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -109,14 +109,10 @@ acorn@^5.0.1: version "5.0.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" -after@0.8.1: +after@0.8.1, after@~0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627" -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - agent-base@2: version "2.0.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.0.1.tgz#bd8f9e86a8eb221fffa07bd14befd55df142815e" @@ -3218,7 +3214,7 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" -debug@*, debug@2, debug@2.6.3, debug@^2.1.3, debug@^2.3.3, debug@^2.6.0, debug@^2.6.1, debug@^2.6.3: +debug@*, debug@2, debug@2.6.3, debug@^2.1.3, debug@^2.6.0, debug@^2.6.1, debug@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: @@ -3246,7 +3242,7 @@ debug@2.6.0: dependencies: ms "0.7.2" -debug@2.6.1, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.5.1: +debug@2.6.1, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.4.5, debug@^2.5.1: version "2.6.1" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" dependencies: @@ -8013,11 +8009,11 @@ mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" -mute-stream@0.0.6, mute-stream@~0.0.4: +mute-stream@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" -mute-stream@0.0.7: +mute-stream@0.0.7, mute-stream@~0.0.4: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"