Merge branch 'master' into cli-options-kebab-case-naming

# Conflicts:
#	dist/index.js
This commit is contained in:
sanex3339
2017-12-04 01:00:16 +03:00
9 changed files with 16 additions and 151 deletions
+2 -1
View File
@@ -1,4 +1,5 @@
import * as commander from 'commander';
import * as packageJson from 'pjson';
import * as path from 'path';
import { TInputCLIOptions } from '../types/options/TInputCLIOptions';
@@ -182,7 +183,7 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
this.commands
.usage('<inputPath> [options]')
.version(
CLIUtils.getPackageConfig().version,
packageJson.version,
'-v, --version'
)
.option(