@nx/next 17.0.0-beta.8 → 17.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "17.0.0-beta.8",
+  "version": "17.0.0-rc.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, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -44,13 +44,13 @@
     "url-loader": "^4.1.1",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.0.0-beta.8",
-    "@nx/js": "17.0.0-beta.8",
-    "@nx/eslint": "17.0.0-beta.8",
-    "@nx/react": "17.0.0-beta.8",
-    "@nx/web": "17.0.0-beta.8",
-    "@nx/workspace": "17.0.0-beta.8",
-    "@nrwl/next": "17.0.0-beta.8"
+    "@nx/devkit": "17.0.0-rc.1",
+    "@nx/js": "17.0.0-rc.1",
+    "@nx/eslint": "17.0.0-rc.1",
+    "@nx/react": "17.0.0-rc.1",
+    "@nx/web": "17.0.0-rc.1",
+    "@nx/workspace": "17.0.0-rc.1",
+    "@nrwl/next": "17.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/schema.json

@@ -20,7 +20,7 @@
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",
-      "alias": "d",
+      "alias": "dir",
       "x-priority": "important"
     },
     "projectNameAndRootFormat": {

package/src/generators/component/component.d.ts

@@ -5,7 +5,7 @@ interface Schema {
     /**
      * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18.
      */
-    project: string;
+    project?: string;
     style: SupportedStyles;
     directory?: string;
     /**

package/src/generators/component/component.js

@@ -4,7 +4,11 @@ exports.componentGeneratorInternal = exports.componentGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
 const styles_1 = require("../../utils/styles");
-function getDirectory(host, options) {
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+// TODO(v18): Remove this logic once we no longer derive directory.
+function maybeGetDerivedDirectory(host, options) {
+    if (!options.project)
+        return options.directory;
     const workspace = (0, devkit_1.getProjects)(host);
     const projectType = workspace.get(options.project).projectType;
     return options.directory
@@ -25,15 +29,29 @@ exports.componentGenerator = componentGenerator;
  * extra dependencies for css, sass, less style options.
  */
 async function componentGeneratorInternal(host, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    const { artifactName: name, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        artifactType: 'component',
+        callingGenerator: '@nx/next:component',
+        name: options.name,
+        directory: options.directory,
+        derivedDirectory: maybeGetDerivedDirectory(host, options),
+        flat: options.flat,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        project: options.project,
+        fileExtension: 'tsx',
+        pascalCaseFile: options.pascalCaseFiles,
+        pascalCaseDirectory: options.pascalCaseDirectory,
+    });
     const componentInstall = await (0, react_1.componentGenerator)(host, {
         ...options,
-        directory: options.directory,
-        derivedDirectory: getDirectory(host, options),
+        nameAndDirectoryFormat: 'as-provided',
+        project: undefined,
+        directory,
         classComponent: false,
         routing: false,
         skipFormat: true,
     });
+    const project = (0, devkit_1.readProjectConfiguration)(host, projectName);
     const styledInstall = (0, styles_1.addStyleDependencies)(host, {
         style: options.style,
         swc: !host.exists((0, devkit_1.joinPathFragments)(project.root, '.babelrc')),

package/src/generators/page/page.js

@@ -21,13 +21,11 @@ async function pageGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     const componentTask = await (0, react_1.componentGenerator)(host, {
         ...options,
-        project: schema.project,
-        pascalCaseFiles: false,
+        nameAndDirectoryFormat: 'as-provided',
         export: false,
         classComponent: false,
         routing: false,
         skipTests: !options.withTests,
-        flat: !!options.flat,
         skipFormat: true,
     });
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
@@ -43,50 +41,39 @@ async function pageGeneratorInternal(host, schema) {
 exports.pageGeneratorInternal = pageGeneratorInternal;
 async function normalizeOptions(host, options) {
     let isAppRouter;
+    let derivedDirectory;
     if (options.project) {
         // Legacy behavior, detect app vs page router from specified project.
+        // TODO(v18): remove this logic
         const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
         // app/ is a reserved folder in nextjs so it is safe to check it's existence
         isAppRouter = host.exists(`${project.root}/app`);
+        const routerDirectory = isAppRouter ? 'app' : 'pages';
+        derivedDirectory = options.directory
+            ? `${routerDirectory}/${options.directory}`
+            : `${routerDirectory}`;
     }
     else {
-        // New behavior, detect app vs page router from the positional arg or directory path
-        const parts = options.name.includes('/') || // mac, linux
-            options.name.includes('\\') // windows
-            ? options.name.split(/[\/\\]/)
-            : options.directory.split(/[\/\\]/);
-        if (parts.includes('pages')) {
-            isAppRouter = false;
-        }
-        else if (parts.includes('app')) {
-            isAppRouter = true;
-        }
-        else {
-        }
+        // New behavior, use directory as is without detecting whether we're using app or pages router.
+        derivedDirectory = options.directory;
     }
-    const { artifactName: name, project: projectName, filePath, fileName, nameAndDirectoryFormat, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'component',
-        callingGenerator: '@nx/react:component',
+    const { artifactName: name, project: projectName, fileName, directory, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        artifactType: 'page',
+        callingGenerator: '@nx/next:page',
         name: options.name,
         fileName: isAppRouter ? 'page' : 'index',
         directory: options.directory,
-        derivedDirectory: options.directory,
+        derivedDirectory,
         flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
         project: options.project,
         fileExtension: 'tsx',
     });
-    const routerDirectory = isAppRouter ? 'app' : 'pages';
-    const derivedDirectory = options.directory
-        ? `${routerDirectory}/${options.directory}`
-        : `${routerDirectory}`;
     return {
         ...options,
+        directory,
         fileName,
         projectName,
-        derivedDirectory,
-        filePath,
-        nameAndDirectoryFormat,
     };
 }
 exports.default = pageGenerator;