@backstage/cli 0.35.5-next.0 → 0.36.0-next.2

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

@@ -1,17 +1,15 @@
 'use strict';
 
-var fix = require('../../maintenance/commands/repo/fix.cjs.js');
+Object.defineProperty(exports, '__esModule', { value: true });
 
-async function command() {
-  console.log(
-    "The `migrate package-exports` command is deprecated, use `repo fix` instead."
+var cleye = require('cleye');
+
+var packageExports = async ({ args, info }) => {
+  cleye.cli({ help: info, booleanFlagNegation: true }, void 0, args);
+  throw new Error(
+    "The `migrate package-exports` command has been removed, use `repo fix` instead."
   );
-  const packages = await fix.readFixablePackages();
-  for (const pkg of packages) {
-    fix.fixPackageExports(pkg);
-  }
-  await fix.writeFixedPackages(packages);
-}
+};
 
-exports.command = command;
+exports.default = packageExports;
 //# sourceMappingURL=packageExports.cjs.js.map

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

@@ -1,5 +1,8 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var cleye = require('cleye');
 var fs = require('fs-extra');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
@@ -10,7 +13,8 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 const PREFIX = `module.exports = require('@backstage/cli/config/eslint-factory')`;
-async function command() {
+var packageLintConfigs = async ({ args, info }) => {
+  cleye.cli({ help: info, booleanFlagNegation: true }, void 0, args);
   const packages = await cliNode.PackageGraph.listTargetPackages();
   const oldConfigs = [
     require.resolve("@backstage/cli/config/eslint.js"),
@@ -67,7 +71,7 @@ async function command() {
   if (hasPrettier) {
     await cliCommon.runOutput(["prettier", "--write", ...configPaths]);
   }
-}
+};
 
-exports.command = command;
+exports.default = packageLintConfigs;
 //# sourceMappingURL=packageLintConfigs.cjs.js.map

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var cleye = require('cleye');
 var fs = require('fs-extra');
 var path = require('node:path');
 var getPackages = require('@manypkg/get-packages');
@@ -12,7 +13,8 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
-var packageRole = async () => {
+var packageRole = async ({ args, info }) => {
+  cleye.cli({ help: info, booleanFlagNegation: true }, void 0, args);
   const { packages } = await getPackages.getPackages(cliCommon.targetPaths.dir);
   await Promise.all(
     packages.map(async ({ dir, packageJson: pkg }) => {

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

@@ -1,5 +1,8 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var cleye = require('cleye');
 var fs = require('fs-extra');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
@@ -10,7 +13,8 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 const configArgPattern = /--config[=\s][^\s$]+/;
 const noStartRoles = ["cli", "common-library"];
-async function command() {
+var packageScripts = async ({ args, info }) => {
+  cleye.cli({ help: info, booleanFlagNegation: true }, void 0, args);
   const packages = await cliNode.PackageGraph.listTargetPackages();
   await Promise.all(
     packages.map(async ({ dir, packageJson }) => {
@@ -38,11 +42,11 @@ async function command() {
       }
       const testCmd = ["test"];
       if (scripts.test?.startsWith("backstage-cli test")) {
-        const args = scripts.test.slice("backstage-cli test".length).split(" ").filter(Boolean);
-        if (args.includes("--passWithNoTests")) {
-          args.splice(args.indexOf("--passWithNoTests"), 1);
+        const testArgs = scripts.test.slice("backstage-cli test".length).split(" ").filter(Boolean);
+        if (testArgs.includes("--passWithNoTests")) {
+          testArgs.splice(testArgs.indexOf("--passWithNoTests"), 1);
         }
-        testCmd.push(...args);
+        testCmd.push(...testArgs);
       }
       const expectedScripts = {
         ...hasStart && {
@@ -77,7 +81,7 @@ async function command() {
       }
     })
   );
-}
+};
 
-exports.command = command;
+exports.default = packageScripts;
 //# sourceMappingURL=packageScripts.cjs.js.map

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

@@ -1,5 +1,8 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var cleye = require('cleye');
 var fs = require('fs-extra');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
@@ -10,7 +13,8 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 const REACT_ROUTER_DEPS = ["react-router", "react-router-dom"];
 const REACT_ROUTER_RANGE = "6.0.0-beta.0 || ^6.3.0";
-async function command() {
+var reactRouterDeps = async ({ args, info }) => {
+  cleye.cli({ help: info, booleanFlagNegation: true }, void 0, args);
   const packages = await cliNode.PackageGraph.listTargetPackages();
   await Promise.all(
     packages.map(async ({ dir, packageJson }) => {
@@ -41,7 +45,7 @@ async function command() {
       }
     })
   );
-}
+};
 
-exports.command = command;
+exports.default = reactRouterDeps;
 //# sourceMappingURL=reactRouterDeps.cjs.js.map

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

@@ -8,12 +8,11 @@ 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 yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
-var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
-var packages = require('../../../../lib/versioning/packages.cjs.js');
 var cliNode = require('@backstage/cli-node');
+var packages = require('../../lib/versioning/packages.cjs.js');
 var releaseManifests = require('@backstage/release-manifests');
 var migrate = require('./migrate.cjs.js');
 var utils = require('../../lib/utils.cjs.js');
@@ -38,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 Lockfile.Lockfile.load(lockfilePath);
-  const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();
-  let pattern = opts.pattern;
+  const lockfile = await cliNode.Lockfile.load(lockfilePath);
+  const yarnPluginEnabled = await cliNode.hasBackstageYarnPlugin();
+  let pattern = patternFlag;
   if (!pattern) {
     console.log(`Using default pattern glob ${DEFAULT_PATTERN_GLOB}`);
     pattern = DEFAULT_PATTERN_GLOB;
@@ -58,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
@@ -76,16 +104,16 @@ 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
     });
   }
-  if (hasYarnPlugin) {
+  if (yarnPluginEnabled) {
     console.log();
     console.log(
       `Updating yarn plugin to v${releaseManifest.releaseVersion}...`
@@ -147,7 +175,7 @@ var bump = async (opts) => {
             if (depType in pkgJson && dep.name in pkgJson[depType]) {
               const oldRange = pkgJson[depType][dep.name];
               const oldLockfileRange = await asLockfileVersion(oldRange);
-              const useBackstageRange = hasYarnPlugin && // Only use backstage:^ versions if the package is present in
+              const useBackstageRange = yarnPluginEnabled && // Only use backstage:^ versions if the package is present in
               // the manifest for the release we're bumping to.
               releaseManifest.packages.find(
                 ({ name: manifestPackageName }) => dep.name === manifestPackageName
@@ -174,7 +202,7 @@ var bump = async (opts) => {
     if (extendsDefaultPattern(pattern)) {
       await bumpBackstageJsonVersion(
         releaseManifest.releaseVersion,
-        hasYarnPlugin
+        yarnPluginEnabled
       );
     } else {
       console.log(
@@ -183,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();
       }
     }
@@ -228,7 +256,7 @@ var bump = async (opts) => {
     } else {
       console.log();
     }
-    if (hasYarnPlugin) {
+    if (yarnPluginEnabled) {
       console.log();
       console.log(
         chalk__default.default.blue(

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('../../lib/lazy.cjs.js');
 
 var index = factory.createCliPlugin({
   pluginId: "migrate",
@@ -12,87 +10,46 @@ 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"],
       description: `Add package role field to packages that don't have it`,
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.action(
-          lazy.lazy(() => import('./commands/packageRole.cjs.js'), "default")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
+      execute: {
+        loader: () => import('./commands/packageRole.cjs.js')
       }
     });
     reg.addCommand({
       path: ["migrate", "package-scripts"],
       description: "Set package scripts according to each package role",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.action(
-          lazy.lazy(() => import('./commands/packageScripts.cjs.js'), "command")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
+      execute: {
+        loader: () => import('./commands/packageScripts.cjs.js')
       }
     });
     reg.addCommand({
       path: ["migrate", "package-exports"],
       description: "Synchronize package subpath export definitions",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.action(
-          lazy.lazy(() => import('./commands/packageExports.cjs.js'), "command")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
+      execute: {
+        loader: () => import('./commands/packageExports.cjs.js')
       }
     });
     reg.addCommand({
       path: ["migrate", "package-lint-configs"],
       description: "Migrates all packages to use @backstage/cli/config/eslint-factory",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.action(
-          lazy.lazy(() => import('./commands/packageLintConfigs.cjs.js'), "command")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
+      execute: {
+        loader: () => import('./commands/packageLintConfigs.cjs.js')
       }
     });
     reg.addCommand({
       path: ["migrate", "react-router-deps"],
       description: "Migrates the react-router dependencies for all packages to be peer dependencies",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.action(
-          lazy.lazy(() => import('./commands/reactRouterDeps.cjs.js'), "command")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
+      execute: {
+        loader: () => import('./commands/reactRouterDeps.cjs.js')
       }
     });
   }

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('../../lib/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/execution/PortableTemplater.cjs.js

@@ -9,13 +9,9 @@ var startCase = require('lodash/startCase');
 var upperCase = require('lodash/upperCase');
 var upperFirst = require('lodash/upperFirst');
 var lowerFirst = require('lodash/lowerFirst');
-var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
-require('minimatch');
-require('@manypkg/get-packages');
-require('@backstage/errors');
+var cliNode = require('@backstage/cli-node');
 var cliCommon = require('@backstage/cli-common');
-var version = require('../../../../lib/version.cjs.js');
-var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
+var version = require('../version.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -43,12 +39,12 @@ class PortableTemplater {
   static async create(options = {}) {
     let lockfile;
     try {
-      lockfile = await Lockfile.Lockfile.load(cliCommon.targetPaths.resolveRoot("yarn.lock"));
+      lockfile = await cliNode.Lockfile.load(cliCommon.targetPaths.resolveRoot("yarn.lock"));
     } catch {
     }
-    const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();
+    const yarnPluginEnabled = await cliNode.hasBackstageYarnPlugin();
     const versionProvider = version.createPackageVersionProvider(lockfile, {
-      preferBackstageProtocol: hasYarnPlugin
+      preferBackstageProtocol: yarnPluginEnabled
     });
     const templater = new PortableTemplater(
       {