@backstage/cli 0.26.8 → 0.26.10-next.0

package/CHANGELOG.md

@@ -1,11 +1,21 @@
 # @backstage/cli
 
-## 0.26.8
+## 0.26.10-next.0
 
 ### Patch Changes
 
-- 2cacbb9: Subpath export `package.json` should be of a unique name to avoid typescript resolution issues
+- e2e320c: - remove unused dependencies `winston` and `yn` from the template of backend plugins;
+  - update `msw` to version `2.3.1` in the template of backend plugins;
+    starting with v1 and switching later to v2 is tedious and not straight forward; it's easier to start with v2;
+- 0540c5a: Updated the scaffolding output message for `plugin-common` in `backstage-cli`. Now, when executing `backstage-cli new` to create a new `plugin-common` package, the output message accurately reflects the action by displaying `Creating common plugin package...` instead of the previous, less accurate `Creating backend plugin...`.
+- 7652db4: Only bootstrap global-agent if it's actually being used
+- f0c0039: Fix issue with CLI that was preventing upgrading from 1.28
+- d228862: Update default backend plugin created by the cli to use non-deprecated error handling middleware
+- da90cce: Updated dependency `esbuild` to `^0.21.0`.
+- a60d73b: Fix a few minor issues with the backend template that were causing failing linting checks in the main repo.
+- 0510d98: Subpath export `package.json` should be of a unique name to avoid typescript resolution issues
 - Updated dependencies
+  - @backstage/integration@1.13.0-next.0
   - @backstage/catalog-model@1.5.0
   - @backstage/cli-common@0.1.14
   - @backstage/cli-node@0.2.6
@@ -13,7 +23,6 @@
   - @backstage/config-loader@1.8.1
   - @backstage/errors@1.2.4
   - @backstage/eslint-plugin@0.1.8
-  - @backstage/integration@1.12.0
   - @backstage/release-manifests@0.0.11
   - @backstage/types@1.1.1
 

package/dist/cjs/{Lockfile-BGMdDb8M.cjs.js → Lockfile-BndFvzHc.cjs.js}

@@ -39,22 +39,6 @@ class Lockfile {
     const lockfileContents = await fs__default.default.readFile(path, "utf8");
     return Lockfile.parse(lockfileContents);
   }
-  static #getRangesFromDataKey(key) {
-    const [, name, ranges] = key.match(ENTRY_PATTERN) ?? [];
-    if (!name) {
-      throw new Error(`Failed to parse yarn.lock entry '${key}'`);
-    }
-    return ranges.split(/\s*,\s*/).map((rangePart) => {
-      let range = rangePart;
-      if (range.startsWith(`${name}@`)) {
-        range = range.slice(`${name}@`.length);
-      }
-      if (range.startsWith("npm:")) {
-        range = range.slice("npm:".length);
-      }
-      return range;
-    });
-  }
   static parse(content) {
     const legacy = LEGACY_REGEX.test(content);
     let data;
@@ -65,9 +49,8 @@ class Lockfile {
     }
     const packages = /* @__PURE__ */ new Map();
     for (const [key, value] of Object.entries(data)) {
-      if (SPECIAL_OBJECT_KEYS.includes(key))
-        continue;
-      const [, name] = ENTRY_PATTERN.exec(key) ?? [];
+      if (SPECIAL_OBJECT_KEYS.includes(key)) continue;
+      const [, name, ranges] = ENTRY_PATTERN.exec(key) ?? [];
       if (!name) {
         throw new Error(`Failed to parse yarn.lock entry '${key}'`);
       }
@@ -76,8 +59,13 @@ class Lockfile {
         queries = [];
         packages.set(name, queries);
       }
-      const ranges = Lockfile.#getRangesFromDataKey(key);
-      for (const range of ranges) {
+      for (let range of ranges.split(/\s*,\s*/)) {
+        if (range.startsWith(`${name}@`)) {
+          range = range.slice(`${name}@`.length);
+        }
+        if (range.startsWith("npm:")) {
+          range = range.slice("npm:".length);
+        }
         queries.push({ range, version: value.version, dataKey: key });
       }
     }
@@ -178,52 +166,26 @@ class Lockfile {
     return result;
   }
   remove(name, range) {
-    const simpleQuery = `${name}@${range}`;
-    const query = this.getEntryOf(name, range);
+    const query = `${name}@${range}`;
     const existed = Boolean(this.data[query]);
-    if (simpleQuery === query) {
-      delete this.data[query];
-    } else {
-      const newRanges = Lockfile.#getRangesFromDataKey(query).filter(
-        (q) => q !== simpleQuery
-      );
-      const newQuery = newRanges.join(", ");
-      const entry = this.data[query];
-      delete this.data[query];
-      this.data[newQuery] = entry;
-      this.packages.get(name)?.forEach((q) => {
-        if (q.dataKey === query) {
-          q.dataKey = newQuery;
-        }
-      });
-    }
+    delete this.data[query];
     const newEntries = this.packages.get(name)?.filter((e) => e.range !== range);
     if (newEntries) {
       this.packages.set(name, newEntries);
     }
     return existed;
   }
-  getEntryOf(name, range) {
-    const query = this.packages.get(name)?.find((q) => q.range === range);
-    if (!query) {
-      throw new Error(`No entry data for ${name}@${range}`);
-    }
-    return query.dataKey;
-  }
   /** Modifies the lockfile by bumping packages to the suggested versions */
   replaceVersions(results) {
-    const oldVersions = Object.fromEntries(
-      Object.entries(this.data).map(([key, val]) => [key, val.version])
-    );
     for (const { name, range, oldVersion, newVersion } of results) {
-      const query = this.getEntryOf(name, range);
+      const query = `${name}@${range}`;
       const entryData = this.data[query];
       if (!entryData) {
         throw new Error(`No entry data for ${query}`);
       }
-      if (oldVersions[query] !== oldVersion) {
+      if (entryData.version !== oldVersion) {
         throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${oldVersions[query]}`
+          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`
         );
       }
       const matchingEntry = Object.entries(this.data).find(
@@ -256,4 +218,4 @@ class Lockfile {
 }
 
 exports.Lockfile = Lockfile;
-//# sourceMappingURL=Lockfile-BGMdDb8M.cjs.js.map
+//# sourceMappingURL=Lockfile-BndFvzHc.cjs.js.map

package/dist/cjs/{build-DWWRzYxi.cjs.js → build-V-FNxXXJ.cjs.js}

@@ -2,17 +2,17 @@
 
 var chalk = require('chalk');
 var path = require('path');
-var createDistWorkspace = require('./createDistWorkspace-CD3f8XIP.cjs.js');
-var index = require('./index-MVnx9WPY.cjs.js');
+var createDistWorkspace = require('./createDistWorkspace-C1dv0q8N.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 var cliNode = require('@backstage/cli-node');
 var parallel = require('./parallel-BszNaKyc.cjs.js');
-var buildBackend = require('./buildBackend-CljaLmsc.cjs.js');
+var buildBackend = require('./buildBackend-4joa0gPk.cjs.js');
 require('fs-extra');
 require('p-limit');
 require('os');
 require('tar');
 require('lodash/partition');
-require('./run-XzqgZL-h.cjs.js');
+require('./run-DEU-tdeD.cjs.js');
 require('child_process');
 require('util');
 require('@backstage/errors');
@@ -42,7 +42,7 @@ require('react-dev-utils/ModuleScopePlugin');
 require('run-script-webpack-plugin');
 require('@manypkg/get-packages');
 require('webpack-node-externals');
-require('./packageDetection-DWPQn_34.cjs.js');
+require('./packageDetection-Dw0n5BWr.cjs.js');
 require('lodash/pickBy');
 require('mini-css-extract-plugin');
 require('@pmmmwh/react-refresh-webpack-plugin');
@@ -59,7 +59,7 @@ require('@yarnpkg/parsers');
 require('@yarnpkg/lockfile');
 require('minimatch');
 require('./yarn-Ukl9MOS0.cjs.js');
-require('./config-D6Q8gklO.cjs.js');
+require('./config-jRNoAglQ.cjs.js');
 require('@backstage/config-loader');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -193,4 +193,4 @@ async function command(opts, cmd) {
 }
 
 exports.command = command;
-//# sourceMappingURL=build-DWWRzYxi.cjs.js.map
+//# sourceMappingURL=build-V-FNxXXJ.cjs.js.map

package/dist/cjs/{buildBackend-CljaLmsc.cjs.js → buildBackend-4joa0gPk.cjs.js}

@@ -9,12 +9,12 @@ require('html-webpack-plugin');
 require('@backstage/cli-common');
 require('react-dev-utils/ModuleScopePlugin');
 require('run-script-webpack-plugin');
-require('./index-MVnx9WPY.cjs.js');
+require('./index-C9Xk2sz-.cjs.js');
 require('@manypkg/get-packages');
 require('webpack-node-externals');
-var packageDetection = require('./packageDetection-DWPQn_34.cjs.js');
+var packageDetection = require('./packageDetection-Dw0n5BWr.cjs.js');
 require('lodash/pickBy');
-require('./run-XzqgZL-h.cjs.js');
+require('./run-DEU-tdeD.cjs.js');
 require('mini-css-extract-plugin');
 require('@pmmmwh/react-refresh-webpack-plugin');
 var yn = require('yn');
@@ -31,11 +31,11 @@ require('@yarnpkg/lockfile');
 require('minimatch');
 require('./yarn-Ukl9MOS0.cjs.js');
 require('lodash/partition');
-var config = require('./config-D6Q8gklO.cjs.js');
+var config = require('./config-jRNoAglQ.cjs.js');
 var parallel = require('./parallel-BszNaKyc.cjs.js');
 var os = require('os');
 var tar = require('tar');
-var createDistWorkspace = require('./createDistWorkspace-CD3f8XIP.cjs.js');
+var createDistWorkspace = require('./createDistWorkspace-C1dv0q8N.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -260,4 +260,4 @@ async function buildBackend(options) {
 
 exports.buildBackend = buildBackend;
 exports.buildFrontend = buildFrontend;
-//# sourceMappingURL=buildBackend-CljaLmsc.cjs.js.map
+//# sourceMappingURL=buildBackend-4joa0gPk.cjs.js.map

package/dist/cjs/{buildWorkspace-BqR8ivIS.cjs.js → buildWorkspace-tyiV0urR.cjs.js}

@@ -1,19 +1,19 @@
 'use strict';
 
 var fs = require('fs-extra');
-var createDistWorkspace = require('./createDistWorkspace-CD3f8XIP.cjs.js');
+var createDistWorkspace = require('./createDistWorkspace-C1dv0q8N.cjs.js');
 require('chalk');
 require('path');
 require('p-limit');
 require('os');
 require('tar');
 require('lodash/partition');
-require('./index-MVnx9WPY.cjs.js');
+require('./index-C9Xk2sz-.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
 require('@backstage/errors');
-require('./run-XzqgZL-h.cjs.js');
+require('./run-DEU-tdeD.cjs.js');
 require('child_process');
 require('util');
 require('rollup');
@@ -49,4 +49,4 @@ var buildWorkspace = async (dir, packages, options) => {
 };
 
 exports.default = buildWorkspace;
-//# sourceMappingURL=buildWorkspace-BqR8ivIS.cjs.js.map
+//# sourceMappingURL=buildWorkspace-tyiV0urR.cjs.js.map

package/dist/cjs/{bump-wQpHhuiM.cjs.js → bump-BU1Krx_C.cjs.js}

@@ -1,5 +1,6 @@
 'use strict';
 
+var globalAgent = require('global-agent');
 var fs = require('fs-extra');
 var chalk = require('chalk');
 var ora = require('ora');
@@ -7,15 +8,14 @@ var semver = require('semver');
 var minimatch = require('minimatch');
 var errors = require('@backstage/errors');
 var path = require('path');
-var run = require('./run-XzqgZL-h.cjs.js');
-var index = require('./index-MVnx9WPY.cjs.js');
-var Lockfile = require('./Lockfile-BGMdDb8M.cjs.js');
-var packages = require('./packages-CCMAC57o.cjs.js');
-var lint = require('./lint-Co6C92iJ.cjs.js');
+var run = require('./run-DEU-tdeD.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
+var Lockfile = require('./Lockfile-BndFvzHc.cjs.js');
+var packages = require('./packages-tPsZmPha.cjs.js');
+var lint = require('./lint-yZemqr3g.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 var parallel = require('./parallel-BszNaKyc.cjs.js');
 var releaseManifests = require('@backstage/release-manifests');
-require('global-agent/bootstrap');
 var cliNode = require('@backstage/cli-node');
 var replace = require('replace-in-file');
 
@@ -125,6 +125,16 @@ var migrate$1 = /*#__PURE__*/Object.freeze({
   migrateMovedPackages: migrateMovedPackages
 });
 
+if (shouldUseGlobalAgent()) {
+  globalAgent.bootstrap();
+}
+function shouldUseGlobalAgent() {
+  const namespace = process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE ?? "GLOBAL_AGENT_";
+  if (process.env[`${namespace}HTTP_PROXY`] || process.env[`${namespace}HTTPS_PROXY`]) {
+    return true;
+  }
+  return false;
+}
 const DEP_TYPES = [
   "dependencies",
   "devDependencies",
@@ -520,4 +530,4 @@ var bump$1 = /*#__PURE__*/Object.freeze({
 
 exports.bump = bump$1;
 exports.migrate = migrate$1;
-//# sourceMappingURL=bump-wQpHhuiM.cjs.js.map
+//# sourceMappingURL=bump-BU1Krx_C.cjs.js.map

package/dist/cjs/{clean-BnAegVOV.cjs.js → clean-D8xUrSOi.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -19,4 +19,4 @@ async function clean() {
 }
 
 exports.default = clean;
-//# sourceMappingURL=clean-BnAegVOV.cjs.js.map
+//# sourceMappingURL=clean-D8xUrSOi.cjs.js.map

package/dist/cjs/{clean-4SCXuQ2y.cjs.js → clean-cHXa4tew.cjs.js}

@@ -5,7 +5,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var util = require('util');
 var cliNode = require('@backstage/cli-node');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -45,4 +45,4 @@ async function command() {
 }
 
 exports.command = command;
-//# sourceMappingURL=clean-4SCXuQ2y.cjs.js.map
+//# sourceMappingURL=clean-cHXa4tew.cjs.js.map

package/dist/cjs/{codeowners-Df2h6sPx.cjs.js → codeowners-BQuyOTdk.cjs.js}

@@ -2,7 +2,7 @@
 
 var fs = require('fs-extra');
 var path = require('path');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -88,4 +88,4 @@ async function addCodeownersEntry(ownedPath, ownerStr, codeownersFilePath) {
 exports.addCodeownersEntry = addCodeownersEntry;
 exports.getCodeownersFilePath = getCodeownersFilePath;
 exports.parseOwnerIds = parseOwnerIds;
-//# sourceMappingURL=codeowners-Df2h6sPx.cjs.js.map
+//# sourceMappingURL=codeowners-BQuyOTdk.cjs.js.map

package/dist/cjs/{config-D6Q8gklO.cjs.js → config-jRNoAglQ.cjs.js}

@@ -2,7 +2,7 @@
 
 var configLoader = require('@backstage/config-loader');
 var config = require('@backstage/config');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 var getPackages = require('@manypkg/get-packages');
 var cliNode = require('@backstage/cli-node');
 
@@ -97,4 +97,4 @@ async function loadCliConfig(options) {
 
 exports.isValidUrl = isValidUrl;
 exports.loadCliConfig = loadCliConfig;
-//# sourceMappingURL=config-D6Q8gklO.cjs.js.map
+//# sourceMappingURL=config-jRNoAglQ.cjs.js.map

package/dist/cjs/{createDistWorkspace-CD3f8XIP.cjs.js → createDistWorkspace-C1dv0q8N.cjs.js}

@@ -7,8 +7,8 @@ var pLimit = require('p-limit');
 var os = require('os');
 var tar = require('tar');
 var partition = require('lodash/partition');
-var index = require('./index-MVnx9WPY.cjs.js');
-var run = require('./run-XzqgZL-h.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
+var run = require('./run-DEU-tdeD.cjs.js');
 var rollup = require('rollup');
 var commonjs = require('@rollup/plugin-commonjs');
 var resolve = require('@rollup/plugin-node-resolve');
@@ -560,4 +560,4 @@ exports.buildPackage = buildPackage;
 exports.buildPackages = buildPackages;
 exports.createDistWorkspace = createDistWorkspace;
 exports.getOutputsForRole = getOutputsForRole;
-//# sourceMappingURL=createDistWorkspace-CD3f8XIP.cjs.js.map
+//# sourceMappingURL=createDistWorkspace-C1dv0q8N.cjs.js.map

package/dist/cjs/{createPlugin-D5KD4JTo.cjs.js → createPlugin-DQNj-8FQ.cjs.js}

@@ -10,14 +10,14 @@ var camelCase = require('lodash/camelCase');
 var upperFirst = require('lodash/upperFirst');
 var os = require('os');
 var errors = require('@backstage/errors');
-var codeowners = require('./codeowners-Df2h6sPx.cjs.js');
-var index = require('./index-MVnx9WPY.cjs.js');
+var codeowners = require('./codeowners-BQuyOTdk.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 var tasks = require('./tasks-Dy-6nV0-.cjs.js');
-var Lockfile = require('./Lockfile-BGMdDb8M.cjs.js');
+var Lockfile = require('./Lockfile-BndFvzHc.cjs.js');
 require('minimatch');
 require('@manypkg/get-packages');
 require('./yarn-Ukl9MOS0.cjs.js');
-require('./run-XzqgZL-h.cjs.js');
+require('./run-DEU-tdeD.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
@@ -275,4 +275,4 @@ exports.addPluginExtensionToApp = addPluginExtensionToApp;
 exports.capitalize = capitalize;
 exports.default = createPlugin;
 exports.movePlugin = movePlugin;
-//# sourceMappingURL=createPlugin-D5KD4JTo.cjs.js.map
+//# sourceMappingURL=createPlugin-DQNj-8FQ.cjs.js.map

package/dist/cjs/{diff-Cq71OahK.cjs.js → diff-Bm3biHgs.cjs.js}

@@ -7,7 +7,7 @@ var path = require('path');
 var inquirer = require('inquirer');
 var handlebars = require('handlebars');
 var recursive = require('recursive-readdir');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
@@ -416,8 +416,7 @@ async function readPluginData() {
     if (`${scope}:registry` in pkg.publishConfig) {
       const registryURL = pkg.publishConfig[`${scope}:registry`];
       npmRegistry = `"${scope}:registry" : "${registryURL}"`;
-    } else
-      npmRegistry = "";
+    } else npmRegistry = "";
   } catch (error) {
     throw new Error(`Failed to read target package, ${error}`);
   }
@@ -434,4 +433,4 @@ async function readPluginData() {
 }
 
 exports.default = diff;
-//# sourceMappingURL=diff-Cq71OahK.cjs.js.map
+//# sourceMappingURL=diff-Bm3biHgs.cjs.js.map

package/dist/cjs/{docs-vvYwoPtO.cjs.js → docs-BixvoB95.cjs.js}

@@ -2,9 +2,9 @@
 
 var configLoader = require('@backstage/config-loader');
 var openBrowser = require('react-dev-utils/openBrowser');
-var config = require('./config-D6Q8gklO.cjs.js');
+var config = require('./config-jRNoAglQ.cjs.js');
 require('@backstage/config');
-require('./index-MVnx9WPY.cjs.js');
+require('./index-C9Xk2sz-.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -34,4 +34,4 @@ var docs = async (opts) => {
 };
 
 exports.default = docs;
-//# sourceMappingURL=docs-vvYwoPtO.cjs.js.map
+//# sourceMappingURL=docs-BixvoB95.cjs.js.map

package/dist/cjs/{fix-Bz8C52nE.cjs.js → fix-BJuJSgW_.cjs.js}

@@ -3,7 +3,7 @@
 var cliNode = require('@backstage/cli-node');
 var fs = require('fs-extra');
 var path = require('path');
-var index = require('./index-MVnx9WPY.cjs.js');
+var index = require('./index-C9Xk2sz-.cjs.js');
 var publishing = require('./publishing-DQtsKTbc.cjs.js');
 require('commander');
 require('chalk');
@@ -359,4 +359,4 @@ exports.fixSideEffects = fixSideEffects;
 exports.printPackageFixHint = printPackageFixHint;
 exports.readFixablePackages = readFixablePackages;
 exports.writeFixedPackages = writeFixedPackages;
-//# sourceMappingURL=fix-Bz8C52nE.cjs.js.map
+//# sourceMappingURL=fix-BJuJSgW_.cjs.js.map

package/dist/cjs/{index-ChLl32wO.cjs.js → index-BvHBcS_W.cjs.js}

@@ -4,7 +4,7 @@ var fs = require('fs-extra');
 var chalk = require('chalk');
 var yaml = require('yaml');
 var inquirer = require('inquirer');
-var index$1 = require('./index-MVnx9WPY.cjs.js');
+var index$1 = require('./index-C9Xk2sz-.cjs.js');
 var crypto = require('crypto');
 var openBrowser = require('react-dev-utils/openBrowser');
 var request = require('@octokit/request');
@@ -224,4 +224,4 @@ async function verifyGithubOrg(org) {
 }
 
 exports.default = index;
-//# sourceMappingURL=index-ChLl32wO.cjs.js.map
+//# sourceMappingURL=index-BvHBcS_W.cjs.js.map