Merge branch 'master' into as-introduce-editor-update

This commit is contained in:
Antonio Scandurra
2016-07-08 18:09:43 +02:00
4 changed files with 17 additions and 12 deletions

View File

@@ -72,7 +72,10 @@ function needsPatching (options = { platform: process.platform, env: process.env
// underlying functionality.
function clone (to, from) {
for (var key in to) {
delete to[key]
// Don't erase NODE_ENV. Fixes #12024
if (key !== 'NODE_ENV') {
delete to[key]
}
}
Object.assign(to, from)