yargs 11.1.0 → 11.1.1

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 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="11.1.1"></a>
+# [11.1.1](https://github.com/yargs/yargs/compare/v11.1.0...v11.1.1) (2019-10-06)
+
+* backport security fix for os-locale.
+
 <a name="11.1.0"></a>
 # [11.1.0](https://github.com/yargs/yargs/compare/v11.0.0...v11.1.0) (2018-03-04)
 
@@ -16,8 +21,6 @@ All notable changes to this project will be documented in this file. See [standa
 * allow hidden options to be displayed with --show-hidden ([#1061](https://github.com/yargs/yargs/issues/1061)) ([ea862ae](https://github.com/yargs/yargs/commit/ea862ae))
 * extend *.rc files in addition to json ([#1080](https://github.com/yargs/yargs/issues/1080)) ([11691a6](https://github.com/yargs/yargs/commit/11691a6))
 
-
-
 <a name="11.0.0"></a>
 # [11.0.0](https://github.com/yargs/yargs/compare/v10.1.2...v11.0.0) (2018-01-22)
 

package/README.md

@@ -1,11 +1,4 @@
-<p align="center">
-  <img width="250" src="/yargs-logo.png">
-</p>
-<h1 align="center"> Yargs </h1>
-<p align="center">
-  <b >Yargs be a node.js library fer hearties tryin' ter parse optstrings</b>
-</p>
-<br>
+# Yargs
 
 [![Build Status][travis-image]][travis-url]
 [![Coverage Status][coveralls-image]][coveralls-url]
@@ -15,10 +8,13 @@
 [![Conventional Commits][conventional-commits-image]][conventional-commits-url]
 [![Slack][slack-image]][slack-url]
 
-## Description :
-Yargs helps you build interactive command line tools, by parsing arguments and generating an elegant user interface. 
+_Having problems? want to contribute? join our [community slack](http://devtoolscommunity.herokuapp.com)_.
 
-It gives you:
+> Yargs be a node.js library fer hearties tryin' ter parse optstrings.
+
+<img width="250" src="/yargs-logo.png">
+
+Yargs helps you build interactive command line tools, by parsing arguments and generating an elegant user interface. It gives you:
 
 * commands and (grouped) options (`my-program.js serve --port=5000`).
 * a dynamically generated help menu based on your arguments.
@@ -34,9 +30,7 @@ It gives you:
 npm i yargs --save
 ```
 
-## Usage :
-
-### Simple Example
+## Simple Example
 
 ````javascript
 #!/usr/bin/env node
@@ -57,9 +51,9 @@ $ ./plunder.js --ships 12 --distance 98.7
 Retreat from the xupptumblers!
 ```
 
-### Complex Example
+## Complex Example
 
-```javascript
+```js
 #!/usr/bin/env node
 require('yargs') // eslint-disable-line
   .command('serve [port]', 'start the server', (yargs) => {
@@ -81,13 +75,7 @@ require('yargs') // eslint-disable-line
 
 Run the example above with `--help` to see the help for the application.
 
-## Community :
-
-Having problems? want to contribute? join our [community slack](http://devtoolscommunity.herokuapp.com).
-
-## Documentation :
-
-### Table of Contents
+## Table of Contents
 
 * [Yargs' API](/docs/api.md)
 * [Examples](/docs/examples.md)

package/lib/apply-extends.js

@@ -21,7 +21,7 @@ function applyExtends (config, cwd) {
 
   if (config.hasOwnProperty('extends')) {
     if (typeof config.extends !== 'string') return defaultConfig
-    const isPath = /\.json|\..*rc$/.test(config.extends)
+    const isPath = /\.json$/.test(config.extends)
     let pathToDefault = null
     if (!isPath) {
       try {

package/lib/usage.js

@@ -152,23 +152,16 @@ module.exports = function usage (yargs, y18n) {
     const demandedCommands = yargs.getDemandedCommands()
     const groups = yargs.getGroups()
     const options = yargs.getOptions()
-
-    let keys = []
-    keys = keys.concat(Object.keys(descriptions))
-    keys = keys.concat(Object.keys(demandedOptions))
-    keys = keys.concat(Object.keys(demandedCommands))
-    keys = keys.concat(Object.keys(options.default))
-    keys = keys.filter(key => {
-      if (options.hiddenOptions.indexOf(key) < 0) {
-        return true
-      } else if (yargs.parsed.argv[options.showHiddenOpt]) {
-        return true
-      }
-    })
-    keys = Object.keys(keys.reduce((acc, key) => {
-      if (key !== '_') acc[key] = true
-      return acc
-    }, {}))
+    let keys = Object.keys(
+      Object.keys(descriptions)
+      .concat(Object.keys(demandedOptions))
+      .concat(Object.keys(demandedCommands))
+      .concat(Object.keys(options.default))
+      .reduce((acc, key) => {
+        if (key !== '_') acc[key] = true
+        return acc
+      }, {})
+    )
 
     const theWrap = getWrap()
     const ui = require('cliui')({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.js",
   "files": [
@@ -16,7 +16,7 @@
     "decamelize": "^1.1.1",
     "find-up": "^2.1.0",
     "get-caller-file": "^1.0.1",
-    "os-locale": "^2.0.0",
+    "os-locale": "^3.1.0",
     "require-directory": "^2.1.1",
     "require-main-filename": "^1.0.1",
     "set-blocking": "^2.0.0",

package/yargs.js

@@ -93,8 +93,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
     const arrayOptions = [
       'array', 'boolean', 'string', 'skipValidation',
-      'count', 'normalize', 'number',
-      'hiddenOptions'
+      'count', 'normalize', 'number'
     ]
 
     const objectOptions = [
@@ -658,9 +657,8 @@ function Yargs (processArgs, cwd, parentRequire) {
       }
 
       const desc = opt.describe || opt.description || opt.desc
-      self.describe(key, desc)
-      if (opt.hidden) {
-        self.hide(key)
+      if (!opt.hidden) {
+        self.describe(key, desc)
       }
 
       if (opt.requiresArg) {
@@ -826,28 +824,6 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
-  const defaultShowHiddenOpt = 'show-hidden'
-  options.showHiddenOpt = defaultShowHiddenOpt
-  self.addShowHiddenOpt = self.showHidden = function addShowHiddenOpt (opt, msg) {
-    argsert('[string|boolean] [string]', [opt, msg], arguments.length)
-
-    if (arguments.length === 1) {
-      if (opt === false) return self
-    }
-
-    const showHiddenOpt = typeof opt === 'string' ? opt : defaultShowHiddenOpt
-    self.boolean(showHiddenOpt)
-    self.describe(showHiddenOpt, msg || usage.deferY18nLookup('Show hidden options'))
-    options.showHiddenOpt = showHiddenOpt
-    return self
-  }
-
-  self.hide = function hide (key) {
-    argsert('<string|object>', [key], arguments.length)
-    options.hiddenOptions.push(key)
-    return self
-  }
-
   self.showHelpOnFail = function showHelpOnFail (enabled, message) {
     argsert('[boolean|string] [string]', [enabled, message], arguments.length)
     usage.showHelpOnFail(enabled, message)