@nx/next 19.8.0 → 20.0.0-beta.0

package/generators.json

@@ -17,12 +17,12 @@
       "description": "Create an application."
     },
     "page": {
-      "factory": "./src/generators/page/page#pageGeneratorInternal",
+      "factory": "./src/generators/page/page",
       "schema": "./src/generators/page/schema.json",
       "description": "Create a page."
     },
     "component": {
-      "factory": "./src/generators/component/component#componentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a component."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "19.8.0",
+  "version": "20.0.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": "19.8.0",
+    "@nx/devkit": "20.0.0-beta.0",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -46,14 +46,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "19.8.0",
-    "@nx/eslint": "19.8.0",
-    "@nx/react": "19.8.0",
-    "@nx/web": "19.8.0",
-    "@nx/webpack": "19.8.0",
-    "@nx/workspace": "19.8.0",
+    "@nx/js": "20.0.0-beta.0",
+    "@nx/eslint": "20.0.0-beta.0",
+    "@nx/react": "20.0.0-beta.0",
+    "@nx/web": "20.0.0-beta.0",
+    "@nx/webpack": "20.0.0-beta.0",
+    "@nx/workspace": "20.0.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/next": "19.8.0"
+    "@nrwl/next": "20.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -24,7 +24,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

package/src/generators/application/lib/normalize-options.js

@@ -12,7 +12,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/next:application',
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;

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

@@ -1,28 +1,12 @@
 import { Tree } from '@nx/devkit';
 import type { SupportedStyles } from '@nx/react';
+import { type NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 interface Schema {
     name: string;
-    /**
-     * @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 v20.
-     */
-    project?: string;
     style: SupportedStyles;
     directory?: string;
-    /**
-     * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-     */
-    flat?: boolean;
-    /**
-     * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-     */
-    pascalCaseFiles?: boolean;
-    /**
-     * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-     */
-    pascalCaseDirectory?: boolean;
-    nameAndDirectoryFormat?: 'as-provided' | 'derived';
+    nameAndDirectoryFormat?: NameAndDirectoryFormat;
     skipFormat?: boolean;
 }
-export declare function componentGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function componentGeneratorInternal(host: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function componentGenerator(host: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default componentGenerator;

package/src/generators/component/component.js

@@ -1,52 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 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");
-// TODO(v20): 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
-        ? options.directory
-        : projectType === 'application'
-            ? 'components'
-            : undefined;
-}
-async function componentGenerator(host, schema) {
-    return componentGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
 /*
  * This schematic is basically the React one, but for Next we need
  * extra dependencies for css, sass, less style options.
  */
-async function componentGeneratorInternal(host, options) {
+async function componentGenerator(host, options) {
     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,
         name,
         nameAndDirectoryFormat: 'as-provided', // already determined the directory so use as is
-        project: undefined,
         directory,
         classComponent: false,
         routing: false,

package/src/generators/component/schema.json

@@ -6,15 +6,6 @@
   "description": "Create a React Component for Next.",
   "type": "object",
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-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 v20."
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -93,26 +84,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. This option will be removed in Nx v19."
-    },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
-    "pascalCaseDirectory": {
-      "type": "boolean",
-      "description": "Use pascal case directory name (e.g. `App/App.tsx`).",
-      "alias": "R",
-      "default": false,
-      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/library/lib/normalize-options.js

@@ -10,7 +10,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/next:library',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);

package/src/generators/library/library.js

@@ -12,7 +12,6 @@ const versions_2 = require("../../utils/versions");
 async function libraryGenerator(host, rawOptions) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...rawOptions,
     });
 }

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

@@ -10,7 +10,6 @@ export interface Schema {
   skipTsConfig?: boolean;
   skipFormat?: boolean;
   tags?: string;
-  pascalCaseFiles?: boolean;
   routing?: boolean;
   appProject?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';

package/src/generators/library/schema.json

@@ -91,12 +91,6 @@
       "default": false,
       "description": "Do not update tsconfig.json for development experience."
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate library with routes."

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

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function pageGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function pageGeneratorInternal(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default pageGenerator;

package/src/generators/page/page.js

@@ -1,23 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pageGenerator = pageGenerator;
-exports.pageGeneratorInternal = pageGeneratorInternal;
 const react_1 = require("@nx/react");
 const devkit_1 = require("@nx/devkit");
 const styles_1 = require("../../utils/styles");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-async function pageGenerator(host, schema) {
-    return pageGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
 /*
  * This schematic is basically the React component one, but for Next we need
  * extra dependencies for css, sass, less style options, and make sure
  * it is under `pages` folder.
  */
-async function pageGeneratorInternal(host, schema) {
+async function pageGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     const componentTask = await (0, react_1.componentGenerator)(host, {
         ...options,
@@ -40,49 +33,20 @@ async function pageGeneratorInternal(host, schema) {
     return (0, devkit_1.runTasksInSerial)(componentTask, styledTask);
 }
 async function normalizeOptions(host, options) {
-    let isAppRouter;
-    let derivedDirectory;
-    let routerDirectory;
-    if (options.project) {
-        // Legacy behavior, detect app vs page router from specified project.
-        // TODO(v20): 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`) ||
-                host.exists(`${project.root}/src/app`);
-        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 (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-            artifactType: 'page',
-            callingGenerator: '@nx/next:page',
-            name: options.name,
-            directory: options.directory,
-        });
-        const project = (0, devkit_1.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;
-    }
-    const { artifactName: name, project: projectName, fileName, directory, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'page',
-        callingGenerator: '@nx/next:page',
+    // Get the project name first so we can determine the router directory
+    const { project: determinedProjectName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        name: options.name,
+        directory: options.directory,
+    });
+    const project = (0, devkit_1.readProjectConfiguration)(host, determinedProjectName);
+    // 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`);
+    const { project: projectName, fileName, directory, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
         fileName: isAppRouter ? 'page' : 'index',
         directory: options.directory,
-        derivedDirectory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
     });
     return {

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

@@ -1,20 +1,13 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 import { SupportedStyles } from '@nx/react';
 
 export interface Schema {
   name: string;
-  /**
-   * @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 v20.
-   */
-  project?: string;
   style: SupportedStyles;
   directory?: string;
   fileName?: string;
   withTests?: boolean;
   js?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }