aboutsummaryrefslogtreecommitdiff
path: root/node_modules/yargs-parser
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/yargs-parser')
-rw-r--r--node_modules/yargs-parser/CHANGELOG.md15
-rw-r--r--node_modules/yargs-parser/README.md2
-rw-r--r--node_modules/yargs-parser/index.js8
-rw-r--r--node_modules/yargs-parser/package.json2
4 files changed, 21 insertions, 6 deletions
diff --git a/node_modules/yargs-parser/CHANGELOG.md b/node_modules/yargs-parser/CHANGELOG.md
index bf172df5f..cd060f3c6 100644
--- a/node_modules/yargs-parser/CHANGELOG.md
+++ b/node_modules/yargs-parser/CHANGELOG.md
@@ -2,6 +2,21 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="5.0.0"></a>
+# [5.0.0](https://github.com/yargs/yargs-parser/compare/v4.2.1...v5.0.0) (2017-02-18)
+
+
+### Bug Fixes
+
+* environment variables should take precedence over config file ([#81](https://github.com/yargs/yargs-parser/issues/81)) ([76cee1f](https://github.com/yargs/yargs-parser/commit/76cee1f))
+
+
+### BREAKING CHANGES
+
+* environment variables will now override config files (args, env, config-file, config-object)
+
+
+
<a name="4.2.1"></a>
## [4.2.1](https://github.com/yargs/yargs-parser/compare/v4.2.0...v4.2.1) (2017-01-02)
diff --git a/node_modules/yargs-parser/README.md b/node_modules/yargs-parser/README.md
index cf4517481..6d5916c33 100644
--- a/node_modules/yargs-parser/README.md
+++ b/node_modules/yargs-parser/README.md
@@ -11,7 +11,7 @@ The mighty option parser used by [yargs](https://github.com/yargs/yargs).
visit the [yargs website](http://yargs.js.org/) for more examples, and thorough usage instructions.
-<img width="250" src="yargs-logo.png">
+<img width="250" src="https://github.com/yargs/yargs-parser/blob/master/yargs-logo.png">
## Example
diff --git a/node_modules/yargs-parser/index.js b/node_modules/yargs-parser/index.js
index 1a04d559b..b71faf584 100644
--- a/node_modules/yargs-parser/index.js
+++ b/node_modules/yargs-parser/index.js
@@ -273,14 +273,14 @@ function parse (args, opts) {
// order of precedence:
// 1. command line arg
- // 2. value from config file
- // 3. value from config objects
- // 4. value from env var
+ // 2. value from env var
+ // 3. value from config file
+ // 4. value from config objects
// 5. configured default value
applyEnvVars(argv, true) // special case: check env vars that point to config file
+ applyEnvVars(argv, false)
setConfig(argv)
setConfigObjects()
- applyEnvVars(argv, false)
applyDefaultsAndAliases(argv, flags.aliases, defaults)
applyCoercions(argv)
diff --git a/node_modules/yargs-parser/package.json b/node_modules/yargs-parser/package.json
index 9b3ddd555..d025a7ef7 100644
--- a/node_modules/yargs-parser/package.json
+++ b/node_modules/yargs-parser/package.json
@@ -1,6 +1,6 @@
{
"name": "yargs-parser",
- "version": "4.2.1",
+ "version": "5.0.0",
"description": "the mighty option parser used by yargs",
"main": "index.js",
"scripts": {