@nx/next 22.0.0-beta.2 → 22.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "22.0.0-beta.2",
+  "version": "22.0.0-beta.3",
   "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": "22.0.0-beta.2",
+    "@nx/devkit": "22.0.0-beta.3",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,15 +44,17 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "22.0.0-beta.2",
-    "@nx/eslint": "22.0.0-beta.2",
-    "@nx/react": "22.0.0-beta.2",
-    "@nx/web": "22.0.0-beta.2",
-    "@nx/webpack": "22.0.0-beta.2",
+    "@nx/js": "22.0.0-beta.3",
+    "@nx/eslint": "22.0.0-beta.3",
+    "@nx/react": "22.0.0-beta.3",
+    "@nx/web": "22.0.0-beta.3",
+    "@nx/webpack": "22.0.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.2"
+    "@nx/cypress": "22.0.0-beta.3",
+    "@nx/playwright": "22.0.0-beta.3",
+    "nx": "22.0.0-beta.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/library/lib/update-vite-config.d.ts

@@ -0,0 +1,15 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Updates a Vite config to support multiple entry points for Next.js libraries.
+ * Transforms:
+ * 1. entry: 'src/index.ts' -> entry: { index: 'src/index.ts', server: 'src/server.ts' }
+ * 2. fileName: 'index' -> fileName: (format, entryName) => `${entryName}.js`
+ *
+ * Note: We know the shape of the vite config that is being generated, therefore string manipulation is fine
+ *
+ * @param tree - The file system tree
+ * @param viteConfigPath - Path to the vite.config.ts file
+ * @returns true if the config was updated, false otherwise
+ */
+export declare function updateViteConfigForServerEntry(tree: Tree, viteConfigPath: string): boolean;
+//# sourceMappingURL=update-vite-config.d.ts.map

package/src/generators/library/lib/update-vite-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-vite-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/library/lib/update-vite-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,GACrB,OAAO,CA4BT"}

package/src/generators/library/lib/update-vite-config.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateViteConfigForServerEntry = updateViteConfigForServerEntry;
+/**
+ * Updates a Vite config to support multiple entry points for Next.js libraries.
+ * Transforms:
+ * 1. entry: 'src/index.ts' -> entry: { index: 'src/index.ts', server: 'src/server.ts' }
+ * 2. fileName: 'index' -> fileName: (format, entryName) => `${entryName}.js`
+ *
+ * Note: We know the shape of the vite config that is being generated, therefore string manipulation is fine
+ *
+ * @param tree - The file system tree
+ * @param viteConfigPath - Path to the vite.config.ts file
+ * @returns true if the config was updated, false otherwise
+ */
+function updateViteConfigForServerEntry(tree, viteConfigPath) {
+    if (!tree.exists(viteConfigPath)) {
+        return false;
+    }
+    const viteConfigContent = tree.read(viteConfigPath, 'utf-8');
+    // Replace single entry string with multiple entry object
+    const updatedViteConfig = viteConfigContent
+        .replace(/entry:\s*['"]src\/index\.ts['"]/, `entry: {
+        index: 'src/index.ts',
+        server: 'src/server.ts',
+      }`)
+        .replace(/fileName:\s*['"]index['"]/, `fileName: (format, entryName) => \`\${entryName}.js\``);
+    // Only write if changes were made
+    if (updatedViteConfig !== viteConfigContent) {
+        tree.write(viteConfigPath, updatedViteConfig);
+        return true;
+    }
+    return false;
+}

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;AAWlC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAMpE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAuJ5E;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;AAalC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAMpE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA+L5E;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -8,6 +8,7 @@ const js_1 = require("@nx/js");
 const versions_1 = require("@nx/react/src/utils/versions");
 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");
@@ -61,14 +62,41 @@ async function libraryGeneratorInternal(host, rawOptions) {
     host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src', `server.${options.js ? 'js' : 'ts'}`), `// Use this file to export React server components
     export * from './lib/hello-server';`);
     host.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', `hello-server.${options.js ? 'js' : 'tsx'}`), `// React server components are async so you make database or API calls.
-      export async function HelloServer() {
-        return <h1>Hello Server</h1>
-      }
-    `);
+export async function HelloServer() {
+  return <h1>Hello Server</h1>;
+}
+`);
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     if (!options.skipTsConfig && !isTsSolutionSetup) {
         (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
     }
+    // Configure Vite and package.json for server entry point when using Vite bundler
+    if (options.bundler === 'vite') {
+        // Update vite.config.ts to support multiple entry points
+        const viteConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'vite.config.ts');
+        (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, ts_solution_setup_1.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.json'), (json) => {
         if (options.style === '@emotion/styled') {
             json.compilerOptions.jsxImportSource = '@emotion/react';

package/src/plugins/plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes, CreateNodesV2 } from '@nx/devkit';
+import { CreateDependencies, CreateNodesV2 } from '@nx/devkit';
 export interface NextPluginOptions {
     buildTargetName?: string;
     devTargetName?: string;
@@ -14,10 +14,6 @@ export interface NextPluginOptions {
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
 export declare const createDependencies: CreateDependencies;
+export declare const createNodes: CreateNodesV2<NextPluginOptions>;
 export declare const createNodesV2: CreateNodesV2<NextPluginOptions>;
-/**
- * @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
- * This function will change to the v2 function in Nx 21.
- */
-export declare const createNodes: CreateNodes<NextPluginOptions>;
 //# sourceMappingURL=plugin.d.ts.map

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,EAClB,WAAW,EAGX,aAAa,EAQd,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;AAuBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,iBAAiB,CA0B1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,iBAAiB,CAsBtD,CAAC"}
+{"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;AAuBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CA0BxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createNodesV2 = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
 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");
@@ -31,7 +31,7 @@ const createDependencies = () => {
     return [];
 };
 exports.createDependencies = createDependencies;
-exports.createNodesV2 = [
+exports.createNodes = [
     nextConfigBlob,
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
@@ -46,23 +46,7 @@ exports.createNodesV2 = [
         }
     },
 ];
-/**
- * @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
- * This function will change to the v2 function in Nx 21.
- */
-exports.createNodes = [
-    nextConfigBlob,
-    async (configFilePath, options, context) => {
-        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 21, this will change to the createNodesV2 API.');
-        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)();
-        const result = await createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup);
-        writeTargetsToCache(cachePath, targetsCache);
-        return result;
-    },
-];
+exports.createNodesV2 = exports.createNodes;
 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.