@backstage/cli 0.28.0-next.2 → 0.29.0-next.0

package/dist/commands/repo/test.cjs.js

@@ -2,40 +2,20 @@
 
 var os = require('os');
 var crypto = require('node:crypto');
-var fs = require('fs-extra');
 var yargs = require('yargs');
 var path = require('path');
 var cliNode = require('@backstage/cli-node');
 var paths = require('../../lib/paths.cjs.js');
 var run = require('../../lib/run.cjs.js');
 var cliCommon = require('@backstage/cli-common');
+var SuccessCache = require('../../lib/cache/SuccessCache.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var os__default = /*#__PURE__*/_interopDefaultCompat(os);
 var crypto__default = /*#__PURE__*/_interopDefaultCompat(crypto);
-var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var yargs__default = /*#__PURE__*/_interopDefaultCompat(yargs);
 
-const CACHE_FILE_NAME = "test-cache.json";
-async function readCache(dir) {
-  try {
-    const data = await fs__default.default.readJson(path.resolve(dir, CACHE_FILE_NAME));
-    if (!Array.isArray(data)) {
-      return void 0;
-    }
-    if (data.some((x) => typeof x !== "string")) {
-      return void 0;
-    }
-    return data;
-  } catch {
-    return void 0;
-  }
-}
-function writeCache(dir, cache) {
-  fs__default.default.mkdirpSync(dir);
-  fs__default.default.writeJsonSync(path.resolve(dir, CACHE_FILE_NAME), cache, { spaces: 2 });
-}
 async function readPackageTreeHashes(graph) {
   const pkgs = Array.from(graph.values());
   const output = await run.runPlain(
@@ -116,7 +96,7 @@ async function command(opts, cmd) {
   if (!hasFlags("--passWithNoTests")) {
     args.push("--passWithNoTests");
   }
-  if (!process.env.CI && !hasFlags("--coverage", "--watch", "--watchAll")) {
+  if (!opts.since && !process.env.CI && !hasFlags("--coverage", "--watch", "--watchAll")) {
     const isGitRepo = () => run.runCheck("git", "rev-parse", "--is-inside-work-tree");
     const isMercurialRepo = () => run.runCheck("hg", "--cwd", ".", "root");
     if (await isGitRepo() || await isMercurialRepo()) {
@@ -143,23 +123,24 @@ async function command(opts, cmd) {
     packageGraph = cliNode.PackageGraph.fromPackages(packages);
     return packageGraph;
   }
+  let selectedProjects = void 0;
   if (opts.since && !hasFlags("--selectProjects")) {
     const graph = await getPackageGraph();
     const changedPackages = await graph.listChangedPackages({
       ref: opts.since,
       analyzeLockfile: true
     });
-    const packageNames = Array.from(
+    selectedProjects = Array.from(
       graph.collectPackageNames(
         changedPackages.map((pkg) => pkg.name),
         (pkg) => pkg.allLocalDependents.keys()
       )
     );
-    if (packageNames.length === 0) {
+    if (selectedProjects.length === 0) {
       console.log(`No packages changed since ${opts.since}`);
       return;
     }
-    args.push("--selectProjects", ...packageNames);
+    args.push("--selectProjects", ...selectedProjects);
   }
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "test";
@@ -176,9 +157,6 @@ async function command(opts, cmd) {
   if (opts.successCache) {
     removeOptionArg(args, "--successCache", 1);
     removeOptionArg(args, "--successCacheDir");
-    const cacheDir = path.resolve(
-      opts.successCacheDir ?? "node_modules/.cache/backstage-cli"
-    );
     const { _: parsedArgs } = await yargs__default.default(args).options(jestCli.yargsOptions).argv;
     if (parsedArgs.length > 0) {
       throw new Error(
@@ -192,6 +170,7 @@ async function command(opts, cmd) {
         `The --successCache flag can not be combined with the --shard flag`
       );
     }
+    const cache = new SuccessCache.SuccessCache("test", opts.successCacheDir);
     const graph = await getPackageGraph();
     const projectHashes = /* @__PURE__ */ new Map();
     const outputSuccessCache = new Array();
@@ -199,7 +178,7 @@ async function command(opts, cmd) {
     globalWithCache.__backstageCli_jestSuccessCache = {
       // This is called by `config/jest.js` after the project configs have been gathered
       async filterConfigs(projectConfigs, globalRootConfig) {
-        const cache = await readCache(cacheDir);
+        const cacheEntries = await cache.read();
         const lockfile = await cliNode.Lockfile.load(
           paths.paths.resolveTargetRoot("yarn.lock")
         );
@@ -231,8 +210,10 @@ async function command(opts, cmd) {
           hash.update(lockfile.getDependencyTreeHash(packageName));
           const sha = hash.digest("hex");
           projectHashes.set(packageName, sha);
-          if (cache?.includes(sha)) {
-            console.log(`Skipped ${packageName} due to cache hit`);
+          if (cacheEntries.has(sha)) {
+            if (!selectedProjects || selectedProjects.includes(packageName)) {
+              console.log(`Skipped ${packageName} due to cache hit`);
+            }
             outputSuccessCache.push(sha);
             return void 0;
           }
@@ -262,7 +243,7 @@ async function command(opts, cmd) {
             outputSuccessCache.push(sha);
           }
         }
-        await writeCache(cacheDir, outputSuccessCache);
+        await cache.write(outputSuccessCache);
       }
     };
   }

package/dist/commands/start/command.cjs.js

@@ -9,6 +9,7 @@ async function command(opts) {
   const options = {
     configPaths: opts.config,
     checksEnabled: Boolean(opts.check),
+    linkedWorkspace: opts.link,
     inspectEnabled: opts.inspect,
     inspectBrkEnabled: opts.inspectBrk,
     require: opts.require

package/dist/commands/start/startBackend.cjs.js

@@ -2,109 +2,40 @@
 
 var fs = require('fs-extra');
 var paths = require('../../lib/paths.cjs.js');
-var backend = require('../../lib/bundler/backend.cjs.js');
-require('yn');
-require('path');
-require('webpack');
-require('react-dev-utils/FileSizeReporter');
-require('react-dev-utils/formatWebpackMessages');
-require('chalk');
-require('eslint-webpack-plugin');
-require('fork-ts-checker-webpack-plugin');
-require('html-webpack-plugin');
-require('@module-federation/enhanced/webpack');
-require('@backstage/cli-common');
-require('react-dev-utils/ModuleScopePlugin');
-require('run-script-webpack-plugin');
-require('@pmmmwh/react-refresh-webpack-plugin');
-require('@manypkg/get-packages');
-require('webpack-node-externals');
-require('../../lib/bundler/optimization.cjs.js');
-require('lodash/pickBy');
-require('../../lib/run.cjs.js');
-require('mini-css-extract-plugin');
-require('../../lib/version.cjs.js');
-require('../../lib/bundler/packageDetection.cjs.js');
-require('react-dev-utils/openBrowser');
-require('webpack-dev-server');
-require('@backstage/config-loader');
-require('@backstage/config');
-require('@backstage/cli-node');
-var startBackendExperimental = require('../../lib/experimental/startBackendExperimental.cjs.js');
+var runBackend = require('../../lib/runner/runBackend.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function startBackend(options) {
-  if (!process.env.LEGACY_BACKEND_START) {
-    const waitForExit = await startBackendExperimental.startBackendExperimental({
-      entry: "src/index",
-      checksEnabled: false,
-      // not supported
-      inspectEnabled: options.inspectEnabled,
-      inspectBrkEnabled: options.inspectBrkEnabled,
-      require: options.require
-    });
-    await waitForExit();
-  } else {
-    console.warn(
-      "LEGACY_BACKEND_START is deprecated and will be removed in a future release"
-    );
-    const waitForExit = await cleanDistAndServeBackend({
-      entry: "src/index",
-      checksEnabled: options.checksEnabled,
-      inspectEnabled: options.inspectEnabled,
-      inspectBrkEnabled: options.inspectBrkEnabled,
-      require: options.require
-    });
-    await waitForExit();
-  }
+  const waitForExit = await runBackend.runBackend({
+    entry: "src/index",
+    inspectEnabled: options.inspectEnabled,
+    inspectBrkEnabled: options.inspectBrkEnabled,
+    linkedWorkspace: options.linkedWorkspace,
+    require: options.require
+  });
+  await waitForExit();
 }
 async function startBackendPlugin(options) {
-  if (!process.env.LEGACY_BACKEND_START) {
-    const hasDevIndexEntry = await fs__default.default.pathExists(
-      paths.paths.resolveTarget("dev", "index.ts")
-    );
-    if (!hasDevIndexEntry) {
-      console.warn(
-        `The 'dev' directory is missing. Please create a proper dev/index.ts in order to start the plugin.`
-      );
-      return;
-    }
-    const waitForExit = await startBackendExperimental.startBackendExperimental({
-      entry: "dev/index",
-      checksEnabled: false,
-      // not supported
-      inspectEnabled: options.inspectEnabled,
-      inspectBrkEnabled: options.inspectBrkEnabled,
-      require: options.require
-    });
-    await waitForExit();
-  } else {
-    const hasEntry = await fs__default.default.pathExists(paths.paths.resolveTarget("src", "run.ts"));
-    if (!hasEntry) {
-      console.warn(
-        `src/run.ts is missing. Please create the file or run the command without LEGACY_BACKEND_START`
-      );
-      return;
-    }
+  const hasDevIndexEntry = await fs__default.default.pathExists(
+    paths.paths.resolveTarget("dev", "index.ts")
+  );
+  if (!hasDevIndexEntry) {
     console.warn(
-      "LEGACY_BACKEND_START is deprecated and will be removed in a future release"
+      `The 'dev' directory is missing. Please create a proper dev/index.ts in order to start the plugin.`
     );
-    const waitForExit = await cleanDistAndServeBackend({
-      entry: "src/run",
-      checksEnabled: options.checksEnabled,
-      inspectEnabled: options.inspectEnabled,
-      inspectBrkEnabled: options.inspectBrkEnabled,
-      require: options.require
-    });
-    await waitForExit();
+    return;
   }
-}
-async function cleanDistAndServeBackend(options) {
-  await fs__default.default.remove(paths.paths.resolveTarget("dist"));
-  return backend.serveBackend(options);
+  const waitForExit = await runBackend.runBackend({
+    entry: "dev/index",
+    inspectEnabled: options.inspectEnabled,
+    inspectBrkEnabled: options.inspectBrkEnabled,
+    require: options.require,
+    linkedWorkspace: options.linkedWorkspace
+  });
+  await waitForExit();
 }
 
 exports.startBackend = startBackend;

package/dist/commands/start/startFrontend.cjs.js

@@ -1,28 +1,25 @@
 'use strict';
 
 var fs = require('fs-extra');
-require('webpack');
+require('yn');
 require('path');
+require('webpack');
+require('react-dev-utils/FileSizeReporter');
+require('react-dev-utils/formatWebpackMessages');
 require('chalk');
 require('eslint-webpack-plugin');
 require('fork-ts-checker-webpack-plugin');
 require('html-webpack-plugin');
 require('@module-federation/enhanced/webpack');
-require('@backstage/cli-common');
 require('react-dev-utils/ModuleScopePlugin');
-require('run-script-webpack-plugin');
 require('@pmmmwh/react-refresh-webpack-plugin');
 var paths = require('../../lib/paths.cjs.js');
-require('@manypkg/get-packages');
-require('webpack-node-externals');
 require('../../lib/bundler/optimization.cjs.js');
 require('lodash/pickBy');
 require('../../lib/run.cjs.js');
 require('mini-css-extract-plugin');
 require('../../lib/version.cjs.js');
-require('yn');
-require('react-dev-utils/FileSizeReporter');
-require('react-dev-utils/formatWebpackMessages');
+require('@manypkg/get-packages');
 require('../../lib/bundler/packageDetection.cjs.js');
 var moduleFederation = require('../../lib/bundler/moduleFederation.cjs.js');
 var server = require('../../lib/bundler/server.cjs.js');
@@ -35,6 +32,7 @@ async function startFrontend(options) {
     configPaths: options.configPaths,
     verifyVersions: options.verifyVersions,
     skipOpenBrowser: options.skipOpenBrowser,
+    linkedWorkspace: options.linkedWorkspace,
     moduleFederation: moduleFederation.getModuleFederationOptions(
       name,
       options.isModuleFederationRemote

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

@@ -160,7 +160,10 @@ var bump = async (opts) => {
     });
     console.log();
     if (pattern === DEFAULT_PATTERN_GLOB) {
-      await bumpBackstageJsonVersion(releaseManifest.releaseVersion);
+      await bumpBackstageJsonVersion(
+        releaseManifest.releaseVersion,
+        hasYarnPlugin
+      );
     } else {
       console.log(
         chalk__default.default.yellow(
@@ -306,7 +309,7 @@ async function getBackstageJson() {
     throw e;
   });
 }
-async function bumpBackstageJsonVersion(version) {
+async function bumpBackstageJsonVersion(version, useYarnPlugin) {
   const backstageJson = await getBackstageJson();
   const prevVersion = backstageJson?.version;
   if (prevVersion === version) {
@@ -316,7 +319,10 @@ async function bumpBackstageJsonVersion(version) {
   if (prevVersion) {
     const from = encodeURIComponent(prevVersion);
     const to = encodeURIComponent(version);
-    const link = `https://backstage.github.io/upgrade-helper/?from=${from}&to=${to}`;
+    let link = `https://backstage.github.io/upgrade-helper/?from=${from}&to=${to}`;
+    if (useYarnPlugin) {
+      link += "&yarnPlugin=1";
+    }
     console.log(
       yellow(
         `Upgraded from release ${green(prevVersion)} to ${green(

package/dist/lib/bundler/bundle.cjs.js

@@ -26,7 +26,7 @@ function applyContextToError(error, moduleName) {
   ${error}`;
 }
 async function buildBundle(options) {
-  const { statsJsonEnabled, schema: configSchema } = options;
+  const { statsJsonEnabled, schema: configSchema, rspack } = options;
   const paths$1 = paths.resolveBundlingPaths(options);
   const publicPaths = await paths.resolveOptionalBundlingPaths({
     targetDir: options.targetDir,
@@ -91,7 +91,7 @@ async function buildBundle(options) {
       { spaces: 2 }
     );
   }
-  const { stats } = await build(configs, isCi);
+  const { stats } = await build(configs, isCi, rspack);
   if (!stats) {
     throw new Error("No stats returned");
   }
@@ -119,10 +119,11 @@ async function buildBundle(options) {
     );
   }
 }
-async function build(configs, isCi) {
+async function build(configs, isCi, rspack) {
+  const bundler = rspack ?? webpack__default.default;
   const stats = await new Promise(
     (resolve, reject) => {
-      webpack__default.default(configs, (err, buildStats) => {
+      bundler(configs, (err, buildStats) => {
         if (err) {
           if (err.message) {
             const { errors: errors2 } = formatWebpackMessages__default.default({