@nx/next 22.0.1 → 22.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "22.0.1",
+  "version": "22.0.3",
   "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,26 +35,26 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "22.0.1",
+    "@nx/devkit": "22.0.3",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
     "file-loader": "^6.2.0",
     "ignore": "^5.0.4",
-    "semver": "^7.5.3",
+    "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "22.0.1",
-    "@nx/eslint": "22.0.1",
-    "@nx/react": "22.0.1",
-    "@nx/web": "22.0.1",
-    "@nx/webpack": "22.0.1",
+    "@nx/js": "22.0.3",
+    "@nx/eslint": "22.0.3",
+    "@nx/react": "22.0.3",
+    "@nx/web": "22.0.3",
+    "@nx/webpack": "22.0.3",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "devDependencies": {
-    "@nx/cypress": "22.0.1",
-    "@nx/playwright": "22.0.1",
-    "nx": "22.0.1"
+    "@nx/cypress": "22.0.3",
+    "@nx/playwright": "22.0.3",
+    "nx": "22.0.3"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/build/build.impl.js

@@ -13,7 +13,7 @@ const create_next_config_file_1 = require("./lib/create-next-config-file");
 const check_project_1 = require("./lib/check-project");
 const child_process_1 = require("child_process");
 const create_cli_options_1 = require("../../utils/create-cli-options");
-const exit_codes_1 = require("nx/src/utils/exit-codes");
+const internal_1 = require("@nx/devkit/internal");
 let childProcess;
 async function buildExecutor(options, context) {
     // Cast to any to overwrite NODE_ENV
@@ -108,15 +108,17 @@ function runCliBuild(workspaceRoot, projectRoot, options) {
         // Ensure the child process is killed when the parent exits
         process.on('exit', () => childProcess.kill());
         process.on('SIGTERM', (signal) => {
-            reject({ code: (0, exit_codes_1.signalToCode)(signal), signal });
+            reject({ code: (0, internal_1.signalToCode)(signal), signal });
         });
         process.on('SIGINT', (signal) => {
-            reject({ code: (0, exit_codes_1.signalToCode)(signal), signal });
+            reject({ code: (0, internal_1.signalToCode)(signal), signal });
         });
         childProcess.on('error', (err) => {
             reject({ error: err });
         });
         childProcess.on('exit', (code, signal) => {
+            if (code === null)
+                code = (0, internal_1.signalToCode)(signal);
             if (code === 0) {
                 resolve({ code, signal });
             }

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

@@ -32,5 +32,5 @@
     <% } %>
     "next-env.d.ts"
   ],
-  "exclude": ["node_modules", "jest.config.ts", "<%= rootPath %>**/*.spec.ts", "<%= rootPath %>**/*.test.ts"]
+  "exclude": ["node_modules", "jest.config.ts", "jest.config.cts", "<%= rootPath %>**/*.spec.ts", "<%= rootPath %>**/*.test.ts"]
 }

package/src/generators/application/lib/add-jest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEJ,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAyD5B"}
+{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEJ,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA2D5B"}

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

@@ -27,10 +27,10 @@ async function addJest(host, options) {
     });
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'), (json) => {
         json.compilerOptions.jsx = 'react';
-        // have to override exclude otherwise lint will fail with setParserOptionsProject and jest.config.ts
+        // have to override exclude otherwise lint will fail with setParserOptionsProject and jest.config.ts/jest.config.cts
         if (options.setParserOptionsProject) {
             const tsConfig = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'));
-            json.exclude = tsConfig.exclude.filter((e) => e !== 'jest.config.ts');
+            json.exclude = tsConfig.exclude.filter((e) => e !== 'jest.config.ts' && e !== 'jest.config.cts');
         }
         return json;
     });

package/src/generators/application/lib/add-linting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAWvD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAuF5B"}
+{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAWvD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA0F5B"}

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

@@ -5,7 +5,7 @@ const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const versions_1 = require("../../../utils/versions");
+const version_utils_1 = require("../../../utils/version-utils");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinting(host, options) {
     if (options.linter !== 'eslint')
@@ -61,10 +61,11 @@ async function addLinting(host, options) {
         ]);
     }
     if (!options.skipPackageJson) {
+        const eslintConfigNextVersion = await (0, version_utils_1.getEslintConfigNextDependenciesVersionsToInstall)(host);
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, {
             ...lint_1.extraEslintDependencies.devDependencies,
-            'eslint-config-next': versions_1.eslintConfigNextVersion,
-            '@next/eslint-plugin-next': versions_1.eslintConfigNextVersion,
+            'eslint-config-next': eslintConfigNextVersion,
+            '@next/eslint-plugin-next': eslintConfigNextVersion,
         }));
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);

package/src/utils/jest-config-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-config-util.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/jest-config-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,YAAY,CAAC;AAElD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QAwDF"}
+{"version":3,"file":"jest-config-util.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/jest-config-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkB,MAAM,YAAY,CAAC;AAelD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QAwDF"}

package/src/utils/jest-config-util.js

@@ -2,16 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = updateJestConfig;
 const devkit_1 = require("@nx/devkit");
+function findProjectJestConfig(host, projectRoot) {
+    const extensions = ['js', 'ts', 'cts'];
+    for (const ext of extensions) {
+        const configPath = `${projectRoot}/jest.config.${ext}`;
+        if (host.exists(configPath)) {
+            return configPath;
+        }
+    }
+    return null;
+}
 function updateJestConfig(host, options) {
     if (options.unitTestRunner !== 'jest') {
         return;
     }
-    const configPath = `${options.projectRoot}/jest.config.${options.js ? 'js' : 'ts'}`;
-    if (!host.exists(configPath))
+    const configPath = findProjectJestConfig(host, options.projectRoot);
+    if (!configPath)
         return;
     const offset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
+    const isCommonJS = configPath.endsWith('.js') || configPath.endsWith('.cts');
     // Easier to override the whole file rather than replace content since the structure has changed with `next/jest.js` being used.
-    const newContent = options.js
+    const newContent = isCommonJS
         ? `const nextJest = require('next/jest.js');
 
 const createJestConfig = nextJest({

package/src/utils/version-utils.d.ts

@@ -2,7 +2,9 @@ import { type Tree } from '@nx/devkit';
 type NextDependenciesVersions = {
     next: string;
 };
+type EslintConfigNextVersion = string;
 export declare function getNextDependenciesVersionsToInstall(tree: Tree, isReact18?: boolean): Promise<NextDependenciesVersions>;
+export declare function getEslintConfigNextDependenciesVersionsToInstall(tree: Tree): Promise<EslintConfigNextVersion>;
 export declare function isNext14(tree: Tree): Promise<boolean>;
 export declare function getInstalledNextVersion(tree: Tree): string;
 export declare function getInstalledNextVersionFromGraph(): Promise<string>;

package/src/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAIpB,KAAK,wBAAwB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,IAAI,EACV,SAAS,UAAQ,GAChB,OAAO,CAAC,wBAAwB,CAAC,CAUnC;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,oBAMxC;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAe1D;AAED,wBAAsB,gCAAgC,oBAOrD"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AASpB,KAAK,wBAAwB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,uBAAuB,GAAG,MAAM,CAAC;AAEtC,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,IAAI,EACV,SAAS,UAAQ,GAChB,OAAO,CAAC,wBAAwB,CAAC,CAUnC;AAED,wBAAsB,gDAAgD,CACpE,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,uBAAuB,CAAC,CAMlC;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,oBAMxC;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAe1D;AAED,wBAAsB,gCAAgC,oBAOrD"}

package/src/utils/version-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextDependenciesVersionsToInstall = getNextDependenciesVersionsToInstall;
+exports.getEslintConfigNextDependenciesVersionsToInstall = getEslintConfigNextDependenciesVersionsToInstall;
 exports.isNext14 = isNext14;
 exports.getInstalledNextVersion = getInstalledNextVersion;
 exports.getInstalledNextVersionFromGraph = getInstalledNextVersionFromGraph;
@@ -19,6 +20,14 @@ async function getNextDependenciesVersionsToInstall(tree, isReact18 = false) {
         };
     }
 }
+async function getEslintConfigNextDependenciesVersionsToInstall(tree) {
+    if (await isNext14(tree)) {
+        return versions_1.eslintConfigNext14Version;
+    }
+    else {
+        return versions_1.eslintConfigNextVersion;
+    }
+}
 async function isNext14(tree) {
     let installedNextVersion = await getInstalledNextVersionFromGraph();
     if (!installedNextVersion) {

package/src/utils/versions.d.ts

@@ -2,6 +2,7 @@ export declare const nxVersion: any;
 export declare const nextVersion = "~15.2.4";
 export declare const next14Version = "~14.2.26";
 export declare const eslintConfigNextVersion = "^15.2.4";
+export declare const eslintConfigNext14Version = "~14.2.26";
 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,kCAAkC,WAAW,CAAC;AAC3D,eAAO,MAAM,YAAY,WAAW,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,yBAAyB,aAAa,CAAC;AACpD,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,kCAAkC,WAAW,CAAC;AAC3D,eAAO,MAAM,YAAY,WAAW,CAAC"}

package/src/utils/versions.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.next14Version = exports.nextVersion = exports.nxVersion = void 0;
+exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNext14Version = exports.eslintConfigNextVersion = exports.next14Version = exports.nextVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.nextVersion = '~15.2.4';
 exports.next14Version = '~14.2.26';
 exports.eslintConfigNextVersion = '^15.2.4';
+exports.eslintConfigNext14Version = '~14.2.26';
 exports.sassVersion = '1.62.1';
 exports.lessLoader = '11.1.0';
 exports.emotionServerVersion = '11.11.0';