@backstage/cli 0.9.1 → 0.10.3

package/dist/cjs/{diff-56188f93.cjs.js → diff-4789ad9c.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-994e77d9.cjs.js');
+var index = require('./index-dc8e5d2a.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
@@ -38,7 +38,7 @@ class PackageJsonHandler {
     this.targetPkg = targetPkg;
     this.variant = variant;
   }
-  static async handler({path, write, missing, targetContents, templateContents}, prompt, variant) {
+  static async handler({ path, write, missing, targetContents, templateContents }, prompt, variant) {
     console.log("Checking package.json");
     if (missing) {
       throw new Error(`${path} doesn't exist`);
@@ -61,18 +61,20 @@ class PackageJsonHandler {
     await this.syncScripts();
     await this.syncPublishConfig();
     await this.syncDependencies("dependencies");
+    await this.syncDependencies("peerDependencies", true);
     await this.syncDependencies("devDependencies");
+    await this.syncReactDeps();
   }
   async syncField(fieldName, obj = this.pkg, targetObj = this.targetPkg, prefix, sort, optional) {
-    const fullFieldName = chalk__default['default'].cyan(prefix ? `${prefix}[${fieldName}]` : fieldName);
+    const fullFieldName = chalk__default["default"].cyan(prefix ? `${prefix}[${fieldName}]` : fieldName);
     const newValue = obj[fieldName];
-    const coloredNewValue = chalk__default['default'].cyan(JSON.stringify(newValue));
+    const coloredNewValue = chalk__default["default"].cyan(JSON.stringify(newValue));
     if (fieldName in targetObj) {
       const oldValue = targetObj[fieldName];
       if (JSON.stringify(oldValue) === JSON.stringify(newValue)) {
         return;
       }
-      const coloredOldValue = chalk__default['default'].cyan(JSON.stringify(oldValue));
+      const coloredOldValue = chalk__default["default"].cyan(JSON.stringify(oldValue));
       const msg = `package.json has mismatched field, ${fullFieldName}, change from ${coloredOldValue} to ${coloredNewValue}?`;
       if (await this.prompt(msg)) {
         targetObj[fieldName] = newValue;
@@ -92,7 +94,7 @@ class PackageJsonHandler {
     }
   }
   async syncFiles() {
-    const {configSchema} = this.targetPkg;
+    const { configSchema } = this.targetPkg;
     const hasSchemaFile = typeof configSchema === "string";
     if (!this.targetPkg.files) {
       const expected = hasSchemaFile ? ["dist", configSchema] : ["dist"];
@@ -145,10 +147,10 @@ class PackageJsonHandler {
       }
     }
   }
-  async syncDependencies(fieldName) {
+  async syncDependencies(fieldName, required = false) {
     const pkgDeps = this.pkg[fieldName];
     const targetDeps = this.targetPkg[fieldName] = this.targetPkg[fieldName] || {};
-    if (!pkgDeps) {
+    if (!pkgDeps && !required) {
       return;
     }
     await this.syncField("@backstage/core", {}, targetDeps, fieldName, true);
@@ -157,17 +159,22 @@ class PackageJsonHandler {
       if (this.variant === "app" && key.startsWith("plugin-")) {
         continue;
       }
-      await this.syncField(key, pkgDeps, targetDeps, fieldName, true, true);
+      await this.syncField(key, pkgDeps, targetDeps, fieldName, true, !required);
     }
   }
+  async syncReactDeps() {
+    const targetDeps = this.targetPkg.dependencies = this.targetPkg.dependencies || {};
+    await this.syncField("react", {}, targetDeps, "dependencies");
+    await this.syncField("react-dom", {}, targetDeps, "dependencies");
+  }
   async write() {
     await this.writeFunc(`${JSON.stringify(this.targetPkg, null, 2)}
 `);
   }
 }
-async function exactMatchHandler({path, write, missing, targetContents, templateContents}, prompt) {
+async function exactMatchHandler({ path, write, missing, targetContents, templateContents }, prompt) {
   console.log(`Checking ${path}`);
-  const coloredPath = chalk__default['default'].cyan(path);
+  const coloredPath = chalk__default["default"].cyan(path);
   if (missing) {
     if (await prompt(`Missing ${coloredPath}, do you want to add it?`)) {
       await write(templateContents);
@@ -180,9 +187,9 @@ async function exactMatchHandler({path, write, missing, targetContents, template
   const diffs = diff$1.diffLines(targetContents, templateContents);
   for (const diff of diffs) {
     if (diff.added) {
-      process.stdout.write(chalk__default['default'].green(`+${diff.value}`));
+      process.stdout.write(chalk__default["default"].green(`+${diff.value}`));
     } else if (diff.removed) {
-      process.stdout.write(chalk__default['default'].red(`-${diff.value}`));
+      process.stdout.write(chalk__default["default"].red(`-${diff.value}`));
     } else {
       process.stdout.write(` ${diff.value}`);
     }
@@ -191,9 +198,9 @@ async function exactMatchHandler({path, write, missing, targetContents, template
     await write(templateContents);
   }
 }
-async function existsHandler({path, write, missing, templateContents}, prompt) {
+async function existsHandler({ path, write, missing, templateContents }, prompt) {
   console.log(`Making sure ${path} exists`);
-  const coloredPath = chalk__default['default'].cyan(path);
+  const coloredPath = chalk__default["default"].cyan(path);
   if (missing) {
     if (await prompt(`Missing ${coloredPath}, do you want to add it?`)) {
       await write(templateContents);
@@ -201,7 +208,7 @@ async function existsHandler({path, write, missing, templateContents}, prompt) {
     return;
   }
 }
-async function skipHandler({path}) {
+async function skipHandler({ path }) {
   console.log(`Skipping ${path}`);
 }
 const handlers = {
@@ -224,10 +231,10 @@ async function handleAllFiles(fileHandlers, files, promptFunc) {
 }
 
 const inquirerPromptFunc = async (msg) => {
-  const {result} = await inquirer__default['default'].prompt({
+  const { result } = await inquirer__default["default"].prompt({
     type: "confirm",
     name: "result",
-    message: chalk__default['default'].blue(msg)
+    message: chalk__default["default"].blue(msg)
   });
   return result;
 };
@@ -235,7 +242,7 @@ const makeCheckPromptFunc = () => {
   let failed = false;
   const promptFunc = async (msg) => {
     failed = true;
-    console.log(chalk__default['default'].red(`[Check Failed] ${msg}`));
+    console.log(chalk__default["default"].red(`[Check Failed] ${msg}`));
     return false;
   };
   const finalize = () => {
@@ -251,12 +258,12 @@ const yesPromptFunc = async (msg) => {
 };
 
 async function readTemplateFile(templateFile, templateVars) {
-  const contents = await fs__default['default'].readFile(templateFile, "utf8");
+  const contents = await fs__default["default"].readFile(templateFile, "utf8");
   if (!templateFile.endsWith(".hbs")) {
     return contents;
   }
   const packageVersionProvider = index.createPackageVersionProvider(void 0);
-  return handlebars__default['default'].compile(contents)(templateVars, {
+  return handlebars__default["default"].compile(contents)(templateVars, {
     helpers: {
       versionQuery(name, hint) {
         return packageVersionProvider(name, typeof hint === "string" ? hint : void 0);
@@ -265,28 +272,28 @@ async function readTemplateFile(templateFile, templateVars) {
   });
 }
 async function readTemplate(templateDir, templateVars) {
-  const templateFilePaths = await recursive__default['default'](templateDir).catch((error) => {
+  const templateFilePaths = await recursive__default["default"](templateDir).catch((error) => {
     throw new Error(`Failed to read template directory: ${error.message}`);
   });
   const templatedFiles = new Array();
   for (const templateFile of templateFilePaths) {
     const path$1 = path.relative(templateDir, templateFile).replace(/\.hbs$/, "");
     const contents = await readTemplateFile(templateFile, templateVars);
-    templatedFiles.push({path: path$1, contents});
+    templatedFiles.push({ path: path$1, contents });
   }
   return templatedFiles;
 }
 async function diffTemplatedFiles(targetDir, templatedFiles) {
   const fileDiffs = new Array();
-  for (const {path: path$1, contents: templateContents} of templatedFiles) {
+  for (const { path: path$1, contents: templateContents } of templatedFiles) {
     const targetPath = path.resolve(targetDir, path$1);
-    const targetExists = await fs__default['default'].pathExists(targetPath);
+    const targetExists = await fs__default["default"].pathExists(targetPath);
     const write = async (contents) => {
-      await fs__default['default'].ensureDir(path.dirname(targetPath));
-      await fs__default['default'].writeFile(targetPath, contents, "utf8");
+      await fs__default["default"].ensureDir(path.dirname(targetPath));
+      await fs__default["default"].writeFile(targetPath, contents, "utf8");
     };
     if (targetExists) {
-      const targetContents = await fs__default['default'].readFile(targetPath, "utf8");
+      const targetContents = await fs__default["default"].readFile(targetPath, "utf8");
       fileDiffs.push({
         path: path$1,
         write,
@@ -364,14 +371,14 @@ async function readPluginData() {
   } catch (error) {
     throw new Error(`Failed to read target package, ${error}`);
   }
-  const pluginTsContents = await fs__default['default'].readFile(index.paths.resolveTarget("src/plugin.ts"), "utf8");
+  const pluginTsContents = await fs__default["default"].readFile(index.paths.resolveTarget("src/plugin.ts"), "utf8");
   const pluginIdMatch = pluginTsContents.match(/id: ['"`](.+?)['"`]/);
   if (!pluginIdMatch) {
     throw new Error(`Failed to parse plugin.ts, no plugin ID found`);
   }
   const id = pluginIdMatch[1];
-  return {id, name, privatePackage, pluginVersion, npmRegistry};
+  return { id, name, privatePackage, pluginVersion, npmRegistry };
 }
 
-exports.default = diff;
-//# sourceMappingURL=diff-56188f93.cjs.js.map
+exports["default"] = diff;
+//# sourceMappingURL=diff-4789ad9c.cjs.js.map

package/dist/cjs/{docs-8039cb55.cjs.js → docs-12b2616e.cjs.js}

@@ -2,9 +2,9 @@
 
 var configLoader = require('@backstage/config-loader');
 var openBrowser = require('react-dev-utils/openBrowser');
-var config = require('./config-6ab0fc63.cjs.js');
+var config = require('./config-956d86a6.cjs.js');
 require('@backstage/config');
-require('./index-994e77d9.cjs.js');
+require('./index-dc8e5d2a.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -19,14 +19,14 @@ var openBrowser__default = /*#__PURE__*/_interopDefaultLegacy(openBrowser);
 
 const DOCS_URL = "https://config.backstage.io";
 var docs = async (cmd) => {
-  const {schema: appSchemas} = await config.loadCliConfig({
+  const { schema: appSchemas } = await config.loadCliConfig({
     args: [],
     fromPackage: cmd.package,
     mockEnv: true
   });
   const schema = configLoader.mergeConfigSchemas(appSchemas.serialize().schemas.map((_) => _.value));
-  openBrowser__default['default'](`${DOCS_URL}#schema=${JSON.stringify(schema)}`);
+  openBrowser__default["default"](`${DOCS_URL}#schema=${JSON.stringify(schema)}`);
 };
 
-exports.default = docs;
-//# sourceMappingURL=docs-8039cb55.cjs.js.map
+exports["default"] = docs;
+//# sourceMappingURL=docs-12b2616e.cjs.js.map

package/dist/cjs/{index-e84c4ef7.cjs.js → index-451d4133.cjs.js}

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var chalk = require('chalk');
 var yaml = require('yaml');
-var index$1 = require('./index-994e77d9.cjs.js');
+var index$1 = require('./index-dc8e5d2a.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-e84c4ef7.cjs.js.map
+exports["default"] = index;
+//# sourceMappingURL=index-451d4133.cjs.js.map

package/dist/cjs/{index-a18a4cd9.cjs.js → index-a18da53d.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-994e77d9.cjs.js');
-var run = require('./run-40072d67.cjs.js');
+var index = require('./index-dc8e5d2a.cjs.js');
+var run = require('./run-330d1527.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-a18a4cd9.cjs.js.map
+//# sourceMappingURL=index-a18da53d.cjs.js.map