@nx/next 19.5.6 → 19.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "19.5.6",
+  "version": "19.6.0-beta.0",
   "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": "19.5.6",
+    "@nx/devkit": "19.6.0-beta.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -46,14 +46,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "19.5.6",
-    "@nx/eslint": "19.5.6",
-    "@nx/react": "19.5.6",
-    "@nx/web": "19.5.6",
-    "@nx/webpack": "19.5.6",
-    "@nx/workspace": "19.5.6",
+    "@nx/js": "19.6.0-beta.0",
+    "@nx/eslint": "19.6.0-beta.0",
+    "@nx/react": "19.6.0-beta.0",
+    "@nx/web": "19.6.0-beta.0",
+    "@nx/webpack": "19.6.0-beta.0",
+    "@nx/workspace": "19.6.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/next": "19.5.6"
+    "@nrwl/next": "19.6.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -5,6 +5,8 @@ const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const versions_1 = require("../../../utils/versions");
 const web_1 = require("@nx/web");
+const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -27,7 +29,7 @@ async function addE2e(host, options) {
             tags: [],
             implicitDependencies: [options.projectName],
         });
-        return configurationGenerator(host, {
+        const e2eTask = await configurationGenerator(host, {
             ...options,
             linter: eslint_1.Linter.EsLint,
             project: options.e2eProjectName,
@@ -45,6 +47,20 @@ async function addE2e(host, options) {
                 ? `nx run ${options.projectName}:serve-static`
                 : undefined,
         });
+        if (options.addPlugin ||
+            (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
+                ? p === '@nx/cypress/plugin'
+                : p.plugin === '@nx/cypress/plugin')) {
+            let buildTarget = '^build';
+            if (hasPlugin) {
+                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, '@nx/next/plugin', (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'next.config.js'));
+                if (matchingPlugin && typeof matchingPlugin !== 'string') {
+                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
+                }
+            }
+            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.${options.js ? 'js' : 'ts'}`));
+        }
+        return e2eTask;
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
@@ -55,7 +71,7 @@ async function addE2e(host, options) {
             tags: [],
             implicitDependencies: [options.projectName],
         });
-        return configurationGenerator(host, {
+        const e2eTask = await configurationGenerator(host, {
             rootProject: options.rootProject,
             project: options.e2eProjectName,
             skipFormat: true,
@@ -68,6 +84,20 @@ async function addE2e(host, options) {
             webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
             addPlugin: options.addPlugin,
         });
+        if (options.addPlugin ||
+            (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
+                ? p === '@nx/playwright/plugin'
+                : p.plugin === '@nx/playwright/plugin')) {
+            let buildTarget = '^build';
+            if (hasPlugin) {
+                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, '@nx/next/plugin', (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'next.config.js'));
+                if (matchingPlugin && typeof matchingPlugin !== 'string') {
+                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
+                }
+            }
+            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
+        }
+        return e2eTask;
     }
     return () => { };
 }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 function addProject(host, options) {
     const targets = {};
     // Check if plugin exists in nx.json and if it doesn't then we can continue
@@ -12,7 +12,7 @@ function addProject(host, options) {
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
     if (!hasPlugin) {
-        (0, add_build_target_defaults_1.addBuildTargetDefaults)(host, '@nx/next:build');
+        (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/next:build');
         targets.build = {
             executor: '@nx/next:build',
             outputs: ['{options.outputPath}'],