@nx/next 20.1.2 → 20.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.1.2",
+  "version": "20.1.4",
   "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.1.2",
+    "@nx/devkit": "20.1.4",
     "@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.1.2",
-    "@nx/eslint": "20.1.2",
-    "@nx/react": "20.1.2",
-    "@nx/web": "20.1.2",
-    "@nx/webpack": "20.1.2",
+    "@nx/js": "20.1.4",
+    "@nx/eslint": "20.1.4",
+    "@nx/react": "20.1.4",
+    "@nx/web": "20.1.4",
+    "@nx/webpack": "20.1.4",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

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

@@ -154,7 +154,7 @@ function stripOuterQuotes(str) {
 }
 // Exported for testing
 function ensureFileExtensions(files, absoluteDir) {
-    const extensions = ['.js', '.cjs', '.mjs', '.json'];
+    const extensions = ['.js', '.cjs', '.mjs', '.json', '.ts'];
     return files.map((file) => {
         const providedExt = (0, path_1.extname)(file);
         if (providedExt && extensions.includes(providedExt))

package/src/generators/component/schema.json

@@ -8,19 +8,17 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "Path where the component will be generated.",
+      "description": "The file path to the component without the file extension. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Where should the component be generated?",
+      "x-prompt": "What is the component file path?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The name of the component.",
-      "x-prompt": "What name would you like to use for the component?",
-      "x-priority": "important"
+      "description": "The component symbol name. Defaults to the last segment of the file path."
     },
     "style": {
       "description": "The file extension to be used for style files.",

package/src/generators/page/page.js

@@ -41,8 +41,31 @@ async function normalizeOptions(host, options) {
     // app/ is a reserved folder in nextjs so it is safe to check it's existence
     const isAppRouter = host.exists(`${project.root}/app`) ||
         host.exists(`${project.root}/src/app`);
+    let pageSymbolName = options.name;
+    if (!pageSymbolName) {
+        // if `name` is not provided, we use the last segment of the path
+        if (options.path !== '.' && options.path !== '') {
+            pageSymbolName = options.path.split('/').pop();
+        }
+        else {
+            // the user must have cd into a previously created directory, we need to
+            // resolve the cwd to get it
+            const cwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
+            if (cwd !== '.' && cwd !== '') {
+                pageSymbolName = cwd.split('/').pop();
+            }
+            else {
+                // this can only happen when running from the workspace root, in which
+                // case, we don't have a good way to automatically determine the name
+                throw new Error('Cannot determine the page name, please provide a `name` or `path` option.');
+            }
+        }
+    }
+    // the helper below expects a path to a file, but the `path` option here
+    // represents a directory, so we artificially add the symbol name to it
+    options.path = (0, devkit_1.joinPathFragments)(options.path, pageSymbolName);
     const { project: projectName, fileName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        name: options.name,
+        name: pageSymbolName,
         fileName: isAppRouter ? 'page' : 'index',
         path: options.path,
         fileExtension: 'tsx',

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

@@ -1,4 +1,3 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 import { SupportedStyles } from '@nx/react';
 
 export interface Schema {

package/src/generators/page/schema.json

@@ -8,19 +8,17 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "Path where the page will be generated.",
+      "description": "The path to the directory where the page will be generated. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Where should the page be generated?",
+      "x-prompt": "Which directory do you want to create the page in?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "The name of the page.",
-      "x-prompt": "What name would you like to use for the page?",
-      "x-priority": "important"
+      "description": "The page symbol name. Defaults to the page directory name."
     },
     "style": {
       "description": "The file extension to be used for style files.",
@@ -79,12 +77,6 @@
       "description": "Generate JavaScript files rather than TypeScript files.",
       "default": false
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create component at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",