@nx/next 16.3.2 → 16.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.3.2",
+  "version": "16.4.0-beta.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": {
@@ -35,13 +35,13 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@nrwl/next": "16.3.2",
-    "@nx/devkit": "16.3.2",
-    "@nx/js": "16.3.2",
-    "@nx/linter": "16.3.2",
-    "@nx/react": "16.3.2",
-    "@nx/web": "16.3.2",
-    "@nx/workspace": "16.3.2",
+    "@nrwl/next": "16.4.0-beta.1",
+    "@nx/devkit": "16.4.0-beta.1",
+    "@nx/js": "16.4.0-beta.1",
+    "@nx/linter": "16.4.0-beta.1",
+    "@nx/react": "16.4.0-beta.1",
+    "@nx/web": "16.4.0-beta.1",
+    "@nx/workspace": "16.4.0-beta.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -61,5 +61,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "097c1ca05f2fd825a6d7c70659350acd8455e144"
+  "gitHead": "1c4fb934b607f0d93bb23bff2cf0f39b31a8fa43"
 }

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

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function pageGenerator(host: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function pageGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default pageGenerator;
 export declare const pageSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/page/page.js

@@ -10,14 +10,13 @@ const styles_1 = require("../../utils/styles");
  * extra dependencies for css, sass, less, styl style options, and make sure
  * it is under `pages` folder.
  */
-function pageGenerator(host, options) {
+function pageGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
-        const directory = options.directory ? `pages/${options.directory}` : 'pages';
-        const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, fileName: !options.flat ? 'index' : undefined, skipFormat: true }));
+        const options = normalizeOptions(host, schema);
+        const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { project: schema.project, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, skipFormat: true }));
         const styledTask = (0, styles_1.addStyleDependencies)(host, {
             style: options.style,
-            swc: !host.exists((0, devkit_1.joinPathFragments)(project.root, '.babelrc')),
+            swc: !host.exists((0, devkit_1.joinPathFragments)(options.project.root, '.babelrc')),
         });
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
@@ -26,5 +25,16 @@ function pageGenerator(host, options) {
     });
 }
 exports.pageGenerator = pageGenerator;
+function normalizeOptions(host, options) {
+    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
+    const isAppRouter = host.exists(`${project.root}/app`);
+    const routerDirectory = isAppRouter ? 'app' : 'pages';
+    const directory = options.directory
+        ? `${routerDirectory}/${options.directory}`
+        : `${routerDirectory}`;
+    const fileName = isAppRouter ? 'page' : !options.flat ? 'index' : undefined;
+    return Object.assign(Object.assign({}, options), { project, directory, fileName });
+}
 exports.default = pageGenerator;
 exports.pageSchematic = (0, devkit_1.convertNxGenerator)(pageGenerator);