@nx/next 17.3.0-beta.4 → 17.3.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.3.0-beta.4",
+  "version": "17.3.0-beta.6",
   "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, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -34,7 +34,7 @@
     "next": ">=13.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/devkit": "17.3.0-beta.6",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -45,12 +45,12 @@
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "17.3.0-beta.4",
-    "@nx/eslint": "17.3.0-beta.4",
-    "@nx/react": "17.3.0-beta.4",
-    "@nx/web": "17.3.0-beta.4",
-    "@nx/workspace": "17.3.0-beta.4",
-    "@nrwl/next": "17.3.0-beta.4"
+    "@nx/js": "17.3.0-beta.6",
+    "@nx/eslint": "17.3.0-beta.6",
+    "@nx/react": "17.3.0-beta.6",
+    "@nx/web": "17.3.0-beta.6",
+    "@nx/workspace": "17.3.0-beta.6",
+    "@nrwl/next": "17.3.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,8 +1,10 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-
+<% if (src) { %>
+import Index from '../src/pages/index';
+<% } else { %>
 import Index from '../pages/index';
-
+<% } %>
 describe('Index', () => {
   it('should render successfully', () => {
     const { baseElement } = render(<Index />);

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(host, options) {
     const targets = {};
     // Check if plugin exists in nx.json and if it doesn't then we can continue
@@ -11,6 +12,7 @@ function addProject(host, options) {
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
     if (!hasPlugin) {
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(host, '@nx/next:build');
         targets.build = {
             executor: '@nx/next:build',
             outputs: ['{options.outputPath}'],

package/src/generators/application/lib/create-application-files.js

@@ -23,23 +23,26 @@ function createApplicationFiles(host, options) {
         pageStyleContent: `.page {}`,
         stylesExt: options.style === 'less' ? options.style : 'css',
     };
+    const generatedAppFilePath = options.src
+        ? (0, path_1.join)(options.appProjectRoot, 'src')
+        : options.appProjectRoot;
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
     if (options.appDir) {
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(generatedAppFilePath, 'app'), templateVariables);
         // RSC is not possible to unit test without extra helpers for data fetching. Leaving it to the user to figure out.
         host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'specs', `index.spec.${options.js ? 'jsx' : 'tsx'}`));
         if (options.style === 'styled-components') {
-            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-components'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
+            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-components'), (0, path_1.join)(generatedAppFilePath, 'app'), templateVariables);
         }
         else if (options.style === 'styled-jsx') {
-            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-jsx'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
+            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-jsx'), (0, path_1.join)(generatedAppFilePath, 'app'), templateVariables);
         }
         else {
-            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-default-layout'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
+            (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-default-layout'), (0, path_1.join)(generatedAppFilePath, 'app'), templateVariables);
         }
     }
     else {
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/pages'), (0, path_1.join)(options.appProjectRoot, 'pages'), templateVariables);
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/pages'), (0, path_1.join)(generatedAppFilePath, 'pages'), templateVariables);
     }
     if (options.rootProject) {
         (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
@@ -83,14 +86,14 @@ function createApplicationFiles(host, options) {
     }
     if (options.styledModule) {
         if (options.appDir) {
-            host.delete(`${options.appProjectRoot}/app/page.module.${options.style}`);
+            host.delete(`${generatedAppFilePath}/app/page.module.${options.style}`);
         }
         else {
-            host.delete(`${options.appProjectRoot}/pages/${options.fileName}.module.${options.style}`);
+            host.delete(`${generatedAppFilePath}/pages/${options.fileName}.module.${options.style}`);
         }
     }
     if (options.style !== 'styled-components') {
-        host.delete(`${options.appProjectRoot}/pages/_document.tsx`);
+        host.delete(`${generatedAppFilePath}/pages/_document.tsx`);
     }
     if (options.js) {
         host.delete(`${options.appProjectRoot}/index.d.ts`);

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

@@ -25,6 +25,7 @@ async function normalizeOptions(host, options) {
         : [];
     const fileName = 'index';
     const appDir = options.appDir ?? true;
+    const src = options.src ?? true;
     const styledModule = /^(css|scss|less)$/.test(options.style)
         ? null
         : options.style;
@@ -32,6 +33,7 @@ async function normalizeOptions(host, options) {
     return {
         ...options,
         appDir,
+        src,
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,

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

@@ -18,5 +18,6 @@ export interface Schema {
   customServer?: boolean;
   skipPackageJson?: boolean;
   appDir?: boolean;
+  src?: boolean;
   rootProject?: boolean;
 }

package/src/generators/application/schema.json

@@ -127,6 +127,12 @@
       "description": "Enable the App Router for this project.",
       "x-prompt": "Would you like to use the App Router (recommended)?"
     },
+    "src": {
+      "type": "boolean",
+      "default": true,
+      "description": "Generate a `src` directory for the project.",
+      "x-prompt": "Would you like to use `src/` directory?"
+    },
     "rootProject": {
       "description": "Create an application at the root of the workspace.",
       "type": "boolean",

package/src/generators/init/init.js

@@ -15,7 +15,7 @@ function updateDependencies(host, schema) {
         'react-dom': versions_1.reactDomVersion,
     }, {
         '@nx/next': versions_2.nxVersion,
-    }));
+    }, undefined, schema.keepExistingVersions));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function nextInitGenerator(host, schema) {

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

@@ -1,4 +1,5 @@
 export interface InitSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/src/generators/init/schema.json

@@ -16,6 +16,12 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []