@nx/next 20.2.1 → 20.3.0-beta.0

package/package.json

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

package/src/generators/component/component.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
 const devkit_1 = require("@nx/devkit");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const react_1 = require("@nx/react");
 const styles_1 = require("../../utils/styles");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 /*
  * This schematic is basically the React one, but for Next we need
  * extra dependencies for css, sass, less style options.
  */
 async function componentGenerator(host, options) {
-    const { artifactName: name, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        name: options.name,
+    // we only need to provide the path to get the project, we let the react
+    // generator handle the rest
+    const { project: projectName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
-        fileExtension: 'tsx',
     });
     const componentInstall = await (0, react_1.componentGenerator)(host, {
         ...options,
-        name,
         classComponent: false,
         routing: false,
         skipFormat: true,

package/src/generators/component/schema.json

@@ -8,7 +8,7 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the component without the file extension. Relative to the current working directory.",
+      "description": "The file path to the component. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -75,7 +75,7 @@
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
-      "default": false
+      "x-deprecated": "Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21."
     },
     "skipFormat": {
       "description": "Skip formatting files.",

package/src/generators/page/page.js

@@ -61,18 +61,13 @@ async function normalizeOptions(host, options) {
             }
         }
     }
-    // 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, {
+    const { project: projectName, filePath } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: pageSymbolName,
-        fileName: isAppRouter ? 'page' : 'index',
-        path: options.path,
-        fileExtension: 'tsx',
+        path: (0, devkit_1.joinPathFragments)(options.path, isAppRouter ? 'page.tsx' : 'index.tsx'),
     });
     return {
         ...options,
-        fileName,
+        path: filePath,
         projectName,
     };
 }