@nx/next 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "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.11",
+    "@nx/devkit": "23.0.0-beta.13",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "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.11",
-    "@nx/eslint": "23.0.0-beta.11",
-    "@nx/react": "23.0.0-beta.11",
-    "@nx/web": "23.0.0-beta.11",
-    "@nx/webpack": "23.0.0-beta.11",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/react": "23.0.0-beta.13",
+    "@nx/web": "23.0.0-beta.13",
+    "@nx/webpack": "23.0.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "devDependencies": {
-    "@nx/cypress": "23.0.0-beta.11",
-    "@nx/playwright": "23.0.0-beta.11",
-    "nx": "23.0.0-beta.11"
+    "@nx/cypress": "23.0.0-beta.13",
+    "@nx/playwright": "23.0.0-beta.13",
+    "nx": "23.0.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/plugins/component-testing.js

@@ -4,7 +4,7 @@ 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 devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const react_1 = require("@nx/react");
 const webpack_1 = require("@nx/webpack");
 const configuration_1 = require("nx/src/config/configuration");
@@ -69,7 +69,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_1.getProjectSourceRoot)(ctProjectConfig),
         main: '',
         useTsconfigPaths: undefined,
         fileReplacements: buildFileReplacements,

package/src/generators/application/application.js

@@ -19,8 +19,7 @@ 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 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 internal_2 = 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");
 async function applicationGenerator(host, schema) {
@@ -32,7 +31,7 @@ async function applicationGenerator(host, schema) {
 }
 async function applicationGeneratorInternal(host, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: schema.js,
         skipPackageJson: schema.skipPackageJson,
@@ -53,7 +52,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_2.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
@@ -91,14 +90,14 @@ async function applicationGeneratorInternal(host, schema) {
         }
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, devDependencies));
     }
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.json', {
+    (0, internal_2.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_2.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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":"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"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAIA,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

@@ -107,9 +107,9 @@ 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, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/next/plugin',

package/src/generators/application/lib/create-application-files.js

@@ -5,13 +5,13 @@ const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const create_application_files_helpers_1 = require("./create-application-files.helpers");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const version_utils_1 = require("../../../utils/version-utils");
 async function createApplicationFiles(host, options) {
     const offsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     const layoutTypeSrcPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.appProjectRoot, '.next/types/**/*.ts');
     const layoutTypeDistPath = (0, devkit_1.joinPathFragments)(offsetFromRoot, options.outputPath, '.next/types/**/*.ts');
-    const rootPath = options.rootProject || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)
+    const rootPath = options.rootProject || (0, internal_1.isUsingTsSolutionSetup)(host)
         ? options.src
             ? 'src/'
             : options.appDir
@@ -33,7 +33,7 @@ async function createApplicationFiles(host, options) {
         styleContent: (0, create_application_files_helpers_1.createStyleRules)(),
         pageStyleContent: `.page {}`,
         stylesExt: 'css',
-        isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionSetup: (0, internal_1.isUsingTsSolutionSetup)(host),
         isNext16: await (0, version_utils_1.isNext16)(host),
     };
     const generatedAppFilePath = options.src

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 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");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -18,7 +18,7 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    const isTsSolutionSetup = options.useTsSolution || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = options.useTsSolution || (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;

package/src/generators/custom-server/custom-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-server.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/custom-server/custom-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAUrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,uBA4I5B"}
+{"version":3,"file":"custom-server.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/custom-server/custom-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAYrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,uBAgJ5B"}

package/src/generators/custom-server/custom-server.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customServerGenerator = customServerGenerator;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_2 = require("@nx/devkit");
 const path_1 = require("path");
 const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function customServerGenerator(host, options) {
     const project = (0, devkit_2.readProjectConfiguration)(host, options.project);
     const swcServerName = '.server.swcrc';
@@ -39,7 +40,7 @@ async function customServerGenerator(host, options) {
         ? `../../${(0, devkit_2.offsetFromRoot)(project.root)}${project.root}`
         : `${(0, devkit_2.offsetFromRoot)(`dist/${project.root}`)}${project.root}`;
     const offset = (0, devkit_2.offsetFromRoot)(project.root);
-    const isTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolution = (0, internal_2.isUsingTsSolutionSetup)(host);
     (0, devkit_2.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, {
         ...options,
         hasPlugin,
@@ -101,11 +102,14 @@ async function customServerGenerator(host, options) {
             json.tasksRunnerOptions?.default?.options?.cacheableOperations) {
             json.tasksRunnerOptions.default.options.cacheableOperations.push('build-custom-server');
         }
-        json.targetDefaults ??= {};
-        json.targetDefaults['build-custom-server'] ??= {};
-        json.targetDefaults['build-custom-server'].cache ??= true;
         return json;
     });
+    const updatedNxJson = (0, devkit_2.readNxJson)(host) ?? {};
+    (0, internal_1.upsertTargetDefault)(host, updatedNxJson, {
+        target: 'build-custom-server',
+        cache: true,
+    });
+    (0, devkit_2.updateNxJson)(host, updatedNxJson);
     if (options.compiler === 'swc') {
         // Update app swc to exlude server files
         (0, devkit_2.updateJson)(host, (0, path_1.join)(project.root, '.swcrc'), (json) => {

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const react_1 = require("@nx/react");
 const ct_utils_1 = require("@nx/react/src/utils/ct-utils");
 const path_1 = require("path");
@@ -100,7 +100,7 @@ ${isUsingTailwind
 `);
     if (opts.generateTests) {
         const filePaths = [];
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+        const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
         (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot, (filePath) => {
             const fromProjectRootPath = (0, path_1.relative)(projectConfig.root, filePath);
             // we don't generate tests for pages/server-side/appDir components

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'library');
     const { projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -16,7 +16,7 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         importPath,

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

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAalC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAMpE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAoL5E;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAYlC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAMpE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAoL5E;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -10,8 +10,7 @@ const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const update_vite_config_1 = require("./lib/update-vite-config");
 const versions_2 = require("../../utils/versions");
-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 internal_1 = require("@nx/js/internal");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -21,7 +20,7 @@ async function libraryGenerator(host, rawOptions) {
 }
 async function libraryGeneratorInternal(host, rawOptions) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, rawOptions.addPlugin);
+    const addTsPlugin = (0, internal_1.shouldConfigureTsSolutionSetup)(host, rawOptions.addPlugin);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: rawOptions.js,
         addTsPlugin,
@@ -66,7 +65,7 @@ export async function HelloServer() {
   return <h1>Hello Server</h1>;
 }
 `);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(host);
     if (!options.skipTsConfig && !isTsSolutionSetup) {
         (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
     }
@@ -86,7 +85,7 @@ export async function HelloServer() {
                 const serverExport = {};
                 // For TS Solution setups, include development condition
                 if (isTsSolutionSetup) {
-                    const customConditionName = (0, ts_solution_setup_1.getDefinedCustomConditionName)(host);
+                    const customConditionName = (0, internal_1.getDefinedCustomConditionName)(host);
                     serverExport[customConditionName] = './src/server.ts';
                 }
                 serverExport.types = './dist/server.d.ts';
@@ -113,7 +112,7 @@ export async function HelloServer() {
         ];
         return json;
     });
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+    (0, internal_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
@@ -121,9 +120,9 @@ export async function HelloServer() {
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
+    (0, internal_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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":"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"}
+{"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;AAWpB,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

@@ -4,8 +4,7 @@ exports.createNodesV2 = exports.createNodes = exports.createDependencies = void
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
@@ -24,7 +23,7 @@ exports.createNodes = [
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `next-${optionsHash}.json`);
         const targetsCache = new internal_1.PluginCache(cachePath);
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -68,7 +67,7 @@ async function buildNextTargets(nextConfigPath, projectRoot, options, context, i
     const startTarget = getStartTargetConfig(options, projectRoot);
     targets[options.startTargetName] = startTarget;
     targets[options.serveStaticTargetName] = startTarget;
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig, isTsSolutionSetup) {

package/src/utils/add-swc-to-custom-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-swc-to-custom-server.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/add-swc-to-custom-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAKL,MAAM,YAAY,CAAC;AASpB,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,aAAa,SAAW,EACxB,gBAAgB,GAAE,MAAM,EAAO,cAyBhC"}
+{"version":3,"file":"add-swc-to-custom-server.d.ts","sourceRoot":"","sources":["../../../../../packages/next/src/utils/add-swc-to-custom-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAKL,MAAM,YAAY,CAAC;AAQpB,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,aAAa,SAAW,EACxB,gBAAgB,GAAE,MAAM,EAAO,cAyBhC"}

package/src/utils/add-swc-to-custom-server.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureForSwc = configureForSwc;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
+const internal_1 = require("@nx/js/internal");
 function configureForSwc(tree, projectRoot, swcConfigName = '.swcrc', additonalExludes = []) {
     const swcConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, swcConfigName);
     const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
@@ -13,7 +12,7 @@ function configureForSwc(tree, projectRoot, swcConfigName = '.swcrc', additonalE
         rootPackageJson.devDependencies?.['@swc/cli'];
     if (!tree.exists(swcConfigPath)) {
         // We need to create a swc config file specific for custom server
-        (0, add_swc_config_1.addSwcConfig)(tree, projectRoot, 'commonjs', false, swcConfigName, [
+        (0, internal_1.addSwcConfig)(tree, projectRoot, 'commonjs', false, swcConfigName, [
             ...additonalExludes,
             '.*.d.ts$',
         ]);
@@ -25,10 +24,10 @@ function configureForSwc(tree, projectRoot, swcConfigName = '.swcrc', additonalE
 }
 function addSwcDependencies(tree) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        '@swc/helpers': versions_1.swcHelpersVersion,
+        '@swc/helpers': internal_1.swcHelpersVersion,
     }, {
-        '@swc-node/register': versions_1.swcNodeVersion,
-        '@swc/cli': versions_1.swcCliVersion,
-        '@swc/core': versions_1.swcCoreVersion,
+        '@swc-node/register': internal_1.swcNodeVersion,
+        '@swc/cli': internal_1.swcCliVersion,
+        '@swc/core': internal_1.swcCoreVersion,
     });
 }

package/tailwind.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;
-const generate_globs_1 = require("@nx/js/src/utils/generate-globs");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 let hasWarned = false;
 /**
@@ -23,8 +23,8 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPatternToInclude = '
         if (majorVersion >= 4) {
             try {
                 return [
-                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
-                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
+                    ...(0, internal_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
+                    ...(0, internal_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
                 ];
             }
             catch (e) {
@@ -44,7 +44,7 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPatternToInclude = '
         }
         else {
             try {
-                return (0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude);
+                return (0, internal_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude);
             }
             catch (e) {
                 /**