@nx/next 20.0.0-beta.5 → 20.0.0-beta.6

package/migrations.json

@@ -1,23 +1,5 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/next with @nx/next",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-3-0-remove-root-build-option": {
-      "cli": "nx",
-      "version": "16.3.0-beta.9",
-      "description": "Remove root build option from project configurations since it is not needed.",
-      "implementation": "./src/migrations/update-16-3-0/remove-root-build-option"
-    },
-    "update-16-4-0-update-next-dependency": {
-      "cli": "nx",
-      "version": "16.4.0-beta.3",
-      "description": "Update package.json moving @nx/next from dependency to devDependency",
-      "implementation": "./src/migrations/update-16-4-0/update-nx-next-dependency"
-    },
     "update-17-2-7": {
       "cli": "nx",
       "version": "17.2.7",
@@ -26,24 +8,6 @@
     }
   },
   "packageJsonUpdates": {
-    "16.0.0": {
-      "version": "16.0.0-beta.0",
-      "packages": {
-        "next": {
-          "version": "13.3.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.4.0-beta.4": {
-      "version": "16.4.0-beta.4",
-      "packages": {
-        "stylus": {
-          "version": "^0.59.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "17.3.1-beta.0": {
       "version": "17.3.1-beta.0",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.0.0-beta.5",
+  "version": "20.0.0-beta.6",
   "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,23 +35,21 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.0-beta.5",
+    "@nx/devkit": "20.0.0-beta.6",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "copy-webpack-plugin": "^10.2.4",
     "file-loader": "^6.2.0",
-    "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "picocolors": "^1.1.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "20.0.0-beta.5",
-    "@nx/eslint": "20.0.0-beta.5",
-    "@nx/react": "20.0.0-beta.5",
-    "@nx/web": "20.0.0-beta.5",
-    "@nx/webpack": "20.0.0-beta.5",
-    "@nx/workspace": "20.0.0-beta.5",
+    "@nx/js": "20.0.0-beta.6",
+    "@nx/eslint": "20.0.0-beta.6",
+    "@nx/react": "20.0.0-beta.6",
+    "@nx/web": "20.0.0-beta.6",
+    "@nx/webpack": "20.0.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/executors/build/build.impl.js

@@ -4,9 +4,9 @@ exports.default = buildExecutor;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const semver_1 = require("semver");
-const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
 const semver_2 = require("@nx/devkit/src/utils/semver");
 const update_package_json_1 = require("./lib/update-package-json");
 const create_next_config_file_1 = require("./lib/create-next-config-file");
@@ -22,7 +22,7 @@ async function buildExecutor(options, context) {
     (0, check_project_1.checkPublicDirectory)(projectRoot);
     // Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
     const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
-    const packageJson = (0, fs_extra_1.existsSync)(packageJsonPath)
+    const packageJson = (0, node_fs_1.existsSync)(packageJsonPath)
         ? (0, devkit_1.readJsonFile)(packageJsonPath)
         : undefined;
     const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.root, 'package.json'));
@@ -51,9 +51,7 @@ async function buildExecutor(options, context) {
             childProcess.kill();
         }
     }
-    if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
-        (0, fs_extra_1.mkdir)(options.outputPath);
-    }
+    await (0, promises_1.mkdir)(options.outputPath, { recursive: true });
     const builtPackageJson = (0, js_1.createPackageJson)(context.projectName, context.projectGraph, {
         target: context.targetName,
         root: context.root,
@@ -70,7 +68,7 @@ async function buildExecutor(options, context) {
     if (options.generateLockfile) {
         const packageManager = (0, devkit_1.detectPackageManager)(context.root);
         const lockFile = (0, js_1.createLockFile)(builtPackageJson, context.projectGraph, packageManager);
-        (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)(packageManager)}`, lockFile, {
+        (0, node_fs_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)(packageManager)}`, lockFile, {
             encoding: 'utf-8',
         });
     }
@@ -78,8 +76,9 @@ async function buildExecutor(options, context) {
     // This is the default behavior when running `nx build <app>`.
     if (options.outputPath.replace(/\/$/, '') !== projectRoot) {
         (0, create_next_config_file_1.createNextConfigFile)(options, context);
-        (0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
+        (0, node_fs_1.cpSync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
             dereference: true,
+            recursive: true,
         });
     }
     return { success: true };

package/src/executors/build/lib/check-project.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPublicDirectory = checkPublicDirectory;
 const devkit_1 = require("@nx/devkit");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 function checkPublicDirectory(root) {
-    if ((0, fs_extra_1.readdirSync)((0, path_1.join)(root, 'public')).length === 0) {
+    if ((0, node_fs_1.readdirSync)((0, path_1.join)(root, 'public')).length === 0) {
         devkit_1.logger.warn('public directory cannot be empty. This may result in errors during the deployment. Consider adding a public/.gitkeep file');
     }
 }

package/src/executors/build/lib/create-next-config-file.js

@@ -8,7 +8,7 @@ exports.getRelativeImports = getRelativeImports;
 exports.ensureFileExtensions = ensureFileExtensions;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const js_1 = require("@nx/js");
 function createNextConfigFile(options, context) {
@@ -22,21 +22,21 @@ function createNextConfigFile(options, context) {
     // If user passed a config then it is relative to the workspace root, need to normalize it to be relative to the project root.
     options.nextConfig ? (0, path_1.relative)(projectRoot, options.nextConfig) : undefined);
     const configAbsolutePath = (0, path_1.join)(projectRoot, configRelativeToProjectRoot);
-    if (!(0, fs_extra_1.existsSync)(configAbsolutePath)) {
+    if (!(0, node_fs_1.existsSync)(configAbsolutePath)) {
         throw new Error('next.config.js not found');
     }
     // Copy config file and our `.nx-helpers` folder to remove dependency on @nrwl/next for production build.
     const helpersPath = (0, path_1.join)(options.outputPath, '.nx-helpers');
-    (0, fs_extra_1.mkdirSync)(helpersPath, { recursive: true });
-    (0, fs_extra_1.copyFileSync)((0, path_1.join)(__dirname, '../../../utils/compose-plugins.js'), (0, path_1.join)(helpersPath, 'compose-plugins.js'));
-    (0, fs_extra_1.writeFileSync)((0, path_1.join)(helpersPath, 'with-nx.js'), getWithNxContent());
-    (0, fs_extra_1.writeFileSync)((0, path_1.join)(helpersPath, 'compiled.js'), `
+    (0, node_fs_1.mkdirSync)(helpersPath, { recursive: true });
+    (0, node_fs_1.copyFileSync)((0, path_1.join)(__dirname, '../../../utils/compose-plugins.js'), (0, path_1.join)(helpersPath, 'compose-plugins.js'));
+    (0, node_fs_1.writeFileSync)((0, path_1.join)(helpersPath, 'with-nx.js'), getWithNxContent());
+    (0, node_fs_1.writeFileSync)((0, path_1.join)(helpersPath, 'compiled.js'), `
         const withNx = require('./with-nx');
         module.exports = withNx;
         module.exports.withNx = withNx;
         module.exports.composePlugins = require('./compose-plugins').composePlugins;
       `);
-    (0, fs_extra_1.writeFileSync)((0, path_1.join)(options.outputPath, configRelativeToProjectRoot), (0, fs_extra_1.readFileSync)(configAbsolutePath)
+    (0, node_fs_1.writeFileSync)((0, path_1.join)(options.outputPath, configRelativeToProjectRoot), (0, node_fs_1.readFileSync)(configAbsolutePath)
         .toString()
         .replace(/["']@nx\/next["']/, `'./.nx-helpers/compiled.js'`)
         // TODO(v17): Remove this once users have all migrated to new @nx scope and import from '@nx/next' not the deep import paths.
@@ -45,17 +45,18 @@ function createNextConfigFile(options, context) {
     // Find all relative imports needed by next.config.js and copy them to the dist folder.
     const moduleFilesToCopy = getRelativeFilesToCopy(configRelativeToProjectRoot, projectRoot);
     for (const moduleFile of moduleFilesToCopy) {
-        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, path_1.join)(context.root, options.outputPath, moduleFile)));
+        const moduleFileDir = (0, path_1.dirname)((0, path_1.join)(context.root, options.outputPath, moduleFile));
+        (0, node_fs_1.mkdirSync)(moduleFileDir, { recursive: true });
         // We already generate a build version of package.json in the dist folder.
         if (moduleFile !== 'package.json') {
-            (0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root, projectRoot, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
+            (0, node_fs_1.copyFileSync)((0, path_1.join)(context.root, projectRoot, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
         }
     }
 }
 function readSource(getFile) {
     return {
         file: getFile(),
-        content: (0, fs_extra_1.readFileSync)(getFile()).toString(),
+        content: (0, node_fs_1.readFileSync)(getFile()).toString(),
     };
 }
 // Exported for testing
@@ -89,13 +90,13 @@ function getWithNxContent({ file, content } = readSource(() => (0, path_1.join)(
 function findNextConfigPath(dirname, userDefinedConfigPath) {
     if (userDefinedConfigPath) {
         const file = userDefinedConfigPath;
-        if ((0, fs_extra_1.existsSync)((0, path_1.join)(dirname, file)))
+        if ((0, node_fs_1.existsSync)((0, path_1.join)(dirname, file)))
             return file;
         throw new Error(`Cannot find the Next.js config file: ${userDefinedConfigPath}. Is the path correct in project.json?`);
     }
     const candidates = ['next.config.js', 'next.config.cjs', 'next.config.mjs'];
     for (const candidate of candidates) {
-        if ((0, fs_extra_1.existsSync)((0, path_1.join)(dirname, candidate)))
+        if ((0, node_fs_1.existsSync)((0, path_1.join)(dirname, candidate)))
             return candidate;
     }
     throw new Error(`Cannot find any of the following files in your project: ${candidates.join(', ')}. Is this a Next.js project?`);
@@ -110,7 +111,7 @@ function getRelativeFilesToCopy(fileName, cwd) {
             return;
         seen.add(currFile);
         const absoluteFilePath = (0, path_1.join)(cwd, currFile);
-        const content = (0, fs_extra_1.readFileSync)(absoluteFilePath).toString();
+        const content = (0, node_fs_1.readFileSync)(absoluteFilePath).toString();
         const files = getRelativeImports({ file: currFile, content });
         const modules = ensureFileExtensions(files, (0, path_1.dirname)(absoluteFilePath));
         const relativeDirPath = (0, path_1.dirname)(currFile);
@@ -153,7 +154,7 @@ function ensureFileExtensions(files, absoluteDir) {
         const providedExt = (0, path_1.extname)(file);
         if (providedExt && extensions.includes(providedExt))
             return file;
-        const ext = extensions.find((ext) => (0, fs_extra_1.existsSync)((0, path_1.join)(absoluteDir, file + ext)));
+        const ext = extensions.find((ext) => (0, node_fs_1.existsSync)((0, path_1.join)(absoluteDir, file + ext)));
         if (ext) {
             return file + ext;
         }

package/src/generators/application/application.js

@@ -4,6 +4,7 @@ exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const react_1 = require("@nx/react");
 const versions_1 = require("@nx/react/src/utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -28,6 +29,7 @@ async function applicationGenerator(host, schema) {
     });
 }
 async function applicationGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'application');
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     (0, show_possible_warnings_1.showPossibleWarnings)(host, options);

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

@@ -6,15 +6,14 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const eslint_1 = require("@nx/eslint");
 const assertion_1 = require("@nx/react/src/utils/assertion");
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,13 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   style?: SupportedStyles;
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';

package/src/generators/application/schema.json

@@ -6,28 +6,22 @@
   "description": "Create a Next.js Application for Nx.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
-      "alias": "dir",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -37,7 +31,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS"
+          },
           {
             "value": "scss",
             "label": "SASS(.scss)       [ https://sass-lang.com          ]"
@@ -145,6 +142,6 @@
       "x-priority": "internal"
     }
   },
-  "required": [],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

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

@@ -1,11 +1,9 @@
 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;
+    path: string;
+    name?: string;
     style: SupportedStyles;
-    directory?: string;
-    nameAndDirectoryFormat?: NameAndDirectoryFormat;
     skipFormat?: boolean;
 }
 export declare function componentGenerator(host: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/generators/component/component.js

@@ -12,15 +12,12 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 async function componentGenerator(host, options) {
     const { artifactName: name, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         fileExtension: 'tsx',
     });
     const componentInstall = await (0, react_1.componentGenerator)(host, {
         ...options,
         name,
-        nameAndDirectoryFormat: 'as-provided', // already determined the directory so use as is
-        directory,
         classComponent: false,
         routing: false,
         skipFormat: true,

package/src/generators/component/schema.json

@@ -6,13 +6,19 @@
   "description": "Create a React Component for Next.",
   "type": "object",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "Path where the component will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "Where should the component be generated?",
+      "x-priority": "important"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the component.",
       "x-prompt": "What name would you like to use for the component?",
       "x-priority": "important"
     },
@@ -62,17 +68,6 @@
       "default": false,
       "x-priority": "internal"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the project root.",
-      "alias": "dir",
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project index.ts (if it exists).",
@@ -91,6 +86,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "examplesFile": "../../../docs/component-examples.md"
 }

package/src/generators/init/init.js

@@ -4,6 +4,7 @@ exports.nextInitGenerator = nextInitGenerator;
 exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/react/src/utils/versions");
 const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
 const versions_2 = require("../../utils/versions");
@@ -23,6 +24,7 @@ function nextInitGenerator(tree, schema) {
     return nextInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function nextInitGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'init');
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -4,14 +4,13 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
-    const { projectRoot, importPath, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    const { projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/src/generators/library/library.js

@@ -5,6 +5,7 @@ exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const library_1 = require("@nx/react/src/generators/library/library");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/react/src/utils/versions");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -16,6 +17,7 @@ async function libraryGenerator(host, rawOptions) {
     });
 }
 async function libraryGeneratorInternal(host, rawOptions) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'next', 'library');
     const options = await (0, normalize_options_1.normalizeOptions)(host, rawOptions);
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {

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

@@ -1,11 +1,9 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   style: SupportedStyles;
   skipTsConfig?: boolean;
   skipFormat?: boolean;

package/src/generators/library/schema.json

@@ -6,28 +6,22 @@
   "description": "Create a React Library for an Nx workspace.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed.",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -37,7 +31,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS"
+          },
           {
             "value": "scss",
             "label": "SASS(.scss)       [ https://sass-lang.com          ]"
@@ -73,8 +70,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests."
+      "enum": ["vitest", "jest", "none"],
+      "description": "Test runner to use for unit tests.",
+      "default": "vitest"
     },
     "tags": {
       "type": "string",
@@ -145,6 +143,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/library-examples.md"
 }

package/src/generators/page/page.js

@@ -15,7 +15,6 @@ async function pageGenerator(host, schema) {
     const componentTask = await (0, react_1.componentGenerator)(host, {
         ...options,
         isNextPage: true,
-        nameAndDirectoryFormat: 'as-provided', // already determined the directory so use as is
         export: false,
         classComponent: false,
         routing: false,
@@ -36,22 +35,20 @@ async function normalizeOptions(host, options) {
     // 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,
+        path: options.path,
     });
     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, {
+    const { project: projectName, fileName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
         fileName: isAppRouter ? 'page' : 'index',
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         fileExtension: 'tsx',
     });
     return {
         ...options,
-        directory,
         fileName,
         projectName,
     };

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

@@ -2,12 +2,11 @@ import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-
 import { SupportedStyles } from '@nx/react';
 
 export interface Schema {
-  name: string;
+  path: string;
+  name?: string;
   style: SupportedStyles;
-  directory?: string;
   fileName?: string;
   withTests?: boolean;
   js?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/page/schema.json

@@ -6,36 +6,22 @@
   "description": "Create a Page for Next.",
   "type": "object",
   "properties": {
-    "project": {
+    "path": {
       "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.",
+      "description": "Path where the page will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?",
+      "x-prompt": "Where should the page be generated?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the page file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the project root.",
-      "alias": "dir",
+      "description": "The name of the page.",
+      "x-prompt": "What name would you like to use for the page?",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -106,6 +92,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "examplesFile": "../../../docs/page-examples.md"
 }

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/next', '@nx/next');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-3-0/remove-root-build-option.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-3-0/remove-root-build-option.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        delete projectConfig.targets[targetName].options.root;
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/next:build', (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        delete projectConfig.targets[targetName].options.root;
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    });
-}

package/src/migrations/update-16-4-0/update-nx-next-dependency.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/update-nx-next-dependency.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-async function update(tree) {
-    if (tree.exists('./package.json')) {
-        (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
-            if (packageJson.dependencies['@nx/next']) {
-                packageJson.devDependencies['@nx/next'] =
-                    packageJson.dependencies['@nx/next'];
-                delete packageJson.dependencies['@nx/next'];
-            }
-            return packageJson;
-        });
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}