@nx/rsbuild 23.0.0-beta.2 → 23.0.0-beta.21

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-beta.2",
+  "version": "23.0.0-beta.21",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -30,16 +30,23 @@
   "executors": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@rsbuild/core": "1.1.8",
-    "minimatch": "10.2.4",
-    "@phenomnomnominal/tsquery": "~6.1.4"
+    "@nx/devkit": "23.0.0-beta.21",
+    "@nx/js": "23.0.0-beta.21",
+    "minimatch": "10.2.5",
+    "semver": "^7.6.3",
+    "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.2"
+    "nx": "23.0.0-beta.21"
+  },
+  "peerDependencies": {
+    "@rsbuild/core": "^1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    }
   },
-  "peerDependencies": {},
   "nx-migrations": {
     "migrations": "./migrations.json"
   },

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rsbuild/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAOvC,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAiDtE;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rsbuild/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAQvC,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0DtE;AAED,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -5,9 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
-const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("../../utils/version-utils");
+const assert_supported_rsbuild_version_1 = require("../../utils/assert-supported-rsbuild-version");
 const path_1 = require("path");
 async function configurationGenerator(tree, schema) {
+    (0, assert_supported_rsbuild_version_1.assertSupportedRsbuildVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const projects = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     let project = projects.projects[schema.project];
@@ -39,7 +41,8 @@ async function configurationGenerator(tree, schema) {
             delete projectJson.targets['dev'];
         }
     }
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@rsbuild/core': versions_1.rsbuildVersion }));
+    const rsbuildVersions = (0, version_utils_1.getRsbuildVersionsForInstalledMajor)(tree);
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@rsbuild/core': rsbuildVersions.rsbuildVersion }, undefined, true));
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), options.projectRoot, {
         ...options,
         tpl: '',

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rsbuild/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAMvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBAWzE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAEpE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAkD5B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rsbuild/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAMvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAM/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBAazE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAEpE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAoD5B;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -3,26 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = updateDependencies;
 exports.initGenerator = initGenerator;
 exports.initGeneratorInternal = initGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("../../utils/version-utils");
+const assert_supported_rsbuild_version_1 = require("../../utils/assert-supported-rsbuild-version");
 function updateDependencies(tree, schema) {
+    const rsbuildVersions = (0, version_utils_1.getRsbuildVersionsForInstalledMajor)(tree);
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@nx/rsbuild': versions_1.nxVersion,
-        '@rsbuild/core': versions_1.rsbuildVersion,
-    }, undefined, schema.keepExistingVersions);
+        '@rsbuild/core': rsbuildVersions.rsbuildVersion,
+    }, undefined, schema.keepExistingVersions ?? true);
 }
 function initGenerator(tree, schema) {
     return initGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function initGeneratorInternal(tree, schema) {
+    (0, assert_supported_rsbuild_version_1.assertSupportedRsbuildVersion)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rsbuild', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rsbuild', plugin_1.createNodesV2, {
             buildTargetName: ['build', 'rsbuild:build', 'rsbuild-build'],
             devTargetName: ['dev', 'rsbuild:dev', 'rsbuild-dev'],
             previewTargetName: ['preview', 'rsbuild:preview', 'rsbuild-preview'],

package/src/generators/init/schema.json

@@ -13,7 +13,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAiBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAgC7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,aAAa,EAMd,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAiE7D,CAAC"}

package/src/plugins/plugin.js

@@ -1,54 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const internal_2 = require("@nx/js/internal");
 const js_1 = require("@nx/js");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const minimatch_1 = require("minimatch");
-const core_1 = require("@rsbuild/core");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
-function readTargetsCache(cachePath) {
-    return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
-}
-function writeTargetsCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 const rsbuildConfigGlob = '**/rsbuild.config.{js,ts,mjs,mts,cjs,cts}';
 exports.createNodesV2 = [
     rsbuildConfigGlob,
     async (configFilePaths, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rsbuild-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
-        const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const targetsCache = new internal_1.PluginCache(cachePath);
+        const isUsingTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
+        const normalizedOptions = normalizeOptions(options);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isUsingTsSolutionSetup, pmc), configFilePaths, options, context);
+            const { entries, preErrors } = await filterRsbuildConfigs(configFilePaths, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), { ...normalizedOptions, isUsingTsSolutionSetup }, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, targetsCache, isUsingTsSolutionSetup, pmc, entries[idx].tsConfigFiles, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
-            writeTargetsCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup, pmc) {
+async function createNodesInternal(configFilePath, normalizedOptions, context, targetsCache, isUsingTsSolutionSetup, pmc, tsConfigFiles, hash) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
-    // Do not create a project if package.json and project.json isn't there.
-    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-    if (!siblingFiles.includes('package.json') &&
-        !siblingFiles.includes('project.json')) {
-        return {};
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await createRsbuildTargets(configFilePath, projectRoot, normalizedOptions, tsConfigFiles, isUsingTsSolutionSetup, context, pmc));
     }
-    const tsConfigFiles = siblingFiles.filter((p) => (0, minimatch_1.minimatch)(p, 'tsconfig*{.json,.*.json}')) ?? [];
-    const normalizedOptions = normalizeOptions(options);
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, { ...normalizedOptions, isUsingTsSolutionSetup }, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await createRsbuildTargets(configFilePath, projectRoot, normalizedOptions, tsConfigFiles, isUsingTsSolutionSetup, context, pmc);
-    const { targets, metadata } = targetsCache[hash];
+    const { targets, metadata } = targetsCache.get(hash);
     return {
         projects: {
             [projectRoot]: {
@@ -61,13 +68,17 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
 }
 async function createRsbuildTargets(configFilePath, projectRoot, options, tsConfigFiles, isUsingTsSolutionSetup, context, pmc) {
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
-    const rsbuildConfig = await (0, core_1.loadConfig)({
+    // 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).
+    const { loadConfig } = require('@rsbuild/core');
+    const rsbuildConfig = await loadConfig({
         path: absoluteConfigFilePath,
     });
     if (!rsbuildConfig.filePath) {
         return { targets: {}, metadata: {} };
     }
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const { buildOutputs } = getOutputs(rsbuildConfig.content, projectRoot, context.workspaceRoot);
     const targets = {};
     targets[options.buildTargetName] = {
@@ -156,13 +167,14 @@ async function createRsbuildTargets(configFilePath, projectRoot, options, tsConf
             ];
         }
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
 function getOutputs(rsbuildConfig, projectRoot, workspaceRoot) {
-    const buildOutputPath = normalizeOutputPath(rsbuildConfig?.output?.distPath?.root
-        ? (0, path_1.dirname)(rsbuildConfig?.output.distPath.root)
-        : undefined, projectRoot, workspaceRoot, 'dist');
+    // `output.distPath.root` is the directory Rsbuild emits the build into, so
+    // it is the build output as-is. (Don't take its `dirname` - that points at
+    // the parent directory, which can capture sibling projects' outputs.)
+    const buildOutputPath = normalizeOutputPath(rsbuildConfig?.output?.distPath?.root, projectRoot, workspaceRoot, 'dist');
     return {
         buildOutputs: [buildOutputPath],
     };
@@ -190,6 +202,29 @@ function normalizeOutputPath(outputPath, projectRoot, workspaceRoot, path) {
         }
     }
 }
+async function filterRsbuildConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = (0, path_1.dirname)(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            const tsConfigFiles = siblingFiles.filter((p) => (0, minimatch_1.minimatch)(p, 'tsconfig*{.json,.*.json}')) ?? [];
+            return { configFile, projectRoot, tsConfigFiles };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     options ??= {};
     options.buildTargetName ??= 'build';

package/src/utils/assert-supported-rsbuild-version.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedRsbuildVersion(tree: Tree): void;
+//# sourceMappingURL=assert-supported-rsbuild-version.d.ts.map

package/src/utils/assert-supported-rsbuild-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-supported-rsbuild-version.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/assert-supported-rsbuild-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAM9D"}

package/src/utils/assert-supported-rsbuild-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedRsbuildVersion = assertSupportedRsbuildVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedRsbuildVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, '@rsbuild/core', versions_1.minSupportedRsbuildVersion);
+}

package/src/utils/e2e-web-server-info-utils.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
-export declare function getRsbuildE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;
+export declare function getRsbuildE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
 //# sourceMappingURL=e2e-web-server-info-utils.d.ts.map

package/src/utils/e2e-web-server-info-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8FA8BzB"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAMnD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA6BzB"}

package/src/utils/e2e-web-server-info-utils.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRsbuildE2EWebServerInfo = getRsbuildE2EWebServerInfo;
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function getRsbuildE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
-    if (nxJson.targetDefaults?.['dev'] &&
-        nxJson.targetDefaults?.['dev'].options?.port) {
-        e2ePort = nxJson.targetDefaults?.['dev'].options?.port;
+    const devPort = (0, internal_1.readTargetDefaultsForTarget)('dev', nxJson.targetDefaults)
+        ?.options?.port;
+    if (devPort) {
+        e2ePort = devPort;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/rsbuild',
         serveTargetName: 'devTargetName',
         serveStaticTargetName: 'previewTargetName',

package/src/utils/version-utils.d.ts

@@ -0,0 +1,28 @@
+import { type Tree } from '@nx/devkit';
+import { type SupportedRsbuildMajorVersion } from './versions';
+/**
+ * Returns the declared @rsbuild/core major version from the workspace's
+ * package.json when it matches a supported major, or `undefined` otherwise
+ * (fresh install, dist tag, unknown major). Below-floor enforcement is
+ * handled at generator entry points via `assertSupportedRsbuildVersion`.
+ */
+export declare function getInstalledRsbuildMajorVersion(tree: Tree): SupportedRsbuildMajorVersion | undefined;
+/**
+ * Returns the installed @rsbuild/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rsbuild/core can't be resolved or the
+ * installed major isn't supported.
+ */
+export declare function getInstalledRsbuildVersionRuntime(): SupportedRsbuildMajorVersion | null;
+/**
+ * Returns the version-map entry for the installed major, falling back to the
+ * latest supported map when no installed version is detected (fresh install)
+ * or the detected major is outside the supported window.
+ */
+export declare function getRsbuildVersionsForInstalledMajor(tree: Tree): {
+    rsbuildVersion: string;
+    rsbuildPluginReactVersion: string;
+    rsbuildPluginVueVersion: string;
+    rsbuildPluginSassVersion: string;
+};
+//# sourceMappingURL=version-utils.d.ts.map

package/src/utils/version-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,EAGL,KAAK,4BAA4B,EAClC,MAAM,YAAY,CAAC;AAIpB;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,GACT,4BAA4B,GAAG,SAAS,CAS1C;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,IAAI,4BAA4B,GAAG,IAAI,CASvF;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI;;;;;EAM7D"}

package/src/utils/version-utils.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledRsbuildMajorVersion = getInstalledRsbuildMajorVersion;
+exports.getInstalledRsbuildVersionRuntime = getInstalledRsbuildVersionRuntime;
+exports.getRsbuildVersionsForInstalledMajor = getRsbuildVersionsForInstalledMajor;
+const internal_1 = require("@nx/devkit/internal");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
+const RSBUILD_CORE_PACKAGE = '@rsbuild/core';
+/**
+ * Returns the declared @rsbuild/core major version from the workspace's
+ * package.json when it matches a supported major, or `undefined` otherwise
+ * (fresh install, dist tag, unknown major). Below-floor enforcement is
+ * handled at generator entry points via `assertSupportedRsbuildVersion`.
+ */
+function getInstalledRsbuildMajorVersion(tree) {
+    const declared = (0, internal_1.getDeclaredPackageVersion)(tree, RSBUILD_CORE_PACKAGE);
+    if (!declared) {
+        return undefined;
+    }
+    const installedMajor = (0, semver_1.major)(declared);
+    return installedMajor in versions_1.backwardCompatibleRsbuildVersions
+        ? installedMajor
+        : undefined;
+}
+/**
+ * Returns the installed @rsbuild/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rsbuild/core can't be resolved or the
+ * installed major isn't supported.
+ */
+function getInstalledRsbuildVersionRuntime() {
+    const version = (0, internal_1.getInstalledPackageVersion)(RSBUILD_CORE_PACKAGE);
+    if (!version) {
+        return null;
+    }
+    const installedMajor = (0, semver_1.major)(version);
+    return installedMajor in versions_1.backwardCompatibleRsbuildVersions
+        ? installedMajor
+        : null;
+}
+/**
+ * Returns the version-map entry for the installed major, falling back to the
+ * latest supported map when no installed version is detected (fresh install)
+ * or the detected major is outside the supported window.
+ */
+function getRsbuildVersionsForInstalledMajor(tree) {
+    const installed = getInstalledRsbuildMajorVersion(tree);
+    if (installed === undefined) {
+        return versions_1.latestRsbuildVersions;
+    }
+    return versions_1.backwardCompatibleRsbuildVersions[installed];
+}

package/src/utils/versions.d.ts

@@ -1,6 +1,22 @@
 export declare const nxVersion: any;
-export declare const rsbuildVersion = "1.1.10";
-export declare const rsbuildPluginReactVersion = "1.1.0";
-export declare const rsbuildPluginVueVersion = "1.0.5";
-export declare const rsbuildPluginSassVersion = "1.1.2";
+export declare const minSupportedRsbuildVersion = "1.0.0";
+export declare const supportedRsbuildMajorVersions: readonly [1];
+export type SupportedRsbuildMajorVersion = (typeof supportedRsbuildMajorVersions)[number];
+type RsbuildVersionMap = {
+    rsbuildVersion: string;
+    rsbuildPluginReactVersion: string;
+    rsbuildPluginVueVersion: string;
+    rsbuildPluginSassVersion: string;
+};
+export declare const latestRsbuildVersions: RsbuildVersionMap;
+export declare const backwardCompatibleRsbuildVersions: Record<SupportedRsbuildMajorVersion, RsbuildVersionMap>;
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+export declare const rsbuildVersion: string;
+export declare const rsbuildPluginReactVersion: string;
+export declare const rsbuildPluginVueVersion: string;
+export declare const rsbuildPluginSassVersion: string;
+export {};
 //# sourceMappingURL=versions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,yBAAyB,UAAU,CAAC;AACjD,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,eAAO,MAAM,wBAAwB,UAAU,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,0BAA0B,UAAU,CAAC;AAKlD,eAAO,MAAM,6BAA6B,cAAe,CAAC;AAC1D,MAAM,MAAM,4BAA4B,GACtC,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB,EAAE,MAAM,CAAC;IAClC,uBAAuB,EAAE,MAAM,CAAC;IAChC,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,iBAKnC,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,MAAM,CACpD,4BAA4B,EAC5B,iBAAiB,CAGlB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAuC,CAAC;AACnE,eAAO,MAAM,yBAAyB,QACW,CAAC;AAClD,eAAO,MAAM,uBAAuB,QACW,CAAC;AAChD,eAAO,MAAM,wBAAwB,QACW,CAAC"}

package/src/utils/versions.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rsbuildPluginSassVersion = exports.rsbuildPluginVueVersion = exports.rsbuildPluginReactVersion = exports.rsbuildVersion = exports.nxVersion = void 0;
+exports.rsbuildPluginSassVersion = exports.rsbuildPluginVueVersion = exports.rsbuildPluginReactVersion = exports.rsbuildVersion = exports.backwardCompatibleRsbuildVersions = exports.latestRsbuildVersions = exports.supportedRsbuildMajorVersions = exports.minSupportedRsbuildVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.rsbuildVersion = '1.1.10';
-exports.rsbuildPluginReactVersion = '1.1.0';
-exports.rsbuildPluginVueVersion = '1.0.5';
-exports.rsbuildPluginSassVersion = '1.1.2';
+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];
+exports.latestRsbuildVersions = {
+    rsbuildVersion: '1.1.10',
+    rsbuildPluginReactVersion: '1.1.0',
+    rsbuildPluginVueVersion: '1.0.5',
+    rsbuildPluginSassVersion: '1.1.2',
+};
+exports.backwardCompatibleRsbuildVersions = {
+    1: exports.latestRsbuildVersions,
+};
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+exports.rsbuildVersion = exports.latestRsbuildVersions.rsbuildVersion;
+exports.rsbuildPluginReactVersion = exports.latestRsbuildVersions.rsbuildPluginReactVersion;
+exports.rsbuildPluginVueVersion = exports.latestRsbuildVersions.rsbuildPluginVueVersion;
+exports.rsbuildPluginSassVersion = exports.latestRsbuildVersions.rsbuildPluginSassVersion;