diff --git a/package.json b/package.json index f5c789feb90..26bee3638cd 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "dependencies": { "7zip-bin": "~4.1.0", "@types/is-ci": "^1.1.0", - "app-builder-bin": "2.5.5", + "app-builder-bin": "2.6.0", "archiver": "^3.0.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.6", @@ -53,7 +53,7 @@ "mime": "^2.4.0", "minimatch": "^3.0.4", "normalize-package-data": "^2.4.0", - "pako": "^1.0.6", + "pako": "^1.0.7", "parse-color": "^1.0.0", "plist": "^3.0.1", "read-config-file": "3.2.0", @@ -116,7 +116,7 @@ "ts-babel": "6.1.2", "ts-jsdoc": "^3.0.1", "tslint": "^5.11.0", - "typescript": "^3.1.6", + "typescript": "^3.2.1", "whitespace": "^2.1.0", "worker-farm": "^1.6.0" }, diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json index d2c59a0c9c1..1fe82fb85e9 100644 --- a/packages/app-builder-lib/package.json +++ b/packages/app-builder-lib/package.json @@ -42,7 +42,7 @@ "homepage": "https://github.com/electron-userland/electron-builder", "dependencies": { "7zip-bin": "~4.1.0", - "app-builder-bin": "2.5.5", + "app-builder-bin": "2.6.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.6", "chromium-pickle-js": "^0.2.0", diff --git a/packages/app-builder-lib/src/platformPackager.ts b/packages/app-builder-lib/src/platformPackager.ts index a1f68399ce5..ed8c5b8ee8f 100644 --- a/packages/app-builder-lib/src/platformPackager.ts +++ b/packages/app-builder-lib/src/platformPackager.ts @@ -587,9 +587,7 @@ export abstract class PlatformPackager getDefaultFrameworkIcon(): string | null { const framework = this.info.framework - const result = framework.getDefaultIcon == null ? null : framework.getDefaultIcon(this.platform) - log.warn({reason: "application icon is not set"}, `default ${capitalizeFirstLetter(framework.name)} icon is used`) - return result + return framework.getDefaultIcon == null ? null : framework.getDefaultIcon(this.platform) } // convert if need, validate size (it is a reason why tool is called even if file has target extension (already specified as foo.icns for example)) @@ -613,6 +611,11 @@ export abstract class PlatformPackager if (errorMessage != null) { throw new InvalidConfigurationError(errorMessage, result.errorCode) } + + if (result.isFallback) { + log.warn({reason: "application icon is not set"}, `default ${capitalizeFirstLetter(this.info.framework.name)} icon is used`) + } + return result.icons || [] } } @@ -627,6 +630,7 @@ interface IconConvertResult { error?: string errorCode?: string + isFallback?: boolean } export type IconFormat = "icns" | "ico" | "set" diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index 1e2468950f2..f0a46da7ed5 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -11,7 +11,7 @@ "out" ], "dependencies": { - "app-builder-bin": "2.5.5", + "app-builder-bin": "2.6.0", "temp-file": "^3.3.2", "fs-extra-p": "^7.0.0", "is-ci": "^1.2.1", diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json index 4449e2fde04..75e2b297b73 100644 --- a/packages/electron-updater/package.json +++ b/packages/electron-updater/package.json @@ -20,7 +20,7 @@ "source-map-support": "^0.5.9", "builder-util-runtime": "~0.0.0-semantic-release", "lodash.isequal": "^4.5.0", - "pako": "^1.0.6" + "pako": "^1.0.7" }, "typings": "./out/main.d.ts", "publishConfig": { diff --git a/yarn.lock b/yarn.lock index 23c4a3bb935..03db29c958a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -995,9 +995,9 @@ ajv-keywords@^3.2.0: integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo= ajv@^6.5.5: - version "6.6.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.0.tgz#762e4a2f97cf423c9a2472b819f227c3a081a895" - integrity sha512-ZCIMdm75ps9usdeb0GQL9rKOUlTtS0p0vU2nQVXgRIu6Yb00G9GY7AvbVLwTQ5Po4JDKIwJlT5nwggoRDrDVAw== + version "6.6.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61" + integrity sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1053,10 +1053,10 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@2.5.5: - version "2.5.5" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.5.5.tgz#5721a37b1c89d24df058e6308b5d30fc62a63bab" - integrity sha512-ZemMZqFJGf05J7qSvZeKIs3vSYl8sG8DWsyBLzxtfoIIoLD/dI/dtNwSOZwyoY54w/g8b7IbG5L6egnqfyX7oA== +app-builder-bin@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.0.tgz#b4e5d5ee5bcf264818ab9830b95338f9f419de5d" + integrity sha512-7HphDMS2U9MwAA6R7lSU6MASFR/D+VJDb5hQ4Fn2coOMyaRn71QDWPdG0TPnDr88F2I7bsTuHYud28S/yN2lZw== append-transform@^0.4.0: version "0.4.0" @@ -4106,12 +4106,12 @@ lowercase-keys@^1.0.0: integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== lru-cache@^4.0.1: - version "4.1.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.4.tgz#51cc46e8e6d9530771c857e24ccc720ecdbcc031" - integrity sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA== + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== dependencies: pseudomap "^1.0.2" - yallist "^3.0.2" + yallist "^2.1.2" make-dir@^1.0.0: version "1.3.0" @@ -4674,10 +4674,10 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -pako@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" - integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== +pako@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" + integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ== parse-color@^1.0.0: version "1.0.0" @@ -5896,10 +5896,10 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -typescript@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68" - integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA== +typescript@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.1.tgz#0b7a04b8cf3868188de914d9568bd030f0c56192" + integrity sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg== typescript@~2.6.2: version "2.6.2" @@ -6285,6 +6285,11 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + yallist@^3.0.0, yallist@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"