@nx/next 17.2.5 → 17.3.0-beta.1

package/migrations.json

@@ -23,6 +23,12 @@
       "version": "16.4.0-beta.3",
       "description": "Update package.json moving @nx/next from dependency to devDependency",
       "implementation": "./src/migrations/update-16-4-0/update-nx-next-dependency"
+    },
+    "update-17-2-7": {
+      "cli": "nx",
+      "version": "17.2.7",
+      "description": "Remove patched eslint rule for @next/next/no-html-link-for-pages",
+      "implementation": "./src/migrations/update-17-2-7/remove-eslint-rules-patch"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "v17.2.5",
+  "version": "17.3.0-beta.1",
   "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, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -34,7 +34,7 @@
     "next": ">=13.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "v17.2.5",
+    "@nx/devkit": "17.3.0-beta.1",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,12 +45,12 @@
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "v17.2.5",
-    "@nx/eslint": "v17.2.5",
-    "@nx/react": "v17.2.5",
-    "@nx/web": "v17.2.5",
-    "@nx/workspace": "v17.2.5",
-    "@nrwl/next": "v17.2.5"
+    "@nx/js": "17.3.0-beta.1",
+    "@nx/eslint": "17.3.0-beta.1",
+    "@nx/react": "17.3.0-beta.1",
+    "@nx/web": "17.3.0-beta.1",
+    "@nx/workspace": "17.3.0-beta.1",
+    "@nrwl/next": "17.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/server/schema.json

@@ -52,6 +52,10 @@
     "turbo": {
       "type": "boolean",
       "description": "Activate the incremental bundler for Next.js, which is implemented in Rust. Please note, this feature is exclusively available in development mode."
+    },
+    "experimentalHttps": {
+      "type": "boolean",
+      "description": "Enable HTTPS support for the Next.js development server."
     }
   },
   "required": ["buildTarget"],

package/src/executors/server/server.impl.js

@@ -32,9 +32,10 @@ async function* serveExecutor(options, context) {
     const nextDir = (0, path_1.resolve)(context.root, buildOptions.outputPath);
     const mode = options.dev ? 'dev' : 'start';
     const turbo = options.turbo && options.dev ? '--turbo' : '';
+    const experimentalHttps = options.experimentalHttps && options.dev ? '--experimental-https' : '';
     const nextBin = require.resolve('next/dist/bin/next');
     yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error }) => {
-        const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
+        const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo, experimentalHttps], {
             cwd: options.dev ? projectRoot : nextDir,
             stdio: 'inherit',
         });

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

@@ -23,14 +23,6 @@ async function addLinting(host, options) {
             'next',
             'next/core-web-vitals',
         ]);
-        // Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
-        // TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
-        (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
-            files: ['*.*'],
-            rules: {
-                '@next/next/no-html-link-for-pages': 'off',
-            },
-        }, { insertAtTheEnd: false });
         (0, eslint_file_1.updateOverrideInLintConfig)(host, options.appProjectRoot, (o) => Array.isArray(o.files) &&
             o.files.some((f) => f.match(/\*\.ts$/)) &&
             o.files.some((f) => f.match(/\*\.tsx$/)) &&

package/src/generators/page/page.js

@@ -43,18 +43,34 @@ exports.pageGeneratorInternal = pageGeneratorInternal;
 async function normalizeOptions(host, options) {
     let isAppRouter;
     let derivedDirectory;
+    let routerDirectory;
     if (options.project) {
         // Legacy behavior, detect app vs page router from specified project.
         // TODO(v18): remove this logic
         const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
         // app/ is a reserved folder in nextjs so it is safe to check it's existence
-        isAppRouter = host.exists(`${project.root}/app`);
-        const routerDirectory = isAppRouter ? 'app' : 'pages';
+        isAppRouter =
+            host.exists(`${project.root}/app`) ||
+                host.exists(`${project.root}/src/app`);
+        routerDirectory = isAppRouter ? 'app' : 'pages';
         derivedDirectory = options.directory
             ? `${routerDirectory}/${options.directory}`
             : `${routerDirectory}`;
     }
     else {
+        // Get the project name first so we can determine the router directory
+        const { project: determinedProjectName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+            artifactType: 'page',
+            callingGenerator: '@nx/next:page',
+            name: options.name,
+            directory: options.directory,
+        });
+        const project = (0, devkit_1.readProjectConfiguration)(host, determinedProjectName);
+        // app/ is a reserved folder in nextjs so it is safe to check it's existence
+        isAppRouter =
+            host.exists(`${project.root}/app`) ||
+                host.exists(`${project.root}/src/app`);
+        routerDirectory = isAppRouter ? 'app' : 'pages';
         // New behavior, use directory as is without detecting whether we're using app or pages router.
         derivedDirectory = options.directory;
     }

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

@@ -5,7 +5,7 @@ export interface Schema {
   /**
    * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18.
    */
-  project: string;
+  project?: string;
   style: SupportedStyles;
   directory?: string;
   fileName?: string;

package/src/migrations/update-17-2-7/remove-eslint-rules-patch.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-2-7/remove-eslint-rules-patch.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((project) => {
+        (0, eslint_file_1.updateOverrideInLintConfig)(tree, project.root, (o) => o.rules?.['@next/next/no-html-link-for-pages'] &&
+            o.files?.includes('**/*.*'), (o) => undefined);
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = update;

package/src/utils/types.d.ts

@@ -44,6 +44,7 @@ export interface NextServeBuilderOptions {
     buildLibsFromSource?: boolean;
     keepAliveTimeout?: number;
     turbo?: boolean;
+    experimentalHttps?: boolean;
 }
 export interface NextExportBuilderOptions {
     buildTarget: string;