@backstage/cli 0.34.6-next.1 → 0.34.6

package/CHANGELOG.md

@@ -1,30 +1,10 @@
 # @backstage/cli
 
-## 0.34.6-next.1
+## 0.34.6
 
 ### Patch Changes
 
-- 7fbac5c: Updated to use new utilities from `@backstage/cli-common`.
-- Updated dependencies
-  - @backstage/cli-node@0.2.16-next.1
-  - @backstage/cli-common@0.1.16-next.1
-
-## 0.34.6-next.0
-
-### Patch Changes
-
-- c8c2329: Add proxy configuration from env-vars to create-app tasks
-- Updated dependencies
-  - @backstage/integration@1.18.3-next.0
-  - @backstage/cli-common@0.1.16-next.0
-  - @backstage/cli-node@0.2.16-next.0
-  - @backstage/config@1.3.6
-  - @backstage/release-manifests@0.0.13
-  - @backstage/config-loader@1.10.7-next.0
-  - @backstage/catalog-model@1.7.6
-  - @backstage/errors@1.2.7
-  - @backstage/eslint-plugin@0.2.0
-  - @backstage/types@1.2.2
+- Upgraded `tar` dependency to v7.
 
 ## 0.34.5
 

package/dist/lib/errors.cjs.js

@@ -7,6 +7,15 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
+class ExitCodeError extends errors.CustomErrorBase {
+  code;
+  constructor(code, command) {
+    super(
+      command ? `Command '${command}' exited with code ${code}` : `Child exited with code ${code}`
+    );
+    this.code = code;
+  }
+}
 function exit(message, code = 1) {
   process.stderr.write(`
 ${chalk__default.default.red(message)}
@@ -58,5 +67,6 @@ ${chalk__default.default.red(errors.stringifyError(error))}
   }
 }
 
+exports.ExitCodeError = ExitCodeError;
 exports.exitWithError = exitWithError;
 //# sourceMappingURL=errors.cjs.js.map

package/dist/lib/run.cjs.js

@@ -0,0 +1,82 @@
+'use strict';
+
+var child_process = require('child_process');
+var errors = require('./errors.cjs.js');
+var util = require('util');
+var errors$1 = require('@backstage/errors');
+
+const execFile = util.promisify(child_process.execFile);
+async function run(name, args = [], options = {}) {
+  const { stdoutLogFunc, stderrLogFunc } = options;
+  const env = {
+    ...process.env,
+    FORCE_COLOR: "true",
+    ...options.env ?? {}
+  };
+  const stdio = [
+    "inherit",
+    stdoutLogFunc ? "pipe" : "inherit",
+    stderrLogFunc ? "pipe" : "inherit"
+  ];
+  const child = child_process.spawn(name, args, {
+    stdio,
+    shell: true,
+    ...options,
+    env
+  });
+  if (stdoutLogFunc && child.stdout) {
+    child.stdout.on("data", stdoutLogFunc);
+  }
+  if (stderrLogFunc && child.stderr) {
+    child.stderr.on("data", stderrLogFunc);
+  }
+  await waitForExit(child, name);
+}
+async function runPlain(cmd, ...args) {
+  try {
+    const { stdout } = await execFile(cmd, args, { shell: true });
+    return stdout.trim();
+  } catch (error) {
+    errors$1.assertError(error);
+    if ("stderr" in error) {
+      process.stderr.write(error.stderr);
+    }
+    if (typeof error.code === "number") {
+      throw new errors.ExitCodeError(error.code, [cmd, ...args].join(" "));
+    }
+    throw new errors$1.ForwardedError("Unknown execution error", error);
+  }
+}
+async function runCheck(cmd, ...args) {
+  try {
+    await execFile(cmd, args, { shell: true });
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+async function waitForExit(child, name) {
+  if (typeof child.exitCode === "number") {
+    if (child.exitCode) {
+      throw new errors.ExitCodeError(child.exitCode, name);
+    }
+    return;
+  }
+  await new Promise((resolve, reject) => {
+    child.once("error", (error) => reject(error));
+    child.once("exit", (code) => {
+      if (code) {
+        reject(new errors.ExitCodeError(code, name));
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
+exports.execFile = execFile;
+exports.run = run;
+exports.runCheck = runCheck;
+exports.runPlain = runPlain;
+exports.waitForExit = waitForExit;
+//# sourceMappingURL=run.cjs.js.map

package/dist/lib/versioning/packages.cjs.js

@@ -3,7 +3,7 @@
 var minimatch = require('minimatch');
 var getPackages = require('@manypkg/get-packages');
 var yarn = require('./yarn.cjs.js');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../run.cjs.js');
 var errors = require('@backstage/errors');
 
 const DEP_TYPES = [
@@ -16,7 +16,11 @@ async function fetchPackageInfo(name) {
   const yarnVersion = await yarn.detectYarnVersion();
   const cmd = yarnVersion === "classic" ? ["info"] : ["npm", "info"];
   try {
-    const output = await cliCommon.runOutput(["yarn", ...cmd, "--json", name]);
+    const { stdout: output } = await run.execFile(
+      "yarn",
+      [...cmd, "--json", name],
+      { shell: true }
+    );
     if (!output) {
       throw new errors.NotFoundError(
         `No package information found for package ${name}`
@@ -34,7 +38,7 @@ async function fetchPackageInfo(name) {
     if (yarnVersion === "classic") {
       throw error;
     }
-    if (error instanceof Error && "stdout" in error && typeof error.stdout === "string" && error.stdout.includes("Response Code: 404")) {
+    if (error?.stdout.includes("Response Code: 404")) {
       throw new errors.NotFoundError(
         `No package information found for package ${name}`
       );

package/dist/lib/versioning/yarn.cjs.js

@@ -1,8 +1,10 @@
 'use strict';
 
 var errors = require('@backstage/errors');
-var cliCommon = require('@backstage/cli-common');
+var child_process = require('child_process');
+var util = require('util');
 
+const execFile = util.promisify(child_process.execFile);
 const versions = /* @__PURE__ */ new Map();
 function detectYarnVersion(dir) {
   const cwd = process.cwd();
@@ -11,12 +13,16 @@ function detectYarnVersion(dir) {
   }
   const promise = Promise.resolve().then(async () => {
     try {
-      const stdout = await cliCommon.runOutput(["yarn", "--version"], {
+      const { stdout } = await execFile("yarn", ["--version"], {
+        shell: true,
         cwd
       });
       return stdout.trim().startsWith("1.") ? "classic" : "berry";
     } catch (error) {
       errors.assertError(error);
+      if ("stderr" in error) {
+        process.stderr.write(error.stderr);
+      }
       throw new errors.ForwardedError("Failed to determine yarn version", error);
     }
   });

package/dist/modules/build/commands/package/start/startFrontend.cjs.js

@@ -13,7 +13,7 @@ require('react-dev-utils/ModuleScopePlugin');
 require('@module-federation/enhanced/rspack');
 var paths = require('../../../../../lib/paths.cjs.js');
 require('lodash/pickBy');
-require('@backstage/cli-common');
+require('../../../../../lib/run.cjs.js');
 require('../../../../../lib/version.cjs.js');
 var hasReactDomClient = require('../../../lib/bundler/hasReactDomClient.cjs.js');
 require('@manypkg/get-packages');

package/dist/modules/build/lib/buildBackend.cjs.js

@@ -12,9 +12,27 @@ var cliNode = require('@backstage/cli-node');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
 var os__default = /*#__PURE__*/_interopDefaultCompat(os);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-var tar__default = /*#__PURE__*/_interopDefaultCompat(tar);
+var tar__namespace = /*#__PURE__*/_interopNamespaceCompat(tar);
 
 const BUNDLE_FILE = "bundle.tar.gz";
 const SKELETON_FILE = "skeleton.tar.gz";
@@ -46,7 +64,7 @@ async function buildBackend(options) {
       path.resolve(tmpDir, SKELETON_FILE),
       path.resolve(distDir, SKELETON_FILE)
     );
-    await tar__default.default.create(
+    await tar__namespace.create(
       {
         file: path.resolve(distDir, BUNDLE_FILE),
         cwd: tmpDir,

package/dist/modules/build/lib/buildFrontend.cjs.js

@@ -16,7 +16,7 @@ require('html-webpack-plugin');
 require('react-dev-utils/ModuleScopePlugin');
 require('@module-federation/enhanced/rspack');
 require('lodash/pickBy');
-require('@backstage/cli-common');
+require('../../../lib/run.cjs.js');
 require('../../../lib/version.cjs.js');
 require('yn');
 require('@manypkg/get-packages');

package/dist/modules/build/lib/bundler/config.cjs.js

@@ -11,7 +11,7 @@ var paths = require('../../../../lib/paths.cjs.js');
 var fs = require('fs-extra');
 var optimization = require('./optimization.cjs.js');
 var pickBy = require('lodash/pickBy');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../../lib/run.cjs.js');
 var transforms = require('./transforms.cjs.js');
 var version = require('../../../../lib/version.cjs.js');
 var yn = require('yn');
@@ -48,12 +48,12 @@ async function readBuildInfo() {
   const timestamp = Date.now();
   let commit;
   try {
-    commit = await cliCommon.runOutput(["git", "rev-parse", "HEAD"]);
+    commit = await run.runPlain("git", "rev-parse", "HEAD");
   } catch (error) {
   }
   let gitVersion;
   try {
-    gitVersion = await cliCommon.runOutput(["git", "describe", "--always"]);
+    gitVersion = await run.runPlain("git", "describe", "--always");
   } catch (error) {
   }
   if (commit === void 0 || gitVersion === void 0) {

package/dist/modules/build/lib/packager/createDistWorkspace.cjs.js

@@ -7,7 +7,7 @@ var os = require('os');
 var tar = require('tar');
 var partition = require('lodash/partition');
 var paths = require('../../../../lib/paths.cjs.js');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../../lib/run.cjs.js');
 var _package = require('../../../../packages/cli/package.json.cjs.js');
 var packager = require('../builder/packager.cjs.js');
 var types = require('../builder/types.cjs.js');
@@ -18,9 +18,27 @@ var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-var tar__default = /*#__PURE__*/_interopDefaultCompat(tar);
+var tar__namespace = /*#__PURE__*/_interopNamespaceCompat(tar);
 var partition__default = /*#__PURE__*/_interopDefaultCompat(partition);
 
 const UNSAFE_PACKAGES = [
@@ -104,11 +122,11 @@ async function createDistWorkspace(packageNames, options = {}) {
       await parallel.runParallelWorkers({
         items: customBuild,
         worker: async ({ name, dir, args }) => {
-          await cliCommon.run(["yarn", "run", "build", ...args || []], {
+          await run.run("yarn", ["run", "build", ...args || []], {
             cwd: dir,
-            onStdout: prefixLogFunc(`${name}: `, "stdout"),
-            onStderr: prefixLogFunc(`${name}: `, "stderr")
-          }).waitForExit();
+            stdoutLogFunc: prefixLogFunc(`${name}: `, "stdout"),
+            stderrLogFunc: prefixLogFunc(`${name}: `, "stderr")
+          });
         }
       });
     }
@@ -130,7 +148,7 @@ async function createDistWorkspace(packageNames, options = {}) {
       const dir = path.relative(paths.paths.targetRoot, target.dir);
       return path.join(dir, "package.json");
     }).sort();
-    await tar__default.default.create(
+    await tar__namespace.create(
       {
         file: path.resolve(targetDir, options.skeleton),
         cwd: targetDir,
@@ -169,13 +187,13 @@ async function moveToDistWorkspace(workspaceDir, localPackages, alwaysPack, enab
   async function pack(target, archive) {
     console.log(`Repacking ${target.name} into dist workspace`);
     const archivePath = path.resolve(workspaceDir, archive);
-    await cliCommon.run(["yarn", "pack", "--filename", archivePath], {
+    await run.run("yarn", ["pack", "--filename", archivePath], {
       cwd: target.dir
-    }).waitForExit();
+    });
     const outputDir = path.relative(paths.paths.targetRoot, target.dir);
     const absoluteOutputPath = path.resolve(workspaceDir, outputDir);
     await fs__default.default.ensureDir(absoluteOutputPath);
-    await tar__default.default.extract({
+    await tar__namespace.extract({
       file: archivePath,
       cwd: absoluteOutputPath,
       strip: 1

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

@@ -4,11 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _package = require('../../../packages/cli/package.json.cjs.js');
 var os = require('os');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../lib/run.cjs.js');
 var paths = require('../../../lib/paths.cjs.js');
 var Lockfile = require('../../../lib/versioning/Lockfile.cjs.js');
 require('minimatch');
 require('@manypkg/get-packages');
+require('../../../lib/versioning/yarn.cjs.js');
 require('@backstage/errors');
 var fs = require('fs-extra');
 
@@ -19,7 +20,7 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 var info = async () => {
   await new Promise(async () => {
-    const yarnVersion = await cliCommon.runOutput(["yarn", "--version"]);
+    const yarnVersion = await run.runPlain("yarn --version");
     const isLocal = fs__default.default.existsSync(paths.paths.resolveOwn("./src"));
     const backstageFile = paths.paths.resolveTargetRoot("backstage.json");
     let backstageVersion = "N/A";

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

@@ -1,15 +1,17 @@
 'use strict';
 
+var child_process = require('child_process');
 var fs = require('fs-extra');
 var path = require('path');
+var util = require('util');
 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);
 
+const execFile = util.promisify(child_process.execFile);
 async function command() {
   const packages = await cliNode.PackageGraph.listTargetPackages();
   await fs__default.default.remove(paths.paths.resolveTargetRoot("dist"));
@@ -25,9 +27,12 @@ async function command() {
           await fs__default.default.remove(path.resolve(pkg.dir, "dist-types"));
           await fs__default.default.remove(path.resolve(pkg.dir, "coverage"));
         } else if (cleanScript) {
-          await cliCommon.run(["yarn", "run", "clean"], {
-            cwd: pkg.dir
-          }).waitForExit();
+          const result = await execFile("yarn", ["run", "clean"], {
+            cwd: pkg.dir,
+            shell: true
+          });
+          process.stdout.write(result.stdout);
+          process.stderr.write(result.stderr);
         }
       }
     })

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

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var path = require('path');
 var cliNode = require('@backstage/cli-node');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../lib/run.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -65,7 +65,7 @@ async function command() {
   } catch {
   }
   if (hasPrettier) {
-    await cliCommon.runOutput(["prettier", "--write", ...configPaths]);
+    await run.runPlain("prettier", "--write", ...configPaths);
   }
 }
 

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

@@ -2,8 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var cliCommon = require('@backstage/cli-common');
-var process = require('process');
+var process$1 = require('process');
 var fs = require('fs-extra');
 var chalk = require('chalk');
 var minimatch = require('minimatch');
@@ -14,10 +13,12 @@ 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 cliCommon = require('@backstage/cli-common');
 var parallel = require('../../../../lib/parallel.cjs.js');
 var releaseManifests = require('@backstage/release-manifests');
 var migrate = require('./migrate.cjs.js');
 var utils = require('../../lib/utils.cjs.js');
+var run = require('../../../../lib/run.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -25,7 +26,18 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
 
-cliCommon.bootstrapEnvProxyAgents();
+maybeBootstrapProxy();
+function maybeBootstrapProxy() {
+  const globalAgentNamespace = process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE ?? "GLOBAL_AGENT_";
+  if (process.env[`${globalAgentNamespace}HTTP_PROXY`] || process.env[`${globalAgentNamespace}HTTPS_PROXY`]) {
+    const globalAgent = require("global-agent");
+    globalAgent.bootstrap();
+  }
+  if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
+    const { setGlobalDispatcher, EnvHttpProxyAgent } = require("undici");
+    setGlobalDispatcher(new EnvHttpProxyAgent());
+  }
+}
 const DEP_TYPES = [
   "dependencies",
   "devDependencies",
@@ -54,8 +66,8 @@ var bump = async (opts) => {
   }
   let findTargetVersion;
   let releaseManifest;
-  if (process.env.BACKSTAGE_MANIFEST_FILE) {
-    releaseManifest = await fs__default.default.readJson(process.env.BACKSTAGE_MANIFEST_FILE);
+  if (process$1.env.BACKSTAGE_MANIFEST_FILE) {
+    releaseManifest = await fs__default.default.readJson(process$1.env.BACKSTAGE_MANIFEST_FILE);
     findTargetVersion = createStrictVersionFinder({
       releaseManifest
     });
@@ -68,17 +80,17 @@ var bump = async (opts) => {
     if (opts.release === "next") {
       const next = await releaseManifests.getManifestByReleaseLine({
         releaseLine: "next",
-        versionsBaseUrl: process.env.BACKSTAGE_VERSIONS_BASE_URL
+        versionsBaseUrl: process$1.env.BACKSTAGE_VERSIONS_BASE_URL
       });
       const main = await releaseManifests.getManifestByReleaseLine({
         releaseLine: "main",
-        versionsBaseUrl: process.env.BACKSTAGE_VERSIONS_BASE_URL
+        versionsBaseUrl: process$1.env.BACKSTAGE_VERSIONS_BASE_URL
       });
       releaseManifest = semver__default.default.gt(next.releaseVersion, main.releaseVersion) ? next : main;
     } else {
       releaseManifest = await releaseManifests.getManifestByReleaseLine({
         releaseLine: opts.release,
-        versionsBaseUrl: process.env.BACKSTAGE_VERSIONS_BASE_URL
+        versionsBaseUrl: process$1.env.BACKSTAGE_VERSIONS_BASE_URL
       });
     }
     findTargetVersion = createVersionFinder({
@@ -92,8 +104,8 @@ var bump = async (opts) => {
       `Updating yarn plugin to v${releaseManifest.releaseVersion}...`
     );
     console.log();
-    const yarnPluginUrl = process.env.BACKSTAGE_VERSIONS_BASE_URL ? `${process.env.BACKSTAGE_VERSIONS_BASE_URL}/v1/releases/${releaseManifest.releaseVersion}/yarn-plugin` : `https://versions.backstage.io/v1/releases/${releaseManifest.releaseVersion}/yarn-plugin`;
-    await cliCommon.run(["yarn", "plugin", "import", yarnPluginUrl]).waitForExit();
+    const yarnPluginUrl = process$1.env.BACKSTAGE_VERSIONS_BASE_URL ? `${process$1.env.BACKSTAGE_VERSIONS_BASE_URL}/v1/releases/${releaseManifest.releaseVersion}/yarn-plugin` : `https://versions.backstage.io/v1/releases/${releaseManifest.releaseVersion}/yarn-plugin`;
+    await run.run("yarn", ["plugin", "import", yarnPluginUrl]);
     console.log();
   }
   const dependencyMap = await packages.mapDependencies(paths.paths.targetDir, pattern);

package/dist/modules/migrate/lib/utils.cjs.js

@@ -2,7 +2,7 @@
 
 var ora = require('ora');
 var chalk = require('chalk');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../lib/run.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -17,7 +17,7 @@ async function runYarnInstall() {
   }).start();
   const installOutput = new Array();
   try {
-    await cliCommon.run(["yarn", "install"], {
+    await run.run("yarn", ["install"], {
       env: {
         FORCE_COLOR: "true",
         // We filter out all of the npm_* environment variables that are added when
@@ -29,9 +29,9 @@ async function runYarnInstall() {
           )
         )
       },
-      onStdout: (data) => installOutput.push(data),
-      onStderr: (data) => installOutput.push(data)
-    }).waitForExit();
+      stdoutLogFunc: (data) => installOutput.push(data),
+      stderrLogFunc: (data) => installOutput.push(data)
+    });
     spinner.succeed();
   } catch (error) {
     spinner.fail();

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

@@ -12,8 +12,9 @@ var lowerFirst = require('lodash/lowerFirst');
 var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
 require('minimatch');
 require('@manypkg/get-packages');
+require('../../../../lib/versioning/yarn.cjs.js');
+require('../../../../lib/run.cjs.js');
 require('@backstage/errors');
-require('@backstage/cli-common');
 var paths = require('../../../../lib/paths.cjs.js');
 var version = require('../../../../lib/version.cjs.js');
 var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');

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

@@ -5,7 +5,6 @@ var codeowners = require('../codeowners/codeowners.cjs.js');
 var tasks = require('../tasks.cjs.js');
 var installNewPackage = require('./installNewPackage.cjs.js');
 var writeTemplateContents = require('./writeTemplateContents.cjs.js');
-var cliCommon = require('@backstage/cli-common');
 
 async function executePortableTemplate(options) {
   const { template, input } = options;
@@ -22,25 +21,14 @@ async function executePortableTemplate(options) {
       await codeowners.addCodeownersEntry(targetDir, input.owner);
     }
     if (!options.skipInstall) {
-      for (const command of [
-        ["yarn", "install"],
-        ["yarn", "lint", "--fix"]
-      ]) {
-        const commandStr = command.join(" ");
-        try {
-          await tasks.Task.forItem("executing", commandStr, async () => {
-            await cliCommon.run(command, {
-              cwd: targetDir,
-              stdio: "ignore"
-            }).waitForExit();
-          });
-        } catch (error) {
-          errors.assertError(error);
-          tasks.Task.error(
-            `Warning: Failed to execute command '${commandStr}', ${error}`
-          );
-        }
-      }
+      await tasks.Task.forCommand("yarn install", {
+        cwd: targetDir,
+        optional: true
+      });
+      await tasks.Task.forCommand("yarn lint --fix", {
+        cwd: targetDir,
+        optional: true
+      });
     }
     tasks.Task.log();
     tasks.Task.log(`\u{1F389}  Successfully created ${template.name}`);

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

@@ -2,12 +2,16 @@
 
 var chalk = require('chalk');
 var ora = require('ora');
+var util = require('util');
+var child_process = require('child_process');
+var errors = require('@backstage/errors');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var ora__default = /*#__PURE__*/_interopDefaultCompat(ora);
 
+const exec = util.promisify(child_process.exec);
 const TASK_NAME_MAX_LENGTH = 14;
 class Task {
   static log(name = "") {
@@ -45,6 +49,28 @@ ${chalk__default.default.red(message)}
       throw error;
     }
   }
+  static async forCommand(command, options) {
+    try {
+      await Task.forItem("executing", command, async () => {
+        await exec(command, { cwd: options?.cwd });
+      });
+    } catch (error) {
+      errors.assertError(error);
+      if (error.stderr) {
+        process.stderr.write(error.stderr);
+      }
+      if (error.stdout) {
+        process.stdout.write(error.stdout);
+      }
+      if (options?.optional) {
+        Task.error(`Warning: Failed to execute command ${chalk__default.default.cyan(command)}`);
+      } else {
+        throw new Error(
+          `Failed to execute command '${chalk__default.default.cyan(command)}', ${error}`
+        );
+      }
+    }
+  }
 }
 
 exports.Task = Task;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var paths = require('../../../../lib/paths.cjs.js');
-var cliCommon = require('@backstage/cli-common');
+var run = require('../../../../lib/run.cjs.js');
 
 function includesAnyOf(hayStack, ...needles) {
   for (const needle of needles) {
@@ -29,8 +29,8 @@ var test = async (_opts, cmd) => {
   if (!process.env.CI && !args.includes("--coverage") && // explicitly no watching
   !includesAnyOf(args, "--no-watch", "--watch=false", "--watchAll=false") && // already watching
   !includesAnyOf(args, "--watch", "--watchAll")) {
-    const isGitRepo = () => cliCommon.runCheck(["git", "rev-parse", "--is-inside-work-tree"]);
-    const isMercurialRepo = () => cliCommon.runCheck(["hg", "--cwd", ".", "root"]);
+    const isGitRepo = () => run.runCheck("git", "rev-parse", "--is-inside-work-tree");
+    const isMercurialRepo = () => run.runCheck("hg", "--cwd", ".", "root");
     if (await isGitRepo() || await isMercurialRepo()) {
       args.push("--watch");
     } else {

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

@@ -7,6 +7,7 @@ var jestCli = require('jest-cli');
 var path = require('path');
 var cliNode = require('@backstage/cli-node');
 var paths = require('../../../../lib/paths.cjs.js');
+var run = require('../../../../lib/run.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 var SuccessCache = require('../../../../lib/cache/SuccessCache.cjs.js');
 
@@ -21,14 +22,14 @@ async function readPackageTreeHashes(graph) {
     ...pkg,
     path: path.relative(paths.paths.targetRoot, pkg.dir)
   }));
-  const output = await cliCommon.runOutput([
+  const output = await run.runPlain(
     "git",
     "ls-tree",
-    "--format=%(objectname)=%(path)",
+    '--format="%(objectname)=%(path)"',
     "HEAD",
     "--",
     ...pkgs.map((pkg) => pkg.path)
-  ]);
+  );
   const map = new Map(
     output.trim().split(/\r?\n/).map((line) => {
       const [itemSha, ...itemPathParts] = line.split("=");
@@ -107,8 +108,8 @@ async function command(opts, cmd) {
   }
   let isSingleWatchMode = args.includes("--watch");
   if (!opts.since && !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"]);
+    const isGitRepo = () => run.runCheck("git", "rev-parse", "--is-inside-work-tree");
+    const isMercurialRepo = () => run.runCheck("hg", "--cwd", ".", "root");
     if (await isGitRepo() || await isMercurialRepo()) {
       isSingleWatchMode = true;
       args.push("--watch");

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.14.0-next.0";
+var version = "0.13.3";
 
 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.5.1-next.0";
+var version = "1.5.0";
 
 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.10.1-next.0";
+var version = "1.10.1";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/cli/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.34.6-next.1";
+var version = "0.34.6";
 var dependencies = {
 	"@backstage/catalog-model": "workspace:^",
 	"@backstage/cli-common": "workspace:^",
@@ -93,7 +93,7 @@ var dependencies = {
 	"style-loader": "^3.3.1",
 	sucrase: "^3.20.2",
 	"swc-loader": "^0.2.3",
-	tar: "^6.1.12",
+	tar: "^7.4.3",
 	"ts-checker-rspack-plugin": "^1.1.5",
 	"ts-morph": "^24.0.0",
 	undici: "^7.2.3",

package/dist/packages/core-app-api/package.json.cjs.js

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

package/dist/packages/core-components/package.json.cjs.js

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

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

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

package/dist/packages/dev-utils/package.json.cjs.js

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

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

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

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

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

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

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

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

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

package/dist/packages/theme/package.json.cjs.js

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

package/dist/plugins/auth-backend/package.json.cjs.js

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

package/dist/plugins/auth-backend-module-guest-provider/package.json.cjs.js

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

package/dist/plugins/catalog-node/package.json.cjs.js

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

package/dist/plugins/scaffolder-node/package.json.cjs.js

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

package/dist/plugins/scaffolder-node-test-utils/package.json.cjs.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.34.6-next.1",
+  "version": "0.34.6",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -47,16 +47,16 @@
     ]
   },
   "dependencies": {
-    "@backstage/catalog-model": "1.7.6",
-    "@backstage/cli-common": "0.1.16-next.1",
-    "@backstage/cli-node": "0.2.16-next.1",
-    "@backstage/config": "1.3.6",
-    "@backstage/config-loader": "1.10.7-next.0",
-    "@backstage/errors": "1.2.7",
-    "@backstage/eslint-plugin": "0.2.0",
-    "@backstage/integration": "1.18.3-next.0",
-    "@backstage/release-manifests": "0.0.13",
-    "@backstage/types": "1.2.2",
+    "@backstage/catalog-model": "^1.7.6",
+    "@backstage/cli-common": "^0.1.15",
+    "@backstage/cli-node": "^0.2.15",
+    "@backstage/config": "^1.3.6",
+    "@backstage/config-loader": "^1.10.6",
+    "@backstage/errors": "^1.2.7",
+    "@backstage/eslint-plugin": "^0.2.0",
+    "@backstage/integration": "^1.18.2",
+    "@backstage/release-manifests": "^0.0.13",
+    "@backstage/types": "^1.2.2",
     "@manypkg/get-packages": "^1.1.3",
     "@module-federation/enhanced": "^0.9.0",
     "@octokit/request": "^8.0.0",
@@ -138,7 +138,7 @@
     "style-loader": "^3.3.1",
     "sucrase": "^3.20.2",
     "swc-loader": "^0.2.3",
-    "tar": "^6.1.12",
+    "tar": "^7.4.3",
     "ts-checker-rspack-plugin": "^1.1.5",
     "ts-morph": "^24.0.0",
     "undici": "^7.2.3",
@@ -151,22 +151,22 @@
     "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
-    "@backstage/backend-plugin-api": "1.5.1-next.0",
-    "@backstage/backend-test-utils": "1.10.1-next.0",
-    "@backstage/catalog-client": "1.12.1",
-    "@backstage/config": "1.3.6",
-    "@backstage/core-app-api": "1.19.3-next.0",
-    "@backstage/core-components": "0.18.4-next.1",
-    "@backstage/core-plugin-api": "1.12.1-next.0",
-    "@backstage/dev-utils": "1.1.18-next.1",
-    "@backstage/errors": "1.2.7",
-    "@backstage/plugin-auth-backend": "0.25.7-next.0",
-    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.15-next.0",
-    "@backstage/plugin-catalog-node": "1.20.1-next.0",
-    "@backstage/plugin-scaffolder-node": "0.12.2-next.0",
-    "@backstage/plugin-scaffolder-node-test-utils": "0.3.6-next.0",
-    "@backstage/test-utils": "1.7.14-next.0",
-    "@backstage/theme": "0.7.1-next.0",
+    "@backstage/backend-plugin-api": "^1.5.0",
+    "@backstage/backend-test-utils": "^1.10.1",
+    "@backstage/catalog-client": "^1.12.1",
+    "@backstage/config": "^1.3.6",
+    "@backstage/core-app-api": "^1.19.2",
+    "@backstage/core-components": "^0.18.3",
+    "@backstage/core-plugin-api": "^1.12.0",
+    "@backstage/dev-utils": "^1.1.17",
+    "@backstage/errors": "^1.2.7",
+    "@backstage/plugin-auth-backend": "^0.25.6",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.14",
+    "@backstage/plugin-catalog-node": "^1.20.0",
+    "@backstage/plugin-scaffolder-node": "^0.12.1",
+    "@backstage/plugin-scaffolder-node-test-utils": "^0.3.5",
+    "@backstage/test-utils": "^1.7.13",
+    "@backstage/theme": "^0.7.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@types/cross-spawn": "^6.0.2",
     "@types/ejs": "^3.1.3",