@nx/next 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.7",
   "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": {
@@ -36,7 +36,7 @@
     "next": ">=14.0.0 <17.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.5",
+    "@nx/devkit": "23.0.0-beta.7",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^14.0.0",
@@ -44,17 +44,17 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "23.0.0-beta.5",
-    "@nx/eslint": "23.0.0-beta.5",
-    "@nx/react": "23.0.0-beta.5",
-    "@nx/web": "23.0.0-beta.5",
-    "@nx/webpack": "23.0.0-beta.5",
-    "@phenomnomnominal/tsquery": "~6.1.4"
+    "@nx/js": "23.0.0-beta.7",
+    "@nx/eslint": "23.0.0-beta.7",
+    "@nx/react": "23.0.0-beta.7",
+    "@nx/web": "23.0.0-beta.7",
+    "@nx/webpack": "23.0.0-beta.7",
+    "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "devDependencies": {
-    "@nx/cypress": "23.0.0-beta.5",
-    "@nx/playwright": "23.0.0-beta.5",
-    "nx": "23.0.0-beta.5"
+    "@nx/cypress": "23.0.0-beta.7",
+    "@nx/playwright": "23.0.0-beta.7",
+    "nx": "23.0.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/build/build.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAQ5D,wBAA8B,aAAa,CACzC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;GAoGzB"}
+{"version":3,"file":"build.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAQ5D,wBAA8B,aAAa,CACzC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;GAoGzB"}

package/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");
@@ -30,7 +29,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/executors/server/server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAEL,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAQ3B,wBAA+B,aAAa,CAC1C,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;cAqHzB"}
+{"version":3,"file":"server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAEL,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAO3B,wBAA+B,aAAa,CAC1C,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe;;;cAqHzB"}

package/src/executors/server/server.impl.js

@@ -2,12 +2,12 @@
 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 runtime_version_utils_1 = require("../../utils/runtime-version-utils");
 async function* serveExecutor(options, context) {
@@ -64,7 +64,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,

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAuBlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkH5E"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAsBlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkH5E"}

package/src/generators/application/application.js

@@ -2,6 +2,7 @@
 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 js_1 = require("@nx/js");
 const versions_1 = require("@nx/react/src/utils/versions");
@@ -18,7 +19,6 @@ 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 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 add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
@@ -103,7 +103,7 @@ async function applicationGeneratorInternal(host, schema) {
         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/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACJ,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA8H5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,IAAI,EACJ,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA8H5B"}

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

@@ -1,8 +1,8 @@
 "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");
 async function addE2e(host, options) {
@@ -111,7 +111,7 @@ async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPlug
         nxJson.targetDefaults?.[defaultServeTarget].options?.port) {
         e2ePort = nxJson.targetDefaults?.[defaultServeTarget].options?.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/generators/application/lib/add-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAOpB,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA2F/D"}
+{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAMpB,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA2F/D"}

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const versions_1 = require("../../../utils/versions");
 const react_1 = require("@nx/react");
 function addProject(host, options) {
@@ -14,7 +14,7 @@ function addProject(host, options) {
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
     if (!hasPlugin) {
-        (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/next:build');
+        (0, internal_1.addBuildTargetDefaults)(host, '@nx/next:build');
         targets.build = {
             executor: '@nx/next:build',
             outputs: ['{options.outputPath}'],

package/src/generators/application/lib/normalize-options.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const assertion_1 = require("@nx/react/src/utils/assertion");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,

package/src/generators/component/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAIjD,UAAU,MAAM;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAMD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDA0BnE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAIjD,UAAU,MAAM;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAMD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDA0BnE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/component/component.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const react_1 = require("@nx/react");
 const styles_1 = require("../../utils/styles");
 /*
@@ -12,7 +12,7 @@ const styles_1 = require("../../utils/styles");
 async function componentGenerator(host, options) {
     // we only need to provide the path to get the project, we let the react
     // generator handle the rest
-    const { project: projectName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { project: projectName } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
     });
     const componentInstall = await (0, react_1.componentGenerator)(host, {

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
 const devkit_1 = require("@nx/devkit");
-const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
+const internal_1 = require("@nx/devkit/internal");
 const plugin_1 = require("../../plugins/plugin");
 const build_post_target_transformer_1 = require("./lib/build-post-target-transformer");
 const serve_post_target_tranformer_1 = require("./lib/serve-post-target-tranformer");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migrationLogs = new aggregate_log_util_1.AggregatedLog();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/next/plugin', plugin_1.createNodesV2, {
+    const migrationLogs = new internal_1.AggregatedLog();
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/next/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         devTargetName: 'dev',
         startTargetName: 'start',
@@ -32,7 +31,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts

@@ -1,5 +1,5 @@
 import { TargetConfiguration, Tree } from '@nx/devkit';
-import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import { AggregatedLog } from '@nx/devkit/internal';
 import { NextBuildBuilderOptions } from '../../../utils/types';
 export declare function buildPostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration<NextBuildBuilderOptions>, tree: Tree, projectDetails: {
     projectName: string;

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAK/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/D,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,CAAC,uBAAuB,CAAC,EACpD,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,kDAgEnD"}
+{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EACL,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/D,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,CAAC,uBAAuB,CAAC,EACpD,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,kDAgEnD"}

package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostTargetTransformer = buildPostTargetTransformer;
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const internal_1 = require("@nx/devkit/internal");
 const update_next_config_1 = require("./update-next-config");
 function buildPostTargetTransformer(migrationLogs) {
     return (target, tree, projectDetails, inferredTargetConfiguration) => {
@@ -27,7 +27,7 @@ function buildPostTargetTransformer(migrationLogs) {
         }
         if (target.outputs) {
             target.outputs = target.outputs.filter((out) => !out.includes('options.outputPath'));
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+            (0, internal_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -61,8 +61,8 @@ function handlePropertiesFromTargetOptions(options, projectDetails, migrationLog
     if ('fileReplacements' in options) {
         configMap['fileReplacements'] = options.fileReplacements.map(({ replace: replacePath, with: withPath }) => {
             return {
-                replace: (0, plugin_migration_utils_1.toProjectRelativePath)(replacePath, projectDetails.root),
-                with: (0, plugin_migration_utils_1.toProjectRelativePath)(withPath, projectDetails.root),
+                replace: (0, internal_1.toProjectRelativePath)(replacePath, projectDetails.root),
+                with: (0, internal_1.toProjectRelativePath)(withPath, projectDetails.root),
             };
         });
         delete options.fileReplacements;
@@ -74,8 +74,8 @@ function handlePropertiesFromTargetOptions(options, projectDetails, migrationLog
         configMap['assets'] = options.assets.map((asset) => {
             return {
                 ...asset,
-                input: (0, plugin_migration_utils_1.toProjectRelativePath)(asset.input, projectDetails.root),
-                output: (0, plugin_migration_utils_1.toProjectRelativePath)(asset.output, projectDetails.root),
+                input: (0, internal_1.toProjectRelativePath)(asset.input, projectDetails.root),
+                output: (0, internal_1.toProjectRelativePath)(asset.output, projectDetails.root),
             };
         });
         delete options.assets;

package/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.d.ts

@@ -1,7 +1,6 @@
 import { TargetConfiguration, Tree } from '@nx/devkit';
-import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import { AggregatedLog, type InferredTargetConfiguration } from '@nx/devkit/internal';
 import type { NextServeBuilderOptions } from '../../../utils/types';
-import type { InferredTargetConfiguration } from '@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator';
 export declare function servePosTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration<NextServeBuilderOptions>, _tree: Tree, projectDetails: {
     projectName: string;
     root: string;

package/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve-post-target-tranformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAC/F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;AAE3H,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,aAAa,IAElE,QAAQ,mBAAmB,CAAC,uBAAuB,CAAC,EACpD,OAAO,IAAI,EACX,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,2BAA2B,kDAoC3D"}
+{"version":3,"file":"serve-post-target-tranformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/serve-post-target-tranformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EACL,aAAa,EACb,KAAK,2BAA2B,EACjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEpE,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,aAAa,IAElE,QAAQ,mBAAmB,CAAC,uBAAuB,CAAC,EACpD,OAAO,IAAI,EACX,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,2BAA2B,kDAoC3D"}

package/src/generators/convert-to-inferred/lib/update-next-config.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import { AggregatedLog } from '@nx/devkit/internal';
 export declare function updateNextConfig(tree: Tree, updatedConfigFileContents: string, project: {
     projectName: string;
     root: string;

package/src/generators/convert-to-inferred/lib/update-next-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-next-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,OAAO,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAE/F,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,yBAAyB,EAAE,MAAM,EACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC9C,aAAa,EAAE,aAAa,QA6G7B"}
+{"version":3,"file":"update-next-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKpD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,yBAAyB,EAAE,MAAM,EACjC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC9C,aAAa,EAAE,aAAa,QA6G7B"}

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgC3C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,8BAE/D;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,8BA+CnB;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgC3C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,8BAE/D;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,8BA+CnB;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/init/init.js

@@ -35,8 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nextInitGenerator = nextInitGenerator;
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const version_utils_1 = require("@nx/react/src/utils/version-utils");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 const versions_1 = require("../../utils/versions");
@@ -65,7 +65,7 @@ async function nextInitGeneratorInternal(host, schema) {
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
         const { createNodesV2 } = await Promise.resolve().then(() => __importStar(require('../../plugins/plugin')));
-        await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/next/plugin', createNodesV2, {
+        await (0, internal_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/next/plugin', createNodesV2, {
             startTargetName: ['start', 'next:start', 'next-start'],
             buildTargetName: ['build', 'next:build', 'next-build'],
             devTargetName: ['dev', 'next:dev', 'next-dev'],

package/src/generators/library/lib/normalize-options.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

package/src/generators/page/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWlC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAuB7D;AAuDD,eAAe,aAAa,CAAC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAOlC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAuB7D;AAuDD,eAAe,aAAa,CAAC"}

package/src/generators/page/page.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pageGenerator = pageGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const react_1 = require("@nx/react");
 const devkit_1 = require("@nx/devkit");
 const styles_1 = require("../../utils/styles");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 /*
  * This schematic is basically the React component one, but for Next we need
  * extra dependencies for css, sass, less style options, and make sure
@@ -33,7 +33,7 @@ async function pageGenerator(host, schema) {
 }
 async function normalizeOptions(host, options) {
     // Get the project name first so we can determine the router directory
-    const { project: determinedProjectName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { project: determinedProjectName } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
         path: options.path,
     });
@@ -50,7 +50,7 @@ async function normalizeOptions(host, options) {
         else {
             // the user must have cd into a previously created directory, we need to
             // resolve the cwd to get it
-            const cwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
+            const cwd = (0, internal_1.getRelativeCwd)();
             if (cwd !== '.' && cwd !== '') {
                 pageSymbolName = cwd.split('/').pop();
             }
@@ -62,7 +62,7 @@ async function normalizeOptions(host, options) {
         }
     }
     const fileName = options.fileName || (isAppRouter ? 'page' : 'index');
-    const { project: projectName, filePath } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { project: projectName, filePath } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: pageSymbolName,
         path: (0, devkit_1.joinPathFragments)(options.path, `${fileName}.${options.js ? 'jsx' : 'tsx'}`),
     });

package/src/migrations/update-22-0-0/add-svgr-to-next-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-svgr-to-next-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAMV,MAAM,YAAY,CAAC;AAKpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAyQ3D"}
+{"version":3,"file":"add-svgr-to-next-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-22-0-0/add-svgr-to-next-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAMV,MAAM,YAAY,CAAC;AAIpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAyQ3D"}

package/src/migrations/update-22-0-0/add-svgr-to-next-config.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = addSvgrToNextConfig;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 async function addSvgrToNextConfig(tree) {
     const projects = new Map();
     // Find all Next.js projects using withNx that have svgr explicitly set to true or an options object
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         const nextConfigPath = `${projectConfig.root}/next.config.js`;
         if (!tree.exists(nextConfigPath))

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAOd,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAqBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/plugins/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAKd,MAAM,YAAY,CAAC;AASpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA+BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
@@ -13,16 +11,6 @@ const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
 const nextConfigBlob = '**/next.config.{ts,js,cjs,mjs}';
-function readTargetsCache(cachePath) {
-    return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
-}
-function writeTargetsToCache(cachePath, targetsCache) {
-    const oldCache = readTargetsCache(cachePath);
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...oldCache,
-        ...targetsCache,
-    });
-}
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -35,19 +23,21 @@ exports.createNodes = [
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `next-${optionsHash}.json`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -56,20 +46,22 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         return {};
     }
     options = normalizeOptions(options);
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await buildNextTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc);
+    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
+    if (!targetsCache.has(hash)) {
+        targetsCache.set(hash, await buildNextTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc));
+    }
     return {
         projects: {
             [projectRoot]: {
                 root: projectRoot,
-                targets: targetsCache[hash],
+                targets: targetsCache.get(hash),
             },
         },
     };
 }
 async function buildNextTargets(nextConfigPath, projectRoot, options, context, isTsSolutionSetup, pmc) {
     const nextConfig = await getNextConfig(nextConfigPath, context);
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     targets[options.buildTargetName] = await getBuildTargetConfig(namedInputs, projectRoot, nextConfig, isTsSolutionSetup);
     targets[options.devTargetName] = getDevTargetConfig(projectRoot, isTsSolutionSetup);
@@ -147,7 +139,7 @@ async function getOutputs(projectRoot, nextConfig) {
 }
 function getNextConfig(configFilePath, context) {
     const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
-    return (0, config_utils_1.loadConfigFile)(resolvedPath);
+    return (0, internal_1.loadConfigFile)(resolvedPath);
 }
 function normalizeOptions(options) {
     options ??= {};