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

package/src/executors/rspack/lib/config.js

@@ -6,7 +6,12 @@ const resolve_user_defined_rspack_config_1 = require("../../../utils/resolve-use
 const with_nx_1 = require("../../../utils/with-nx");
 const with_web_1 = require("../../../utils/with-web");
 async function getRspackConfigs(options, context) {
-    let userDefinedConfig = (0, resolve_user_defined_rspack_config_1.resolveUserDefinedRspackConfig)(options.rspackConfig, options.tsConfig);
+    let maybeUserDefinedConfig = await (0, resolve_user_defined_rspack_config_1.resolveUserDefinedRspackConfig)(options.rspackConfig, options.tsConfig);
+    let userDefinedConfig = 'default' in maybeUserDefinedConfig
+        ? 'default' in maybeUserDefinedConfig.default
+            ? maybeUserDefinedConfig.default.default
+            : maybeUserDefinedConfig.default
+        : maybeUserDefinedConfig;
     if (typeof userDefinedConfig.then === 'function') {
         userDefinedConfig = await userDefinedConfig;
     }

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 {
@@ -66,7 +77,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
 }
 async function createRspackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const rspackConfig = (0, resolve_user_defined_rspack_config_1.resolveUserDefinedRspackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
+    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 = [];
     for (const config of rspackOptions) {

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),

package/src/utils/resolve-user-defined-rspack-config.d.ts

@@ -1,3 +1,3 @@
 export declare function resolveUserDefinedRspackConfig(path: string, tsConfig: string, 
 /** Skip require cache and return latest content */
-reload?: boolean): any;
+reload?: boolean): Promise<any>;

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

@@ -2,37 +2,8 @@
 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/js/src/internal");
-function resolveUserDefinedRspackConfig(path, tsConfig, 
+async function resolveUserDefinedRspackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {
-    if (reload) {
-        // Clear cache if the path is in the cache
-        if (require.cache[path]) {
-            // Clear all entries because config may import other modules
-            (0, config_utils_1.clearRequireCache)();
-        }
-    }
-    // Don't transpile non-TS files. This prevents workspaces libs from being registered via tsconfig-paths.
-    // There's an issue here with Nx workspace where loading plugins from source (via tsconfig-paths) can lead to errors.
-    if (!/\.(ts|mts|cts)$/.test(path)) {
-        return require(path);
-    }
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const maybeCustomRspackConfig = require(path);
-    cleanupTranspiler();
-    // If the user provides a configuration in TS file
-    // then there are 3 cases for exploring an object. The first one is:
-    // `module.exports = { ... }`. And the second one is:
-    // `export default { ... }`. The ESM format is compiled into:
-    // `{ default: { ... } }`
-    // There is also a case of
-    // `{ default: { default: { ... } }`
-    const customRspackConfig = 'default' in maybeCustomRspackConfig
-        ? 'default' in maybeCustomRspackConfig.default
-            ? maybeCustomRspackConfig.default.default
-            : maybeCustomRspackConfig.default
-        : maybeCustomRspackConfig;
-    return customRspackConfig;
+    return await (0, config_utils_1.loadConfigFile)(path);
 }