@nx/next 20.0.7 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.0.7",
+  "version": "20.1.0-beta.0",
   "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": "20.0.7",
+    "@nx/devkit": "20.1.0-beta.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "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": "20.0.7",
-    "@nx/eslint": "20.0.7",
-    "@nx/react": "20.0.7",
-    "@nx/web": "20.0.7",
-    "@nx/webpack": "20.0.7",
+    "@nx/js": "20.1.0-beta.0",
+    "@nx/eslint": "20.1.0-beta.0",
+    "@nx/react": "20.1.0-beta.0",
+    "@nx/web": "20.1.0-beta.0",
+    "@nx/webpack": "20.1.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, NextPluginOptions } from './src/plugins/plugin';
+export { createNodes, createNodesV2, NextPluginOptions, } from './src/plugins/plugin';

package/plugin.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
+exports.createNodesV2 = exports.createNodes = void 0;
 var plugin_1 = require("./src/plugins/plugin");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });

package/src/executors/build/lib/create-next-config-file.js

@@ -94,7 +94,12 @@ function findNextConfigPath(dirname, userDefinedConfigPath) {
             return file;
         throw new Error(`Cannot find the Next.js config file: ${userDefinedConfigPath}. Is the path correct in project.json?`);
     }
-    const candidates = ['next.config.js', 'next.config.cjs', 'next.config.mjs'];
+    const candidates = [
+        'next.config.js',
+        'next.config.cjs',
+        'next.config.mjs',
+        'next.config.ts',
+    ];
     for (const candidate of candidates) {
         if ((0, node_fs_1.existsSync)((0, path_1.join)(dirname, candidate)))
             return candidate;

package/src/generators/application/files/app/page.tsx__tmpl__

@@ -1,19 +1,16 @@
-<% if (style !== 'none') { %>
-  <% if (styledModule && (styledModule === 'styled-jsx' || styledModule === 'styled-components'))  {%>
-  'use client';
-  <% }%> 
-  <% if (styledModule && styledModule !== 'styled-jsx') {
-    var wrapper = 'StyledPage';
-  %>import styled from '<%= styledModule %>';<% } else {
-    var wrapper = 'div';
-  %>
-    <%- (style !== 'styled-jsx' && style !== 'tailwind') ? `import styles from './page.module.${style}';` : '' %>
-  <% }
-  %>
+<%_ if (style !== 'none') { _%>
+  <%_ if (styledModule && (styledModule === 'styled-jsx' || styledModule === 'styled-components'))  { _%>
+'use client';
+  <%_ } _%> 
+  <%_ if (styledModule && styledModule !== 'styled-jsx') { var wrapper = 'StyledPage'; _%>
+import styled from '<%= styledModule %>';
+<%_ } else { var wrapper = 'div'; _%>
+<%- (style !== 'styled-jsx' && style !== 'tailwind') ? `import styles from './page.module.${style}';` : '' %>
+  <%_ } _%>
 
-  <% if (styledModule && styledModule !== 'styled-jsx') { %>
-  const StyledPage = styled.div`<%- pageStyleContent %>`;
-  <% }%>
+  <%_ if (styledModule && styledModule !== 'styled-jsx') { _%>
+const StyledPage = styled.div`<%- pageStyleContent %>`;
+  <%_ } _%>
 <% } %>
 export default function Index() {
   /*

package/src/generators/application/files/common/specs/__fileName__.spec.tsx__tmpl__

@@ -1,14 +1,14 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-<% if (src && !appDir) { %>
+<%_ if (src && !appDir) { _%>
 import Index from '../src/pages/index';
-<% } else if (!appDir) { %>
+<%_ } else if (!appDir) { _%>
 import Index from '../pages/index';
-<% } else if (appDir && src) {%>
+<%_ } else if (appDir && src) { _%>
 import Page from '../src/app/page';
-<% } else { %>
+<%_ } else { _%>
 import Page from '../app/page';
-<% } %>
+<%_ } _%>
 
 describe(<%- appDir ? `'Page'` : `'Index'` %>, () => {
   it('should render successfully', () => {

package/src/generators/application/files/pages/__fileName__.tsx__tmpl__

@@ -1,17 +1,14 @@
-<% if (style !== 'none') { %>
-  <% if (styledModule && styledModule !== 'styled-jsx') {
-    var wrapper = 'StyledPage';
-  %>import styled from '<%= styledModule %>';<% } else {
-    var wrapper = 'div';
-  %>
-    <%- (style !== 'styled-jsx' && style !== 'tailwind') ? `import styles from './${fileName}.module.${style}';` : '' %>
-  <% }
-  %>
+<%_ if (style !== 'none') { _%>
+  <%_ if (styledModule && styledModule !== 'styled-jsx') { var wrapper = 'StyledPage'; _%>
+import styled from '<%= styledModule %>';
+  <% } else { var wrapper = 'div';%>
+<%- (style !== 'styled-jsx' && style !== 'tailwind') ? `import styles from './${fileName}.module.${style}';` : '' %>
+  <%_ } _%>
 
-  <% if (styledModule && styledModule !== 'styled-jsx') { %>
-  const StyledPage = styled.div`<%- pageStyleContent %>`;
-  <% }%>
-<% } %>
+  <%_ if (styledModule && styledModule !== 'styled-jsx') { _%>
+const StyledPage = styled.div`<%- pageStyleContent %>`;
+  <%_ } _%>
+<%_ } _%>
 
 export function Index() {
   /*

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

@@ -10,7 +10,7 @@ const serve_post_target_tranformer_1 = require("./lib/serve-post-target-tranform
 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.migrateProjectExecutorsToPluginV1)(tree, projectGraph, '@nx/next/plugin', plugin_1.createNodes, {
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/next/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         devTargetName: 'dev',
         startTargetName: 'start',

package/src/generators/init/init.js

@@ -30,8 +30,8 @@ async function nextInitGeneratorInternal(host, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        const { createNodes } = await Promise.resolve().then(() => require('../../plugins/plugin'));
-        await (0, add_plugin_1.addPluginV1)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/next/plugin', createNodes, {
+        const { createNodesV2 } = await Promise.resolve().then(() => require('../../plugins/plugin'));
+        await (0, add_plugin_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/plugins/plugin.d.ts

@@ -1,9 +1,17 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateDependencies, CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface NextPluginOptions {
     buildTargetName?: string;
     devTargetName?: string;
     startTargetName?: string;
     serveStaticTargetName?: string;
 }
+/**
+ * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
+ */
 export declare const createDependencies: CreateDependencies;
+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>;

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+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");
@@ -9,46 +9,75 @@ 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 cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'next.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+const devkit_internals_1 = require("nx/src/devkit-internals");
+const nextConfigBlob = '**/next.config.{ts,js,cjs,mjs}';
+function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
+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'.
+ */
 const createDependencies = () => {
-    writeTargetsToCache();
     return [];
 };
 exports.createDependencies = createDependencies;
+exports.createNodesV2 = [
+    nextConfigBlob,
+    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);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
+        }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
+        }
+    },
+];
+/**
+ * @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 = [
-    '**/next.config.{js,cjs,mjs}',
+    nextConfigBlob,
     async (configFilePath, options, context) => {
-        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));
-        if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
-            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);
-        return {
-            projects: {
-                [projectRoot]: {
-                    root: projectRoot,
-                    targets: targetsCache[hash],
-                },
-            },
-        };
+        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 result = await createNodesInternal(configFilePath, options, context, targetsCache);
+        writeTargetsToCache(cachePath, targetsCache);
+        return result;
     },
 ];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    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));
+    if (!siblingFiles.includes('package.json') &&
+        !siblingFiles.includes('project.json')) {
+        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);
+    return {
+        projects: {
+            [projectRoot]: {
+                root: projectRoot,
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 async function buildNextTargets(nextConfigPath, projectRoot, options, context) {
     const nextConfig = await getNextConfig(nextConfigPath, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
-export declare const nextVersion = "14.2.3";
-export declare const eslintConfigNextVersion = "14.2.3";
+export declare const nextVersion = "14.2.16";
+export declare const eslintConfigNextVersion = "14.2.16";
 export declare const sassVersion = "1.62.1";
 export declare const lessLoader = "11.1.0";
 export declare const emotionServerVersion = "11.11.0";

package/src/utils/versions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.nextVersion = '14.2.3';
-exports.eslintConfigNextVersion = '14.2.3';
+exports.nextVersion = '14.2.16';
+exports.eslintConfigNextVersion = '14.2.16';
 exports.sassVersion = '1.62.1';
 exports.lessLoader = '11.1.0';
 exports.emotionServerVersion = '11.11.0';