@nx/next 21.3.0-beta.2 → 21.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "21.3.0-beta.2",
+  "version": "21.3.0-beta.4",
   "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.3.0-beta.2",
+    "@nx/devkit": "21.3.0-beta.4",
     "@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.3.0-beta.2",
-    "@nx/eslint": "21.3.0-beta.2",
-    "@nx/react": "21.3.0-beta.2",
-    "@nx/web": "21.3.0-beta.2",
-    "@nx/webpack": "21.3.0-beta.2",
+    "@nx/js": "21.3.0-beta.4",
+    "@nx/eslint": "21.3.0-beta.4",
+    "@nx/react": "21.3.0-beta.4",
+    "@nx/web": "21.3.0-beta.4",
+    "@nx/webpack": "21.3.0-beta.4",
     "@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/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') ||