@nx/next 21.3.4 → 21.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "21.3.4",
+  "version": "21.3.6",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "21.3.4",
+    "@nx/devkit": "21.3.6",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "21.3.4",
-    "@nx/eslint": "21.3.4",
-    "@nx/react": "21.3.4",
-    "@nx/web": "21.3.4",
-    "@nx/webpack": "21.3.4",
+    "@nx/js": "21.3.6",
+    "@nx/eslint": "21.3.6",
+    "@nx/react": "21.3.6",
+    "@nx/web": "21.3.6",
+    "@nx/webpack": "21.3.6",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/plugins/plugin.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const fs_1 = require("fs");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const js_1 = require("@nx/js");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const devkit_internals_1 = require("nx/src/devkit-internals");
+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");
+const fs_1 = require("fs");
+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 pmc = (0, devkit_1.getPackageManagerCommand)();
 const nextConfigBlob = '**/next.config.{ts,js,cjs,mjs}';
 function readTargetsCache(cachePath) {
@@ -36,8 +37,9 @@ exports.createNodesV2 = [
         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 isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup), configFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -55,12 +57,13 @@ 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 = readTargetsCache(cachePath);
-        const result = await createNodesInternal(configFilePath, options, context, targetsCache);
+        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const result = await createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup);
         writeTargetsToCache(cachePath, targetsCache);
         return result;
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
     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));
@@ -70,7 +73,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     }
     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);
+    targetsCache[hash] ??= await buildNextTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup);
     return {
         projects: {
             [projectRoot]: {
@@ -80,19 +83,19 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function buildNextTargets(nextConfigPath, projectRoot, options, context) {
+async function buildNextTargets(nextConfigPath, projectRoot, options, context, isTsSolutionSetup) {
     const nextConfig = await getNextConfig(nextConfigPath, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
-    targets[options.buildTargetName] = await getBuildTargetConfig(namedInputs, projectRoot, nextConfig);
-    targets[options.devTargetName] = getDevTargetConfig(projectRoot);
+    targets[options.buildTargetName] = await getBuildTargetConfig(namedInputs, projectRoot, nextConfig, isTsSolutionSetup);
+    targets[options.devTargetName] = getDevTargetConfig(projectRoot, isTsSolutionSetup);
     const startTarget = getStartTargetConfig(options, projectRoot);
     targets[options.startTargetName] = startTarget;
     targets[options.serveStaticTargetName] = startTarget;
     (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
-async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig) {
+async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig, isTsSolutionSetup) {
     const nextOutputPath = await getOutputs(projectRoot, nextConfig);
     // Set output path here so that `withNx` can pick it up.
     const targetConfig = {
@@ -108,9 +111,12 @@ async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig) {
     // TODO(ndcunningham): Update this to be consider different versions of next.js which is running
     // This doesn't actually need to be tty, but next.js has a bug, https://github.com/vercel/next.js/issues/62906, where it exits 0 when SIGINT is sent.
     targetConfig.options.tty = false;
+    if (isTsSolutionSetup) {
+        targetConfig.syncGenerators = ['@nx/js:typescript-sync'];
+    }
     return targetConfig;
 }
-function getDevTargetConfig(projectRoot) {
+function getDevTargetConfig(projectRoot, isTsSolutionSetup) {
     const targetConfig = {
         continuous: true,
         command: `next dev`,
@@ -118,6 +124,9 @@ function getDevTargetConfig(projectRoot) {
             cwd: projectRoot,
         },
     };
+    if (isTsSolutionSetup) {
+        targetConfig.syncGenerators = ['@nx/js:typescript-sync'];
+    }
     return targetConfig;
 }
 function getStartTargetConfig(options, projectRoot) {