Skip to content

Commit

Permalink
Upgrade Electron to 1.8.4 (#11204)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjb authored and chrisnojima committed Apr 4, 2018
1 parent d72b25e commit c5dbedc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 25 deletions.
2 changes: 1 addition & 1 deletion shared/.babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// Used by node for our own scripts
"yarn": {
"presets": ['@babel/preset-env', '@babel/preset-react'],
"plugins": ['@babel/plugin-proposal-object-rest-spread', '@babel/transform-flow-strip-types', '@babel/plugin-proposal-class-properties']
"plugins": ['@babel/plugin-proposal-object-rest-spread', '@babel/transform-flow-strip-types']
}
}
}
2 changes: 1 addition & 1 deletion shared/desktop/webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const config = (_, {mode}) => {
cacheDirectory: true,
extends: path.join(__dirname, '..', '.babelrc'),
plugins: [...(isHot ? ['react-hot-loader/babel'] : [])],
presets: [['@babel/preset-env', {debug: false, modules: false, targets: {electron: '1.7.5'}}]],
presets: [['@babel/preset-env', {debug: false, modules: false, targets: {electron: '1.8.4'}}]],
},
}

Expand Down
3 changes: 1 addition & 2 deletions shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
"@babel/cli": "^7.0.0-beta.42",
"@babel/core": "^7.0.0-beta.42",
"@babel/node": "^7.0.0-beta.42",
"@babel/plugin-proposal-class-properties": "^7.0.0-beta.42",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.42",
"@babel/plugin-transform-flow-strip-types": "^7.0.0-beta.42",
"@babel/preset-env": "^7.0.0-beta.42",
Expand All @@ -163,7 +162,7 @@
"css-loader": "0.28.11",
"del": "3.0.0",
"devtron": "1.4.0",
"electron": "1.7.13",
"electron": "1.8.4",
"electron-download": "git://github.com/keybase/electron-download#keybase-fixes-off-410",
"electron-packager": "9.1.0",
"eslint": "4.19.1",
Expand Down
28 changes: 7 additions & 21 deletions shared/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -453,14 +453,6 @@
"@babel/helper-plugin-utils" "7.0.0-beta.41"
"@babel/plugin-syntax-class-properties" "7.0.0-beta.41"

"@babel/plugin-proposal-class-properties@^7.0.0-beta.42":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.42.tgz#2cd29050ab997567071b65896f92afc08a620748"
dependencies:
"@babel/helper-function-name" "7.0.0-beta.42"
"@babel/helper-plugin-utils" "7.0.0-beta.42"
"@babel/plugin-syntax-class-properties" "7.0.0-beta.42"

"@babel/[email protected]", "@babel/plugin-proposal-object-rest-spread@^7.0.0-beta.42":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.42.tgz#56ebd55a8268165cb7cb43a5a232b60f5435a822"
Expand Down Expand Up @@ -502,12 +494,6 @@
dependencies:
"@babel/helper-plugin-utils" "7.0.0-beta.41"

"@babel/[email protected]":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.42.tgz#80ccce27907f22d0ffb49721e9d2cde311b41459"
dependencies:
"@babel/helper-plugin-utils" "7.0.0-beta.42"

"@babel/plugin-syntax-dynamic-import@^7.0.0-beta":
version "7.0.0-beta.41"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.41.tgz#7e8b3d1c53171a451e50ff790e582aa2ac582c53"
Expand Down Expand Up @@ -1396,9 +1382,9 @@
react-split-pane "^0.1.77"
react-treebeard "^2.1.0"

"@types/node@^7.0.18":
version "7.0.42"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.42.tgz#051ff1cdbd1e1b7523ba425bc388147483344dbf"
"@types/node@^8.0.24":
version "8.10.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.2.tgz#f1fb9c73414832c5b00ee954c4bbf68394e2e526"

abab@^1.0.4:
version "1.0.4"
Expand Down Expand Up @@ -4793,11 +4779,11 @@ electron-to-chromium@^1.3.39, electron-to-chromium@^1.3.40, electron-to-chromium
version "1.3.41"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235"

electron@1.7.13:
version "1.7.13"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.13.tgz#10851baec77d686d95812f34425c17e48ac1413f"
electron@1.8.4:
version "1.8.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38"
dependencies:
"@types/node" "^7.0.18"
"@types/node" "^8.0.24"
electron-download "^3.0.1"
extract-zip "^1.0.3"

Expand Down

0 comments on commit c5dbedc

Please sign in to comment.