yargs 18.0.0-browser.0 → 18.0.0-candidate.1

package/build/lib/command.js

@@ -4,6 +4,7 @@ import { applyMiddleware, commandMiddlewareFactory, } from './middleware.js';
 import { parseCommand } from './parse-command.js';
 import { isYargsInstance, } from './yargs-factory.js';
 import { maybeAsyncResult } from './utils/maybe-async-result.js';
+import { readdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 const DEFAULT_MARKER = /(^\*)|(^\$0)/;
 export class CommandInstance {
@@ -21,14 +22,14 @@ export class CommandInstance {
         opts = opts || {};
         this.requireCache.add(callerFile);
         const fullDirPath = join(dirname(callerFile), dir);
-        const files = this.shim.readdirSync(fullDirPath, {
+        const files = readdirSync(fullDirPath, {
             recursive: opts.recurse ? true : false,
         });
         if (!Array.isArray(opts.extensions))
             opts.extensions = ['js'];
         const visit = typeof opts.visit === 'function' ? opts.visit : (o) => o;
         for (const fileb of files) {
-            const file = fileb.toString();
+            const file = fileb.toString('utf8');
             if (opts.exclude) {
                 let exclude = false;
                 if (typeof opts.exclude === 'function') {

package/build/lib/completion-templates.js

@@ -13,10 +13,9 @@ _{{app_name}}_yargs_completions()
     args=("\${COMP_WORDS[@]}")
 
     # ask yargs to generate completions.
-    # see https://stackoverflow.com/a/40944195/7080036 for the spaces-handling awk
-    mapfile -t type_list < <({{app_path}} --get-yargs-completions "\${args[@]}")
-    mapfile -t COMPREPLY < <(compgen -W "$( printf '%q ' "\${type_list[@]}" )" -- "\${cur_word}" |
-        awk '/ / { print "\\""$0"\\"" } /^[^ ]+$/ { print $0 }')
+    type_list=$({{app_path}} --get-yargs-completions "\${args[@]}")
+
+    COMPREPLY=( $(compgen -W "\${type_list}" -- \${cur_word}) )
 
     # if no match was found, fall back to filename completion
     if [ \${#COMPREPLY[@]} -eq 0 ]; then

package/lib/platform-shims/browser.mjs

@@ -1,8 +1,8 @@
 /* eslint-disable no-unused-vars */
 'use strict';
 
-import cliui from 'https://unpkg.com/cliui@8.0.1/index.mjs'; // eslint-disable-line
-import Parser from 'https://unpkg.com/yargs-parser@21.1.1/browser.js'; // eslint-disable-line
+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';
 
@@ -54,9 +54,6 @@ export default {
   readFileSync: () => {
     return '';
   },
-  readdirSync: () => {
-    return [];
-  },
   require: () => {
     throw new YError(REQUIRE_ERROR);
   },

package/lib/platform-shims/esm.mjs

@@ -4,6 +4,7 @@ import { notStrictEqual, strictEqual } from 'assert'
 import cliui from 'cliui'
 import escalade from 'escalade/sync'
 import { inspect } from 'util'
+import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url';
 import Parser from 'yargs-parser'
 import { basename, dirname, extname, relative, resolve } from 'path'
@@ -12,7 +13,6 @@ import stringWidth from 'string-width';
 import y18n from 'y18n'
 import { createRequire } from 'node:module';
 import getCallerFile from 'get-caller-file';
-import { readFileSync, readdirSync } from 'node:fs'
 
 const __dirname = fileURLToPath(import.meta.url);
 const mainFilename = __dirname.substring(0, __dirname.lastIndexOf('node_modules'));
@@ -52,7 +52,6 @@ export default {
     stdColumns: typeof process.stdout.columns !== 'undefined' ? process.stdout.columns : null
   },
   readFileSync,
-  readdirSync,
   require,
   getCallerFile: () => {
     const callerFile = getCallerFile(3);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "yargs",
-  "version": "18.0.0-browser.0",
+  "version": "18.0.0-candidate.1",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.mjs",
   "exports": {
     "./package.json": "./package.json",
     "./helpers": "./helpers/helpers.mjs",
     "./browser": {
-      "types": "./browser.d.ts",
-      "import": "./browser.mjs"
+      "import": "./browser.mjs",
+      "types": "./browser.d.ts"
     },
     ".": "./index.mjs",
     "./yargs": "./index.mjs"