@nx/next 21.2.1 → 21.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "21.2.1",
+  "version": "21.2.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,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "21.2.1",
+    "@nx/devkit": "21.2.3",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "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": "21.2.1",
-    "@nx/eslint": "21.2.1",
-    "@nx/react": "21.2.1",
-    "@nx/web": "21.2.1",
-    "@nx/webpack": "21.2.1",
+    "@nx/js": "21.2.3",
+    "@nx/eslint": "21.2.3",
+    "@nx/react": "21.2.3",
+    "@nx/web": "21.2.3",
+    "@nx/webpack": "21.2.3",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/plugins/component-testing.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
+const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const react_1 = require("@nx/react");
 const webpack_1 = require("@nx/webpack");
-const path_1 = require("path");
 const configuration_1 = require("nx/src/config/configuration");
+const path_1 = require("path");
 function nxComponentTestingPreset(pathToConfig, options) {
     if (global.NX_GRAPH_CREATION) {
         // this is only used by plugins, so we don't need the component testing
@@ -68,7 +69,7 @@ Able to find CT project, ${!!ctProjectConfig}.`);
     const webpackOptions = {
         root: ctExecutorContext.root,
         projectRoot: ctProjectConfig.root,
-        sourceRoot: ctProjectConfig.sourceRoot,
+        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(ctProjectConfig),
         main: '',
         useTsconfigPaths: undefined,
         fileReplacements: buildFileReplacements,

package/src/generators/application/application.js

@@ -13,7 +13,6 @@ const add_jest_1 = require("./lib/add-jest");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const set_defaults_1 = require("./lib/set-defaults");
-const update_jest_config_1 = require("./lib/update-jest-config");
 const init_1 = require("../init/init");
 const styles_1 = require("../../utils/styles");
 const add_linting_1 = require("./lib/add-linting");
@@ -25,6 +24,7 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
+const jest_config_util_1 = require("../../utils/jest-config-util");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
@@ -74,7 +74,7 @@ async function applicationGeneratorInternal(host, schema) {
         swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
     });
     tasks.push(styledTask);
-    (0, update_jest_config_1.updateJestConfig)(host, options);
+    (0, jest_config_util_1.updateJestConfig)(host, { ...options, projectRoot: options.appProjectRoot });
     (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
     (0, set_defaults_1.setDefaults)(host, options);
     if (options.swc) {

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 const devkit_1 = require("@nx/devkit");
-const ct_utils_1 = require("@nx/react/src/utils/ct-utils");
-const versions_1 = require("../../utils/versions");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const react_1 = require("@nx/react");
+const ct_utils_1 = require("@nx/react/src/utils/ct-utils");
 const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 function cypressComponentConfiguration(tree, options) {
     return cypressComponentConfigurationInternal(tree, {
         addPlugin: false,
@@ -66,7 +67,8 @@ ${isUsingTailwind
 `);
     if (opts.generateTests) {
         const filePaths = [];
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
+        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+        (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot, (filePath) => {
             const fromProjectRootPath = (0, path_1.relative)(projectConfig.root, filePath);
             // we don't generate tests for pages/server-side/appDir components
             if (fromProjectRootPath.includes('pages') ||

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

@@ -0,0 +1,7 @@
+import { Tree } from '@nx/devkit';
+export declare function updateJestConfig(host: Tree, options: {
+    projectRoot: string;
+    projectName: string;
+    js?: boolean;
+    unitTestRunner?: string;
+}): void;

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateJestConfig = updateJestConfig;
+const devkit_1 = require("@nx/devkit");
+function updateJestConfig(host, options) {
+    if (options.unitTestRunner !== 'jest') {
+        return;
+    }
+    const configPath = `${options.projectRoot}/jest.config.${options.js ? 'js' : 'ts'}`;
+    if (!host.exists(configPath))
+        return;
+    const offset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
+    // 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 nextJest = require('next/jest.js');
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
+  displayName: '${options.projectName}',
+  preset: '${offset}jest.preset.js',
+  transform: {
+    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '${offset}coverage/${options.projectRoot}',
+  testEnvironment: 'jsdom',
+};
+
+module.exports = createJestConfig(config);
+`
+        : `import type { Config } from 'jest';
+import nextJest from 'next/jest.js';
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config: Config = {
+  displayName: '${options.projectName}',
+  preset: '${offset}jest.preset.js',
+  transform: {
+    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '${offset}coverage/${options.projectRoot}',
+  testEnvironment: 'jsdom',
+};
+
+export default createJestConfig(config);
+`;
+    host.write(configPath, newContent);
+}

package/src/generators/application/lib/update-jest-config.d.ts

@@ -1,3 +0,0 @@
-import { NormalizedSchema } from './normalize-options';
-import { Tree } from '@nx/devkit';
-export declare function updateJestConfig(host: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/update-jest-config.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateJestConfig = updateJestConfig;
-function updateJestConfig(host, options) {
-    if (options.unitTestRunner !== 'jest') {
-        return;
-    }
-    const configPath = `${options.appProjectRoot}/jest.config.${options.js ? 'js' : 'ts'}`;
-    const originalContent = host.read(configPath, 'utf-8');
-    const content = originalContent
-        .replace('transform: {', "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',")
-        .replace(`'babel-jest'`, `['babel-jest', { presets: ['@nx/next/babel'] }]`);
-    host.write(configPath, content);
-}