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

package/dist/wiring/CommandGraph.cjs.js

@@ -1,38 +1,66 @@
 'use strict';
 
+var InternalCliModule = require('../cli-internal/src/InternalCliModule.cjs.js');
+var InternalCommandNode = require('../cli-internal/src/InternalCommandNode.cjs.js');
+require('node:fs');
+require('node:os');
+require('node:path');
+require('../cli-internal/src/knownPluginPackages.cjs.js');
+
 class CommandGraph {
   graph = [];
   /**
    * Adds a command to the graph. The graph is sparse, so we use the path to determine the nodes
    *    to traverse. Only leaf nodes should have a command/action.
    */
-  add(command) {
+  add(command, module) {
     const path = command.path;
     let current = this.graph;
     for (let i = 0; i < path.length - 1; i++) {
       const name = path[i];
-      let next = current.find((n) => n.name === name);
+      let next = current.find(
+        (n) => InternalCommandNode.OpaqueCommandTreeNode.isType(n) && InternalCommandNode.OpaqueCommandTreeNode.toInternal(n).name === name || InternalCommandNode.OpaqueCommandLeafNode.isType(n) && InternalCommandNode.OpaqueCommandLeafNode.toInternal(n).name === name
+      );
       if (!next) {
-        next = { $$type: "@tree/root", name, children: [] };
+        next = InternalCommandNode.OpaqueCommandTreeNode.createInstance("v1", {
+          name,
+          children: []
+        });
         current.push(next);
-      } else if (next.$$type === "@tree/leaf") {
+      } else if (InternalCommandNode.OpaqueCommandLeafNode.isType(next)) {
         throw new Error(
-          `Command already exists at path: "${path.slice(0, i).join(" ")}"`
+          formatConflictError(
+            path,
+            module,
+            InternalCommandNode.OpaqueCommandLeafNode.toInternal(next).module
+          )
         );
       }
-      current = next.children;
+      current = InternalCommandNode.OpaqueCommandTreeNode.toInternal(next).children;
     }
-    const last = current.find((n) => n.name === path[path.length - 1]);
-    if (last && last.$$type === "@tree/leaf") {
+    const lastName = path[path.length - 1];
+    const last = current.find((n) => {
+      if (InternalCommandNode.OpaqueCommandTreeNode.isType(n)) {
+        return InternalCommandNode.OpaqueCommandTreeNode.toInternal(n).name === lastName;
+      }
+      return InternalCommandNode.OpaqueCommandLeafNode.toInternal(n).name === lastName;
+    });
+    if (last && InternalCommandNode.OpaqueCommandLeafNode.isType(last)) {
       throw new Error(
-        `Command already exists at path: "${path.slice(0, -1).join(" ")}"`
+        formatConflictError(
+          path,
+          module,
+          InternalCommandNode.OpaqueCommandLeafNode.toInternal(last).module
+        )
       );
     } else {
-      current.push({
-        $$type: "@tree/leaf",
-        name: path[path.length - 1],
-        command
-      });
+      current.push(
+        InternalCommandNode.OpaqueCommandLeafNode.createInstance("v1", {
+          name: lastName,
+          command,
+          module
+        })
+      );
     }
   }
   /**
@@ -42,30 +70,60 @@ class CommandGraph {
     let current = this.graph;
     for (let i = 0; i < path.length - 1; i++) {
       const name = path[i];
-      const next = current.find((n) => n.name === name);
-      if (!next) {
-        return void 0;
-      } else if (next.$$type === "@tree/leaf") {
+      const next = current.find((n) => {
+        if (InternalCommandNode.OpaqueCommandTreeNode.isType(n)) {
+          return InternalCommandNode.OpaqueCommandTreeNode.toInternal(n).name === name;
+        }
+        return InternalCommandNode.OpaqueCommandLeafNode.toInternal(n).name === name;
+      });
+      if (!next || InternalCommandNode.OpaqueCommandLeafNode.isType(next)) {
         return void 0;
       }
-      current = next.children;
+      current = InternalCommandNode.OpaqueCommandTreeNode.toInternal(next).children;
     }
-    const last = current.find((n) => n.name === path[path.length - 1]);
-    if (!last || last.$$type === "@tree/root") {
+    const lastName = path[path.length - 1];
+    const last = current.find((n) => {
+      if (InternalCommandNode.OpaqueCommandTreeNode.isType(n)) {
+        return InternalCommandNode.OpaqueCommandTreeNode.toInternal(n).name === lastName;
+      }
+      return InternalCommandNode.OpaqueCommandLeafNode.toInternal(n).name === lastName;
+    });
+    if (!last || InternalCommandNode.OpaqueCommandTreeNode.isType(last)) {
       return void 0;
     }
-    return last?.command;
+    return InternalCommandNode.OpaqueCommandLeafNode.toInternal(last).command;
   }
   atDepth(depth) {
     let current = this.graph;
     for (let i = 0; i < depth; i++) {
       current = current.flatMap(
-        (n) => n.$$type === "@tree/root" ? n.children : []
+        (n) => InternalCommandNode.OpaqueCommandTreeNode.isType(n) ? InternalCommandNode.OpaqueCommandTreeNode.toInternal(n).children : []
       );
     }
     return current;
   }
 }
+function getModuleName(module) {
+  if (module && InternalCliModule.OpaqueCliModule.isType(module)) {
+    return InternalCliModule.OpaqueCliModule.toInternal(module).packageName;
+  }
+  return void 0;
+}
+function formatConflictError(path, newModule, existingModule) {
+  const cmd = path.join(" ");
+  const newPkg = getModuleName(newModule);
+  const existingPkg = getModuleName(existingModule);
+  if (newPkg && existingPkg) {
+    return `Command "${cmd}" from "${newPkg}" conflicts with an existing command from "${existingPkg}"`;
+  }
+  if (newPkg) {
+    return `Command "${cmd}" from "${newPkg}" conflicts with an existing command`;
+  }
+  if (existingPkg) {
+    return `Command "${cmd}" conflicts with an existing command from "${existingPkg}"`;
+  }
+  return `Command "${cmd}" conflicts with an existing command`;
+}
 
 exports.CommandGraph = CommandGraph;
 //# sourceMappingURL=CommandGraph.cjs.js.map

package/dist/wiring/discoverCliModules.cjs.js

@@ -0,0 +1,44 @@
+'use strict';
+
+var cliCommon = require('@backstage/cli-common');
+var cliNode = require('@backstage/cli-node');
+var fs = require('node:fs');
+var path = require('node:path');
+var node_url = require('node:url');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+
+function discoverCliModules() {
+  const rootDir = cliCommon.targetPaths.rootDir;
+  const pkgJsonPath = path.resolve(rootDir, "package.json");
+  let projectPkg;
+  try {
+    projectPkg = JSON.parse(fs__default.default.readFileSync(pkgJsonPath, "utf8"));
+  } catch {
+    return [];
+  }
+  const allDeps = {
+    ...projectPkg.dependencies,
+    ...projectPkg.devDependencies
+  };
+  const modules = [];
+  for (const depName of Object.keys(allDeps)) {
+    try {
+      const depPkgPath = require.resolve(`${depName}/package.json`, {
+        paths: [rootDir]
+      });
+      const depPkg = JSON.parse(fs__default.default.readFileSync(depPkgPath, "utf8"));
+      if (cliNode.PackageRoles.getRoleFromPackage(depPkg) === "cli-module") {
+        const resolvedPath = require.resolve(depName, { paths: [rootDir] });
+        modules.push(node_url.pathToFileURL(resolvedPath).href);
+      }
+    } catch {
+    }
+  }
+  return modules;
+}
+
+exports.discoverCliModules = discoverCliModules;
+//# sourceMappingURL=discoverCliModules.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.36.0-next.2",
+  "version": "0.36.1-next.0",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -41,56 +41,28 @@
     "ext": "ts",
     "watch": "./src"
   },
-  "jest": {
-    "coveragePathIgnorePatterns": [
-      "/__fixtures__/"
-    ]
-  },
   "dependencies": {
-    "@backstage/catalog-model": "1.7.6",
-    "@backstage/cli-common": "0.2.0-next.2",
-    "@backstage/cli-node": "0.2.19-next.1",
-    "@backstage/config": "1.3.6",
-    "@backstage/config-loader": "1.10.9-next.0",
+    "@backstage/cli-common": "0.2.1-next.0",
+    "@backstage/cli-defaults": "0.1.1-next.0",
+    "@backstage/cli-module-build": "0.1.1-next.0",
+    "@backstage/cli-module-test-jest": "0.1.1-next.0",
+    "@backstage/cli-node": "0.3.1-next.0",
     "@backstage/errors": "1.2.7",
-    "@backstage/eslint-plugin": "0.2.2-next.0",
-    "@backstage/integration": "2.0.0-next.2",
-    "@backstage/module-federation-common": "0.1.2-next.0",
-    "@backstage/release-manifests": "0.0.13",
-    "@backstage/types": "1.2.2",
+    "@backstage/eslint-plugin": "0.2.2",
     "@manypkg/get-packages": "^1.1.3",
-    "@module-federation/enhanced": "^0.21.6",
-    "@octokit/request": "^8.0.0",
-    "@rollup/plugin-commonjs": "^26.0.0",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.0",
-    "@rollup/plugin-yaml": "^4.0.0",
-    "@rspack/core": "^1.4.11",
-    "@rspack/dev-server": "^1.1.4",
-    "@rspack/plugin-react-refresh": "^1.4.3",
     "@spotify/eslint-config-base": "^15.0.0",
     "@spotify/eslint-config-react": "^15.0.0",
     "@spotify/eslint-config-typescript": "^15.0.0",
     "@swc/core": "^1.15.6",
-    "@swc/helpers": "^0.5.17",
     "@swc/jest": "^0.2.39",
     "@types/webpack-env": "^1.15.2",
     "@typescript-eslint/eslint-plugin": "^8.17.0",
     "@typescript-eslint/parser": "^8.16.0",
-    "bfj": "^9.0.2",
-    "buffer": "^6.0.3",
     "chalk": "^4.0.0",
-    "chokidar": "^3.3.1",
-    "cleye": "^2.3.0",
     "commander": "^14.0.3",
     "cross-fetch": "^4.0.0",
-    "cross-spawn": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "ctrlc-windows": "^2.1.0",
-    "esbuild": "^0.27.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-formatter-friendly": "^7.0.0",
     "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.9.0",
@@ -98,159 +70,54 @@
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-rspack-plugin": "^4.2.1",
-    "express": "^4.22.0",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^15.0.0",
     "glob": "^7.1.7",
-    "global-agent": "^3.0.0",
-    "globby": "^11.1.0",
-    "handlebars": "^4.7.3",
-    "html-webpack-plugin": "^5.6.3",
-    "inquirer": "^8.2.0",
     "jest-css-modules": "^2.1.0",
-    "json-schema": "^0.4.0",
-    "lodash": "^4.17.21",
-    "minimatch": "^10.2.1",
-    "node-stdlib-browser": "^1.3.1",
-    "npm-packlist": "^5.0.0",
-    "ora": "^5.3.0",
-    "p-queue": "^6.6.2",
     "pirates": "^4.0.6",
     "postcss": "^8.1.0",
-    "postcss-import": "^16.1.0",
-    "process": "^0.11.10",
-    "proper-lockfile": "^4.1.2",
-    "raw-loader": "^4.0.2",
-    "react-dev-utils": "^12.0.0-next.60",
-    "react-refresh": "^0.18.0",
-    "recursive-readdir": "^2.2.2",
-    "replace-in-file": "^7.1.0",
-    "rollup": "^4.27.3",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-esbuild": "^6.1.1",
-    "rollup-plugin-postcss": "^4.0.0",
-    "rollup-pluginutils": "^2.8.2",
-    "semver": "^7.5.3",
-    "shell-quote": "^1.8.1",
-    "style-loader": "^3.3.1",
     "sucrase": "^3.20.2",
-    "swc-loader": "^0.2.3",
-    "tar": "^7.5.6",
-    "ts-checker-rspack-plugin": "^1.1.5",
-    "ts-morph": "^24.0.0",
-    "undici": "^7.2.3",
-    "util": "^0.12.3",
-    "yaml": "^2.0.0",
-    "yargs": "^16.2.0",
-    "yml-loader": "^2.1.0",
-    "yn": "^4.0.0",
-    "zod": "^3.25.76",
-    "zod-validation-error": "^4.0.2"
+    "yaml": "^2.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-plugin-api": "1.8.0-next.1",
-    "@backstage/backend-test-utils": "1.11.1-next.2",
-    "@backstage/catalog-client": "1.14.0-next.2",
+    "@backstage/backend-plugin-api": "1.8.1-next.0",
+    "@backstage/backend-test-utils": "1.11.2-next.0",
+    "@backstage/catalog-client": "1.14.0",
     "@backstage/config": "1.3.6",
-    "@backstage/core-app-api": "1.19.6-next.1",
-    "@backstage/core-components": "0.18.8-next.1",
-    "@backstage/core-plugin-api": "1.12.4-next.1",
-    "@backstage/dev-utils": "1.1.21-next.1",
+    "@backstage/core-app-api": "1.19.7-next.0",
+    "@backstage/core-components": "0.18.9-next.0",
+    "@backstage/core-plugin-api": "1.12.5-next.0",
+    "@backstage/dev-utils": "1.1.22-next.0",
     "@backstage/errors": "1.2.7",
-    "@backstage/plugin-auth-backend": "0.27.1-next.2",
-    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.17-next.1",
-    "@backstage/plugin-catalog-node": "2.1.0-next.2",
-    "@backstage/plugin-scaffolder-node": "0.13.0-next.2",
-    "@backstage/plugin-scaffolder-node-test-utils": "0.3.9-next.2",
-    "@backstage/test-utils": "1.7.16-next.0",
+    "@backstage/plugin-auth-backend": "0.28.0-next.0",
+    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.18-next.0",
+    "@backstage/plugin-catalog-node": "2.1.1-next.0",
+    "@backstage/plugin-scaffolder-node": "0.13.1-next.0",
+    "@backstage/plugin-scaffolder-node-test-utils": "0.3.10-next.0",
+    "@backstage/test-utils": "1.7.17-next.0",
     "@backstage/theme": "0.7.2",
     "@jest/environment-jsdom-abstract": "^30.0.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.6.0",
-    "@types/cross-spawn": "^6.0.2",
-    "@types/ejs": "^3.1.3",
-    "@types/express": "^4.17.6",
     "@types/fs-extra": "^11.0.0",
-    "@types/http-proxy": "^1.17.4",
-    "@types/inquirer": "^8.1.3",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.13.14",
-    "@types/npm-packlist": "^3.0.0",
-    "@types/proper-lockfile": "^4",
-    "@types/recursive-readdir": "^2.2.0",
-    "@types/rollup-plugin-peer-deps-external": "^2.2.0",
-    "@types/rollup-plugin-postcss": "^3.1.4",
-    "@types/shell-quote": "^1.7.5",
-    "@types/svgo": "^2.6.2",
-    "@types/terser-webpack-plugin": "^5.0.4",
-    "@types/webpack-sources": "^3.2.3",
-    "del": "^8.0.0",
-    "esbuild-loader": "^4.0.0",
-    "eslint-webpack-plugin": "^4.2.0",
-    "fork-ts-checker-webpack-plugin": "^9.0.0",
     "jest": "^30.2.0",
     "jsdom": "^27.1.0",
-    "mini-css-extract-plugin": "^2.4.2",
-    "msw": "^1.0.0",
-    "nodemon": "^3.0.1",
-    "terser-webpack-plugin": "^5.1.3",
-    "webpack": "~5.105.0",
-    "webpack-dev-server": "^5.0.0"
-  },
-  "optionalDependencies": {
-    "keytar": "^7.9.0"
+    "nodemon": "^3.0.1"
   },
   "peerDependencies": {
     "@jest/environment-jsdom-abstract": "^30.0.0",
-    "@module-federation/enhanced": "^0.21.6",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.6.0",
-    "esbuild-loader": "^4.0.0",
-    "eslint-webpack-plugin": "^4.2.0",
-    "fork-ts-checker-webpack-plugin": "^9.0.0",
     "jest": "^29.0.0 || ^30.0.0",
     "jest-environment-jsdom": "*",
-    "jsdom": "^27.1.0",
-    "mini-css-extract-plugin": "^2.4.2",
-    "terser-webpack-plugin": "^5.1.3",
-    "webpack": "~5.105.0",
-    "webpack-dev-server": "^5.0.0"
+    "jsdom": "^27.1.0"
   },
   "peerDependenciesMeta": {
     "@jest/environment-jsdom-abstract": {
       "optional": true
     },
-    "@module-federation/enhanced": {
-      "optional": true
-    },
-    "@pmmmwh/react-refresh-webpack-plugin": {
-      "optional": true
-    },
-    "esbuild-loader": {
-      "optional": true
-    },
-    "eslint-webpack-plugin": {
-      "optional": true
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "optional": true
-    },
     "jest-environment-jsdom": {
       "optional": true
     },
     "jsdom": {
       "optional": true
-    },
-    "mini-css-extract-plugin": {
-      "optional": true
-    },
-    "terser-webpack-plugin": {
-      "optional": true
-    },
-    "webpack": {
-      "optional": true
-    },
-    "webpack-dev-server": {
-      "optional": true
     }
   },
   "configSchema": {

package/dist/modules/auth/commands/list.cjs.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var cleye = require('cleye');
-var storage = require('../lib/storage.cjs.js');
-
-var list = async ({ args, info }) => {
-  cleye.cli({ help: info }, void 0, args);
-  const { instances, selected } = await storage.getAllInstances();
-  if (!instances.length) {
-    process.stderr.write("No instances found\n");
-    return;
-  }
-  for (const inst of instances) {
-    const mark = inst.name === selected?.name ? "* " : "  ";
-    process.stdout.write(`${mark}${inst.name} - ${inst.baseUrl}
-`);
-  }
-};
-
-exports.default = list;
-//# sourceMappingURL=list.cjs.js.map