github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18815 from atom/electron-3.1.3

Browse Source 
Upgrade to Electron 3.1.3
This commit is contained in:
David Wilson
2019-02-08 11:00:17 -08:00
committed by GitHub
parent bded0c102a 505cf161fb
commit e81f71318a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -12,7 +12,7 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
"electronVersion": "3.0.14",
"electronVersion": "3.1.3",
"dependencies": {
"@atom/nsfw": "1.0.21",
"@atom/source-map-support": "^0.3.4",

12
script/lib/check-chromedriver-version.js
View File

@@ -5,17 +5,17 @@ const CONFIG = require('../config')
const semver = require('semver')
module.exports = function () {
// Chromedriver should be specified as ~x.y where x and y match Electron major/minor
// Chromedriver should be specified as ^n.x where n matches the Electron major version
const chromedriverVer = buildMetadata.dependencies['electron-chromedriver']
const mksnapshotVer = buildMetadata.dependencies['electron-mksnapshot']
// Always use tilde on electron-chromedriver so that it can pick up the best patch version
if (!chromedriverVer.startsWith('~')) {
throw new Error(`electron-chromedriver version in script/package.json should start with a tilde to match latest patch version.`)
// Always use caret on electron-chromedriver so that it can pick up the best minor/patch versions
if (!chromedriverVer.startsWith('^')) {
throw new Error(`electron-chromedriver version in script/package.json should start with a caret to match latest patch version.`)
}
if (!mksnapshotVer.startsWith('~')) {
throw new Error(`electron-mksnapshot version in script/package.json should start with a tilde to match latest patch version.`)
if (!mksnapshotVer.startsWith('^')) {
throw new Error(`electron-mksnapshot version in script/package.json should start with a caret to match latest patch version.`)
}
const electronVer = CONFIG.appMetadata.electronVersion

4
script/package.json
View File

@@ -9,9 +9,9 @@
"coffeelint": "1.15.7",
"colors": "1.1.2",
"donna": "1.0.16",
"electron-chromedriver": "~3.0.0-beta.1",
"electron-chromedriver": "^3.0.0-beta.1",
"electron-link": "0.3.3",
"electron-mksnapshot": "~3.0.10",
"electron-mksnapshot": "^3.0.10",
"electron-packager": "7.3.0",
"electron-winstaller": "2.6.4",
"fs-admin": "^0.1.5",