Electron upgrade to 1.6.11 #286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hexa00
suggested changes
Jul 11, 2017
examples/browser/npm-shrinkwrap.json
Outdated
| "from": "xterm@>=2.6.0 <3.0.0", | ||
| "resolved": "https://registry.npmjs.org/xterm/-/xterm-2.7.0.tgz" | ||
| "resolved": "https://registry.npmjs.org/xterm/-/xterm-2.8.1.tgz" | ||
| }, | ||
| "y18n": { | ||
| "version": "3.2.1", |
There was a problem hiding this comment.
Electron is not the only change in the shrinkwrap here... it is not good.
Strange thing it looks like the changes from the previous commit are in this one also ?
| "from": "xterm@>=2.6.0 <3.0.0", | ||
| "resolved": "https://registry.npmjs.org/xterm/-/xterm-2.7.0.tgz" | ||
| "resolved": "https://registry.npmjs.org/xterm/-/xterm-2.8.1.tgz" | ||
| }, | ||
| "y18n": { | ||
| "version": "3.2.1", |
There was a problem hiding this comment.
Same problem here about the shrinkwrap change
| "from": "@types/node@>=7.0.18 <8.0.0", | ||
| "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.34.tgz" | ||
| } | ||
| } | ||
| }, | ||
| "electron-download": { |
There was a problem hiding this comment.
This one is OK, the others should look like it
package.json
Outdated
| @@ -35,7 +34,7 @@ | |||
| "body-parser": "^1.17.2", | |||
| "bunyan": "^1.8.10", | |||
| "chokidar": "^1.6.1", | |||
| "electron": "1.6.8", | |||
| "electron": "1.6.11", | |||
|
Note also the 1st commit is there to better help you make a good shrinkwrap commit with only your changes... You just remove it from the PR once this is ok |
|
The shrinkwrap is still wrong and you still have the 2 commits in your pr... |
lmcgupe
force-pushed
the
electron
branch
2 times, most recently
from
ff9cdd0 to
190377b
Compare
Signed-off-by: Guy Perron <guy.perron@ericsson.com>
hexa00
approved these changes
Jul 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.