@backstage/cli 0.36.0-next.1 → 0.36.0-next.2

package/dist/modules/migrate/commands/versions/bump.cjs.js

@@ -8,6 +8,7 @@ var fs = require('fs-extra');
 var chalk = require('chalk');
 var minimatch = require('minimatch');
 var semver = require('semver');
+var cleye = require('cleye');
 var errors = require('@backstage/errors');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
@@ -36,11 +37,40 @@ function extendsDefaultPattern(pattern) {
   }
   return minimatch.minimatch("@backstage/", pattern.slice(0, -1));
 }
-var bump = async (opts) => {
+var bump = async ({ args, info }) => {
+  const {
+    flags: { pattern: patternFlag, release, skipInstall, skipMigrate }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        pattern: {
+          type: String,
+          description: "Override glob for matching packages to upgrade"
+        },
+        release: {
+          type: String,
+          description: "Bump to a specific Backstage release line or version",
+          default: "main"
+        },
+        skipInstall: {
+          type: Boolean,
+          description: "Skips yarn install step"
+        },
+        skipMigrate: {
+          type: Boolean,
+          description: "Skips migration of any moved packages"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const lockfilePath = cliCommon.targetPaths.resolveRoot("yarn.lock");
   const lockfile = await cliNode.Lockfile.load(lockfilePath);
   const yarnPluginEnabled = await cliNode.hasBackstageYarnPlugin();
-  let pattern = opts.pattern;
+  let pattern = patternFlag;
   if (!pattern) {
     console.log(`Using default pattern glob ${DEFAULT_PATTERN_GLOB}`);
     pattern = DEFAULT_PATTERN_GLOB;
@@ -56,13 +86,13 @@ var bump = async (opts) => {
     findTargetVersion = createStrictVersionFinder({
       releaseManifest
     });
-  } else if (semver__default.default.valid(opts.release)) {
-    releaseManifest = await releaseManifests.getManifestByVersion({ version: opts.release });
+  } else if (semver__default.default.valid(release)) {
+    releaseManifest = await releaseManifests.getManifestByVersion({ version: release });
     findTargetVersion = createStrictVersionFinder({
       releaseManifest
     });
   } else {
-    if (opts.release === "next") {
+    if (release === "next") {
       const next = await releaseManifests.getManifestByReleaseLine({
         releaseLine: "next",
         versionsBaseUrl: node_process.env.BACKSTAGE_VERSIONS_BASE_URL
@@ -74,12 +104,12 @@ var bump = async (opts) => {
       releaseManifest = semver__default.default.gt(next.releaseVersion, main.releaseVersion) ? next : main;
     } else {
       releaseManifest = await releaseManifests.getManifestByReleaseLine({
-        releaseLine: opts.release,
+        releaseLine: release,
         versionsBaseUrl: node_process.env.BACKSTAGE_VERSIONS_BASE_URL
       });
     }
     findTargetVersion = createVersionFinder({
-      releaseLine: opts.releaseLine,
+      releaseLine: release,
       releaseManifest
     });
   }
@@ -181,18 +211,18 @@ var bump = async (opts) => {
         )
       );
     }
-    if (!opts.skipInstall) {
+    if (!skipInstall) {
       await utils.runYarnInstall();
     } else {
       console.log();
       console.log(chalk__default.default.yellow(`Skipping yarn install`));
     }
-    if (!opts.skipMigrate) {
+    if (!skipMigrate) {
       console.log();
       const changed = await migrate.migrateMovedPackages({
-        pattern: opts.pattern
+        pattern: patternFlag
       });
-      if (changed && !opts.skipInstall) {
+      if (changed && !skipInstall) {
         await utils.runYarnInstall();
       }
     }

package/dist/modules/migrate/commands/versions/migrate.cjs.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var cliNode = require('@backstage/cli-node');
 var chalk = require('chalk');
 var path = require('node:path');
+var cleye = require('cleye');
 var fs = require('fs-extra');
 var minimatch = require('minimatch');
 var utils = require('../../lib/utils.cjs.js');
@@ -15,10 +16,30 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var replace__default = /*#__PURE__*/_interopDefaultCompat(replace);
 
-var migrate = async (options) => {
+var migrate = async ({ args, info }) => {
+  const {
+    flags: { pattern, skipCodeChanges }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        pattern: {
+          type: String,
+          description: "Override glob for matching packages to upgrade"
+        },
+        skipCodeChanges: {
+          type: Boolean,
+          description: "Skip code changes and only update package.json files"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const changed = await migrateMovedPackages({
-    pattern: options.pattern,
-    skipCodeChanges: options.skipCodeChanges
+    pattern,
+    skipCodeChanges
   });
   if (changed) {
     await utils.runYarnInstall();

package/dist/modules/migrate/index.cjs.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var factory = require('../../wiring/factory.cjs.js');
-var commander = require('commander');
-var lazy = require('../../wiring/lazy.cjs.js');
 
 var index = factory.createCliPlugin({
   pluginId: "migrate",
@@ -12,33 +10,12 @@ var index = factory.createCliPlugin({
     reg.addCommand({
       path: ["versions:migrate"],
       description: "Migrate any plugins that have been moved to the @backstage-community namespace automatically",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.option(
-          "--pattern <glob>",
-          "Override glob for matching packages to upgrade"
-        ).option(
-          "--skip-code-changes",
-          "Skip code changes and only update package.json files"
-        ).action(lazy.lazy(() => import('./commands/versions/migrate.cjs.js'), "default"));
-        await defaultCommand.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/versions/migrate.cjs.js') }
     });
     reg.addCommand({
       path: ["versions:bump"],
       description: "Bump Backstage packages to the latest versions",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.option(
-          "--pattern <glob>",
-          "Override glob for matching packages to upgrade"
-        ).option(
-          "--release <version|next|main>",
-          "Bump to a specific Backstage release line or version",
-          "main"
-        ).option("--skip-install", "Skips yarn install step").option("--skip-migrate", "Skips migration of any moved packages").action(lazy.lazy(() => import('./commands/versions/bump.cjs.js'), "default"));
-        await defaultCommand.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/versions/bump.cjs.js') }
     });
     reg.addCommand({
       path: ["migrate", "package-roles"],

package/dist/modules/new/commands/new.cjs.js

@@ -2,17 +2,73 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var cleye = require('cleye');
 var createNewPackage = require('../lib/createNewPackage.cjs.js');
 
-var _new = async (opts) => {
+var _new = async ({ args, info }) => {
+  for (const flag of ["skipInstall", "npmRegistry", "baseVersion"]) {
+    if (args.some((a) => a === `--${flag}` || a.startsWith(`--${flag}=`))) {
+      process.stderr.write(
+        `DEPRECATION WARNING: --${flag} is deprecated, use the kebab-case form instead
+`
+      );
+    }
+  }
   const {
-    option: rawArgOptions,
-    select: preselectedTemplateId,
-    skipInstall,
-    scope,
-    private: isPrivate,
-    ...otherGlobals
-  } = opts;
+    flags: {
+      select,
+      option: rawArgOptions,
+      skipInstall,
+      scope,
+      npmRegistry,
+      baseVersion,
+      license,
+      private: isPrivate
+    }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        select: {
+          type: String,
+          description: "Select the thing you want to be creating upfront"
+        },
+        option: {
+          type: [String],
+          description: "Pre-fill options for the creation process",
+          default: []
+        },
+        skipInstall: {
+          type: Boolean,
+          description: `Skips running 'yarn install' and 'yarn lint --fix'`
+        },
+        scope: {
+          type: String,
+          description: "The scope to use for new packages"
+        },
+        npmRegistry: {
+          type: String,
+          description: "The package registry to use for new packages"
+        },
+        baseVersion: {
+          type: String,
+          description: "The version to use for any new packages (default: 0.1.0)"
+        },
+        license: {
+          type: String,
+          description: "The license to use for any new packages (default: Apache-2.0)"
+        },
+        private: {
+          type: Boolean,
+          description: "Mark new packages as private",
+          default: true
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const prefilledParams = parseParams(rawArgOptions);
   let pluginInfix = void 0;
   let packagePrefix = void 0;
@@ -21,24 +77,23 @@ var _new = async (opts) => {
     packagePrefix = normalizedScope.includes("/") ? normalizedScope : `${normalizedScope}/`;
     pluginInfix = scope.includes("backstage") ? "plugin-" : "backstage-plugin-";
   }
-  if (isPrivate === false || // set to false with --no-private flag
-  Object.values(otherGlobals).filter(Boolean).length !== 0) {
+  if (isPrivate === false || [npmRegistry, baseVersion, license].filter(Boolean).length !== 0) {
     console.warn(
       `Global template configuration via CLI flags is deprecated, see https://backstage.io/docs/cli/new for information on how to configure package templating`
     );
   }
   await createNewPackage.createNewPackage({
     prefilledParams,
-    preselectedTemplateId,
+    preselectedTemplateId: select,
     configOverrides: {
-      license: otherGlobals.license,
-      version: otherGlobals.baseVersion,
+      license,
+      version: baseVersion,
       private: isPrivate,
-      publishRegistry: otherGlobals.npmRegistry,
+      publishRegistry: npmRegistry,
       packageNamePrefix: packagePrefix,
       packageNamePluginInfix: pluginInfix
     },
-    skipInstall
+    skipInstall: Boolean(skipInstall)
   });
 };
 function parseParams(optionStrings) {

package/dist/modules/new/index.cjs.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var factory = require('../../wiring/factory.cjs.js');
-var commander = require('commander');
-var lazy = require('../../wiring/lazy.cjs.js');
 var errors = require('@backstage/errors');
 
 var index = factory.createCliPlugin({
@@ -13,33 +11,7 @@ var index = factory.createCliPlugin({
     reg.addCommand({
       path: ["new"],
       description: "Open up an interactive guide to creating new things in your app",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.storeOptionsAsProperties(false).description(
-          "Open up an interactive guide to creating new things in your app"
-        ).option(
-          "--select <name>",
-          "Select the thing you want to be creating upfront"
-        ).option(
-          "--option <name>=<value>",
-          "Pre-fill options for the creation process",
-          (opt, arr) => [...arr, opt],
-          []
-        ).option(
-          "--skip-install",
-          `Skips running 'yarn install' and 'yarn lint --fix'`
-        ).option("--scope <scope>", "The scope to use for new packages").option(
-          "--npm-registry <URL>",
-          "The package registry to use for new packages"
-        ).option(
-          "--baseVersion <version>",
-          "The version to use for any new packages (default: 0.1.0)"
-        ).option(
-          "--license <license>",
-          "The license to use for any new packages (default: Apache-2.0)"
-        ).option("--no-private", "Do not mark new packages as private").action(lazy.lazy(() => import('./commands/new.cjs.js'), "default"));
-        await defaultCommand.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/new.cjs.js') }
     });
     reg.addCommand({
       path: ["create"],

package/dist/modules/new/lib/preparation/loadPortableTemplate.cjs.js

@@ -4,7 +4,7 @@ var zod = require('zod');
 var fs = require('fs-extra');
 var recursiveReaddir = require('recursive-readdir');
 var path = require('node:path');
-var yaml = require('yaml');
+var YAML = require('yaml');
 var cliCommon = require('@backstage/cli-common');
 var types = require('../types.cjs.js');
 var errors = require('@backstage/errors');
@@ -31,7 +31,7 @@ async function loadPortableTemplate(pointer) {
       error
     );
   });
-  const rawTemplate = yaml.parse(templateContent);
+  const rawTemplate = YAML.parse(templateContent);
   const parsed = templateDefinitionSchema.safeParse(rawTemplate);
   if (!parsed.success) {
     throw new errors.ForwardedError(

package/dist/modules/new/lib/preparation/loadPortableTemplateConfig.cjs.js

@@ -5,7 +5,7 @@ var path = require('node:path');
 var cliCommon = require('@backstage/cli-common');
 var defaultTemplates = require('../defaultTemplates.cjs.js');
 var types = require('../types.cjs.js');
-var yaml = require('yaml');
+var YAML = require('yaml');
 var zod = require('zod');
 var v3 = require('zod-validation-error/v3');
 var errors = require('@backstage/errors');
@@ -116,7 +116,7 @@ const partialTemplateDefinitionSchema = zod.z.object({
 });
 async function peekLocalTemplateDefinition(target) {
   const content = await fs__default.default.readFile(target, "utf8");
-  const rawTemplate = yaml.parse(content);
+  const rawTemplate = YAML.parse(content);
   const parsed = partialTemplateDefinitionSchema.safeParse(rawTemplate);
   if (!parsed.success) {
     throw v3.fromZodError(parsed.error);

package/dist/modules/test/commands/package/test.cjs.js

@@ -12,13 +12,7 @@ function includesAnyOf(hayStack, ...needles) {
   }
   return false;
 }
-var test = async (_opts, cmd) => {
-  let parent = cmd;
-  while (parent.parent) {
-    parent = parent.parent;
-  }
-  const allArgs = parent.args;
-  const args = allArgs.slice(allArgs.indexOf("test") + 1);
+var test = async ({ args }) => {
   if (!includesAnyOf(args, "-c", "--config")) {
     args.push("--config", cliCommon.findOwnPaths(__dirname).resolve("config/jest.js"));
   }

package/dist/modules/test/commands/repo/test.cjs.js

@@ -1,7 +1,10 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var os = require('node:os');
 var crypto = require('node:crypto');
+var cleye = require('cleye');
 var yargs = require('yargs');
 var jestCli = require('jest-cli');
 var path = require('node:path');
@@ -71,31 +74,45 @@ function createFlagFinder(args) {
     return false;
   };
 }
-function removeOptionArg(args, option, size = 2) {
-  let changed = false;
-  do {
-    changed = false;
-    const index = args.indexOf(option);
-    if (index >= 0) {
-      changed = true;
-      args.splice(index, size);
-    }
-    const indexEq = args.findIndex((arg) => arg.startsWith(`${option}=`));
-    if (indexEq >= 0) {
-      changed = true;
-      args.splice(indexEq, 1);
-    }
-  } while (changed);
-}
-async function command(opts, cmd) {
+var test = async ({ args, info }) => {
   const testGlobal = global;
-  let parent = cmd;
-  while (parent.parent) {
-    parent = parent.parent;
+  for (const flag of ["successCache", "successCacheDir", "jestHelp"]) {
+    if (args.some((a) => a === `--${flag}` || a.startsWith(`--${flag}=`))) {
+      process.stderr.write(
+        `DEPRECATION WARNING: --${flag} is deprecated, use the kebab-case form instead
+`
+      );
+    }
   }
-  const allArgs = parent.args;
-  const args = allArgs.slice(allArgs.indexOf("test") + 1);
+  const { flags: opts } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        since: {
+          type: String,
+          description: "Only include test packages changed since the specified ref"
+        },
+        successCache: {
+          type: Boolean,
+          description: "Cache and skip tests for unchanged packages"
+        },
+        successCacheDir: {
+          type: String,
+          description: "Directory for the success cache"
+        },
+        jestHelp: {
+          type: Boolean,
+          description: "Show Jest's own help output"
+        }
+      },
+      ignoreArgv: (type) => type === "unknown-flag" || type === "argument"
+    },
+    void 0,
+    args
+  );
   const hasFlags = createFlagFinder(args);
+  const sinceRef = opts.since || void 0;
   const { _: parsedArgs } = await yargs__default.default(args).options(jestCli.yargsOptions).argv;
   if (!hasFlags("-c", "--config")) {
     args.push("--config", cliCommon.findOwnPaths(__dirname).resolve("config/jest.js"));
@@ -104,7 +121,7 @@ async function command(opts, cmd) {
     args.push("--passWithNoTests");
   }
   let isSingleWatchMode = args.includes("--watch");
-  if (!opts.since && !process.env.CI && !hasFlags("--coverage", "--watch", "--watchAll")) {
+  if (!sinceRef && !process.env.CI && !hasFlags("--coverage", "--watch", "--watchAll")) {
     const isGitRepo = () => cliCommon.runCheck(["git", "rev-parse", "--is-inside-work-tree"]);
     const isMercurialRepo = () => cliCommon.runCheck(["hg", "--cwd", ".", "root"]);
     if (await isGitRepo() || await isMercurialRepo()) {
@@ -140,9 +157,6 @@ async function command(opts, cmd) {
   if (os__default.default.cpus().length <= 3 && !hasFlags("-i", "--runInBand", "-w", "--maxWorkers")) {
     args.push("--maxWorkers=2");
   }
-  if (opts.since) {
-    removeOptionArg(args, "--since");
-  }
   let packageGraph;
   async function getPackageGraph() {
     if (packageGraph) {
@@ -153,10 +167,10 @@ async function command(opts, cmd) {
     return packageGraph;
   }
   let selectedProjects = void 0;
-  if (opts.since && !hasFlags("--selectProjects")) {
+  if (sinceRef && !hasFlags("--selectProjects")) {
     const graph = await getPackageGraph();
     const changedPackages = await graph.listChangedPackages({
-      ref: opts.since,
+      ref: sinceRef,
       analyzeLockfile: true
     });
     selectedProjects = Array.from(
@@ -180,13 +194,10 @@ async function command(opts, cmd) {
   if (!process.env.NODE_OPTIONS?.includes("--node-snapshot")) {
     process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS ? `${process.env.NODE_OPTIONS} ` : ""}--no-node-snapshot`;
   }
-  if (args.includes("--jest-help")) {
-    removeOptionArg(args, "--jest-help");
+  if (opts.jestHelp) {
     args.push("--help");
   }
   if (opts.successCache) {
-    removeOptionArg(args, "--successCache", 1);
-    removeOptionArg(args, "--successCacheDir");
     if (parsedArgs.length > 0) {
       throw new Error(
         `The --successCache flag can not be combined with the following arguments: ${parsedArgs.join(
@@ -281,8 +292,8 @@ async function command(opts, cmd) {
     };
   }
   await jestCli.run(args);
-}
+};
 
-exports.command = command;
 exports.createFlagFinder = createFlagFinder;
+exports.default = test;
 //# sourceMappingURL=test.cjs.js.map

package/dist/modules/test/index.cjs.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var factory = require('../../wiring/factory.cjs.js');
-var commander = require('commander');
-var lazy = require('../../wiring/lazy.cjs.js');
 
 var index = factory.createCliPlugin({
   pluginId: "test",
@@ -12,40 +10,12 @@ var index = factory.createCliPlugin({
     reg.addCommand({
       path: ["repo", "test"],
       description: "Run tests, forwarding args to Jest, defaulting to watch mode",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        command.allowUnknownOption(true);
-        command.allowExcessArguments(true);
-        command.option(
-          "--since <ref>",
-          "Only test packages that changed since the specified ref"
-        );
-        command.option("--successCache", "Enable success caching");
-        command.option(
-          "--successCacheDir <path>",
-          "Set the success cache location, (default: node_modules/.cache/backstage-cli)"
-        );
-        command.option(
-          "--jest-help",
-          "Show help for Jest CLI options, which are passed through"
-        );
-        command.action(lazy.lazy(() => import('./commands/repo/test.cjs.js'), "command"));
-        await command.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/repo/test.cjs.js') }
     });
     reg.addCommand({
       path: ["package", "test"],
       description: "Run tests, forwarding args to Jest, defaulting to watch mode",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        command.allowUnknownOption(true);
-        command.allowExcessArguments(true);
-        command.helpOption("--backstage-cli-help");
-        command.action(
-          lazy.lazy(() => import('./commands/package/test.cjs.js'), "default")
-        );
-        await command.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/package/test.cjs.js') }
     });
   }
 });

package/dist/modules/translations/commands/export.cjs.js

@@ -20,6 +20,7 @@ var _export = async ({ args, info }) => {
   } = cleye.cli(
     {
       help: info,
+      booleanFlagNegation: true,
       flags: {
         output: {
           type: String,

package/dist/modules/translations/commands/import.cjs.js

@@ -19,6 +19,7 @@ var _import = async ({ args, info }) => {
   } = cleye.cli(
     {
       help: info,
+      booleanFlagNegation: true,
       flags: {
         input: {
           type: String,

package/dist/packages/backend-defaults/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.16.0-next.1";
+var version = "0.16.0-next.2";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/backend-plugin-api/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.7.1-next.0";
+var version = "1.8.0-next.1";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/backend-test-utils/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.11.1-next.1";
+var version = "1.11.1-next.2";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/catalog-client/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.14.0-next.1";
+var version = "1.14.0-next.2";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map