@nx/next 24.0.0-pr.37405.acdaf31 → 24.0.0-rc.0

package/dist/plugins/component-testing.js

@@ -5,10 +5,8 @@ const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
 const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
-const react_1 = require("@nx/react");
 const internal_3 = require("@nx/react/internal");
 const path_1 = require("path");
-const internal_4 = require("@nx/devkit/internal");
 function nxComponentTestingPreset(pathToConfig, options) {
     if (global.NX_GRAPH_CREATION) {
         // this is only used by plugins, so we don't need the component testing
@@ -16,57 +14,15 @@ function nxComponentTestingPreset(pathToConfig, options) {
         return (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig);
     }
     (0, internal_3.assertPackageIsInstalled)('@nx/webpack', '@nx/next/plugins/component-testing');
-    const { composePluginsSync, withNx, } = require('@nx/webpack');
-    const { suppressWebpackComposeHelperWarnings, } = require('@nx/webpack/internal');
+    const { applyBaseConfig, applyWebConfig, } = require('@nx/webpack/internal');
     const graph = (0, devkit_1.readCachedProjectGraph)();
     const { targets: ctTargets, name: ctProjectName } = (0, internal_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctTargetName = options?.ctTargetName || 'component-test';
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
     const ctExecutorContext = (0, internal_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
-    let buildTarget = options?.buildTarget;
-    if (!buildTarget) {
-        const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
-            project: ctProjectName,
-            target: ctTargetName,
-            configuration: ctConfigurationName,
-        }, ctExecutorContext);
-        buildTarget = ctExecutorOptions.devServerTarget;
-    }
-    let buildAssets = [];
-    let buildFileReplacements = [];
-    let buildOuputPath = `dist/${ctProjectName}/.next`;
-    if (buildTarget) {
-        const parsedBuildTarget = (0, devkit_1.parseTargetString)(buildTarget, {
-            cwd: process.cwd(),
-            root: devkit_1.workspaceRoot,
-            projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph),
-            nxJsonConfiguration: (0, internal_4.readNxJsonFromDisk)(devkit_1.workspaceRoot),
-            isVerbose: false,
-            projectName: ctProjectName,
-            projectGraph: graph,
-        });
-        const buildProjectConfig = graph.nodes[parsedBuildTarget.project]?.data;
-        if (buildProjectConfig?.targets?.[parsedBuildTarget.target]?.executor !==
-            '@nx/next:build') {
-            throw new Error(`The '${parsedBuildTarget.target}' target of the '${[
-                parsedBuildTarget.project,
-            ]}' project is not using the '@nx/next:build' executor. ` +
-                `Please make sure to use '@nx/next:build' executor in that target to use Cypress Component Testing.`);
-        }
-        const buildExecutorContext = (0, internal_1.createExecutorContext)(graph, buildProjectConfig.targets, parsedBuildTarget.project, parsedBuildTarget.target, parsedBuildTarget.configuration);
-        const buildExecutorOptions = (0, devkit_1.readTargetOptions)({
-            project: parsedBuildTarget.project,
-            target: parsedBuildTarget.target,
-            configuration: parsedBuildTarget.configuration,
-        }, buildExecutorContext);
-        buildAssets ??= buildExecutorOptions.assets;
-        buildFileReplacements ??= buildExecutorOptions.fileReplacements;
-        buildOuputPath ??= buildExecutorOptions.outputPath;
-    }
     const ctProjectConfig = graph.nodes[ctProjectName]?.data;
     if (!ctProjectConfig) {
         throw new Error((0, devkit_1.stripIndents) `Unable to load project configs from the project graph.
-Provided build target, ${buildTarget}.
 Able to find CT project, ${!!ctProjectConfig}.`);
     }
     const webpackOptions = {
@@ -75,27 +31,28 @@ Able to find CT project, ${!!ctProjectConfig}.`);
         sourceRoot: (0, internal_2.getProjectSourceRoot)(ctProjectConfig),
         main: '',
         useTsconfigPaths: undefined,
-        fileReplacements: buildFileReplacements,
-        assets: buildAssets,
-        outputPath: buildOuputPath,
+        fileReplacements: [],
+        assets: [],
+        outputPath: `dist/${ctProjectName}/.next`,
         outputFileName: 'main.js',
         compiler: options?.compiler || 'swc',
         tsConfig: (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tsconfig.json'),
     };
-    // Nx composes these helpers internally for the Cypress CT preset; suppress
-    // their deprecation warning so it fires only for user-authored configs.
-    const webpackConfig = suppressWebpackComposeHelperWarnings(() => (0, internal_3.suppressReactComposeHelperWarnings)(() => {
-        const configure = composePluginsSync(withNx({
-            target: 'web',
-            styles: [],
-            scripts: [],
-            postcssConfig: ctProjectConfig.root,
-        }), (0, react_1.withReact)({}));
-        return configure({}, {
-            options: webpackOptions,
-            context: ctExecutorContext,
-        });
-    }));
+    const webpackConfig = {};
+    const configOptions = {
+        ...webpackOptions,
+        target: 'web',
+        styles: [],
+        scripts: [],
+        postcssConfig: ctProjectConfig.root,
+        projectName: ctExecutorContext.projectName,
+        targetName: ctExecutorContext.targetName,
+        configurationName: ctExecutorContext.configurationName,
+        projectGraph: ctExecutorContext.projectGraph,
+    };
+    applyBaseConfig(configOptions, webpackConfig);
+    applyWebConfig(configOptions, webpackConfig);
+    (0, internal_3.applyReactConfig)({}, webpackConfig);
     return {
         ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig),
         specPattern: '**/*.cy.{js,jsx,ts,tsx}',

package/dist/plugins/with-nx.d.ts

@@ -1,10 +1,5 @@
-/**
- * WARNING: Do not add development dependencies to top-level imports.
- * Instead, `require` them inline during the build phase.
- */
 import type { NextConfig } from 'next';
 import type { NextConfigFn } from '../src/utils/config';
-import { type ProjectGraphProjectNode } from '@nx/devkit';
 import type { AssetGlobPattern } from '@nx/webpack';
 export interface WithNxOptions extends NextConfig {
     nx?: {
@@ -21,10 +16,19 @@ export interface WithNxContext {
     libsDir: string;
 }
 /**
- * Try to read output dir from project, and default to '.next' if executing outside of Nx (e.g. dist is added to a docker image).
+ * @deprecated Export the Next.js config directly and compose
+ * any other wrappers yourself.
+ * This inert stub will be removed in Nx v25.
+ */
+declare function withNx(config?: WithNxOptions, _context?: WithNxContext): NextConfigFn;
+/**
+ * @deprecated Use the Next.js config object directly.
+ * This inert stub will be removed in Nx v25.
+ */
+export declare function getNextConfig(nextConfig?: WithNxOptions, _context?: WithNxContext): NextConfig;
+/**
+ * @deprecated Next.js resolves tsconfig `paths` natively.
+ * This inert stub will be removed in Nx v25.
  */
-declare function withNx(_nextConfig?: WithNxOptions, context?: WithNxContext): NextConfigFn;
-export declare function getNextConfig(nextConfig?: WithNxOptions, context?: WithNxContext): NextConfig;
-export declare function getAliasForProject(node: ProjectGraphProjectNode, paths: Record<string, string[]>): null | string;
-export declare function forNextVersion(range: string, fn: () => void): void;
+export declare function getAliasForProject(_node: unknown, _paths: Record<string, string[]>): null | string;
 export { withNx };

package/dist/plugins/with-nx.js

@@ -2,276 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextConfig = getNextConfig;
 exports.getAliasForProject = getAliasForProject;
-exports.forNextVersion = forNextVersion;
 exports.withNx = withNx;
-const semver_1 = require("semver");
-function regexEqual(x, y) {
-    return (x instanceof RegExp &&
-        y instanceof RegExp &&
-        x.source === y.source &&
-        x.global === y.global &&
-        x.ignoreCase === y.ignoreCase &&
-        x.multiline === y.multiline);
-}
-/**
- * Do not remove or rename this function. Production builds inline `with-nx.js` file with a replacement
- * To this function that hard-codes the libsDir.
- */
-function getWithNxContext() {
-    const { workspaceRoot, workspaceLayout } = require('@nx/devkit');
-    return {
-        workspaceRoot,
-        libsDir: workspaceLayout().libsDir,
-    };
-}
-function getNxContext(graph, target) {
-    const { parseTargetString, workspaceRoot } = require('@nx/devkit');
-    const projectNode = graph.nodes[target.project];
-    const targetConfig = projectNode.data.targets[target.target];
-    const targetOptions = targetConfig.options;
-    if (target.configuration) {
-        Object.assign(targetOptions, targetConfig.configurations[target.configuration]);
-    }
-    const partialExecutorContext = {
-        projectName: target.project,
-        targetName: target.target,
-        projectGraph: graph,
-        configurationName: target.configuration,
-        root: workspaceRoot,
-    };
-    if (targetOptions.devServerTarget) {
-        // Executors such as @nx/cypress:cypress define the devServerTarget option.
-        return getNxContext(graph, parseTargetString(targetOptions.devServerTarget, partialExecutorContext));
-    }
-    else if (targetOptions.buildTarget) {
-        // Executors such as @nx/next:server define the buildTarget option.
-        return getNxContext(graph, parseTargetString(targetOptions.buildTarget, partialExecutorContext));
-    }
-    // Default case, return info for current target.
-    // This could be a build using @nx/next:build or run-commands without using our executors.
-    return {
-        node: graph.nodes[target.project],
-        options: targetOptions,
-        projectName: target.project,
-        targetName: target.target,
-        configurationName: target.configuration,
-    };
-}
+// TODO(v25): remove the inert config-helper stubs in this file.
 /**
- * Try to read output dir from project, and default to '.next' if executing outside of Nx (e.g. dist is added to a docker image).
+ * @deprecated Export the Next.js config directly and compose
+ * any other wrappers yourself.
+ * This inert stub will be removed in Nx v25.
  */
-function withNx(_nextConfig = {}, context = getWithNxContext()) {
+function withNx(config = {}, _context) {
     return async (phase) => {
-        const { PHASE_PRODUCTION_SERVER, PHASE_DEVELOPMENT_SERVER, } = require('next/constants');
-        // Three scenarios where we want to skip graph creation:
-        // 1. Running production server means the build is already done so we just need to start the Next.js server.
-        // 2. During graph creation (i.e. create nodes), we won't have a graph to read, and it is not needed anyway since it's a build-time concern.
-        // 3. Running outside of Nx, we don't have a graph to read.
-        //
-        // NOTE: Avoid any `require(...)` or `import(...)` statements here. Development dependencies are not available at production runtime.
-        if (PHASE_PRODUCTION_SERVER === phase ||
-            global.NX_GRAPH_CREATION ||
-            !process.env.NX_TASK_TARGET_TARGET) {
-            const { nx, ...validNextConfig } = _nextConfig;
-            return {
-                distDir: '.next',
-                ...validNextConfig,
-            };
-        }
-        else {
-            const { readCachedProjectGraph, joinPathFragments, offsetFromRoot, workspaceRoot, } = require('@nx/devkit');
-            // Resolved from the workspace (not bundled) so the deprecation warning is
-            // not inlined into production builds. Reached only on the active Nx-task
-            // path; the production-server phase returns above.
+        const { PHASE_PRODUCTION_SERVER } = require('next/constants');
+        // Copied into production builds, so only resolve the warning on Nx task runs.
+        if (phase !== PHASE_PRODUCTION_SERVER &&
+            !global.NX_GRAPH_CREATION &&
+            process.env.NX_TASK_TARGET_TARGET) {
+            const { workspaceRoot } = require('@nx/devkit');
             const { warnWithNxDeprecation } = require(require.resolve('@nx/next/src/utils/deprecation', {
                 paths: [workspaceRoot],
             }));
             warnWithNxDeprecation();
-            // Since this is invoked by an Nx task, the graph is already cached.
-            const graph = readCachedProjectGraph();
-            const originalTarget = {
-                project: process.env.NX_TASK_TARGET_PROJECT,
-                target: process.env.NX_TASK_TARGET_TARGET,
-                configuration: process.env.NX_TASK_TARGET_CONFIGURATION,
-            };
-            const { node: projectNode, options, projectName: project, } = getNxContext(graph, originalTarget);
-            const projectDirectory = projectNode.data.root;
-            // Get next config
-            const nextConfig = getNextConfig(_nextConfig, context);
-            // For Next.js 13.1 and greater, make sure workspace libs are transpiled.
-            forNextVersion('>=13.1.0', () => {
-                if (!graph.dependencies[project])
-                    return;
-                const { readTsConfigPaths } = require('@nx/js');
-                const { findAllProjectNodeDependencies, } = require('@nx/devkit/internal');
-                const paths = readTsConfigPaths();
-                const deps = findAllProjectNodeDependencies(project);
-                nextConfig.transpilePackages ??= [];
-                for (const dep of deps) {
-                    const alias = getAliasForProject(graph.nodes[dep], paths);
-                    if (alias) {
-                        nextConfig.transpilePackages.push(alias);
-                    }
-                }
-            });
-            // process.env.NX_NEXT_OUTPUT_PATH is set when running @nx/next:build
-            options.outputPath =
-                process.env.NX_NEXT_OUTPUT_PATH || options.outputPath;
-            // outputPath may be undefined if using run-commands or other executors other than @nx/next:build.
-            // In this case, the user should set distDir in their next.config.js.
-            if (options.outputPath && phase !== PHASE_DEVELOPMENT_SERVER) {
-                const outputDir = `${offsetFromRoot(projectDirectory)}${options.outputPath}`;
-                // If running dev-server, we should keep `.next` inside project directory since Turbopack expects this.
-                // See: https://github.com/nrwl/nx/issues/19365
-                nextConfig.distDir =
-                    nextConfig.distDir && nextConfig.distDir !== '.next'
-                        ? joinPathFragments(outputDir, nextConfig.distDir)
-                        : joinPathFragments(outputDir, '.next');
-            }
-            // If we are running a static serve of the Next.js app, we need to change the output to 'export' and the distDir to 'out'.
-            if (process.env.NX_SERVE_STATIC_BUILD_RUNNING === 'true') {
-                nextConfig.output = 'export';
-                nextConfig.distDir = 'out';
-            }
-            const userWebpackConfig = nextConfig.webpack;
-            const { createWebpackConfig } = require(require.resolve('@nx/next/src/utils/config', {
-                paths: [workspaceRoot],
-            }));
-            // If we have file replacements or assets, inside of the next config we pass the workspaceRoot as a join of the workspaceRoot and the projectDirectory
-            // Because the file replacements and assets are relative to the projectRoot, not the workspaceRoot
-            nextConfig.webpack = (a, b) => createWebpackConfig(_nextConfig.nx?.fileReplacements
-                ? joinPathFragments(workspaceRoot, projectDirectory)
-                : workspaceRoot, projectDirectory, _nextConfig.nx?.fileReplacements || options.fileReplacements, _nextConfig.nx?.assets || options.assets)(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
-            return nextConfig;
         }
+        return config;
     };
 }
-function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
-    // If `next-compose-plugins` is used, the context argument is invalid.
-    if (!context.libsDir || !context.workspaceRoot) {
-        context = getWithNxContext();
-    }
-    const userWebpack = nextConfig.webpack || ((x) => x);
-    const { nx, ...validNextConfig } = nextConfig;
-    const baseConfig = {
-        ...validNextConfig,
-    };
-    const nextJsVersion = require('next/package.json')?.version ?? '16.0.1';
-    if ((0, semver_1.satisfies)(nextJsVersion, '<16.0.0', { includePrerelease: true })) {
-        baseConfig.eslint = {
-            ignoreDuringBuilds: true,
-            ...(validNextConfig.eslint ?? {}),
-        };
-    }
-    return {
-        ...baseConfig,
-        webpack: (config, options) => {
-            /**
-             * To support ESM library export, we need to ensure the extensionAlias contains both `.js` and `.ts` extensions.
-             * This is because Webpack uses the `extensionAlias` to resolve the correct file extension when importing modules.
-             */
-            config.resolve.extensionAlias = {
-                ...(config.resolve.extensionAlias || {}),
-                '.js': ['.ts', '.tsx', '.js', '.jsx'],
-                '.mjs': ['.mts', '.mjs'],
-                '.cjs': ['.cts', '.cjs'],
-                '.jsx': ['.tsx', '.jsx'],
-            };
-            /*
-             * Update babel to support our monorepo setup.
-             * The 'upward' mode allows the root babel.config.json and per-project .babelrc files to be picked up.
-             */
-            if (nx?.babelUpwardRootMode) {
-                options.defaultLoaders.babel.options.babelrc = true;
-                options.defaultLoaders.babel.options.rootMode = 'upward';
-            }
-            /*
-             * Modify the Next.js webpack config to allow workspace libs to use css modules.
-             * Note: This would be easier if Next.js exposes css-loader and sass-loader on `defaultLoaders`.
-             */
-            // Include workspace libs in css/sass loaders
-            const includes = [
-                require('path').join(context.workspaceRoot, context.libsDir),
-            ];
-            const nextCssLoaders = config.module.rules.find((rule) => typeof rule.oneOf === 'object');
-            // webpack config is not as expected
-            if (!nextCssLoaders)
-                return config;
-            /*
-             *  1. Modify css loader to enable module support for workspace libs
-             */
-            const nextCssLoader = nextCssLoaders.oneOf.find((rule) => rule.sideEffects === false && regexEqual(rule.test, /\.module\.css$/));
-            // Might not be found if Next.js webpack config changes in the future
-            if (nextCssLoader && nextCssLoader.issuer) {
-                nextCssLoader.issuer.or = nextCssLoader.issuer.and
-                    ? nextCssLoader.issuer.and.concat(includes)
-                    : includes;
-                delete nextCssLoader.issuer.and;
-            }
-            /*
-             *  2. Modify sass loader to enable module support for workspace libs
-             */
-            const nextSassLoader = nextCssLoaders.oneOf.find((rule) => rule.sideEffects === false &&
-                regexEqual(rule.test, /\.module\.(scss|sass)$/));
-            // Might not be found if Next.js webpack config changes in the future
-            if (nextSassLoader && nextSassLoader.issuer) {
-                nextSassLoader.issuer.or = nextSassLoader.issuer.and
-                    ? nextSassLoader.issuer.and.concat(includes)
-                    : includes;
-                delete nextSassLoader.issuer.and;
-            }
-            /*
-             *  3. Modify error loader to ignore css modules used by workspace libs
-             */
-            const nextErrorCssModuleLoader = nextCssLoaders.oneOf.find((rule) => rule.use &&
-                rule.use.loader === 'error-loader' &&
-                rule.use.options &&
-                (rule.use.options.reason ===
-                    'CSS Modules \u001b[1mcannot\u001b[22m be imported from within \u001b[1mnode_modules\u001b[22m.\n' +
-                        'Read more: https://err.sh/next.js/css-modules-npm' ||
-                    rule.use.options.reason ===
-                        'CSS Modules cannot be imported from within node_modules.\nRead more: https://err.sh/next.js/css-modules-npm'));
-            // Might not be found if Next.js webpack config changes in the future
-            if (nextErrorCssModuleLoader) {
-                nextErrorCssModuleLoader.exclude = includes;
-            }
-            /**
-             * 4. Modify css loader to allow global css from node_modules to be imported from workspace libs
-             */
-            const nextGlobalCssLoader = nextCssLoaders.oneOf.find((rule) => rule.include?.and?.find((include) => regexEqual(include, /node_modules/)));
-            // Might not be found if Next.js webpack config changes in the future
-            if (nextGlobalCssLoader && nextGlobalCssLoader.issuer) {
-                nextGlobalCssLoader.issuer.or = nextGlobalCssLoader.issuer.and
-                    ? nextGlobalCssLoader.issuer.and.concat(includes)
-                    : includes;
-                delete nextGlobalCssLoader.issuer.and;
-            }
-            return userWebpack(config, options);
-        },
-    };
+/**
+ * @deprecated Use the Next.js config object directly.
+ * This inert stub will be removed in Nx v25.
+ */
+function getNextConfig(nextConfig = {}, _context) {
+    return nextConfig;
 }
-function getAliasForProject(node, paths) {
-    // Match workspace libs to their alias in tsconfig paths.
-    for (const [alias, lookup] of Object.entries(paths ?? {})) {
-        const lookupContainsDepNode = lookup.some((lookupPath) => lookupPath.startsWith(node?.data?.root) ||
-            lookupPath.startsWith('./' + node?.data?.root));
-        if (lookupContainsDepNode) {
-            return alias;
-        }
-    }
+/**
+ * @deprecated Next.js resolves tsconfig `paths` natively.
+ * This inert stub will be removed in Nx v25.
+ */
+function getAliasForProject(_node, _paths) {
     return null;
 }
-// Runs a function if the Next.js version satisfies the range.
-function forNextVersion(range, fn) {
-    const semver = require('semver');
-    const nextJsVersion = require('next/package.json').version;
-    if (semver.satisfies(nextJsVersion, range, { includePrerelease: true })) {
-        fn();
-    }
-}
-// Support for older generated code: `const withNx = require('@nx/next/plugins/with-nx');`
+// Both import forms exist in generated configs and copied production configs.
 module.exports = withNx;
-// Support for newer generated code: `const { withNx } = require(...);`
 module.exports.withNx = withNx;
 module.exports.getNextConfig = getNextConfig;
 module.exports.getAliasForProject = getAliasForProject;

package/dist/ready-check.d.ts

@@ -0,0 +1 @@
+export { waitForNextServer as waitForDevServer } from './src/utils/dev-server-ready-check';

package/dist/ready-check.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForDevServer = void 0;
+var dev_server_ready_check_1 = require("./src/utils/dev-server-ready-check");
+Object.defineProperty(exports, "waitForDevServer", { enumerable: true, get: function () { return dev_server_ready_check_1.waitForNextServer; } });

package/dist/src/generators/application/application.js

@@ -25,7 +25,6 @@ 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,
         useProjectJson: true,
         ...schema,
     });
@@ -33,7 +32,7 @@ async function applicationGenerator(host, schema) {
 async function applicationGeneratorInternal(host, schema) {
     (0, assert_supported_next_version_1.assertSupportedNextVersion)(host);
     const tasks = [];
-    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(host, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: schema.js,
         skipPackageJson: schema.skipPackageJson,
@@ -77,10 +76,13 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(swcTask);
     }
     if (options.customServer) {
-        await (0, custom_server_1.customServerGenerator)(host, {
+        const customServerTask = await (0, custom_server_1.customServerGenerator)(host, {
             project: options.projectName,
             compiler: options.swc ? 'swc' : 'tsc',
         });
+        if (customServerTask) {
+            tasks.push(customServerTask);
+        }
     }
     if (!options.skipPackageJson) {
         const reactVersions = await (0, internal_2.getReactDependenciesVersionsToInstall)(host);

package/dist/src/generators/application/files/common/next.config.js__tmpl__

@@ -1,5 +1,4 @@
 //@ts-check
-<% if (addPlugin) { -%>
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
@@ -8,24 +7,3 @@ const nextConfig = {
 };
 
 module.exports = nextConfig;
-<% } else { -%>
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { composePlugins, withNx } = require('@nx/next');
-
-/**
- * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
- **/
-const nextConfig = {
-  // Use this to set Nx-specific options
-  // See: https://nx.dev/docs/technologies/react/next/Guides/next-config-setup
-  nx: {},
-};
-
-const plugins = [
-  // Add more Next.js plugins to this list if needed.
-  withNx,
-];
-
-module.exports = composePlugins(...plugins)(nextConfig);
-<% } -%>

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
@@ -11,7 +10,7 @@ async function addE2e(host, options) {
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
-    const e2eWebServerInfo = await getNextE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'next.config.js'), options.addPlugin);
+    const e2eWebServerInfo = await getNextE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'next.config.js'));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         if (!hasPlugin) {
@@ -53,7 +52,6 @@ async function addE2e(host, options) {
             devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
             baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             jsx: true,
-            enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
             webServerCommands: {
                 default: e2eWebServerInfo.e2eWebServerCommand,
             },
@@ -95,19 +93,20 @@ async function addE2e(host, options) {
             directory: 'src',
             js: false,
             linter: options.linter,
-            enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
-            webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+            enableTypedLinting: options.enableTypedLinting,
             webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
-            addPlugin: options.addPlugin,
+            webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            ciWebServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
         });
         return e2eTask;
     }
     return () => { };
 }
-async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
+async function getNextE2EWebServerInfo(tree, projectName, configFilePath) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    let e2ePort = isPluginBeingAdded ? 3000 : 4200;
-    const defaultServeTarget = isPluginBeingAdded ? 'dev' : 'serve';
+    let e2ePort = 3000;
+    const defaultServeTarget = 'dev';
     const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)(defaultServeTarget, nxJson.targetDefaults)?.options;
     if (serveTargetOptions?.port) {
         e2ePort = serveTargetOptions.port;
@@ -123,5 +122,5 @@ async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPlug
         defaultE2EWebServerAddress: `http://127.0.0.1:${e2ePort}`,
         defaultE2ECiBaseUrl: `http://localhost:${e2ePort}`,
         defaultE2EPort: e2ePort,
-    }, isPluginBeingAdded);
+    });
 }

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = addJest;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/eslint/internal");
 const versions_1 = require("../../../utils/versions");
 async function addJest(host, options) {
     if (options.unitTestRunner !== 'jest') {
@@ -31,7 +30,7 @@ async function addJest(host, options) {
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'), (json) => {
         json.compilerOptions.jsx = 'react';
         // Override exclude so typed linting doesn't fail on jest.config.ts and jest.config.cts.
-        if ((0, internal_1.isTypedLintingEnabled)(options)) {
+        if (options.enableTypedLinting) {
             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' && e !== 'jest.config.cts');
         }

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

@@ -18,8 +18,7 @@ async function addLinting(host, options) {
         ],
         unitTestRunner: options.unitTestRunner,
         rootProject: options.rootProject,
-        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
-        addPlugin: options.addPlugin,
+        enableTypedLinting: options.enableTypedLinting,
         skipPackageJson: options.skipPackageJson,
     }));
     // Everything below configures ESLint — predefined configs, `extends`, ignore