@nx/next 0.0.0-pr-29047-57d3073 → 0.0.0-pr-28808-eac89e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "0.0.0-pr-29047-57d3073",
+  "version": "0.0.0-pr-28808-eac89e6",
   "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": "0.0.0-pr-29047-57d3073",
+    "@nx/devkit": "0.0.0-pr-28808-eac89e6",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "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": "0.0.0-pr-29047-57d3073",
-    "@nx/eslint": "0.0.0-pr-29047-57d3073",
-    "@nx/react": "0.0.0-pr-29047-57d3073",
-    "@nx/web": "0.0.0-pr-29047-57d3073",
-    "@nx/webpack": "0.0.0-pr-29047-57d3073",
+    "@nx/js": "0.0.0-pr-28808-eac89e6",
+    "@nx/eslint": "0.0.0-pr-28808-eac89e6",
+    "@nx/react": "0.0.0-pr-28808-eac89e6",
+    "@nx/web": "0.0.0-pr-28808-eac89e6",
+    "@nx/webpack": "0.0.0-pr-28808-eac89e6",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -4,7 +4,6 @@ exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const react_1 = require("@nx/react");
 const versions_1 = require("@nx/react/src/utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -22,6 +21,7 @@ const update_cypress_tsconfig_1 = require("./lib/update-cypress-tsconfig");
 const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 const versions_2 = require("../../utils/versions");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
@@ -29,7 +29,6 @@ async function applicationGenerator(host, schema) {
     });
 }
 async function applicationGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'application');
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
@@ -37,6 +36,8 @@ async function applicationGeneratorInternal(host, schema) {
         js: options.js,
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
     });
     tasks.push(jsInitTask);
     const nextTask = await (0, init_1.nextInitGenerator)(host, {
@@ -82,6 +83,13 @@ async function applicationGeneratorInternal(host, schema) {
         }
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.json', {
+        jsx: 'preserve',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : ['.next'], options.src ? 'src' : '.');
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/files/common/tsconfig.json__tmpl__

@@ -3,16 +3,22 @@
   "compilerOptions": {
     "jsx": "preserve",
     <% if (style === '@emotion/styled') { %>"jsxImportSource": "@emotion/react",<% } %>
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
     "incremental": true,
-    "plugins": [{ "name": "next" }]
+    "plugins": [{ "name": "next" }]<% if (isUsingTsSolutionSetup) { %>,
+    "paths": {
+      "@/*": [<% if (src) { %>"./src/*"<% } else { %>"./*"<% } %>]
+    }<% } %>
   },
   "include": [
     "<%= rootPath %>**/*.ts",

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

@@ -8,6 +8,7 @@ const web_1 = require("@nx/web");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -24,13 +25,28 @@ async function addE2e(host, options) {
                 spa: true,
             });
         }
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                projectType: 'application',
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             linter: eslint_1.Linter.EsLint,
@@ -65,13 +81,28 @@ async function addE2e(host, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                projectType: 'application',
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(host, {
             rootProject: options.rootProject,
             project: options.e2eProjectName,

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

@@ -8,6 +8,8 @@ const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const versions_1 = require("../../../utils/versions");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinting(host, options) {
+    if (options.linter !== 'eslint')
+        return () => { };
     const tasks = [];
     tasks.push(await (0, eslint_1.lintProjectGenerator)(host, {
         linter: options.linter,

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

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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) {
     const targets = {};
     // Check if plugin exists in nx.json and if it doesn't then we can continue
@@ -53,7 +57,27 @@ function addProject(host, options) {
         targets,
         tags: options.parsedTags,
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
-        ...project,
-    });
+    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),
+            version: '0.0.1',
+            private: true,
+            dependencies: {
+                next: versions_1.nextVersion,
+                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,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+            ...project,
+        });
+    }
 }

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

@@ -5,12 +5,12 @@ const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const create_application_files_helpers_1 = require("./create-application-files.helpers");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createApplicationFiles(host, options) {
     const offsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     const layoutTypeSrcPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.appProjectRoot, '.next/types/**/*.ts');
     const layoutTypeDistPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.outputPath, '.next/types/**/*.ts');
-    // scope tsconfig to the project directory so that it doesn't include other projects/libs
-    const rootPath = options.rootProject
+    const rootPath = options.rootProject || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)
         ? options.src
             ? 'src/'
             : options.appDir
@@ -32,6 +32,7 @@ function createApplicationFiles(host, options) {
         styleContent: (0, create_application_files_helpers_1.createStyleRules)(),
         pageStyleContent: `.page {}`,
         stylesExt: options.style === 'less' ? options.style : 'css',
+        isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     const generatedAppFilePath = options.src
         ? (0, path_1.join)(options.appProjectRoot, 'src')

package/src/generators/application/schema.d.ts

@@ -17,6 +17,9 @@ export interface Schema {
   skipPackageJson?: boolean;
   appDir?: boolean;
   src?: boolean;
+  // Internal options
   rootProject?: boolean;
   addPlugin?: boolean;
+  useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
 }

package/src/generators/application/schema.json

@@ -69,8 +69,10 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "none"],
+      "default": "eslint",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -82,7 +84,9 @@
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "jest",
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "e2eTestRunner": {
       "type": "string",

package/src/generators/custom-server/custom-server.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { CustomServerSchema } from './schema';
 export declare function customServerGenerator(host: Tree, options: CustomServerSchema): Promise<() => void>;

package/src/generators/custom-server/custom-server.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customServerGenerator = customServerGenerator;
 const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
 const path_1 = require("path");
 const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function customServerGenerator(host, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const nxJson = (0, devkit_1.readNxJson)(host);
+    const project = (0, devkit_2.readProjectConfiguration)(host, options.project);
+    const nxJson = (0, devkit_2.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
     if (project.targets?.build?.executor !== '@nx/next:build' &&
         project.targets?.build?.executor !== '@nrwl/next:build' &&
         !hasPlugin) {
-        devkit_1.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`);
+        devkit_2.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`);
         return;
     }
     // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
@@ -26,23 +28,28 @@ async function customServerGenerator(host, options) {
         !project.targets?.build?.configurations?.development ||
         !project.targets?.build?.configurations?.production) &&
         !hasPlugin) {
-        devkit_1.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @nx/next:app"?`);
+        devkit_2.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @nx/next:app"?`);
         return;
     }
     if (project.targets?.['build-custom-server'] ||
         project.targets?.['serve-custom-server']) {
-        devkit_1.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
+        devkit_2.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
         return;
     }
     // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
     // So we need ensure the mapping is correct from dist to the project root
-    const projectPathFromDist = `../../${(0, devkit_1.offsetFromRoot)(project.root)}${project.root}`;
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, {
+    const projectPathFromDist = `../../${(0, devkit_2.offsetFromRoot)(project.root)}${project.root}`;
+    const offset = (0, devkit_2.offsetFromRoot)(project.root);
+    const isTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    (0, devkit_2.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, {
         ...options,
         hasPlugin,
         projectPathFromDist,
-        offsetFromRoot: (0, devkit_1.offsetFromRoot)(project.root),
+        offsetFromRoot: offset,
         projectRoot: project.root,
+        baseTsConfigPath: isTsSolution
+            ? (0, devkit_1.joinPathFragments)(offset, 'tsconfig.base.json')
+            : './tsconfig.json',
         tmpl: '',
     });
     if (!hasPlugin) {
@@ -86,8 +93,8 @@ async function customServerGenerator(host, options) {
             },
         },
     };
-    (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
-    (0, devkit_1.updateJson)(host, 'nx.json', (json) => {
+    (0, devkit_2.updateProjectConfiguration)(host, options.project, project);
+    (0, devkit_2.updateJson)(host, 'nx.json', (json) => {
         if (!json.tasksRunnerOptions?.default?.options?.cacheableOperations?.includes('build-custom-server') &&
             json.tasksRunnerOptions?.default?.options?.cacheableOperations) {
             json.tasksRunnerOptions.default.options.cacheableOperations.push('build-custom-server');

package/src/generators/custom-server/files/tsconfig.server.json__tmpl__

@@ -1,7 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "<%= baseTsConfigPath %>",
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "noEmit": false,
     "incremental": true,
     <% if(hasPlugin && compiler === 'tsc') { %>

package/src/generators/init/init.js

@@ -4,7 +4,6 @@ exports.nextInitGenerator = nextInitGenerator;
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/react/src/utils/versions");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 const versions_2 = require("../../utils/versions");
@@ -24,7 +23,6 @@ function nextInitGenerator(tree, schema) {
     return nextInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function nextInitGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'init');
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/src/generators/library/library.js

@@ -5,11 +5,11 @@ exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const library_1 = require("@nx/react/src/generators/library/library");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/react/src/utils/versions");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const versions_2 = require("../../utils/versions");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -17,7 +17,6 @@ async function libraryGenerator(host, rawOptions) {
     });
 }
 async function libraryGeneratorInternal(host, rawOptions) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'library');
     const options = await (0, normalize_options_1.normalizeOptions)(host, rawOptions);
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -84,6 +83,13 @@ async function libraryGeneratorInternal(host, rawOptions) {
         ];
         return json;
     });
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/library/schema.json

@@ -65,14 +65,18 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "none"],
+      "default": "eslint",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "vitest"
+      "default": "vitest",
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",