@nx/rspack 23.0.0-beta.4 → 23.0.0-beta.6

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.4",
+  "version": "23.0.0-beta.6",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.4",
-    "@nx/js": "23.0.0-beta.4",
-    "@nx/module-federation": "23.0.0-beta.4",
-    "@nx/web": "23.0.0-beta.4",
+    "@nx/devkit": "23.0.0-beta.6",
+    "@nx/js": "23.0.0-beta.6",
+    "@nx/module-federation": "23.0.0-beta.6",
+    "@nx/web": "23.0.0-beta.6",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@rspack/core": "1.6.8",
     "@rspack/dev-server": "^1.1.4",
@@ -57,8 +57,8 @@
     "webpack-node-externals": "^3.0.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.4",
-    "@nx/nest": "23.0.0-beta.4"
+    "nx": "23.0.0-beta.6",
+    "@nx/nest": "23.0.0-beta.6"
   },
   "peerDependencies": {
     "@module-federation/enhanced": "^2.3.3",

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;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"}

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

@@ -1,8 +1,8 @@
 "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 dev_server_1 = require("@rspack/dev-server");
 const create_compiler_1 = require("../../utils/create-compiler");
@@ -37,7 +37,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/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -3,7 +3,7 @@ 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 internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 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"));
@@ -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,7 +3,7 @@ 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 internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 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");
@@ -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,8 +3,8 @@ 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 utils_1 = require("@nx/module-federation/src/executors/utils");
 const utils_2 = require("@nx/module-federation/src/utils");
@@ -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/rspack.impl.js

@@ -2,7 +2,7 @@
 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 core_1 = require("@rspack/core");
@@ -23,7 +23,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/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/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;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,iBAwGhB;AAED,eAAe,oCAAoC,CAAC"}

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

@@ -1,8 +1,8 @@
 "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");
@@ -18,7 +18,7 @@ const preprocessText = (text) => {
 async function convertConfigToRspackPluginGenerator(tree, options) {
     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;
         }

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;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"}

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

@@ -2,9 +2,8 @@
 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");
@@ -13,12 +12,12 @@ const devkit_exports_1 = require("nx/src/devkit-exports");
 async function convertToInferred(tree, options) {
     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,7 +46,7 @@ async function convertToInferred(tree, options) {
         }
         else {
             logger.flushLogs();
-            throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+            throw new internal_1.NoTargetsToMigrateError();
         }
     }
     else {

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"}

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.servePostTargetTransformerFactory = servePostTargetTransformerFactory;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const path_1 = require("path");
 const ts = tslib_1.__importStar(require("typescript"));
@@ -19,7 +19,7 @@ function servePostTargetTransformerFactory(migrationContext) {
         const { devServerOptions, rspackConfigPath } = await processOptions(tree, target, context);
         updateRspackConfig(tree, rspackConfigPath, devServerOptions, context);
         if (target.outputs) {
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+            (0, internal_1.processTargetOutputs)(target, [], inferredTarget, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -64,8 +64,8 @@ function extractDevServerOptions(options, context) {
                     devServerOptions.server = { type: 'https' };
                     if (options.sslCert && options.sslKey) {
                         devServerOptions.server.options = {};
-                        devServerOptions.server.options.cert = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslCert, context.projectRoot);
-                        devServerOptions.server.options.key = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslKey, context.projectRoot);
+                        devServerOptions.server.options.cert = (0, internal_1.toProjectRelativePath)(options.sslCert, context.projectRoot);
+                        devServerOptions.server.options.key = (0, internal_1.toProjectRelativePath)(options.sslKey, context.projectRoot);
                     }
                     else if (options.sslCert) {
                         context.logger.addLog({

package/src/generators/convert-to-inferred/utils/types.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectGraph } from '@nx/devkit';
-import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import type { AggregatedLog } from '@nx/devkit/internal';
 export type MigrationContext = {
     logger: AggregatedLog;
     projectGraph: ProjectGraph;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-to-inferred/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAEpG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/rspack/src/generators/convert-to-inferred/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}

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":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAapB,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;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"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rspackInitSchematic = void 0;
 exports.rspackInitGenerator = rspackInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const js_1 = require("@nx/js");
 const plugin_1 = require("../../../plugin");
 const versions_1 = require("../../utils/versions");
@@ -14,7 +14,7 @@ async function rspackInitGenerator(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rspack/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rspack/plugin', plugin_1.createNodesV2, {
             buildTargetName: [
                 'build',
                 'rspack:build',

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AASpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}
+{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAQpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateWithMfImport;
+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 tsquery_1 = require("@phenomnomnominal/tsquery");
 const versions_1 = require("../../utils/versions");
 const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/rspack/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/rspack/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/rspack'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rspack:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAIpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}
+{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAGpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ensureMfPackage;
+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 versions_1 = require("../../utils/versions");
 async function ensureMfPackage(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rspack:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-22-0-0/remove-deprecated-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-deprecated-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAGpB,wBAA8B,uBAAuB,CAAC,IAAI,EAAE,IAAI,iBAwH/D"}
+{"version":3,"file":"remove-deprecated-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/migrations/update-22-0-0/remove-deprecated-options.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAEpB,wBAA8B,uBAAuB,CAAC,IAAI,EAAE,IAAI,iBAwH/D"}

package/src/migrations/update-22-0-0/remove-deprecated-options.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = removeDeprecatedOptions;
+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");
 async function removeDeprecatedOptions(tree) {
     const projects = new Set();
     // Find all projects using @nx/rspack:rspack or @nx/rspack:dev-server executors
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rspack:rspack', (options, project) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:rspack', (options, project) => {
         projects.add(project);
     });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rspack:dev-server', (options, project) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/rspack:dev-server', (options, project) => {
         projects.add(project);
     });
     // Update project configurations to remove deprecated options

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":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAMd,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;AAqBD,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAgC5D,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;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"}

package/src/plugins/plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs_1 = require("fs");
@@ -13,19 +13,6 @@ 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");
-function readTargetsCache(cachePath) {
-    try {
-        return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
-            ? (0, devkit_1.readJsonFile)(cachePath)
-            : {};
-    }
-    catch {
-        return {};
-    }
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 const createDependencies = () => {
     return [];
 };
@@ -36,18 +23,20 @@ exports.createNodesV2 = [
     async (configFilePaths, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rspack-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const pmc = (0, package_manager_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFilePaths, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -60,7 +49,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
     }
     const normalizedOptions = normalizeOptions(options);
-    const lockFileHash = (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)))) ?? '';
+    const lockFileHash = (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
     const nodeHash = (0, file_hasher_1.hashArray)([
         (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, configFilePath)),
         lockFileHash,
@@ -70,8 +59,10 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     // We do not want to alter how the hash is calculated, so appending the config file path to the hash
     // to prevent vite/vitest files overwriting the target cache created by the other
     const hash = `${nodeHash}_${configFilePath}`;
-    targetsCache[hash] ??= await createRspackTargets(configFilePath, projectRoot, normalizedOptions, context, isTsSolutionSetup, pmc);
-    const { targets, metadata } = targetsCache[hash];
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await createRspackTargets(configFilePath, projectRoot, normalizedOptions, context, isTsSolutionSetup, pmc));
+    }
+    const { targets, metadata } = targetsCache.get(hash);
     return {
         projects: {
             [projectRoot]: {
@@ -83,7 +74,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     };
 }
 async function createRspackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const rspackConfig = await (0, resolve_user_defined_rspack_config_1.resolveUserDefinedRspackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
     const rspackOptions = await (0, read_rspack_options_1.readRspackOptions)(rspackConfig);
     const outputs = [];

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/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,8FA8BzB"}
+{"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"}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRspackE2EWebServerInfo = getRspackE2EWebServerInfo;
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
@@ -10,7 +10,7 @@ async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPl
         nxJson.targetDefaults?.['serve'].options?.port) {
         e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/rspack/plugin',
         serveTargetName: 'serveTargetName',
         serveStaticTargetName: 'previewTargetName',

package/src/utils/resolve-user-defined-rspack-config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedRspackConfig = resolveUserDefinedRspackConfig;
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function resolveUserDefinedRspackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {
-    return await (0, config_utils_1.loadConfigFile)(path);
+    return await (0, internal_1.loadConfigFile)(path);
 }