Merge branch 'master' into 7.0

# Conflicts:
#	.travis.yml
#	CHANGELOG.md
#	lerna.json
#	packages/babel-cli/package.json
This commit is contained in:
Henry Zhu
2017-01-21 08:52:14 -05:00
7 changed files with 38 additions and 30 deletions

View File

@@ -102,7 +102,7 @@ if (program.eval || program.print) {
let i = 0;
let ignoreNext = false;
args.forEach(function (arg, i2) {
args.some(function (arg, i2) {
if (ignoreNext) {
ignoreNext = false;
return;
@@ -115,7 +115,7 @@ if (program.eval || program.print) {
}
} else {
i = i2;
return false;
return true;
}
});
args = args.slice(i);