@oclif/core 3.7.0 → 3.8.0

package/lib/config/config.js

@@ -458,7 +458,7 @@ class Config {
                 const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runHook#${p.name}(${hook})`);
                 try {
                     /* eslint-disable no-await-in-loop */
-                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, (0, node_path_1.join)(p.root, hook));
+                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, hook);
                     debug('start', isESM ? '(import)' : '(require)', filePath);
                     const result = timeout
                         ? await withTimeout(timeout, search(module).call(context, { ...opts, config: this }))
@@ -686,6 +686,15 @@ class Config {
     insertLegacyPlugins(plugins) {
         for (const plugin of plugins) {
             this.plugins.set(plugin.name, plugin);
+            // Delete all commands from the legacy plugin so that we can re-add them.
+            // This is necessary because this.determinePriority will pick the initial
+            // command that was added, which won't have been converted by PluginLegacy yet.
+            for (const cmd of plugin.commands ?? []) {
+                this._commands.delete(cmd.id);
+                for (const alias of [...(cmd.aliases ?? []), ...(cmd.hiddenAliases ?? [])]) {
+                    this._commands.delete(alias);
+                }
+            }
             this.loadCommands(plugin);
         }
     }

package/lib/config/plugin.js

@@ -163,7 +163,7 @@ class Plugin {
         else {
             this.pjson.oclif = this.pjson['cli-engine'] || {};
         }
-        this.hooks = (0, util_1.mapValues)(this.pjson.oclif.hooks || {}, (i) => (Array.isArray(i) ? i : [i]));
+        this.hooks = (0, util_1.mapValues)(this.pjson.oclif.hooks ?? {}, (i) => (0, util_1.castArray)(i).map((i) => (0, ts_node_1.tsPath)(this.root, i, this)));
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)
             .map(([id, c]) => ({

package/package.json

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