@nx/next 23.2.1 → 23.3.0-beta.1

package/dist/src/generators/library/lib/add-rollup-server-entry.d.ts

@@ -0,0 +1,8 @@
+import { Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './normalize-options';
+/**
+ * Adds the server entry (`src/server.ts`, or `src/server.js` with `--js`) as a
+ * second Rollup entry so React Server Components are bundled separately from
+ * the client entry.
+ */
+export declare function addRollupServerEntry(tree: Tree, options: NormalizedSchema): void;

package/dist/src/generators/library/lib/add-rollup-server-entry.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addRollupServerEntry = addRollupServerEntry;
+const devkit_1 = require("@nx/devkit");
+/**
+ * Adds the server entry (`src/server.ts`, or `src/server.js` with `--js`) as a
+ * second Rollup entry so React Server Components are bundled separately from
+ * the client entry.
+ */
+function addRollupServerEntry(tree, options) {
+    const serverEntry = `src/server.${options.js ? 'js' : 'ts'}`;
+    const rollupConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'rollup.config.cjs');
+    if (tree.exists(rollupConfigPath)) {
+        const content = tree.read(rollupConfigPath, 'utf-8');
+        const updated = content.replace(/^(\s*)main: .*\n/m, (line, indent) => line + `${indent}additionalEntryPoints: ['./${serverEntry}'],\n`);
+        if (updated === content) {
+            throw new Error(`Could not add the server entry to ${rollupConfigPath}: "main" option not found.`);
+        }
+        tree.write(rollupConfigPath, updated);
+        return;
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+    const build = project.targets?.build;
+    if (build?.executor !== '@nx/rollup:rollup') {
+        throw new Error(`Could not add the server entry to the "build" target of "${options.projectName}": expected the @nx/rollup:rollup executor.`);
+    }
+    build.options.additionalEntryPoints = [
+        (0, devkit_1.joinPathFragments)(options.projectRoot, serverEntry),
+    ];
+    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
+}

package/dist/src/generators/library/lib/normalize-options.d.ts

@@ -4,6 +4,7 @@ import type { LinterType } from '@nx/js';
 export interface NormalizedSchema extends Schema {
     linter: LinterType;
     importPath: string;
+    projectName: string;
     projectRoot: string;
     isUsingTsSolutionConfig: boolean;
 }

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

@@ -6,7 +6,7 @@ const internal_1 = require("@nx/devkit/internal");
 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, {
+    const { projectName, projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -23,6 +23,8 @@ async function normalizeOptions(host, options) {
         // `=== 'eslint'`, and an unresolved `undefined` would skip all of it.
         linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         importPath,
+        // Same rule as the React library generator, which registers the project.
+        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectRoot,
         isUsingTsSolutionConfig,
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,

package/dist/src/generators/library/library.js

@@ -10,6 +10,7 @@ const init_1 = require("../init/init");
 const assert_supported_next_version_1 = require("../../utils/assert-supported-next-version");
 const normalize_options_1 = require("./lib/normalize-options");
 const update_vite_config_1 = require("./lib/update-vite-config");
+const add_rollup_server_entry_1 = require("./lib/add-rollup-server-entry");
 const versions_1 = require("../../utils/versions");
 const internal_2 = require("@nx/js/internal");
 async function libraryGenerator(host, rawOptions) {
@@ -67,10 +68,25 @@ export async function HelloServer() {
     if (!options.skipTsConfig && !isTsSolutionSetup) {
         (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
     }
-    const isBuildable = (options.bundler && options.bundler !== 'none') ||
-        options.buildable ||
-        options.publishable;
-    if (isTsSolutionSetup && !isBuildable) {
+    // The React library generator defaults buildable and publishable libraries to Rollup.
+    const bundler = options.bundler && options.bundler !== 'none'
+        ? options.bundler
+        : options.buildable || options.publishable
+            ? 'rollup'
+            : 'none';
+    if (bundler === 'vite') {
+        (0, update_vite_config_1.updateViteConfigForServerEntry)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'vite.config.mts'));
+        addServerExport(host, options, './dist/server.js');
+    }
+    else if (bundler === 'rollup') {
+        (0, add_rollup_server_entry_1.addRollupServerEntry)(host, options);
+        if (isTsSolutionSetup) {
+            // Other setups publish no exports field, and introducing one would close
+            // every other subpath of the package.
+            addServerExport(host, options, './dist/server.esm.js');
+        }
+    }
+    else if (bundler === 'none' && isTsSolutionSetup) {
         // Non-buildable libs resolve `.` straight to source, so `./server` does the same.
         const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
         if (host.exists(packageJsonPath)) {
@@ -88,33 +104,6 @@ export async function HelloServer() {
             });
         }
     }
-    // Configure Vite and package.json for server entry point when using Vite bundler
-    if (options.bundler === 'vite') {
-        // Update vite.config.mts to support multiple entry points
-        const viteConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'vite.config.mts');
-        (0, update_vite_config_1.updateViteConfigForServerEntry)(host, viteConfigPath);
-        // Update package.json to include server export
-        const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
-        if (host.exists(packageJsonPath)) {
-            (0, devkit_1.updateJson)(host, packageJsonPath, (json) => {
-                if (!json.exports) {
-                    json.exports = {};
-                }
-                // Add server export
-                const serverExport = {};
-                // For TS Solution setups, include development condition
-                if (isTsSolutionSetup) {
-                    const customConditionName = (0, internal_2.getDefinedCustomConditionName)(host);
-                    serverExport[customConditionName] = './src/server.ts';
-                }
-                serverExport.types = './dist/server.d.ts';
-                serverExport.import = './dist/server.js';
-                serverExport.default = './dist/server.js';
-                json.exports['./server'] = serverExport;
-                return json;
-            });
-        }
-    }
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'), (json) => {
         if (!json.compilerOptions) {
             json.compilerOptions = {
@@ -147,4 +136,27 @@ export async function HelloServer() {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function addServerExport(host, options, distFile) {
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
+    if (!host.exists(packageJsonPath)) {
+        return;
+    }
+    (0, devkit_1.updateJson)(host, packageJsonPath, (json) => {
+        json.exports ??= {};
+        const serverExport = {};
+        if (options.isUsingTsSolutionConfig) {
+            const customConditionName = (0, internal_2.getDefinedCustomConditionName)(host);
+            if (customConditionName) {
+                serverExport[customConditionName] = `./src/server.${options.js ? 'js' : 'ts'}`;
+            }
+        }
+        // Both bundlers name the declaration after the entry, without the format
+        // suffix the JavaScript output carries.
+        serverExport.types = './dist/server.d.ts';
+        serverExport.import = distFile;
+        serverExport.default = distFile;
+        json.exports['./server'] = serverExport;
+        return json;
+    });
+}
 exports.default = libraryGenerator;

package/dist/src/plugins/plugin.js

@@ -74,8 +74,8 @@ async function buildNextTargets(nextConfigPath, projectRoot, options, context, i
     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);
-    const startTarget = getStartTargetConfig(options, projectRoot);
+    targets[options.devTargetName] = getDevTargetConfig(namedInputs, projectRoot, isTsSolutionSetup);
+    const startTarget = getStartTargetConfig(namedInputs, options, projectRoot);
     targets[options.startTargetName] = startTarget;
     targets[options.serveStaticTargetName] = startTarget;
     (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
@@ -104,20 +104,21 @@ async function getBuildTargetConfig(namedInputs, projectRoot, nextConfig, isTsSo
     }
     return targetConfig;
 }
-function getDevTargetConfig(projectRoot, isTsSolutionSetup) {
+function getDevTargetConfig(namedInputs, projectRoot, isTsSolutionSetup) {
     const targetConfig = {
         continuous: true,
         command: `next dev`,
         options: {
             cwd: projectRoot,
         },
+        inputs: getInputs(namedInputs),
     };
     if (isTsSolutionSetup) {
         targetConfig.syncGenerators = ['@nx/js:typescript-sync'];
     }
     return targetConfig;
 }
-function getStartTargetConfig(options, projectRoot) {
+function getStartTargetConfig(namedInputs, options, projectRoot) {
     const targetConfig = {
         continuous: true,
         command: `next start`,
@@ -125,6 +126,7 @@ function getStartTargetConfig(options, projectRoot) {
             cwd: projectRoot,
         },
         dependsOn: [options.buildTargetName],
+        inputs: getInputs(namedInputs),
     };
     return targetConfig;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "23.2.1",
+  "version": "23.3.0-beta.1",
   "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": {
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "next": ">=14.0.0 <17.0.0",
-    "@nx/webpack": "23.2.1"
+    "@nx/webpack": "23.3.0-beta.1"
   },
   "peerDependenciesMeta": {
     "@nx/webpack": {
@@ -83,18 +83,19 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.2.1",
-    "@nx/js": "23.2.1",
-    "@nx/eslint": "23.2.1",
-    "@nx/react": "23.2.1",
-    "@nx/web": "23.2.1"
+    "@nx/devkit": "23.3.0-beta.1",
+    "@nx/js": "23.3.0-beta.1",
+    "@nx/eslint": "23.3.0-beta.1",
+    "@nx/react": "23.3.0-beta.1",
+    "@nx/web": "23.3.0-beta.1"
   },
   "devDependencies": {
-    "@nx/cypress": "23.2.1",
-    "@nx/playwright": "23.2.1",
-    "@nx/vitest": "23.2.1",
-    "@nx/webpack": "23.2.1",
-    "nx": "23.2.1"
+    "next": "15.5.25",
+    "@nx/cypress": "23.3.0-beta.1",
+    "@nx/playwright": "23.3.0-beta.1",
+    "@nx/vitest": "23.3.0-beta.1",
+    "@nx/webpack": "23.3.0-beta.1",
+    "nx": "23.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"