diff --git a/.babelrc b/.babelrc index 38ae0f81..cc472537 100644 --- a/.babelrc +++ b/.babelrc @@ -1,7 +1,10 @@ { "presets": [ ["env", { - "targets": { "node": 7 }, + "targets": { + "node": 7, + "browsers": "electron 1.7" + }, "useBuiltIns": true }], "stage-0", diff --git a/package.json b/package.json index 6aafbfb5..e00d0be7 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "test-watch": "npm test -- --watch", "install-grpc": "cd app && npm run install-grpc" }, - "browserslist": "electron 1.6", + "browserslist": "electron 1.7", "build": { "productName": "ZapDesktop", "appId": "org.develar.ZapDesktop", @@ -138,6 +138,7 @@ "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.24.1", "babili-webpack-plugin": "^0.1.2", + "browserslist": "^2.11.0", "chalk": "^2.0.1", "concurrently": "^3.5.0", "cross-env": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index dc47bf7d..163b1a56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1728,6 +1728,13 @@ browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5 caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" +browserslist@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d" + dependencies: + caniuse-lite "^1.0.30000784" + electron-to-chromium "^1.3.30" + bs58@=2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.0.tgz#72b713bed223a0ac518bbda0e3ce3f4817f39eb5" @@ -1888,6 +1895,10 @@ caniuse-lite@^1.0.30000670: version "1.0.30000683" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000683.tgz#a7573707cf2acc9217ca6484d1dfbc9f13898364" +caniuse-lite@^1.0.30000784: + version "1.0.30000787" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz#a76c4fa1d6ac00640447ec83c1e7c6b33dd615c5" + capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" @@ -3173,10 +3184,20 @@ electron-publish@19.49.0: fs-extra-p "^4.5.0" mime "^2.0.3" +electron-releases@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" + electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11: version "1.3.14" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43" +electron-to-chromium@^1.3.30: + version "1.3.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" + dependencies: + electron-releases "^2.1.0" + electron@^1.7.10: version "1.7.10" resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.10.tgz#3a3e83d965fd7fafe473be8ddf8f472561b6253d"