@nx/rspack 23.0.0-beta.12 → 23.0.0-beta.14

package/migrations.json

@@ -65,13 +65,24 @@
         }
       }
     },
-    "21.3.0": {
+    "21.3.0-module-federation-enhanced": {
       "version": "21.3.0-beta.8",
+      "requires": {
+        "@module-federation/enhanced": ">=0.15.0 <0.17.0"
+      },
       "packages": {
         "@module-federation/enhanced": {
           "version": "^0.17.0",
           "alwaysAddToPackageJson": false
-        },
+        }
+      }
+    },
+    "21.3.0-module-federation-node": {
+      "version": "21.3.0-beta.8",
+      "requires": {
+        "@module-federation/node": "<2.7.9"
+      },
+      "packages": {
         "@module-federation/node": {
           "version": "^2.7.9",
           "alwaysAddToPackageJson": false
@@ -100,21 +111,48 @@
         }
       }
     },
-    "22.2.0": {
+    "22.2.0-module-federation-enhanced": {
       "version": "22.2.0-beta.0",
+      "requires": {
+        "@module-federation/enhanced": ">=0.17.0 <0.21.0"
+      },
       "packages": {
         "@module-federation/enhanced": {
           "version": "^0.21.2",
           "alwaysAddToPackageJson": false
-        },
-        "@module-federation/runtime": {
+        }
+      }
+    },
+    "22.2.0-module-federation-sdk": {
+      "version": "22.2.0-beta.0",
+      "requires": {
+        "@module-federation/sdk": ">=0.17.0 <0.21.0"
+      },
+      "packages": {
+        "@module-federation/sdk": {
           "version": "^0.21.2",
           "alwaysAddToPackageJson": false
-        },
-        "@module-federation/sdk": {
+        }
+      }
+    },
+    "22.2.0-module-federation-runtime": {
+      "version": "22.2.0-beta.0",
+      "requires": {
+        "@module-federation/runtime": "<0.21.0"
+      },
+      "packages": {
+        "@module-federation/runtime": {
           "version": "^0.21.2",
           "alwaysAddToPackageJson": false
-        },
+        }
+      }
+    },
+    "22.2.0-module-federation-node": {
+      "version": "22.2.0-beta.0",
+      "requires": {
+        "@module-federation/node": "<2.7.21"
+      },
+      "packages": {
         "@module-federation/node": {
           "version": "^2.7.21",
           "alwaysAddToPackageJson": false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.14",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,14 +24,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
-    "@nx/module-federation": "23.0.0-beta.12",
-    "@nx/web": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.14",
+    "@nx/js": "23.0.0-beta.14",
+    "@nx/module-federation": "23.0.0-beta.14",
+    "@nx/web": "23.0.0-beta.14",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@rspack/core": "1.6.8",
-    "@rspack/dev-server": "^1.1.4",
-    "@rspack/plugin-react-refresh": "^1.0.0",
     "autoprefixer": "^10.4.9",
     "browserslist": "^4.26.0",
     "css-loader": "^6.4.0",
@@ -49,6 +46,7 @@
     "sass": "^1.97.2",
     "sass-embedded": "^1.97.2",
     "sass-loader": "^16.0.7",
+    "semver": "^7.6.3",
     "source-map-loader": "^5.0.0",
     "style-loader": "^3.3.0",
     "ts-checker-rspack-plugin": "^1.1.1",
@@ -57,12 +55,28 @@
     "webpack-node-externals": "^3.0.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12",
-    "@nx/nest": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.14",
+    "@nx/nest": "23.0.0-beta.14"
   },
   "peerDependencies": {
-    "@module-federation/enhanced": "^2.3.3",
-    "@module-federation/node": "^2.7.21"
+    "@rspack/cli": "^1.0.0",
+    "@rspack/core": "^1.0.0",
+    "@rspack/dev-server": "^1.0.0",
+    "@rspack/plugin-react-refresh": "^1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@rspack/cli": {
+      "optional": true
+    },
+    "@rspack/core": {
+      "optional": true
+    },
+    "@rspack/dev-server": {
+      "optional": true
+    },
+    "@rspack/plugin-react-refresh": {
+      "optional": true
+    }
   },
   "nx-migrations": {
     "migrations": "./migrations.json"

package/src/executors/dev-server/dev-server.impl.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const dev_server_1 = require("@rspack/dev-server");
 const create_compiler_1 = require("../../utils/create-compiler");
 const mode_utils_1 = require("../../utils/mode-utils");
@@ -21,7 +21,7 @@ async function* runExecutor(options, context) {
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildOptions.buildLibsFromSource}`;
     process.env.NX_BUILD_TARGET = options.buildTarget;
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(metadata);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(metadata);
     const normalizedBuildOptions = (0, normalize_options_1.normalizeOptions)(buildOptions, context.root, metadata.root, sourceRoot);
     let devServerConfig = (0, get_dev_server_config_1.getDevServerOptions)(context.root, options, normalizedBuildOptions);
     const compiler = await (0, create_compiler_1.createCompiler)({

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -4,7 +4,7 @@ exports.default = moduleFederationDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
@@ -25,7 +25,7 @@ async function* moduleFederationDevServer(schema, context) {
         }, context)
         : (0, dev_server_impl_1.default)(options, context);
     const p = context.projectsConfigurations.projects[context.projectName];
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(p), 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(p), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -4,7 +4,7 @@ exports.default = moduleFederationSsrDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
@@ -15,7 +15,7 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     const options = (0, lib_1.normalizeOptions)(ssrDevServerOptions);
     const iter = (0, ssr_dev_server_impl_1.default)(options, context);
     const projectConfig = context.projectsConfigurations.projects[context.projectName];
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig), 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(projectConfig), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -5,7 +5,7 @@ exports.default = moduleFederationStaticServer;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const utils_2 = require("@nx/module-federation/src/utils");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
@@ -18,7 +18,7 @@ function getBuildAndServeOptionsFromServeTarget(serveTarget, context) {
     const serveOptions = (0, devkit_1.readTargetOptions)(target, context);
     const buildTarget = (0, devkit_1.parseTargetString)(serveOptions.buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
     if (serveOptions.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, serveOptions.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/rspack/lib/normalize-options.js

@@ -4,11 +4,11 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizePluginPath = normalizePluginPath;
 const path_1 = require("path");
 const normalize_options_1 = require("../../../plugins/utils/plugins/normalize-options");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeOptions(options, root, projectRoot, sourceRoot) {
     const normalizedOptions = {
         ...options,
-        useTsconfigPaths: !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(),
+        useTsconfigPaths: !(0, internal_1.isUsingTsSolutionSetup)(),
         root,
         projectRoot,
         sourceRoot,

package/src/executors/rspack/rspack.impl.js

@@ -4,7 +4,7 @@ exports.default = runExecutor;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const core_1 = require("@rspack/core");
 const path_1 = require("path");
 const create_compiler_1 = require("../../utils/create-compiler");
@@ -16,7 +16,7 @@ async function* runExecutor(options, context) {
     process.env.NODE_ENV ??= options.mode ?? 'production';
     options.target ??= 'web';
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(metadata);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(metadata);
     const normalizedOptions = (0, normalize_options_1.normalizeOptions)(options, context.root, metadata.root, sourceRoot);
     if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
         normalizedOptions.mode = process.env.NODE_ENV;

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAmD/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,mDAmI7B;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAoD/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,mDAqI7B;AAED,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -6,13 +6,14 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const generator_utils_1 = require("../../utils/generator-utils");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const deprecation_1 = require("../../utils/deprecation");
+const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 function projectIsRootProjectInStandaloneWorkspace(projectRoot) {
     return (0, path_1.relative)(devkit_1.workspaceRoot, projectRoot).length === 0;
 }
 function editTsConfig(tree, projectRoot, framework, relativePathToRootTsConfig) {
-    const shared = require('@nx/js/src/utils/typescript/create-ts-config');
+    const shared = require('@nx/js');
     if (framework === 'react') {
         const json = {
             compilerOptions: {
@@ -46,6 +47,7 @@ function editTsConfig(tree, projectRoot, framework, relativePathToRootTsConfig)
     }
 }
 async function configurationGenerator(tree, options) {
+    (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
     const task = await (0, init_1.default)(tree, {
         ...options,
     });
@@ -70,7 +72,7 @@ async function configurationGenerator(tree, options) {
         projectAlreadyHasRspackTargets = alreadyHasNxRspackTargets;
         if (alreadyHasNxRspackTargets.build &&
             (alreadyHasNxRspackTargets.serve ||
-                (0, ts_solution_setup_1.getProjectType)(tree, options.project, projectType) === 'library' ||
+                (0, internal_1.getProjectType)(tree, options.project, projectType) === 'library' ||
                 options.framework === 'nest')) {
             throw new Error(`The project ${options.project} is already configured to use the @nx/rspack executors.
         Please try a different project, or remove the existing targets

package/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-config-to-rspack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,IAAI,EAIL,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAWD,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,iBAoGhB;AAED,eAAe,oCAAoC,CAAC"}
+{"version":3,"file":"convert-config-to-rspack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,IAAI,EAIL,MAAM,YAAY,CAAC;AAQpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAWD,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,iBAsGhB;AAED,eAAe,oCAAoC,CAAC"}

package/src/generators/convert-config-to-rspack-plugin/convert-config-to-rspack-plugin.js

@@ -7,6 +7,7 @@ const extract_rspack_options_1 = require("./lib/extract-rspack-options");
 const normalize_path_options_1 = require("./lib/normalize-path-options");
 const path_1 = require("path");
 const validate_project_1 = require("./lib/validate-project");
+const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 // Make text JSON compatible
 const preprocessText = (text) => {
     return text
@@ -16,6 +17,7 @@ const preprocessText = (text) => {
         .replace(/(\r\n|\n|\r|\t)/gm, ''); // Remove newlines and tabs
 };
 async function convertConfigToRspackPluginGenerator(tree, options) {
+    (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
     let migrated = 0;
     const projects = (0, devkit_1.getProjects)(tree);
     (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:rspack', (currentTargetOptions, projectName, targetName, configurationName) => {

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAyElE;AA6CD,wBAAgB,sBAAsB,IAAI,OAAO,YAAY,GAAG;IAC9D,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,KAAK,IAAI,CAAC;CAC5D,CAkCA"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG/D,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAiFlE;AA6CD,wBAAgB,sBAAsB,IAAI,OAAO,YAAY,GAAG;IAC9D,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,KAAK,IAAI,CAAC;CAC5D,CAkCA"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -9,7 +9,9 @@ const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const utils_1 = require("./utils");
 const devkit_exports_1 = require("nx/src/devkit-exports");
+const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migrationContext = {
         logger: new internal_1.AggregatedLog(),
@@ -52,7 +54,13 @@ async function convertToInferred(tree, options) {
     else {
         logger.flushLogs();
     }
-    const installCallback = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@rspack/core': versions_1.rspackCoreVersion }, undefined, true);
+    const installCallback = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@rspack/core': versions_1.rspackCoreVersion,
+        // The inferred plugin's targets run the `rspack` CLI. Since
+        // @rspack/cli is an optional peer dependency of @nx/rspack, install
+        // it explicitly so the converted targets can execute.
+        '@rspack/cli': versions_1.rspackCoreVersion,
+    }, undefined, true);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/convert-webpack/convert-webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-webpack.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-webpack/convert-webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC,yBAA+B,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAwJzD"}
+{"version":3,"file":"convert-webpack.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/convert-webpack/convert-webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWlC,yBAA+B,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAiKzD"}

package/src/generators/convert-webpack/convert-webpack.js

@@ -6,7 +6,9 @@ const versions_1 = require("../../utils/versions");
 const transform_esm_1 = require("./lib/transform-esm");
 const transform_cjs_1 = require("./lib/transform-cjs");
 const transform_plugin_config_1 = require("./lib/transform-plugin-config");
+const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 async function default_1(tree, options) {
+    (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
     const projects = (0, devkit_1.getProjects)(tree);
     if (!projects.has(options.project)) {
         throw new Error(`Could not find project '${options.project}'. Ensure you have specified the project you'd like to convert correctly.`);
@@ -113,7 +115,12 @@ async function default_1(tree, options) {
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@rspack/core': versions_1.rspackCoreVersion,
         '@rspack/dev-server': versions_1.rspackDevServerVersion,
-    });
+        // @rspack/plugin-react-refresh is required at runtime by
+        // apply-react-config when building a React project. Since it is an
+        // optional peer dependency of @nx/rspack, the convert generator must
+        // install it explicitly.
+        '@rspack/plugin-react-refresh': versions_1.rspackPluginReactRefreshVersion,
+    }, undefined, true);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAyG5B;AAED,eAAe,mBAAmB,CAAC;AAEnC,eAAO,MAAM,mBAAmB,sFAA0C,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAiH5B;AAED,eAAe,mBAAmB,CAAC;AAEnC,eAAO,MAAM,mBAAmB,sFAA0C,CAAC"}

package/src/generators/init/init.js

@@ -7,7 +7,10 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const plugin_1 = require("../../../plugin");
 const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("../../utils/version-utils");
+const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 async function rspackInitGenerator(tree, schema) {
+    (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -59,12 +62,15 @@ async function rspackInitGenerator(tree, schema) {
         skipFormat: true,
     });
     tasks.push(jsInitTask);
+    const rspackVersions = (0, version_utils_1.getRspackVersionsForInstalledMajor)(tree);
+    const keepExistingVersions = schema.keepExistingVersions ?? true;
     const devDependencies = {
-        '@rspack/core': versions_1.rspackCoreVersion,
-        '@rspack/cli': versions_1.rspackCoreVersion,
+        '@rspack/core': rspackVersions.rspackCoreVersion,
+        '@rspack/cli': rspackVersions.rspackCoreVersion,
+        '@rspack/dev-server': rspackVersions.rspackDevServerVersion,
         ...(!schema.framework || schema.framework === 'react'
             ? {
-                '@rspack/plugin-react-refresh': versions_1.rspackPluginReactRefreshVersion,
+                '@rspack/plugin-react-refresh': rspackVersions.rspackPluginReactRefreshVersion,
                 'react-refresh': versions_1.reactRefreshVersion,
             }
             : {}),
@@ -82,9 +88,10 @@ async function rspackInitGenerator(tree, schema) {
         devDependencies['sass-embedded'] = versions_1.sassEmbeddedVersion;
     }
     if (schema.framework !== 'none' || schema.devServer) {
-        devDependencies['@rspack/dev-server'] = versions_1.rspackDevServerVersion;
+        devDependencies['@rspack/dev-server'] =
+            rspackVersions.rspackDevServerVersion;
     }
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, keepExistingVersions);
     tasks.push(installTask);
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/init/schema.json

@@ -24,7 +24,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     }
   },
   "required": []

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/plugins/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAKd,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAiC5D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/plugins/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAKd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAiC5D,CAAC"}

package/src/plugins/plugin.js

@@ -4,7 +4,7 @@ exports.createNodesV2 = exports.createDependencies = void 0;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
@@ -12,7 +12,6 @@ const package_manager_1 = require("nx/src/utils/package-manager");
 const path_1 = require("path");
 const read_rspack_options_1 = require("../utils/read-rspack-options");
 const resolve_user_defined_rspack_config_1 = require("../utils/resolve-user-defined-rspack-config");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
 const createDependencies = () => {
     return [];
 };
@@ -24,7 +23,7 @@ exports.createNodesV2 = [
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rspack-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -166,7 +165,7 @@ async function createRspackTargets(configFilePath, projectRoot, options, context
             '@nx/js:typescript-sync',
         ];
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
 function normalizeOptions(options) {

package/src/plugins/utils/apply-base-config.js

@@ -12,7 +12,7 @@ const hash_format_1 = require("./hash-format");
 const nx_tsconfig_paths_rspack_plugin_1 = require("./plugins/nx-tsconfig-paths-rspack-plugin");
 const get_terser_ecma_version_1 = require("./get-terser-ecma-version");
 const nodeExternals = require("webpack-node-externals");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const get_non_buildable_libs_1 = require("./get-non-buildable-libs");
 const IGNORED_RSPACK_WARNINGS = [
     /The comment file/i,
@@ -201,7 +201,7 @@ function applyNxIndependentConfig(options, config) {
 function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     const tsConfig = options.tsConfig ?? (0, js_1.getRootTsConfigPath)();
     const plugins = [];
-    const isUsingTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isUsingTsSolution = (0, internal_1.isUsingTsSolutionSetup)();
     const executorContext = {
         projectName: options.projectName,
         targetName: options.targetName,

package/src/plugins/utils/apply-web-config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyWebConfig = applyWebConfig;
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const core_1 = require("@rspack/core");
 const path_1 = require("path");
 const write_index_html_plugin_1 = require("../write-index-html-plugin");
@@ -18,7 +18,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     options.generateIndexHtml ??= true;
     options.index = options.index
         ? (0, path_1.join)(options.root, options.index)
-        : (0, path_1.join)(options.root, (0, ts_solution_setup_1.getProjectSourceRoot)(options.projectGraph.nodes[options.projectName].data), 'index.html');
+        : (0, path_1.join)(options.root, (0, internal_1.getProjectSourceRoot)(options.projectGraph.nodes[options.projectName].data), 'index.html');
     options.styles ??= [];
     options.scripts ??= [];
     const isProd = process.env.NODE_ENV === 'production' || options.mode === 'production';

package/src/plugins/utils/models.d.ts

@@ -1,6 +1,6 @@
 import type { DevTool, Mode } from '@rspack/core';
 import type { ProjectGraph } from '@nx/devkit';
-import type { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import type { AssetGlob } from '@nx/js/internal';
 export interface AssetGlobPattern {
     glob: string;
     input: string;

package/src/plugins/utils/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"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"}

package/src/plugins/utils/plugins/normalize-options.js

@@ -4,7 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizeAssets = normalizeAssets;
 exports.normalizeFileReplacements = normalizeFileReplacements;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function normalizeOptions(options) {
@@ -49,7 +49,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectNode.data);
     if (!combinedPluginAndMaybeExecutorOptions.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx rspack plugin.`);
     }

package/src/plugins/utils/plugins/nx-tsconfig-paths-rspack-plugin.js

@@ -4,7 +4,7 @@ exports.NxTsconfigPathsRspackPlugin = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const rspack_nx_build_coordination_plugin_1 = require("./rspack-nx-build-coordination-plugin");
 const fs_1 = require("fs");
 class NxTsconfigPathsRspackPlugin {
@@ -43,8 +43,8 @@ class NxTsconfigPathsRspackPlugin {
     handleBuildLibsFromSource(config, options) {
         if (!options.buildLibsFromSource && options.targetName) {
             const remappedTarget = options.targetName === 'serve' ? 'build' : options.targetName;
-            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
-            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
+            const { target, dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
+            options.tsConfig = (0, internal_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
             this.tmpTsConfigPath = options.tsConfig;
             if (options.targetName === 'serve') {
                 const buildableDependencies = dependencies

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

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

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

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

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

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

package/src/utils/config.js

@@ -5,7 +5,7 @@ exports.isNxRspackComposablePlugin = isNxRspackComposablePlugin;
 exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const configuration_1 = require("nx/src/config/configuration");
 exports.nxRspackComposablePlugin = 'nxRspackComposablePlugin';
 function isNxRspackComposablePlugin(a) {
@@ -50,7 +50,7 @@ function ensureNxRspackExecutionContext(ctx) {
     ctx.options ??= {
         root: devkit_1.workspaceRoot,
         projectRoot: projectNode.data.root,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
+        sourceRoot: (0, internal_1.getProjectSourceRoot)(projectNode.data),
         // These aren't actually needed since NxRspackPlugin and withNx both support them being undefined.
         assets: undefined,
         outputFileName: undefined,

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/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA8BzB"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAMnD,wBAAsB,yBAAyB,CAC7C,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

@@ -6,9 +6,10 @@ const internal_1 = require("@nx/devkit/internal");
 async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        nxJson.targetDefaults?.['serve'].options?.port) {
-        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
+        ?.options?.port;
+    if (servePort) {
+        e2ePort = servePort;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/rspack/plugin',

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

@@ -1 +1 @@
-{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,mBAAmB,EACnB,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAKnE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,EACD,mBAAmB,CAAC,EAAE,sBAAsB,GAC3C;IACD,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,kCAAkC,EAAE,OAAO,CAAC;IAC5C,+BAA+B,EAAE,WAAW,CAAC;IAC7C,yBAAyB,EAAE,WAAW,CAAC;CACxC,CAwHA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAgEf;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAoBf;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,wBAAwB,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,QAQvD;AAyND,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,qBAAqB,CAAC,EAAE,MAAM,QAa/B;AAID,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,QA8DpB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAQR;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,UAchB;AAED,wBAAsB,oCAAoC,CACxD,+BAA+B,EAAE,WAAW,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,iBAuBrB;AAqCD,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,iBA4B/D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;CAChD,GACA;IAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAmEnD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UASrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UAYzE"}
+{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,mBAAmB,EACnB,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAKnE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,EACD,mBAAmB,CAAC,EAAE,sBAAsB,GAC3C;IACD,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,kCAAkC,EAAE,OAAO,CAAC;IAC5C,+BAA+B,EAAE,WAAW,CAAC;IAC7C,yBAAyB,EAAE,WAAW,CAAC;CACxC,CAwHA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAgEf;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAoBf;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,wBAAwB,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,QAQvD;AAyND,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,qBAAqB,CAAC,EAAE,MAAM,QAa/B;AAID,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,QA8DpB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAQR;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,UAchB;AAED,wBAAsB,oCAAoC,CACxD,+BAA+B,EAAE,WAAW,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,iBAuBrB;AAqCD,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,iBA4B/D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;CAChD,GACA;IAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAmEnD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UASrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UAYzE"}

package/src/utils/generator-utils.js

@@ -14,8 +14,7 @@ exports.determineFrameworkAndTarget = determineFrameworkAndTarget;
 exports.determineMain = determineMain;
 exports.determineTsConfig = determineTsConfig;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const has_plugin_1 = require("./has-plugin");
 function findExistingTargetsInProject(targets, userProvidedTargets) {
     const output = {
@@ -130,7 +129,7 @@ function addOrChangeBuildTarget(tree, options, target) {
     if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src/assets'))) {
         assets.push((0, devkit_1.joinPathFragments)(project.root, 'src/assets'));
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(tree);
     const buildOptions = {
         target: options.target ?? 'web',
         outputPath: isTsSolutionSetup
@@ -486,7 +485,7 @@ async function handleUnknownExecutors(projectName) {
     }
 }
 function determineFrameworkAndTarget(tree, options, projectRoot, targets) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     // First try to infer if the target is node
     if (options.target !== 'node') {

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

@@ -0,0 +1,27 @@
+import { type Tree } from '@nx/devkit';
+import { type SupportedRspackMajorVersion } from './versions';
+/**
+ * Returns the declared @rspack/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 `assertSupportedRspackVersion`.
+ */
+export declare function getInstalledRspackMajorVersion(tree: Tree): SupportedRspackMajorVersion | undefined;
+/**
+ * Returns the installed @rspack/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rspack/core can't be resolved or the
+ * installed major isn't supported.
+ */
+export declare function getInstalledRspackVersionRuntime(): SupportedRspackMajorVersion | 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 getRspackVersionsForInstalledMajor(tree: Tree): {
+    rspackCoreVersion: string;
+    rspackDevServerVersion: string;
+    rspackPluginReactRefreshVersion: 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/rspack/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,YAAY,CAAC;AAIpB;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,GACT,2BAA2B,GAAG,SAAS,CASzC;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,IAAI,2BAA2B,GAAG,IAAI,CASrF;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,IAAI;;;;EAM5D"}

package/src/utils/version-utils.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledRspackMajorVersion = getInstalledRspackMajorVersion;
+exports.getInstalledRspackVersionRuntime = getInstalledRspackVersionRuntime;
+exports.getRspackVersionsForInstalledMajor = getRspackVersionsForInstalledMajor;
+const internal_1 = require("@nx/devkit/internal");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
+const RSPACK_CORE_PACKAGE = '@rspack/core';
+/**
+ * Returns the declared @rspack/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 `assertSupportedRspackVersion`.
+ */
+function getInstalledRspackMajorVersion(tree) {
+    const declared = (0, internal_1.getDeclaredPackageVersion)(tree, RSPACK_CORE_PACKAGE);
+    if (!declared) {
+        return undefined;
+    }
+    const installedMajor = (0, semver_1.major)(declared);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? installedMajor
+        : undefined;
+}
+/**
+ * Returns the installed @rspack/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rspack/core can't be resolved or the
+ * installed major isn't supported.
+ */
+function getInstalledRspackVersionRuntime() {
+    const version = (0, internal_1.getInstalledPackageVersion)(RSPACK_CORE_PACKAGE);
+    if (!version) {
+        return null;
+    }
+    const installedMajor = (0, semver_1.major)(version);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? 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 getRspackVersionsForInstalledMajor(tree) {
+    const installed = getInstalledRspackMajorVersion(tree);
+    if (installed === undefined) {
+        return versions_1.latestRspackVersions;
+    }
+    return versions_1.backwardCompatibleRspackVersions[installed];
+}

package/src/utils/versions.d.ts

@@ -1,9 +1,24 @@
 export declare const nxVersion: any;
-export declare const rspackCoreVersion = "1.6.8";
-export declare const rspackDevServerVersion = "^1.1.4";
-export declare const rspackPluginReactRefreshVersion = "^1.0.0";
+export declare const minSupportedRspackVersion = "1.0.0";
 export declare const lessLoaderVersion = "~11.1.3";
 export declare const sassLoaderVersion = "^16.0.7";
 export declare const sassEmbeddedVersion = "^1.97.2";
 export declare const reactRefreshVersion = "~0.14.0";
+export declare const supportedRspackMajorVersions: readonly [1];
+export type SupportedRspackMajorVersion = (typeof supportedRspackMajorVersions)[number];
+type RspackVersionMap = {
+    rspackCoreVersion: string;
+    rspackDevServerVersion: string;
+    rspackPluginReactRefreshVersion: string;
+};
+export declare const latestRspackVersions: RspackVersionMap;
+export declare const backwardCompatibleRspackVersions: Record<SupportedRspackMajorVersion, RspackVersionMap>;
+/**
+ * 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 rspackCoreVersion: string;
+export declare const rspackDevServerVersion: string;
+export declare const rspackPluginReactRefreshVersion: 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/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,eAAO,MAAM,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,yBAAyB,UAAU,CAAC;AAEjD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAK7C,eAAO,MAAM,4BAA4B,cAAe,CAAC;AACzD,MAAM,MAAM,2BAA2B,GACrC,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,KAAK,gBAAgB,GAAG;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B,EAAE,MAAM,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,gBAIlC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CACnD,2BAA2B,EAC3B,gBAAgB,CAGjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAyC,CAAC;AACxE,eAAO,MAAM,sBAAsB,QACU,CAAC;AAC9C,eAAO,MAAM,+BAA+B,QACU,CAAC"}

package/src/utils/versions.js

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
+exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.backwardCompatibleRspackVersions = exports.latestRspackVersions = exports.supportedRspackMajorVersions = exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.minSupportedRspackVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.rspackCoreVersion = '1.6.8';
-exports.rspackDevServerVersion = '^1.1.4';
-exports.rspackPluginReactRefreshVersion = '^1.0.0';
+exports.minSupportedRspackVersion = '1.0.0';
 exports.lessLoaderVersion = '~11.1.3';
 exports.sassLoaderVersion = '^16.0.7';
 exports.sassEmbeddedVersion = '^1.97.2';
 exports.reactRefreshVersion = '~0.14.0';
+// Supported `@rspack/core` majors. Currently v1 only — v2 ships as pure
+// ESM, which @nx/rspack (CommonJS) cannot consume without a deeper
+// refactor; tracked separately.
+exports.supportedRspackMajorVersions = [1];
+exports.latestRspackVersions = {
+    rspackCoreVersion: '1.6.8',
+    rspackDevServerVersion: '^1.1.4',
+    rspackPluginReactRefreshVersion: '^1.0.0',
+};
+exports.backwardCompatibleRspackVersions = {
+    1: exports.latestRspackVersions,
+};
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+exports.rspackCoreVersion = exports.latestRspackVersions.rspackCoreVersion;
+exports.rspackDevServerVersion = exports.latestRspackVersions.rspackDevServerVersion;
+exports.rspackPluginReactRefreshVersion = exports.latestRspackVersions.rspackPluginReactRefreshVersion;

package/src/utils/with-react.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import { NxRspackExecutionContext } from './config';
 import { WithWebOptions } from './with-web';
 export interface WithReactOptions extends WithWebOptions {

package/src/utils/with-react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAE3D,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}
+{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAE3D,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}

package/src/utils/with-web.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import { ExtraEntryPointClass } from './model';
 import { NxRspackExecutionContext } from './config';
 export interface WithWebOptions {

package/src/utils/with-web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}
+{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}