@nx/rspack 20.5.0-rc.3 → 20.5.0

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

package/src/generators/application/lib/normalize-options.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         ...options,
         projectType: 'application',
     });
     // --monorepo takes precedence over --rootProject
     // This won't be needed once we add --bundler=rspack to the @nx/react:app preset
     const rootProject = !options.monorepo && options.rootProject;
-    const e2eProjectName = options.rootProject
-        ? 'e2e'
-        : `${(0, devkit_1.names)(appProjectName).fileName}-e2e`;
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
+    const e2eProjectName = options.rootProject ? 'e2e' : `${projectName}-e2e`;
     const normalized = {
         ...options,
         rootProject,
-        name: (0, devkit_1.names)(options.name).fileName,
+        name: appProjectName,
         projectName: appProjectName,
         appProjectRoot,
         e2eProjectName,