@nx/next 17.2.5 → 17.2.7

package/README.md

@@ -1,9 +1,4 @@
-<p style="text-align: center;">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
-  </picture>
-</p>
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <div style="text-align: center;">
 
@@ -20,9 +15,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart, Fast and Extensible Build System
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a next generation build system with first class monorepo support and powerful integrations.
 
 This package is a [Next.js plugin for Nx](https://nx.dev/next/overview).
 
@@ -64,5 +59,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
 

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.2.7",
   "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.2.7",
     "@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.2.7",
+    "@nx/eslint": "17.2.7",
+    "@nx/react": "17.2.7",
+    "@nx/web": "17.2.7",
+    "@nx/workspace": "17.2.7",
+    "@nrwl/next": "17.2.7"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/export/export.impl.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const export_1 = require("next/dist/export");
+const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const nextTrace = require("next/dist/trace");
 const os_1 = require("os");
 const child_process_1 = require("child_process");
 const chalk = require("chalk");
-const semver_1 = require("semver");
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 /**
@@ -22,9 +22,11 @@ const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
  * Read https://nextjs.org/docs/pages/building-your-application/deploying/static-exports
  **/
 async function exportExecutor(options, context) {
-    const nextJsVersion = require('next/package.json').version;
-    if ((0, semver_1.satisfies)(nextJsVersion, '>=14.0.0')) {
-        throw new Error('The export command has been removed in Next.js 14. Please update your Next config to use the output property. Read more: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports');
+    let dependencies = [];
+    if (!options.buildLibsFromSource) {
+        const result = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // this should be generalized
+        context.configurationName);
+        dependencies = result.dependencies;
     }
     // Returns { project: ProjectGraphNode; target: string; configuration?: string;}
     const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context);

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/plugins/plugin.js

@@ -107,7 +107,12 @@ async function getOutputs(projectRoot, nextConfig) {
         // If nextConfig is an object, directly use its 'distDir' property.
         dir = nextConfig.distDir;
     }
-    return `{workspaceRoot}/${projectRoot}/${dir}`;
+    if (projectRoot === '.') {
+        return `{projectRoot}/${dir}`;
+    }
+    else {
+        return `{workspaceRoot}/${projectRoot}/${dir}`;
+    }
 }
 function getNextConfig(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
-export declare const nextVersion = "14.0.4";
-export declare const eslintConfigNextVersion = "14.0.4";
+export declare const nextVersion = "13.4.4";
+export declare const eslintConfigNextVersion = "13.4.4";
 export declare const sassVersion = "1.62.1";
 export declare const lessLoader = "11.1.0";
 export declare const emotionServerVersion = "11.11.0";

package/src/utils/versions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.nextVersion = '14.0.4';
-exports.eslintConfigNextVersion = '14.0.4';
+exports.nextVersion = '13.4.4';
+exports.eslintConfigNextVersion = '13.4.4';
 exports.sassVersion = '1.62.1';
 exports.lessLoader = '11.1.0';
 exports.emotionServerVersion = '11.11.0';