oclif 3.11.0 → 3.11.2

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.11.0",
+  "version": "3.11.2",
   "commands": {
     "generate": {
       "id": "generate",

package/README.md

@@ -99,8 +99,8 @@ COMMANDS
   hello
   help   display help for mynewcli
 
-$ ./bin/run hello
-hello world from ./src/hello.js!
+$ ./bin/run hello world
+hello world! (./src/commands/hello/world.ts)
 ```
 
 # 📚 Examples

package/lib/commands/readme.js

@@ -125,11 +125,14 @@ USAGE
             return usage ? `## \`${config.bin} ${usage}\`` : `## \`${config.bin}\``;
         };
         try {
+            // copy c to keep the command ID with colons, see:
+            // https://github.com/oclif/oclif/pull/1165#discussion_r1282305242
+            const command = Object.assign({}, c);
             return (0, util_1.compact)([
                 header(),
                 title,
                 '```\n' + wrapper.formatCommand(c).trim() + '\n```',
-                this.commandCode(config, c),
+                this.commandCode(config, command),
             ]).join('\n\n');
         }
         catch (error) {

package/lib/generators/cli.js

@@ -5,7 +5,6 @@ const fs = require("fs");
 const _ = require("lodash");
 const path = require("path");
 const Generator = require("yeoman-generator");
-const yosay = require("yosay");
 const debug = require('debug')('generator-oclif');
 const { version } = require('../../package.json');
 let hasYarn = false;
@@ -26,7 +25,7 @@ class CLI extends Generator {
     }
     async prompting() {
         const msg = 'Time to build an oclif CLI!';
-        this.log(yosay(`${msg} Version: ${version}`));
+        this.log(`${msg} Version: ${version}`);
         const { moduleType } = await this.prompt([
             {
                 type: 'list',

package/lib/generators/command.d.ts

@@ -1,8 +1,9 @@
 import * as Generator from 'yeoman-generator';
-import { GeneratorOptions, PackageJson } from '../types';
+import { GeneratorOptions } from '../types';
+import { Interfaces } from '@oclif/core';
 export default class Command extends Generator {
     options: GeneratorOptions;
-    pjson: PackageJson;
+    pjson: Interfaces.PJSON;
     constructor(args: string | string[], opts: GeneratorOptions);
     private hasMocha;
     prompting(): Promise<void>;

package/lib/generators/command.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
 const path = require("path");
 const Generator = require("yeoman-generator");
-const yosay = require("yosay");
 const { version } = require('../../package.json');
 class Command extends Generator {
     constructor(args, opts) {
@@ -23,7 +22,7 @@ class Command extends Generator {
         if (!this.pjson)
             throw new Error('not in a project directory');
         this.pjson.oclif = this.pjson.oclif || {};
-        this.log(yosay(`Adding a command to ${this.pjson.name} Version: ${version}`));
+        this.log(`Adding a command to ${this.pjson.name}! Version: ${version}`);
     }
     writing() {
         const cmdPath = this.options.name.split(':').join('/');

package/lib/generators/hook.d.ts

@@ -1,11 +1,12 @@
 import * as Generator from 'yeoman-generator';
-import { GeneratorOptions, PackageJson } from '../types';
+import { GeneratorOptions } from '../types';
+import { Interfaces } from '@oclif/core';
 export interface Options extends GeneratorOptions {
     event: string;
 }
 export default class Hook extends Generator {
     options: Options;
-    pjson: PackageJson;
+    pjson: Interfaces.PJSON;
     constructor(args: string | string[], options: Options);
     private hasMocha;
     prompting(): Promise<void>;

package/lib/generators/hook.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
 const path = require("path");
 const Generator = require("yeoman-generator");
-const yosay = require("yosay");
 const { version } = require('../../package.json');
 class Hook extends Generator {
     constructor(args, options) {
@@ -19,7 +18,7 @@ class Hook extends Generator {
         this.pjson.oclif = this.pjson.oclif || {};
         if (!this.pjson)
             throw new Error('not in a project directory');
-        this.log(yosay(`Adding a ${this.options.event} hook to ${this.pjson.name} Version: ${version}`));
+        this.log(`Adding a ${this.options.event} hook to ${this.pjson.name}! Version: ${version}`);
     }
     writing() {
         this.sourceRoot(path.join(__dirname, '../../templates'));

package/lib/types/index.d.ts

@@ -1,14 +1,4 @@
 import * as Generator from 'yeoman-generator';
-export interface PackageJson {
-    name: string;
-    devDependencies: Record<string, string>;
-    dependencies: Record<string, string>;
-    oclif: {
-        bin: string;
-        dirname: string;
-        hooks: Record<string, string | string[]>;
-    };
-}
 export interface GeneratorOptions extends Generator.GeneratorOptions {
     name: string;
     defaults?: boolean;

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.11.0",
+  "version": "3.11.2",
   "author": "Salesforce",
   "bin": {
-    "oclif": "bin/run",
-    "oclif2": "bin/run"
+    "oclif": "bin/run"
   },
   "bugs": "https://github.com/oclif/oclif/issues",
   "dependencies": {
-    "@oclif/core": "^2.9.4",
+    "@oclif/core": "^2.11.4",
     "@oclif/plugin-help": "^5.2.14",
     "@oclif/plugin-not-found": "^2.3.32",
     "@oclif/plugin-warn-if-update-available": "^2.0.44",
@@ -26,8 +25,7 @@
     "shelljs": "^0.8.5",
     "tslib": "^2.3.1",
     "yeoman-environment": "^3.15.1",
-    "yeoman-generator": "^5.8.0",
-    "yosay": "^2.0.2"
+    "yeoman-generator": "^5.8.0"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",
@@ -42,7 +40,6 @@
     "@types/semver": "^7.3.13",
     "@types/shelljs": "^0.8.11",
     "@types/yeoman-generator": "^5.2.11",
-    "@types/yosay": "^2.0.1",
     "chai": "^4.3.7",
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^7.32.0",
@@ -87,9 +84,6 @@
       "@oclif/plugin-not-found"
     ],
     "bin": "oclif",
-    "binAliases": [
-      "oclif2"
-    ],
     "dirname": "oclif",
     "topicSeparator": " ",
     "macos": {