@nx/next 0.0.0-pr-28808-ca32248 → 0.0.0-pr-28808-bceb02f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "0.0.0-pr-28808-ca32248",
+  "version": "0.0.0-pr-28808-bceb02f",
   "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-28808-ca32248",
+    "@nx/devkit": "0.0.0-pr-28808-bceb02f",
     "@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-28808-ca32248",
-    "@nx/eslint": "0.0.0-pr-28808-ca32248",
-    "@nx/react": "0.0.0-pr-28808-ca32248",
-    "@nx/web": "0.0.0-pr-28808-ca32248",
-    "@nx/webpack": "0.0.0-pr-28808-ca32248",
+    "@nx/js": "0.0.0-pr-28808-bceb02f",
+    "@nx/eslint": "0.0.0-pr-28808-bceb02f",
+    "@nx/react": "0.0.0-pr-28808-bceb02f",
+    "@nx/web": "0.0.0-pr-28808-bceb02f",
+    "@nx/webpack": "0.0.0-pr-28808-bceb02f",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -37,6 +37,7 @@ async function applicationGeneratorInternal(host, schema) {
         skipPackageJson: options.skipPackageJson,
         skipFormat: true,
         addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
     });
     tasks.push(jsInitTask);
     const nextTask = await (0, init_1.nextInitGenerator)(host, {

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/schema.d.ts

@@ -21,4 +21,5 @@ export interface Schema {
   rootProject?: boolean;
   addPlugin?: boolean;
   useTsSolution?: boolean;
+  formatter?: 'prettier' | 'none';
 }

package/src/generators/application/schema.json

@@ -69,8 +69,8 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "none",
+      "enum": ["eslint", "none"],
+      "default": "eslint",
       "x-prompt": "Which linter would you like to use?",
       "x-priority": "important"
     },
@@ -84,7 +84,7 @@
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "none",
+      "default": "jest",
       "x-priority": "important"
     },
     "e2eTestRunner": {
@@ -92,7 +92,7 @@
       "enum": ["playwright", "cypress", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
       "x-prompt": "Which E2E test runner would you like to use?",
-      "default": "none"
+      "default": "playwright"
     },
     "tags": {
       "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/library/schema.json

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