@oclif/core 2.6.3 → 2.6.5

package/lib/command.js

@@ -157,16 +157,21 @@ class Command {
     }
     warnIfFlagDeprecated(flags) {
         for (const flag of Object.keys(flags)) {
-            const deprecated = this.ctor.flags[flag]?.deprecated;
+            const flagDef = this.ctor.flags[flag];
+            const deprecated = flagDef?.deprecated;
             if (deprecated) {
                 this.warn((0, util_2.formatFlagDeprecationWarning)(flag, deprecated));
             }
-            const deprecateAliases = this.ctor.flags[flag]?.deprecateAliases;
-            const aliases = (this.ctor.flags[flag]?.aliases ?? []).map(a => a.length === 1 ? `-${a}` : `--${a}`);
+            const deprecateAliases = flagDef?.deprecateAliases;
+            const aliases = (flagDef?.aliases ?? []).map(a => a.length === 1 ? `-${a}` : `--${a}`);
             if (deprecateAliases && aliases.length > 0) {
                 const foundAliases = aliases.filter(alias => this.argv.some(a => a.startsWith(alias)));
                 for (const alias of foundAliases) {
-                    this.warn((0, util_2.formatFlagDeprecationWarning)(alias, { to: this.ctor.flags[flag]?.name }));
+                    let preferredUsage = `--${flagDef?.name}`;
+                    if (flagDef?.char) {
+                        preferredUsage += ` | -${flagDef?.char}`;
+                    }
+                    this.warn((0, util_2.formatFlagDeprecationWarning)(alias, { to: preferredUsage }));
                 }
             }
         }

package/lib/help/util.js

@@ -101,7 +101,7 @@ function formatFlagDeprecationWarning(flag, opts) {
     if (opts.version) {
         message += ` and will be removed in version ${opts.version}`;
     }
-    message += opts.to ? `. Use "--${opts.to}" instead.` : '.';
+    message += opts.to ? `. Use "${opts.to}" instead.` : '.';
     return message;
 }
 exports.formatFlagDeprecationWarning = formatFlagDeprecationWarning;

package/lib/module-loader.js

@@ -123,12 +123,15 @@ class ModuleLoader {
     static resolvePath(config, modulePath) {
         let isESM;
         let filePath;
+        const isPlugin = (config) => {
+            return config.type !== undefined;
+        };
         try {
             filePath = require.resolve(modulePath);
             isESM = ModuleLoader.isPathModule(filePath);
         }
         catch {
-            filePath = Config.tsPath(config.root, modulePath);
+            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)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {