yargs 18.0.0-candidate.2 → 18.0.0-candidate.3

package/build/lib/command.js

@@ -4,8 +4,6 @@ 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 {
     constructor(usage, validation, globalMiddleware, shim) {
@@ -21,15 +19,15 @@ export class CommandInstance {
     addDirectory(dir, req, callerFile, opts) {
         opts = opts || {};
         this.requireCache.add(callerFile);
-        const fullDirPath = join(dirname(callerFile), dir);
-        const files = readdirSync(fullDirPath, {
+        const fullDirPath = this.shim.path.join(this.shim.path.dirname(callerFile), dir);
+        const files = this.shim.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('utf8');
+            const file = fileb.toString();
             if (opts.exclude) {
                 let exclude = false;
                 if (typeof opts.exclude === 'function') {
@@ -58,7 +56,7 @@ export class CommandInstance {
                     supportedExtension = true;
             }
             if (supportedExtension) {
-                const joined = join(fullDirPath, file);
+                const joined = this.shim.path.join(fullDirPath, file);
                 const module = req(joined);
                 const visited = visit(module, joined, file);
                 if (visited) {

package/build/lib/utils/apply-extends.js

@@ -1,6 +1,4 @@
 import { YError } from '../yerror.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
 let previouslyVisitedConfigs = [];
 let shim;
 export function applyExtends(config, cwd, mergeExtends, _shim) {
@@ -26,7 +24,7 @@ export function applyExtends(config, cwd, mergeExtends, _shim) {
         previouslyVisitedConfigs.push(pathToDefault);
         defaultConfig = isPath
             ? JSON.parse(shim.readFileSync(pathToDefault, 'utf8'))
-            : require(config.extends);
+            : _shim.require(config.extends);
         delete config.extends;
         defaultConfig = applyExtends(defaultConfig, shim.path.dirname(pathToDefault), mergeExtends, shim);
     }

package/lib/platform-shims/browser.mjs

@@ -1,8 +1,8 @@
 /* eslint-disable no-unused-vars */
 'use strict';
 
-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 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 {getProcessArgvBin} from '../../build/lib/utils/process-argv.js';
 import {YError} from '../../build/lib/yerror.js';
 
@@ -37,6 +37,7 @@ export default {
     dirname: str => str,
     extname: str => str,
     relative: str => str,
+    join: (str, _str2) => str,
   },
   process: {
     argv: () => [],
@@ -54,6 +55,9 @@ export default {
   readFileSync: () => {
     return '';
   },
+  readdirSync: () => {
+    return [];
+  },
   require: () => {
     throw new YError(REQUIRE_ERROR);
   },

package/lib/platform-shims/esm.mjs

@@ -4,15 +4,15 @@ 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'
+import { basename, dirname, extname, relative, resolve, join } from 'path'
 import { getProcessArgvBin } from '../../build/lib/utils/process-argv.js'
 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'));
@@ -37,7 +37,8 @@ export default {
     dirname,
     extname,
     relative,
-    resolve
+    resolve,
+    join
   },
   process: {
     argv: () => process.argv,
@@ -52,6 +53,7 @@ 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-candidate.2",
+  "version": "18.0.0-candidate.3",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.mjs",
   "exports": {
     "./package.json": "./package.json",
     "./helpers": "./helpers/helpers.mjs",
     "./browser": {
-      "import": "./browser.mjs",
-      "types": "./browser.d.ts"
+      "types": "./browser.d.ts",
+      "import": "./browser.mjs"
     },
     ".": "./index.mjs",
     "./yargs": "./index.mjs"