@oclif/core 4.13.2 → 4.13.4

package/lib/config/config.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
-const ejs = __importStar(require("ejs"));
+const ejs_1 = __importDefault(require("ejs"));
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
@@ -304,7 +271,7 @@ class Config {
         if (this.platform === 'win32')
             this.dirname = this.dirname.replace('/', '\\');
         this.userAgent = `${this.name}/${this.version} ${this.platform}-${this.arch} node-${process.version}`;
-        this.shell = (0, os_1.getShell)();
+        this.shell = await (0, os_1.getShell)();
         this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, os_1.getHomeDir)() || (0, node_os_1.tmpdir)();
         this.cacheDir = this.scopedEnvVar('CACHE_DIR') || this.macosCacheDir() || this.dir('cache');
         this.configDir = this.scopedEnvVar('CONFIG_DIR') || this.dir('config');
@@ -532,7 +499,7 @@ class Config {
         else if (ext)
             options.ext = ext;
         const template = this.updateConfig.s3?.templates?.[options.platform ? 'target' : 'vanilla'][type] ?? '';
-        return ejs.render(template, { ...this, ...options });
+        return ejs_1.default.render(template, { ...this, ...options });
     }
     s3Url(key) {
         const { host } = this.updateConfig.s3 ?? { host: undefined };

package/lib/help/util.js

@@ -1,37 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.template = template;
 exports.standardizeIDFromArgv = standardizeIDFromArgv;
@@ -39,12 +9,12 @@ exports.getHelpFlagAdditions = getHelpFlagAdditions;
 exports.formatFlagDeprecationWarning = formatFlagDeprecationWarning;
 exports.formatCommandDeprecationWarning = formatCommandDeprecationWarning;
 exports.normalizeArgv = normalizeArgv;
-const ejs = __importStar(require("ejs"));
+const ejs_1 = __importDefault(require("ejs"));
 const util_1 = require("../config/util");
 const ids_1 = require("../util/ids");
 function template(context) {
     function render(t) {
-        return ejs.render(t, context);
+        return ejs_1.default.render(t, context);
     }
     return render;
 }

package/lib/util/os.d.ts

@@ -16,4 +16,4 @@ export declare function getHomeDir(): string;
  * @returns The process' platform
  */
 export declare function getPlatform(): 'wsl' | NodeJS.Platform;
-export declare function getShell(): string;
+export declare function getShell(): Promise<string>;

package/lib/util/os.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHomeDir = getHomeDir;
 exports.getPlatform = getPlatform;
 exports.getShell = getShell;
-const is_wsl_1 = __importDefault(require("is-wsl"));
 const node_child_process_1 = require("node:child_process");
 const node_os_1 = require("node:os");
 const node_path_1 = __importDefault(require("node:path"));
+// eslint-disable-next-line perfectionist/sort-imports -- Conflicts with other import rules in the case of `require` statements.
+const wslUtils = require('wsl-utils');
 /**
  * Call os.homedir() and return the result
  *
@@ -30,25 +31,25 @@ function getHomeDir() {
  * @returns The process' platform
  */
 function getPlatform() {
-    return is_wsl_1.default ? 'wsl' : (0, node_os_1.platform)();
+    return wslUtils.isWsl ? 'wsl' : (0, node_os_1.platform)();
 }
-function getShell() {
+async function getShell() {
     let shellPath;
     const SHELL = process.env.SHELL ?? (0, node_os_1.userInfo)().shell?.split(node_path_1.default.sep)?.pop();
     if (SHELL) {
         shellPath = SHELL.split('/');
     }
     else if (getPlatform() === 'win32') {
-        shellPath = determineWindowsShell().split(node_path_1.default.sep);
+        shellPath = (await determineWindowsShell()).split(node_path_1.default.sep);
     }
     else {
         shellPath = ['unknown'];
     }
     return shellPath.at(-1) ?? 'unknown';
 }
-function determineWindowsShell() {
+async function determineWindowsShell() {
     try {
-        const parentProcessName = (0, node_child_process_1.execSync)(`powershell.exe -NoProfile -Command "(Get-CimInstance Win32_Process -Filter 'ProcessID = ${process.ppid}').Name"`, { encoding: 'utf8' });
+        const parentProcessName = (0, node_child_process_1.execSync)(`${await wslUtils.powerShellPath()} -NoProfile -Command "(Get-CimInstance Win32_Process -Filter 'ProcessID = ${process.ppid}').Name"`, { encoding: 'utf8' });
         return parentProcessName.includes('powershell') || parentProcessName.includes('pwsh')
             ? 'powershell'
             : (process.env.COMSPEC ?? 'cmd.exe');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.13.2",
+  "version": "4.13.4",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -10,10 +10,9 @@
     "clean-stack": "^3.0.1",
     "cli-spinners": "^2.9.2",
     "debug": "^4.4.3",
-    "ejs": "^3.1.10",
+    "ejs": "^6",
     "get-package-type": "^0.1.0",
     "indent-string": "^4.0.0",
-    "is-wsl": "^2.2.0",
     "lilconfig": "^3.1.3",
     "minimatch": "^10.2.5",
     "semver": "^7.8.1",
@@ -22,7 +21,8 @@
     "tinyglobby": "^0.2.17",
     "widest-line": "^3.1.0",
     "wordwrap": "^1.0.0",
-    "wrap-ansi": "^7.0.0"
+    "wrap-ansi": "^7.0.0",
+    "wsl-utils": "^0.4.0"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",