@nx/next 20.5.0 → 20.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.5.0",
+  "version": "20.6.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.5.0",
+    "@nx/devkit": "20.6.0-beta.0",
     "@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": "20.5.0",
-    "@nx/eslint": "20.5.0",
-    "@nx/react": "20.5.0",
-    "@nx/web": "20.5.0",
-    "@nx/webpack": "20.5.0",
+    "@nx/js": "20.6.0-beta.0",
+    "@nx/eslint": "20.6.0-beta.0",
+    "@nx/react": "20.6.0-beta.0",
+    "@nx/web": "20.6.0-beta.0",
+    "@nx/webpack": "20.6.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -28,6 +28,7 @@ const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -54,7 +55,7 @@ async function applicationGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
     tasks.push(e2eTask);

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

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const eslint_1 = require("@nx/eslint");
-const versions_1 = require("../../../utils/versions");
 const web_1 = require("@nx/web");
-const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const versions_1 = require("../../../utils/versions");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -25,15 +24,15 @@ async function addE2e(host, options) {
                 spa: true,
             });
         }
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-                nx: {
-                    implicitDependencies: [options.projectName],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -45,6 +44,9 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isTsSolutionSetup) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             linter: eslint_1.Linter.EsLint,
@@ -79,15 +81,15 @@ async function addE2e(host, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-                nx: {
-                    implicitDependencies: [options.projectName],
-                },
-            });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -99,6 +101,9 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
+        if (!options.useProjectJson || options.isTsSolutionSetup) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(host, {
             rootProject: options.rootProject,
             project: options.e2eProjectName,

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../../utils/versions");
 const react_1 = require("@nx/react");
 function addProject(host, options) {
@@ -56,17 +55,17 @@ function addProject(host, options) {
         targets,
         tags: options.parsedTags,
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-            dependencies: {
-                next: versions_1.nextVersion,
-                react: react_1.reactVersion,
-                'react-dom': react_1.reactDomVersion,
-            },
-        };
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+        dependencies: {
+            next: versions_1.nextVersion,
+            react: react_1.reactVersion,
+            'react-dom': react_1.reactDomVersion,
+        },
+    };
+    if (!options.useProjectJson) {
         if (options.projectName !== options.importPath) {
             packageJson.nx = { name: options.projectName };
         }
@@ -74,11 +73,13 @@ function addProject(host, options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });
     }
+    if (!options.useProjectJson || options.isTsSolutionSetup) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
 }

package/src/generators/application/lib/normalize-options.js

@@ -53,5 +53,6 @@ async function normalizeOptions(host, options) {
         unitTestRunner: options.unitTestRunner || 'jest',
         importPath,
         isTsSolutionSetup,
+        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
     };
 }

package/src/generators/application/schema.d.ts

@@ -22,4 +22,5 @@ export interface Schema {
   addPlugin?: boolean;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
+  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -144,6 +144,10 @@
       "default": false,
       "hidden": true,
       "x-priority": "internal"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],

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

@@ -16,10 +16,12 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         importPath,
         projectRoot,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }

package/src/generators/library/library.js

@@ -14,6 +14,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...rawOptions,
     });
 }
@@ -96,7 +97,7 @@ async function libraryGeneratorInternal(host, rawOptions) {
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {

package/src/generators/library/schema.d.ts

@@ -24,4 +24,5 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -158,6 +158,10 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],