@backstage/cli 0.13.2-next.0 → 0.14.1

package/CHANGELOG.md

@@ -1,5 +1,85 @@
 # @backstage/cli
 
+## 0.14.1
+
+### Patch Changes
+
+- 5cc7f48400: Fixed a bug in the built-in Jest configuration that prevented it from identifying packages that had migrated to using the new package scripts to run tests.
+- 49ae6c9573: chore(deps-dev): bump `@types/rollup-plugin-postcss` from 2.0.1 to 3.1.4
+- d64b8d3678: chore(deps): bump `minimatch` from 3.0.4 to 5.0.0
+- d2e9d2a34f: chore(deps): bump `@hot-loader/react-dom` from 16.13.0 to 17.0.2
+- c2f3a548cf: Fix building of backends with `repo build --all`, where it would previously only work if the build was executed within the backend package.
+- 3d7ed5377a: Ignore setupTests and the file inside ./dev folder recursively. Eslint
+  can not resolve relative paths as we defined in the rule import/no-extraneous-dependencies, and it does not apply this rule.
+
+  A downside to use a recursive definition would be to checking all `dev` folders, which might not be wanted. Ensure you don't use
+  the `dev` folder out of scope (must be used for dev. env. only)
+
+- Updated dependencies
+  - @backstage/config-loader@0.9.6
+
+## 0.14.0
+
+### Minor Changes
+
+- 1fc0cd3896: Bumped Webpack and Rollup `svgr` dependencies and updated the AST template for `.icon.svg` modules. This means that SVG icon imports are now using SVGO v2.
+
+### Patch Changes
+
+- 0b74c72987: Added a new experimental and hidden `backstage-cli repo lint` command that can be used to lint all packages in the project, similar to `lerna run lint`.
+- 532dae9c4c: The `versions:bump --release next` command is updated to compare the `main` and `next` release manifests and prefer the latest.
+- 1ed305728b: Bump `node-fetch` to version 2.6.7 and `cross-fetch` to version 3.1.5
+- c77c5c7eb6: Added `backstage.role` to `package.json`
+- 22862486de: The `versions:bump` command now filters out `npm_` environment configuration when running `yarn install`. This has the effect of allowing it to consider local configuration files within the repository, which is the behavior that one would expect.
+- 22862486de: The `versions:bump` command now also considers the root `package.json` when searching for updates. It has also received updates to its output, including a link the [Backstage upgrade helper](https://backstage.github.io/upgrade-helper) and silenced `yarn install` output.
+- 7410e12268: Several changes were made to the new experimental package roles system. Unless you have been experimenting with using this new system, these changes have no affect on your project.
+
+  Renamed the `backstage-cli migrate package-role` command to `backstage-cli migrate package-roles`.
+
+  Updated the package role definitions by renaming `app` to `frontend`, `plugin-frontend` to `frontend-plugin`, `plugin-frontend-module` to `frontend-plugin-module`, `plugin-backend` to `backend-plugin`, and `plugin-backend-module` to `backend-plugin-module`
+
+  The `backstage-cli migrate package-scripts` received several tweaks to make it more accurate. It now tries to maintain existing script arguments, like `--config` parameters for `build` and `start` scripts.
+
+  The `script` command category has been renamed to `package`.
+
+  The `backstage-cli package build` command set an incorrect target directory for `app` and `backend` packages, which has been fixed.
+
+  The `backend:bundle` and `repo build` command for the `backend` role was previously ignoring building of bundled packages that had migrated to use package roles and the standard build script, this has now been fixed.
+
+- c6bbafb516: Updated the default [sucrase](https://github.com/alangpierce/sucrase)-based Jest transform to include source maps if the environment variable `ENABLE_SOURCE_MAPS` is non-empty. This can be used to better support editor test debugging integrations.
+- 7410e12268: The `test` command now automatically adds `--passWithNoTests` to the Jest invocation. To revert this behavior, pass `--passWithNoTests=false` or `--no-passWithNoTests`.
+- Updated dependencies
+  - @backstage/config-loader@0.9.4
+  - @backstage/errors@0.2.1
+  - @backstage/release-manifests@0.0.2
+  - @backstage/cli-common@0.1.7
+  - @backstage/config@0.1.14
+  - @backstage/types@0.1.2
+
+## 0.13.2
+
+### Patch Changes
+
+- bbbaa8ed61: The `plugin:diff` command no longer validates the existence of any of the files within `dev/` or `src/`.
+- eaf67f0578: Introduced initial support for an experimental `backstage.role` field in package.json, as well as experimental and hidden `migrate` and `script` sub-commands. We do not recommend usage of any of these additions yet.
+- aeb5c69abb: Introduces a new `--release` parameter to the `backstage-cli versions:bump` command.
+  The release can be either a specific version, for example `0.99.1`, or the latest `main` or `next` release.
+  The default behavior is to bump to the latest `main` release.
+- d59b90852a: The experimental types build enabled by `--experimental-type-build` now runs in a separate worker thread.
+- 50a19ff8dd: The file path printed by the default lint formatter is now relative to the repository root, rather than the individual package.
+- 63181dee79: Tweaked frontend bundling configuration to avoid leaking declarations into global scope.
+- fae2aee878: Removed the `import/no-duplicates` lint rule from the frontend and backend ESLint configurations. This rule is quite expensive to execute and only provides a purely cosmetic benefit, so we opted to remove it from the set of default rules. If you would like to keep this rule you can add it back in your local ESLint configuration:
+
+  ```js
+    'import/no-duplicates': 'warn'
+  ```
+
+- b906f98119: Rather than calling `yarn pack`, the `build-workspace` and `backend-bundle` commands now move files directly whenever possible. This cuts out several `yarn` invocations and speeds the packing process up by several orders of magnitude.
+- d0c71e2aa4: Switched the `lint` command to invoke ESLint directly through its Node.js API rather than spawning a new process.
+- d59b90852a: Introduced an experimental and hidden `repo` sub-command, that contains commands that operate on an entire monorepo rather than individual packages.
+- Updated dependencies
+  - @backstage/release-manifests@0.0.1
+
 ## 0.13.2-next.0
 
 ### Patch Changes

package/config/eslint.js

@@ -55,8 +55,8 @@ module.exports = {
         devDependencies: [
           '**/*.test.*',
           '**/*.stories.*',
-          'src/setupTests.*',
-          'dev/**',
+          '**/src/setupTests.*',
+          '**/dev/**',
         ],
         optionalDependencies: true,
         peerDependencies: true,

package/config/jest.js

@@ -102,9 +102,10 @@ async function getProjectConfig(targetPath, displayName) {
     },
 
     transform: {
-      '\\.(js|jsx|ts|tsx|mjs|cjs)$': require.resolve(
-        './jestSucraseTransform.js',
-      ),
+      '\\.(js|jsx|ts|tsx|mjs|cjs)$': [
+        require.resolve('./jestSucraseTransform.js'),
+        { enableSourceMaps: Boolean(process.env.ENABLE_SOURCE_MAPS) },
+      ],
       '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg|eot|woff|woff2|ttf)$':
         require.resolve('./jestFileTransform.js'),
       '\\.(yaml)$': require.resolve('jest-transform-yaml'),
@@ -174,7 +175,10 @@ async function getRootConfig() {
       // script to determine whether a given package should be tested
       const packageData = await fs.readJson(packagePath);
       const testScript = packageData.scripts && packageData.scripts.test;
-      if (testScript && testScript.includes('backstage-cli test')) {
+      const isSupportedTestScript =
+        testScript?.includes('backstage-cli test') ||
+        testScript?.includes('backstage-cli package test');
+      if (testScript && isSupportedTestScript) {
         return await getProjectConfig(projectPath, packageData.name);
       }
 

package/config/jestSucraseTransform.js

@@ -21,50 +21,71 @@ const sucrasePluginPkg = require('@sucrase/jest-plugin/package.json');
 
 const ESM_REGEX = /\b(?:import|export)\b/;
 
-function process(source, filePath) {
-  let transforms;
+function createTransformer(config) {
+  const process = (source, filePath) => {
+    let transforms;
 
-  if (filePath.endsWith('.esm.js')) {
-    transforms = ['imports'];
-  } else if (filePath.endsWith('.js')) {
-    // This is a very rough filter to avoid transforming things that we quickly
-    // can be sure are definitely not ESM modules.
-    if (ESM_REGEX.test(source)) {
-      transforms = ['imports', 'jsx']; // JSX within .js is currently allowed
+    if (filePath.endsWith('.esm.js')) {
+      transforms = ['imports'];
+    } else if (filePath.endsWith('.js')) {
+      // This is a very rough filter to avoid transforming things that we quickly
+      // can be sure are definitely not ESM modules.
+      if (ESM_REGEX.test(source)) {
+        transforms = ['imports', 'jsx']; // JSX within .js is currently allowed
+      }
+    } else if (filePath.endsWith('.jsx')) {
+      transforms = ['jsx', 'imports'];
+    } else if (filePath.endsWith('.ts')) {
+      transforms = ['typescript', 'imports'];
+    } else if (filePath.endsWith('.tsx')) {
+      transforms = ['typescript', 'jsx', 'imports'];
     }
-  } else if (filePath.endsWith('.jsx')) {
-    transforms = ['jsx', 'imports'];
-  } else if (filePath.endsWith('.ts')) {
-    transforms = ['typescript', 'imports'];
-  } else if (filePath.endsWith('.tsx')) {
-    transforms = ['typescript', 'jsx', 'imports'];
-  }
 
-  // Only apply the jest transform to the test files themselves
-  if (transforms && filePath.includes('.test.')) {
-    transforms.push('jest');
-  }
+    // Only apply the jest transform to the test files themselves
+    if (transforms && filePath.includes('.test.')) {
+      transforms.push('jest');
+    }
+
+    if (transforms) {
+      const { code, sourceMap: map } = transform(source, {
+        transforms,
+        filePath,
+        disableESTransforms: true,
+        sourceMapOptions: {
+          compiledFilename: filePath,
+        },
+      });
+      if (config.enableSourceMaps) {
+        const b64 = Buffer.from(JSON.stringify(map), 'utf8').toString('base64');
+        const suffix = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${b64}`;
+        // Include both inline and object source maps, as inline source maps are
+        // needed for support of some editor integrations.
+        return { code: `${code}\n${suffix}`, map };
+      }
+      // We only return the `map` result if source maps are enabled, as they
+      // have a negative impact on the coverage accuracy.
+      return code;
+    }
 
-  if (transforms) {
-    return transform(source, {
-      transforms,
-      filePath,
-      disableESTransforms: true,
-    }).code;
-  }
+    return source;
+  };
 
-  return source;
-}
+  // TODO: contribute something like this to @sucrase/jest-plugin
+  const getCacheKey = sourceText => {
+    return createHash('md5')
+      .update(sourceText)
+      .update(Buffer.alloc(1))
+      .update(sucrasePkg.version)
+      .update(Buffer.alloc(1))
+      .update(sucrasePluginPkg.version)
+      .update(Buffer.alloc(1))
+      .update(JSON.stringify(config))
+      .update(Buffer.alloc(1))
+      .update('1') // increment whenever the transform logic in this file changes
+      .digest('hex');
+  };
 
-// TODO: contribute something like this to @sucrase/jest-plugin
-function getCacheKey(sourceText) {
-  return createHash('md5')
-    .update(sourceText)
-    .update(Buffer.alloc(1))
-    .update(sucrasePkg.version)
-    .update(Buffer.alloc(1))
-    .update(sucrasePluginPkg.version)
-    .digest('hex');
+  return { process, getCacheKey };
 }
 
-module.exports = { process, getCacheKey };
+module.exports = { createTransformer };

package/dist/cjs/{PackageGraph-96b2e6ef.cjs.js → PackageGraph-452ec2ff.cjs.js}

@@ -1,7 +1,44 @@
 'use strict';
 
+var path = require('path');
 var getPackages = require('@manypkg/get-packages');
-var index = require('./index-8b03e1f7.cjs.js');
+var index = require('./index-f4a6cd4f.cjs.js');
+var errors = require('@backstage/errors');
+var child_process = require('child_process');
+var util = require('util');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+
+const execFile = util.promisify(child_process.execFile);
+async function runGit(...args) {
+  var _a, _b;
+  try {
+    const { stdout } = await execFile("git", args, {
+      shell: true,
+      cwd: index.paths.targetRoot
+    });
+    return stdout.trim().split(/\r\n|\r|\n/);
+  } catch (error) {
+    errors.assertError(error);
+    if (error.stderr || typeof error.code === "number") {
+      const stderr = (_a = error.stderr) == null ? void 0 : _a.toString("utf8");
+      const msg = (_b = stderr == null ? void 0 : stderr.trim()) != null ? _b : `with exit code ${error.code}`;
+      throw new Error(`git ${args[0]} failed, ${msg}`);
+    }
+    throw new errors.ForwardedError("Unknown execution error", error);
+  }
+}
+async function listChangedFiles(ref) {
+  if (!ref) {
+    throw new Error("ref is required");
+  }
+  const [base] = await runGit("merge-base", "HEAD", ref);
+  const tracked = await runGit("diff", "--name-only", base);
+  const untracked = await runGit("ls-files", "--others", "--exclude-standard");
+  return Array.from(/* @__PURE__ */ new Set([...tracked, ...untracked]));
+}
 
 class PackageGraph extends Map {
   static async listTargetPackages() {
@@ -74,7 +111,33 @@ class PackageGraph extends Map {
     }
     return targets;
   }
+  async listChangedPackages(options) {
+    var _a, _b;
+    const changedFiles = await listChangedFiles(options.ref);
+    const dirMap = new Map(Array.from(this.values()).map((pkg) => [
+      path__default["default"].relative(index.paths.targetRoot, pkg.dir).split(path__default["default"].sep).join(path__default["default"].posix.sep) + path__default["default"].posix.sep,
+      pkg
+    ]));
+    const packageDirs = Array.from(dirMap.keys());
+    const result = new Array();
+    let searchIndex = 0;
+    changedFiles.sort();
+    packageDirs.sort();
+    for (const packageDir of packageDirs) {
+      while (searchIndex < changedFiles.length && changedFiles[searchIndex] < packageDir) {
+        searchIndex += 1;
+      }
+      if ((_a = changedFiles[searchIndex]) == null ? void 0 : _a.startsWith(packageDir)) {
+        searchIndex += 1;
+        result.push(dirMap.get(packageDir));
+        while ((_b = changedFiles[searchIndex]) == null ? void 0 : _b.startsWith(packageDir)) {
+          searchIndex += 1;
+        }
+      }
+    }
+    return result;
+  }
 }
 
 exports.PackageGraph = PackageGraph;
-//# sourceMappingURL=PackageGraph-96b2e6ef.cjs.js.map
+//# sourceMappingURL=PackageGraph-452ec2ff.cjs.js.map

package/dist/cjs/{backend-fb6d6170.cjs.js → backend-f623f925.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var webpack = require('webpack');
-var paths = require('./paths-f6ca70df.cjs.js');
+var paths = require('./paths-67855a60.cjs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,4 +33,4 @@ async function serveBackend(options) {
 }
 
 exports.serveBackend = serveBackend;
-//# sourceMappingURL=backend-fb6d6170.cjs.js.map
+//# sourceMappingURL=backend-f623f925.cjs.js.map

package/dist/cjs/{build-b3c69eff.cjs.js → build-c6587a6a.cjs.js}

@@ -11,18 +11,18 @@ require('run-script-webpack-plugin');
 require('webpack-node-externals');
 require('@backstage/cli-common');
 require('@manypkg/get-packages');
-require('./paths-f6ca70df.cjs.js');
+require('./paths-67855a60.cjs.js');
 require('mini-css-extract-plugin');
-var index = require('./index-8b03e1f7.cjs.js');
-require('./run-8da8f918.cjs.js');
+var index = require('./index-f4a6cd4f.cjs.js');
+require('./run-b09132d3.cjs.js');
 require('eslint-webpack-plugin');
 require('lodash/pickBy');
-var bundle = require('./bundle-4ce79bce.cjs.js');
+var bundle = require('./bundle-bcefdcef.cjs.js');
 require('webpack-dev-server');
 require('react-dev-utils/openBrowser');
-var parallel = require('./parallel-e73a4058.cjs.js');
-var config = require('./config-f2365900.cjs.js');
-require('./svgrTemplate-f19e974c.cjs.js');
+var parallel = require('./parallel-d8e5bcbf.cjs.js');
+var config = require('./config-7c2e1f5a.cjs.js');
+require('./svgrTemplate-b7a4ee52.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/config/package.json');
@@ -32,9 +32,11 @@ require('util');
 require('yn');
 require('react-dev-utils/FileSizeReporter');
 require('react-dev-utils/formatWebpackMessages');
+require('os');
+require('worker_threads');
 require('@backstage/config-loader');
 require('@backstage/config');
-require('./PackageGraph-96b2e6ef.cjs.js');
+require('./PackageGraph-452ec2ff.cjs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -54,4 +56,4 @@ var build = async (cmd) => {
 };
 
 exports["default"] = build;
-//# sourceMappingURL=build-b3c69eff.cjs.js.map
+//# sourceMappingURL=build-c6587a6a.cjs.js.map

package/dist/cjs/{build-8fd28a6d.cjs.js → build-d22951cc.cjs.js}

@@ -1,11 +1,11 @@
 'use strict';
 
-var packager = require('./packager-3bddd88f.cjs.js');
+var packager = require('./packager-3c7ef6f2.cjs.js');
 require('fs-extra');
 require('rollup');
 require('chalk');
 require('path');
-require('./index-8b03e1f7.cjs.js');
+require('./index-f4a6cd4f.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
@@ -21,11 +21,12 @@ require('rollup-plugin-dts');
 require('@rollup/plugin-json');
 require('@rollup/plugin-yaml');
 require('rollup-pluginutils');
-require('./svgrTemplate-f19e974c.cjs.js');
+require('./svgrTemplate-b7a4ee52.cjs.js');
+require('./parallel-d8e5bcbf.cjs.js');
+require('os');
 require('worker_threads');
-require('./packageRoles-f4b169a7.cjs.js');
+require('./packageRoles-be5cc4e7.cjs.js');
 require('zod');
-require('./parallel-e73a4058.cjs.js');
 
 var build = async (cmd) => {
   await packager.buildPackage({
@@ -36,4 +37,4 @@ var build = async (cmd) => {
 };
 
 exports["default"] = build;
-//# sourceMappingURL=build-8fd28a6d.cjs.js.map
+//# sourceMappingURL=build-d22951cc.cjs.js.map

package/dist/cjs/{build-93f627fc.cjs.js → build-d555ae41.cjs.js}

@@ -1,11 +1,11 @@
 'use strict';
 
-var packager = require('./packager-3bddd88f.cjs.js');
+var packager = require('./packager-3c7ef6f2.cjs.js');
 require('fs-extra');
 require('rollup');
 require('chalk');
 require('path');
-require('./index-8b03e1f7.cjs.js');
+require('./index-f4a6cd4f.cjs.js');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
@@ -21,11 +21,12 @@ require('rollup-plugin-dts');
 require('@rollup/plugin-json');
 require('@rollup/plugin-yaml');
 require('rollup-pluginutils');
-require('./svgrTemplate-f19e974c.cjs.js');
+require('./svgrTemplate-b7a4ee52.cjs.js');
+require('./parallel-d8e5bcbf.cjs.js');
+require('os');
 require('worker_threads');
-require('./packageRoles-f4b169a7.cjs.js');
+require('./packageRoles-be5cc4e7.cjs.js');
 require('zod');
-require('./parallel-e73a4058.cjs.js');
 
 var build = async (cmd) => {
   await packager.buildPackage({
@@ -36,4 +37,4 @@ var build = async (cmd) => {
 };
 
 exports["default"] = build;
-//# sourceMappingURL=build-93f627fc.cjs.js.map
+//# sourceMappingURL=build-d555ae41.cjs.js.map

package/dist/cjs/{build-9db9aaaf.cjs.js → build-dde37a4d.cjs.js}

@@ -2,12 +2,12 @@
 
 var chalk = require('chalk');
 var path = require('path');
-var packager = require('./packager-3bddd88f.cjs.js');
-var PackageGraph = require('./PackageGraph-96b2e6ef.cjs.js');
-var parallel = require('./parallel-e73a4058.cjs.js');
-var index = require('./index-8b03e1f7.cjs.js');
-var packageRoles = require('./packageRoles-f4b169a7.cjs.js');
-var buildBackend = require('./buildBackend-08cefb3c.cjs.js');
+var packager = require('./packager-3c7ef6f2.cjs.js');
+var PackageGraph = require('./PackageGraph-452ec2ff.cjs.js');
+var parallel = require('./parallel-d8e5bcbf.cjs.js');
+var index = require('./index-f4a6cd4f.cjs.js');
+var packageRoles = require('./packageRoles-be5cc4e7.cjs.js');
+var buildBackend = require('./buildBackend-4890a3fb.cjs.js');
 require('fs-extra');
 require('rollup');
 require('rollup-plugin-peer-deps-external');
@@ -20,14 +20,17 @@ require('rollup-plugin-dts');
 require('@rollup/plugin-json');
 require('@rollup/plugin-yaml');
 require('rollup-pluginutils');
-require('./svgrTemplate-f19e974c.cjs.js');
-require('worker_threads');
+require('./svgrTemplate-b7a4ee52.cjs.js');
 require('@manypkg/get-packages');
+require('@backstage/errors');
+require('child_process');
+require('util');
+require('os');
+require('worker_threads');
 require('commander');
 require('semver');
 require('@backstage/cli-common');
 require('@backstage/config/package.json');
-require('@backstage/errors');
 require('zod');
 require('webpack');
 require('fork-ts-checker-webpack-plugin');
@@ -35,25 +38,22 @@ require('html-webpack-plugin');
 require('react-dev-utils/ModuleScopePlugin');
 require('run-script-webpack-plugin');
 require('webpack-node-externals');
-require('./paths-f6ca70df.cjs.js');
+require('./paths-67855a60.cjs.js');
 require('mini-css-extract-plugin');
-require('./run-8da8f918.cjs.js');
-require('child_process');
-require('util');
+require('./run-b09132d3.cjs.js');
 require('eslint-webpack-plugin');
 require('lodash/pickBy');
-require('./bundle-4ce79bce.cjs.js');
+require('./bundle-bcefdcef.cjs.js');
 require('yn');
 require('react-dev-utils/FileSizeReporter');
 require('react-dev-utils/formatWebpackMessages');
 require('webpack-dev-server');
 require('react-dev-utils/openBrowser');
-require('./config-f2365900.cjs.js');
+require('./config-7c2e1f5a.cjs.js');
 require('@backstage/config-loader');
 require('@backstage/config');
-require('os');
 require('tar');
-require('./createDistWorkspace-f4c0276b.cjs.js');
+require('./createDistWorkspace-7dc77457.cjs.js');
 require('lodash/partition');
 require('npm-packlist');
 
@@ -71,7 +71,7 @@ function createScriptOptionsParser(anyCmd, commandPath) {
     targetCmd = targetCmd == null ? void 0 : targetCmd.commands.find((c) => c.name() === name);
   }
   if (!targetCmd) {
-    throw new Error(`Could not find script command '${commandPath.join(" ")}'`);
+    throw new Error(`Could not find package command '${commandPath.join(" ")}'`);
   }
   const cmd = targetCmd;
   const expectedScript = `backstage-cli ${commandPath.join(" ")}`;
@@ -95,7 +95,7 @@ async function command(cmd) {
   const packages = await PackageGraph.PackageGraph.listTargetPackages();
   const apps = new Array();
   const backends = new Array();
-  const parseBuildScript = createScriptOptionsParser(cmd, ["script", "build"]);
+  const parseBuildScript = createScriptOptionsParser(cmd, ["package", "build"]);
   const options = packages.flatMap((pkg) => {
     var _a, _b, _c;
     const role = (_b = (_a = pkg.packageJson.backstage) == null ? void 0 : _a.role) != null ? _b : packageRoles.detectRoleFromPackage(pkg.packageJson);
@@ -103,7 +103,7 @@ async function command(cmd) {
       console.warn(`Ignored ${pkg.packageJson.name} because it has no role`);
       return [];
     }
-    if (role === "app") {
+    if (role === "frontend") {
       apps.push(pkg);
       return [];
     } else if (role === "backend") {
@@ -142,7 +142,7 @@ async function command(cmd) {
           console.warn(`Ignored ${pkg.packageJson.name} because it does not have a matching build script`);
           return;
         }
-        await buildBackend.buildApp({
+        await buildBackend.buildFrontend({
           targetDir: pkg.dir,
           configPaths: (_b = buildOptions.config) != null ? _b : [],
           writeStats: Boolean(buildOptions.stats)
@@ -170,4 +170,4 @@ async function command(cmd) {
 }
 
 exports.command = command;
-//# sourceMappingURL=build-9db9aaaf.cjs.js.map
+//# sourceMappingURL=build-dde37a4d.cjs.js.map

package/dist/cjs/{buildBackend-08cefb3c.cjs.js → buildBackend-4890a3fb.cjs.js}

@@ -11,21 +11,21 @@ require('run-script-webpack-plugin');
 require('webpack-node-externals');
 require('@backstage/cli-common');
 require('@manypkg/get-packages');
-require('./paths-f6ca70df.cjs.js');
+require('./paths-67855a60.cjs.js');
 require('mini-css-extract-plugin');
-require('./index-8b03e1f7.cjs.js');
-require('./run-8da8f918.cjs.js');
+require('./index-f4a6cd4f.cjs.js');
+require('./run-b09132d3.cjs.js');
 require('eslint-webpack-plugin');
 require('lodash/pickBy');
-var bundle = require('./bundle-4ce79bce.cjs.js');
+var bundle = require('./bundle-bcefdcef.cjs.js');
 require('webpack-dev-server');
 require('react-dev-utils/openBrowser');
-var parallel = require('./parallel-e73a4058.cjs.js');
-var config = require('./config-f2365900.cjs.js');
+var parallel = require('./parallel-d8e5bcbf.cjs.js');
+var config = require('./config-7c2e1f5a.cjs.js');
 var os = require('os');
 var tar = require('tar');
-var createDistWorkspace = require('./createDistWorkspace-f4c0276b.cjs.js');
-var packager = require('./packager-3bddd88f.cjs.js');
+var createDistWorkspace = require('./createDistWorkspace-7dc77457.cjs.js');
+var packager = require('./packager-3c7ef6f2.cjs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,7 +33,7 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 var tar__default = /*#__PURE__*/_interopDefaultLegacy(tar);
 
-async function buildApp(options) {
+async function buildFrontend(options) {
   const { targetDir, writeStats, configPaths } = options;
   const { name } = await fs__default["default"].readJson(path.resolve(targetDir, "package.json"));
   await bundle.buildBundle({
@@ -53,7 +53,10 @@ const SKELETON_FILE = "skeleton.tar.gz";
 async function buildBackend(options) {
   const { targetDir, skipBuildDependencies } = options;
   const pkg = await fs__default["default"].readJson(path.resolve(targetDir, "package.json"));
-  await packager.buildPackage({ outputs: /* @__PURE__ */ new Set([packager.Output.cjs]) });
+  await packager.buildPackage({
+    targetDir: options.targetDir,
+    outputs: /* @__PURE__ */ new Set([packager.Output.cjs])
+  });
   const tmpDir = await fs__default["default"].mkdtemp(path.resolve(os__default["default"].tmpdir(), "backstage-bundle"));
   try {
     await createDistWorkspace.createDistWorkspace([pkg.name], {
@@ -63,11 +66,12 @@ async function buildBackend(options) {
       parallelism: parallel.getEnvironmentParallelism(),
       skeleton: SKELETON_FILE
     });
-    await fs__default["default"].remove(targetDir);
-    await fs__default["default"].mkdir(targetDir);
-    await fs__default["default"].move(path.resolve(tmpDir, SKELETON_FILE), path.resolve(targetDir, SKELETON_FILE));
+    const distDir = path.resolve(targetDir, "dist");
+    await fs__default["default"].remove(distDir);
+    await fs__default["default"].mkdir(distDir);
+    await fs__default["default"].move(path.resolve(tmpDir, SKELETON_FILE), path.resolve(distDir, SKELETON_FILE));
     await tar__default["default"].create({
-      file: path.resolve(targetDir, BUNDLE_FILE),
+      file: path.resolve(distDir, BUNDLE_FILE),
       cwd: tmpDir,
       portable: true,
       noMtime: true,
@@ -78,6 +82,6 @@ async function buildBackend(options) {
   }
 }
 
-exports.buildApp = buildApp;
 exports.buildBackend = buildBackend;
-//# sourceMappingURL=buildBackend-08cefb3c.cjs.js.map
+exports.buildFrontend = buildFrontend;
+//# sourceMappingURL=buildBackend-4890a3fb.cjs.js.map