@nx/rspack 20.5.0-beta.1 → 20.5.0-beta.3

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.1",
+  "version": "20.5.0-beta.3",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.5.0-beta.1",
-    "@nx/devkit": "20.5.0-beta.1",
-    "@nx/web": "20.5.0-beta.1",
-    "@nx/module-federation": "20.5.0-beta.1",
+    "@nx/js": "20.5.0-beta.3",
+    "@nx/devkit": "20.5.0-beta.3",
+    "@nx/web": "20.5.0-beta.3",
+    "@nx/module-federation": "20.5.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.1.5",
     "@rspack/dev-server": "^1.0.9",

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 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");
@@ -48,10 +47,22 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         !siblingFiles.includes('project.json')) {
         return {};
     }
+    let packageJson = {};
+    if (siblingFiles.includes('package.json')) {
+        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 hash = (await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, normalizedOptions, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))])) + configFilePath;
+    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.hashObject)(packageJson),
+    ]);
+    const hash = `${nodeHash}_${configFilePath}`;
     targetsCache[hash] ??= await createRspackTargets(configFilePath, projectRoot, normalizedOptions, context, isTsSolutionSetup);
     const { targets, metadata } = targetsCache[hash];
     return {

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/generator-utils.js

@@ -15,6 +15,7 @@ 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 has_plugin_1 = require("./has-plugin");
 function findExistingTargetsInProject(targets, userProvidedTargets) {
     const output = {
@@ -129,11 +130,14 @@ 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 buildOptions = {
         target: options.target ?? 'web',
-        outputPath: (0, devkit_1.joinPathFragments)('dist', 
-        // If standalone project then use the project's name in dist.
-        project.root === '.' ? project.name : project.root),
+        outputPath: isTsSolutionSetup
+            ? (0, devkit_1.joinPathFragments)(project.root, 'dist')
+            : (0, devkit_1.joinPathFragments)('dist', 
+            // If standalone project then use the project's name in dist.
+            project.root === '.' ? project.name : project.root),
         index: (0, devkit_1.joinPathFragments)(project.root, 'src/index.html'),
         main: determineMain(tree, options),
         tsConfig: determineTsConfig(tree, options),