@backstage/cli 0.35.4-next.2 → 0.35.5-next.0

package/dist/modules/build/lib/bundler/config.cjs.js

@@ -7,7 +7,6 @@ var tsCheckerRspackPlugin = require('ts-checker-rspack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 var rspack = require('@module-federation/enhanced/rspack');
-var paths = require('../../../../lib/paths.cjs.js');
 var fs = require('fs-extra');
 var optimization = require('./optimization.cjs.js');
 var pickBy = require('lodash/pickBy');
@@ -28,17 +27,17 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var pickBy__default = /*#__PURE__*/_interopDefaultCompat(pickBy);
 var yn__default = /*#__PURE__*/_interopDefaultCompat(yn);
 
-function resolveBaseUrl(config, moduleFederation) {
+function resolveBaseUrl(config, moduleFederationRemote) {
   const baseUrl = config.getOptionalString("app.baseUrl");
-  const defaultBaseUrl = moduleFederation?.mode === "remote" ? `http://localhost:${process.env.PORT ?? "3000"}` : "http://localhost:3000";
+  const defaultBaseUrl = moduleFederationRemote ? `http://localhost:${process.env.PORT ?? "3000"}` : "http://localhost:3000";
   try {
     return new URL(baseUrl ?? "/", defaultBaseUrl);
   } catch (error) {
     throw new Error(`Invalid app.baseUrl, ${error}`);
   }
 }
-function resolveEndpoint(config, moduleFederation) {
-  const url = resolveBaseUrl(config, moduleFederation);
+function resolveEndpoint(config, moduleFederationRemote) {
+  const url = resolveBaseUrl(config, moduleFederationRemote);
   return {
     host: config.getOptionalString("app.listen.host") ?? url.hostname,
     port: config.getOptionalNumber("app.listen.port") ?? Number(url.port) ?? (url.protocol === "https:" ? 443 : 80)
@@ -62,7 +61,7 @@ async function readBuildInfo() {
     );
   }
   const { version: packageVersion } = await fs__default.default.readJson(
-    paths.paths.resolveTarget("package.json")
+    cliCommon.targetPaths.resolve("package.json")
   );
   return {
     cliVersion: version.version,
@@ -77,12 +76,12 @@ async function createConfig(paths, options) {
     checksEnabled,
     isDev,
     frontendConfig,
-    moduleFederation,
+    moduleFederationRemote,
     publicSubPath = "",
     webpack
   } = options;
   const { plugins, loaders } = transforms.transforms(options);
-  const validBaseUrl = resolveBaseUrl(frontendConfig, moduleFederation);
+  const validBaseUrl = resolveBaseUrl(frontendConfig, moduleFederationRemote);
   let publicPath = validBaseUrl.pathname.replace(/\/$/, "");
   if (publicSubPath) {
     publicPath = `${publicPath}${publicSubPath}`.replace("//", "/");
@@ -90,7 +89,7 @@ async function createConfig(paths, options) {
   if (isDev) {
     const { host, port } = resolveEndpoint(
       options.frontendConfig,
-      options.moduleFederation
+      options.moduleFederationRemote
     );
     const refreshOptions = {
       overlay: {
@@ -129,7 +128,7 @@ async function createConfig(paths, options) {
       Buffer: ["buffer", "Buffer"]
     })
   );
-  if (options.moduleFederation?.mode !== "remote") {
+  if (!options.moduleFederationRemote) {
     const templateOptions = {
       meta: {
         "backstage-app-mode": options?.appMode ?? "public"
@@ -164,79 +163,22 @@ async function createConfig(paths, options) {
       })
     );
   }
-  if (options.moduleFederation) {
-    const isRemote = options.moduleFederation?.mode === "remote";
+  if (options.moduleFederationRemote) {
     const AdaptedModuleFederationPlugin = webpack ? require("@module-federation/enhanced/webpack").ModuleFederationPlugin : rspack.ModuleFederationPlugin;
-    const exposes = options.moduleFederation?.exposes ? Object.fromEntries(
-      Object.entries(options.moduleFederation?.exposes).map(([k, v]) => [
-        k,
-        path.resolve(paths.targetPath, v)
-      ])
+    const exposes = options.moduleFederationRemote.exposes ? Object.fromEntries(
+      Object.entries(options.moduleFederationRemote?.exposes).map(
+        ([k, v]) => [k, path.resolve(paths.targetPath, v)]
+      )
     ) : {
       ".": paths.targetEntry
     };
     plugins.push(
       new AdaptedModuleFederationPlugin({
-        ...isRemote && {
-          filename: "remoteEntry.js",
-          exposes
-        },
-        name: options.moduleFederation.name,
+        filename: "remoteEntry.js",
+        exposes,
+        name: options.moduleFederationRemote.name,
         runtime: false,
-        shared: {
-          // React
-          react: {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote,
-            ...isRemote && { import: false }
-          },
-          "react-dom": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote,
-            ...isRemote && { import: false }
-          },
-          // React Router
-          "react-router": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote,
-            ...isRemote && { import: false }
-          },
-          "react-router-dom": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote,
-            ...isRemote && { import: false }
-          },
-          // MUI v4
-          // not setting import: false for MUI packages as this
-          // will break once Backstage moves to BUI
-          "@material-ui/core/styles": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote
-          },
-          "@material-ui/styles": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote
-          },
-          // MUI v5
-          // not setting import: false for MUI packages as this
-          // will break once Backstage moves to BUI
-          "@mui/material/styles/": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote
-          },
-          "@emotion/react": {
-            singleton: true,
-            requiredVersion: "*",
-            eager: !isRemote
-          }
-        }
+        shared: options.moduleFederationRemote.sharedDependencies
       })
     );
   }
@@ -337,9 +279,9 @@ async function createConfig(paths, options) {
       rules: loaders
     },
     output: {
-      uniqueName: options.moduleFederation?.name,
+      uniqueName: options.moduleFederationRemote?.name,
       path: paths.targetDist,
-      publicPath: options.moduleFederation?.mode === "remote" ? "auto" : `${publicPath}/`,
+      publicPath: options.moduleFederationRemote ? "auto" : `${publicPath}/`,
       filename: isDev ? "[name].js" : "static/[name].[contenthash:8].js",
       chunkFilename: isDev ? "[name].chunk.js" : "static/[name].[contenthash:8].chunk.js",
       ...isDev ? {

package/dist/modules/build/lib/bundler/hasReactDomClient.cjs.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function hasReactDomClient() {
   try {
     require.resolve("react-dom/client", {
-      paths: [paths.paths.targetDir]
+      paths: [cliCommon.targetPaths.dir]
     });
     return true;
   } catch {

package/dist/modules/build/lib/bundler/linkWorkspaces.cjs.js

@@ -2,7 +2,7 @@
 
 var path = require('node:path');
 var getPackages = require('@manypkg/get-packages');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 async function createWorkspaceLinkingPlugins(bundler, workspace) {
   const { packages: linkedPackages, root: linkedRoot } = await getPackages.getPackages(
@@ -23,7 +23,7 @@ async function createWorkspaceLinkingPlugins(bundler, workspace) {
       /^react(?:-router)?(?:-dom)?$/,
       (resource) => {
         if (!path.relative(linkedRoot.dir, resource.context).startsWith("..")) {
-          resource.context = paths.paths.targetDir;
+          resource.context = cliCommon.targetPaths.dir;
         }
       }
     )

package/dist/modules/build/lib/bundler/moduleFederation.cjs.js

@@ -1,25 +1,23 @@
 'use strict';
 
-var chalk = require('chalk');
-var entryPoints = require('../../../../lib/entryPoints.cjs.js');
+var entryPoints = require('../entryPoints.cjs.js');
 var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
+var moduleFederationCommon = require('@backstage/module-federation-common');
+var path = require('node:path');
+var fs = require('fs-extra');
+var chokidar = require('chokidar');
+var PQueue = require('p-queue');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
-var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+var chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+var PQueue__default = /*#__PURE__*/_interopDefaultCompat(PQueue);
 
-async function getModuleFederationOptions(packageJson, packageDir, isModuleFederationRemote) {
-  if (!isModuleFederationRemote && !process.env.EXPERIMENTAL_MODULE_FEDERATION) {
-    return void 0;
-  }
-  console.log(
-    chalk__default.default.yellow(
-      `\u26A0\uFE0F  WARNING: Module federation is experimental and will receive immediate breaking changes in the future.`
-    )
-  );
+async function getModuleFederationRemoteOptions(packageJson, packageDir) {
   let exposes;
   const packageRole = packageJson.backstage?.role;
-  if (isModuleFederationRemote && packageJson.exports && packageRole) {
+  if (packageJson.exports && packageRole) {
     const project = await typeDistProject.createTypeDistProject();
     exposes = Object.fromEntries(
       entryPoints.readEntryPoints(packageJson).filter((ep) => {
@@ -39,14 +37,99 @@ async function getModuleFederationOptions(packageJson, packageDir, isModuleFeder
     );
   }
   return {
-    mode: isModuleFederationRemote ? "remote" : "host",
     // The default output mode requires the name to be a usable as a code
     // symbol, there might be better options here but for now we need to
     // sanitize the name.
     name: packageJson.name.replaceAll("@", "").replaceAll("/", "__").replaceAll("-", "_"),
-    exposes
+    exposes,
+    sharedDependencies: moduleFederationCommon.defaultRemoteSharedDependencies()
+  };
+}
+function prepareRuntimeSharedDependenciesScript(hostSharedDependencies) {
+  const items = Object.entries(hostSharedDependencies).map(
+    ([name, sharedDep]) => {
+      if (!sharedDep.version) {
+        throw new Error(`Version is required for shared dependency '${name}'`);
+      }
+      return {
+        name,
+        version: sharedDep.version,
+        lib: name,
+        // Coverted into import below
+        shareConfig: {
+          singleton: sharedDep.singleton,
+          requiredVersion: sharedDep.requiredVersion,
+          eager: sharedDep.eager
+        }
+      };
+    }
+  );
+  return `window['${moduleFederationCommon.BACKSTAGE_RUNTIME_SHARED_DEPENDENCIES_GLOBAL}'] = ${JSON.stringify(
+    { items, version: "v1" },
+    null,
+    2
+  ).replace(
+    /"lib": ("[^"]+")/gm,
+    (_, name) => `"lib": () => import(${name})`
+  )};`;
+}
+const RUNTIME_SHARED_DEPENDENCIES_MODULE_NAME = "__backstage-module-federation-runtime-shared-dependencies__";
+const writeQueue = new PQueue__default.default({ concurrency: 1 });
+async function writeRuntimeSharedDependenciesModule(targetPath, runtimeSharedDependencies) {
+  const script = prepareRuntimeSharedDependenciesScript(
+    runtimeSharedDependencies
+  );
+  await writeQueue.add(async () => {
+    const path$1 = path.join(
+      targetPath,
+      "node_modules",
+      `${RUNTIME_SHARED_DEPENDENCIES_MODULE_NAME}.js`
+    );
+    await fs__default.default.ensureDir(path.dirname(path$1));
+    await fs__default.default.writeFile(path$1, script);
+  });
+}
+function resolveSharedDependencyVersions(targetPath, hostSharedDependencies) {
+  return Object.fromEntries(
+    Object.entries(hostSharedDependencies).filter(([_, sharedDep]) => sharedDep !== void 0).flatMap(([importPath, sharedDep]) => {
+      const moduleName = importPath.startsWith("@") ? importPath.split("/").slice(0, 2).join("/") : importPath.split("/")[0];
+      let version;
+      try {
+        const packagePath = require.resolve(`${moduleName}/package.json`, {
+          paths: [targetPath]
+        });
+        version = require(packagePath).version;
+      } catch (e) {
+        console.log(
+          `Skipping module federation shared dependency '${importPath}' because it could not be resolved.`
+        );
+        return [];
+      }
+      return [[importPath, { ...sharedDep, version }]];
+    })
+  );
+}
+async function createRuntimeSharedDependenciesEntryPoint(options) {
+  const { targetPath, watch } = options;
+  const doWriteSharedDependenciesModule = async () => {
+    const sharedDependencies = moduleFederationCommon.defaultHostSharedDependencies();
+    await writeRuntimeSharedDependenciesModule(
+      targetPath,
+      resolveSharedDependencyVersions(targetPath, sharedDependencies)
+    );
   };
+  if (watch) {
+    const watcher = chokidar__default.default.watch(path.resolve(targetPath, "package.json"));
+    watcher.on("change", async () => {
+      await doWriteSharedDependenciesModule();
+      watch();
+    });
+  }
+  await doWriteSharedDependenciesModule();
+  return [RUNTIME_SHARED_DEPENDENCIES_MODULE_NAME];
 }
 
-exports.getModuleFederationOptions = getModuleFederationOptions;
+exports.createRuntimeSharedDependenciesEntryPoint = createRuntimeSharedDependenciesEntryPoint;
+exports.getModuleFederationRemoteOptions = getModuleFederationRemoteOptions;
+exports.prepareRuntimeSharedDependenciesScript = prepareRuntimeSharedDependenciesScript;
 //# sourceMappingURL=moduleFederation.cjs.js.map

package/dist/modules/build/lib/bundler/packageDetection.cjs.js

@@ -5,7 +5,7 @@ var chokidar = require('chokidar');
 var fs = require('fs-extra');
 var PQueue = require('p-queue');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -96,7 +96,7 @@ async function createDetectedModulesEntryPoint(options) {
     return [];
   }
   const legacyDetectedModulesPath = path.join(
-    paths.paths.targetRoot,
+    cliCommon.targetPaths.rootDir,
     "node_modules",
     `${DETECTED_MODULES_MODULE_NAME}.js`
   );

package/dist/modules/build/lib/bundler/paths.cjs.js

@@ -2,14 +2,14 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 function resolveBundlingPaths(options) {
-  const { entry, targetDir = paths.paths.targetDir } = options;
+  const { entry, targetDir = cliCommon.targetPaths.dir } = options;
   const resolveTargetModule = (pathString) => {
     for (const ext of ["mjs", "js", "ts", "tsx", "jsx"]) {
       const filePath = path.resolve(targetDir, `${pathString}.${ext}`);
@@ -26,7 +26,9 @@ function resolveBundlingPaths(options) {
   } else {
     targetHtml = path.resolve(targetDir, `${entry}.html`);
     if (!fs__default.default.pathExistsSync(targetHtml)) {
-      targetHtml = paths.paths.resolveOwn("templates/serve_index.html");
+      targetHtml = cliCommon.findOwnPaths(__dirname).resolve(
+        "templates/serve_index.html"
+      );
     }
   }
   const targetRunFile = path.resolve(targetDir, "src/run.ts");
@@ -41,10 +43,10 @@ function resolveBundlingPaths(options) {
     targetSrc: path.resolve(targetDir, "src"),
     targetDev: path.resolve(targetDir, "dev"),
     targetEntry: resolveTargetModule(entry),
-    targetTsConfig: paths.paths.resolveTargetRoot("tsconfig.json"),
+    targetTsConfig: cliCommon.targetPaths.resolveRoot("tsconfig.json"),
     targetPackageJson: path.resolve(targetDir, "package.json"),
-    rootNodeModules: paths.paths.resolveTargetRoot("node_modules"),
-    root: paths.paths.targetRoot
+    rootNodeModules: cliCommon.targetPaths.resolveRoot("node_modules"),
+    root: cliCommon.targetPaths.rootDir
   };
 }
 async function resolveOptionalBundlingPaths(options) {

package/dist/modules/build/lib/bundler/server.cjs.js

@@ -6,11 +6,12 @@ var path = require('node:path');
 var openBrowser = require('react-dev-utils/openBrowser');
 var core = require('@rspack/core');
 var devServer = require('@rspack/dev-server');
-var paths$1 = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var config = require('../../../config/lib/config.cjs.js');
 var config$1 = require('./config.cjs.js');
 var packageDetection = require('./packageDetection.cjs.js');
 var paths = require('./paths.cjs.js');
+var moduleFederation = require('./moduleFederation.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -19,8 +20,8 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var openBrowser__default = /*#__PURE__*/_interopDefaultCompat(openBrowser);
 
 async function serveBundle(options) {
-  const paths$2 = paths.resolveBundlingPaths(options);
-  const targetPkg = await fs__default.default.readJson(paths$2.targetPackageJson);
+  const paths$1 = paths.resolveBundlingPaths(options);
+  const targetPkg = await fs__default.default.readJson(paths$1.targetPackageJson);
   if (options.verifyVersions) {
     if (targetPkg.dependencies?.["react-router"]?.includes("beta") || targetPkg.dependencies?.["react-router-dom"]?.includes("beta")) {
       console.warn(
@@ -34,7 +35,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
   }
   checkReactVersion();
   const { name } = await fs__default.default.readJson(
-    path.resolve(options.targetDir ?? paths$1.paths.targetDir, "package.json")
+    path.resolve(options.targetDir ?? cliCommon.targetPaths.dir, "package.json")
   );
   let devServer$1 = void 0;
   let latestFrontendAppConfigs = [];
@@ -78,14 +79,20 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     );
   }
   const { frontendConfig, fullConfig } = cliConfig;
-  const url = config$1.resolveBaseUrl(frontendConfig, options.moduleFederation);
+  const url = config$1.resolveBaseUrl(frontendConfig, options.moduleFederationRemote);
   const { host, port } = config$1.resolveEndpoint(
     frontendConfig,
-    options.moduleFederation
+    options.moduleFederationRemote
   );
   const detectedModulesEntryPoint = await packageDetection.createDetectedModulesEntryPoint({
     config: fullConfig,
-    targetPath: paths$2.targetPath,
+    targetPath: paths$1.targetPath,
+    watch() {
+      triggerReload();
+    }
+  });
+  const moduleFederationSharedDependenciesEntryPoint = await moduleFederation.createRuntimeSharedDependenciesEntryPoint({
+    targetPath: paths$1.targetPath,
     watch() {
       triggerReload();
     }
@@ -102,10 +109,13 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
       return latestFrontendAppConfigs;
     }
   };
-  const config$2 = await config$1.createConfig(paths$2, {
+  const config$2 = await config$1.createConfig(paths$1, {
     ...commonConfigOptions,
-    additionalEntryPoints: detectedModulesEntryPoint,
-    moduleFederation: options.moduleFederation
+    additionalEntryPoints: [
+      ...detectedModulesEntryPoint,
+      ...moduleFederationSharedDependenciesEntryPoint
+    ],
+    moduleFederationRemote: options.moduleFederationRemote
   });
   const bundler = webpack ?? core.rspack;
   const DevServer = webpack ? require("webpack-dev-server") : devServer.RspackDevServer;
@@ -131,11 +141,11 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
         publicPath: config$2.output?.publicPath,
         stats: "errors-warnings"
       },
-      static: paths$2.targetPublic ? {
+      static: paths$1.targetPublic ? {
         publicPath: config$2.output?.publicPath,
-        directory: paths$2.targetPublic
+        directory: paths$1.targetPublic
       } : void 0,
-      historyApiFallback: options.moduleFederation?.mode === "remote" ? false : {
+      historyApiFallback: options.moduleFederationRemote ? false : {
         // Paths with dots should still use the history fallback.
         // See https://github.com/facebookincubator/create-react-app/issues/387.
         disableDotRule: true,
@@ -198,7 +208,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
 function checkReactVersion() {
   try {
     const reactPkgPath = require.resolve("react/package.json", {
-      paths: [paths$1.paths.targetRoot]
+      paths: [cliCommon.targetPaths.rootDir]
     });
     const reactPkg = require(reactPkgPath);
     if (reactPkg.version.startsWith("16.")) {

package/dist/modules/build/lib/packager/createDistWorkspace.cjs.js

@@ -6,14 +6,12 @@ var path = require('node:path');
 var os = require('node:os');
 var tar = require('tar');
 var partition = require('lodash/partition');
-var paths = require('../../../../lib/paths.cjs.js');
 var cliCommon = require('@backstage/cli-common');
 var _package = require('../../../../packages/cli/package.json.cjs.js');
 var packager = require('../builder/packager.cjs.js');
 var types = require('../builder/types.cjs.js');
 var productionPack = require('./productionPack.cjs.js');
 var cliNode = require('@backstage/cli-node');
-var parallel = require('../../../../lib/parallel.cjs.js');
 var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -111,7 +109,9 @@ async function createDistWorkspace(packageNames, options = {}) {
           targetDir: pkg.dir,
           packageJson: pkg.packageJson,
           outputs,
-          logPrefix: `${chalk__default.default.cyan(path.relative(paths.paths.targetRoot, pkg.dir))}: `,
+          logPrefix: `${chalk__default.default.cyan(
+            path.relative(cliCommon.targetPaths.rootDir, pkg.dir)
+          )}: `,
           minify: options.minify,
           workspacePackages: packages
         });
@@ -119,7 +119,7 @@ async function createDistWorkspace(packageNames, options = {}) {
     }
     await packager.buildPackages(standardBuilds);
     if (customBuild.length > 0) {
-      await parallel.runParallelWorkers({
+      await cliNode.runConcurrentTasks({
         items: customBuild,
         worker: async ({ name, dir, args }) => {
           await cliCommon.run(["yarn", "run", "build", ...args || []], {
@@ -141,11 +141,11 @@ 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(paths.paths.resolveTargetRoot(src), path.resolve(targetDir, dest));
+    await fs__default.default.copy(cliCommon.targetPaths.resolveRoot(src), path.resolve(targetDir, dest));
   }
   if (options.skeleton) {
     const skeletonFiles = targets.map((target) => {
-      const dir = path.relative(paths.paths.targetRoot, target.dir);
+      const dir = path.relative(cliCommon.targetPaths.rootDir, target.dir);
       return path.join(dir, "package.json");
     }).sort();
     await tar__namespace.create(
@@ -175,7 +175,7 @@ async function moveToDistWorkspace(workspaceDir, localPackages, alwaysPack, enab
   await Promise.all(
     fastPackPackages.map(async (target) => {
       console.log(`Moving ${target.name} into dist workspace`);
-      const outputDir = path.relative(paths.paths.targetRoot, target.dir);
+      const outputDir = path.relative(cliCommon.targetPaths.rootDir, target.dir);
       const absoluteOutputPath = path.resolve(workspaceDir, outputDir);
       await productionPack.productionPack({
         packageDir: target.dir,
@@ -190,7 +190,7 @@ async function moveToDistWorkspace(workspaceDir, localPackages, alwaysPack, enab
     await cliCommon.run(["yarn", "pack", "--filename", archivePath], {
       cwd: target.dir
     }).waitForExit();
-    const outputDir = path.relative(paths.paths.targetRoot, target.dir);
+    const outputDir = path.relative(cliCommon.targetPaths.rootDir, target.dir);
     const absoluteOutputPath = path.resolve(workspaceDir, outputDir);
     await fs__default.default.ensureDir(absoluteOutputPath);
     await tar__namespace.extract({
@@ -223,7 +223,7 @@ async function moveToDistWorkspace(workspaceDir, localPackages, alwaysPack, enab
   for (const target of unsafePackages) {
     await pack(target, `temp-package.tgz`);
   }
-  await parallel.runParallelWorkers({
+  await cliNode.runConcurrentTasks({
     items: safePackages.map((target, index) => ({ target, index })),
     worker: async ({ target, index }) => {
       await pack(target, `temp-package-${index}.tgz`);

package/dist/modules/build/lib/packager/productionPack.cjs.js

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var npmPackList = require('npm-packlist');
 var path = require('node:path');
-var entryPoints = require('../../../../lib/entryPoints.cjs.js');
+var entryPoints = require('../entryPoints.cjs.js');
 var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

package/dist/{lib → modules/build/lib}/role.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var paths = require('./paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var cliNode = require('@backstage/cli-node');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -12,7 +12,7 @@ async function findRoleFromCommand(opts) {
   if (opts.role) {
     return cliNode.PackageRoles.getRoleInfo(opts.role)?.role;
   }
-  const pkg = await fs__default.default.readJson(paths.paths.resolveTarget("package.json"));
+  const pkg = await fs__default.default.readJson(cliCommon.targetPaths.resolve("package.json"));
   const info = cliNode.PackageRoles.getRoleFromPackage(pkg);
   if (!info) {
     throw new Error(`Target package must have 'backstage.role' set`);

package/dist/modules/build/lib/runner/runBackend.cjs.js

@@ -7,7 +7,7 @@ var ServerDataStore = require('../ipc/ServerDataStore.cjs.js');
 var debounce = require('lodash/debounce');
 var node_url = require('node:url');
 var path = require('node:path');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var spawn = require('cross-spawn');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -86,7 +86,7 @@ async function runBackend(options) {
           ...process.env,
           BACKSTAGE_CLI_LINKED_WORKSPACE: options.linkedWorkspace,
           BACKSTAGE_CLI_CHANNEL: "1",
-          ESBK_TSCONFIG_PATH: paths.paths.resolveTargetRoot("tsconfig.json")
+          ESBK_TSCONFIG_PATH: cliCommon.targetPaths.resolveRoot("tsconfig.json")
         },
         serialization: "advanced"
       }

package/dist/modules/config/lib/config.cjs.js

@@ -2,13 +2,13 @@
 
 var configLoader = require('@backstage/config-loader');
 var config = require('@backstage/config');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var getPackages = require('@manypkg/get-packages');
 var cliNode = require('@backstage/cli-node');
 var path = require('node:path');
 
 async function loadCliConfig(options) {
-  const targetDir = options.targetDir ?? paths.paths.targetDir;
+  const targetDir = options.targetDir ?? cliCommon.targetPaths.dir;
   const { packages } = await getPackages.getPackages(targetDir);
   let localPackageNames;
   if (options.fromPackage) {
@@ -31,14 +31,14 @@ async function loadCliConfig(options) {
   const schema = await configLoader.loadConfigSchema({
     dependencies: localPackageNames,
     // Include the package.json in the project root if it exists
-    packagePaths: [paths.paths.resolveTargetRoot("package.json")],
+    packagePaths: [cliCommon.targetPaths.resolveRoot("package.json")],
     noUndeclaredProperties: options.strict
   });
   const source = configLoader.ConfigSources.default({
     allowMissingDefaultConfig: true,
     substitutionFunc: options.mockEnv ? async (name) => process.env[name] || "x" : void 0,
     watch: Boolean(options.watch),
-    rootDir: paths.paths.targetRoot,
+    rootDir: cliCommon.targetPaths.rootDir,
     argv: options.args.flatMap((t) => ["--config", path.resolve(targetDir, t)])
   });
   const appConfigs = await new Promise((resolve, reject) => {