@backstage/cli 0.10.0 → 0.10.4

package/dist/cjs/{index-05328067.cjs.js → index-d1f94b33.cjs.js}

@@ -4,8 +4,8 @@ var fs = require('fs-extra');
 var path = require('path');
 var os = require('os');
 var tar = require('tar');
-var index = require('./index-8a512334.cjs.js');
-var run = require('./run-bacdaaf1.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
+var run = require('./run-8b1e277a.cjs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -18,7 +18,7 @@ const UNSAFE_PACKAGES = [
 ];
 async function createDistWorkspace(packageNames, options = {}) {
   var _a, _b, _c;
-  const targetDir = (_a = options.targetDir) != null ? _a : await fs__default['default'].mkdtemp(path.resolve(os.tmpdir(), "dist-workspace"));
+  const targetDir = (_a = options.targetDir) != null ? _a : await fs__default["default"].mkdtemp(path.resolve(os.tmpdir(), "dist-workspace"));
   const targets = await findTargetPackages(packageNames);
   if (options.buildDependencies) {
     const exclude = (_b = options.buildExcludes) != null ? _b : [];
@@ -36,14 +36,14 @@ async function createDistWorkspace(packageNames, options = {}) {
   for (const file of files) {
     const src = typeof file === "string" ? file : file.src;
     const dest = typeof file === "string" ? file : file.dest;
-    await fs__default['default'].copy(index.paths.resolveTargetRoot(src), path.resolve(targetDir, dest));
+    await fs__default["default"].copy(index.paths.resolveTargetRoot(src), path.resolve(targetDir, dest));
   }
   if (options.skeleton) {
     const skeletonFiles = targets.map((target) => {
       const dir = path.relative(index.paths.targetRoot, target.location);
       return path.join(dir, "package.json");
     });
-    await tar__default['default'].create({
+    await tar__default["default"].create({
       file: path.resolve(targetDir, options.skeleton),
       cwd: targetDir,
       portable: true,
@@ -61,24 +61,24 @@ async function moveToDistWorkspace(workspaceDir, localPackages) {
       cwd: target.location
     });
     if (target.scripts.postpack) {
-      await run.run("yarn", ["postpack"], {cwd: target.location});
+      await run.run("yarn", ["postpack"], { cwd: target.location });
     }
     const outputDir = path.relative(index.paths.targetRoot, target.location);
     const absoluteOutputPath = path.resolve(workspaceDir, outputDir);
-    await fs__default['default'].ensureDir(absoluteOutputPath);
-    await tar__default['default'].extract({
+    await fs__default["default"].ensureDir(absoluteOutputPath);
+    await tar__default["default"].extract({
       file: archivePath,
       cwd: absoluteOutputPath,
       strip: 1
     });
-    await fs__default['default'].remove(archivePath);
+    await fs__default["default"].remove(archivePath);
     if (target.get("bundled")) {
-      const pkgJson = await fs__default['default'].readJson(path.resolve(absoluteOutputPath, "package.json"));
+      const pkgJson = await fs__default["default"].readJson(path.resolve(absoluteOutputPath, "package.json"));
       delete pkgJson.dependencies;
       delete pkgJson.devDependencies;
       delete pkgJson.peerDependencies;
       delete pkgJson.optionalDependencies;
-      await fs__default['default'].writeJson(path.resolve(absoluteOutputPath, "package.json"), pkgJson, {
+      await fs__default["default"].writeJson(path.resolve(absoluteOutputPath, "package.json"), pkgJson, {
         spaces: 2
       });
     }
@@ -92,12 +92,12 @@ async function moveToDistWorkspace(workspaceDir, localPackages) {
 }
 async function findTargetPackages(pkgNames) {
   var _a;
-  const {Project} = require("@lerna/project");
-  const {PackageGraph} = require("@lerna/package-graph");
+  const { Project } = require("@lerna/project");
+  const { PackageGraph } = require("@lerna/package-graph");
   const project = new Project(index.paths.targetDir);
   const packages = await project.getPackages();
   const graph = new PackageGraph(packages);
-  const targets = new Map();
+  const targets = /* @__PURE__ */ new Map();
   const searchNames = pkgNames.slice();
   while (searchNames.length) {
     const name = searchNames.pop();
@@ -120,4 +120,4 @@ async function findTargetPackages(pkgNames) {
 }
 
 exports.createDistWorkspace = createDistWorkspace;
-//# sourceMappingURL=index-05328067.cjs.js.map
+//# sourceMappingURL=index-d1f94b33.cjs.js.map

package/dist/cjs/{index-c8a3517a.cjs.js → index-f5dcae68.cjs.js}

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var chalk = require('chalk');
 var yaml = require('yaml');
-var index$1 = require('./index-8a512334.cjs.js');
+var index$1 = require('./index-60792ea9.cjs.js');
 var crypto = require('crypto');
 var openBrowser = require('react-dev-utils/openBrowser');
 var request = require('@octokit/request');
@@ -42,7 +42,7 @@ const FORM_PAGE = `
     </form>
     <script>
       document.getElementById("form").submit()
-    </script>
+    <\/script>
   </body>
 </html>
 `;
@@ -69,21 +69,21 @@ class GithubCreateAppServer {
       res.setHeader("content-type", "text/html");
       res.send(body);
     };
-    const webhookId = crypto__default['default'].randomBytes(15).toString("base64").replace(/[\+\/]/g, "");
+    const webhookId = crypto__default["default"].randomBytes(15).toString("base64").replace(/[\+\/]/g, "");
     this.webhookUrl = `https://smee.io/${webhookId}`;
   }
-  static async run({org}) {
+  static async run({ org }) {
     const encodedOrg = encodeURIComponent(org);
     const actionUrl = `https://github.com/organizations/${encodedOrg}/settings/apps/new`;
     const server = new GithubCreateAppServer(actionUrl);
     return server.start();
   }
   async start() {
-    const app = express__default['default']();
+    const app = express__default["default"]();
     app.get("/", this.formHandler);
     const callPromise = new Promise((resolve, reject) => {
       app.get("/callback", (req, res) => {
-        request.request(`POST /app-manifests/${encodeURIComponent(req.query.code)}/conversions`).then(({data}) => {
+        request.request(`POST /app-manifests/${encodeURIComponent(req.query.code)}/conversions`).then(({ data }) => {
           resolve({
             name: data.name,
             slug: data.slug,
@@ -99,7 +99,7 @@ class GithubCreateAppServer {
       });
     });
     this.baseUrl = await this.listen(app);
-    openBrowser__default['default'](this.baseUrl);
+    openBrowser__default["default"](this.baseUrl);
     return callPromise;
   }
   async listen(app) {
@@ -110,7 +110,7 @@ class GithubCreateAppServer {
           reject(new Error(`Unexpected listener info '${info}'`));
           return;
         }
-        const {port} = info;
+        const { port } = info;
         resolve(`http://localhost:${port}`);
       });
     });
@@ -118,14 +118,14 @@ class GithubCreateAppServer {
 }
 
 var index = async (org) => {
-  const {slug, name, ...config} = await GithubCreateAppServer.run({org});
+  const { slug, name, ...config } = await GithubCreateAppServer.run({ org });
   const fileName = `github-app-${slug}-credentials.yaml`;
   const content = `# Name: ${name}
 ${yaml.stringify(config)}`;
-  await fs__default['default'].writeFile(index$1.paths.resolveTargetRoot(fileName), content);
-  console.log(`GitHub App configuration written to ${chalk__default['default'].cyan(fileName)}`);
-  console.log(chalk__default['default'].yellow("This file contains sensitive credentials, it should not be committed to version control and handled with care!"));
+  await fs__default["default"].writeFile(index$1.paths.resolveTargetRoot(fileName), content);
+  console.log(`GitHub App configuration written to ${chalk__default["default"].cyan(fileName)}`);
+  console.log(chalk__default["default"].yellow("This file contains sensitive credentials, it should not be committed to version control and handled with care!"));
 };
 
-exports.default = index;
-//# sourceMappingURL=index-c8a3517a.cjs.js.map
+exports["default"] = index;
+//# sourceMappingURL=index-f5dcae68.cjs.js.map

package/dist/cjs/{info-a069f3b4.cjs.js → info-f260605b.cjs.js}

@@ -1,9 +1,9 @@
 'use strict';
 
-var index = require('./index-8a512334.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
 var os = require('os');
-var run = require('./run-bacdaaf1.cjs.js');
-var Lockfile = require('./Lockfile-80f0eec4.cjs.js');
+var run = require('./run-8b1e277a.cjs.js');
+var Lockfile = require('./Lockfile-35661afa.cjs.js');
 require('chalk');
 require('commander');
 require('fs-extra');
@@ -23,7 +23,7 @@ var info = async () => {
   await new Promise(async () => {
     const yarnVersion = await run.runPlain("yarn --version");
     const isLocal = require("fs").existsSync(index.paths.resolveOwn("./src"));
-    console.log(`OS:   ${os__default['default'].type} ${os__default['default'].release} - ${os__default['default'].platform}/${os__default['default'].arch}`);
+    console.log(`OS:   ${os__default["default"].type} ${os__default["default"].release} - ${os__default["default"].platform}/${os__default["default"].arch}`);
     console.log(`node: ${process.version}`);
     console.log(`yarn: ${yarnVersion}`);
     console.log(`cli:  ${index.version$1} (${isLocal ? "local" : "installed"})`);
@@ -40,5 +40,5 @@ var info = async () => {
   });
 };
 
-exports.default = info;
-//# sourceMappingURL=info-a069f3b4.cjs.js.map
+exports["default"] = info;
+//# sourceMappingURL=info-f260605b.cjs.js.map

package/dist/cjs/{install-43a8076b.cjs.js → install-db22d18d.cjs.js}

@@ -3,12 +3,12 @@
 var fs = require('fs-extra');
 require('semver');
 require('@yarnpkg/lockfile');
-var packages = require('./packages-562fcd14.cjs.js');
-var index = require('./index-8a512334.cjs.js');
+var packages = require('./packages-587c99dd.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
 var chalk = require('chalk');
 var sortBy = require('lodash/sortBy');
 var groupBy = require('lodash/groupBy');
-var run = require('./run-bacdaaf1.cjs.js');
+var run = require('./run-8b1e277a.cjs.js');
 require('commander');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
@@ -33,9 +33,9 @@ class AppRouteStep {
   }
   async run() {
     var _a;
-    const {path, element, packageName} = this.data;
+    const { path, element, packageName } = this.data;
     const appTsxPath = index.paths.resolveTargetRoot("packages/app/src/App.tsx");
-    const contents = await fs__default['default'].readFile(appTsxPath, "utf-8");
+    const contents = await fs__default["default"].readFile(appTsxPath, "utf-8");
     let failed = false;
     const contentsWithRoute = contents.replace(/(\s*)<\/FlatRoutes>/, `$1  <Route path="${path}" element={${element}} />$1</FlatRoutes>`);
     if (contentsWithRoute === contents) {
@@ -56,21 +56,21 @@ import `);
       console.log(`1. import { ${componentName} } from '${packageName}';`);
       console.log(`2. <Route path="${path}" element={${element}} />`);
     } else {
-      await fs__default['default'].writeFile(appTsxPath, contentsWithImport);
+      await fs__default["default"].writeFile(appTsxPath, contentsWithImport);
     }
   }
 }
 const appRoute = createStepDefinition({
   type: "app-route",
   deserialize(obj, pkg) {
-    const {path, element} = obj;
+    const { path, element } = obj;
     if (!path || typeof path !== "string") {
       throw new Error("Invalid install step, 'path' must be a string");
     }
     if (!element || typeof element !== "string") {
       throw new Error("Invalid install step, 'element' must be a string");
     }
-    return new AppRouteStep({path, element, packageName: pkg.name});
+    return new AppRouteStep({ path, element, packageName: pkg.name });
   },
   create(data) {
     return new AppRouteStep(data);
@@ -82,23 +82,23 @@ class DependenciesStep {
     this.data = data;
   }
   async run() {
-    const {dependencies: dependencies2} = this.data;
-    const byTarget = groupBy__default['default'](dependencies2, "target");
+    const { dependencies: dependencies2 } = this.data;
+    const byTarget = groupBy__default["default"](dependencies2, "target");
     for (const [target, deps] of Object.entries(byTarget)) {
       const pkgPath = index.paths.resolveTargetRoot(target, "package.json");
-      const pkgJson = await fs__default['default'].readJson(pkgPath);
-      const depTypes = new Set();
+      const pkgJson = await fs__default["default"].readJson(pkgPath);
+      const depTypes = /* @__PURE__ */ new Set();
       for (const dep of deps) {
         depTypes.add(dep.type);
         pkgJson[dep.type][dep.name] = dep.query;
       }
       for (const depType of depTypes) {
-        pkgJson[depType] = Object.fromEntries(sortBy__default['default'](Object.entries(pkgJson[depType]), ([key]) => key));
+        pkgJson[depType] = Object.fromEntries(sortBy__default["default"](Object.entries(pkgJson[depType]), ([key]) => key));
       }
-      await fs__default['default'].writeJson(pkgPath, pkgJson, {spaces: 2});
+      await fs__default["default"].writeJson(pkgPath, pkgJson, { spaces: 2 });
     }
     console.log();
-    console.log(`Running ${chalk__default['default'].blue("yarn install")} to install new versions`);
+    console.log(`Running ${chalk__default["default"].blue("yarn install")} to install new versions`);
     console.log();
     await run.run("yarn", ["install"]);
   }
@@ -124,11 +124,11 @@ class MessageStep {
 const message = createStepDefinition({
   type: "message",
   deserialize(obj) {
-    const {message: msg} = obj;
+    const { message: msg } = obj;
     if (!msg || typeof msg !== "string" && !Array.isArray(msg)) {
       throw new Error("Invalid install step, 'message' must be a string or array");
     }
-    return new MessageStep({message: [msg].flat().join("")});
+    return new MessageStep({ message: [msg].flat().join("") });
   },
   create(data) {
     return new MessageStep(data);
@@ -161,7 +161,7 @@ class PluginInstaller {
   constructor(steps) {
     this.steps = steps;
   }
-  static async resolveSteps(pkg) {
+  static async resolveSteps(pkg, versionToInstall) {
     var _a, _b;
     const steps = [];
     const dependencies$1 = [];
@@ -169,14 +169,14 @@ class PluginInstaller {
       target: "packages/app",
       type: "dependencies",
       name: pkg.name,
-      query: `^${pkg.version}`
+      query: versionToInstall || `^${pkg.version}`
     });
     steps.push({
       type: "dependencies",
-      step: dependencies.create({dependencies: dependencies$1})
+      step: dependencies.create({ dependencies: dependencies$1 })
     });
     for (const step of (_b = (_a = pkg.experimentalInstallationRecipe) == null ? void 0 : _a.steps) != null ? _b : []) {
-      const {type} = step;
+      const { type } = step;
       const definition = stepDefinitions.find((d) => d.type === type);
       if (definition) {
         steps.push({
@@ -190,25 +190,52 @@ class PluginInstaller {
     return steps;
   }
   async run() {
-    for (const {type, step} of this.steps) {
+    for (const { type, step } of this.steps) {
       console.log(`Running step ${type}`);
       await step.run();
     }
   }
 }
+async function installPluginAndPeerPlugins(pkg) {
+  const pluginDeps = /* @__PURE__ */ new Map();
+  pluginDeps.set(pkg.name, { pkg });
+  await loadPeerPluginDeps(pkg, pluginDeps);
+  console.log(`Installing ${pkg.name} AND any peer plugin dependencies.`);
+  for (const [_pluginDepName, pluginDep] of pluginDeps.entries()) {
+    const { pkg: pluginDepPkg, versionToInstall } = pluginDep;
+    console.log(`Installing plugin: ${pluginDepPkg.name}: ${versionToInstall || pluginDepPkg.version}`);
+    const steps = await PluginInstaller.resolveSteps(pluginDepPkg, versionToInstall);
+    const installer = new PluginInstaller(steps);
+    await installer.run();
+  }
+}
+async function loadPackageJson(plugin) {
+  if (plugin.endsWith("package.json")) {
+    return await fs__default["default"].readJson(plugin);
+  }
+  return await fetchPluginPackage(plugin);
+}
+async function loadPeerPluginDeps(pkg, pluginMap) {
+  var _a, _b;
+  for (const [pluginId, pluginVersion] of Object.entries((_b = (_a = pkg.experimentalInstallationRecipe) == null ? void 0 : _a.peerPluginDependencies) != null ? _b : {})) {
+    const depPkg = await loadPackageJson(pluginId);
+    if (!pluginMap.get(depPkg.name)) {
+      pluginMap.set(depPkg.name, {
+        pkg: depPkg,
+        versionToInstall: pluginVersion
+      });
+      await loadPeerPluginDeps(depPkg, pluginMap);
+    }
+  }
+}
 var install = async (pluginId, cmd) => {
-  let pkg;
-  if (pluginId) {
-    pkg = await fetchPluginPackage(pluginId);
-  } else if (cmd == null ? void 0 : cmd.from) {
-    pkg = await fs__default['default'].readJson(cmd.from);
-  } else {
+  const from = pluginId || (cmd == null ? void 0 : cmd.from);
+  if (!from) {
     throw new Error("Missing both <plugin-id> or a package.json file path in the --from flag.");
   }
-  const steps = await PluginInstaller.resolveSteps(pkg);
-  const installer = new PluginInstaller(steps);
-  await installer.run();
+  const pkg = await loadPackageJson(from);
+  await installPluginAndPeerPlugins(pkg);
 };
 
-exports.default = install;
-//# sourceMappingURL=install-43a8076b.cjs.js.map
+exports["default"] = install;
+//# sourceMappingURL=install-db22d18d.cjs.js.map

package/dist/cjs/{lint-60658813.cjs.js → lint-0c8dd45e.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var run = require('./run-bacdaaf1.cjs.js');
-var index = require('./index-8a512334.cjs.js');
+var run = require('./run-8b1e277a.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
 require('child_process');
 require('util');
 require('@backstage/errors');
@@ -14,7 +14,7 @@ require('@backstage/config/package.json');
 
 var lint = async (cmd, cmdArgs) => {
   const args = [
-    "--ext=js,jsx,ts,tsx",
+    "--ext=js,jsx,ts,tsx,mjs,cjs",
     "--max-warnings=0",
     `--format=${cmd.format}`,
     ...cmdArgs != null ? cmdArgs : [index.paths.targetDir]
@@ -25,5 +25,5 @@ var lint = async (cmd, cmdArgs) => {
   await run.run("eslint", args);
 };
 
-exports.default = lint;
-//# sourceMappingURL=lint-60658813.cjs.js.map
+exports["default"] = lint;
+//# sourceMappingURL=lint-0c8dd45e.cjs.js.map

package/dist/cjs/{lint-0053aded.cjs.js → lint-f4a40773.cjs.js}

@@ -1,9 +1,9 @@
 'use strict';
 
-var Lockfile = require('./Lockfile-80f0eec4.cjs.js');
-require('./run-bacdaaf1.cjs.js');
+var Lockfile = require('./Lockfile-35661afa.cjs.js');
+require('./run-8b1e277a.cjs.js');
 require('chalk');
-var index = require('./index-8a512334.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
 var partition = require('lodash/partition');
 require('fs-extra');
 require('semver');
@@ -42,14 +42,14 @@ var lint = async (cmd) => {
     lockfile.replaceVersions(result.newVersions);
     await lockfile.save();
   } else {
-    const [newVersionsForbidden, newVersionsAllowed] = partition__default['default'](result.newVersions, ({name}) => forbiddenDuplicatesFilter(name));
+    const [newVersionsForbidden, newVersionsAllowed] = partition__default["default"](result.newVersions, ({ name }) => forbiddenDuplicatesFilter(name));
     if (newVersionsForbidden.length && !fix) {
       success = false;
     }
     logArray(newVersionsForbidden, "The following packages must be deduplicated, this can be done automatically with --fix", (e) => `  ${e.name} @ ${e.range} bumped from ${e.oldVersion} to ${e.newVersion}`);
     logArray(newVersionsAllowed, "The following packages can be deduplicated, this can be done automatically with --fix", (e) => `  ${e.name} @ ${e.range} bumped from ${e.oldVersion} to ${e.newVersion}`);
   }
-  const [newRangesForbidden, newRangesAllowed] = partition__default['default'](result.newRanges, ({name}) => forbiddenDuplicatesFilter(name));
+  const [newRangesForbidden, newRangesAllowed] = partition__default["default"](result.newRanges, ({ name }) => forbiddenDuplicatesFilter(name));
   if (newRangesForbidden.length) {
     success = false;
   }
@@ -71,7 +71,7 @@ function logArray(arr, header, each) {
   console.log();
 }
 
-exports.default = lint;
+exports["default"] = lint;
 exports.forbiddenDuplicatesFilter = forbiddenDuplicatesFilter;
 exports.includedFilter = includedFilter;
-//# sourceMappingURL=lint-0053aded.cjs.js.map
+//# sourceMappingURL=lint-f4a40773.cjs.js.map

package/dist/cjs/{pack-a4246579.cjs.js → pack-f5669e4f.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-8a512334.cjs.js');
+var index = require('./index-60792ea9.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -19,19 +19,19 @@ const PKG_BACKUP_PATH = "package.json-prepack";
 const pre = async () => {
   var _a;
   const pkgPath = index.paths.resolveTarget(PKG_PATH);
-  const pkgContent = await fs__default['default'].readFile(pkgPath, "utf8");
+  const pkgContent = await fs__default["default"].readFile(pkgPath, "utf8");
   const pkg = JSON.parse(pkgContent);
-  await fs__default['default'].writeFile(PKG_BACKUP_PATH, pkgContent);
+  await fs__default["default"].writeFile(PKG_BACKUP_PATH, pkgContent);
   for (const key of Object.keys((_a = pkg.publishConfig) != null ? _a : {})) {
     if (!SKIPPED_KEYS.includes(key)) {
       pkg[key] = pkg.publishConfig[key];
     }
   }
-  await fs__default['default'].writeJson(pkgPath, pkg, {encoding: "utf8", spaces: 2});
+  await fs__default["default"].writeJson(pkgPath, pkg, { encoding: "utf8", spaces: 2 });
 };
 const post = async () => {
   try {
-    await fs__default['default'].move(PKG_BACKUP_PATH, PKG_PATH, {overwrite: true});
+    await fs__default["default"].move(PKG_BACKUP_PATH, PKG_PATH, { overwrite: true });
   } catch (error) {
     console.warn(`Failed to restore package.json during postpack, ${error}. Your package will be fine but you may have ended up with some garbage in the repo.`);
   }
@@ -39,4 +39,4 @@ const post = async () => {
 
 exports.post = post;
 exports.pre = pre;
-//# sourceMappingURL=pack-a4246579.cjs.js.map
+//# sourceMappingURL=pack-f5669e4f.cjs.js.map