From ebbd9f796e2d8d5b0720b2b699ba24dc159ee692 Mon Sep 17 00:00:00 2001 From: develar Date: Wed, 31 Jul 2019 17:11:12 +0200 Subject: [PATCH] chore: update deps --- .circleci/config.yml | 6 +-- package.json | 4 +- packages/builder-util/package.json | 4 +- .../test-app-build-sub/electron-builder.yml | 2 +- test/fixtures/test-app-one/package.json | 2 +- .../packages/test-app/package.json | 2 +- .../packages/test-app/package.json | 2 +- .../packages/test-app/package.json | 2 +- test/fixtures/test-app/package.json | 2 +- test/out/linux/__snapshots__/debTest.js.snap | 10 ++--- test/src/helpers/testConfig.ts | 2 +- yarn.lock | 40 +++++++++---------- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index abd956c35ed..4e4ebc6c21f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: - deps-{{ checksum "yarn.lock" }} - restore_cache: keys: - - v-5.0.7-electron + - v-6.0.0-electron - run: command: yarn --frozen-lockfile - run: @@ -23,7 +23,7 @@ jobs: - run: command: node ./test/out/helpers/downloadElectron.js - save_cache: - key: v-5.0.7-electron + key: v-6.0.0-electron paths: - ~/.cache/electron @@ -41,7 +41,7 @@ jobs: - deps-{{ checksum "yarn.lock" }} - restore_cache: keys: - - v-5.0.7-electron + - v-6.0.0-electron # because in the build job we use circleci docker image and circleci restores cache to original user home - run: command: | diff --git a/package.json b/package.json index 9a3e487e4b5..e0be30af50a 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@types/debug": "^4.1.4", "@types/is-ci": "^2.0.0", "@types/semver": "^6.0.1", - "app-builder-bin": "3.4.2", + "app-builder-bin": "3.4.3", "archiver": "^3.0.3", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", @@ -60,7 +60,7 @@ "sanitize-filename": "^1.6.2", "sax": "^1.2.4", "semver": "^6.3.0", - "source-map-support": "^0.5.12", + "source-map-support": "^0.5.13", "stat-mode": "^0.3.0", "sumchecker": "^3.0.0", "temp-file": "^3.3.4", diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index a4749952245..1c03dab0e80 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -11,7 +11,7 @@ "out" ], "dependencies": { - "app-builder-bin": "3.4.2", + "app-builder-bin": "3.4.3", "temp-file": "^3.3.4", "fs-extra": "^8.1.0", "is-ci": "^2.0.0", @@ -20,7 +20,7 @@ "chalk": "^2.4.2", "debug": "^4.1.1", "builder-util-runtime": "0.0.0-semantic-release", - "source-map-support": "^0.5.12", + "source-map-support": "^0.5.13", "7zip-bin": "~5.0.3", "js-yaml": "^3.13.1", "@types/debug": "^4.1.4" diff --git a/test/fixtures/test-app-build-sub/electron-builder.yml b/test/fixtures/test-app-build-sub/electron-builder.yml index b865541de47..45dc66bb58f 100644 --- a/test/fixtures/test-app-build-sub/electron-builder.yml +++ b/test/fixtures/test-app-build-sub/electron-builder.yml @@ -1,4 +1,4 @@ -electronVersion: 5.0.7 +electronVersion: 6.0.0 appId: org.electron-builder.testApp compression: store npmRebuild: false diff --git a/test/fixtures/test-app-one/package.json b/test/fixtures/test-app-one/package.json index 666f23fbe95..d1de65c6946 100644 --- a/test/fixtures/test-app-one/package.json +++ b/test/fixtures/test-app-one/package.json @@ -8,7 +8,7 @@ "author": "Foo Bar ", "license": "MIT", "build": { - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "appId": "org.electron-builder.testApp", "compression": "store", "npmRebuild": false, diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json index f0b0f01c537..3f98e506e75 100644 --- a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json +++ b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json @@ -7,7 +7,7 @@ "author": "Foo Bar ", "license": "MIT", "build": { - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "appId": "org.electron-builder.testApp", "compression": "store", "npmRebuild": false, diff --git a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json index 5fc2c86c293..0abb9db5108 100644 --- a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json +++ b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json @@ -7,7 +7,7 @@ "author": "Foo Bar ", "license": "MIT", "build": { - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "appId": "org.electron-builder.testApp", "compression": "store", "npmRebuild": false, diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json index 0f0b4d21c91..21cf96e45e1 100644 --- a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json +++ b/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json @@ -7,7 +7,7 @@ "author": "Foo Bar ", "license": "MIT", "build": { - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "appId": "org.electron-builder.testApp", "compression": "store", "npmRebuild": false, diff --git a/test/fixtures/test-app/package.json b/test/fixtures/test-app/package.json index 64bd62ea8b3..20c21be3411 100644 --- a/test/fixtures/test-app/package.json +++ b/test/fixtures/test-app/package.json @@ -1,7 +1,7 @@ { "private": true, "build": { - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "appId": "org.electron-builder.testApp", "compression": "store", "npmRebuild": false, diff --git a/test/out/linux/__snapshots__/debTest.js.snap b/test/out/linux/__snapshots__/debTest.js.snap index cd66aa3380f..c8bc16de1ff 100644 --- a/test/out/linux/__snapshots__/debTest.js.snap +++ b/test/out/linux/__snapshots__/debTest.js.snap @@ -73,7 +73,7 @@ Array [ exports[`arm 3`] = ` Object { "Architecture": "armhf", - "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, gir1.2-gnomekeyring-1.0", + "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0", "Homepage": "http://foo.example.com", "License": "MIT", "Maintainer": "Foo Bar ", @@ -144,7 +144,7 @@ Array [ exports[`arm 6`] = ` Object { "Architecture": "armhf", - "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, gir1.2-gnomekeyring-1.0", + "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0", "Homepage": "http://foo.example.com", "License": "MIT", "Maintainer": "Foo Bar ", @@ -314,7 +314,7 @@ Array [ exports[`deb 3`] = ` Object { "Architecture": "amd64", - "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, gir1.2-gnomekeyring-1.0", + "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0", "Homepage": "http://foo.example.com", "License": "MIT", "Maintainer": "Foo Bar ", @@ -402,7 +402,7 @@ Array [ exports[`deb file associations 3`] = ` Object { "Architecture": "amd64", - "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, gir1.2-gnomekeyring-1.0", + "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0", "Homepage": "http://foo.example.com", "License": "MIT", "Maintainer": "Foo Bar ", @@ -511,7 +511,7 @@ Array [ exports[`no quotes for safe exec name 4`] = ` Object { "Architecture": "amd64", - "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, gir1.2-gnomekeyring-1.0", + "Depends": "libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0", "Homepage": "http://foo.example.com", "License": "MIT", "Maintainer": "Foo Bar ", diff --git a/test/src/helpers/testConfig.ts b/test/src/helpers/testConfig.ts index 1def1791bff..4625434b0eb 100644 --- a/test/src/helpers/testConfig.ts +++ b/test/src/helpers/testConfig.ts @@ -1,7 +1,7 @@ import * as os from "os" import * as path from "path" -export const ELECTRON_VERSION = "5.0.7" +export const ELECTRON_VERSION = "6.0.0" export function getElectronCacheDir() { if (process.platform === "win32") { diff --git a/yarn.lock b/yarn.lock index 7c5f9b9d264..e9aca816dd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1398,10 +1398,10 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@3.4.2: - version "3.4.2" - resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.2.tgz#4684003fb319d8bc154b1b6e9ce006bba1602fa9" - integrity sha512-E9VvUrZm60oLl0rvLw/ErvZiEOIHkulZbJ9C9TWMD4ftNrkXFc2+a5JGlD19Bwvj329d4qz91zs/hWD01q18TQ== +app-builder-bin@3.4.3: + version "3.4.3" + resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.3.tgz#58a74193eb882f029be6b7f0cd3f0c6805927a6b" + integrity sha512-qMhayIwi3juerQEVJMQ76trObEbfQT0nhUdxZz9a26/3NLT3pE6awmQ8S1cEnrGugaaM5gYqR8OElcDezfmEsg== aproba@^1.0.3: version "1.2.0" @@ -1828,9 +1828,9 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30000984: - version "1.0.30000987" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000987.tgz#bc6b47217afd8226a2b1964635c6bff62cdf5738" - integrity sha512-O3VrjtRMTxoU5Cn5/QSmXeIR1gkVps4j9jqfIm4FLaQ5JzqBlVjMUG1xWnoYFv8N+H3Lp++aa05TekyIbjHL7g== + version "1.0.30000988" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db" + integrity sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ== capture-exit@^2.0.0: version "2.0.0" @@ -2400,9 +2400,9 @@ electron-builder-tslint-config@^1.1.0: integrity sha512-m/oAwS+NYB/b182bGY8C7uj1cDy8XXnHTl5CwD98dng7wE/nZGV2mJD9NyqbFmhJ1kF61wbsYDVx2KLIN5s5tg== electron-to-chromium@^1.3.191: - version "1.3.204" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.204.tgz#1ea5c6d495bab77995aa135dbcbc1d383dd4e21e" - integrity sha512-T0eXE6hfbtpzRUaI7aHI/HYJ29Ndk84aVSborRAmXfWvBvz2EuB2OWYUxNcUX9d+jtqEIjgZjWMdoxS0hp5j1g== + version "1.3.207" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.207.tgz#b19ce94d61187d72411ebb83dfe287366a785102" + integrity sha512-RIgAnfqbjZNECBLjslfy4cIYvcPl3GAXmnENrcoo0TZ8fGkyEEAealAbO7MoevW4xYUPe+e68cWAj6eP0DmMHw== emoji-regex@^7.0.1: version "7.0.3" @@ -2494,9 +2494,9 @@ estraverse@^4.2.0: integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= esutils@^2.0.0, esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + version "2.0.3" + resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== exec-sh@^0.3.2: version "0.3.2" @@ -4202,9 +4202,9 @@ merge-stream@^1.0.1: readable-stream "^2.0.1" merge2@^1.2.3: - version "1.2.3" - resolved "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" - integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA== + version "1.2.4" + resolved "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3" + integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A== micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" @@ -5399,10 +5399,10 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.12, source-map-support@^0.5.6: - version "0.5.12" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== +source-map-support@^0.5.12, source-map-support@^0.5.13, source-map-support@^0.5.6: + version "0.5.13" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0"