@nx/next 23.0.0-pr.35413.460eeef → 23.0.0-rc.0

package/dist/babel.d.ts

@@ -0,0 +1 @@
+export {};

package/{babel.js → dist/babel.js}

@@ -1,3 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Babel preset to provide Next.js support for Nx.
  */

package/{index.d.ts → dist/index.d.ts}

@@ -1,9 +1,7 @@
 export * from './src/utils/types';
-export { createGlobPatternsOfDependentProjects } from './src/utils/generate-globs';
 export { applicationGenerator } from './src/generators/application/application';
 export { componentGenerator } from './src/generators/component/component';
 export { libraryGenerator } from './src/generators/library/library';
 export { pageGenerator } from './src/generators/page/page';
 export { withNx } from './plugins/with-nx';
 export { composePlugins } from './src/utils/compose-plugins';
-//# sourceMappingURL=index.d.ts.map

package/{index.js → dist/index.js}

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.composePlugins = exports.withNx = exports.pageGenerator = exports.libraryGenerator = exports.componentGenerator = exports.applicationGenerator = exports.createGlobPatternsOfDependentProjects = void 0;
+exports.composePlugins = exports.withNx = exports.pageGenerator = exports.libraryGenerator = exports.componentGenerator = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/utils/types"), exports);
-var generate_globs_1 = require("./src/utils/generate-globs");
-Object.defineProperty(exports, "createGlobPatternsOfDependentProjects", { enumerable: true, get: function () { return generate_globs_1.createGlobPatternsOfDependentProjects; } });
 var application_1 = require("./src/generators/application/application");
 Object.defineProperty(exports, "applicationGenerator", { enumerable: true, get: function () { return application_1.applicationGenerator; } });
 var component_1 = require("./src/generators/component/component");

package/{plugin.d.ts → dist/plugin.d.ts}

@@ -1,2 +1 @@
 export { createNodes, createNodesV2, NextPluginOptions, } from './src/plugins/plugin';
-//# sourceMappingURL=plugin.d.ts.map

package/{plugins → dist/plugins}/component-testing.d.ts

@@ -1,3 +1,2 @@
 import { NxComponentTestingOptions } from '@nx/cypress/plugins/cypress-preset';
 export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): any;
-//# sourceMappingURL=component-testing.d.ts.map

package/{plugins → dist/plugins}/component-testing.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
+const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const react_1 = require("@nx/react");
+const internal_3 = require("@nx/react/internal");
 const webpack_1 = require("@nx/webpack");
+const internal_4 = require("@nx/webpack/internal");
 const configuration_1 = require("nx/src/config/configuration");
 const path_1 = require("path");
 function nxComponentTestingPreset(pathToConfig, options) {
@@ -16,10 +18,10 @@ function nxComponentTestingPreset(pathToConfig, options) {
         return (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig);
     }
     const graph = (0, devkit_1.readCachedProjectGraph)();
-    const { targets: ctTargets, name: ctProjectName } = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
+    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, ct_helpers_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
+    const ctExecutorContext = (0, internal_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
     let buildTarget = options?.buildTarget;
     if (!buildTarget) {
         const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
@@ -50,7 +52,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
             ]}' 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, ct_helpers_1.createExecutorContext)(graph, buildProjectConfig.targets, parsedBuildTarget.project, parsedBuildTarget.target, parsedBuildTarget.configuration);
+        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,
@@ -69,7 +71,7 @@ Able to find CT project, ${!!ctProjectConfig}.`);
     const webpackOptions = {
         root: ctExecutorContext.root,
         projectRoot: ctProjectConfig.root,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(ctProjectConfig),
+        sourceRoot: (0, internal_2.getProjectSourceRoot)(ctProjectConfig),
         main: '',
         useTsconfigPaths: undefined,
         fileReplacements: buildFileReplacements,
@@ -79,16 +81,20 @@ Able to find CT project, ${!!ctProjectConfig}.`);
         compiler: options?.compiler || 'swc',
         tsConfig: (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tsconfig.json'),
     };
-    const configure = (0, webpack_1.composePluginsSync)((0, webpack_1.withNx)({
-        target: 'web',
-        styles: [],
-        scripts: [],
-        postcssConfig: ctProjectConfig.root,
-    }), (0, react_1.withReact)({}));
-    const webpackConfig = configure({}, {
-        options: webpackOptions,
-        context: ctExecutorContext,
-    });
+    // Nx composes these helpers internally for the Cypress CT preset; suppress
+    // their deprecation warning so it fires only for user-authored configs.
+    const webpackConfig = (0, internal_4.suppressWebpackComposeHelperWarnings)(() => (0, internal_3.suppressReactComposeHelperWarnings)(() => {
+        const configure = (0, webpack_1.composePluginsSync)((0, webpack_1.withNx)({
+            target: 'web',
+            styles: [],
+            scripts: [],
+            postcssConfig: ctProjectConfig.root,
+        }), (0, react_1.withReact)({}));
+        return configure({}, {
+            options: webpackOptions,
+            context: ctExecutorContext,
+        });
+    }));
     return {
         ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig),
         specPattern: '**/*.cy.{js,jsx,ts,tsx}',

package/{plugins → dist/plugins}/with-less.d.ts

@@ -1,4 +1,3 @@
 import { NextConfigFn } from '../src/utils/config';
 import { WithNxOptions } from './with-nx';
 export declare function withLess(configOrFn: NextConfigFn | WithNxOptions): NextConfigFn;
-//# sourceMappingURL=with-less.d.ts.map

package/{plugins → dist/plugins}/with-nx.d.ts

@@ -28,4 +28,3 @@ export declare function getNextConfig(nextConfig?: WithNxOptions, context?: With
 export declare function getAliasForProject(node: ProjectGraphProjectNode, paths: Record<string, string[]>): null | string;
 export declare function forNextVersion(range: string, fn: () => void): void;
 export { withNx };
-//# sourceMappingURL=with-nx.d.ts.map

package/{plugins → dist/plugins}/with-nx.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextConfig = getNextConfig;
 exports.getAliasForProject = getAliasForProject;
@@ -95,7 +62,7 @@ function getNxContext(graph, target) {
  */
 function withNx(_nextConfig = {}, context = getWithNxContext()) {
     return async (phase) => {
-        const { PHASE_PRODUCTION_SERVER, PHASE_DEVELOPMENT_SERVER } = await Promise.resolve().then(() => __importStar(require('next/constants')));
+        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.
@@ -112,17 +79,16 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
             };
         }
         else {
-            const { createProjectGraphAsync, joinPathFragments, offsetFromRoot, workspaceRoot, } = require('@nx/devkit');
-            let graph;
-            try {
-                graph = await createProjectGraphAsync({
-                    exitOnError: false,
-                    resetDaemonClient: true,
-                });
-            }
-            catch (e) {
-                throw new Error('Could not create project graph. Please ensure that your workspace is valid.', { cause: e });
-            }
+            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 { 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,

package/{src → dist/src}/executors/build/build.impl.d.ts

@@ -3,4 +3,3 @@ import { NextBuildBuilderOptions } from '../../utils/types';
 export default function buildExecutor(options: NextBuildBuilderOptions, context: ExecutorContext): Promise<{
     success: boolean;
 }>;
-//# sourceMappingURL=build.impl.d.ts.map

package/{src → dist/src}/executors/build/build.impl.js

@@ -7,7 +7,6 @@ const path_1 = require("path");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const semver_1 = require("semver");
-const semver_2 = require("@nx/devkit/src/utils/semver");
 const update_package_json_1 = require("./lib/update-package-json");
 const create_next_config_file_1 = require("./lib/create-next-config-file");
 const check_project_1 = require("./lib/check-project");
@@ -15,8 +14,10 @@ const child_process_1 = require("child_process");
 const create_cli_options_1 = require("../../utils/create-cli-options");
 const internal_1 = require("@nx/devkit/internal");
 const runtime_version_utils_1 = require("../../utils/runtime-version-utils");
+const deprecation_1 = require("../../utils/deprecation");
 let childProcess;
 async function buildExecutor(options, context) {
+    (0, deprecation_1.warnNextBuildExecutorDeprecation)();
     // Cast to any to overwrite NODE_ENV
     process.env.NODE_ENV ||= 'production';
     const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
@@ -30,7 +31,7 @@ async function buildExecutor(options, context) {
     const reactDomVersion = packageJson?.dependencies?.['react-dom'] ??
         rootPackageJson.dependencies?.['react-dom'];
     const hasReact18 = reactDomVersion &&
-        (0, semver_1.gte)((0, semver_2.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
+        (0, semver_1.gte)((0, internal_1.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
     if (hasReact18) {
         process.env['__NEXT_REACT_ROOT'] ||= 'true';
     }

package/{src → dist/src}/executors/build/lib/check-project.d.ts

@@ -1,2 +1 @@
 export declare function checkPublicDirectory(root: string): void;
-//# sourceMappingURL=check-project.d.ts.map

package/{src → dist/src}/executors/build/lib/create-next-config-file.d.ts

@@ -12,4 +12,3 @@ export declare function getRelativeImports({ file, content, }: {
     content: string;
 }): string[];
 export declare function ensureFileExtensions(files: string[], absoluteDir: string): string[];
-//# sourceMappingURL=create-next-config-file.d.ts.map

package/{src → dist/src}/executors/build/lib/update-package-json.d.ts

@@ -1,4 +1,3 @@
 import type { ExecutorContext } from '@nx/devkit';
 import type { PackageJson } from 'nx/src/utils/package-json';
 export declare function updatePackageJson(packageJson: PackageJson, context: ExecutorContext): void;
-//# sourceMappingURL=update-package-json.d.ts.map

package/{src → dist/src}/executors/build/schema.json

@@ -6,6 +6,7 @@
   "title": "Next Build",
   "description": "Build a Next.js app.",
   "type": "object",
+  "x-deprecated": "The `@nx/next:build` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/next:convert-to-inferred` to migrate to the `@nx/next/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "outputPath": {
       "type": "string",

package/{src → dist/src}/executors/server/custom-server.impl.d.ts

@@ -4,4 +4,3 @@ export default function serveExecutor(options: NextServeBuilderOptions, context:
     success: boolean;
     baseUrl: string;
 }, void, unknown>;
-//# sourceMappingURL=custom-server.impl.d.ts.map

package/{src → dist/src}/executors/server/schema.json

@@ -6,6 +6,7 @@
   "title": "Next Serve",
   "description": "Serve a Next.js app.",
   "type": "object",
+  "x-deprecated": "The `@nx/next:server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/next:convert-to-inferred` to migrate to the `@nx/next/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "dev": {
       "type": "boolean",

package/{src → dist/src}/executors/server/server.impl.d.ts

@@ -4,4 +4,3 @@ export default function serveExecutor(options: NextServeBuilderOptions, context:
     success: boolean;
     baseUrl: string;
 }, void, any>;
-//# sourceMappingURL=server.impl.d.ts.map

package/{src → dist/src}/executors/server/server.impl.js

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = serveExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const custom_server_impl_1 = tslib_1.__importDefault(require("./custom-server.impl"));
 const create_cli_options_1 = require("../../utils/create-cli-options");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
+const internal_2 = require("@nx/web/internal");
 const runtime_version_utils_1 = require("../../utils/runtime-version-utils");
+const deprecation_1 = require("../../utils/deprecation");
 async function* serveExecutor(options, context) {
+    (0, deprecation_1.warnNextServerExecutorDeprecation)();
     const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context), context);
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     // This is required for the default custom server to work. See the @nx/next:app generator.
@@ -64,7 +66,7 @@ async function* serveExecutor(options, context) {
         }
     }
     const nextBin = require.resolve('next/dist/bin/next');
-    yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error }) => {
+    yield* (0, internal_1.createAsyncIterable)(async ({ done, next, error }) => {
         const server = (0, child_process_1.fork)(nextBin, [
             mode,
             ...args,
@@ -91,7 +93,7 @@ async function* serveExecutor(options, context) {
         process.on('SIGINT', () => killServer());
         process.on('SIGTERM', () => killServer());
         process.on('SIGHUP', () => killServer());
-        await (0, wait_for_port_open_1.waitForPortOpen)(options.port, { host: options.hostname });
+        await (0, internal_2.waitForPortOpen)(options.port, { host: options.hostname });
         next({
             success: true,
             baseUrl: `http://${options.hostname ?? 'localhost'}:${options.port}`,

package/{src → dist/src}/generators/application/application.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function applicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function applicationGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-//# sourceMappingURL=application.d.ts.map

package/{src → dist/src}/generators/application/application.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const assert_supported_next_version_1 = require("../../utils/assert-supported-next-version");
 const js_1 = require("@nx/js");
-const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
-const versions_1 = require("@nx/react/src/utils/versions");
-const version_utils_1 = require("@nx/react/src/utils/version-utils");
+const internal_2 = require("@nx/react/internal");
+const internal_3 = require("@nx/react/internal");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_e2e_1 = require("./lib/add-e2e");
 const add_jest_1 = require("./lib/add-jest");
@@ -18,14 +19,10 @@ const styles_1 = require("../../utils/styles");
 const add_linting_1 = require("./lib/add-linting");
 const custom_server_1 = require("../custom-server/custom-server");
 const update_cypress_tsconfig_1 = require("./lib/update-cypress-tsconfig");
-const show_possible_warnings_1 = require("./lib/show-possible-warnings");
-const versions_2 = require("../../utils/versions");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-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 versions_1 = require("../../utils/versions");
+const internal_4 = require("@nx/js/internal");
 const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
 const jest_config_util_1 = require("../../utils/jest-config-util");
-const version_utils_2 = require("../../utils/version-utils");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
@@ -34,8 +31,9 @@ async function applicationGenerator(host, schema) {
     });
 }
 async function applicationGeneratorInternal(host, schema) {
+    (0, assert_supported_next_version_1.assertSupportedNextVersion)(host);
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_4.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: schema.js,
         skipPackageJson: schema.skipPackageJson,
@@ -46,7 +44,6 @@ async function applicationGeneratorInternal(host, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
-    (0, show_possible_warnings_1.showPossibleWarnings)(host, options);
     const nextTask = await (0, init_1.nextInitGenerator)(host, {
         ...options,
         skipFormat: true,
@@ -57,7 +54,7 @@ async function applicationGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, internal_4.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
@@ -65,17 +62,6 @@ async function applicationGeneratorInternal(host, schema) {
     tasks.push(e2eTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options);
     tasks.push(jestTask);
-    if (options.style === 'tailwind') {
-        const tailwindTask = await (0, setup_tailwind_1.setupTailwindGenerator)(host, {
-            project: options.projectName,
-        });
-        tasks.push(tailwindTask);
-    }
-    // LESS is not currrently supported with Turbopack
-    // Turbopack is default in Next 16, set to webpack
-    if (options.style === 'less' && (await (0, version_utils_2.isNext16)(host))) {
-        devkit_1.logger.warn("NX LESS is only supported with Webpack bundler. Please ensure you run your application with '--webpack'.");
-    }
     const styledTask = (0, styles_1.addStyleDependencies)(host, {
         style: options.style,
         swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
@@ -95,30 +81,30 @@ async function applicationGeneratorInternal(host, schema) {
         });
     }
     if (!options.skipPackageJson) {
-        const reactVersions = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
+        const reactVersions = await (0, internal_3.getReactDependenciesVersionsToInstall)(host);
         const devDependencies = {
             '@types/react': reactVersions['@types/react'],
             '@types/react-dom': reactVersions['@types/react-dom'],
         };
         if (options.unitTestRunner && options.unitTestRunner !== 'none') {
-            devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
-            devDependencies['@testing-library/dom'] = versions_1.testingLibraryDomVersion;
+            devDependencies['@testing-library/react'] = internal_2.testingLibraryReactVersion;
+            devDependencies['@testing-library/dom'] = internal_2.testingLibraryDomVersion;
         }
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_1.tsLibVersion }, devDependencies, undefined, true));
     }
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.json', {
+    (0, internal_4.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.json', {
         jsx: 'preserve',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : ['.next'], options.src ? 'src' : '.');
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
+    (0, internal_4.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+        (0, internal_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/dist/src/generators/application/files/app/page.tsx__tmpl__

@@ -0,0 +1,15 @@
+<%_ if (style !== 'none') { var wrapper = 'div'; _%>
+import styles from './page.module.<%= style %>';
+<% } else { var wrapper = 'div'; } %>
+export default function Index() {
+  /*
+   * Replace the elements below with your own.
+   *
+   * Note: The corresponding styles are in the ./<%= fileName %>.<%= style %> file.
+   */
+  return (
+    <<%= wrapper %><% if (style !== 'none') {%> className={styles.page}<% } %>>
+      <%- appContent %>
+    </<%= wrapper %>>
+  );
+};

package/dist/src/generators/application/files/common/__dot__babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["@nx/next/babel"],
+  "plugins": []
+}

package/{src → dist/src}/generators/application/files/common/index.d.ts__tmpl__

@@ -4,10 +4,3 @@ declare module '*.svg' {
   export const ReactComponent: any;
   export default content;
 }
-
-<% if (style === 'less') { %>
-declare module '*.module.less' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-<% } %>

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

@@ -0,0 +1,31 @@
+//@ts-check
+<% if (addPlugin) { -%>
+
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  // Next.js options go here
+  // See: https://nextjs.org/docs/app/api-reference/config/next-config-js
+};
+
+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/{src → dist/src}/generators/application/files/common/tsconfig.json__tmpl__

@@ -2,7 +2,6 @@
   "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
     "jsx": "preserve",
-    <% if (style === '@emotion/styled') { %>"jsxImportSource": "@emotion/react",<% } %>
     "strict": true,
     "noEmit": true,
     "emitDeclarationOnly": false,

package/dist/src/generators/application/files/pages/__fileName__.tsx__tmpl__

@@ -0,0 +1,18 @@
+<%_ if (style !== 'none') { var wrapper = 'div'; _%>
+import styles from './<%= fileName %>.module.<%= style %>';
+<% } else { var wrapper = 'div'; } %>
+
+export function Index() {
+  /*
+   * Replace the elements below with your own.
+   *
+   * Note: The corresponding styles are in the ./<%= fileName %>.<%= style %> file.
+   */
+  return (
+    <<%= wrapper %><% if (style !== 'none') {%> className={styles.page}<% } %>>
+      <%- appContent %>
+    </<%= wrapper %>>
+  );
+}
+
+export default Index;

package/{src → dist/src}/generators/application/lib/add-e2e.d.ts

@@ -1,4 +1,3 @@
 import { Tree, GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
 export declare function addE2e(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-e2e.d.ts.map

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

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
-const version_utils_1 = require("../../../utils/version-utils");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     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 forceWebpack = options.style === 'less' && (await (0, version_utils_1.isNext16)(host));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         if (!hasPlugin) {
@@ -56,7 +54,7 @@ async function addE2e(host, options) {
             baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             jsx: true,
             webServerCommands: {
-                default: `${e2eWebServerInfo.e2eWebServerCommand}${forceWebpack ? ' --webpack' : ''}`,
+                default: e2eWebServerInfo.e2eWebServerCommand,
             },
             ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
@@ -98,7 +96,7 @@ async function addE2e(host, options) {
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
             webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
-            webServerCommand: `${e2eWebServerInfo.e2eWebServerCommand}${forceWebpack ? ' --webpack' : ''}`,
+            webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
             addPlugin: options.addPlugin,
         });
         return e2eTask;
@@ -109,11 +107,11 @@ async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPlug
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = isPluginBeingAdded ? 3000 : 4200;
     const defaultServeTarget = isPluginBeingAdded ? 'dev' : 'serve';
-    if (nxJson.targetDefaults?.[defaultServeTarget] &&
-        nxJson.targetDefaults?.[defaultServeTarget].options?.port) {
-        e2ePort = nxJson.targetDefaults?.[defaultServeTarget].options?.port;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)(defaultServeTarget, nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port) {
+        e2ePort = serveTargetOptions.port;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/next/plugin',
         serveTargetName: 'devTargetName',
         serveStaticTargetName: 'startTargetName',

package/{src → dist/src}/generators/application/lib/add-jest.d.ts

@@ -1,4 +1,3 @@
 import { Tree, GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
 export declare function addJest(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-jest.d.ts.map

package/{src → dist/src}/generators/application/lib/add-linting.d.ts

@@ -1,4 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
 export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-linting.d.ts.map