@backstage/cli 0.35.3 → 0.35.4-next.2

package/CHANGELOG.md

@@ -1,12 +1,49 @@
 # @backstage/cli
 
-## 0.35.3
+## 0.35.4-next.2
 
 ### Patch Changes
 
-- 5683c85: Bump to latest zod to ensure it has the latest features
+- 20131c5: Added support for CSS exports in package builds. When a package declares a CSS file in its `exports` field (e.g., `"./styles.css": "./src/styles.css"`), the CLI will automatically bundle it during `backstage-cli package build`, resolving any `@import` statements. The export path is rewritten from `src/` to `dist/` at publish time.
+
+  Fixed `backstage-cli repo fix` to not add `typesVersions` entries for non-script exports like CSS files.
+
+- 6ce4a13: Removed `/alpha` from `scaffolderActionsExtensionPoint` import
+- 73351c2: Updated dependency `webpack` to `~5.104.0`.
 - Updated dependencies
-  - @backstage/cli-node@0.2.17
+  - @backstage/integration@1.20.0-next.2
+  - @backstage/cli-node@0.2.18-next.1
+  - @backstage/config-loader@1.10.8-next.0
+
+## 0.35.4-next.1
+
+### Patch Changes
+
+- 5e3ef57: Added support for the new `peerModules` metadata field in `package.json`. This field allows plugin packages to declare modules that should be installed alongside them for cross-plugin integrations. The field is validated by `backstage-cli repo fix --publish`.
+- Updated dependencies
+  - @backstage/integration@1.20.0-next.1
+  - @backstage/cli-node@0.2.18-next.1
+
+## 0.35.3-next.0
+
+### Patch Changes
+
+- cfd8103: Updated catalog provider module template to use stable catalog extension points from `@backstage/plugin-catalog-node` instead of alpha exports.
+- 7455dae: Use node prefix on native imports
+- 4fc7bf0: Bump to tar v7
+- 122d39c: Completely removed support for the deprecated `app.experimental.packages` configuration. Replace existing usage directly with `app.packages`.
+- 69d880e: Bump to latest zod to ensure it has the latest features
+- Updated dependencies
+  - @backstage/config-loader@1.10.8-next.0
+  - @backstage/eslint-plugin@0.2.1-next.0
+  - @backstage/integration@1.19.3-next.0
+  - @backstage/cli-common@0.1.18-next.0
+  - @backstage/cli-node@0.2.17-next.0
+  - @backstage/catalog-model@1.7.6
+  - @backstage/config@1.3.6
+  - @backstage/errors@1.2.7
+  - @backstage/release-manifests@0.0.13
+  - @backstage/types@1.2.2
 
 ## 0.35.2
 

package/bin/backstage-cli

@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-const path = require('path');
+const path = require('node:path');
 
 // Figure out whether we're running inside the backstage repo or as an installed dependency
 /* eslint-disable-next-line no-restricted-syntax */
-const isLocal = require('fs').existsSync(path.resolve(__dirname, '../src'));
+const isLocal = require('node:fs').existsSync(
+  path.resolve(__dirname, '../src'),
+);
 
 if (!isLocal || process.env.BACKSTAGE_E2E_CLI_TEST) {
   require('..');

package/config/eslint-factory.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const { join: joinPath } = require('path');
+const { join: joinPath } = require('node:path');
 
 /**
  * Creates a ESLint configuration that extends the base Backstage configuration.
@@ -235,7 +235,7 @@ function createConfigForRole(dir, role, extraConfig = {}) {
             name: '@mui/material',
             message: "Please import '@mui/material/...' instead.",
           },
-          ...require('module').builtinModules,
+          ...require('node:module').builtinModules,
           ...(extraConfig.restrictedImports ?? []),
         ],
         // https://mui.com/material-ui/guides/minimizing-bundle-size/

package/config/jest.js

@@ -15,9 +15,9 @@
  */
 
 const fs = require('fs-extra');
-const path = require('path');
-const crypto = require('crypto');
-const glob = require('util').promisify(require('glob'));
+const path = require('node:path');
+const crypto = require('node:crypto');
+const glob = require('node:util').promisify(require('glob'));
 const { version } = require('../package.json');
 const paths = require('@backstage/cli-common').findPaths(process.cwd());
 const {

package/config/jestFileTransform.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const path = require('path');
+const path = require('node:path');
 
 module.exports = {
   process(src, filename) {

package/config/jestRejectNetworkRequests.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-const http = require('http');
-const https = require('https');
+const http = require('node:http');
+const https = require('node:https');
 
 const errorMessage = 'Network requests are not allowed in tests';
 

package/config/jestSucraseTransform.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const { createHash } = require('crypto');
+const { createHash } = require('node:crypto');
 const { transform } = require('sucrase');
 const sucrasePkg = require('sucrase/package.json');
 

package/config/jestYamlTransform.js

@@ -15,7 +15,7 @@
  */
 
 const yaml = require('yaml');
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 function createTransformer(config) {
   const process = source => {

package/config/nodeTransform.cjs

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-const { pathToFileURL } = require('url');
+const { pathToFileURL } = require('node:url');
 const { transformSync } = require('@swc/core');
 const { addHook } = require('pirates');
-const { Module } = require('module');
+const { Module } = require('node:module');
 
 // This hooks into module resolution and overrides imports of packages that
 // exist in the linked workspace to instead be resolved from the linked workspace.
 if (process.env.BACKSTAGE_CLI_LINKED_WORKSPACE) {
-  const { join: joinPath } = require('path');
+  const { join: joinPath } = require('node:path');
   const { getPackagesSync } = require('@manypkg/get-packages');
   const { packages: linkedPackages, root: linkedRoot } = getPackagesSync(
     process.env.BACKSTAGE_CLI_LINKED_WORKSPACE,

package/config/nodeTransformHooks.mjs

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { dirname, extname, resolve as resolvePath } from 'path';
-import { fileURLToPath } from 'url';
+import { dirname, extname, resolve as resolvePath } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { transformFile } from '@swc/core';
 import { isBuiltin } from 'node:module';
-import { readFile } from 'fs/promises';
-import { existsSync } from 'fs';
+import { readFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
 
 // @ts-check
 

package/dist/lib/cache/SuccessCache.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var node_path = require('node:path');
+var path = require('node:path');
 var paths = require('../paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -21,7 +21,7 @@ class SuccessCache {
     return input.replaceAll(paths.paths.targetRoot, "");
   }
   constructor(name, basePath) {
-    this.#path = node_path.resolve(basePath ?? DEFAULT_CACHE_BASE_PATH, name);
+    this.#path = path.resolve(basePath ?? DEFAULT_CACHE_BASE_PATH, name);
   }
   async read() {
     try {
@@ -54,7 +54,7 @@ class SuccessCache {
       }
     }
     for (const item of removed) {
-      await fs__default.default.unlink(node_path.resolve(this.#path, item));
+      await fs__default.default.unlink(path.resolve(this.#path, item));
     }
     return returned;
   }
@@ -68,9 +68,9 @@ class SuccessCache {
         (item) => item.endsWith(`_${key}`)
       );
       for (const trimmedItem of trimmedItems) {
-        await fs__default.default.unlink(node_path.resolve(this.#path, trimmedItem));
+        await fs__default.default.unlink(path.resolve(this.#path, trimmedItem));
       }
-      await fs__default.default.writeFile(node_path.resolve(this.#path, `${now}_${key}`), empty);
+      await fs__default.default.writeFile(path.resolve(this.#path, `${now}_${key}`), empty);
     }
   }
 }

package/dist/lib/entryPoints.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var path = require('path');
+var path = require('node:path');
 
 const defaultIndex = {
   mount: ".",
@@ -8,17 +8,19 @@ const defaultIndex = {
   name: "index",
   ext: ".ts"
 };
+const SCRIPT_EXTS = [".js", ".jsx", ".ts", ".tsx"];
 function parseEntryPoint(mount, path$1) {
+  const ext = path.extname(path$1);
   let name = mount;
   if (name === ".") {
     name = "index";
   } else if (name.startsWith("./")) {
     name = name.slice(2);
   }
-  if (name.includes("/")) {
+  if (name.includes("/") && SCRIPT_EXTS.includes(ext)) {
     throw new Error(`Mount point '${mount}' may not contain multiple slashes`);
   }
-  return { mount, path: path$1, name, ext: path.extname(path$1) };
+  return { mount, path: path$1, name, ext };
 }
 function readEntryPoints(pkg) {
   const exp = pkg.exports;

package/dist/lib/parallel.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var os = require('os');
-var worker_threads = require('worker_threads');
+var os = require('node:os');
+var node_worker_threads = require('node:worker_threads');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -65,7 +65,7 @@ async function runWorkerQueueThreads(options) {
   let itemIndex = 0;
   await Promise.all(
     Array(threadCount).fill(0).map(async () => {
-      const thread = new worker_threads.Worker(`(${workerQueueThread})(${workerFactory})`, {
+      const thread = new node_worker_threads.Worker(`(${workerQueueThread})(${workerFactory})`, {
         eval: true,
         workerData
       });
@@ -107,7 +107,7 @@ async function runWorkerQueueThreads(options) {
   return results;
 }
 function workerQueueThread(workerFuncFactory) {
-  const { parentPort, workerData } = require("worker_threads");
+  const { parentPort, workerData } = require("node:worker_threads");
   Promise.resolve().then(() => workerFuncFactory(workerData)).then(
     (workerFunc) => {
       parentPort.on("message", async (message) => {

package/dist/lib/typeDistProject.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var cliNode = require('@backstage/cli-node');
-var path = require('path');
+var path = require('node:path');
 var tsMorph = require('ts-morph');
 var paths = require('./paths.cjs.js');
 

package/dist/modules/build/commands/package/build/command.cjs.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var fs = require('fs-extra');
 var packager = require('../../../lib/builder/packager.cjs.js');
 var types = require('../../../lib/builder/types.cjs.js');
 var role = require('../../../../../lib/role.cjs.js');
@@ -12,6 +13,7 @@ var chalk = require('chalk');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
 async function command(opts) {
@@ -64,8 +66,12 @@ async function command(opts) {
   if (roleInfo.output.includes("types")) {
     outputs.add(types.Output.types);
   }
+  const packageJson = await fs__default.default.readJson(
+    paths.paths.resolveTarget("package.json")
+  );
   return packager.buildPackage({
     outputs,
+    packageJson,
     minify: Boolean(opts.minify),
     workspacePackages: await cliNode.PackageGraph.listTargetPackages()
   });

package/dist/modules/build/commands/package/start/resolveLinkedWorkspace.cjs.js

@@ -2,7 +2,7 @@
 
 var errors = require('@backstage/errors');
 var fs = require('fs-extra');
-var posix = require('path/posix');
+var posix = require('node:path/posix');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 

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

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var paths = require('../../../../../lib/paths.cjs.js');
 var runBackend = require('../../../lib/runner/runBackend.cjs.js');
 

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

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 require('yn');
 require('@rspack/core');
 require('react-dev-utils/FileSizeReporter');

package/dist/modules/build/commands/package/start/startPackage.cjs.js

@@ -2,7 +2,7 @@
 
 var startBackend = require('./startBackend.cjs.js');
 var startFrontend = require('./startFrontend.cjs.js');
-var path = require('path');
+var path = require('node:path');
 var glob = require('glob');
 
 function resolveEntryPath(entrypoint = "dev", targetDir) {

package/dist/modules/build/commands/repo/build.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var path = require('path');
+var path = require('node:path');
 var packager = require('../../lib/builder/packager.cjs.js');
 var paths = require('../../../../lib/paths.cjs.js');
 var cliNode = require('@backstage/cli-node');

package/dist/modules/build/commands/repo/start.cjs.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var cliNode = require('@backstage/cli-node');
-var path = require('path');
+var path = require('node:path');
 var paths = require('../../../../lib/paths.cjs.js');
 var resolveLinkedWorkspace = require('../package/start/resolveLinkedWorkspace.cjs.js');
 var startPackage = require('../package/start/startPackage.cjs.js');
-var util = require('util');
+var node_util = require('node:util');
 
 const ACCEPTED_PACKAGE_ROLES = [
   "frontend",
@@ -112,7 +112,7 @@ async function resolvePackageOptions(targetPackages, options) {
       );
       return [];
     }
-    const { values: parsedOpts } = util.parseArgs({
+    const { values: parsedOpts } = node_util.parseArgs({
       args: startScript.split(" "),
       strict: false,
       options: {

package/dist/modules/build/lib/buildBackend.cjs.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var os = require('os');
+var os = require('node:os');
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var tar = require('tar');
 var createDistWorkspace = require('./packager/createDistWorkspace.cjs.js');
 var parallel = require('../../../lib/parallel.cjs.js');
@@ -12,9 +12,27 @@ var cliNode = require('@backstage/cli-node');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
 var os__default = /*#__PURE__*/_interopDefaultCompat(os);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-var tar__default = /*#__PURE__*/_interopDefaultCompat(tar);
+var tar__namespace = /*#__PURE__*/_interopNamespaceCompat(tar);
 
 const BUNDLE_FILE = "bundle.tar.gz";
 const SKELETON_FILE = "skeleton.tar.gz";
@@ -46,7 +64,7 @@ async function buildBackend(options) {
       path.resolve(tmpDir, SKELETON_FILE),
       path.resolve(distDir, SKELETON_FILE)
     );
-    await tar__default.default.create(
+    await tar__namespace.create(
       {
         file: path.resolve(distDir, BUNDLE_FILE),
         cwd: tmpDir,

package/dist/modules/build/lib/buildFrontend.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var bundle = require('./bundler/bundle.cjs.js');
 var moduleFederation = require('./bundler/moduleFederation.cjs.js');
 require('chalk');

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

@@ -2,8 +2,8 @@
 
 var chalk = require('chalk');
 var fs = require('fs-extra');
-var crypto = require('crypto');
-var path = require('path');
+var crypto = require('node:crypto');
+var path = require('node:path');
 var commonjs = require('@rollup/plugin-commonjs');
 var resolve = require('@rollup/plugin-node-resolve');
 var postcss = require('rollup-plugin-postcss');
@@ -210,7 +210,8 @@ async function makeRollupConfigs(options) {
         esbuild__default.default({
           target: "ES2023",
           minify: options.minify
-        })
+        }),
+        plugins.cssEntryPoints({ entryPoints: entryPoints$1, targetDir })
       ]
     });
   }

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

@@ -3,7 +3,7 @@
 var fs = require('fs-extra');
 var rollup = require('rollup');
 var chalk = require('chalk');
-var path = require('path');
+var path = require('node:path');
 var paths = require('../../../../lib/paths.cjs.js');
 var config = require('./config.cjs.js');
 var types = require('./types.cjs.js');
@@ -90,7 +90,8 @@ const buildPackage = async (options) => {
   } catch {
   }
   const rollupConfigs = await config.makeRollupConfigs(options);
-  await fs__default.default.remove(path.resolve(options.targetDir ?? paths.paths.targetDir, "dist"));
+  const targetDir = options.targetDir ?? paths.paths.targetDir;
+  await fs__default.default.remove(path.resolve(targetDir, "dist"));
   const buildTasks = rollupConfigs.map(rollupBuild);
   await Promise.all(buildTasks);
 };

package/dist/modules/build/lib/builder/plugins.cjs.js

@@ -1,12 +1,16 @@
 'use strict';
 
 var fs = require('fs-extra');
-var path = require('path');
+var postcss = require('postcss');
+var postcssImport = require('postcss-import');
+var path = require('node:path');
 var rollupPluginutils = require('rollup-pluginutils');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+var postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
+var postcssImport__default = /*#__PURE__*/_interopDefaultCompat(postcssImport);
 
 function forwardFileImports(options) {
   const filter = rollupPluginutils.createFilter(options.include, options.exclude);
@@ -85,6 +89,37 @@ function forwardFileImports(options) {
     }
   };
 }
+function cssEntryPoints(options) {
+  const cssEntries = options.entryPoints.filter((ep) => ep.ext === ".css");
+  const generatedFor = /* @__PURE__ */ new Set();
+  return {
+    name: "backstage-css-entry-points",
+    async generateBundle(outputOptions, _bundle, isWrite) {
+      if (!isWrite) {
+        return;
+      }
+      const dir = outputOptions.dir || path.dirname(outputOptions.file);
+      if (generatedFor.has(dir)) {
+        return;
+      }
+      generatedFor.add(dir);
+      for (const entryPoint of cssEntries) {
+        const sourcePath = path.resolve(options.targetDir, entryPoint.path);
+        const outputPath = entryPoint.path.replace(/^(\.\/)?src\//, "");
+        const source = await fs__default.default.readFile(sourcePath, "utf8");
+        const result = await postcss__default.default([postcssImport__default.default()]).process(source, {
+          from: sourcePath
+        });
+        this.emitFile({
+          type: "asset",
+          fileName: outputPath,
+          source: result.css
+        });
+      }
+    }
+  };
+}
 
+exports.cssEntryPoints = cssEntryPoints;
 exports.forwardFileImports = forwardFileImports;
 //# sourceMappingURL=plugins.cjs.js.map

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

@@ -2,7 +2,7 @@
 
 var yn = require('yn');
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var core = require('@rspack/core');
 var FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 var formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var path = require('path');
+var path = require('node:path');
 var core = require('@rspack/core');
 var ESLintRspackPlugin = require('eslint-rspack-plugin');
 var tsCheckerRspackPlugin = require('ts-checker-rspack-plugin');

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var path = require('path');
+var path = require('node:path');
 var getPackages = require('@manypkg/get-packages');
 var paths = require('../../../../lib/paths.cjs.js');
 

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

@@ -4,7 +4,7 @@ var config = require('@backstage/config');
 var chokidar = require('chokidar');
 var fs = require('fs-extra');
 var PQueue = require('p-queue');
-var path = require('path');
+var path = require('node:path');
 var paths = require('../../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -15,7 +15,7 @@ var PQueue__default = /*#__PURE__*/_interopDefaultCompat(PQueue);
 
 const DETECTED_MODULES_MODULE_NAME = "__backstage-autodetected-plugins__";
 function readPackageDetectionConfig(config$1) {
-  const packages = config$1.getOptional("app.packages") ?? config$1.getOptional("app.experimental.packages");
+  const packages = config$1.getOptional("app.packages");
   if (packages === void 0 || packages === null) {
     return void 0;
   }

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

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var paths = require('../../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }

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

@@ -2,7 +2,7 @@
 
 var chalk = require('chalk');
 var fs = require('fs-extra');
-var path = require('path');
+var path = require('node:path');
 var openBrowser = require('react-dev-utils/openBrowser');
 var core = require('@rspack/core');
 var devServer = require('@rspack/dev-server');