@backstage/cli 0.34.0-next.1 → 0.34.0

package/CHANGELOG.md

@@ -1,5 +1,72 @@
 # @backstage/cli
 
+## 0.34.0
+
+### Minor Changes
+
+- 38b4243: Added plugin and module templates for the new frontend system. These templates are not included by default, but can be included by adding `@backstage/cli/templates/new-frontend-plugin` and `@backstage/cli/templates/new-frontend-plugin-module` as [custom templates](https://backstage.io/docs/tooling/cli/templates#installing-custom-templates).
+- 923ceb2: **BREAKING**: The new app build based on [Rspack](https://rspack.dev/) is now the default, and the `EXPERIMENTAL_RSPACK` flag has been removed. To revert to the old behavior, set the `LEGACY_WEBPACK_BUILD` environment flag and install the following optional dependencies:
+
+  ```json
+  {
+    "dependencies": {
+      "@module-federation/enhanced": "^0.9.0",
+      "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+      "esbuild-loader": "^4.0.0",
+      "eslint-webpack-plugin": "^4.2.0",
+      "fork-ts-checker-webpack-plugin": "^9.0.0",
+      "mini-css-extract-plugin": "^2.4.2",
+      "terser-webpack-plugin": "^5.1.3",
+      "webpack": "^5.96.0",
+      "webpack-dev-server": "^5.0.0"
+    }
+  }
+  ```
+
+  If you do encounter a blocking issue that forces you to use the old WebPack build, please [open an issue](https://github.com/backstage/backstage/issues) explaining the problem. The WebPack build will be removed in a future release.
+
+- eda80c7: **BREAKING**: Removed support for `.icon.svg` imports, which have been deprecated since the 1.19 release.
+
+### Patch Changes
+
+- 2b8082a: Internal refactor of error handling
+- 8b1bf6e: Deprecated new frontend system config setting `app.experimental.packages` to just `app.packages`. The old config will continue working for the time being, but may be removed in a future release.
+- ead626f: The Node.js transform in `@backstage/cli/config/nodeTransformHooks.mjs` now supports the built-in type stripping in Node.js, which is enabled by default from v22.18.0.
+- a6af768: Allow js files to be processed by the nodeTransform loader
+- Updated dependencies
+  - @backstage/cli-node@0.2.14
+
+## 0.34.0-next.2
+
+### Minor Changes
+
+- 923ceb2: **BREAKING**: The new app build based on [Rspack](https://rspack.dev/) is now the default, and the `EXPERIMENTAL_RSPACK` flag has been removed. To revert to the old behavior, set the `LEGACY_WEBPACK_BUILD` environment flag and install the following optional dependencies:
+
+  ```json
+  {
+    "dependencies": {
+      "@module-federation/enhanced": "^0.9.0",
+      "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+      "esbuild-loader": "^4.0.0",
+      "eslint-webpack-plugin": "^4.2.0",
+      "fork-ts-checker-webpack-plugin": "^9.0.0",
+      "mini-css-extract-plugin": "^2.4.2",
+      "terser-webpack-plugin": "^5.1.3",
+      "webpack": "^5.96.0",
+      "webpack-dev-server": "^5.0.0"
+    }
+  }
+  ```
+
+  If you do encounter a blocking issue that forces you to use the old WebPack build, please [open an issue](https://github.com/backstage/backstage/issues) explaining the problem. The WebPack build will be removed in a future release.
+
+- eda80c7: **BREAKING**: Removed support for `.icon.svg` imports, which have been deprecated since the 1.19 release.
+
+### Patch Changes
+
+- 8b1bf6e: Deprecated new frontend system config setting `app.experimental.packages` to just `app.packages`. The old config will continue working for the time being, but may be removed in a future release.
+- ead626f: The Node.js transform in `@backstage/cli/config/nodeTransformHooks.mjs` now supports the built-in type stripping in Node.js, which is enabled by default from v22.18.0.
+
 ## 0.34.0-next.1
 
 ### Minor Changes

package/asset-types/asset-types.d.ts

@@ -65,44 +65,6 @@ declare module '*.yaml' {
   export default src;
 }
 
-/**
- * @deprecated support for .icon.svg extensions are being removed, inline the SVG elements in a MUI SvgIcon instead.
- * @example
- * ```tsx
- * import SvgIcon from '@material-ui/core/SvgIcon';
- *
- * const MyIcon = () => (
- *   <SvgIcon>
- *     <g>
- *        <path d="..." />
- *      </g>
- *   </SvgIcon>
- * )
- * ```
- */
-declare module '*.icon.svg' {
-  import { ComponentType } from 'react';
-  import { SvgIconProps } from '@material-ui/core';
-
-  /**
-   * @deprecated support for .icon.svg extensions are being removed, inline the SVG elements in a MUI SvgIcon instead.
-   * @example
-   * ```tsx
-   * import SvgIcon from '@material-ui/core/SvgIcon';
-   *
-   * const MyIcon = () => (
-   *   <SvgIcon>
-   *     <g>
-   *        <path d="..." />
-   *      </g>
-   *   </SvgIcon>
-   * )
-   * ```
-   */
-  const Icon: ComponentType<SvgIconProps>;
-  export default Icon;
-}
-
 declare module '*.svg' {
   const src: string;
   export default src;

package/config/nodeTransformHooks.mjs

@@ -255,6 +255,18 @@ export async function load(url, context, nextLoad) {
     return nextLoad(url, { ...context, format });
   }
 
+  // If the Node.js version we're running supports TypeScript, i.e. type
+  // stripping, we hand over to the default loader. This is done for all cases
+  // except if we're loading a .ts file that's been resolved to CommonJS format.
+  // This is because these files aren't actually CommonJS in the Backstage build
+  // system, and need to be transformed to CommonJS.
+  if (
+    format === 'module-typescript' ||
+    (format === 'module-commonjs' && ext !== '.ts')
+  ) {
+    return nextLoad(url, { ...context, format });
+  }
+
   const transformed = await transformFile(fileURLToPath(url), {
     sourceMaps: 'inline',
     module: {

package/dist/lib/errors.cjs.js

@@ -1,17 +1,13 @@
 'use strict';
 
+var errors = require('@backstage/errors');
 var chalk = require('chalk');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
-class CustomError extends Error {
-  get name() {
-    return this.constructor.name;
-  }
-}
-class ExitCodeError extends CustomError {
+class ExitCodeError extends errors.CustomErrorBase {
   code;
   constructor(code, command) {
     super(
@@ -20,26 +16,57 @@ class ExitCodeError extends CustomError {
     this.code = code;
   }
 }
-function exitWithError(error) {
-  if (error instanceof ExitCodeError) {
-    process.stderr.write(`
-${chalk__default.default.red(error.message)}
+function exit(message, code = 1) {
+  process.stderr.write(`
+${chalk__default.default.red(message)}
 
 `);
-    process.exit(error.code);
-  } else {
+  process.exit(code);
+}
+function exitWithError(error) {
+  if (!errors.isError(error)) {
     process.stderr.write(`
-${chalk__default.default.red(`${error.stack}`)}
+${chalk__default.default.red(errors.stringifyError(error))}
 
 `);
     process.exit(1);
   }
-}
-class NotFoundError extends CustomError {
+  switch (error.name) {
+    case "InputError":
+      return exit(
+        error.message,
+        74
+        /* input/output error */
+      );
+    case "NotFoundError":
+      return exit(
+        error.message,
+        127
+        /* command not found */
+      );
+    case "NotImplementedError":
+      return exit(
+        error.message,
+        64
+        /* command line usage error */
+      );
+    case "AuthenticationError":
+    case "NotAllowedError":
+      return exit(
+        error.message,
+        77
+        /* permissino denied */
+      );
+    case "ExitCodeError":
+      return exit(
+        error.message,
+        "code" in error && typeof error.code === "number" ? error.code : 1
+      );
+    default:
+      return exit(errors.stringifyError(error), 1);
+  }
 }
 
-exports.CustomError = CustomError;
 exports.ExitCodeError = ExitCodeError;
-exports.NotFoundError = NotFoundError;
 exports.exitWithError = exitWithError;
 //# sourceMappingURL=errors.cjs.js.map

package/dist/lib/run.cjs.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var child_process = require('child_process');
-var errors$1 = require('./errors.cjs.js');
+var errors = require('./errors.cjs.js');
 var util = require('util');
-var errors = require('@backstage/errors');
+var errors$1 = require('@backstage/errors');
 
 const execFile = util.promisify(child_process.execFile);
 async function run(name, args = [], options = {}) {
@@ -37,14 +37,14 @@ async function runPlain(cmd, ...args) {
     const { stdout } = await execFile(cmd, args, { shell: true });
     return stdout.trim();
   } catch (error) {
-    errors.assertError(error);
+    errors$1.assertError(error);
     if ("stderr" in error) {
       process.stderr.write(error.stderr);
     }
     if (typeof error.code === "number") {
-      throw new errors$1.ExitCodeError(error.code, [cmd, ...args].join(" "));
+      throw new errors.ExitCodeError(error.code, [cmd, ...args].join(" "));
     }
-    throw new errors.ForwardedError("Unknown execution error", error);
+    throw new errors$1.ForwardedError("Unknown execution error", error);
   }
 }
 async function runCheck(cmd, ...args) {
@@ -58,7 +58,7 @@ async function runCheck(cmd, ...args) {
 async function waitForExit(child, name) {
   if (typeof child.exitCode === "number") {
     if (child.exitCode) {
-      throw new errors$1.ExitCodeError(child.exitCode, name);
+      throw new errors.ExitCodeError(child.exitCode, name);
     }
     return;
   }
@@ -66,7 +66,7 @@ async function waitForExit(child, name) {
     child.once("error", (error) => reject(error));
     child.once("exit", (code) => {
       if (code) {
-        reject(new errors$1.ExitCodeError(code, name));
+        reject(new errors.ExitCodeError(code, name));
       } else {
         resolve();
       }

package/dist/lib/version.cjs.js

@@ -3,27 +3,27 @@
 var fs = require('fs-extra');
 var semver = require('semver');
 var paths = require('./paths.cjs.js');
-var _package$1 = require('../packages/backend-plugin-api/package.json.cjs.js');
-var _package$2 = require('../packages/backend-test-utils/package.json.cjs.js');
-var _package$3 = require('../packages/catalog-client/package.json.cjs.js');
-var _package$4 = require('../packages/cli/package.json.cjs.js');
-var _package$5 = require('../packages/config/package.json.cjs.js');
-var _package$6 = require('../packages/core-app-api/package.json.cjs.js');
-var _package$7 = require('../packages/core-components/package.json.cjs.js');
-var _package$8 = require('../packages/core-plugin-api/package.json.cjs.js');
-var _package$9 = require('../packages/dev-utils/package.json.cjs.js');
+var _package$j = require('../packages/backend-plugin-api/package.json.cjs.js');
+var _package$i = require('../packages/backend-test-utils/package.json.cjs.js');
+var _package$h = require('../packages/catalog-client/package.json.cjs.js');
+var _package$g = require('../packages/cli/package.json.cjs.js');
+var _package$f = require('../packages/config/package.json.cjs.js');
+var _package$e = require('../packages/core-app-api/package.json.cjs.js');
+var _package$d = require('../packages/core-components/package.json.cjs.js');
+var _package$c = require('../packages/core-plugin-api/package.json.cjs.js');
+var _package$b = require('../packages/dev-utils/package.json.cjs.js');
 var _package$a = require('../packages/errors/package.json.cjs.js');
-var _package$b = require('../packages/frontend-defaults/package.json.cjs.js');
-var _package$c = require('../packages/frontend-plugin-api/package.json.cjs.js');
-var _package$d = require('../packages/frontend-test-utils/package.json.cjs.js');
-var _package$e = require('../packages/test-utils/package.json.cjs.js');
-var _package$g = require('../plugins/scaffolder-node/package.json.cjs.js');
-var _package$h = require('../plugins/scaffolder-node-test-utils/package.json.cjs.js');
-var _package$i = require('../plugins/auth-backend/package.json.cjs.js');
-var _package$j = require('../plugins/auth-backend-module-guest-provider/package.json.cjs.js');
-var _package$k = require('../plugins/catalog-node/package.json.cjs.js');
-var _package$f = require('../packages/theme/package.json.cjs.js');
-var _package = require('../packages/backend-defaults/package.json.cjs.js');
+var _package$9 = require('../packages/frontend-defaults/package.json.cjs.js');
+var _package$8 = require('../packages/frontend-plugin-api/package.json.cjs.js');
+var _package$7 = require('../packages/frontend-test-utils/package.json.cjs.js');
+var _package$6 = require('../packages/test-utils/package.json.cjs.js');
+var _package$4 = require('../plugins/scaffolder-node/package.json.cjs.js');
+var _package$3 = require('../plugins/scaffolder-node-test-utils/package.json.cjs.js');
+var _package$2 = require('../plugins/auth-backend/package.json.cjs.js');
+var _package$1 = require('../plugins/auth-backend-module-guest-provider/package.json.cjs.js');
+var _package = require('../plugins/catalog-node/package.json.cjs.js');
+var _package$5 = require('../packages/theme/package.json.cjs.js');
+var _package$k = require('../packages/backend-defaults/package.json.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -31,27 +31,27 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
 
 const packageVersions = {
-  "@backstage/backend-defaults": _package.version,
-  "@backstage/backend-plugin-api": _package$1.version,
-  "@backstage/backend-test-utils": _package$2.version,
-  "@backstage/catalog-client": _package$3.version,
-  "@backstage/cli": _package$4.version,
-  "@backstage/config": _package$5.version,
-  "@backstage/core-app-api": _package$6.version,
-  "@backstage/core-components": _package$7.version,
-  "@backstage/core-plugin-api": _package$8.version,
-  "@backstage/dev-utils": _package$9.version,
+  "@backstage/backend-defaults": _package$k.version,
+  "@backstage/backend-plugin-api": _package$j.version,
+  "@backstage/backend-test-utils": _package$i.version,
+  "@backstage/catalog-client": _package$h.version,
+  "@backstage/cli": _package$g.version,
+  "@backstage/config": _package$f.version,
+  "@backstage/core-app-api": _package$e.version,
+  "@backstage/core-components": _package$d.version,
+  "@backstage/core-plugin-api": _package$c.version,
+  "@backstage/dev-utils": _package$b.version,
   "@backstage/errors": _package$a.version,
-  "@backstage/frontend-defaults": _package$b.version,
-  "@backstage/frontend-plugin-api": _package$c.version,
-  "@backstage/frontend-test-utils": _package$d.version,
-  "@backstage/test-utils": _package$e.version,
-  "@backstage/theme": _package$f.version,
-  "@backstage/plugin-scaffolder-node": _package$g.version,
-  "@backstage/plugin-scaffolder-node-test-utils": _package$h.version,
-  "@backstage/plugin-auth-backend": _package$i.version,
-  "@backstage/plugin-auth-backend-module-guest-provider": _package$j.version,
-  "@backstage/plugin-catalog-node": _package$k.version
+  "@backstage/frontend-defaults": _package$9.version,
+  "@backstage/frontend-plugin-api": _package$8.version,
+  "@backstage/frontend-test-utils": _package$7.version,
+  "@backstage/test-utils": _package$6.version,
+  "@backstage/theme": _package$5.version,
+  "@backstage/plugin-scaffolder-node": _package$4.version,
+  "@backstage/plugin-scaffolder-node-test-utils": _package$3.version,
+  "@backstage/plugin-auth-backend": _package$2.version,
+  "@backstage/plugin-auth-backend-module-guest-provider": _package$1.version,
+  "@backstage/plugin-catalog-node": _package.version
 };
 function findVersion() {
   const pkgContent = fs__default.default.readFileSync(paths.paths.resolveOwn("package.json"), "utf8");

package/dist/lib/versioning/packages.cjs.js

@@ -2,9 +2,9 @@
 
 var minimatch = require('minimatch');
 var getPackages = require('@manypkg/get-packages');
-var errors = require('../errors.cjs.js');
 var yarn = require('./yarn.cjs.js');
 var run = require('../run.cjs.js');
+var errors = require('@backstage/errors');
 
 const DEP_TYPES = [
   "dependencies",

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

@@ -15,7 +15,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
 async function command(opts) {
-  const rspack = process.env.EXPERIMENTAL_RSPACK ? require("@rspack/core") : void 0;
+  const webpack = process.env.LEGACY_WEBPACK_BUILD ? require("webpack") : void 0;
   const role$1 = await role.findRoleFromCommand(opts);
   if (role$1 === "frontend" || role$1 === "backend") {
     const configPaths = opts.config.map((arg) => {
@@ -29,7 +29,7 @@ async function command(opts) {
         targetDir: paths.paths.targetDir,
         configPaths,
         writeStats: Boolean(opts.stats),
-        rspack
+        webpack
       });
     }
     return buildBackend.buildBackend({
@@ -50,7 +50,7 @@ async function command(opts) {
       configPaths: [],
       writeStats: Boolean(opts.stats),
       isModuleFederationRemote: true,
-      rspack
+      webpack
     });
   }
   const roleInfo = cliNode.PackageRoles.getRoleInfo(role$1);

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

@@ -3,20 +3,17 @@
 var fs = require('fs-extra');
 var path = require('path');
 require('yn');
-require('webpack');
+require('@rspack/core');
 require('react-dev-utils/FileSizeReporter');
 require('react-dev-utils/formatWebpackMessages');
-require('eslint-webpack-plugin');
-require('fork-ts-checker-webpack-plugin');
+require('eslint-rspack-plugin');
+require('ts-checker-rspack-plugin');
 require('html-webpack-plugin');
-require('@module-federation/enhanced/webpack');
 require('react-dev-utils/ModuleScopePlugin');
-require('@pmmmwh/react-refresh-webpack-plugin');
+require('@module-federation/enhanced/rspack');
 var paths = require('../../../../../lib/paths.cjs.js');
-require('../../../lib/bundler/optimization.cjs.js');
 require('lodash/pickBy');
 require('../../../../../lib/run.cjs.js');
-require('mini-css-extract-plugin');
 require('../../../../../lib/version.cjs.js');
 var hasReactDomClient = require('../../../lib/bundler/hasReactDomClient.cjs.js');
 require('@manypkg/get-packages');

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

@@ -16,8 +16,7 @@ var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
 async function command(opts, cmd) {
   let packages = await cliNode.PackageGraph.listTargetPackages();
-  const shouldUseRspack = Boolean(process.env.EXPERIMENTAL_RSPACK);
-  const rspack = shouldUseRspack ? require("@rspack/core") : void 0;
+  const webpack = process.env.LEGACY_WEBPACK_BUILD ? require("webpack") : void 0;
   if (opts.since) {
     const graph = cliNode.PackageGraph.fromPackages(packages);
     const changedPackages = await graph.listChangedPackages({
@@ -86,7 +85,7 @@ async function command(opts, cmd) {
           targetDir: pkg.dir,
           configPaths: buildOptions.config ?? [],
           writeStats: Boolean(buildOptions.stats),
-          rspack
+          webpack
         });
       }
     });

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

@@ -6,20 +6,17 @@ var bundle = require('./bundler/bundle.cjs.js');
 var moduleFederation = require('./bundler/moduleFederation.cjs.js');
 require('chalk');
 require('react-dev-utils/openBrowser');
-require('webpack');
-require('webpack-dev-server');
+require('@rspack/core');
+require('@rspack/dev-server');
 require('../../../lib/paths.cjs.js');
 var config = require('../../config/lib/config.cjs.js');
-require('eslint-webpack-plugin');
-require('fork-ts-checker-webpack-plugin');
+require('eslint-rspack-plugin');
+require('ts-checker-rspack-plugin');
 require('html-webpack-plugin');
-require('@module-federation/enhanced/webpack');
 require('react-dev-utils/ModuleScopePlugin');
-require('@pmmmwh/react-refresh-webpack-plugin');
-require('./bundler/optimization.cjs.js');
+require('@module-federation/enhanced/rspack');
 require('lodash/pickBy');
 require('../../../lib/run.cjs.js');
-require('mini-css-extract-plugin');
 require('../../../lib/version.cjs.js');
 require('yn');
 require('@manypkg/get-packages');
@@ -31,7 +28,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function buildFrontend(options) {
-  const { targetDir, writeStats, configPaths, rspack } = options;
+  const { targetDir, writeStats, configPaths, webpack } = options;
   const packageJson = await fs__default.default.readJson(
     path.resolve(targetDir, "package.json")
   );
@@ -49,7 +46,7 @@ async function buildFrontend(options) {
       args: configPaths,
       fromPackage: packageJson.name
     }),
-    rspack
+    webpack
   });
 }
 

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

@@ -7,14 +7,12 @@ var commonjs = require('@rollup/plugin-commonjs');
 var resolve = require('@rollup/plugin-node-resolve');
 var postcss = require('rollup-plugin-postcss');
 var esbuild = require('rollup-plugin-esbuild');
-var svgr = require('@svgr/rollup');
 var dts = require('rollup-plugin-dts');
 var json = require('@rollup/plugin-json');
 var yaml = require('@rollup/plugin-yaml');
 var plugins = require('./plugins.cjs.js');
 var types = require('./types.cjs.js');
 var paths = require('../../../../lib/paths.cjs.js');
-var svgrTemplate = require('../../../../lib/svgrTemplate.cjs.js');
 var entryPoints = require('../../../../lib/entryPoints.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -25,7 +23,6 @@ var commonjs__default = /*#__PURE__*/_interopDefaultCompat(commonjs);
 var resolve__default = /*#__PURE__*/_interopDefaultCompat(resolve);
 var postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
 var esbuild__default = /*#__PURE__*/_interopDefaultCompat(esbuild);
-var svgr__default = /*#__PURE__*/_interopDefaultCompat(svgr);
 var dts__default = /*#__PURE__*/_interopDefaultCompat(dts);
 var json__default = /*#__PURE__*/_interopDefaultCompat(json);
 var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
@@ -201,10 +198,6 @@ async function makeRollupConfigs(options) {
         }),
         json__default.default(),
         yaml__default.default(),
-        svgr__default.default({
-          include: /\.icon\.svg$/,
-          template: svgrTemplate.svgrTemplate
-        }),
         esbuild__default.default({
           target: "ES2022",
           minify: options.minify

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

@@ -3,7 +3,7 @@
 var yn = require('yn');
 var fs = require('fs-extra');
 var path = require('path');
-var webpack = require('webpack');
+var core = require('@rspack/core');
 var FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 var formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 var config = require('./config.cjs.js');
@@ -15,7 +15,6 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var yn__default = /*#__PURE__*/_interopDefaultCompat(yn);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-var webpack__default = /*#__PURE__*/_interopDefaultCompat(webpack);
 var formatWebpackMessages__default = /*#__PURE__*/_interopDefaultCompat(formatWebpackMessages);
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
@@ -26,7 +25,7 @@ function applyContextToError(error, moduleName) {
   ${error}`;
 }
 async function buildBundle(options) {
-  const { statsJsonEnabled, schema: configSchema, rspack } = options;
+  const { statsJsonEnabled, schema: configSchema, webpack } = options;
   const paths$1 = paths.resolveBundlingPaths(options);
   const publicPaths = await paths.resolveOptionalBundlingPaths({
     targetDir: options.targetDir,
@@ -91,12 +90,10 @@ async function buildBundle(options) {
       { spaces: 2 }
     );
   }
-  if (rspack) {
-    console.log(
-      chalk__default.default.yellow(`\u26A0\uFE0F  WARNING: Using experimental RSPack bundler.`)
-    );
+  if (webpack) {
+    console.log(chalk__default.default.yellow(`\u26A0\uFE0F  WARNING: Using legacy WebPack bundler`));
   }
-  const { stats } = await build(configs, isCi, rspack);
+  const { stats } = await build(configs, isCi, webpack);
   if (!stats) {
     throw new Error("No stats returned");
   }
@@ -124,29 +121,27 @@ async function buildBundle(options) {
     );
   }
 }
-async function build(configs, isCi, rspack) {
-  const bundler = rspack ?? webpack__default.default;
-  const stats = await new Promise(
-    (resolve, reject) => {
-      bundler(configs, (err, buildStats) => {
-        if (err) {
-          if (err.message) {
-            const { errors: errors2 } = formatWebpackMessages__default.default({
-              errors: [err.message],
-              warnings: new Array(),
-              _showErrors: true,
-              _showWarnings: true
-            });
-            throw new Error(errors2[0]);
-          } else {
-            reject(err);
-          }
+async function build(configs, isCi, webpack) {
+  const bundler = webpack ?? core.rspack;
+  const stats = await new Promise((resolve, reject) => {
+    bundler(configs, (err, buildStats) => {
+      if (err) {
+        if (err.message) {
+          const { errors: errors2 } = formatWebpackMessages__default.default({
+            errors: [err.message],
+            warnings: new Array(),
+            _showErrors: true,
+            _showWarnings: true
+          });
+          throw new Error(errors2[0]);
         } else {
-          resolve(buildStats);
+          reject(err);
         }
-      });
-    }
-  );
+      } else {
+        resolve(buildStats);
+      }
+    });
+  });
   if (!stats) {
     throw new Error("Failed to compile: No stats provided");
   }