@backstage/cli 0.34.4-next.2 → 0.34.4-next.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @backstage/cli
 
+## 0.34.4-next.3
+
+### Patch Changes
+
+- f2cf564: Removed the script transform cache from the default Jest configuration. The script cache provided a moderate performance boost, but it is incompatible with Jest 30.
+- 024645e: Remove unused @octokit modules from cli package
+
+  - @octokit/graphql
+  - @octokit/graphql-schema
+  - @octokit/oauth-app
+
+- d14ef24: Added automatic detection and support for the Backstage Yarn plugin when generating new packages with `yarn new`. When the plugin is installed, new packages will automatically use `backstage:^` ranges for `@backstage/*` dependencies.
+
 ## 0.34.4-next.2
 
 ### Patch Changes

package/config/jestCachingModuleLoader.js

@@ -16,29 +16,12 @@
 
 const { default: JestRuntime } = require('jest-runtime');
 
-const scriptTransformCache = new Map();
-
 module.exports = class CachingJestRuntime extends JestRuntime {
   constructor(config, ...restArgs) {
     super(config, ...restArgs);
     this.allowLoadAsEsm = config.extensionsToTreatAsEsm.includes('.mts');
   }
 
-  // This may or may not be a good idea. Theoretically I don't know why this would impact
-  // test correctness and flakiness, but it seems like it may introduce flakiness and strange failures.
-  // It does seem to speed up test execution by a fair amount though.
-  createScriptFromCode(scriptSource, filename) {
-    let script = scriptTransformCache.get(scriptSource);
-    if (!script) {
-      script = super.createScriptFromCode(scriptSource, filename);
-      // Tried to store the script object in a WeakRef here. It starts out at
-      // about 90% hit rate, but eventually drops all the way to 20%, and overall
-      // it seemed to increase memory usage by 20% or so.
-      scriptTransformCache.set(scriptSource, script);
-    }
-    return script;
-  }
-
   // Unfortunately we need to use this unstable API to make sure that .js files
   // are only loaded as modules where ESM is supported, i.e. Node.js packages.
   unstable_shouldLoadAsEsm(path, ...restArgs) {

package/dist/lib/version.cjs.js

@@ -61,20 +61,23 @@ function findVersion() {
 }
 const version = findVersion();
 fs__default.default.pathExistsSync(paths.paths.resolveOwn("src"));
-function createPackageVersionProvider(lockfile) {
+function createPackageVersionProvider(lockfile, options) {
   return (name, versionHint) => {
     const packageVersion = packageVersions[name];
+    const lockfileEntries = lockfile?.get(name);
+    const lockfileEntry = lockfileEntries?.find(
+      (entry) => entry.range.startsWith("workspace:")
+    );
+    if (lockfileEntry) {
+      return "workspace:^";
+    }
+    if (options?.preferBackstageProtocol && name.startsWith("@backstage/")) {
+      return "backstage:^";
+    }
     const targetVersion = versionHint || packageVersion;
     if (!targetVersion) {
       throw new Error(`No version available for package ${name}`);
     }
-    const lockfileEntries = lockfile?.get(name);
-    for (const specifier of ["^", "~", "*"]) {
-      const range = `workspace:${specifier}`;
-      if (lockfileEntries?.some((entry) => entry.range === range)) {
-        return range;
-      }
-    }
     const validRanges = lockfileEntries?.filter(
       (entry) => semver__default.default.satisfies(targetVersion, entry.range)
     );

package/dist/lib/yarnPlugin.cjs.js

@@ -0,0 +1,46 @@
+'use strict';
+
+var fs = require('fs-extra');
+var yaml = require('yaml');
+var z = require('zod');
+var paths = require('./paths.cjs.js');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
+var z__default = /*#__PURE__*/_interopDefaultCompat(z);
+
+const yarnRcSchema = z__default.default.object({
+  plugins: z__default.default.array(
+    z__default.default.object({
+      path: z__default.default.string()
+    })
+  ).optional()
+});
+async function getHasYarnPlugin() {
+  const yarnRcPath = paths.paths.resolveTargetRoot(".yarnrc.yml");
+  const yarnRcContent = await fs__default.default.readFile(yarnRcPath, "utf-8").catch((e) => {
+    if (e.code === "ENOENT") {
+      return "";
+    }
+    throw e;
+  });
+  if (!yarnRcContent) {
+    return false;
+  }
+  const parseResult = yarnRcSchema.safeParse(yaml__default.default.parse(yarnRcContent));
+  if (!parseResult.success) {
+    throw new Error(
+      `Unexpected content in .yarnrc.yml: ${parseResult.error.toString()}`
+    );
+  }
+  const yarnRc = parseResult.data;
+  const backstagePlugin = yarnRc.plugins?.some(
+    (plugin) => plugin.path === ".yarn/plugins/@yarnpkg/plugin-backstage.cjs"
+  );
+  return Boolean(backstagePlugin);
+}
+
+exports.getHasYarnPlugin = getHasYarnPlugin;
+//# sourceMappingURL=yarnPlugin.cjs.js.map

package/dist/modules/migrate/commands/versions/bump.cjs.js

@@ -6,11 +6,10 @@ var fs = require('fs-extra');
 var chalk = require('chalk');
 var minimatch = require('minimatch');
 var semver = require('semver');
-var yaml = require('yaml');
-var z = require('zod');
 var errors = require('@backstage/errors');
 var path = require('path');
 var paths = require('../../../../lib/paths.cjs.js');
+var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
 var Lockfile = require('../../../../lib/versioning/Lockfile.cjs.js');
 var packages = require('../../../../lib/versioning/packages.cjs.js');
 var cliCommon = require('@backstage/cli-common');
@@ -25,8 +24,6 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
-var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
-var z__default = /*#__PURE__*/_interopDefaultCompat(z);
 
 maybeBootstrapProxy();
 function maybeBootstrapProxy() {
@@ -56,7 +53,7 @@ function extendsDefaultPattern(pattern) {
 var bump = async (opts) => {
   const lockfilePath = paths.paths.resolveTargetRoot("yarn.lock");
   const lockfile = await Lockfile.Lockfile.load(lockfilePath);
-  const hasYarnPlugin = await getHasYarnPlugin();
+  const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();
   let pattern = opts.pattern;
   if (!pattern) {
     console.log(`Using default pattern glob ${DEFAULT_PATTERN_GLOB}`);
@@ -377,35 +374,6 @@ async function asLockfileVersion(version) {
   }
   return version;
 }
-const yarnRcSchema = z__default.default.object({
-  plugins: z__default.default.array(
-    z__default.default.object({
-      path: z__default.default.string()
-    })
-  ).optional()
-});
-async function getHasYarnPlugin() {
-  const yarnRcPath = paths.paths.resolveTargetRoot(".yarnrc.yml");
-  const yarnRcContent = await fs__default.default.readFile(yarnRcPath, "utf-8").catch((e) => {
-    if (e.code === "ENOENT") {
-      return "";
-    }
-    throw e;
-  });
-  if (!yarnRcContent) {
-    return false;
-  }
-  const parseResult = yarnRcSchema.safeParse(yaml__default.default.parse(yarnRcContent));
-  if (!parseResult.success) {
-    throw new Error(
-      `Unexpected content in .yarnrc.yml: ${parseResult.error.toString()}`
-    );
-  }
-  const yarnRc = parseResult.data;
-  return yarnRc.plugins?.some(
-    (plugin) => plugin.path === ".yarn/plugins/@yarnpkg/plugin-backstage.cjs"
-  );
-}
 
 exports.bumpBackstageJsonVersion = bumpBackstageJsonVersion;
 exports.createStrictVersionFinder = createStrictVersionFinder;

package/dist/modules/new/lib/execution/PortableTemplater.cjs.js

@@ -17,6 +17,7 @@ require('../../../../lib/run.cjs.js');
 require('@backstage/errors');
 var paths = require('../../../../lib/paths.cjs.js');
 var version = require('../../../../lib/version.cjs.js');
+var yarnPlugin = require('../../../../lib/yarnPlugin.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -47,7 +48,10 @@ class PortableTemplater {
       lockfile = await Lockfile.Lockfile.load(paths.paths.resolveTargetRoot("yarn.lock"));
     } catch {
     }
-    const versionProvider = version.createPackageVersionProvider(lockfile);
+    const hasYarnPlugin = await yarnPlugin.getHasYarnPlugin();
+    const versionProvider = version.createPackageVersionProvider(lockfile, {
+      preferBackstageProtocol: hasYarnPlugin
+    });
     const templater = new PortableTemplater(
       {
         versionQuery(name, versionHint) {

package/dist/packages/cli/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.34.4-next.2";
+var version = "0.34.4-next.3";
 var dependencies = {
 	"@backstage/catalog-model": "workspace:^",
 	"@backstage/cli-common": "workspace:^",
@@ -14,9 +14,6 @@ var dependencies = {
 	"@backstage/types": "workspace:^",
 	"@manypkg/get-packages": "^1.1.3",
 	"@module-federation/enhanced": "^0.9.0",
-	"@octokit/graphql": "^5.0.0",
-	"@octokit/graphql-schema": "^13.7.0",
-	"@octokit/oauth-app": "^4.2.0",
 	"@octokit/request": "^8.0.0",
 	"@rollup/plugin-commonjs": "^26.0.0",
 	"@rollup/plugin-json": "^6.0.0",

package/dist/packages/core-components/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.18.2-next.2";
+var version = "0.18.2-next.3";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/frontend-plugin-api/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.12.1-next.1";
+var version = "0.12.1-next.2";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.34.4-next.2",
+  "version": "0.34.4-next.3",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -59,9 +59,6 @@
     "@backstage/types": "1.2.2",
     "@manypkg/get-packages": "^1.1.3",
     "@module-federation/enhanced": "^0.9.0",
-    "@octokit/graphql": "^5.0.0",
-    "@octokit/graphql-schema": "^13.7.0",
-    "@octokit/oauth-app": "^4.2.0",
     "@octokit/request": "^8.0.0",
     "@rollup/plugin-commonjs": "^26.0.0",
     "@rollup/plugin-json": "^6.0.0",
@@ -159,7 +156,7 @@
     "@backstage/catalog-client": "1.12.0",
     "@backstage/config": "1.3.5-next.0",
     "@backstage/core-app-api": "1.19.1-next.0",
-    "@backstage/core-components": "0.18.2-next.2",
+    "@backstage/core-components": "0.18.2-next.3",
     "@backstage/core-plugin-api": "1.11.1-next.0",
     "@backstage/dev-utils": "1.1.15-next.2",
     "@backstage/errors": "1.2.7",