oclif 4.4.11 → 4.4.13-dev.0

package/lib/commands/generate/hook.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const fs = require("fs-extra");
+const node_path_1 = require("node:path");
 const command_base_1 = require("./../../command-base");
 class GenerateHook extends command_base_1.default {
     static args = {
@@ -13,10 +15,13 @@ class GenerateHook extends command_base_1.default {
     };
     async run() {
         const { args, flags } = await this.parse(GenerateHook);
+        const tsConfigPath = (0, node_path_1.resolve)(process.cwd(), 'tsconfig.json');
+        const tsConfig = await fs.readJSON(tsConfigPath).catch(() => ({}));
         await super.generate('hook', {
             event: flags.event,
             force: flags.force,
             name: args.name,
+            outDir: tsConfig.compilerOptions?.outDir ?? 'dist',
         });
     }
 }

package/lib/commands/readme.js

@@ -211,7 +211,13 @@ USAGE
      * fetches the path to a command
      */
     commandPath(plugin, c) {
-        const commandsDir = plugin.pjson.oclif.commands;
+        const strategy = typeof plugin.pjson.oclif?.commands === 'string' ? 'pattern' : plugin.pjson.oclif?.commands?.strategy;
+        // if the strategy is explicit, we can't determine the path so return undefined
+        if (strategy === 'explicit')
+            return;
+        const commandsDir = typeof plugin.pjson.oclif?.commands === 'string'
+            ? plugin.pjson.oclif?.commands
+            : plugin.pjson.oclif?.commands?.target;
         if (!commandsDir)
             return;
         const hasTypescript = plugin.pjson.devDependencies?.typescript || plugin.pjson.dependencies?.typescript;

package/lib/generators/hook.d.ts

@@ -3,6 +3,7 @@ import * as Generator from 'yeoman-generator';
 import { GeneratorOptions } from '../types';
 export interface Options extends GeneratorOptions {
     event: string;
+    outDir: string;
 }
 export default class Hook extends Generator {
     options: Options;

package/lib/generators/hook.js

@@ -27,7 +27,7 @@ class Hook extends Generator {
         this.pjson.oclif = this.pjson.oclif || {};
         this.pjson.oclif.hooks = this.pjson.oclif.hooks || {};
         const hooks = this.pjson.oclif.hooks;
-        const p = `./dist/hooks/${this.options.event}/${this.options.name}`;
+        const p = `./${this.options.outDir}/hooks/${this.options.event}/${this.options.name}`;
         if (hooks[this.options.event]) {
             hooks[this.options.event] = (0, util_1.castArray)(hooks[this.options.event]);
             hooks[this.options.event] = [...hooks[this.options.event], p];

package/oclif.manifest.json

@@ -737,5 +737,5 @@
       ]
     }
   },
-  "version": "4.4.11"
+  "version": "4.4.13-dev.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.4.11",
+  "version": "4.4.13-dev.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -10,7 +10,7 @@
   "dependencies": {
     "@aws-sdk/client-cloudfront": "^3.511.0",
     "@aws-sdk/client-s3": "^3.504.0",
-    "@oclif/core": "^3.19.1",
+    "@oclif/core": "3.19.2-dev.0",
     "@oclif/plugin-help": "^6.0.12",
     "@oclif/plugin-not-found": "^3.0.10",
     "@oclif/plugin-warn-if-update-available": "^3.0.9",
@@ -50,8 +50,8 @@
     "eslint-config-oclif": "^5.0.0",
     "eslint-config-oclif-typescript": "^3.0.44",
     "eslint-config-prettier": "^9.0.0",
-    "fancy-test": "^3.0.10",
     "eslint-plugin-perfectionist": "^2.1.0",
+    "fancy-test": "^3.0.10",
     "globby": "^11.1.0",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
@@ -64,6 +64,9 @@
     "ts-node": "^10.7.0",
     "typescript": "^5"
   },
+  "resolutions": {
+    "@oclif/core": "3.19.2-dev.0"
+  },
   "engines": {
     "node": ">=18.0.0"
   },