@backstage/cli 0.0.0-nightly-202182222128 → 0.0.0-nightly-202182622037

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # @backstage/cli
 
-## 0.0.0-nightly-202182222128
+## 0.0.0-nightly-202182622037
+
+### Patch Changes
+
+- 2a6c393c06: The `create-plugin` command now prefers dependency versions ranges that are already in the lockfile.
+- 12e074a6e4: Fix duplication checks to stop looking for the old core packages, and to allow some explicitly
+
+## 0.7.13
 
 ### Patch Changes
 
@@ -9,7 +16,7 @@
 - febddedcb2: Bump `lodash` to remediate `SNYK-JS-LODASH-590103` security vulnerability
 - 050797c5b3: Switched the Jest YAML transform from `yaml-jest` to `jest-transform-yaml`, which works with newer versions of Node.js.
 - Updated dependencies
-  - @backstage/config@0.0.0-nightly-202182222128
+  - @backstage/config@0.1.10
 
 ## 0.7.12
 

package/dist/cjs/{lint-a04ad0c9.cjs.js → Lockfile-80f0eec4.cjs.js}

@@ -3,16 +3,11 @@
 var fs = require('fs-extra');
 var semver = require('semver');
 var lockfile = require('@yarnpkg/lockfile');
-require('./run-9dbe70e9.cjs.js');
-require('chalk');
-var index = require('./index-4c8e4312.cjs.js');
-var partition = require('lodash/partition');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
-var partition__default = /*#__PURE__*/_interopDefaultLegacy(partition);
 
 const ENTRY_PATTERN = /^((?:@[^/]+\/)?[^@/]+)@(.+)$/;
 class Lockfile {
@@ -156,64 +151,5 @@ class Lockfile {
   }
 }
 
-const INCLUDED = [/^@backstage\//];
-const includedFilter = (name) => INCLUDED.some((pattern) => pattern.test(name));
-const FORBID_DUPLICATES = [
-  /^@backstage\/core$/,
-  /^@backstage\/core-api$/,
-  /^@backstage\/plugin-/
-];
-const forbiddenDuplicatesFilter = (name) => FORBID_DUPLICATES.some((pattern) => pattern.test(name));
-var lint = async (cmd) => {
-  const fix = Boolean(cmd.fix);
-  let success = true;
-  const lockfile = await Lockfile.load(index.paths.resolveTargetRoot("yarn.lock"));
-  const result = lockfile.analyze({
-    filter: includedFilter
-  });
-  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();
-  } 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();
-}
-
-var lint$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  includedFilter: includedFilter,
-  forbiddenDuplicatesFilter: forbiddenDuplicatesFilter,
-  'default': lint
-});
-
 exports.Lockfile = Lockfile;
-exports.forbiddenDuplicatesFilter = forbiddenDuplicatesFilter;
-exports.includedFilter = includedFilter;
-exports.lint = lint$1;
-//# sourceMappingURL=lint-a04ad0c9.cjs.js.map
+//# sourceMappingURL=Lockfile-80f0eec4.cjs.js.map

package/dist/cjs/{build-8ff700d9.cjs.js → build-469caaac.cjs.js}

@@ -12,18 +12,19 @@ require('@backstage/cli-common');
 require('terser-webpack-plugin');
 var parallel = require('./parallel-a4714c72.cjs.js');
 require('mini-css-extract-plugin');
-var index = require('./index-4c8e4312.cjs.js');
-require('./run-9dbe70e9.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
+require('./run-51c0c9a1.cjs.js');
 require('lodash/pickBy');
 var yn = require('yn');
 var FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 var formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-var paths = require('./paths-90c07c2d.cjs.js');
+var paths = require('./paths-3d580aef.cjs.js');
 var chalk = require('chalk');
 require('webpack-dev-server');
 require('react-dev-utils/openBrowser');
-var config = require('./config-28e42b9e.cjs.js');
+var config = require('./config-90b3ea39.cjs.js');
 require('commander');
+require('semver');
 require('@backstage/config/package.json');
 require('child_process');
 require('util');
@@ -134,4 +135,4 @@ var build = async (cmd) => {
 };
 
 exports.default = build;
-//# sourceMappingURL=build-8ff700d9.cjs.js.map
+//# sourceMappingURL=build-469caaac.cjs.js.map

package/dist/cjs/{build-b1687478.cjs.js → build-87f92a6c.cjs.js}

@@ -1,12 +1,13 @@
 'use strict';
 
-var packager = require('./packager-48e2ffad.cjs.js');
+var packager = require('./packager-dca4411a.cjs.js');
 require('fs-extra');
 require('rollup');
 require('chalk');
 require('path');
-require('./index-4c8e4312.cjs.js');
+require('./index-1adee07b.cjs.js');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('rollup-plugin-peer-deps-external');
@@ -28,4 +29,4 @@ var build = async () => {
 };
 
 exports.default = build;
-//# sourceMappingURL=build-b1687478.cjs.js.map
+//# sourceMappingURL=build-87f92a6c.cjs.js.map

package/dist/cjs/{build-b64bd9d1.cjs.js → build-8c8fc2b9.cjs.js}

@@ -1,12 +1,13 @@
 'use strict';
 
-var packager = require('./packager-48e2ffad.cjs.js');
+var packager = require('./packager-dca4411a.cjs.js');
 require('fs-extra');
 require('rollup');
 require('chalk');
 require('path');
-require('./index-4c8e4312.cjs.js');
+require('./index-1adee07b.cjs.js');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('rollup-plugin-peer-deps-external');
@@ -28,4 +29,4 @@ var build = async () => {
 };
 
 exports.default = build;
-//# sourceMappingURL=build-b64bd9d1.cjs.js.map
+//# sourceMappingURL=build-8c8fc2b9.cjs.js.map

package/dist/cjs/{build-207e0e14.cjs.js → build-e2c9e9a7.cjs.js}

@@ -1,12 +1,13 @@
 'use strict';
 
-var packager = require('./packager-48e2ffad.cjs.js');
+var packager = require('./packager-dca4411a.cjs.js');
 require('fs-extra');
 require('rollup');
 require('chalk');
 require('path');
-require('./index-4c8e4312.cjs.js');
+require('./index-1adee07b.cjs.js');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('rollup-plugin-peer-deps-external');
@@ -39,4 +40,4 @@ var build = async (cmd) => {
 };
 
 exports.default = build;
-//# sourceMappingURL=build-207e0e14.cjs.js.map
+//# sourceMappingURL=build-e2c9e9a7.cjs.js.map

package/dist/cjs/{buildImage-499c6040.cjs.js → buildImage-3e12ca8f.cjs.js}

@@ -3,13 +3,14 @@
 var chalk = require('chalk');
 var fs = require('fs-extra');
 var path = require('path');
-var index$1 = require('./index-18d4fc40.cjs.js');
-var index = require('./index-4c8e4312.cjs.js');
-var run = require('./run-9dbe70e9.cjs.js');
+var index$1 = require('./index-b352eec0.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
+var run = require('./run-51c0c9a1.cjs.js');
 var parallel = require('./parallel-a4714c72.cjs.js');
 require('os');
 require('tar');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('child_process');
@@ -72,4 +73,4 @@ async function findAppConfigs() {
 }
 
 exports.default = buildImage;
-//# sourceMappingURL=buildImage-499c6040.cjs.js.map
+//# sourceMappingURL=buildImage-3e12ca8f.cjs.js.map

package/dist/cjs/{buildWorkspace-c2982f76.cjs.js → buildWorkspace-83214a95.cjs.js}

@@ -1,16 +1,17 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-18d4fc40.cjs.js');
+var index = require('./index-b352eec0.cjs.js');
 require('path');
 require('os');
 require('tar');
-require('./index-4c8e4312.cjs.js');
+require('./index-1adee07b.cjs.js');
 require('commander');
 require('chalk');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
-require('./run-9dbe70e9.cjs.js');
+require('./run-51c0c9a1.cjs.js');
 require('child_process');
 require('util');
 
@@ -28,4 +29,4 @@ var buildWorkspace = async (dir, _cmd, packages) => {
 };
 
 exports.default = buildWorkspace;
-//# sourceMappingURL=buildWorkspace-c2982f76.cjs.js.map
+//# sourceMappingURL=buildWorkspace-83214a95.cjs.js.map

package/dist/cjs/{bump-95c0a841.cjs.js → bump-e0a6cf05.cjs.js}

@@ -4,9 +4,10 @@ var fs = require('fs-extra');
 var chalk = require('chalk');
 var semver = require('semver');
 var path = require('path');
-var run = require('./run-9dbe70e9.cjs.js');
-var index = require('./index-4c8e4312.cjs.js');
-var lint = require('./lint-a04ad0c9.cjs.js');
+var run = require('./run-51c0c9a1.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
+var Lockfile = require('./Lockfile-80f0eec4.cjs.js');
+var lint = require('./lint-b0918343.cjs.js');
 require('child_process');
 require('util');
 require('commander');
@@ -72,7 +73,7 @@ const DEP_TYPES = [
 var bump = async () => {
   var _a;
   const lockfilePath = index.paths.resolveTargetRoot("yarn.lock");
-  const lockfile = await lint.Lockfile.load(lockfilePath);
+  const lockfile = await Lockfile.Lockfile.load(lockfilePath);
   const findTargetVersion = createVersionFinder();
   const dependencyMap = await mapDependencies(index.paths.targetDir);
   const versionBumps = new Map();
@@ -199,7 +200,7 @@ var bump = async () => {
     console.log(chalk__default['default'].green("Version bump complete!"));
   }
   console.log();
-  const dedupLockfile = await lint.Lockfile.load(lockfilePath);
+  const dedupLockfile = await Lockfile.Lockfile.load(lockfilePath);
   const result = dedupLockfile.analyze({
     filter: lint.includedFilter
   });
@@ -242,4 +243,4 @@ async function workerThreads(count, items, fn) {
 }
 
 exports.default = bump;
-//# sourceMappingURL=bump-95c0a841.cjs.js.map
+//# sourceMappingURL=bump-e0a6cf05.cjs.js.map

package/dist/cjs/{bundle-12b58961.cjs.js → bundle-23f9f94d.cjs.js}

@@ -4,15 +4,16 @@ var os = require('os');
 var fs = require('fs-extra');
 var path = require('path');
 var tar = require('tar');
-var index$1 = require('./index-18d4fc40.cjs.js');
-var index = require('./index-4c8e4312.cjs.js');
+var index$1 = require('./index-b352eec0.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
 var parallel = require('./parallel-a4714c72.cjs.js');
-var packager = require('./packager-48e2ffad.cjs.js');
-require('./run-9dbe70e9.cjs.js');
+var packager = require('./packager-dca4411a.cjs.js');
+require('./run-51c0c9a1.cjs.js');
 require('child_process');
 require('util');
 require('commander');
 require('chalk');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('rollup');
@@ -65,4 +66,4 @@ var bundle = async (cmd) => {
 };
 
 exports.default = bundle;
-//# sourceMappingURL=bundle-12b58961.cjs.js.map
+//# sourceMappingURL=bundle-23f9f94d.cjs.js.map

package/dist/cjs/{clean-19a871a4.cjs.js → clean-39612213.cjs.js}

@@ -1,9 +1,10 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-4c8e4312.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
 require('commander');
 require('chalk');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 
@@ -18,4 +19,4 @@ async function clean() {
 }
 
 exports.default = clean;
-//# sourceMappingURL=clean-19a871a4.cjs.js.map
+//# sourceMappingURL=clean-39612213.cjs.js.map

package/dist/cjs/{config-28e42b9e.cjs.js → config-90b3ea39.cjs.js}

@@ -2,7 +2,7 @@
 
 var configLoader = require('@backstage/config-loader');
 var config = require('@backstage/config');
-var index = require('./index-4c8e4312.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
 
 async function loadCliConfig(options) {
   const configPaths = options.args.map((arg) => index.paths.resolveTarget(arg));
@@ -66,4 +66,4 @@ function findPackages(packages, fromPackage) {
 }
 
 exports.loadCliConfig = loadCliConfig;
-//# sourceMappingURL=config-28e42b9e.cjs.js.map
+//# sourceMappingURL=config-90b3ea39.cjs.js.map

package/dist/cjs/{createPlugin-1fd4b486.cjs.js → createPlugin-f20d7f4e.cjs.js}

@@ -9,14 +9,18 @@ var path = require('path');
 var camelCase = require('lodash/camelCase');
 var upperFirst = require('lodash/upperFirst');
 var os = require('os');
-var tasks = require('./tasks-e05ab474.cjs.js');
-var index = require('./index-4c8e4312.cjs.js');
+var tasks = require('./tasks-bab2ff89.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
+var Lockfile = require('./Lockfile-80f0eec4.cjs.js');
+require('./run-51c0c9a1.cjs.js');
 require('handlebars');
 require('ora');
 require('recursive-readdir');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
+require('@yarnpkg/lockfile');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -169,6 +173,12 @@ var createPlugin = async (cmd) => {
   const pluginDir = isMonoRepo ? index.paths.resolveTargetRoot("plugins", pluginId) : index.paths.resolveTargetRoot(pluginId);
   const ownerIds = tasks.parseOwnerIds(answers.owner);
   const {version: pluginVersion} = isMonoRepo ? await fs__default['default'].readJson(index.paths.resolveTargetRoot("lerna.json")) : {version: "0.1.0"};
+  let lockfile;
+  try {
+    lockfile = await Lockfile.Lockfile.load(index.paths.resolveTargetRoot("yarn.lock"));
+  } catch (error) {
+    console.warn(`No yarn.lock available, ${error}`);
+  }
   tasks.Task.log();
   tasks.Task.log("Creating the plugin...");
   tasks.Task.section("Checking if the plugin ID is available");
@@ -185,7 +195,7 @@ var createPlugin = async (cmd) => {
       name,
       privatePackage,
       npmRegistry
-    }, index.packageVersions);
+    }, index.createPackageVersionProvider(lockfile));
     tasks.Task.section("Moving to final location");
     await movePlugin(tempDir, pluginDir, pluginId);
     tasks.Task.section("Building the plugin");
@@ -220,4 +230,4 @@ exports.addPluginExtensionToApp = addPluginExtensionToApp;
 exports.capitalize = capitalize;
 exports.default = createPlugin;
 exports.movePlugin = movePlugin;
-//# sourceMappingURL=createPlugin-1fd4b486.cjs.js.map
+//# sourceMappingURL=createPlugin-f20d7f4e.cjs.js.map

package/dist/cjs/{dev-8a34f2b0.cjs.js → dev-26b0d0ee.cjs.js}

@@ -1,11 +1,12 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-4c8e4312.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
 var webpack = require('webpack');
-var paths = require('./paths-90c07c2d.cjs.js');
+var paths = require('./paths-3d580aef.cjs.js');
 require('commander');
 require('chalk');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 require('path');
@@ -18,7 +19,7 @@ require('terser-webpack-plugin');
 require('./parallel-a4714c72.cjs.js');
 require('mini-css-extract-plugin');
 require('./svgrTemplate-2d0d15cf.cjs.js');
-require('./run-9dbe70e9.cjs.js');
+require('./run-51c0c9a1.cjs.js');
 require('child_process');
 require('util');
 require('lodash/pickBy');
@@ -64,4 +65,4 @@ var dev = async (cmd) => {
 };
 
 exports.default = dev;
-//# sourceMappingURL=dev-8a34f2b0.cjs.js.map
+//# sourceMappingURL=dev-26b0d0ee.cjs.js.map

package/dist/cjs/{diff-13756f9e.cjs.js → diff-20b1ec49.cjs.js}

@@ -7,8 +7,9 @@ var path = require('path');
 var inquirer = require('inquirer');
 var handlebars = require('handlebars');
 var recursive = require('recursive-readdir');
-var index = require('./index-4c8e4312.cjs.js');
+var index = require('./index-1adee07b.cjs.js');
 require('commander');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 
@@ -236,13 +237,11 @@ async function readTemplateFile(templateFile, templateVars) {
   if (!templateFile.endsWith(".hbs")) {
     return contents;
   }
+  const packageVersionProvider = index.createPackageVersionProvider(void 0);
   return handlebars__default['default'].compile(contents)(templateVars, {
     helpers: {
-      version(name) {
-        if (name in index.packageVersions) {
-          return index.packageVersions[name];
-        }
-        throw new Error(`No version available for package ${name}`);
+      versionQuery(name, hint) {
+        return packageVersionProvider(name, typeof hint === "string" ? hint : void 0);
       }
     }
   });
@@ -357,4 +356,4 @@ async function readPluginData() {
 }
 
 exports.default = diff;
-//# sourceMappingURL=diff-13756f9e.cjs.js.map
+//# sourceMappingURL=diff-20b1ec49.cjs.js.map

package/dist/cjs/{docs-9150c87f.cjs.js → docs-5137c9f9.cjs.js}

@@ -2,12 +2,13 @@
 
 var configLoader = require('@backstage/config-loader');
 var openBrowser = require('react-dev-utils/openBrowser');
-var config = require('./config-28e42b9e.cjs.js');
+var config = require('./config-90b3ea39.cjs.js');
 require('@backstage/config');
-require('./index-4c8e4312.cjs.js');
+require('./index-1adee07b.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
+require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
 
@@ -27,4 +28,4 @@ var docs = async (cmd) => {
 };
 
 exports.default = docs;
-//# sourceMappingURL=docs-9150c87f.cjs.js.map
+//# sourceMappingURL=docs-5137c9f9.cjs.js.map