yargs 16.0.3 → 16.2.0

package/lib/platform-shims/browser.mjs

@@ -1,12 +1,13 @@
-'use strict'
+'use strict';
 
-import cliui from 'https://unpkg.com/cliui@7.0.1/index.mjs'
-import Parser from "https://unpkg.com/yargs-parser@19.0.0/browser.js";
-import { getProcessArgvBin } from '../../build/lib/utils/process-argv.js'
-import { YError } from '../../build/lib/yerror.js'
+import cliui from 'https://unpkg.com/cliui@7.0.1/index.mjs'; // eslint-disable-line
+import Parser from 'https://unpkg.com/yargs-parser@19.0.0/browser.js'; // eslint-disable-line
+import {getProcessArgvBin} from '../../build/lib/utils/process-argv.js';
+import {YError} from '../../build/lib/yerror.js';
 
-const REQUIRE_ERROR = 'require is not supported in browser'
-const REQUIRE_DIRECTORY_ERROR = 'loading a directory of commands is not supported in browser'
+const REQUIRE_ERROR = 'require is not supported in browser';
+const REQUIRE_DIRECTORY_ERROR =
+  'loading a directory of commands is not supported in browser';
 
 export default {
   assert: {
@@ -15,26 +16,26 @@ export default {
     },
     strictEqual: (a, b) => {
       // noop.
-    }
+    },
   },
   cliui,
   findUp: () => undefined,
-  getEnv: (key) => {
+  getEnv: key => {
     // There is no environment in browser:
-    return undefined
+    return undefined;
   },
   inspect: console.log,
   getCallerFile: () => {
-    throw new YError(REQUIRE_DIRECTORY_ERROR)
+    throw new YError(REQUIRE_DIRECTORY_ERROR);
   },
   getProcessArgvBin,
   mainFilename: 'yargs',
   Parser,
   path: {
-    basename: (str) => str,
-    dirname: (str) => str,
-    extname: (str) => str,
-    relative: (str) => str
+    basename: str => str,
+    dirname: str => str,
+    extname: str => str,
+    relative: str => str,
   },
   process: {
     argv: () => [],
@@ -42,50 +43,50 @@ export default {
     execPath: () => '',
     // exit is noop browser:
     exit: () => {},
-    nextTick: (cb) => {
-      window.setTimeout(cb, 1)
+    nextTick: cb => {
+      window.setTimeout(cb, 1);
     },
-    stdColumns: 80
+    stdColumns: 80,
   },
   readFileSync: () => {
-    return ''
+    return '';
   },
   require: () => {
-    throw new YError(REQUIRE_ERROR)
+    throw new YError(REQUIRE_ERROR);
   },
   requireDirectory: () => {
-    throw new YError(REQUIRE_DIRECTORY_ERROR)
+    throw new YError(REQUIRE_DIRECTORY_ERROR);
   },
-  stringWidth: (str) => {
-    return [...str].length
+  stringWidth: str => {
+    return [...str].length;
   },
   // TODO: replace this with y18n once it's ported to ESM:
   y18n: {
     __: (...str) => {
-      if (str.length === 0) return ''
-      const args = str.slice(1)
-      return sprintf(str[0], ...args)
+      if (str.length === 0) return '';
+      const args = str.slice(1);
+      return sprintf(str[0], ...args);
     },
     __n: (str1, str2, count, ...args) => {
       if (count === 1) {
-        return sprintf(str1, ...args)
+        return sprintf(str1, ...args);
       } else {
-        return sprintf(str2, ...args)
+        return sprintf(str2, ...args);
       }
     },
     getLocale: () => {
-      return 'en_US'
+      return 'en_US';
     },
     setLocale: () => {},
-    updateLocale: () => {}
-  }
-}
+    updateLocale: () => {},
+  },
+};
 
 function sprintf(_str, ...args) {
-  let str = ''
-  const split = _str.split('%s')
+  let str = '';
+  const split = _str.split('%s');
   split.forEach((token, i) => {
-    str += `${token}${split[i + 1] !== undefined && args[i] ? args[i] : ''}`
-  })
-  return str
+    str += `${token}${split[i + 1] !== undefined && args[i] ? args[i] : ''}`;
+  });
+  return str;
 }

package/package.json

@@ -1,22 +1,30 @@
 {
   "name": "yargs",
-  "version": "16.0.3",
+  "version": "16.2.0",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.cjs",
   "exports": {
-    ".": {
-      "import": "./index.mjs",
-      "require": "./index.cjs"
-    },
+    "./package.json": "./package.json",
+    ".": [
+      {
+        "import": "./index.mjs",
+        "require": "./index.cjs"
+      },
+      "./index.cjs"
+    ],
     "./helpers": {
-      "import": "./helpers.mjs"
+      "import": "./helpers/helpers.mjs",
+      "require": "./helpers/index.js"
     },
-    "./yargs": {
-      "require": "./yargs"
-    }
+    "./yargs": [
+      {
+        "require": "./yargs"
+      },
+      "./yargs"
+    ]
   },
   "type": "module",
-  "module": "./build/index.mjs",
+  "module": "./index.mjs",
   "contributors": [
     {
       "name": "Yargs Contributors",
@@ -26,7 +34,8 @@
   "files": [
     "browser.mjs",
     "index.cjs",
-    "helpers.mjs",
+    "helpers/*.js",
+    "helpers/*",
     "index.mjs",
     "yargs",
     "build",
@@ -36,20 +45,18 @@
     "!*.d.ts"
   ],
   "dependencies": {
-    "cliui": "^7.0.0",
-    "escalade": "^3.0.2",
+    "cliui": "^7.0.2",
+    "escalade": "^3.1.1",
     "get-caller-file": "^2.0.5",
     "require-directory": "^2.1.1",
     "string-width": "^4.2.0",
-    "y18n": "^5.0.1",
-    "yargs-parser": "^20.0.0"
+    "y18n": "^5.0.5",
+    "yargs-parser": "^20.2.2"
   },
   "devDependencies": {
     "@types/chai": "^4.2.11",
     "@types/mocha": "^8.0.0",
-    "@types/node": "^14.0.27",
-    "@typescript-eslint/eslint-plugin": "^3.0.0",
-    "@typescript-eslint/parser": "^3.0.0",
+    "@types/node": "^14.11.2",
     "@wessberg/rollup-plugin-ts": "^1.3.2",
     "c8": "^7.0.0",
     "chai": "^4.2.0",
@@ -58,10 +65,7 @@
     "cpr": "^3.0.1",
     "cross-env": "^7.0.2",
     "cross-spawn": "^7.0.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-node": "^11.0.0",
-    "gts": "^2.0.0-alpha.4",
+    "gts": "^3.0.0",
     "hashish": "0.0.4",
     "mocha": "^8.0.0",
     "rimraf": "^3.0.2",
@@ -73,8 +77,8 @@
     "yargs-test-extends": "^1.0.1"
   },
   "scripts": {
-    "check": "standardx './*.ts' && standardx '**/*.ts'",
-    "fix": "standardx --fix './*.ts'  && standardx --fix '**/*.ts'",
+    "fix": "gts fix && npm run fix:js",
+    "fix:js": "standardx --fix '**/*.mjs' && standardx --fix '**/*.cjs' && standardx --fix './*.mjs' && standardx --fix './*.cjs'",
     "posttest": "npm run check",
     "test": "c8 mocha ./test/*.cjs --require ./test/before.cjs --timeout=12000 --check-leaks",
     "test:esm": "c8 mocha ./test/esm/*.mjs --check-leaks",
@@ -84,7 +88,10 @@
     "compile": "rimraf build && tsc",
     "postcompile": "npm run build:cjs",
     "build:cjs": "rollup -c rollup.config.cjs",
-    "postbuild:cjs": "rimraf ./build/index.cjs.d.ts"
+    "postbuild:cjs": "rimraf ./build/index.cjs.d.ts",
+    "check": "gts lint && npm run check:js",
+    "check:js": "standardx '**/*.mjs' && standardx '**/*.cjs' && standardx './*.mjs' && standardx './*.cjs'",
+    "clean": "gts clean"
   },
   "repository": {
     "type": "git",
@@ -94,7 +101,9 @@
   "standardx": {
     "ignore": [
       "build",
-      "**/example/**"
+      "helpers",
+      "**/example/**",
+      "**/platform-shims/esm.mjs"
     ]
   },
   "keywords": [

package/yargs

@@ -1,8 +1,9 @@
 // TODO: consolidate on using a helpers file at some point in the future, which
-// is the approach currently used to export Parser and  applyExtends for ESM:
-const {applyExtends, cjsPlatformShim, Parser, Yargs} = require('./build/index.cjs')
+// is the approach currently used to export Parser and applyExtends for ESM:
+const {applyExtends, cjsPlatformShim, Parser, Yargs, processArgv} = require('./build/index.cjs')
 Yargs.applyExtends = (config, cwd, mergeExtends) => {
   return applyExtends(config, cwd, mergeExtends, cjsPlatformShim)
 }
+Yargs.hideBin = processArgv.hideBin
 Yargs.Parser = Parser
 module.exports = Yargs

package/helpers.mjs

@@ -1,14 +0,0 @@
-import { applyExtends as _applyExtends } from './build/lib/utils/apply-extends.js'
-import { hideBin } from './build/lib/utils/process-argv.js'
-import Parser from 'yargs-parser'
-import shim from './lib/platform-shims/esm.mjs'
-
-const applyExtends = (config, cwd, mergeExtends) => {
-  return _applyExtends(config, cwd, mergeExtends, shim)
-}
-
-export {
-  applyExtends,
-  hideBin,
-  Parser,
-}