From f49f37992dc814262c530bff2fbb96132424dcdb Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 3 Jul 2019 23:14:47 +0200 Subject: [PATCH] pkg build --- package.json | 6 +- scripts/build-macos.js | 2 +- yarn.lock | 199 +++++++++++++++++------------------------ 3 files changed, 87 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index bdd462c9..0e8e33ea 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "cross-env": "5.2.0", "css-loader": "3.0.0", "electron": "^5.0.5", - "electron-builder": "^20.44.4", + "electron-builder": "^21.0.7", "electron-installer-snap": "^4.0.0", "electron-notarize": "^0.1.1", "electron-rebuild": "^1.8.5", @@ -102,8 +102,8 @@ "NSRequiresAquaSystemAppearance": false } }, - "dmg": { - "artifactName": "terminus-${version}-macos.dmg" + "pkg": { + "artifactName": "terminus-${version}-macos.pkg" }, "linux": { "category": "Utilities", diff --git a/scripts/build-macos.js b/scripts/build-macos.js index 7e3aea09..f2858308 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -4,7 +4,7 @@ const vars = require('./vars') builder({ dir: true, - mac: ['dmg', 'zip'], + mac: ['pkg', 'zip'], config: { extraMetadata: { version: vars.version, diff --git a/yarn.lock b/yarn.lock index a9933813..783d1978 100644 --- a/yarn.lock +++ b/yarn.lock @@ -391,7 +391,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" dependencies: @@ -467,33 +467,33 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.7.1.tgz#9f690af65093821b8a6149aa29ce9f8c81fc554c" - integrity sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ== - app-builder-bin@3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.1.4.tgz#7f13ce5ba677286fe443758c73ff7dfdb0b0f6de" integrity sha512-W72acDbPD99SvwttRDh2aD7Q02HYleGJewGXER2rmloajLbbLSM8tZ/K5+znwu1bCRPI/at0W35qmNjXjN8Kdg== -app-builder-lib@20.44.4, app-builder-lib@~20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.44.4.tgz#39ac20b3155e1b0c2499862bcdea879b50389573" - integrity sha512-1K1xfrhyqDgnibwyuYMgvfwGilGLMF31YwOUJ8IXreyjRef9lUjWW+BZuBXqk4Uqd0C0EYPjhofgpuN0WoAQ+A== +app-builder-bin@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.1.5.tgz#235c42dddee88045c8b6efec8ba7a7abdcaa81e9" + integrity sha512-WShO6mkz3Syvxzylg8JftHyILnWWPL/vrEwZSGy366QFvD3X1lvMuyKeIffmpFEXemveziamFOl/3rBLMaNfPg== + +app-builder-lib@21.0.7, app-builder-lib@~21.0.7: + version "21.0.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.7.tgz#4dfa3b7d7877915aca52411a36b33065797f29cc" + integrity sha512-2+1dUrZsLRmizFod9PEuA4ZpjJPV0IrGQdTQ5pFKZsR4ue0JxvTT2A2+DgCGwKLMfe9Fk0y0pLTeMeD0HmF47g== dependencies: "7zip-bin" "~4.1.0" - app-builder-bin "2.7.1" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "10.1.2" - builder-util-runtime "8.2.5" + builder-util "10.3.2" + builder-util-runtime "8.3.0" chromium-pickle-js "^0.2.0" debug "^4.1.1" ejs "^2.6.2" electron-osx-sign "0.4.11" - electron-publish "20.44.4" - fs-extra-p "^8.0.2" + electron-publish "21.0.7" + fs-extra "^8.1.0" + fs-extra-p "^8.1.0" hosted-git-info "^2.7.1" is-ci "^2.0.0" isbinaryfile "^4.0.1" @@ -501,10 +501,9 @@ app-builder-lib@20.44.4, app-builder-lib@~20.44.4: lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^2.5.0" - plist "^3.0.1" - read-config-file "3.2.2" + read-config-file "4.0.0" sanitize-filename "^1.6.1" - semver "^6.1.1" + semver "^6.2.0" temp-file "^3.3.3" app-builder-lib@^21.0.6: @@ -776,7 +775,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird-lst@^1.0.7, bluebird-lst@^1.0.9: +bluebird-lst@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== @@ -938,17 +937,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -builder-util-runtime@8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.5.tgz#6f19330178345f8ce2c65842b0a9cf6a187d5946" - integrity sha512-YILT+YUlxrE3yNB6mDC1tF+Q24mr1LSYdjP5U861jbBeDZfvy1/VPDzW3boMVrDtzYnDnvkYrzLJnoh6TXA75w== - dependencies: - bluebird-lst "^1.0.9" - debug "^4.1.1" - fs-extra-p "^8.0.2" - sax "^1.2.4" - -builder-util-runtime@8.3.0, builder-util-runtime@^8.2.5: +builder-util-runtime@8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e" integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw== @@ -956,25 +945,6 @@ builder-util-runtime@8.3.0, builder-util-runtime@^8.2.5: debug "^4.1.1" sax "^1.2.4" -builder-util@10.1.2, builder-util@~10.1.2: - version "10.1.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.1.2.tgz#29e631025aa4c837411d5e4ef425d14e320eb2d0" - integrity sha512-LQMh36Cg0r4ZfKqNlaUclndS/IXxZ3OdCgmXvw1vdP3QwYT2NkyE7LfMikAFIHpXOs6zsVH+iW+Fe/AX1jfFag== - dependencies: - "7zip-bin" "~4.1.0" - "@types/debug" "^4.1.4" - app-builder-bin "2.7.1" - bluebird-lst "^1.0.9" - builder-util-runtime "^8.2.5" - chalk "^2.4.2" - debug "^4.1.1" - fs-extra-p "^8.0.2" - is-ci "^2.0.0" - js-yaml "^3.13.1" - source-map-support "^0.5.12" - stat-mode "^0.3.0" - temp-file "^3.3.3" - builder-util@10.3.1, builder-util@~10.3.1: version "10.3.1" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.3.1.tgz#fe88ca7ac99042c36509ef6bf5c575430657930b" @@ -994,6 +964,25 @@ builder-util@10.3.1, builder-util@~10.3.1: stat-mode "^0.3.0" temp-file "^3.3.3" +builder-util@10.3.2, builder-util@~10.3.2: + version "10.3.2" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.3.2.tgz#3bc50e31207fa14f6174f071f6aa5493be80f2d2" + integrity sha512-ZvvCvZKfYSikuNEHPqsQrDMM4VqR3MXe4iiZ4q1dv/VLyE9iJrCTi50uQIuDFhDbtnlj8ZtBL1mzOzyGAzrqpA== + dependencies: + "7zip-bin" "~4.1.0" + "@types/debug" "^4.1.4" + app-builder-bin "3.1.5" + bluebird-lst "^1.0.9" + builder-util-runtime "8.3.0" + chalk "^2.4.2" + debug "^4.1.1" + fs-extra "^8.1.0" + is-ci "^2.0.0" + js-yaml "^3.13.1" + source-map-support "^0.5.12" + stat-mode "^0.3.0" + temp-file "^3.3.3" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1818,16 +1807,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@6.7.2: - version "6.7.2" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.7.2.tgz#4ba4955e7f35f159ce53c68d74d3ea74875f9afd" - integrity sha512-xfYOwhHjOSOIqkk8A0h8zcaio/WyzrAWpMTu9hzV3Z5PI4tOG0Pq6a9Lh/mHr1r3bydif8R21qGvKU1Re9CpUg== +dmg-builder@6.9.3: + version "6.9.3" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.9.3.tgz#64ab0cb85d81781d1b998d3fa9d4049e11de3ad7" + integrity sha512-FIq9MW/aZrfQ27dz9F9T3WDCviPfybpkGUpIkPx2ee7xZt3PIDsK00rmGuImWIh5tcDrYh2TVPU2bTcGF5U80A== dependencies: - app-builder-lib "~20.44.4" + app-builder-lib "~21.0.7" bluebird-lst "^1.0.9" - builder-util "~10.1.2" - fs-extra-p "^8.0.2" - iconv-lite "^0.4.24" + builder-util "~10.3.2" + fs-extra "^8.1.0" + iconv-lite "^0.5.0" js-yaml "^3.13.1" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -1861,10 +1850,6 @@ dot-prop@^4.1.0: dependencies: is-obj "^1.0.0" -dotenv-expand@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -1874,10 +1859,6 @@ dotenv@^5.0.1: version "5.0.1" resolved "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" -dotenv@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" - dotenv@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440" @@ -1912,23 +1893,23 @@ ejs@^2.6.2: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6" integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q== -electron-builder@^20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.44.4.tgz#c47981ddf486d582c0ae0f4d530c831010aacad7" - integrity sha512-H8zzP01albkKh2Ec1zc0A7RGriUkHb5M99NJskaYtgKtGATTAGH+r9OIWVk5Hk9c1dLMVudbqEeaSlygMF2asw== +electron-builder@^21.0.7: + version "21.0.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.0.7.tgz#7f9d47e79320ed7e395608f14b9343108ae7e314" + integrity sha512-mNpGwZQ/kIEsevZ8FIUmP/mO/QlGf6iFPTL/xYkqozT5jgJkJSb5/a0mkA4oD8P3LYyuhKJ993oBOKx0oMDUwg== dependencies: - app-builder-lib "20.44.4" + app-builder-lib "21.0.7" bluebird-lst "^1.0.9" - builder-util "10.1.2" - builder-util-runtime "8.2.5" + builder-util "10.3.2" + builder-util-runtime "8.3.0" chalk "^2.4.2" - dmg-builder "6.7.2" - fs-extra-p "^8.0.2" + dmg-builder "6.9.3" + fs-extra-p "^8.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" - read-config-file "3.2.2" + read-config-file "4.0.0" sanitize-filename "^1.6.1" - update-notifier "^3.0.0" + update-notifier "^3.0.1" yargs "^13.2.4" electron-config@*: @@ -2032,19 +2013,6 @@ electron-osx-sign@0.4.11: minimist "^1.2.0" plist "^3.0.1" -electron-publish@20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.44.4.tgz#f826de3788c4e3848b7f6ebd2c3acb910a1d66cc" - integrity sha512-50NzsKOnNqOpGJzPl04vMyitdguUvp15FWKWtu4KISsHfgdLMWGgxHGZwfMphc/vf364zXvPHsYQza3MASgaEQ== - dependencies: - bluebird-lst "^1.0.9" - builder-util "~10.1.2" - builder-util-runtime "^8.2.5" - chalk "^2.4.2" - fs-extra-p "^8.0.2" - lazy-val "^1.0.4" - mime "^2.4.4" - electron-publish@21.0.6: version "21.0.6" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.6.tgz#ab9bc97536b7d5f03d710259288c8893e15ce182" @@ -2058,6 +2026,19 @@ electron-publish@21.0.6: lazy-val "^1.0.4" mime "^2.4.4" +electron-publish@21.0.7: + version "21.0.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.7.tgz#3ae28dbff45210b0cc802c558ffe80331eccd241" + integrity sha512-I8qkaXCLICRSwItcrsN3vD4aVKug8gcVJi8yzC9bQpTCeWkXDVCBg+1v+W9FbMYGgwi/OhLwBkAkpTBzEGIKhA== + dependencies: + bluebird-lst "^1.0.9" + builder-util "~10.3.2" + builder-util-runtime "8.3.0" + chalk "^2.4.2" + fs-extra-p "^8.1.0" + lazy-val "^1.0.4" + mime "^2.4.4" + electron-rebuild@^1.8.5: version "1.8.5" resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.5.tgz#d15d0aa7f2151eb3f2935a596a92c0348984ba55" @@ -2626,13 +2607,6 @@ fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" -fs-extra-p@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3" - dependencies: - bluebird-lst "^1.0.7" - fs-extra "^7.0.1" - fs-extra-p@^8.0.2, fs-extra-p@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-8.1.0.tgz#781b7105e96cf3c1d3c8a88a83215c8a31c52bae" @@ -3141,6 +3115,13 @@ iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550" + integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw== + dependencies: + safer-buffer ">= 2.1.2 < 3" + icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -3561,7 +3542,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.2: +js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.2: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" dependencies: @@ -5483,20 +5464,6 @@ read-cmd-shim@~1.0.1: dependencies: graceful-fs "^4.1.2" -read-config-file@3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.2.tgz#57bbff7dd97caf237d0d625bd541c6d0efb4d067" - dependencies: - ajv "^6.9.2" - ajv-keywords "^3.4.0" - bluebird-lst "^1.0.7" - dotenv "^6.2.0" - dotenv-expand "^4.2.0" - fs-extra-p "^7.0.1" - js-yaml "^3.12.1" - json5 "^2.1.0" - lazy-val "^1.0.4" - read-config-file@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-4.0.0.tgz#d57d6edc3a4c8a0999860e57e85664570ef56cd5" @@ -5956,7 +5923,7 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.2.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== @@ -6857,10 +6824,10 @@ update-notifier@^2.3.0: semver-diff "^2.0.0" xdg-basedir "^3.0.0" -update-notifier@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.0.tgz#e9bbf8f0f5b7a2ce6666ca46334fdb29492e8fab" - integrity sha512-6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg== +update-notifier@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250" + integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ== dependencies: boxen "^3.0.0" chalk "^2.0.1"