@nx/rsbuild 23.0.0 → 23.1.0-beta.0

package/README.md

@@ -7,13 +7,12 @@
 
 <div style="text-align: center;">
 
-[![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
+[![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)
 
 </div>
 

package/dist/src/generators/configuration/configuration.js

@@ -43,10 +43,34 @@ async function configurationGenerator(tree, schema) {
     }
     const rsbuildVersions = (0, version_utils_1.getRsbuildVersionsForInstalledMajor)(tree);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@rsbuild/core': rsbuildVersions.rsbuildVersion }, undefined, true));
+    // @rsbuild/core@2 emits ESM output by default for both web and Node
+    // targets. There are two ways to make that output runnable:
+    //   1. `"type": "module"` on the project package.json — rsbuild's own
+    //      `create-rsbuild` convention. Used when the project owns a
+    //      package.json (fabricating one, or landing `type` on the
+    //      workspace root, would flip every .js file in the repo to ESM).
+    //   2. `.mjs` output filenames — used for Node builds when the
+    //      project has no package.json to carry `"type": "module"`.
+    //      `.mjs` is unconditionally ESM regardless of the nearest
+    //      package.json. Web output doesn't need this; the browser loads
+    //      it via `<script type="module">`.
+    // Both are v2-only — on v1 rsbuild still emits CommonJS.
+    const installedRsbuildMajor = (0, version_utils_1.getInstalledRsbuildMajorVersion)(tree);
+    const isV2 = installedRsbuildMajor === undefined || installedRsbuildMajor >= 2;
+    const projectPackageJsonPath = (0, path_1.join)(options.projectRoot, 'package.json');
+    const projectHasPackageJson = tree.exists(projectPackageJsonPath);
+    const useMjsOutput = isV2 && options.target === 'node' && !projectHasPackageJson;
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), options.projectRoot, {
         ...options,
+        useMjsOutput,
         tpl: '',
     });
+    if (isV2 && projectHasPackageJson) {
+        (0, devkit_1.updateJson)(tree, projectPackageJsonPath, (json) => {
+            json.type ??= 'module';
+            return json;
+        });
+    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = configurationGenerator;

package/dist/src/generators/configuration/files/rsbuild.config.ts__tpl__

@@ -11,7 +11,12 @@ export default defineConfig({
         port: <%= devServerPort %>
     },
     output: {
-        target: '<%= target %>',
+        target: '<%= target %>',<% if (useMjsOutput) { %>
+        // @rsbuild/core@2 emits ESM for Node targets. Emit .mjs so the
+        // output runs without a `"type": "module"` package.json.
+        filename: {
+            js: '[name].mjs',
+        },<% } %>
         distPath: {
             root: 'dist',
         },

package/dist/src/migrations/update-23-0-0/migrate-node-output-to-esm.md

@@ -0,0 +1,92 @@
+#### Make Node-target rsbuild builds runnable under `@rsbuild/core@2`
+
+`@rsbuild/core@2` changed the default output format for Node targets. In v1,
+`output.target: 'node'` produced **minified CommonJS**. In v2 it produces
+**unminified ESM** (`output.module` defaults to `true`, `output.minify` to
+`false`).
+
+A v2 ESM bundle does not run as plain `node dist/index.js` unless one of the
+following is true:
+
+- a `package.json` with `"type": "module"` governs the output, **or**
+- the output files use the `.mjs` extension.
+
+Without one of those, the build succeeds but the process crashes at runtime
+with `Cannot use import statement outside a module`.
+
+This is workspace-specific — it depends on whether the project owns a
+`package.json`, what runs or references the bundle (a `main` field, a
+Dockerfile, a deploy script, a `serve` target), and whether other `.js`
+files in the project are CommonJS. So it ships as an AI-assisted
+instruction rather than a blind codemod.
+
+#### What needs to change
+
+For every project with an `rsbuild.config.{ts,js,mjs,cjs}` whose
+`output.target` is `'node'`:
+
+1. **Decide how the ESM output should be made runnable.** Prefer, in order:
+   - **The project owns its own `package.json`** → set `"type": "module"`
+     on it. This is rsbuild's recommended convention. Check first that no
+     sibling `.js` files in the project rely on CommonJS (`require`,
+     `module.exports`, `__dirname`); if any do, rename them to `.cjs` or
+     convert them to ESM.
+
+   - **The project has no `package.json`** → add `.mjs` output to the
+     rsbuild config instead, so the output is ESM regardless of any
+     ancestor `package.json`:
+
+     ```ts title="rsbuild.config.ts"
+     export default defineConfig({
+       output: {
+         target: 'node',
+         filename: { js: '[name].mjs' },
+       },
+     });
+     ```
+
+2. **Update anything that references the output filename.** If you chose
+   `.mjs`, fix references in `package.json#main`, Dockerfiles, `serve`
+   targets, deploy scripts, and any `import`/`require` of the built file.
+
+3. **Do not pin back to CommonJS** unless the project genuinely cannot move
+   to ESM. If you must, restore the v1 behavior explicitly:
+
+   ```ts title="rsbuild.config.ts"
+   export default defineConfig({
+     output: {
+       target: 'node',
+       module: false,
+       minify: true,
+     },
+   });
+   ```
+
+#### Sample Code Changes
+
+##### Before — Node project, no project package.json
+
+```ts title="apps/api/rsbuild.config.ts" {4}
+export default defineConfig({
+  output: {
+    target: 'node',
+    distPath: { root: 'dist' },
+  },
+});
+```
+
+##### After — `.mjs` output so the ESM bundle runs
+
+```ts title="apps/api/rsbuild.config.ts" {4}
+export default defineConfig({
+  output: {
+    target: 'node',
+    filename: { js: '[name].mjs' },
+    distPath: { root: 'dist' },
+  },
+});
+```
+
+#### Reference
+
+[`@rsbuild/core` v1 → v2 upgrade guide — Node output](https://rsbuild.rs/guide/upgrade/v1-to-v2#node-output)

package/dist/src/migrations/update-23-0-0/migrate-performance-options.md

@@ -0,0 +1,182 @@
+#### Migrate `performance` options for `@rsbuild/core@2`
+
+`@rsbuild/core@2` removed two `performance` options and deprecated a third.
+rsbuild v2 does not hard-error on the stale keys — it warns and ignores the
+removed ones, and the deprecated one still works — so the changes here are
+about adopting the replacements rather than fixing a broken build. None
+have a drop-in key rename, so this ships as an AI-assisted instruction.
+
+This only affects projects whose `rsbuild.config.{ts,js,mjs,cjs}` sets one
+of the options below. If none of your configs use them, there is nothing
+to do.
+
+#### `performance.bundleAnalyze` was removed
+
+rsbuild v1 bundled `webpack-bundle-analyzer` and exposed it through
+`performance.bundleAnalyze`. v2 removed it to cut install size.
+
+For every config that sets `performance.bundleAnalyze`, remove that option
+and pick one replacement:
+
+- **Preferred — Rsdoctor.** Add the [Rsdoctor](https://rsdoctor.dev) plugin;
+  it covers bundle-size analysis and more. See
+  [rsbuild.rs/guide/debug/rsdoctor](https://rsbuild.rs/guide/debug/rsdoctor).
+
+- **Keep webpack-bundle-analyzer.** Install it and register it via
+  `tools.rspack`:
+
+  ```ts title="rsbuild.config.ts"
+  import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+
+  export default {
+    tools: {
+      rspack: {
+        plugins: [new BundleAnalyzerPlugin({ analyzerMode: 'static' })],
+      },
+    },
+  };
+  ```
+
+If `performance` is left empty after removing the option, delete the empty
+`performance: {}` block too.
+
+#### `performance.profile` was removed
+
+`performance.profile` emitted an rspack stats JSON file. v2 removed it; emit
+the file from a small custom plugin instead.
+
+For every config that sets `performance.profile: true`, remove that option
+and add:
+
+```ts title="rsbuild.config.ts"
+import { writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+const statsJsonPlugin = {
+  name: 'stats-json-plugin',
+  setup(api) {
+    api.onAfterBuild(({ stats }) => {
+      writeFileSync(
+        join(api.context.distPath, 'stats.json'),
+        JSON.stringify(stats?.toJson({}), null, 2)
+      );
+    });
+  },
+};
+
+export default {
+  plugins: [statsJsonPlugin],
+};
+```
+
+#### `performance.chunkSplit` is deprecated
+
+`performance.chunkSplit` still works in v2 but is deprecated. Migrate it to
+the new top-level `splitChunks` option, which aligns with Rspack's
+`optimization.splitChunks`.
+
+For every config that sets `performance.chunkSplit`, translate `strategy`:
+
+| `chunkSplit.strategy`                        | `splitChunks` replacement                       |
+| -------------------------------------------- | ----------------------------------------------- |
+| `split-by-experience`                        | `{ preset: 'default' }`                         |
+| `split-by-module`                            | `{ preset: 'per-package' }`                     |
+| `single-vendor`                              | `{ preset: 'single-vendor' }`                   |
+| `all-in-one`                                 | `false` (chunk splitting disabled)              |
+| `custom` (with a nested `splitChunks`)       | `{ preset: 'none', ...the nested splitChunks }` |
+| `split-by-size` (with `minSize` / `maxSize`) | `{ preset: 'none', minSize, maxSize }`          |
+
+Then translate the remaining `chunkSplit` keys:
+
+- `override` → spread its contents directly into the top-level `splitChunks`.
+- `forceSplitting` → `splitChunks.cacheGroups`. Each `forceSplitting` entry
+  `name: <RegExp>` expands to a full cache group:
+
+  ```ts
+  cacheGroups: {
+    <name>: {
+      test: <RegExp>,
+      name: '<name>',
+      chunks: 'all',
+      // priority 0 normally; use 1 when the `single-vendor` preset is set
+      priority: 0,
+      enforce: true,
+    },
+  }
+  ```
+
+##### `forceSplitting` example
+
+```diff title="rsbuild.config.ts"
+export default {
+-  performance: {
+-    chunkSplit: {
+-      forceSplitting: {
+-        axios: /node_modules[\\/]axios/,
+-      },
+-    },
+-  },
++  splitChunks: {
++    cacheGroups: {
++      axios: {
++        test: /node_modules[\\/]axios/,
++        name: 'axios',
++        chunks: 'all',
++        priority: 0,
++        enforce: true,
++      },
++    },
++  },
+};
+```
+
+If `performance` is empty after removing `chunkSplit`, delete the empty
+`performance: {}` block.
+
+#### Sample Code Changes
+
+##### Before
+
+```ts title="apps/web/rsbuild.config.ts" {3-5}
+export default defineConfig({
+  performance: {
+    bundleAnalyze: {},
+    profile: true,
+  },
+});
+```
+
+##### After
+
+```ts title="apps/web/rsbuild.config.ts"
+import { writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+
+const statsJsonPlugin = {
+  name: 'stats-json-plugin',
+  setup(api) {
+    api.onAfterBuild(({ stats }) => {
+      writeFileSync(
+        join(api.context.distPath, 'stats.json'),
+        JSON.stringify(stats?.toJson({}), null, 2)
+      );
+    });
+  },
+};
+
+export default defineConfig({
+  plugins: [statsJsonPlugin],
+  tools: {
+    rspack: {
+      plugins: [new BundleAnalyzerPlugin({ analyzerMode: 'static' })],
+    },
+  },
+});
+```
+
+#### Reference
+
+- [`@rsbuild/core` v1 → v2 upgrade guide — Remove `performance.bundleAnalyze`](https://rsbuild.rs/guide/upgrade/v1-to-v2#remove-performancebundleanalyze)
+- [`@rsbuild/core` v1 → v2 upgrade guide — Remove `performance.profile`](https://rsbuild.rs/guide/upgrade/v1-to-v2#remove-performanceprofile)
+- [`@rsbuild/core` v1 → v2 upgrade guide — Migrate `performance.chunkSplit`](https://rsbuild.rs/guide/upgrade/v1-to-v2#migrate-performancechunksplit)

package/dist/src/migrations/update-23-0-0/migrate-rsbuild-config-to-v2.d.ts

@@ -0,0 +1,86 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Rewrite user-authored `rsbuild.config.{js,ts,mjs,cjs}` files for
+ * @rsbuild/core@2 compatibility. Five transformations:
+ *
+ * 1. `preview.setupMiddlewares` → `server.setupMiddlewares`. v2 moved
+ *    middleware setup off the preview-only namespace.
+ *
+ * 2. `performance.removeMomentLocale: true|false` is dropped — v2
+ *    removed the option entirely. moment locale stripping in v2 is
+ *    handled via standard externals/aliases.
+ *
+ * 3. `source.alias` / `source.aliasStrategy` → `resolve.alias` /
+ *    `resolve.aliasStrategy`. v2 removed the deprecated `source`-level
+ *    options in favor of the `resolve` block.
+ *
+ * 4. `server.proxy` entry `context` → `pathFilter`. v2's
+ *    http-proxy-middleware@4 renamed the matcher option.
+ *
+ * 5. `server.proxy` entry `on{Open,Close,Error,ProxyReq,ProxyRes}`
+ *    handlers → a unified `on: { open, close, error, proxyReq,
+ *    proxyRes }` object.
+ *
+ * Other v2 changes (default `host` flip from 0.0.0.0 to localhost,
+ * default `loadConfig: 'auto'`, Node target ESM default) are behavior
+ * changes that don't have a deterministic config-rewrite recipe — they
+ * live in the docs / release notes instead.
+ *
+ * All transforms are AST-based: walk the TypeScript parse tree and
+ * patch source ranges so quoted keys, spreads, and surrounding comments
+ * are preserved.
+ */
+export default function migrateRsbuildConfigToV2(tree: Tree): Promise<void>;
+/**
+ * Exported for unit testing. Rewrites a single-key
+ * `preview: { setupMiddlewares: [...] }` literal to
+ * `server: { setupMiddlewares: [...] }`.
+ *
+ * Narrowed to the single-key shape only. For any other shape — preview
+ * with host/port/headers, multiple keys, or anything beyond the
+ * setupMiddlewares array — the file is left untouched. A blanket
+ * rename would move options that still belong under `preview` in v2,
+ * or duplicate a `server:` key the user already has elsewhere.
+ */
+export declare function renameSetupMiddlewares(source: string): string;
+/**
+ * Exported for unit testing. Drops `removeMomentLocale: true|false`
+ * property assignments anywhere in the config — v2 removed the option,
+ * so the value is irrelevant.
+ */
+export declare function dropRemoveMomentLocale(source: string): string;
+/**
+ * Exported for unit testing. Relocates `source.alias` and
+ * `source.aliasStrategy` into a sibling `resolve` block — v2 removed
+ * the deprecated `source`-level forms.
+ *
+ * Three shapes are handled per config object:
+ *  - `source` has only the alias keys, no `resolve` → rename the
+ *    `source` key to `resolve` (one-token edit).
+ *  - `source` has alias keys plus others, with an existing `resolve`
+ *    block → splice the alias properties into the `resolve` block.
+ *  - same, but no `resolve` block → create one immediately before
+ *    `source` carrying the alias properties.
+ *
+ * `formatFiles` tidies whitespace afterward, so the inserts only need
+ * to be syntactically valid, not pretty.
+ */
+export declare function moveSourceAliasToResolve(source: string): string;
+/**
+ * Exported for unit testing. Renames the `context` matcher option to
+ * `pathFilter` inside `server.proxy` entries — http-proxy-middleware@4
+ * (pulled in by @rsbuild/core@2) renamed it. Anchored to a proxy entry
+ * so an unrelated `context` key elsewhere is left alone.
+ */
+export declare function renameProxyContext(source: string): string;
+/**
+ * Exported for unit testing. Consolidates the per-event proxy handlers
+ * (`onOpen`, `onClose`, `onError`, `onProxyReq`, `onProxyRes`) into a
+ * single `on: { open, close, error, proxyReq, proxyRes }` object —
+ * http-proxy-middleware@4's unified event API.
+ *
+ * Skips any proxy entry that already has an `on` property (already
+ * migrated). Anchored to proxy entries so unrelated `on*` keys are
+ * untouched.
+ */
+export declare function groupProxyEventHandlers(source: string): string;

package/dist/src/migrations/update-23-0-0/migrate-rsbuild-config-to-v2.js

@@ -0,0 +1,370 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateRsbuildConfigToV2;
+exports.renameSetupMiddlewares = renameSetupMiddlewares;
+exports.dropRemoveMomentLocale = dropRemoveMomentLocale;
+exports.moveSourceAliasToResolve = moveSourceAliasToResolve;
+exports.renameProxyContext = renameProxyContext;
+exports.groupProxyEventHandlers = groupProxyEventHandlers;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const ts = tslib_1.__importStar(require("typescript"));
+/**
+ * Rewrite user-authored `rsbuild.config.{js,ts,mjs,cjs}` files for
+ * @rsbuild/core@2 compatibility. Five transformations:
+ *
+ * 1. `preview.setupMiddlewares` → `server.setupMiddlewares`. v2 moved
+ *    middleware setup off the preview-only namespace.
+ *
+ * 2. `performance.removeMomentLocale: true|false` is dropped — v2
+ *    removed the option entirely. moment locale stripping in v2 is
+ *    handled via standard externals/aliases.
+ *
+ * 3. `source.alias` / `source.aliasStrategy` → `resolve.alias` /
+ *    `resolve.aliasStrategy`. v2 removed the deprecated `source`-level
+ *    options in favor of the `resolve` block.
+ *
+ * 4. `server.proxy` entry `context` → `pathFilter`. v2's
+ *    http-proxy-middleware@4 renamed the matcher option.
+ *
+ * 5. `server.proxy` entry `on{Open,Close,Error,ProxyReq,ProxyRes}`
+ *    handlers → a unified `on: { open, close, error, proxyReq,
+ *    proxyRes }` object.
+ *
+ * Other v2 changes (default `host` flip from 0.0.0.0 to localhost,
+ * default `loadConfig: 'auto'`, Node target ESM default) are behavior
+ * changes that don't have a deterministic config-rewrite recipe — they
+ * live in the docs / release notes instead.
+ *
+ * All transforms are AST-based: walk the TypeScript parse tree and
+ * patch source ranges so quoted keys, spreads, and surrounding comments
+ * are preserved.
+ */
+async function migrateRsbuildConfigToV2(tree) {
+    const configFiles = [];
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+        if (filePath.endsWith('rsbuild.config.ts') ||
+            filePath.endsWith('rsbuild.config.js') ||
+            filePath.endsWith('rsbuild.config.mjs') ||
+            filePath.endsWith('rsbuild.config.cjs')) {
+            configFiles.push(filePath);
+        }
+    });
+    for (const configFile of configFiles) {
+        const original = tree.read(configFile, 'utf-8');
+        if (!original)
+            continue;
+        let next = renameSetupMiddlewares(original);
+        next = dropRemoveMomentLocale(next);
+        next = moveSourceAliasToResolve(next);
+        next = renameProxyContext(next);
+        next = groupProxyEventHandlers(next);
+        if (next !== original) {
+            tree.write(configFile, next);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function applyEdits(source, edits) {
+    if (edits.length === 0)
+        return source;
+    const sorted = [...edits].sort((a, b) => b.start - a.start);
+    return sorted.reduce((acc, e) => acc.slice(0, e.start) + e.replacement + acc.slice(e.end), source);
+}
+function getPropertyName(prop) {
+    const name = prop.name;
+    if (ts.isIdentifier(name))
+        return name.text;
+    if (ts.isStringLiteral(name) || ts.isNoSubstitutionTemplateLiteral(name)) {
+        return name.text;
+    }
+    return undefined;
+}
+/**
+ * Exported for unit testing. Rewrites a single-key
+ * `preview: { setupMiddlewares: [...] }` literal to
+ * `server: { setupMiddlewares: [...] }`.
+ *
+ * Narrowed to the single-key shape only. For any other shape — preview
+ * with host/port/headers, multiple keys, or anything beyond the
+ * setupMiddlewares array — the file is left untouched. A blanket
+ * rename would move options that still belong under `preview` in v2,
+ * or duplicate a `server:` key the user already has elsewhere.
+ */
+function renameSetupMiddlewares(source) {
+    if (!source.includes('setupMiddlewares'))
+        return source;
+    const sourceFile = (0, tsquery_1.ast)(source);
+    const edits = [];
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) &&
+            getPropertyName(node) === 'preview' &&
+            ts.isObjectLiteralExpression(node.initializer)) {
+            const props = node.initializer.properties;
+            if (props.length === 1 &&
+                ts.isPropertyAssignment(props[0]) &&
+                getPropertyName(props[0]) === 'setupMiddlewares') {
+                // Replace only the property name `preview` → `server`. The
+                // initializer (the object literal with setupMiddlewares) stays
+                // untouched, preserving its formatting verbatim.
+                const nameNode = node.name;
+                edits.push({
+                    start: nameNode.getStart(sourceFile),
+                    end: nameNode.getEnd(),
+                    replacement: 'server',
+                });
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return applyEdits(source, edits);
+}
+/**
+ * Exported for unit testing. Drops `removeMomentLocale: true|false`
+ * property assignments anywhere in the config — v2 removed the option,
+ * so the value is irrelevant.
+ */
+function dropRemoveMomentLocale(source) {
+    if (!source.includes('removeMomentLocale'))
+        return source;
+    const sourceFile = (0, tsquery_1.ast)(source);
+    const edits = [];
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) &&
+            getPropertyName(node) === 'removeMomentLocale' &&
+            (node.initializer.kind === ts.SyntaxKind.TrueKeyword ||
+                node.initializer.kind === ts.SyntaxKind.FalseKeyword)) {
+            let endOfRemoval = node.getEnd();
+            const trailingText = source.slice(endOfRemoval);
+            const trailingMatch = trailingText.match(/^\s*,?\s*\r?\n/);
+            if (trailingMatch) {
+                endOfRemoval += trailingMatch[0].length;
+            }
+            let startOfRemoval = node.getStart(sourceFile);
+            const lineStart = source.lastIndexOf('\n', startOfRemoval - 1) + 1;
+            if (source.slice(lineStart, startOfRemoval).trim() === '') {
+                startOfRemoval = lineStart;
+            }
+            edits.push({
+                start: startOfRemoval,
+                end: endOfRemoval,
+                replacement: '',
+            });
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return applyEdits(source, edits);
+}
+/**
+ * Exported for unit testing. Relocates `source.alias` and
+ * `source.aliasStrategy` into a sibling `resolve` block — v2 removed
+ * the deprecated `source`-level forms.
+ *
+ * Three shapes are handled per config object:
+ *  - `source` has only the alias keys, no `resolve` → rename the
+ *    `source` key to `resolve` (one-token edit).
+ *  - `source` has alias keys plus others, with an existing `resolve`
+ *    block → splice the alias properties into the `resolve` block.
+ *  - same, but no `resolve` block → create one immediately before
+ *    `source` carrying the alias properties.
+ *
+ * `formatFiles` tidies whitespace afterward, so the inserts only need
+ * to be syntactically valid, not pretty.
+ */
+function moveSourceAliasToResolve(source) {
+    if (!/\balias(?:Strategy)?\b/.test(source))
+        return source;
+    const sourceFile = (0, tsquery_1.ast)(source);
+    const edits = [];
+    const ALIAS_KEYS = new Set(['alias', 'aliasStrategy']);
+    const visit = (node) => {
+        if (ts.isObjectLiteralExpression(node)) {
+            const sourceProp = node.properties.find((p) => ts.isPropertyAssignment(p) && getPropertyName(p) === 'source');
+            if (sourceProp && ts.isObjectLiteralExpression(sourceProp.initializer)) {
+                const sourceObj = sourceProp.initializer;
+                const aliasProps = sourceObj.properties.filter((p) => ts.isPropertyAssignment(p) &&
+                    ALIAS_KEYS.has(getPropertyName(p) ?? ''));
+                if (aliasProps.length > 0) {
+                    const resolveProp = node.properties.find((p) => ts.isPropertyAssignment(p) && getPropertyName(p) === 'resolve');
+                    const aliasAreAllProps = aliasProps.length === sourceObj.properties.length;
+                    if (!resolveProp && aliasAreAllProps) {
+                        // `source` carries nothing but the alias keys — just rename
+                        // the property to `resolve`.
+                        edits.push({
+                            start: sourceProp.name.getStart(sourceFile),
+                            end: sourceProp.name.getEnd(),
+                            replacement: 'resolve',
+                        });
+                    }
+                    else {
+                        const movedTexts = aliasProps.map((p) => p.getText(sourceFile));
+                        // Remove each alias property from `source` (+ trailing
+                        // comma / line terminator).
+                        for (const p of aliasProps) {
+                            let end = p.getEnd();
+                            const trailing = source.slice(end).match(/^\s*,?\s*\r?\n?/);
+                            if (trailing)
+                                end += trailing[0].length;
+                            let start = p.getStart(sourceFile);
+                            const lineStart = source.lastIndexOf('\n', start - 1) + 1;
+                            if (source.slice(lineStart, start).trim() === '') {
+                                start = lineStart;
+                            }
+                            edits.push({ start, end, replacement: '' });
+                        }
+                        if (resolveProp &&
+                            ts.isObjectLiteralExpression(resolveProp.initializer)) {
+                            // Splice into the existing `resolve` block, just before
+                            // its closing brace. Lead with a comma when the block
+                            // already has properties so we don't fuse onto a
+                            // comma-less last property.
+                            const closeBrace = resolveProp.initializer.getEnd() - 1;
+                            const leadingSep = resolveProp.initializer.properties.length > 0 ? ',\n' : '';
+                            edits.push({
+                                start: closeBrace,
+                                end: closeBrace,
+                                replacement: leadingSep + movedTexts.map((t) => `${t},\n`).join(''),
+                            });
+                        }
+                        else {
+                            // No `resolve` block — create one right before `source`.
+                            const insertAt = sourceProp.getStart(sourceFile);
+                            edits.push({
+                                start: insertAt,
+                                end: insertAt,
+                                replacement: `resolve: {\n${movedTexts
+                                    .map((t) => `${t},\n`)
+                                    .join('')}},\n`,
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return applyEdits(source, edits);
+}
+/**
+ * Returns true when `obj` is a `server.proxy` entry — either an element
+ * of the array form (`proxy: [{ ... }]`) or a value of the object-map
+ * form (`proxy: { '/api': { ... } }`).
+ */
+function isProxyEntryObject(obj) {
+    const parent = obj.parent;
+    // Array form: proxy: [ { ... } ]
+    if (parent && ts.isArrayLiteralExpression(parent)) {
+        const arrProp = parent.parent;
+        return (!!arrProp &&
+            ts.isPropertyAssignment(arrProp) &&
+            getPropertyName(arrProp) === 'proxy');
+    }
+    // Object-map form: proxy: { '/api': { ... } }
+    if (parent && ts.isPropertyAssignment(parent)) {
+        const mapObj = parent.parent;
+        if (mapObj && ts.isObjectLiteralExpression(mapObj)) {
+            const mapProp = mapObj.parent;
+            return (!!mapProp &&
+                ts.isPropertyAssignment(mapProp) &&
+                getPropertyName(mapProp) === 'proxy');
+        }
+    }
+    return false;
+}
+/**
+ * Exported for unit testing. Renames the `context` matcher option to
+ * `pathFilter` inside `server.proxy` entries — http-proxy-middleware@4
+ * (pulled in by @rsbuild/core@2) renamed it. Anchored to a proxy entry
+ * so an unrelated `context` key elsewhere is left alone.
+ */
+function renameProxyContext(source) {
+    if (!source.includes('context'))
+        return source;
+    const sourceFile = (0, tsquery_1.ast)(source);
+    const edits = [];
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) &&
+            getPropertyName(node) === 'context' &&
+            ts.isObjectLiteralExpression(node.parent) &&
+            isProxyEntryObject(node.parent)) {
+            edits.push({
+                start: node.name.getStart(sourceFile),
+                end: node.name.getEnd(),
+                replacement: 'pathFilter',
+            });
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return applyEdits(source, edits);
+}
+const PROXY_HANDLER_RENAMES = {
+    onOpen: 'open',
+    onClose: 'close',
+    onError: 'error',
+    onProxyReq: 'proxyReq',
+    onProxyRes: 'proxyRes',
+};
+/**
+ * Exported for unit testing. Consolidates the per-event proxy handlers
+ * (`onOpen`, `onClose`, `onError`, `onProxyReq`, `onProxyRes`) into a
+ * single `on: { open, close, error, proxyReq, proxyRes }` object —
+ * http-proxy-middleware@4's unified event API.
+ *
+ * Skips any proxy entry that already has an `on` property (already
+ * migrated). Anchored to proxy entries so unrelated `on*` keys are
+ * untouched.
+ */
+function groupProxyEventHandlers(source) {
+    if (!/\bon(Open|Close|Error|ProxyReq|ProxyRes)\b/.test(source)) {
+        return source;
+    }
+    const sourceFile = (0, tsquery_1.ast)(source);
+    const edits = [];
+    const visit = (node) => {
+        if (ts.isObjectLiteralExpression(node) && isProxyEntryObject(node)) {
+            const alreadyHasOn = node.properties.some((p) => ts.isPropertyAssignment(p) && getPropertyName(p) === 'on');
+            if (!alreadyHasOn) {
+                const handlers = node.properties.filter((p) => ts.isPropertyAssignment(p) &&
+                    (getPropertyName(p) ?? '') in PROXY_HANDLER_RENAMES);
+                if (handlers.length > 0) {
+                    const entries = handlers.map((p) => {
+                        const newName = PROXY_HANDLER_RENAMES[getPropertyName(p)];
+                        return `${newName}: ${p.initializer.getText(sourceFile)}`;
+                    });
+                    // Replace the first handler's range with the `on` block...
+                    const first = handlers[0];
+                    let firstEnd = first.getEnd();
+                    const firstTrailing = source.slice(firstEnd).match(/^\s*,?\s*\r?\n?/);
+                    if (firstTrailing)
+                        firstEnd += firstTrailing[0].length;
+                    edits.push({
+                        start: first.getStart(sourceFile),
+                        end: firstEnd,
+                        replacement: `on: {\n${entries.map((e) => `${e},\n`).join('')}},\n`,
+                    });
+                    // ...and delete the remaining handlers.
+                    for (const p of handlers.slice(1)) {
+                        let end = p.getEnd();
+                        const trailing = source.slice(end).match(/^\s*,?\s*\r?\n?/);
+                        if (trailing)
+                            end += trailing[0].length;
+                        let start = p.getStart(sourceFile);
+                        const lineStart = source.lastIndexOf('\n', start - 1) + 1;
+                        if (source.slice(lineStart, start).trim() === '') {
+                            start = lineStart;
+                        }
+                        edits.push({ start, end, replacement: '' });
+                    }
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+    return applyEdits(source, edits);
+}

package/dist/src/plugins/plugin.js

@@ -74,7 +74,9 @@ async function createRsbuildTargets(configFilePath, projectRoot, options, tsConf
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
     // Required lazily: `@rsbuild/core` is an optional peer dependency, so it
     // may be absent when the plugin is loaded in a workspace that doesn't use
-    // Rsbuild yet (e.g. before a generator installs it).
+    // Rsbuild yet (e.g. before a generator installs it). This path runs in
+    // the CLI/daemon (never Jest), so a plain require works on Node 22.12+
+    // via require(esm) for the pure-ESM @rsbuild/core@2.
     const { loadConfig } = require('@rsbuild/core');
     const rsbuildConfig = await loadConfig({
         path: absoluteConfigFilePath,

package/dist/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
 export declare const minSupportedRsbuildVersion = "1.0.0";
-export declare const supportedRsbuildMajorVersions: readonly [1];
+export declare const supportedRsbuildMajorVersions: readonly [2, 1];
 export type SupportedRsbuildMajorVersion = (typeof supportedRsbuildMajorVersions)[number];
 type RsbuildVersionMap = {
     rsbuildVersion: string;

package/dist/src/utils/versions.js

@@ -4,18 +4,26 @@ exports.rsbuildPluginSassVersion = exports.rsbuildPluginVueVersion = exports.rsb
 const path_1 = require("path");
 exports.nxVersion = require((0, path_1.join)('@nx/rsbuild', 'package.json')).version;
 exports.minSupportedRsbuildVersion = '1.0.0';
-// Supported `@rsbuild/core` majors. Currently v1 only — v2 ships as pure
-// ESM, which @nx/rsbuild (CommonJS) cannot consume without a deeper
-// refactor; tracked separately.
-exports.supportedRsbuildMajorVersions = [1];
+// Supported `@rsbuild/core` majors. v2 is the latest; v1 stays in the
+// window for backward compatibility per the multi-version policy.
+exports.supportedRsbuildMajorVersions = [2, 1];
 exports.latestRsbuildVersions = {
-    rsbuildVersion: '1.1.10',
-    rsbuildPluginReactVersion: '1.1.0',
-    rsbuildPluginVueVersion: '1.0.5',
-    rsbuildPluginSassVersion: '1.1.2',
+    rsbuildVersion: '2.0.7',
+    rsbuildPluginReactVersion: '2.0.0',
+    // plugin-vue and plugin-sass still publish 1.x but declare compatibility
+    // with rsbuild ^1.0.0 || ^2.0.0-0, so the same range works on both
+    // majors.
+    rsbuildPluginVueVersion: '1.2.8',
+    rsbuildPluginSassVersion: '1.5.2',
 };
 exports.backwardCompatibleRsbuildVersions = {
-    1: exports.latestRsbuildVersions,
+    2: exports.latestRsbuildVersions,
+    1: {
+        rsbuildVersion: '1.1.10',
+        rsbuildPluginReactVersion: '1.1.0',
+        rsbuildPluginVueVersion: '1.0.5',
+        rsbuildPluginSassVersion: '1.1.2',
+    },
 };
 /**
  * Kept for backward compatibility with code paths that don't yet branch on

package/migrations.json

@@ -5,6 +5,51 @@
       "description": "Rename imports of `createNodesV2` from `@nx/rsbuild` to the canonical `createNodes` export.",
       "implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
       "documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md"
+    },
+    "update-23-0-0-migrate-rsbuild-config-to-v2": {
+      "cli": "nx",
+      "version": "23.1.0-beta.0",
+      "description": "Rewrites rsbuild.config.{js,ts,mjs,cjs} files for @rsbuild/core@2: renames preview.setupMiddlewares to server.setupMiddlewares, drops the removed performance.removeMomentLocale option, moves source.alias/source.aliasStrategy to the resolve block, and updates server.proxy entries for http-proxy-middleware v4 (context to pathFilter, on* handlers to a unified on object).",
+      "factory": "./dist/src/migrations/update-23-0-0/migrate-rsbuild-config-to-v2",
+      "requires": {
+        "@rsbuild/core": ">=2.0.0"
+      }
+    },
+    "update-23-0-0-migrate-node-output-to-esm": {
+      "cli": "nx",
+      "version": "23.1.0-beta.0",
+      "description": "AI-assisted migration: make Node-target rsbuild builds runnable under @rsbuild/core@2, which emits ESM output by default.",
+      "prompt": "./dist/src/migrations/update-23-0-0/migrate-node-output-to-esm.md",
+      "requires": {
+        "@rsbuild/core": ">=2.0.0"
+      }
+    },
+    "update-23-0-0-migrate-performance-options": {
+      "cli": "nx",
+      "version": "23.1.0-beta.0",
+      "description": "AI-assisted migration: adopt replacements for the performance.bundleAnalyze and performance.profile options removed in @rsbuild/core@2, and migrate the deprecated performance.chunkSplit option to splitChunks.",
+      "prompt": "./dist/src/migrations/update-23-0-0/migrate-performance-options.md",
+      "requires": {
+        "@rsbuild/core": ">=2.0.0"
+      }
+    }
+  },
+  "packageJsonUpdates": {
+    "23.0.0-rsbuild-v2": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "@rsbuild/core": ">=1.0.0 <2.0.0"
+      },
+      "packages": {
+        "@rsbuild/core": {
+          "version": "^2.0.7",
+          "alwaysAddToPackageJson": false
+        },
+        "@rsbuild/plugin-react": {
+          "version": "^2.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rsbuild",
   "description": "The Nx Plugin for Rsbuild contains an Nx plugin, executors and utilities that support building applications using Rsbuild.",
-  "version": "23.0.0",
+  "version": "23.1.0-beta.0",
   "type": "commonjs",
   "files": [
     "dist",
@@ -57,14 +57,14 @@
     "minimatch": "10.2.5",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.0.0",
-    "@nx/js": "23.0.0"
+    "@nx/devkit": "23.1.0-beta.0",
+    "@nx/js": "23.1.0-beta.0"
   },
   "devDependencies": {
-    "nx": "23.0.0"
+    "nx": "23.1.0-beta.0"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^1.0.0"
+    "@rsbuild/core": "^1.0.0 || ^2.0.0"
   },
   "peerDependenciesMeta": {
     "@rsbuild/core": {