fix(nextjs): enhance page generator to work when --project is not sup…

…plied
nrwl · Dec 18, 2023 · 63f4498 · 63f4498
1 parent aaf3e54
commit 63f4498
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/packages/next/src/generators/page/page.spec.ts b/packages/next/src/generators/page/page.spec.ts
@@ -64,8 +64,9 @@ describe('component', () => {
     it('should generate component in app directory', async () => {
       await pageGenerator(tree, {
         name: 'about',
-        project: appRouterProjectName,
+        directory: `${appRouterProjectName}/app/about`,
         style: 'css',
+        nameAndDirectoryFormat: 'as-provided',
       });
 
       expect(

diff --git a/packages/next/src/generators/page/page.ts b/packages/next/src/generators/page/page.ts
@@ -52,19 +52,35 @@ export async function pageGeneratorInternal(host: Tree, schema: Schema) {
 async function normalizeOptions(host: Tree, options: Schema) {
   let isAppRouter: boolean;
   let derivedDirectory: string;
+  let routerDirectory: string;
 
   if (options.project) {
     // Legacy behavior, detect app vs page router from specified project.
     // TODO(v18): remove this logic
     const project = 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`);
+    isAppRouter = host.exists(`${project.root}/app`) || host.exists(`${project.root}/src/app`);
 
-    const routerDirectory = isAppRouter ? 'app' : 'pages';
+    routerDirectory = isAppRouter ? 'app' : 'pages';
     derivedDirectory = options.directory
       ? `${routerDirectory}/${options.directory}`
       : `${routerDirectory}`;
   } else {
+    // Get the project name first so we can determine the router directory
+    const { project: determinedProjectName } =
+      await determineArtifactNameAndDirectoryOptions(host, {
+        artifactType: 'page',
+        callingGenerator: '@nx/next:page',
+        name: options.name,
+        directory: options.directory,
+      });
+
+    const project = readProjectConfiguration(host, determinedProjectName);
+
+    // app/ is a reserved folder in nextjs so it is safe to check it's existence
+    isAppRouter = host.exists(`${project.root}/app`) || host.exists(`${project.root}/src/app`);
+
+    routerDirectory = isAppRouter ? 'app' : 'pages';
     // New behavior, use directory as is without detecting whether we're using app or pages router.
     derivedDirectory = options.directory;
   }

diff --git a/packages/next/src/generators/page/schema.d.ts b/packages/next/src/generators/page/schema.d.ts
@@ -5,7 +5,7 @@ export 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;
   fileName?: string;