oclif 3.6.5 → 3.7.1

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.6.5",
+  "version": "3.7.1",
   "commands": {
     "generate": {
       "id": "generate",

package/lib/commands/generate/hook.d.ts

@@ -3,7 +3,7 @@ export default class GenerateHook extends CommandBase {
     static description: string;
     static flags: {
         force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        event: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
+        event: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
         name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;

package/lib/commands/manifest.js

@@ -54,7 +54,7 @@ class Manifest extends core_1.Command {
         let plugin = new core_1.Plugin({ root, type: 'core', ignoreManifest: true, errorOnManifestCreate: true });
         if (!plugin)
             throw new Error('plugin not found');
-        await plugin.load();
+        await plugin.load(true);
         if (!plugin.valid) {
             const p = require.resolve('@oclif/plugin-legacy', { paths: [process.cwd()] });
             const { PluginLegacy } = require(p);

package/lib/commands/pack/deb.d.ts

@@ -3,8 +3,8 @@ import { Interfaces } from '@oclif/core';
 export default class PackDeb extends Command {
     static description: string;
     static flags: {
-        root: Interfaces.OptionFlag<string, Record<string, unknown>>;
-        tarball: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
+        root: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        tarball: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/macos.d.ts

@@ -1,12 +1,11 @@
-import { Command } from '@oclif/core';
-import { Interfaces } from '@oclif/core';
+import { Command, Interfaces } from '@oclif/core';
 export default class PackMacos extends Command {
     static description: string;
     static flags: {
-        root: Interfaces.OptionFlag<string, Record<string, unknown>>;
-        'additional-cli': Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
-        tarball: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
-        targets: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
+        root: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'additional-cli': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        tarball: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        targets: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/macos.js

@@ -8,6 +8,7 @@ const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 const child_process_1 = require("child_process");
 const node_util_1 = require("node:util");
+const os = require("os");
 const exec = (0, node_util_1.promisify)(child_process_1.exec);
 const noBundleConfiguration = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -23,13 +24,18 @@ sudo rm -rf /usr/local/bin/${config.bin}
 ${additionalCLI ?
         `sudo rm -rf /usr/local/${additionalCLI}
 sudo rm -rf /usr/local/bin/${additionalCLI}` : ''}
+${config.binAliases ? config.binAliases.map(alias => `sudo rm -rf /usr/local/bin/${alias}`).join(os.EOL) : ''}
 `,
-    postinstall: (config, additionalCLI) => `#!/usr/bin/env bash
+    postinstall: (config, additionalCLI) => {
+        var _a;
+        return `#!/usr/bin/env bash
 set -x
 sudo mkdir -p /usr/local/bin
 sudo ln -sf /usr/local/lib/${config.dirname}/bin/${config.bin} /usr/local/bin/${config.bin}
+${config.binAliases ? (_a = config.binAliases) === null || _a === void 0 ? void 0 : _a.map(alias => `sudo ln -sf /usr/local/lib/${config.dirname}/bin/${config.bin} /usr/local/bin/${alias}`).join(os.EOL) : ''}
 ${additionalCLI ? `sudo ln -sf /usr/local/lib/${config.dirname}/bin/${additionalCLI} /usr/local/bin/${additionalCLI}` : ''}
-`,
+`;
+    },
     uninstall: (config, additionalCLI) => {
         const packageIdentifier = config.pjson.oclif.macos.identifier;
         return `#!/usr/bin/env bash
@@ -69,6 +75,8 @@ while [ "$1" != "-y" ]; do
 done
 
 echo "Application uninstalling process started"
+# remove bin aliases link
+${config.binAliases ? config.binAliases.map(alias => `find "/usr/local/bin/" -name "${alias}" | xargs rm`).join(os.EOL) : ''}
 # remove link to shortcut file
 find "/usr/local/bin/" -name "${config.bin}" | xargs rm
 ${additionalCLI ? `find "/usr/local/bin/" -name "${additionalCLI}" | xargs rm` : ''}
@@ -83,9 +91,9 @@ fi
 pkgutil --forget "${packageIdentifier}" > /dev/null 2>&1
 if [ $? -eq 0 ]
 then
-  echo "[2/3] [DONE] Successfully deleted application informations"
+  echo "[2/3] [DONE] Successfully deleted application information"
 else
-  echo "[2/3] [ERROR] Could not delete application informations" >&2
+  echo "[2/3] [ERROR] Could not delete application information" >&2
 fi
 
 #remove application source distribution

package/lib/commands/pack/tarballs.d.ts

@@ -2,11 +2,11 @@ import { Command } from '@oclif/core';
 export default class PackTarballs extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, Record<string, unknown>>;
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         parallel: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tarball: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, Record<string, unknown>>;
+        tarball: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/win.d.ts

@@ -3,9 +3,9 @@ import { Interfaces } from '@oclif/core';
 export default class PackWin extends Command {
     static description: string;
     static flags: {
-        root: Interfaces.OptionFlag<string, Record<string, unknown>>;
-        'additional-cli': Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
-        tarball: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
+        root: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'additional-cli': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        tarball: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
     private checkForNSIS;

package/lib/commands/promote.d.ts

@@ -2,15 +2,15 @@ import { Command } from '@oclif/core';
 export default class Promote extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
-        version: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
-        sha: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
-        channel: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, Record<string, unknown>>;
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        sha: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        channel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         deb: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         macos: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         win: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'max-age': import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
+        'max-age': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         indexes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };

package/lib/commands/readme.d.ts

@@ -2,7 +2,7 @@ import { Command, Interfaces } from '@oclif/core';
 export default class Readme extends Command {
     static description: string;
     static flags: {
-        dir: Interfaces.OptionFlag<string, Record<string, unknown>>;
+        dir: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         multi: Interfaces.BooleanFlag<boolean>;
         aliases: Interfaces.BooleanFlag<boolean>;
     };

package/lib/commands/upload/deb.d.ts

@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 export default class UploadDeb extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/macos.d.ts

@@ -2,8 +2,8 @@ import { Command, Interfaces } from '@oclif/core';
 export default class UploadMacos extends Command {
     static description: string;
     static flags: {
-        root: Interfaces.OptionFlag<string, Record<string, unknown>>;
-        targets: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
+        root: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        targets: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/tarballs.d.ts

@@ -3,8 +3,8 @@ import { Interfaces } from '@oclif/core';
 export default class UploadTarballs extends Command {
     static description: string;
     static flags: {
-        root: Interfaces.OptionFlag<string, Record<string, unknown>>;
-        targets: Interfaces.OptionFlag<string | undefined, Record<string, unknown>>;
+        root: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        targets: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         xz: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/lib/commands/upload/win.d.ts

@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 export default class UploadWin extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, Record<string, unknown>>;
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/generators/cli.js

@@ -94,7 +94,7 @@ class CLI extends Generator {
                     type: 'input',
                     name: 'github.repo',
                     message: 'What is the GitHub name of repository (https://github.com/owner/REPO)',
-                    default: (answers) => (this.pjson.repository || answers.name || this.pjson.name).split('/').pop(),
+                    default: (answers) => (answers.name || this.pjson.repository || this.pjson.name).split('/').pop(),
                 },
                 {
                     type: 'list',
@@ -129,6 +129,10 @@ class CLI extends Generator {
         this.pjson.oclif.dirname = this.answers.bin;
         this.pjson.bin = {};
         this.pjson.bin[this.pjson.oclif.bin] = './bin/run';
+        if (!this.options.yarn) {
+            const scripts = (this.pjson.scripts || {});
+            this.pjson.scripts = Object.fromEntries(Object.entries(scripts).map(([k, v]) => [k, v.replace('yarn', 'npm run')]));
+        }
     }
     writing() {
         if (this.pjson.oclif && Array.isArray(this.pjson.oclif.plugins)) {
@@ -139,6 +143,7 @@ class CLI extends Generator {
         this.pjson.files = _.uniq((this.pjson.files || []).sort());
         this.fs.writeJSON(this.destinationPath('./package.json'), this.pjson);
         this.fs.write(this.destinationPath('.gitignore'), this._gitignore());
+        this.fs.delete(this.destinationPath('LICENSE'));
     }
     end() {
         this.spawnCommandSync(this.env.options.nodePackageManager, ['run', 'build']);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.6.5",
+  "version": "3.7.1",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
   },
   "bugs": "https://github.com/oclif/oclif/issues",
   "dependencies": {
-    "@oclif/core": "^2.0.3",
+    "@oclif/core": "^2.7.0",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/plugin-not-found": "^2.3.7",
     "@oclif/plugin-warn-if-update-available": "^2.0.14",