@nx/next 20.4.0-beta.0 → 20.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.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": {
@@ -35,20 +35,20 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.4.0-beta.0",
+    "@nx/devkit": "20.4.0-beta.1",
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@svgr/webpack": "^8.0.1",
+    "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
     "file-loader": "^6.2.0",
     "ignore": "^5.0.4",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "20.4.0-beta.0",
-    "@nx/eslint": "20.4.0-beta.0",
-    "@nx/react": "20.4.0-beta.0",
-    "@nx/web": "20.4.0-beta.0",
-    "@nx/webpack": "20.4.0-beta.0",
+    "@nx/js": "20.4.0-beta.1",
+    "@nx/eslint": "20.4.0-beta.1",
+    "@nx/react": "20.4.0-beta.1",
+    "@nx/web": "20.4.0-beta.1",
+    "@nx/webpack": "20.4.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const react_1 = require("@nx/react");
 const versions_1 = require("@nx/react/src/utils/versions");
+const version_utils_1 = require("@nx/react/src/utils/version-utils");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_e2e_1 = require("./lib/add-e2e");
 const add_jest_1 = require("./lib/add-jest");
@@ -22,6 +23,7 @@ const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 const versions_2 = require("../../utils/versions");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 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");
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
@@ -38,6 +40,7 @@ async function applicationGeneratorInternal(host, schema) {
         skipFormat: true,
         addTsPlugin: schema.useTsSolution,
         formatter: schema.formatter,
+        platform: 'web',
     });
     tasks.push(jsInitTask);
     const nextTask = await (0, init_1.nextInitGenerator)(host, {
@@ -74,9 +77,10 @@ async function applicationGeneratorInternal(host, schema) {
         });
     }
     if (!options.skipPackageJson) {
+        const reactVersions = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
         const devDependencies = {
-            '@types/react': versions_1.typesReactVersion,
-            '@types/react-dom': versions_1.typesReactDomVersion,
+            '@types/react': reactVersions['@types/react'],
+            '@types/react-dom': reactVersions['@types/react-dom'],
         };
         if (options.unitTestRunner && options.unitTestRunner !== 'none') {
             devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
@@ -95,6 +99,7 @@ async function applicationGeneratorInternal(host, schema) {
     if (options.useTsSolution) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/files/common/next-env.d.ts__tmpl__

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/<%- appDirType %>/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/<%- appDirType %>/api-reference/config/typescript for more information.

package/src/generators/application/lib/add-e2e.js

@@ -144,11 +144,11 @@ async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPlug
     return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/next/plugin',
         serveTargetName: 'devTargetName',
-        serveStaticTargetName: 'serveStaticTargetName',
+        serveStaticTargetName: 'startTargetName',
         configFilePath,
     }, {
         defaultServeTargetName: defaultServeTarget,
-        defaultServeStaticTargetName: 'serve-static',
+        defaultServeStaticTargetName: 'start',
         defaultE2EWebServerAddress: `http://127.0.0.1:${e2ePort}`,
         defaultE2ECiBaseUrl: `http://localhost:${e2ePort}`,
         defaultE2EPort: e2ePort,

package/src/generators/init/init.js

@@ -4,18 +4,21 @@ exports.nextInitGenerator = nextInitGenerator;
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const versions_1 = require("@nx/react/src/utils/versions");
+const version_utils_1 = require("@nx/react/src/utils/version-utils");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
-const versions_2 = require("../../utils/versions");
-function updateDependencies(host, schema) {
+const versions_1 = require("../../utils/versions");
+const version_utils_2 = require("../../utils/version-utils");
+async function updateDependencies(host, schema) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/next'], []));
+    const versions = await (0, version_utils_2.getNextDependenciesVersionsToInstall)(host, await (0, version_utils_1.isReact18)(host));
+    const reactVersions = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
-        next: versions_2.nextVersion,
-        react: versions_1.reactVersion,
-        'react-dom': versions_1.reactDomVersion,
+        next: versions.next,
+        react: reactVersions.react,
+        'react-dom': reactVersions['react-dom'],
     }, {
-        '@nx/next': versions_2.nxVersion,
+        '@nx/next': versions_1.nxVersion,
     }, undefined, schema.keepExistingVersions));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
@@ -53,7 +56,7 @@ async function nextInitGeneratorInternal(host, schema) {
     (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
     let installTask = () => { };
     if (!schema.skipPackageJson) {
-        installTask = updateDependencies(host, schema);
+        installTask = await updateDependencies(host, schema);
     }
     return installTask;
 }

package/src/generators/library/library.js

@@ -10,6 +10,7 @@ const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 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");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -96,6 +97,7 @@ async function libraryGeneratorInternal(host, rawOptions) {
     if (options.isUsingTsSolutionConfig) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/plugins/plugin.d.ts

@@ -3,6 +3,9 @@ export interface NextPluginOptions {
     buildTargetName?: string;
     devTargetName?: string;
     startTargetName?: string;
+    /**
+     * @deprecated Use `startTargetName` instead.
+     */
     serveStaticTargetName?: string;
     buildDepsTargetName?: string;
     watchDepsTargetName?: string;

package/src/plugins/plugin.js

@@ -86,8 +86,9 @@ async function buildNextTargets(nextConfigPath, projectRoot, options, context) {
     const targets = {};
     targets[options.buildTargetName] = await getBuildTargetConfig(namedInputs, projectRoot, nextConfig);
     targets[options.devTargetName] = getDevTargetConfig(projectRoot);
-    targets[options.startTargetName] = getStartTargetConfig(options, projectRoot);
-    targets[options.serveStaticTargetName] = getStaticServeTargetConfig(options);
+    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;
 }

package/src/utils/version-utils.d.ts

@@ -0,0 +1,9 @@
+import { type Tree } from '@nx/devkit';
+type NextDependenciesVersions = {
+    next: string;
+};
+export declare function getNextDependenciesVersionsToInstall(tree: Tree, isReact18?: boolean): Promise<NextDependenciesVersions>;
+export declare function isNext14(tree: Tree): Promise<boolean>;
+export declare function getInstalledNextVersion(tree: Tree): string;
+export declare function getInstalledNextVersionFromGraph(): Promise<string>;
+export {};

package/src/utils/version-utils.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNextDependenciesVersionsToInstall = getNextDependenciesVersionsToInstall;
+exports.isNext14 = isNext14;
+exports.getInstalledNextVersion = getInstalledNextVersion;
+exports.getInstalledNextVersionFromGraph = getInstalledNextVersionFromGraph;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
+async function getNextDependenciesVersionsToInstall(tree, isReact18 = false) {
+    if (await isNext14(tree)) {
+        return {
+            next: versions_1.next14Version,
+        };
+    }
+    else {
+        return {
+            next: versions_1.nextVersion,
+        };
+    }
+}
+async function isNext14(tree) {
+    let installedNextVersion = await getInstalledNextVersionFromGraph();
+    if (!installedNextVersion) {
+        installedNextVersion = getInstalledNextVersion(tree);
+    }
+    return (0, semver_1.major)(installedNextVersion) === 14;
+}
+function getInstalledNextVersion(tree) {
+    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const installedNextVersion = pkgJson.dependencies && pkgJson.dependencies['next'];
+    if (!installedNextVersion ||
+        installedNextVersion === 'latest' ||
+        installedNextVersion === 'next') {
+        return (0, semver_1.clean)(versions_1.nextVersion) ?? (0, semver_1.coerce)(versions_1.nextVersion).version;
+    }
+    return (0, semver_1.clean)(installedNextVersion) ?? (0, semver_1.coerce)(installedNextVersion).version;
+}
+async function getInstalledNextVersionFromGraph() {
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    const nextDep = graph.externalNodes?.['npm:next'];
+    if (!nextDep) {
+        return undefined;
+    }
+    return (0, semver_1.clean)(nextDep.data.version) ?? (0, semver_1.coerce)(nextDep.data.version).version;
+}

package/src/utils/versions.d.ts

@@ -1,5 +1,6 @@
 export declare const nxVersion: any;
-export declare const nextVersion = "14.2.16";
+export declare const nextVersion = "~15.1.4";
+export declare const next14Version = "~14.2.16";
 export declare const eslintConfigNextVersion = "14.2.16";
 export declare const sassVersion = "1.62.1";
 export declare const lessLoader = "11.1.0";

package/src/utils/versions.js

@@ -1,8 +1,9 @@
 "use strict";
 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.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.next14Version = exports.nextVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.nextVersion = '14.2.16';
+exports.nextVersion = '~15.1.4';
+exports.next14Version = '~14.2.16';
 exports.eslintConfigNextVersion = '14.2.16';
 exports.sassVersion = '1.62.1';
 exports.lessLoader = '11.1.0';