@nx/rspack 23.0.0-beta.2 → 23.0.0-beta.20

package/migrations.json

@@ -17,6 +17,12 @@
       "version": "22.0.0-beta.1",
       "description": "Remove deprecated deleteOutputPath and sassImplementation options from rspack configurations.",
       "factory": "./src/migrations/update-22-0-0/remove-deprecated-options"
+    },
+    "update-23-0-0-add-svgr-to-rspack-config": {
+      "cli": "nx",
+      "version": "23.0.0-beta.9",
+      "description": "Updates rspack configs using React to use the new withSvgr composable function instead of the svgr option in withReact or NxReactRspackPlugin.",
+      "factory": "./src/migrations/update-23-0-0/add-svgr-to-rspack-config"
     }
   },
   "packageJsonUpdates": {
@@ -59,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
@@ -94,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.2",
+  "version": "23.0.0-beta.20",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,14 +24,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@nx/module-federation": "23.0.0-beta.2",
-    "@nx/web": "23.0.0-beta.2",
-    "@phenomnomnominal/tsquery": "~6.1.4",
-    "@rspack/core": "1.6.8",
-    "@rspack/dev-server": "^1.1.4",
-    "@rspack/plugin-react-refresh": "^1.0.0",
+    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/js": "23.0.0-beta.20",
+    "@nx/module-federation": "23.0.0-beta.20",
+    "@nx/web": "23.0.0-beta.20",
+    "@phenomnomnominal/tsquery": "~6.2.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.2",
-    "@nx/nest": "23.0.0-beta.2"
+    "nx": "23.0.0-beta.20",
+    "@nx/nest": "23.0.0-beta.20"
   },
   "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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/dev-server/dev-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAGnD,wBAA+B,WAAW,CACxC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,GACvB,qBAAqB,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0E/D"}
+{"version":3,"file":"dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/dev-server/dev-server.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAA+B,WAAW,CACxC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,GACvB,qBAAqB,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4E/D"}

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

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-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");
 const normalize_options_1 = require("../rspack/lib/normalize-options");
 const get_dev_server_config_1 = require("./lib/get-dev-server-config");
+const deprecation_1 = require("../../utils/deprecation");
 async function* runExecutor(options, context) {
+    (0, deprecation_1.warnRspackDevServerExecutorDeprecation)();
     process.env.NODE_ENV ??= options.mode ?? 'development';
     if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
         options.mode = process.env.NODE_ENV;
@@ -19,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)({
@@ -37,7 +39,7 @@ async function* runExecutor(options, context) {
         ...firstCompiler.options.devServer,
     };
     const baseUrl = `http://localhost:${devServerConfig.port ?? 4200}`;
-    return yield* (0, async_iterable_1.createAsyncIterable)(({ next }) => {
+    return yield* (0, internal_1.createAsyncIterable)(({ next }) => {
         const server = new dev_server_1.RspackDevServer({
             ...devServerConfig,
             onListening: () => {

package/src/executors/dev-server/schema.json

@@ -5,6 +5,7 @@
   "description": "Run @rspack/dev-server to serve a project.",
   "continuous": true,
   "type": "object",
+  "x-deprecated": "The `@nx/rspack:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "buildTarget": {
       "type": "string",

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = moduleFederationDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+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)) {
@@ -40,7 +40,7 @@ async function* moduleFederationDevServer(schema, context) {
         return yield* currIter;
     }
     const { staticRemotesIter, devRemoteIters, remotes } = await (0, utils_1.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'react');
-    return yield* (0, async_iterable_1.combineAsyncIterables)(currIter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(currIter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = moduleFederationSsrDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+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)) {
@@ -30,7 +30,7 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
         return yield* iter;
     }
     const { staticRemotesIter, devRemoteIters, remotes } = await (0, utils_1.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'react', true);
-    return yield* (0, async_iterable_1.combineAsyncIterables)(iter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(iter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startProxies = startProxies;
 exports.default = moduleFederationStaticServer;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-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)) {
@@ -201,7 +201,7 @@ async function* moduleFederationStaticServer(schema, context) {
             pathToKey: (0, path_1.join)(devkit_1.workspaceRoot, options.serveOptions.sslKey),
         }
         : undefined);
-    return yield* (0, async_iterable_1.combineAsyncIterables)(staticFileServerIter, (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(staticFileServerIter, (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         const host = options.serveOptions.host ?? 'localhost';
         const baseUrl = `http${options.serveOptions.ssl ? 's' : ''}://${host}:${options.serveOptions.port}`;
         if (remotes.remotePorts.length === 0) {

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rspack.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/rspack/rspack.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAiBrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,wBAA+B,WAAW,CACxC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe;aA0Bb,OAAO;cACN,MAAM;cA+EnB"}
+{"version":3,"file":"rspack.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/rspack/rspack.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAiBrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGhD,wBAA+B,WAAW,CACxC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,eAAe;aA4Bb,OAAO;cACN,MAAM;cA+EnB"}

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

@@ -2,19 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+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");
 const mode_utils_1 = require("../../utils/mode-utils");
 const normalize_options_1 = require("./lib/normalize-options");
+const deprecation_1 = require("../../utils/deprecation");
 async function* runExecutor(options, context) {
+    (0, deprecation_1.warnRspackExecutorDeprecation)();
     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;
@@ -23,7 +25,7 @@ async function* runExecutor(options, context) {
         await executeTypeCheck(normalizedOptions, context);
     }
     const compiler = await (0, create_compiler_1.createCompiler)(normalizedOptions, context);
-    const iterable = (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const iterable = (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         const watch = (compiler instanceof core_1.Compiler
             ? compiler.options.watch
             : compiler.options[0].watch) ?? options.watch;

package/src/executors/rspack/schema.json

@@ -4,6 +4,7 @@
   "title": "Rspack build executor",
   "description": "Run Rspack via an executor for a project.",
   "type": "object",
+  "x-deprecated": "The `@nx/rspack:rspack` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "target": {
       "type": "string",

package/src/executors/ssr-dev-server/ssr-dev-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpE,wBAAuB,oBAAoB,CACzC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,eAAe;;aA0Bb,OAAO;aAEP,aAAa;kBA6BzB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"ssr-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpE,wBAAuB,oBAAoB,CACzC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,eAAe;;aA0Bb,OAAO;aAEP,aAAa;kBA6BzB;AAED,eAAe,oBAAoB,CAAC"}

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrDevServerExecutor = ssrDevServerExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const pc = tslib_1.__importStar(require("picocolors"));
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
 async function* ssrDevServerExecutor(options, context) {
@@ -15,7 +15,7 @@ async function* ssrDevServerExecutor(options, context) {
     const runServer = await (0, devkit_1.runExecutor)(serverTarget, { ...serverOptions, ...options.serverTargetOptions }, context);
     let browserBuilt = false;
     let nodeStarted = false;
-    const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
+    const combined = (0, internal_1.combineAsyncIterables)(runBrowser, runServer);
     for await (const output of combined) {
         if (!output.success)
             throw new Error('Could not build application');

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;AAwD/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,mDA0H7B;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,19 +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) {
-    // Nx 15.8 moved util to @nx/js, but it is in @nx/workspace in 15.7
-    let shared;
-    try {
-        shared = require('@nx/js/src/utils/typescript/create-ts-config');
-    }
-    catch {
-        shared = require('@nx/workspace/src/utils/create-ts-config');
-    }
+    const shared = require('@nx/js');
     if (framework === 'react') {
         const json = {
             compilerOptions: {
@@ -52,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,
     });
@@ -76,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
@@ -106,6 +102,13 @@ async function configurationGenerator(tree, options) {
         (0, generator_utils_1.deleteWebpackConfig)(tree, root, targets?.[buildTargetName]?.options?.webpackConfig);
         editTsConfig(tree, root, options.framework, (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(root), 'tsconfig.base.json'));
     }
+    const willScaffoldExecutorTargets = !projectAlreadyHasRspackTargets.build ||
+        ((options.framework !== 'none' || options.devServer) &&
+            options.framework !== 'nest' &&
+            !projectAlreadyHasRspackTargets.serve);
+    if (willScaffoldExecutorTargets) {
+        (0, deprecation_1.warnRspackExecutorGenerating)();
+    }
     if (!projectAlreadyHasRspackTargets.build) {
         (0, generator_utils_1.addOrChangeBuildTarget)(tree, options, buildTargetName);
     }

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":"AAAA,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,iBAwGhB;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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertConfigToRspackPluginGenerator = convertConfigToRspackPluginGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 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,9 +17,10 @@ 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, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rspack:rspack', (currentTargetOptions, projectName, targetName, configurationName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:rspack', (currentTargetOptions, projectName, targetName, configurationName) => {
         if (options.project && projectName !== options.project) {
             return;
         }
@@ -63,11 +65,7 @@ async function convertConfigToRspackPluginGenerator(tree, options) {
                         : 'new NxAppRspackPlugin()'},
                 ${withReactConfig
                         ? `new NxReactRspackPlugin(${withReactConfig.getText()})`
-                        : `new NxReactRspackPlugin({
-                  // Uncomment this line if you don't want to use SVGR
-                  // See: https://react-svgr.com/
-                  // svgr: false
-                  })`},
+                        : `new NxReactRspackPlugin()`},
                 // NOTE: useLegacyNxPlugin ensures that the non-standard Rspack configuration file previously used still works.
                 // To remove its usage, move options such as "plugins" into this file as standard Rspack configuration options.
                 // To enhance configurations after Nx plugins have applied, you can add a new plugin with the \`apply\` method.

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":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAepB,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

@@ -2,23 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
 exports.createCollectingLogger = createCollectingLogger;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 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 aggregate_log_util_1.AggregatedLog(),
+        logger: new internal_1.AggregatedLog(),
         projectGraph,
         workspaceRoot: tree.root,
     };
     const logger = createCollectingLogger();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/rspack/plugin', plugin_1.createNodesV2, {
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/rspack/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         previewTargetName: 'preview',
         serveStaticTargetName: 'serve-static',
@@ -47,13 +48,19 @@ async function convertToInferred(tree, options) {
         }
         else {
             logger.flushLogs();
-            throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+            throw new internal_1.NoTargetsToMigrateError();
         }
     }
     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-to-inferred/utils/build-post-target-transformer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostTargetTransformerFactory = buildPostTargetTransformerFactory;
 const tslib_1 = require("tslib");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const internal_1 = require("@nx/devkit/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 const ast_1 = require("./ast");
@@ -16,7 +16,7 @@ function buildPostTargetTransformerFactory(migrationContext) {
         const { pluginOptions, rspackConfigPath } = processOptions(target, context);
         updateRspackConfig(tree, rspackConfigPath, pluginOptions);
         if (target.outputs) {
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+            (0, internal_1.processTargetOutputs)(target, [], inferredTarget, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -50,29 +50,29 @@ function extractPluginOptions(options, context, configName) {
     const pluginOptions = {};
     for (const [key, value] of Object.entries(options)) {
         if (pathOptions.has(key)) {
-            pluginOptions[key] = (0, plugin_migration_utils_1.toProjectRelativePath)(value, context.projectRoot);
+            pluginOptions[key] = (0, internal_1.toProjectRelativePath)(value, context.projectRoot);
             delete options[key];
         }
         else if (assetsOptions.has(key)) {
             pluginOptions[key] = value.map((asset) => {
                 if (typeof asset === 'string') {
-                    return (0, plugin_migration_utils_1.toProjectRelativePath)(asset, context.projectRoot);
+                    return (0, internal_1.toProjectRelativePath)(asset, context.projectRoot);
                 }
-                asset.input = (0, plugin_migration_utils_1.toProjectRelativePath)(asset.input, context.projectRoot);
+                asset.input = (0, internal_1.toProjectRelativePath)(asset.input, context.projectRoot);
                 return asset;
             });
             delete options[key];
         }
         else if (key === 'fileReplacements') {
             pluginOptions.fileReplacements = value.map((replacement) => ({
-                replace: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.replace, context.projectRoot),
-                with: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.with, context.projectRoot),
+                replace: (0, internal_1.toProjectRelativePath)(replacement.replace, context.projectRoot),
+                with: (0, internal_1.toProjectRelativePath)(replacement.with, context.projectRoot),
             }));
             delete options.fileReplacements;
         }
         else if (key === 'additionalEntryPoints') {
             pluginOptions.additionalEntryPoints = value.map((entryPoint) => {
-                entryPoint.entryPath = (0, plugin_migration_utils_1.toProjectRelativePath)(entryPoint.entryPath, context.projectRoot);
+                entryPoint.entryPath = (0, internal_1.toProjectRelativePath)(entryPoint.entryPath, context.projectRoot);
                 return entryPoint;
             });
             delete options.additionalEntryPoints;

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAEpE,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,gBAAgB,IAGhC,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,gBAAgB,mBAAmB,KAClC,OAAO,CAAC,mBAAmB,CAAC,CAwBhC"}
+{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAEpE,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,gBAAgB,IAGhC,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,gBAAgB,mBAAmB,KAClC,OAAO,CAAC,mBAAmB,CAAC,CAwBhC"}