@nx/next 17.0.4 → 17.0.6

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

@@ -16,34 +16,8 @@ async function normalizeOptions(host, options) {
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
-    let e2eWebServerTarget = options.addPlugin ? 'start' : 'serve';
-    if (options.addPlugin) {
-        if (nxJson.plugins) {
-            for (const plugin of nxJson.plugins) {
-                if (typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/next/plugin' &&
-                    plugin.options.startTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .startTargetName;
-                }
-            }
-        }
-    }
-    let e2ePort = options.addPlugin ? 3000 : 4200;
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
-    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const name = (0, devkit_1.names)(options.name).fileName;
     const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
     const parsedTags = options.tags
@@ -51,7 +25,6 @@ async function normalizeOptions(host, options) {
         : [];
     const fileName = 'index';
     const appDir = options.appDir ?? true;
-    const src = options.src ?? true;
     const styledModule = /^(css|scss|less)$/.test(options.style)
         ? null
         : options.style;
@@ -59,13 +32,9 @@ async function normalizeOptions(host, options) {
     return {
         ...options,
         appDir,
-        src,
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
         e2eTestRunner: options.e2eTestRunner || 'cypress',
         fileName,
         linter: options.linter || eslint_1.Linter.EsLint,

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

@@ -18,7 +18,5 @@ export interface Schema {
   customServer?: boolean;
   skipPackageJson?: boolean;
   appDir?: boolean;
-  src?: boolean;
   rootProject?: boolean;
-  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxNextApp",
   "title": "Create a Next.js Application for Nx",
@@ -40,11 +40,11 @@
           { "value": "css", "label": "CSS" },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com          ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org            ]"
+            "label": "LESS              [ http://lesscss.org            ]"
           },
           {
             "value": "styled-components",
@@ -127,12 +127,6 @@
       "description": "Enable the App Router for this project.",
       "x-prompt": "Would you like to use the App Router (recommended)?"
     },
-    "src": {
-      "type": "boolean",
-      "default": true,
-      "description": "Generate a `src` directory for the project.",
-      "x-prompt": "Would you like to use `src/` directory?"
-    },
     "rootProject": {
       "description": "Create an application at the root of the workspace.",
       "type": "boolean",

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

@@ -3,21 +3,21 @@ import type { SupportedStyles } from '@nx/react';
 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 v19.
+     * @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;
     style: SupportedStyles;
     directory?: string;
     /**
-     * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
+     * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
      */
     flat?: boolean;
     /**
-     * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
+     * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
      */
     pascalCaseFiles?: boolean;
     /**
-     * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
+     * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
      */
     pascalCaseDirectory?: boolean;
     nameAndDirectoryFormat?: 'as-provided' | 'derived';

package/src/generators/component/component.js

@@ -5,7 +5,7 @@ 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(v19): Remove this logic once we no longer derive directory.
+// TODO(v18): Remove this logic once we no longer derive directory.
 function maybeGetDerivedDirectory(host, options) {
     if (!options.project)
         return options.directory;
@@ -44,8 +44,7 @@ async function componentGeneratorInternal(host, options) {
     });
     const componentInstall = await (0, react_1.componentGenerator)(host, {
         ...options,
-        name,
-        nameAndDirectoryFormat: 'as-provided', // already determined the directory so use as is
+        nameAndDirectoryFormat: 'as-provided',
         project: undefined,
         directory,
         classComponent: false,

package/src/generators/component/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxNextReactComponent",
   "title": "Create a React Component for Next",
@@ -13,7 +13,7 @@
       "$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 v19."
+      "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 v18."
     },
     "name": {
       "type": "string",
@@ -40,11 +40,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com          ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org            ]"
+            "label": "LESS              [ http://lesscss.org            ]"
           },
           {
             "value": "styled-components",
@@ -97,21 +97,21 @@
       "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."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "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."
+      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "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."
+      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "skipFormat": {
       "description": "Skip formatting files.",

package/src/generators/custom-server/custom-server.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import { CustomServerSchema } from './schema';
-export declare function customServerGenerator(host: Tree, options: CustomServerSchema): Promise<() => void>;
+export declare function customServerGenerator(host: Tree, options: CustomServerSchema): Promise<void>;

package/src/generators/custom-server/custom-server.js

@@ -3,29 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.customServerGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const add_swc_to_custom_server_1 = require("../../utils/add-swc-to-custom-server");
 async function customServerGenerator(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/next/plugin'
-        : p.plugin === '@nx/next/plugin');
     if (project.targets?.build?.executor !== '@nx/next:build' &&
-        project.targets?.build?.executor !== '@nrwl/next:build' &&
-        !hasPlugin) {
+        project.targets?.build?.executor !== '@nrwl/next:build') {
         devkit_1.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`);
         return;
     }
-    // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
-    const outputPath = hasPlugin
-        ? `dist/${project.root}`
-        : project.targets?.build?.options?.outputPath;
+    const outputPath = project.targets?.build?.options?.outputPath;
     const root = project.root;
-    if ((!root ||
+    if (!root ||
         !outputPath ||
         !project.targets?.build?.configurations?.development ||
-        !project.targets?.build?.configurations?.production) &&
-        !hasPlugin) {
+        !project.targets?.build?.configurations?.production) {
         devkit_1.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @nx/next:app"?`);
         return;
     }
@@ -34,30 +24,18 @@ async function customServerGenerator(host, options) {
         devkit_1.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
         return;
     }
-    // In Nx 18 next artifacts are inside the project root .next/ & dist/ (for custom server)
-    // So we need ensure the mapping is correct from dist to the project root
-    const projectPathFromDist = `../../${(0, devkit_1.offsetFromRoot)(project.root)}${project.root}`;
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, {
         ...options,
-        hasPlugin,
-        projectPathFromDist,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(project.root),
         projectRoot: project.root,
         tmpl: '',
     });
-    if (!hasPlugin) {
-        project.targets.build.dependsOn = ['build-custom-server'];
-        project.targets.serve.options.customServerTarget = `${options.project}:serve-custom-server`;
-        project.targets.serve.configurations.development.customServerTarget = `${options.project}:serve-custom-server:development`;
-        project.targets.serve.configurations.production.customServerTarget = `${options.project}:serve-custom-server:production`;
-    }
-    else {
-        project.targets['build'] = {
-            dependsOn: ['^build', 'build-custom-server'],
-        };
-    }
+    project.targets.build.dependsOn = ['build-custom-server'];
+    project.targets.serve.options.customServerTarget = `${options.project}:serve-custom-server`;
+    project.targets.serve.configurations.development.customServerTarget = `${options.project}:serve-custom-server:development`;
+    project.targets.serve.configurations.production.customServerTarget = `${options.project}:serve-custom-server:production`;
     project.targets['build-custom-server'] = {
-        executor: options.compiler === 'tsc' ? '@nx/js:tsc' : '@nx/js:swc',
+        executor: '@nx/js:tsc',
         defaultConfiguration: 'production',
         options: {
             outputPath,
@@ -97,8 +75,5 @@ async function customServerGenerator(host, options) {
         json.targetDefaults['build-custom-server'].cache ??= true;
         return json;
     });
-    if (options.compiler === 'swc') {
-        return (0, add_swc_to_custom_server_1.configureForSwc)(host, project.root);
-    }
 }
 exports.customServerGenerator = customServerGenerator;

package/src/generators/custom-server/files/server/main.ts__tmpl__

@@ -2,8 +2,9 @@
  * This is only a minimal custom server to get started.
  * You may want to consider using Express or another server framework, and enable security features such as CORS.
  *
- * For an example, see the Next.js repo:
- * Node - https://github.com/vercel/next.js/blob/canary/examples/custom-server
+ * For more examples, see the Next.js repo:
+ * - Express: https://github.com/vercel/next.js/tree/canary/examples/custom-server-express
+ * - Hapi: https://github.com/vercel/next.js/tree/canary/examples/custom-server-hapi
  */
 import { createServer } from 'http';
 import { parse } from 'node:url';
@@ -14,8 +15,7 @@ import next from 'next';
 // - The environment variable is set by `@nx/next:server` when running the dev server.
 // - The fallback `__dirname` is for production builds.
 // - Feel free to change this to suit your needs.
-
-const dir = process.env.NX_NEXT_DIR || <%- hasPlugin ? `path.join(__dirname, '${projectPathFromDist}')` : `path.join(__dirname, '..')`; %> 
+const dir = process.env.NX_NEXT_DIR || path.join(__dirname, '..');
 const dev = process.env.NODE_ENV === 'development';
 
 // HTTP Server options:

package/src/generators/custom-server/files/tsconfig.server.json__tmpl__

@@ -4,9 +4,7 @@
     "module": "commonjs",
     "noEmit": false,
     "incremental": true,
-    <% if(hasPlugin && compiler === 'tsc') { %>
     "tsBuildInfoFile": "<%= offsetFromRoot %>tmp/buildcache/<%= projectRoot %>/server",
-    <% } %>
     "types": [
       "node"
     ]

package/src/generators/custom-server/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxNextCustomServer",
   "title": "Add custom server",

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { CypressComponentConfigurationGeneratorSchema } from './schema';
 export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigurationGeneratorSchema): Promise<GeneratorCallback>;
-export declare function cypressComponentConfigurationInternal(tree: Tree, options: CypressComponentConfigurationGeneratorSchema): Promise<GeneratorCallback>;
 export default cypressComponentConfiguration;

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,51 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressComponentConfigurationInternal = exports.cypressComponentConfiguration = void 0;
+exports.cypressComponentConfiguration = void 0;
 const devkit_1 = require("@nx/devkit");
 const ct_utils_1 = require("@nx/react/src/utils/ct-utils");
 const versions_1 = require("../../utils/versions");
 const react_1 = require("@nx/react");
 const path_1 = require("path");
-function cypressComponentConfiguration(tree, options) {
-    return cypressComponentConfigurationInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
-}
-exports.cypressComponentConfiguration = cypressComponentConfiguration;
-async function cypressComponentConfigurationInternal(tree, options) {
+async function cypressComponentConfiguration(tree, options) {
     const tasks = [];
     const { componentConfigurationGenerator: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     tasks.push(await baseCyCtConfig(tree, {
         project: options.project,
         skipFormat: true,
-        framework: 'next',
         jsx: true,
-        addPlugin: options.addPlugin,
     }));
     const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
     tasks.push(await webpackInitGenerator(tree, {
+        compiler: 'swc',
+        uiFramework: 'react',
         skipFormat: true,
-        addPlugin: options.addPlugin,
     }));
-    const { ensureDependencies } = await Promise.resolve().then(() => require('@nx/webpack/src/utils/ensure-dependencies'));
-    tasks.push(ensureDependencies(tree, { compiler: 'swc', uiFramework: 'react' }));
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (projectConfig.targets?.['component-test']?.executor ===
-        '@nx/cypress:cypress') {
-        projectConfig.targets['component-test'].options = {
-            ...projectConfig.targets['component-test'].options,
-            skipServe: true,
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    }
+    projectConfig.targets['component-test'].options = {
+        ...projectConfig.targets['component-test'].options,
+        skipServe: true,
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
     await addFiles(tree, projectConfig, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
+exports.cypressComponentConfiguration = cypressComponentConfiguration;
 async function addFiles(tree, projectConfig, opts) {
     const { addMountDefinition, addDefaultCTConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
     const ctFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');

package/src/generators/cypress-component-configuration/schema.d.ts

@@ -2,5 +2,4 @@ export interface CypressComponentConfigurationGeneratorSchema {
   project: string;
   generateTests: boolean;
   skipFormat?: boolean;
-  addPlugin?: boolean;
 }

package/src/generators/cypress-component-configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "CypressComponentConfiguration",
   "title": "NextJS Component Testing Configuration",

package/src/generators/init/init.d.ts

@@ -1,5 +1,4 @@
-import { type GeneratorCallback, type Tree } from '@nx/devkit';
-import type { InitSchema } from './schema';
-export declare function nextInitGenerator(tree: Tree, schema: InitSchema): Promise<GeneratorCallback>;
-export declare function nextInitGeneratorInternal(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { InitSchema } from './schema';
+export declare function nextInitGenerator(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default nextInitGenerator;

package/src/generators/init/init.js

@@ -1,46 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextInitGeneratorInternal = exports.nextInitGenerator = void 0;
+exports.nextInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const versions_1 = require("@nx/react/src/utils/versions");
-const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
+const init_1 = require("@nx/react/src/generators/init/init");
+const js_1 = require("@nx/js");
 const versions_2 = require("../../utils/versions");
-const add_plugin_1 = require("./lib/add-plugin");
-function updateDependencies(host, schema) {
-    const tasks = [];
-    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/next'], []));
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
+const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
+function updateDependencies(host) {
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {
         next: versions_2.nextVersion,
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
+        tslib: versions_2.tsLibVersion,
     }, {
         '@nx/next': versions_2.nxVersion,
-    }, undefined, schema.keepExistingVersions));
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+        'eslint-config-next': versions_2.eslintConfigNextVersion,
+    });
 }
-function nextInitGenerator(tree, schema) {
-    return nextInitGeneratorInternal(tree, { addPlugin: false, ...schema });
-}
-exports.nextInitGenerator = nextInitGenerator;
-async function nextInitGeneratorInternal(host, schema) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    schema.addPlugin ??= addPluginDefault;
-    if (schema.addPlugin) {
-        (0, add_plugin_1.addPlugin)(host);
+async function nextInitGenerator(host, schema) {
+    const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    }));
+    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
+        const { jestInitGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
+        const jestTask = await jestInitGenerator(host, schema);
+        tasks.push(jestTask);
     }
-    (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
-    let installTask = () => { };
-    if (!schema.skipPackageJson) {
-        installTask = updateDependencies(host, schema);
+    if (schema.e2eTestRunner === 'cypress') {
+        const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
+        const cypressTask = await cypressInitGenerator(host, {});
+        tasks.push(cypressTask);
     }
-    if (schema.updatePackageScripts) {
-        const { createNodes } = await Promise.resolve().then(() => require('../../plugins/plugin'));
-        await (0, update_package_scripts_1.updatePackageScripts)(host, createNodes);
+    else if (schema.e2eTestRunner === 'playwright') {
+        const { initGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
+        const playwrightTask = await initGenerator(host, {
+            skipFormat: true,
+            skipPackageJson: schema.skipPackageJson,
+        });
+        tasks.push(playwrightTask);
+    }
+    // @ts-ignore
+    // TODO(jack): remove once the React Playwright PR lands first
+    const reactTask = await (0, init_1.default)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(reactTask);
+    if (!schema.skipPackageJson) {
+        const installTask = updateDependencies(host);
+        tasks.push(installTask);
     }
-    return installTask;
+    (0, add_gitignore_entry_1.addGitIgnoreEntry)(host);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.nextInitGeneratorInternal = nextInitGeneratorInternal;
+exports.nextInitGenerator = nextInitGenerator;
 exports.default = nextInitGenerator;

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

@@ -1,7 +1,8 @@
 export interface InitSchema {
+  unitTestRunner?: 'jest' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
+  js?: boolean;
   skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
-  updatePackageScripts?: boolean;
-  addPlugin?: boolean;
+  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,33 +1,45 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxNextNgInit",
   "title": "Init Next Plugin",
   "description": "Init Next Plugin.",
   "type": "object",
   "properties": {
+    "unitTestRunner": {
+      "description": "Adds the specified unit test runner.",
+      "type": "string",
+      "enum": ["jest", "none"],
+      "default": "jest"
+    },
+    "e2eTestRunner": {
+      "description": "Adds the specified e2e test runner.",
+      "type": "string",
+      "enum": ["cypress", "none"],
+      "default": "cypress"
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
     },
+    "js": {
+      "type": "boolean",
+      "default": false,
+      "description": "Use JavaScript instead of TypeScript"
+    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
     },
-    "keepExistingVersions": {
+    "rootProject": {
+      "description": "Create an application at the root of the workspace.",
       "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
-      "default": false
-    },
-    "updatePackageScripts": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Update `package.json` scripts with inferred targets",
-      "default": false
+      "default": false,
+      "hidden": true,
+      "x-priority": "internal"
     }
   },
   "required": []

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-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, {
@@ -13,10 +12,6 @@ async function normalizeOptions(host, options) {
         callingGenerator: '@nx/next:library',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     return {
         ...options,
         importPath,