@nx/node 0.0.0-pr-30715-a5f5e3b → 0.0.0-pr-31222-862e973

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2025 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
+[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/migrations.json

@@ -1,31 +1,45 @@
 {
-  "generators": {},
+  "generators": {
+    "update-16-0-0-add-nx-packages": {
+      "cli": "nx",
+      "version": "16.0.0-beta.1",
+      "description": "Replace @nrwl/node with @nx/node",
+      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-16-0-0-update-executor": {
+      "cli": "nx",
+      "version": "16.0.0-beta.5",
+      "description": "Replace @nrwl/node:webpack with @nx/node:webpack",
+      "implementation": "./src/migrations/update-16-0-0/update-webpack-executor"
+    },
+    "update-16-3-1-update-executor": {
+      "cli": "nx",
+      "version": "16.3.1-beta.0",
+      "description": "Replace @nrwl/node:webpack and @nx/node:webpack with @nx/webpack:webpack for all project targets",
+      "implementation": "./src/migrations/update-16-3-1/update-webpack-executor"
+    },
+    "update-16-4-0-replace-node-executor": {
+      "cli": "nx",
+      "version": "16.4.0-beta.8",
+      "description": "Replace @nx/node:node with @nx/js:node for all project targets",
+      "implementation": "./src/migrations/update-16-4-0/replace-node-executor"
+    }
+  },
   "packageJsonUpdates": {
-    "20.4.0": {
-      "version": "20.4.0-beta.3",
+    "17.3.0": {
+      "version": "17.3.0-beta.3",
       "packages": {
-        "fastify": {
-          "version": "~5.2.1",
-          "alwaysAddToPackageJson": false
-        },
-        "fastify-plugin": {
-          "version": "~5.0.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@fastify/autoload": {
-          "version": "~6.0.3",
-          "alwaysAddToPackageJson": false
-        },
-        "@fastify/sensible": {
-          "version": "~6.0.2",
+        "@types/node": {
+          "version": "18.16.9",
           "alwaysAddToPackageJson": false
-        },
-        "express": {
-          "version": "^4.21.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@types/express": {
-          "version": "^4.17.21",
+        }
+      }
+    },
+    "17.3.1": {
+      "version": "17.3.1-beta.0",
+      "packages": {
+        "axios": {
+          "version": "^1.6.0",
           "alwaysAddToPackageJson": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "0.0.0-pr-30715-a5f5e3b",
+  "version": "0.0.0-pr-31222-862e973",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,16 +32,15 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-30715-a5f5e3b",
-    "@nx/jest": "0.0.0-pr-30715-a5f5e3b",
-    "@nx/js": "0.0.0-pr-30715-a5f5e3b",
-    "@nx/eslint": "0.0.0-pr-30715-a5f5e3b",
-    "tcp-port-used": "^1.0.2",
-    "kill-port": "^1.6.1"
+    "@nx/devkit": "0.0.0-pr-31222-862e973",
+    "@nx/jest": "0.0.0-pr-31222-862e973",
+    "@nx/js": "0.0.0-pr-31222-862e973",
+    "@nx/eslint": "0.0.0-pr-31222-862e973",
+    "@nrwl/node": "0.0.0-pr-31222-862e973"
   },
   "publishConfig": {
     "access": "public"
   },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  "type": "commonjs",
+  "types": "./index.d.ts"
 }

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

@@ -1,11 +1,9 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
+export interface NormalizedSchema extends Schema {
     appProjectRoot: string;
     parsedTags: string[];
     outputPath: string;
-    importPath: string;
-    isUsingTsSolutionConfig: boolean;
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;

package/src/generators/application/application.js

@@ -17,8 +17,6 @@ const setup_docker_1 = require("../setup-docker/setup-docker");
 const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 function getWebpackBuildConfig(project, options) {
     return {
         executor: `@nx/webpack:webpack`,
@@ -32,7 +30,7 @@ function getWebpackBuildConfig(project, options) {
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
-            generatePackageJson: options.isUsingTsSolutionConfig ? undefined : true,
+            generatePackageJson: true,
         },
         configurations: {
             development: {},
@@ -56,7 +54,7 @@ function getEsBuildConfig(project, options) {
             main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'main' + (options.js ? '.js' : '.ts')),
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
-            generatePackageJson: options.isUsingTsSolutionConfig ? undefined : true,
+            generatePackageJson: true,
             esbuildOptions: {
                 sourcemap: true,
                 // Generate CJS files as .js so imports can be './foo' rather than './foo.cjs'.
@@ -78,7 +76,6 @@ function getEsBuildConfig(project, options) {
 }
 function getServeConfig(options) {
     return {
-        continuous: true,
         executor: '@nx/js:node',
         defaultConfiguration: 'development',
         // Run build, which includes dependency on "^build" by default, so the first run
@@ -100,20 +97,6 @@ function getServeConfig(options) {
         },
     };
 }
-function getNestWebpackBuildConfig() {
-    return {
-        executor: 'nx:run-commands',
-        options: {
-            command: 'webpack-cli build',
-            args: ['node-env=production'],
-        },
-        configurations: {
-            development: {
-                args: ['node-env=development'],
-            },
-        },
-    };
-}
 function addProject(tree, options) {
     const project = {
         root: options.appProjectRoot,
@@ -131,33 +114,12 @@ function addProject(tree, options) {
             (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`);
             project.targets.build = getWebpackBuildConfig(project, options);
         }
-        else if (options.isNest) {
-            // If we are using Nest that has the webpack plugin we need to override the
-            // build target so that node-env can be set to production or development so the serve target can be run in development mode
-            project.targets.build = getNestWebpackBuildConfig();
-        }
     }
     project.targets.serve = getServeConfig(options);
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        private: true,
-    };
-    if (!options.useProjectJson) {
-        packageJson.nx = {
-            name: options.name !== options.importPath ? options.name : undefined,
-            targets: project.targets,
-            tags: project.tags?.length ? project.tags : undefined,
-        };
-    }
-    else {
-        (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
-    }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
-    }
+    (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
 }
 function addAppFiles(tree, options) {
+    const sourceRoot = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src');
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, {
         ...options,
         tmpl: '',
@@ -167,9 +129,7 @@ function addAppFiles(tree, options) {
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
         webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
             ? {
-                outputPath: options.isUsingTsSolutionConfig
-                    ? 'dist'
-                    : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.rootProject ? options.name : options.appProjectRoot),
+                outputPath: options.outputPath,
                 main: './src/main' + (options.js ? '.js' : '.ts'),
                 tsConfig: './tsconfig.app.json',
                 assets: ['./src/assets'],
@@ -192,19 +152,16 @@ function addAppFiles(tree, options) {
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }
+    if (options.pascalCaseFiles) {
+        devkit_1.logger.warn('NOTE: --pascalCaseFiles is a noop');
+    }
 }
 function addProxy(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.frontendProject);
-    if (projectConfig.targets &&
-        ['serve', 'dev'].find((t) => !!projectConfig.targets[t])) {
-        const targetName = ['serve', 'dev'].find((t) => !!projectConfig.targets[t]);
-        projectConfig.targets[targetName].dependsOn = [
-            ...(projectConfig.targets[targetName].dependsOn ?? []),
-            `${options.name}:serve`,
-        ];
+    if (projectConfig.targets && projectConfig.targets.serve) {
         const pathToProxyFile = `${projectConfig.root}/proxy.conf.json`;
-        projectConfig.targets[targetName].options = {
-            ...projectConfig.targets[targetName].options,
+        projectConfig.targets.serve.options = {
+            ...projectConfig.targets.serve.options,
             proxyConfig: pathToProxyFile,
         };
         if (!tree.exists(pathToProxyFile)) {
@@ -291,9 +248,6 @@ function addProjectDependencies(tree, options) {
     });
 }
 function updateTsConfigOptions(tree, options) {
-    if (options.isUsingTsSolutionConfig) {
-        return;
-    }
     (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
         if (options.rootProject) {
             return {
@@ -321,20 +275,13 @@ function updateTsConfigOptions(tree, options) {
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
-        useProjectJson: true,
+        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
 async function applicationGeneratorInternal(tree, schema) {
-    const tasks = [];
-    const jsInitTask = await (0, js_1.initGenerator)(tree, {
-        ...schema,
-        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        skipFormat: true,
-        addTsPlugin: schema.useTsSolution,
-    });
-    tasks.push(jsInitTask);
     const options = await normalizeOptions(tree, schema);
+    const tasks = [];
     if (options.framework === 'nest') {
         // nx-ignore-next-line
         const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
@@ -358,6 +305,12 @@ async function applicationGeneratorInternal(tree, schema) {
             },
         ]);
     }
+    const jsInitTask = await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const initTask = await (0, init_1.initGenerator)(tree, {
         ...schema,
         skipFormat: true,
@@ -382,13 +335,8 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     addAppFiles(tree, options);
     addProject(tree, options);
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
-    }
     updateTsConfigOptions(tree, options);
-    if (options.linter === 'eslint') {
+    if (options.linter === eslint_1.Linter.EsLint) {
         const lintTask = await addLintingToApplication(tree, options);
         tasks.push(lintTask);
     }
@@ -404,13 +352,6 @@ async function applicationGeneratorInternal(tree, schema) {
             skipFormat: true,
         });
         tasks.push(jestTask);
-        // There are no tests by default, so set `--passWithNoTests` to avoid test failure on new project.
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-        projectConfig.targets ??= {};
-        projectConfig.targets.test = {
-            options: { passWithNoTests: true },
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
     }
     else {
         // No need for default spec file if unit testing is not setup.
@@ -422,6 +363,7 @@ async function applicationGeneratorInternal(tree, schema) {
             projectType: options.framework === 'none' ? 'cli' : 'server',
             name: options.rootProject ? 'e2e' : `${options.name}-e2e`,
             directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`,
+            projectNameAndRootFormat: 'as-provided',
             project: options.name,
             port: options.port,
             isNest: options.isNest,
@@ -443,15 +385,6 @@ async function applicationGeneratorInternal(tree, schema) {
         });
         tasks.push(dockerTask);
     }
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
-            module: 'nodenext',
-            moduleResolution: 'nodenext',
-        }, options.linter === 'eslint'
-            ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
-            : undefined);
-    }
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -461,14 +394,16 @@ async function applicationGeneratorInternal(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
+        callingGenerator: '@nx/node:application',
     });
     options.rootProject = appProjectRoot === '.';
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
     options.bundler = options.bundler ?? 'esbuild';
     options.e2eTestRunner = options.e2eTestRunner ?? 'jest';
     const parsedTags = options.tags
@@ -477,10 +412,6 @@ async function normalizeOptions(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const swcJest = options.swcJest ?? isUsingTsSolutionConfig;
-    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
-    const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     return {
         addPlugin,
         ...options,
@@ -489,18 +420,12 @@ async function normalizeOptions(host, options) {
             ? (0, devkit_1.names)(options.frontendProject).fileName
             : undefined,
         appProjectRoot,
-        importPath,
         parsedTags,
-        linter: options.linter ?? 'eslint',
+        linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? 'jest',
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,
-        outputPath: isUsingTsSolutionConfig
-            ? (0, devkit_1.joinPathFragments)(appProjectRoot, 'dist')
-            : (0, devkit_1.joinPathFragments)('dist', options.rootProject ? appProjectName : appProjectRoot),
-        isUsingTsSolutionConfig,
-        swcJest,
-        useProjectJson,
+        outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/files/common/tsconfig.app.json

@@ -5,5 +5,6 @@
     "module": "commonjs",
     "types": ["node"]
   },
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts"]
 }

package/src/generators/application/files/common/webpack.config.js__tmpl__

@@ -1,10 +1,10 @@
-<%_ if (webpackPluginOptions) { _%>
+<% if (webpackPluginOptions) { %>
 const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 const { join } = require('path');
 
 module.exports = {
   output: {
-    path: join(__dirname, '<%= webpackPluginOptions.outputPath %>'),
+    path: join(__dirname, '<%= offset %><%= webpackPluginOptions.outputPath %>'),
   },
   plugins: [
     new NxAppWebpackPlugin({
@@ -19,7 +19,7 @@ module.exports = {
     })
   ],
 };
-<%_ } else { _%>
+<% } else { %>
 const { composePlugins, withNx} = require('@nx/webpack');
 
 // Nx plugins for webpack.
@@ -33,4 +33,4 @@ module.exports = composePlugins(
     return config;
   }
 );
-<%_ } _%>
+<% } %>

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

@@ -1,20 +1,22 @@
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  directory: string;
-  name?: string;
+  name: string;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
   linter?: Linter | LinterType;
-  formatter?: 'none' | 'prettier';
   tags?: string;
   frontendProject?: string;
   swcJest?: boolean;
   /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js?: boolean;
+  pascalCaseFiles?: boolean;
   setParserOptionsProject?: boolean;
   standaloneConfig?: boolean;
   bundler?: 'esbuild' | 'webpack';
@@ -24,8 +26,6 @@ export interface Schema {
   docker?: boolean;
   isNest?: boolean;
   addPlugin?: boolean;
-  useTsSolution?: boolean;
-  useProjectJson?: boolean;
 }
 
 export type NodeJsFrameWorks = 'express' | 'koa' | 'fastify' | 'nest' | 'none';

package/src/generators/application/schema.json

@@ -6,21 +6,27 @@
   "description": "Nx Application Options Schema.",
   "type": "object",
   "properties": {
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Which directory do you want to create the application in?"
+      "x-prompt": "What name would you like to use for the node application?",
+      "x-priority": "important",
+      "pattern": "^[a-zA-Z][^:]*$"
     },
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "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"]
+    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
@@ -36,26 +42,14 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
-      "x-priority": "important"
+      "enum": ["eslint"],
+      "default": "eslint"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "none",
-      "x-priority": "important",
-      "x-prompt": "Which unit test runner would you like to use?"
-    },
-    "e2eTestRunner": {
-      "type": "string",
-      "enum": ["jest", "none"],
-      "description": "Test runner to use for end-to-end tests",
-      "default": "none",
-      "x-priority": "important",
-      "x-prompt": "Which end-to-end test runner would you like to use?"
+      "default": "jest"
     },
     "tags": {
       "type": "string",
@@ -69,7 +63,8 @@
     },
     "swcJest": {
       "type": "boolean",
-      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation."
+      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
+      "default": false
     },
     "babelJest": {
       "type": "boolean",
@@ -77,6 +72,12 @@
       "default": false,
       "x-deprecated": "Use --swcJest instead for faster compilation"
     },
+    "pascalCaseFiles": {
+      "type": "boolean",
+      "description": "Use pascal case file names.",
+      "alias": "P",
+      "default": false
+    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
@@ -120,14 +121,16 @@
       "hidden": true,
       "x-priority": "internal"
     },
+    "e2eTestRunner": {
+      "type": "string",
+      "enum": ["jest", "none"],
+      "description": "Test runner to use for end to end (e2e) tests",
+      "default": "jest"
+    },
     "docker": {
       "type": "boolean",
       "description": "Add a docker build target"
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": ["directory"]
+  "required": ["name"]
 }