@backstage/cli 0.26.11-next.1 → 0.27.0-next.0

package/templates/default-backend-plugin/package.json.hbs

@@ -31,7 +31,6 @@
     "@backstage/backend-common": "{{versionQuery '@backstage/backend-common'}}",
     "@backstage/backend-defaults": "{{versionQuery '@backstage/backend-defaults'}}",
     "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}",
-    "@backstage/config": "{{versionQuery '@backstage/config'}}",
     "express": "{{versionQuery 'express' '4.17.1'}}",
     "express-promise-router": "{{versionQuery 'express-promise-router' '4.1.0'}}",
     "node-fetch": "{{versionQuery 'node-fetch' '2.6.7'}}"

package/templates/default-backend-plugin/src/service/router.ts

@@ -1,12 +1,11 @@
 import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
-import { LoggerService } from '@backstage/backend-plugin-api';
-import { Config } from '@backstage/config';
+import { LoggerService, RootConfigService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import Router from 'express-promise-router';
 
 export interface RouterOptions {
   logger: LoggerService;
-  config: Config;
+  config: RootConfigService;
 }
 
 export async function createRouter(

package/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs

@@ -4,14 +4,14 @@ import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { screen } from '@testing-library/react';
 import {
-  setupRequestMockHandlers,
+  registerMswTestHooks,
   renderInTestApp,
 } from '@backstage/test-utils';
 
 describe('ExampleComponent', () => {
   const server = setupServer();
   // Enable sane handlers for network requests
-  setupRequestMockHandlers(server);
+  registerMswTestHooks(server);
 
   // setup mock response
   beforeEach(() => {

package/dist/cjs/Lockfile-BndFvzHc.cjs.js

@@ -1,221 +0,0 @@
-'use strict';
-
-var fs = require('fs-extra');
-var semver = require('semver');
-var parsers = require('@yarnpkg/parsers');
-var lockfile = require('@yarnpkg/lockfile');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
-
-var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
-
-const ENTRY_PATTERN = /^((?:@[^/]+\/)?[^@/]+)@(.+)$/;
-const NEW_HEADER = `${[
-  `# This file is generated by running "yarn install" inside your project.
-`,
-  `# Manual changes might be lost - proceed with caution!
-`
-].join(``)}
-`;
-const LEGACY_REGEX = /^(#.*(\r?\n))*?#\s+yarn\s+lockfile\s+v1\r?\n/i;
-const SPECIAL_OBJECT_KEYS = [
-  `__metadata`,
-  `version`,
-  `resolution`,
-  `dependencies`,
-  `peerDependencies`,
-  `dependenciesMeta`,
-  `peerDependenciesMeta`,
-  `binaries`
-];
-class Lockfile {
-  constructor(packages, data, legacy = false) {
-    this.packages = packages;
-    this.data = data;
-    this.legacy = legacy;
-  }
-  static async load(path) {
-    const lockfileContents = await fs__default.default.readFile(path, "utf8");
-    return Lockfile.parse(lockfileContents);
-  }
-  static parse(content) {
-    const legacy = LEGACY_REGEX.test(content);
-    let data;
-    try {
-      data = parsers.parseSyml(content);
-    } catch (err) {
-      throw new Error(`Failed yarn.lock parse, ${err}`);
-    }
-    const packages = /* @__PURE__ */ new Map();
-    for (const [key, value] of Object.entries(data)) {
-      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}'`);
-      }
-      let queries = packages.get(name);
-      if (!queries) {
-        queries = [];
-        packages.set(name, queries);
-      }
-      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 });
-      }
-    }
-    return new Lockfile(packages, data, legacy);
-  }
-  /** Get the entries for a single package in the lockfile */
-  get(name) {
-    return this.packages.get(name);
-  }
-  /** Returns the name of all packages available in the lockfile */
-  keys() {
-    return this.packages.keys();
-  }
-  /** Analyzes the lockfile to identify possible actions and warnings for the entries */
-  analyze(options) {
-    const { filter, localPackages } = options;
-    const result = {
-      invalidRanges: [],
-      newVersions: [],
-      newRanges: []
-    };
-    for (const [name, allEntries] of this.packages) {
-      if (filter && !filter(name)) {
-        continue;
-      }
-      const invalid = allEntries.filter(
-        (e) => !semver__default.default.validRange(e.range) && !e.range.startsWith("workspace:")
-      );
-      result.invalidRanges.push(
-        ...invalid.map(({ range }) => ({ name, range }))
-      );
-      const entries = allEntries.filter((e) => semver__default.default.validRange(e.range));
-      if (entries.length < 2) {
-        continue;
-      }
-      const versions = Array.from(new Set(entries.map((e) => e.version))).map((v) => {
-        if (v === "0.0.0-use.local") {
-          const local = localPackages.get(name);
-          if (!local) {
-            throw new Error(`No local package found for ${name}`);
-          }
-          if (!local.packageJson.version) {
-            throw new Error(`No version found for local package ${name}`);
-          }
-          return {
-            entryVersion: v,
-            actualVersion: local.packageJson.version
-          };
-        }
-        return { entryVersion: v, actualVersion: v };
-      }).sort((v1, v2) => semver__default.default.rcompare(v1.actualVersion, v2.actualVersion));
-      if (versions.length < 2) {
-        continue;
-      }
-      const acceptedVersions = /* @__PURE__ */ new Set();
-      for (const { version, range } of entries) {
-        const acceptedVersion = versions.find(
-          (v) => semver__default.default.satisfies(v.actualVersion, range)
-        );
-        if (!acceptedVersion) {
-          throw new Error(
-            `No existing version was accepted for range ${range}, searching through ${versions}, for package ${name}`
-          );
-        }
-        if (acceptedVersion.entryVersion !== version) {
-          result.newVersions.push({
-            name,
-            range,
-            newVersion: acceptedVersion.entryVersion,
-            oldVersion: version
-          });
-        }
-        acceptedVersions.add(acceptedVersion.actualVersion);
-      }
-      if (acceptedVersions.size === 1) {
-        continue;
-      }
-      const maxVersion = Array.from(acceptedVersions).sort(semver__default.default.rcompare)[0];
-      const maxEntry = entries.filter((e) => semver__default.default.satisfies(maxVersion, e.range)).map((e) => ({ e, min: semver__default.default.minVersion(e.range) })).filter((p) => p.min).sort((a, b) => semver__default.default.rcompare(a.min, b.min))[0]?.e;
-      if (!maxEntry) {
-        throw new Error(
-          `No entry found that satisfies max version '${maxVersion}'`
-        );
-      }
-      for (const { version, range } of entries) {
-        if (semver__default.default.satisfies(maxVersion, range)) {
-          continue;
-        }
-        result.newRanges.push({
-          name,
-          oldRange: range,
-          newRange: maxEntry.range,
-          oldVersion: version,
-          newVersion: maxVersion
-        });
-      }
-    }
-    return result;
-  }
-  remove(name, range) {
-    const query = `${name}@${range}`;
-    const existed = Boolean(this.data[query]);
-    delete this.data[query];
-    const newEntries = this.packages.get(name)?.filter((e) => e.range !== range);
-    if (newEntries) {
-      this.packages.set(name, newEntries);
-    }
-    return existed;
-  }
-  /** Modifies the lockfile by bumping packages to the suggested versions */
-  replaceVersions(results) {
-    for (const { name, range, oldVersion, newVersion } of results) {
-      const query = `${name}@${range}`;
-      const entryData = this.data[query];
-      if (!entryData) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entryData.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`
-        );
-      }
-      const matchingEntry = Object.entries(this.data).find(
-        ([q, e]) => q.startsWith(`${name}@`) && e.version === newVersion
-      );
-      if (!matchingEntry) {
-        throw new Error(
-          `No matching entry found for ${name} at version ${newVersion}`
-        );
-      }
-      this.data[query] = matchingEntry[1];
-      const entry = this.packages.get(name)?.find((e) => e.range === range);
-      if (!entry) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entry.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`
-        );
-      }
-      entry.version = newVersion;
-    }
-  }
-  async save(path) {
-    await fs__default.default.writeFile(path, this.toString(), "utf8");
-  }
-  toString() {
-    return this.legacy ? lockfile.stringify(this.data) : NEW_HEADER + parsers.stringifySyml(this.data);
-  }
-}
-
-exports.Lockfile = Lockfile;
-//# sourceMappingURL=Lockfile-BndFvzHc.cjs.js.map

package/dist/cjs/lint-DqMGmvsS.cjs.js

@@ -1,112 +0,0 @@
-'use strict';
-
-var Lockfile = require('./Lockfile-BndFvzHc.cjs.js');
-require('minimatch');
-require('@manypkg/get-packages');
-require('chalk');
-require('./yarn-Ukl9MOS0.cjs.js');
-require('./run-ClbD5HPt.cjs.js');
-var index = require('./index-DX-m2Ed0.cjs.js');
-var partition = require('lodash/partition');
-var cliNode = require('@backstage/cli-node');
-require('fs-extra');
-require('semver');
-require('@yarnpkg/parsers');
-require('@yarnpkg/lockfile');
-require('@backstage/errors');
-require('child_process');
-require('util');
-require('commander');
-require('@backstage/cli-common');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
-
-var partition__default = /*#__PURE__*/_interopDefaultCompat(partition);
-
-const INCLUDED = [/^@backstage\//];
-const includedFilter = (name) => INCLUDED.some((pattern) => pattern.test(name));
-const FORBID_DUPLICATES = [/^@backstage\/\w+-app-api$/, /^@backstage\/plugin-/];
-const ALLOW_DUPLICATES = [
-  /^@backstage\/core-plugin-api$/,
-  // Duplicates of libraries are OK
-  // TODO(Rugvip): Check this using package role instead
-  /^@backstage\/plugin-.*-react$/,
-  /^@backstage\/plugin-.*-node$/,
-  /^@backstage\/plugin-.*-common$/
-];
-const forbiddenDuplicatesFilter = (name) => FORBID_DUPLICATES.some((pattern) => pattern.test(name)) && !ALLOW_DUPLICATES.some((pattern) => pattern.test(name));
-var lint = async (cmd) => {
-  const fix = Boolean(cmd.fix);
-  let success = true;
-  const lockfilePath = index.paths.resolveTargetRoot("yarn.lock");
-  const lockfile = await Lockfile.Lockfile.load(lockfilePath);
-  const result = lockfile.analyze({
-    filter: includedFilter,
-    localPackages: cliNode.PackageGraph.fromPackages(
-      await cliNode.PackageGraph.listTargetPackages()
-    )
-  });
-  logArray(
-    result.invalidRanges,
-    "The following packages versions are invalid and can't be analyzed:",
-    (e) => `  ${e.name} @ ${e.range}`
-  );
-  if (fix) {
-    lockfile.replaceVersions(result.newVersions);
-    await lockfile.save(lockfilePath);
-  } else {
-    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)
-  );
-  if (newRangesForbidden.length) {
-    success = false;
-  }
-  logArray(
-    newRangesForbidden,
-    "The following packages must be deduplicated by updating dependencies in package.json",
-    (e) => `  ${e.name} @ ${e.oldRange} should be changed to ${e.newRange}`
-  );
-  logArray(
-    newRangesAllowed,
-    "The following packages can be deduplicated by updating dependencies in package.json",
-    (e) => `  ${e.name} @ ${e.oldRange} should be changed to ${e.newRange}`
-  );
-  if (!success) {
-    throw new Error("Failed versioning check");
-  }
-};
-function logArray(arr, header, each) {
-  if (arr.length === 0) {
-    return;
-  }
-  console.log(header);
-  console.log();
-  for (const e of arr) {
-    console.log(each(e));
-  }
-  console.log();
-}
-
-exports.default = lint;
-exports.forbiddenDuplicatesFilter = forbiddenDuplicatesFilter;
-exports.includedFilter = includedFilter;
-//# sourceMappingURL=lint-DqMGmvsS.cjs.js.map