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

package/dist/modules/create-github-app/commands/create-github-app/index.cjs.js

@@ -6,7 +6,7 @@ var fs = require('fs-extra');
 var chalk = require('chalk');
 var yaml = require('yaml');
 var inquirer = require('inquirer');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var GithubCreateAppServer = require('./GithubCreateAppServer.cjs.js');
 var openBrowser = require('react-dev-utils/openBrowser');
 
@@ -51,7 +51,7 @@ var index = async (org) => {
   const fileName = `github-app-${slug}-credentials.yaml`;
   const content = `# Name: ${name}
 ${yaml.stringify(config)}`;
-  await fs__default.default.writeFile(paths.paths.resolveTargetRoot(fileName), content);
+  await fs__default.default.writeFile(cliCommon.targetPaths.resolveRoot(fileName), content);
   console.log(`GitHub App configuration written to ${chalk__default.default.cyan(fileName)}`);
   console.log(
     chalk__default.default.yellow(

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _package = require('../../../packages/cli/package.json.cjs.js');
 var os = require('node:os');
 var cliCommon = require('@backstage/cli-common');
-var paths = require('../../../lib/paths.cjs.js');
 var Lockfile = require('../../../lib/versioning/Lockfile.cjs.js');
 var minimatch = require('minimatch');
 require('@manypkg/get-packages');
@@ -34,8 +33,8 @@ function hasBackstageField(packageName, targetPath) {
 var info = async (options) => {
   await new Promise(async () => {
     const yarnVersion = await cliCommon.runOutput(["yarn", "--version"]);
-    const isLocal = fs__default.default.existsSync(paths.paths.resolveOwn("./src"));
-    const backstageFile = paths.paths.resolveTargetRoot("backstage.json");
+    const isLocal = fs__default.default.existsSync(cliCommon.findOwnPaths(__dirname).resolve("./src"));
+    const backstageFile = cliCommon.targetPaths.resolveRoot("backstage.json");
     let backstageVersion = "N/A";
     if (fs__default.default.existsSync(backstageFile)) {
       try {
@@ -57,9 +56,9 @@ var info = async (options) => {
       cli: { version: _package.version, local: isLocal },
       backstage: backstageVersion
     };
-    const lockfilePath = paths.paths.resolveTargetRoot("yarn.lock");
+    const lockfilePath = cliCommon.targetPaths.resolveRoot("yarn.lock");
     const lockfile = await Lockfile.Lockfile.load(lockfilePath);
-    const targetPath = paths.paths.targetRoot;
+    const targetPath = cliCommon.targetPaths.rootDir;
     const workspacePackages = /* @__PURE__ */ new Map();
     try {
       const packages = await cliNode.PackageGraph.listTargetPackages();

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var fs = require('fs-extra');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var eslint = require('eslint');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -12,7 +12,7 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 var lint = async (directories, opts) => {
   const eslint$1 = new eslint.ESLint({
-    cwd: paths.paths.targetDir,
+    cwd: cliCommon.targetPaths.dir,
     fix: opts.fix,
     extensions: ["js", "jsx", "ts", "tsx", "mjs", "cjs"]
   });
@@ -27,12 +27,12 @@ var lint = async (directories, opts) => {
   }
   const formatter = await eslint$1.loadFormatter(opts.format);
   if (opts.format === "eslint-formatter-friendly") {
-    process.chdir(paths.paths.targetRoot);
+    process.chdir(cliCommon.targetPaths.rootDir);
   }
   const resultText = await formatter.format(results);
   if (resultText) {
     if (opts.outputFile) {
-      await fs__default.default.writeFile(paths.paths.resolveTarget(opts.outputFile), resultText);
+      await fs__default.default.writeFile(cliCommon.targetPaths.resolve(opts.outputFile), resultText);
     } else {
       console.log(resultText);
     }

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

@@ -5,8 +5,7 @@ var fs = require('fs-extra');
 var crypto = require('node:crypto');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
-var paths = require('../../../../lib/paths.cjs.js');
-var parallel = require('../../../../lib/parallel.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var optionsParser = require('../../../../lib/optionsParser.cjs.js');
 var SuccessCache = require('../../../../lib/cache/SuccessCache.cjs.js');
 
@@ -25,7 +24,7 @@ async function command(opts, cmd) {
   const cache = new SuccessCache.SuccessCache("lint", opts.successCacheDir);
   const cacheContext = opts.successCache ? {
     entries: await cache.read(),
-    lockfile: await cliNode.Lockfile.load(paths.paths.resolveTargetRoot("yarn.lock"))
+    lockfile: await cliNode.Lockfile.load(cliCommon.targetPaths.resolveRoot("yarn.lock"))
   } : void 0;
   if (opts.since) {
     const graph = cliNode.PackageGraph.fromPackages(packages);
@@ -36,7 +35,7 @@ async function command(opts, cmd) {
   }
   packages.sort((a, b) => depCount(b.packageJson) - depCount(a.packageJson));
   if (opts.format === "eslint-formatter-friendly") {
-    process.chdir(paths.paths.targetRoot);
+    process.chdir(cliCommon.targetPaths.rootDir);
   }
   if (!process.env.FORCE_COLOR) {
     process.env.FORCE_COLOR = "1";
@@ -47,7 +46,7 @@ async function command(opts, cmd) {
       const lintOptions = parseLintScript(pkg.packageJson.scripts?.lint);
       const base = {
         fullDir: pkg.dir,
-        relativeDir: path.relative(paths.paths.targetRoot, pkg.dir),
+        relativeDir: path.relative(cliCommon.targetPaths.rootDir, pkg.dir),
         lintOptions,
         parentHash: void 0
       };
@@ -70,16 +69,16 @@ async function command(opts, cmd) {
       };
     })
   );
-  const resultsList = await parallel.runWorkerQueueThreads({
+  const { results: resultsList } = await cliNode.runWorkerQueueThreads({
     items: items.filter((item) => item.lintOptions),
     // Filter out packages without lint script
-    workerData: {
+    context: {
       fix: Boolean(opts.fix),
       format: opts.format,
       shouldCache: Boolean(cacheContext),
       maxWarnings: opts.maxWarnings ?? -1,
       successCache: cacheContext?.entries,
-      rootDir: paths.paths.targetRoot
+      rootDir: cliCommon.targetPaths.rootDir
     },
     workerFactory: async ({
       fix,
@@ -197,7 +196,7 @@ async function command(opts, cmd) {
     errorOutput = JSON.stringify(mergedJsonResults, null, 2);
   }
   if (opts.outputFile && errorOutput) {
-    await fs__default.default.writeFile(paths.paths.resolveTargetRoot(opts.outputFile), errorOutput);
+    await fs__default.default.writeFile(cliCommon.targetPaths.resolveRoot(opts.outputFile), errorOutput);
   }
   if (cacheContext) {
     await cache.write(outputSuccessCache);

package/dist/modules/maintenance/commands/package/clean.cjs.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var fs = require('fs-extra');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function clean() {
-  await fs__default.default.remove(paths.paths.resolveTarget("dist"));
-  await fs__default.default.remove(paths.paths.resolveTarget("dist-types"));
-  await fs__default.default.remove(paths.paths.resolveTarget("coverage"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolve("dist"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolve("dist-types"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolve("coverage"));
 }
 
 exports.default = clean;

package/dist/modules/maintenance/commands/package/pack.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var productionPack = require('../../../build/lib/packager/productionPack.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var fs = require('fs-extra');
 var publishing = require('../../lib/publishing.cjs.js');
 var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
@@ -12,16 +12,16 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 const pre = async () => {
   publishing.publishPreflightCheck({
-    dir: paths.paths.targetDir,
-    packageJson: await fs__default.default.readJson(paths.paths.resolveTarget("package.json"))
+    dir: cliCommon.targetPaths.dir,
+    packageJson: await fs__default.default.readJson(cliCommon.targetPaths.resolve("package.json"))
   });
   await productionPack.productionPack({
-    packageDir: paths.paths.targetDir,
+    packageDir: cliCommon.targetPaths.dir,
     featureDetectionProject: await typeDistProject.createTypeDistProject()
   });
 };
 const post = async () => {
-  await productionPack.revertProductionPack(paths.paths.targetDir);
+  await productionPack.revertProductionPack(cliCommon.targetPaths.dir);
 };
 
 exports.post = post;

package/dist/modules/maintenance/commands/repo/clean.cjs.js

@@ -3,7 +3,6 @@
 var fs = require('fs-extra');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
-var paths = require('../../../../lib/paths.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -12,9 +11,9 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function command() {
   const packages = await cliNode.PackageGraph.listTargetPackages();
-  await fs__default.default.remove(paths.paths.resolveTargetRoot("dist"));
-  await fs__default.default.remove(paths.paths.resolveTargetRoot("dist-types"));
-  await fs__default.default.remove(paths.paths.resolveTargetRoot("coverage"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolveRoot("dist"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolveRoot("dist-types"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolveRoot("coverage"));
   await Promise.all(
     Array.from(Array(10), async () => {
       while (packages.length > 0) {

package/dist/modules/maintenance/commands/repo/fix.cjs.js

@@ -3,7 +3,7 @@
 var cliNode = require('@backstage/cli-node');
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var publishing = require('../../lib/publishing.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -18,7 +18,7 @@ async function readFixablePackages() {
 function printPackageFixHint(packages) {
   const changed = packages.filter((pkg) => pkg.changed);
   if (changed.length > 0) {
-    const rootPkg = require(paths.paths.resolveTargetRoot("package.json"));
+    const rootPkg = require(cliCommon.targetPaths.resolveRoot("package.json"));
     const fixCmd = rootPkg.scripts?.fix === "backstage-cli repo fix" ? "fix" : "backstage-cli repo fix";
     console.log(
       `The following packages are out of sync, run 'yarn ${fixCmd}' to fix them:`
@@ -148,7 +148,7 @@ function fixSideEffects(pkg) {
   pkg.changed = true;
 }
 function createRepositoryFieldFixer() {
-  const rootPkg = require(paths.paths.resolveTargetRoot("package.json"));
+  const rootPkg = require(cliCommon.targetPaths.resolveRoot("package.json"));
   const rootRepoField = rootPkg.repository;
   if (!rootRepoField) {
     return () => {
@@ -160,7 +160,7 @@ function createRepositoryFieldFixer() {
   return (pkg) => {
     const expectedPath = path.posix.join(
       rootDir,
-      path.relative(paths.paths.targetRoot, pkg.dir)
+      path.relative(cliCommon.targetPaths.rootDir, pkg.dir)
     );
     const repoField = pkg.packageJson.repository;
     if (!repoField || typeof repoField === "string") {
@@ -234,7 +234,7 @@ function fixPluginId(pkg) {
   const guessedPluginId = guessPluginId(role, pkg.packageJson.name);
   if (!guessedPluginId && (role === "frontend-plugin" || role === "frontend-plugin-module" || role === "backend-plugin" || role === "backend-plugin-module")) {
     const path$1 = path.relative(
-      paths.paths.targetRoot,
+      cliCommon.targetPaths.rootDir,
       path.resolve(pkg.dir, "package.json")
     );
     const msg = `Failed to guess plugin ID for "${pkg.packageJson.name}", please set the 'backstage.pluginId' field manually in "${path$1}"`;
@@ -305,7 +305,7 @@ function fixPluginPackages(pkg, repoPackages) {
         return;
       }
       const path$1 = path.relative(
-        paths.paths.targetRoot,
+        cliCommon.targetPaths.rootDir,
         path.resolve(pkg.dir, "package.json")
       );
       const suggestedRole = role === "frontend-plugin-module" ? "web-library" : "node-library";
@@ -341,7 +341,7 @@ function fixPeerModules(pkg) {
     return;
   }
   const packagePath = path.relative(
-    paths.paths.targetRoot,
+    cliCommon.targetPaths.rootDir,
     path.resolve(pkg.dir, "package.json")
   );
   if (role !== "backend-plugin" && role !== "frontend-plugin") {

package/dist/modules/maintenance/commands/repo/list-deprecations.cjs.js

@@ -4,7 +4,7 @@ var chalk = require('chalk');
 var eslint = require('eslint');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -13,14 +13,14 @@ var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 async function command(opts) {
   const packages = await cliNode.PackageGraph.listTargetPackages();
   const eslint$1 = new eslint.ESLint({
-    cwd: paths.paths.targetDir,
+    cwd: cliCommon.targetPaths.dir,
     overrideConfig: {
       plugins: ["deprecation"],
       rules: {
         "deprecation/deprecation": "error"
       },
       parserOptions: {
-        project: [paths.paths.resolveTargetRoot("tsconfig.json")]
+        project: [cliCommon.targetPaths.resolveRoot("tsconfig.json")]
       }
     },
     extensions: ["jsx", "ts", "tsx", "mjs", "cjs"]
@@ -37,7 +37,7 @@ async function command(opts) {
         if (message.ruleId !== "deprecation/deprecation") {
           continue;
         }
-        const path$1 = path.relative(paths.paths.targetRoot, result.filePath);
+        const path$1 = path.relative(cliCommon.targetPaths.rootDir, result.filePath);
         deprecations.push({
           path: path$1,
           message: message.message,

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

@@ -6,14 +6,14 @@ var fs = require('fs-extra');
 var path = require('node:path');
 var getPackages = require('@manypkg/get-packages');
 var cliNode = require('@backstage/cli-node');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 var packageRole = async () => {
-  const { packages } = await getPackages.getPackages(paths.paths.targetDir);
+  const { packages } = await getPackages.getPackages(cliCommon.targetPaths.dir);
   await Promise.all(
     packages.map(async ({ dir, packageJson: pkg }) => {
       const { name } = pkg;

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

@@ -10,11 +10,10 @@ var minimatch = require('minimatch');
 var semver = require('semver');
 var errors = require('@backstage/errors');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
 var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
 var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
 var packages = require('../../../../lib/versioning/packages.cjs.js');
-var parallel = require('../../../../lib/parallel.cjs.js');
+var cliNode = require('@backstage/cli-node');
 var releaseManifests = require('@backstage/release-manifests');
 var migrate = require('./migrate.cjs.js');
 var utils = require('../../lib/utils.cjs.js');
@@ -40,7 +39,7 @@ function extendsDefaultPattern(pattern) {
   return minimatch.minimatch("@backstage/", pattern.slice(0, -1));
 }
 var bump = async (opts) => {
-  const lockfilePath = paths.paths.resolveTargetRoot("yarn.lock");
+  const lockfilePath = cliCommon.targetPaths.resolveRoot("yarn.lock");
   const lockfile = await Lockfile.Lockfile.load(lockfilePath);
   const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();
   let pattern = opts.pattern;
@@ -96,10 +95,10 @@ var bump = async (opts) => {
     await cliCommon.run(["yarn", "plugin", "import", yarnPluginUrl]).waitForExit();
     console.log();
   }
-  const dependencyMap = await packages.mapDependencies(paths.paths.targetDir, pattern);
+  const dependencyMap = await packages.mapDependencies(cliCommon.targetPaths.dir, pattern);
   const versionBumps = /* @__PURE__ */ new Map();
-  await parallel.runParallelWorkers({
-    parallelismFactor: 4,
+  await cliNode.runConcurrentTasks({
+    concurrencyFactor: 4,
     items: dependencyMap.entries(),
     async worker([name, pkgs]) {
       let target;
@@ -132,8 +131,8 @@ var bump = async (opts) => {
     console.log(chalk__default.default.yellow("Some packages are outdated, updating"));
     console.log();
     const breakingUpdates = /* @__PURE__ */ new Map();
-    await parallel.runParallelWorkers({
-      parallelismFactor: 4,
+    await cliNode.runConcurrentTasks({
+      concurrencyFactor: 4,
       items: versionBumps.entries(),
       async worker([name, deps]) {
         const pkgPath = path.resolve(deps[0].location, "package.json");
@@ -311,7 +310,7 @@ function createVersionFinder(options) {
   };
 }
 function getBackstageJsonPath() {
-  return paths.paths.resolveTargetRoot(cliCommon.BACKSTAGE_JSON);
+  return cliCommon.targetPaths.resolveRoot(cliCommon.BACKSTAGE_JSON);
 }
 async function getBackstageJson() {
   const backstageJsonPath = getBackstageJsonPath();

package/dist/modules/new/lib/codeowners/codeowners.cjs.js

@@ -2,7 +2,7 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -50,7 +50,7 @@ async function addCodeownersEntry(ownedPath, ownerStr, codeownersFilePath) {
   }
   let filePath = codeownersFilePath;
   if (!filePath) {
-    filePath = await getCodeownersFilePath(paths.paths.targetRoot);
+    filePath = await getCodeownersFilePath(cliCommon.targetPaths.rootDir);
     if (!filePath) {
       return false;
     }

package/dist/modules/new/lib/execution/PortableTemplater.cjs.js

@@ -13,8 +13,7 @@ var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
 require('minimatch');
 require('@manypkg/get-packages');
 require('@backstage/errors');
-require('@backstage/cli-common');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var version = require('../../../../lib/version.cjs.js');
 var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
 
@@ -44,7 +43,7 @@ class PortableTemplater {
   static async create(options = {}) {
     let lockfile;
     try {
-      lockfile = await Lockfile.Lockfile.load(paths.paths.resolveTargetRoot("yarn.lock"));
+      lockfile = await Lockfile.Lockfile.load(cliCommon.targetPaths.resolveRoot("yarn.lock"));
     } catch {
     }
     const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();

package/dist/modules/new/lib/execution/installNewPackage.cjs.js

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var upperFirst = require('lodash/upperFirst');
 var camelCase = require('lodash/camelCase');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var tasks = require('../tasks.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -44,7 +44,7 @@ async function installNewPackage(input) {
   }
 }
 async function addDependency(input, path) {
-  const pkgJsonPath = paths.paths.resolveTargetRoot(path);
+  const pkgJsonPath = cliCommon.targetPaths.resolveRoot(path);
   const pkgJson = await fs__default.default.readJson(pkgJsonPath).catch((error) => {
     if (error.code === "ENOENT") {
       return void 0;
@@ -71,7 +71,7 @@ async function tryAddFrontendLegacy(input) {
       "add-frontend-legacy can only be used for frontend plugins"
     );
   }
-  const appDefinitionPath = paths.paths.resolveTargetRoot("packages/app/src/App.tsx");
+  const appDefinitionPath = cliCommon.targetPaths.resolveRoot("packages/app/src/App.tsx");
   if (!await fs__default.default.pathExists(appDefinitionPath)) {
     return;
   }
@@ -101,7 +101,7 @@ async function tryAddFrontendLegacy(input) {
   });
 }
 async function tryAddBackend(input) {
-  const backendIndexPath = paths.paths.resolveTargetRoot(
+  const backendIndexPath = cliCommon.targetPaths.resolveRoot(
     "packages/backend/src/index.ts"
   );
   if (!await fs__default.default.pathExists(backendIndexPath)) {

package/dist/modules/new/lib/execution/writeTemplateContents.cjs.js

@@ -2,7 +2,6 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
 var errors = require('@backstage/errors');
 var cliNode = require('@backstage/cli-node');
 var PortableTemplater = require('./PortableTemplater.cjs.js');
@@ -13,7 +12,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function writeTemplateContents(template, input) {
-  const targetDir = paths.paths.resolveTargetRoot(input.packagePath);
+  const targetDir = cliCommon.targetPaths.resolveRoot(input.packagePath);
   if (await fs__default.default.pathExists(targetDir)) {
     throw new errors.InputError(`Package '${input.packagePath}' already exists`);
   }

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

@@ -2,7 +2,7 @@
 
 var inquirer = require('inquirer');
 var codeowners = require('../codeowners/codeowners.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var resolvePackageParams = require('./resolvePackageParams.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -11,7 +11,7 @@ var inquirer__default = /*#__PURE__*/_interopDefaultCompat(inquirer);
 
 async function collectPortableTemplateInput(options) {
   const { config, template, prefilledParams } = options;
-  const codeOwnersFilePath = await codeowners.getCodeownersFilePath(paths.paths.targetRoot);
+  const codeOwnersFilePath = await codeowners.getCodeownersFilePath(cliCommon.targetPaths.rootDir);
   const prompts = getPromptsForRole(template.role);
   if (codeOwnersFilePath) {
     prompts.push(ownerPrompt());

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

@@ -5,7 +5,7 @@ var fs = require('fs-extra');
 var recursiveReaddir = require('recursive-readdir');
 var path = require('node:path');
 var yaml = require('yaml');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var types = require('../types.cjs.js');
 var errors = require('@backstage/errors');
 var v3 = require('zod-validation-error/v3');
@@ -25,7 +25,7 @@ async function loadPortableTemplate(pointer) {
   if (pointer.target.match(/https?:\/\//)) {
     throw new Error("Remote templates are not supported yet");
   }
-  const templateContent = await fs__default.default.readFile(paths.paths.resolveTargetRoot(pointer.target), "utf-8").catch((error) => {
+  const templateContent = await fs__default.default.readFile(cliCommon.targetPaths.resolveRoot(pointer.target), "utf-8").catch((error) => {
     throw new errors.ForwardedError(
       `Failed to load template definition from '${pointer.target}'`,
       error

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

@@ -2,7 +2,7 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var defaultTemplates = require('../defaultTemplates.cjs.js');
 var types = require('../types.cjs.js');
 var yaml = require('yaml');
@@ -48,7 +48,7 @@ function computePackageNamePluginInfix(packageNamePrefix, namePluginInfix) {
 }
 async function loadPortableTemplateConfig(options = {}) {
   const { overrides = {} } = options;
-  const pkgPath = options.packagePath ?? paths.paths.resolveTargetRoot("package.json");
+  const pkgPath = options.packagePath ?? cliCommon.targetPaths.resolveRoot("package.json");
   const pkgJson = await fs__default.default.readJson(pkgPath);
   const parsed = pkgJsonWithNewConfigSchema.safeParse(pkgJson);
   if (!parsed.success) {

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

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var paths = require('../../../../lib/paths.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 
 function includesAnyOf(hayStack, ...needles) {
@@ -21,7 +20,7 @@ var test = async (_opts, cmd) => {
   const allArgs = parent.args;
   const args = allArgs.slice(allArgs.indexOf("test") + 1);
   if (!includesAnyOf(args, "-c", "--config")) {
-    args.push("--config", paths.paths.resolveOwn("config/jest.js"));
+    args.push("--config", cliCommon.findOwnPaths(__dirname).resolve("config/jest.js"));
   }
   if (!includesAnyOf(args, "--no-passWithNoTests", "--passWithNoTests=false")) {
     args.push("--passWithNoTests");

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

@@ -6,7 +6,6 @@ var yargs = require('yargs');
 var jestCli = require('jest-cli');
 var path = require('node:path');
 var cliNode = require('@backstage/cli-node');
-var paths = require('../../../../lib/paths.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 var SuccessCache = require('../../../../lib/cache/SuccessCache.cjs.js');
 
@@ -19,7 +18,7 @@ var yargs__default = /*#__PURE__*/_interopDefaultCompat(yargs);
 async function readPackageTreeHashes(graph) {
   const pkgs = Array.from(graph.values()).map((pkg) => ({
     ...pkg,
-    path: path.relative(paths.paths.targetRoot, pkg.dir)
+    path: path.relative(cliCommon.targetPaths.rootDir, pkg.dir)
   }));
   const output = await cliCommon.runOutput([
     "git",
@@ -100,7 +99,7 @@ async function command(opts, cmd) {
   const hasFlags = createFlagFinder(args);
   const { _: parsedArgs } = await yargs__default.default(args).options(jestCli.yargsOptions).argv;
   if (!hasFlags("-c", "--config")) {
-    args.push("--config", paths.paths.resolveOwn("config/jest.js"));
+    args.push("--config", cliCommon.findOwnPaths(__dirname).resolve("config/jest.js"));
   }
   if (!hasFlags("--passWithNoTests")) {
     args.push("--passWithNoTests");
@@ -211,7 +210,7 @@ async function command(opts, cmd) {
       async filterConfigs(projectConfigs, globalRootConfig) {
         const cacheEntries = await cache.read();
         const lockfile = await cliNode.Lockfile.load(
-          paths.paths.resolveTargetRoot("yarn.lock")
+          cliCommon.targetPaths.resolveRoot("yarn.lock")
         );
         const getPackageTreeHash = await readPackageTreeHashes(graph);
         const baseHash = crypto__default.default.createHash("sha1");

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

@@ -15,6 +15,7 @@ var index = factory.createCliPlugin({
       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"
@@ -38,7 +39,8 @@ var index = factory.createCliPlugin({
       execute: async ({ args }) => {
         const command = new commander.Command();
         command.allowUnknownOption(true);
-        command.helpOption(", --backstage-cli-help");
+        command.allowExcessArguments(true);
+        command.helpOption("--backstage-cli-help");
         command.action(
           lazy.lazy(() => import('./commands/package/test.cjs.js'), "default")
         );