@nx/next 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.5.0-rc.3",
+    "@nx/devkit": "20.5.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "20.5.0-rc.3",
-    "@nx/eslint": "20.5.0-rc.3",
-    "@nx/react": "20.5.0-rc.3",
-    "@nx/web": "20.5.0-rc.3",
-    "@nx/webpack": "20.5.0-rc.3",
+    "@nx/js": "20.5.0",
+    "@nx/eslint": "20.5.0",
+    "@nx/react": "20.5.0",
+    "@nx/web": "20.5.0",
+    "@nx/webpack": "20.5.0",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -39,8 +39,8 @@ async function applicationGeneratorInternal(host, schema) {
         js: options.js,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
-        addTsPlugin: schema.useTsSolution,
-        formatter: schema.formatter,
+        addTsPlugin: options.isTsSolutionSetup,
+        formatter: options.formatter,
         platform: 'web',
     });
     tasks.push(jsInitTask);
@@ -51,6 +51,11 @@ async function applicationGeneratorInternal(host, schema) {
     tasks.push(nextTask);
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isTsSolutionSetup) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
     tasks.push(e2eTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options);
@@ -100,11 +105,6 @@ async function applicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : ['.next'], options.src ? 'src' : '.');
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.useTsSolution) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/src/generators/application/lib/add-e2e.js

@@ -31,8 +31,6 @@ async function addE2e(host, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });
@@ -87,8 +85,6 @@ async function addE2e(host, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });

package/src/generators/application/lib/add-project.js

@@ -4,7 +4,6 @@ exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const versions_1 = require("../../../utils/versions");
 const react_1 = require("@nx/react");
 function addProject(host, options) {
@@ -58,8 +57,8 @@ function addProject(host, options) {
         tags: options.parsedTags,
     };
     if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: (0, get_import_path_1.getImportPath)(host, options.name),
+        const packageJson = {
+            name: options.importPath,
             version: '0.0.1',
             private: true,
             dependencies: {
@@ -67,13 +66,15 @@ function addProject(host, options) {
                 react: react_1.reactVersion,
                 'react-dom': react_1.reactDomVersion,
             },
-            nx: {
-                name: options.name,
-                projectType: 'application',
-                sourceRoot: options.appProjectRoot,
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
-        });
+        };
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {

package/src/generators/application/lib/create-application-files.js

@@ -18,7 +18,7 @@ function createApplicationFiles(host, options) {
                 : 'pages/'
         : '';
     const templateVariables = {
-        ...(0, devkit_1.names)(options.name),
+        ...(0, devkit_1.names)(options.projectSimpleName),
         ...options,
         dot: '.',
         tmpl: '',

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,14 +1,17 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'name' | 'useTsSolution'> {
     projectName: string;
+    projectSimpleName: string;
     appProjectRoot: string;
+    importPath: string;
     outputPath: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];
     fileName: string;
     styledModule: null | string;
+    isTsSolutionSetup: boolean;
     js?: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -5,9 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 const assertion_1 = require("@nx/react/src/utils/assertion");
+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, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -18,10 +19,11 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
+    const isTsSolutionSetup = options.useTsSolution || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
+    const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [projectNames.projectFileName] : []));
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -42,12 +44,14 @@ async function normalizeOptions(host, options) {
         e2eTestRunner: options.e2eTestRunner || 'playwright',
         fileName,
         linter: options.linter || eslint_1.Linter.EsLint,
-        name,
         outputPath,
         parsedTags,
         projectName: appProjectName,
+        projectSimpleName: projectNames.projectSimpleName,
         style: options.style || 'css',
         styledModule,
         unitTestRunner: options.unitTestRunner || 'jest',
+        importPath,
+        isTsSolutionSetup,
     };
 }

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

@@ -5,7 +5,7 @@ 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, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',