@oclif/core 2.12.0 → 2.14.0

package/lib/cli-ux/action/spinner.js

@@ -4,7 +4,6 @@ const chalk = require("chalk");
 const supportsColor = require("supports-color");
 const stripAnsi = require('strip-ansi');
 const ansiStyles = require('ansi-styles');
-const ansiEscapes = require('ansi-escapes');
 const screen_1 = require("../../screen");
 const spinners_1 = require("./spinners");
 const base_1 = require("./base");
@@ -65,6 +64,7 @@ class SpinnerAction extends base_1.ActionBase {
     _reset() {
         if (!this.output)
             return;
+        const ansiEscapes = require('ansi-escapes');
         const lines = this._lines(this.output);
         this._write(this.std, ansiEscapes.cursorLeft + ansiEscapes.cursorUp(lines) + ansiEscapes.eraseDown);
         this.output = undefined;

package/lib/cli-ux/config.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = exports.Config = void 0;
-const semver = require("semver");
 const util_1 = require("../util");
 const spinner_1 = require("./action/spinner");
 const spinner_2 = require("./action/spinner");
 const pride_spinner_1 = require("./action/pride-spinner");
-const version = semver.parse((0, util_1.requireJson)(__dirname, '..', '..', 'package.json').version);
 const g = global;
 const globals = g['cli-ux'] || (g['cli-ux'] = {});
 const actionType = (Boolean(process.stderr.isTTY) &&
@@ -38,10 +36,11 @@ class Config {
 }
 exports.Config = Config;
 function fetch() {
-    if (globals[version.major])
-        return globals[version.major];
-    globals[version.major] = new Config();
-    return globals[version.major];
+    const major = (0, util_1.requireJson)(__dirname, '..', '..', 'package.json').version.split('.')[0];
+    if (globals[major])
+        return globals[major];
+    globals[major] = new Config();
+    return globals[major];
 }
 exports.config = fetch();
 exports.default = exports.config;

package/lib/cli-ux/prompt.js

@@ -5,8 +5,6 @@ const Errors = require("../errors");
 const config_1 = require("./config");
 const chalk = require("chalk");
 const stream_1 = require("./stream");
-const ansiEscapes = require('ansi-escapes');
-const passwordPrompt = require('password-prompt');
 function normal(options, retries = 100) {
     if (retries < 0)
         throw new Error('no input');
@@ -58,6 +56,7 @@ async function single(options) {
     return response;
 }
 function replacePrompt(prompt) {
+    const ansiEscapes = require('ansi-escapes');
     stream_1.stderr.write(ansiEscapes.cursorHide + ansiEscapes.cursorUp(1) + ansiEscapes.cursorLeft + prompt +
         ansiEscapes.cursorDown(1) + ansiEscapes.cursorLeft + ansiEscapes.cursorShow);
 }
@@ -72,6 +71,7 @@ async function _prompt(name, inputOptions = {}) {
         default: '',
         ...inputOptions,
     };
+    const passwordPrompt = require('password-prompt');
     switch (options.type) {
         case 'normal':
             return normal(options);

package/lib/config/config.js

@@ -15,9 +15,8 @@ const help_1 = require("../help");
 const stream_1 = require("../cli-ux/stream");
 const performance_1 = require("../performance");
 const settings_1 = require("../settings");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-const semver_1 = require("semver");
+const os_1 = require("os");
+const path_1 = require("path");
 // eslint-disable-next-line new-cap
 const debug = (0, util_2.Debug)();
 const _pjson = (0, util_3.requireJson)(__dirname, '..', '..', 'package.json');
@@ -71,8 +70,24 @@ class Config {
         this.topicPermutations = new Permutations();
         this._commands = new Map();
         this._topics = new Map();
-        if (options.config)
-            Object.assign(this, options.config);
+        if (options.config) {
+            if (Array.isArray(options.config.plugins) && Array.isArray(this.plugins)) {
+                // incoming config is v2 with plugins array and this config is v2 with plugins array
+                Object.assign(this, options.config);
+            }
+            else if (Array.isArray(options.config.plugins) && !Array.isArray(this.plugins)) {
+                // incoming config is v2 with plugins array and this config is v3 with plugin Map
+                Object.assign(this, options.config, { plugins: new Map(options.config.plugins.map(p => [p.name, p])) });
+            }
+            else if (!Array.isArray(options.config.plugins) && Array.isArray(this.plugins)) {
+                // incoming config is v3 with plugin Map and this config is v2 with plugins array
+                Object.assign(this, options.config, { plugins: options.config.getPluginsList() });
+            }
+            else {
+                // incoming config is v3 with plugin Map and this config is v3 with plugin Map
+                Object.assign(this, options.config);
+            }
+        }
     }
     static async load(opts = module.filename || __dirname) {
         // Handle the case when a file URL string is passed in such as 'import.meta.url'; covert to file path.
@@ -82,6 +97,7 @@ class Config {
         if (typeof opts === 'string')
             opts = { root: opts };
         if (isConfig(opts)) {
+            const { lt } = await import('semver');
             const currentConfigBase = BASE.replace('@oclif/core@', '');
             const incomingConfigBase = opts._base.replace('@oclif/core@', '');
             /**
@@ -94,7 +110,7 @@ class Config {
              * exists in the version of Config required by the command but may not exist on the
              * root's instance of Config.
              */
-            if ((0, semver_1.lt)(incomingConfigBase, currentConfigBase)) {
+            if (lt(incomingConfigBase, currentConfigBase)) {
                 debug(`reloading config from ${opts._base} to ${BASE}`);
                 return new Config({ ...opts.options, config: opts });
             }
@@ -507,7 +523,7 @@ class Config {
     _shell() {
         let shellPath;
         const COMSPEC = process.env.COMSPEC;
-        const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.sep)?.pop();
+        const SHELL = process.env.SHELL ?? (0, os_1.userInfo)().shell?.split(path_1.sep)?.pop();
         if (SHELL) {
             shellPath = SHELL.split('/');
         }

package/lib/errors/logger.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
-const fs = require("fs-extra");
-const path = require("path");
+const fs = require("fs/promises");
+const path_1 = require("path");
 const stripAnsi = require("strip-ansi");
 const timestamp = () => new Date().toISOString();
 let timer;
@@ -35,7 +35,7 @@ class Logger {
                 return;
             const mylines = this.buffer;
             this.buffer = [];
-            await fs.mkdirp(path.dirname(this.file));
+            await fs.mkdir((0, path_1.dirname)(this.file), { recursive: true });
             await fs.appendFile(this.file, mylines.join('\n') + '\n');
         });
         await this.flushing;

package/lib/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.tsPath = exports.toCached = exports.run = exports.Performance = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Command = exports.Args = void 0;
-const semver = require("semver");
 const command_1 = require("./command");
 Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return command_1.Command; } });
 const main_1 = require("./main");
@@ -34,7 +33,6 @@ const settings_1 = require("./settings");
 Object.defineProperty(exports, "settings", { enumerable: true, get: function () { return settings_1.settings; } });
 const ux = require("./cli-ux");
 exports.ux = ux;
-const util_2 = require("./util");
 const stream_1 = require("./cli-ux/stream");
 Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return stream_1.stderr; } });
 Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return stream_1.stdout; } });
@@ -52,11 +50,4 @@ function checkCWD() {
         }
     }
 }
-function checkNodeVersion() {
-    const pjson = (0, util_2.requireJson)(__dirname, '..', 'package.json');
-    if (!semver.satisfies(process.versions.node, pjson.engines.node)) {
-        stream_1.stderr.write(`WARNING\nWARNING Node version must be ${pjson.engines.node} to use this CLI\nWARNING Current node version: ${process.versions.node}\nWARNING\n`);
-    }
-}
 checkCWD();
-checkNodeVersion();

package/lib/module-loader.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const url = require("url");
-const fs = require("fs-extra");
+const fs_1 = require("fs");
 const errors_1 = require("./errors");
 const Config = require("./config");
 const getPackageType = require('get-package-type');
@@ -131,10 +131,10 @@ class ModuleLoader {
             filePath = isPlugin(config) ? Config.tsPath(config.root, modulePath, config.type) : Config.tsPath(config.root, modulePath);
             let fileExists = false;
             let isDirectory = false;
-            if (fs.existsSync(filePath)) {
+            if ((0, fs_1.existsSync)(filePath)) {
                 fileExists = true;
                 try {
-                    if (fs.lstatSync(filePath)?.isDirectory?.()) {
+                    if ((0, fs_1.lstatSync)(filePath)?.isDirectory?.()) {
                         fileExists = false;
                         isDirectory = true;
                     }
@@ -167,7 +167,7 @@ class ModuleLoader {
         // eslint-disable-next-line camelcase
         for (const extension of s_EXTENSIONS) {
             const testPath = `${filePath}${extension}`;
-            if (fs.existsSync(testPath)) {
+            if ((0, fs_1.existsSync)(testPath)) {
                 return testPath;
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.12.0",
+  "version": "2.14.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -14,7 +14,6 @@
     "cli-progress": "^3.12.0",
     "debug": "^4.3.4",
     "ejs": "^3.1.8",
-    "fs-extra": "^9.1.0",
     "get-package-type": "^0.1.0",
     "globby": "^11.1.0",
     "hyperlinker": "^1.0.0",
@@ -24,7 +23,7 @@
     "natural-orderby": "^2.0.3",
     "object-treeify": "^1.1.33",
     "password-prompt": "^1.1.2",
-    "semver": "^7.5.3",
+    "semver": "^7.5.4",
     "slice-ansi": "^4.0.0",
     "string-width": "^4.2.3",
     "strip-ansi": "^6.0.1",
@@ -47,7 +46,6 @@
     "@types/chai-as-promised": "^7.1.5",
     "@types/clean-stack": "^2.1.1",
     "@types/ejs": "^3.1.2",
-    "@types/fs-extra": "^9.0.13",
     "@types/indent-string": "^4.0.1",
     "@types/js-yaml": "^3.12.7",
     "@types/mocha": "^8.2.3",
@@ -55,7 +53,7 @@
     "@types/node": "^16",
     "@types/node-notifier": "^8.0.2",
     "@types/proxyquire": "^1.3.28",
-    "@types/semver": "^7.5.0",
+    "@types/semver": "^7.5.1",
     "@types/shelljs": "^0.8.11",
     "@types/slice-ansi": "^4.0.0",
     "@types/strip-ansi": "^5.2.1",
@@ -120,4 +118,4 @@
     "test:perf": "ts-node test/perf/parser.perf.ts"
   },
   "types": "lib/index.d.ts"
-}
+}