@nx/rspack 20.5.0-beta.2 → 20.5.0-beta.4

package/migrations.json

@@ -94,6 +94,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.5.0": {
+      "version": "20.5.0-beta.3",
+      "packages": {
+        "@rspack/core": {
+          "version": "^1.2.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   },
   "version": "0.1"

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": "20.5.0-beta.2",
+  "version": "20.5.0-beta.4",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.5.0-beta.2",
-    "@nx/devkit": "20.5.0-beta.2",
-    "@nx/web": "20.5.0-beta.2",
-    "@nx/module-federation": "20.5.0-beta.2",
+    "@nx/js": "20.5.0-beta.4",
+    "@nx/devkit": "20.5.0-beta.4",
+    "@nx/web": "20.5.0-beta.4",
+    "@nx/module-federation": "20.5.0-beta.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.1.5",
     "@rspack/dev-server": "^1.0.9",
@@ -37,7 +37,7 @@
     "css-loader": "^6.4.0",
     "enquirer": "~2.3.6",
     "express": "^4.21.2",
-    "fork-ts-checker-webpack-plugin": "7.2.13",
+    "ts-checker-rspack-plugin": "^1.1.1",
     "http-proxy-middleware": "^3.0.3",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",

package/src/generators/application/application.js

@@ -11,9 +11,6 @@ async function default_1(tree, _options) {
     const tasks = [];
     const initTask = await (0, init_1.default)(tree, {
         ..._options,
-        // TODO: Crystalize the default rspack.config.js file.
-        // The default setup isn't crystalized so don't add plugin.
-        addPlugin: false,
     });
     tasks.push(initTask);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);

package/src/generators/configuration/configuration.js

@@ -10,9 +10,6 @@ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-set
 async function configurationGenerator(tree, options) {
     const task = await (0, init_1.default)(tree, {
         ...options,
-        // TODO: Crystalize the default rspack.config.js file.
-        // The default setup isn't crystalized so don't add plugin.
-        addPlugin: false,
     });
     const { targets, root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { target, framework } = (0, generator_utils_1.determineFrameworkAndTarget)(tree, options, root, targets);

package/src/plugins/plugin.js

@@ -52,16 +52,15 @@ 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);
-    // 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 lockFileHash = (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)))) ?? '';
     const nodeHash = (0, file_hasher_1.hashArray)([
-        ...[
-            (0, path_1.join)(context.workspaceRoot, configFilePath),
-            (0, path_1.join)(context.workspaceRoot, (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))),
-        ].map(file_hasher_1.hashFile),
-        (0, file_hasher_1.hashObject)(options),
+        (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, configFilePath)),
+        lockFileHash,
+        (0, file_hasher_1.hashObject)({ ...options, isTsSolutionSetup }),
         (0, file_hasher_1.hashObject)(packageJson),
     ]);
+    // 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);
     const { targets, metadata } = targetsCache[hash];

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

@@ -179,13 +179,13 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     }
     // New TS Solution already has a typecheck target
     if (!options?.skipTypeChecking && !isUsingTsSolution) {
-        const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-        plugins.push(new ForkTsCheckerWebpackPlugin({
+        const { TsCheckerRspackPlugin } = require('ts-checker-rspack-plugin');
+        plugins.push(new TsCheckerRspackPlugin({
             typescript: {
                 configFile: path.isAbsolute(tsConfig)
                     ? tsConfig
                     : path.join(options.root, tsConfig),
-                memoryLimit: options.memoryLimit || 2018,
+                memoryLimit: options.memoryLimit || 8192, // default memory limit is 8192
             },
         }));
     }

package/src/plugins/utils/plugins/rspack-nx-build-coordination-plugin.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RspackNxBuildCoordinationPlugin = void 0;
 const child_process_1 = require("child_process");
 const client_1 = require("nx/src/daemon/client/client");
+const enabled_1 = require("nx/src/daemon/client/enabled");
 const watch_1 = require("nx/src/command-line/watch/watch");
 const output_1 = require("nx/src/utils/output");
 class RspackNxBuildCoordinationPlugin {
@@ -13,7 +14,7 @@ class RspackNxBuildCoordinationPlugin {
         if (!skipInitialBuild) {
             this.buildChangedProjects();
         }
-        if ((0, client_1.isDaemonEnabled)()) {
+        if ((0, enabled_1.isDaemonEnabled)()) {
             this.startWatchingBuildableLibs();
         }
         else {

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
 export declare const nxVersion: any;
-export declare const rspackCoreVersion = "^1.1.5";
+export declare const rspackCoreVersion = "1.2.2";
 export declare const rspackDevServerVersion = "1.0.9";
 export declare const rspackPluginMinifyVersion = "^0.7.5";
 export declare const rspackPluginReactRefreshVersion = "^1.0.0";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.stylusVersion = exports.sassVersion = exports.lessVersion = exports.nestjsMicroservicesVersion = exports.nestjsPlatformExpressVersion = exports.nestjsCoreVersion = exports.nestjsCommonVersion = exports.reactRefreshVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackPluginMinifyVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.rspackCoreVersion = '^1.1.5';
+exports.rspackCoreVersion = '1.2.2';
 exports.rspackDevServerVersion = '1.0.9';
 exports.rspackPluginMinifyVersion = '^0.7.5';
 exports.rspackPluginReactRefreshVersion = '^1.0.0';