jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-19 17:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade: electron to v1.6.6 (#1357)

Browse Source 
Some changes that we're particularly interested in:

- https://github.com/electron/electron/pull/8590
- https://github.com/electron/electron/pull/8852
- https://github.com/electron/electron/pull/7631

Note that the `electron-prebuilt` packaged has been renamed to
`electron`.

Change-Type: patch
Changelog-Entry: Upgrade Electron to v1.6.6.
Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2017-04-25 15:52:19 -04:00 committed by GitHub
parent 62ca0e5b09
commit bc01e151c4
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ BUILD_OUTPUT_DIRECTORY = $(BUILD_DIRECTORY)/out
# Application configuration
# ---------------------------------------------------------------------
ELECTRON_VERSION = $(shell jq -r '.devDependencies["electron-prebuilt"]' package.json)
ELECTRON_VERSION = $(shell jq -r '.devDependencies["electron"]' package.json)
NODE_VERSION = 6.1.0
COMPANY_NAME = $(shell jq -r '.companyName' package.json)
APPLICATION_NAME = $(shell jq -r '.displayName' package.json)

4
docs/MAINTAINERS.md
View File

@ -42,8 +42,8 @@ git push --tags
Upgrading Electron
------------------
- Upgrade the `electron-prebuilt` dependency version in `package.json` to an
*exact version* (no `~`, `^`, etc).
- Upgrade the `electron` dependency version in `package.json` to an *exact
version* (no `~`, `^`, etc).
Dealing with a problematic release
----------------------------------

76
npm-shrinkwrap.json generated
View File

@ -1479,6 +1479,44 @@
"dev": true,
"optional": true
},
"electron": {
"version": "1.6.6",
"from": "electron@1.6.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-1.6.6.tgz",
"dev": true,
"dependencies": {
"electron-download": {
"version": "3.3.0",
"from": "electron-download@>=3.0.1 <4.0.0",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
"dev": true
},
"fs-extra": {
"version": "0.30.0",
"from": "fs-extra@>=0.30.0 <0.31.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
"dev": true
},
"nugget": {
"version": "2.0.1",
"from": "nugget@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
"dev": true
},
"semver": {
"version": "5.3.0",
"from": "semver@>=5.3.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"dev": true
},
"single-line-log": {
"version": "1.1.2",
"from": "single-line-log@>=1.1.2 <2.0.0",
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
"dev": true
}
}
},
"electron-builder": {
"version": "2.11.0",
"from": "electron-builder@>=2.6.0 <3.0.0",
@ -1734,44 +1772,6 @@
}
}
},
"electron-prebuilt": {
"version": "1.4.4",
"from": "electron-prebuilt@1.4.4",
"resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-1.4.4.tgz",
"dev": true,
"dependencies": {
"electron-download": {
"version": "3.3.0",
"from": "electron-download@>=3.0.1 <4.0.0",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
"dev": true
},
"fs-extra": {
"version": "0.30.0",
"from": "fs-extra@>=0.30.0 <0.31.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
"dev": true
},
"nugget": {
"version": "2.0.1",
"from": "nugget@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
"dev": true
},
"semver": {
"version": "5.3.0",
"from": "semver@>=5.3.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"dev": true
},
"single-line-log": {
"version": "1.1.2",
"from": "single-line-log@>=1.1.2 <2.0.0",
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
"dev": true
}
}
},
"electron-window": {
"version": "0.8.1",
"from": "electron-window@>=0.8.0 <0.9.0",

2
package.json
View File

@ -106,10 +106,10 @@
"angular-mocks": "1.6.3",
"asar": "^0.10.0",
"browserify": "^13.0.1",
"electron": "1.6.6",
"electron-builder": "^2.6.0",
"electron-mocha": "^3.1.1",
"electron-packager": "^7.0.1",
"electron-prebuilt": "1.4.4",
"eslint": "^3.16.1",
"eslint-plugin-lodash": "^2.3.5",
"file-exists": "^1.0.0",