@nx/workspace 17.0.5 → 17.0.6

package/src/generators/move/lib/extract-base-configs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeMigrateEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
+exports.maybeExtractEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
 const devkit_1 = require("@nx/devkit");
 function maybeExtractTsConfigBase(tree) {
     let extractTsConfigBase;
@@ -26,7 +26,11 @@ async function maybeExtractJestConfigBase(tree) {
     await jestInitGenerator(tree, {});
 }
 exports.maybeExtractJestConfigBase = maybeExtractJestConfigBase;
-function maybeMigrateEslintConfigIfRootProject(tree, rootProject) {
+function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
+    if (rootProject.root !== '.')
+        return;
+    if (tree.exists('.eslintrc.base.json'))
+        return;
     let migrateConfigToMonorepoStyle;
     try {
         migrateConfigToMonorepoStyle = require('@nx/' +
@@ -35,9 +39,11 @@ function maybeMigrateEslintConfigIfRootProject(tree, rootProject) {
     catch {
         // eslint not installed
     }
-    migrateConfigToMonorepoStyle?.(Array.from((0, devkit_1.getProjects)(tree).values()), tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
+    // Only need to handle migrating the root rootProject.
+    // If other libs/apps exist, then this migration is already done by `@nx/eslint:lint-rootProject` generator.
+    migrateConfigToMonorepoStyle?.([rootProject], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
         tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.js'))
         ? 'jest'
         : 'none');
 }
-exports.maybeMigrateEslintConfigIfRootProject = maybeMigrateEslintConfigIfRootProject;
+exports.maybeExtractEslintConfigIfRootProject = maybeExtractEslintConfigIfRootProject;

package/src/generators/move/lib/move-project-files.js

@@ -22,15 +22,15 @@ function moveProjectFiles(tree, schema, project) {
         '.babelrc',
         '.eslintrc.json',
         'eslint.config.js',
-        /^jest\.config\.((app|lib)\.)?[jt]s$/,
+        /^jest\.config\.(app|lib)\.[jt]s$/,
         'vite.config.ts',
         /^webpack.*\.js$/,
         'index.html', // Vite
     ];
     const knownRootProjectFolders = [
-        'src', // Most apps/libs
-        'app', // Remix, Next.js
-        'pages', // Next.js
+        'src',
+        'app',
+        'pages',
         'public', // Vite, Remix, Next.js
     ];
     const isKnownRootProjectFile = (file) => {

package/src/generators/move/lib/normalize-schema.d.ts

@@ -1,3 +1,3 @@
-import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { NormalizedSchema, Schema } from '../schema';
 export declare function normalizeSchema(tree: Tree, schema: Schema, projectConfiguration: ProjectConfiguration): Promise<NormalizedSchema>;

package/src/generators/move/lib/normalize-schema.js

@@ -17,16 +17,10 @@ async function normalizeSchema(tree, schema, projectConfiguration) {
 }
 exports.normalizeSchema = normalizeSchema;
 async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
-    if (!options.projectNameAndRootFormat &&
-        (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
-        options.projectNameAndRootFormat = 'derived';
-    }
     validateName(options.newProjectName, options.projectNameAndRootFormat, projectConfiguration);
     const formats = getProjectNameAndRootFormats(tree, options, projectConfiguration);
-    const format = options.projectNameAndRootFormat ?? (await determineFormat(formats));
-    if (format === 'derived') {
-        logDeprecationMessage(formats, options);
-    }
+    const format = options.projectNameAndRootFormat ??
+        (await determineFormat(tree, formats, options));
     return formats[format];
 }
 function validateName(name, projectNameAndRootFormat, projectConfiguration) {
@@ -61,47 +55,65 @@ function validateName(name, projectNameAndRootFormat, projectConfiguration) {
         }
     }
 }
-function getProjectNameAndRootFormats(tree, options, projectConfiguration) {
-    let destination = (0, utils_1.normalizePathSlashes)(options.destination);
-    if (options.newProjectName &&
-        options.newProjectName.includes('/') &&
-        !options.newProjectName.startsWith('@')) {
-        throw new Error(`You can't specify a new project name with a directory path (${options.newProjectName}). ` +
-            `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
-    }
-    const asProvidedOptions = getAsProvidedOptions(tree, { ...options, destination }, projectConfiguration);
-    if (options.projectNameAndRootFormat === 'as-provided') {
+function getProjectNameAndRootFormats(tree, schema, projectConfiguration) {
+    let destination = (0, utils_1.normalizePathSlashes)(schema.destination);
+    const normalizedNewProjectName = schema.newProjectName
+        ? (0, devkit_1.names)(schema.newProjectName).fileName
+        : undefined;
+    const asProvidedProjectName = normalizedNewProjectName ?? schema.projectName;
+    const asProvidedDestination = destination;
+    if (normalizedNewProjectName?.startsWith('@')) {
         return {
-            'as-provided': asProvidedOptions,
-            derived: undefined,
+            'as-provided': {
+                destination: asProvidedDestination,
+                importPath: schema.importPath ??
+                    // keep the existing import path if the name didn't change
+                    (normalizedNewProjectName &&
+                        schema.projectName !== normalizedNewProjectName
+                        ? asProvidedProjectName
+                        : undefined),
+                newProjectName: asProvidedProjectName,
+            },
         };
     }
-    if (asProvidedOptions.newProjectName.startsWith('@')) {
-        if (!options.projectNameAndRootFormat) {
-            devkit_1.output.warn({
-                title: `The provided new project name "${asProvidedOptions.newProjectName}" is a scoped project name and this is not supported by the move generator when using the "derived" format.`,
-                bodyLines: [
-                    `The generator will try to move the project using the "as-provided" format with the new name "${asProvidedOptions.newProjectName}" located at "${asProvidedOptions.destination}".`,
-                ],
-            });
-            return {
-                'as-provided': asProvidedOptions,
-                derived: undefined,
-            };
-        }
-        throw new Error(`The provided new project name "${options.newProjectName}" is a scoped project name and this is not supported by the move generator when using the "derived" format. ` +
-            `Please provide a name without "@" or use the "as-provided" format.`);
+    let npmScope;
+    let asProvidedImportPath = schema.importPath;
+    if (!asProvidedImportPath &&
+        schema.newProjectName &&
+        projectConfiguration.projectType === 'library') {
+        npmScope = (0, get_import_path_1.getNpmScope)(tree);
+        asProvidedImportPath = npmScope
+            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${asProvidedProjectName}`
+            : asProvidedProjectName;
+    }
+    const derivedProjectName = schema.newProjectName ?? (0, utils_1.getNewProjectName)(destination);
+    const derivedDestination = (0, utils_1.getDestination)(tree, schema, projectConfiguration);
+    let derivedImportPath;
+    if (projectConfiguration.projectType === 'library') {
+        derivedImportPath =
+            schema.importPath ??
+                (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, destination));
     }
-    const derivedOptions = getDerivedOptions(tree, { ...options, destination }, projectConfiguration);
     return {
-        'as-provided': asProvidedOptions,
-        derived: derivedOptions,
+        'as-provided': {
+            destination: asProvidedDestination,
+            newProjectName: asProvidedProjectName,
+            importPath: asProvidedImportPath,
+        },
+        derived: {
+            destination: derivedDestination,
+            newProjectName: derivedProjectName,
+            importPath: derivedImportPath,
+        },
     };
 }
-async function determineFormat(formats) {
+async function determineFormat(tree, formats, schema) {
     if (!formats.derived) {
         return 'as-provided';
     }
+    if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
+        return 'derived';
+    }
     const asProvidedDescription = `As provided:
     Name: ${formats['as-provided'].newProjectName}
     Destination: ${formats['as-provided'].destination}`;
@@ -124,59 +136,40 @@ async function determineFormat(formats) {
                 name: derivedSelectedValue,
             },
         ],
-        initial: 0,
+        initial: 'as-provided',
     }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    return result;
-}
-function logDeprecationMessage(formats, options) {
     const callingGenerator = process.env.NX_ANGULAR_MOVE_INVOKED === 'true'
         ? '@nx/angular:move'
         : '@nx/workspace:move';
-    devkit_1.logger.warn((0, devkit_1.stripIndents) `
-    In Nx 19, the project name and destination will no longer be derived.
-    Please provide the exact new project name and destination in the future.
-    Example: nx g ${callingGenerator} --projectName ${options.projectName} --destination ${formats['derived'].destination}` +
-        (options.projectName !== formats['derived'].newProjectName
-            ? ` --newProjectName ${formats['derived'].newProjectName}`
-            : ''));
-}
-function getAsProvidedOptions(tree, options, projectConfiguration) {
-    const newProjectName = options.newProjectName ?? options.projectName;
-    const destination = options.destination;
-    if (projectConfiguration.projectType !== 'library') {
-        return { destination, newProjectName };
-    }
-    let importPath = options.importPath;
-    if (importPath) {
-        return { destination, newProjectName, importPath };
-    }
-    if (options.newProjectName?.startsWith('@')) {
-        // keep the existing import path if the name didn't change
-        importPath =
-            options.newProjectName && options.projectName !== options.newProjectName
-                ? newProjectName
-                : undefined;
-    }
-    else if (options.newProjectName) {
-        const npmScope = (0, get_import_path_1.getNpmScope)(tree);
-        importPath = npmScope
-            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${newProjectName}`
-            : newProjectName;
+    const deprecationWarning = (0, devkit_1.stripIndents) `
+    In Nx 18, the project name and destination will no longer be derived.
+    Please provide the exact new project name and destination in the future.`;
+    if (result === 'as-provided') {
+        const { saveDefault } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            message: `Would you like to configure Nx to always take the project name and destination as provided for ${callingGenerator}?`,
+            name: 'saveDefault',
+            initial: true,
+        });
+        if (saveDefault) {
+            const nxJson = (0, devkit_1.readNxJson)(tree);
+            nxJson.generators ??= {};
+            nxJson.generators[callingGenerator] ??= {};
+            nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
+            (0, devkit_1.updateNxJson)(tree, nxJson);
+        }
+        else {
+            devkit_1.logger.warn(deprecationWarning);
+        }
     }
-    return { destination, newProjectName, importPath };
-}
-function getDerivedOptions(tree, options, projectConfiguration) {
-    const newProjectName = options.newProjectName
-        ? (0, devkit_1.names)(options.newProjectName).fileName
-        : (0, utils_1.getNewProjectName)(options.destination);
-    const destination = (0, utils_1.getDestination)(tree, options, projectConfiguration);
-    let importPath;
-    if (projectConfiguration.projectType === 'library') {
-        importPath =
-            options.importPath ??
-                (0, utils_1.normalizePathSlashes)((0, get_import_path_1.getImportPath)(tree, options.destination));
+    else {
+        const example = `Example: nx g ${callingGenerator} --projectName ${schema.projectName} --destination ${formats[result].destination}` +
+            (schema.projectName !== formats[result].newProjectName
+                ? ` --newProjectName ${formats[result].newProjectName}`
+                : '');
+        devkit_1.logger.warn(deprecationWarning + '\n' + example);
     }
-    return { destination, newProjectName, importPath };
+    return result;
 }
 function isTTY() {
     return !!process.stdout.isTTY && process.env['CI'] !== 'true';

package/src/generators/move/lib/update-imports.js

@@ -124,7 +124,7 @@ function updateImportDeclarations(sourceFile, from, to) {
     ]);
     const changes = [];
     for (const { moduleSpecifier } of importDecls) {
-        if (moduleSpecifier && tsModule.isStringLiteral(moduleSpecifier)) {
+        if (tsModule.isStringLiteral(moduleSpecifier)) {
             changes.push(...updateModuleSpecifier(moduleSpecifier, from, to));
         }
     }

package/src/generators/move/lib/update-jest-config.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = void 0;
 const path = require("path");
-const jest_config_1 = require("../../utils/jest-config");
 /**
  * Updates the project name and coverage folder in the jest.config.js if it exists
  *
@@ -35,14 +34,13 @@ function updateJestConfig(tree, schema, project) {
         tree.write(jestConfigPath, newContent);
     }
     // update root jest.config.ts
-    const rootJestConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
-    if (!rootJestConfigPath || !tree.exists(rootJestConfigPath)) {
+    const rootJestConfigPath = '/jest.config.ts';
+    if (!tree.exists(rootJestConfigPath)) {
         return;
     }
     const findProject = `'<rootDir>/${project.root}'`;
     const oldRootJestConfigContent = tree.read(rootJestConfigPath, 'utf-8');
-    const usingJestProjects = oldRootJestConfigContent.includes('getJestProjects()') ||
-        oldRootJestConfigContent.includes('getJestProjectsAsync()');
+    const usingJestProjects = oldRootJestConfigContent.includes('getJestProjects()');
     const newRootJestConfigContent = oldRootJestConfigContent.replace(findProject, usingJestProjects ? `` : `'<rootDir>/${schema.relativeToRootDestination}'`);
     tree.write(rootJestConfigPath, newRootJestConfigContent);
 }

package/src/generators/move/lib/update-project-root-files.js

@@ -57,7 +57,7 @@ function updateFilesForNonRootProjects(tree, schema, project) {
     const newRelativeRoot = path
         .relative(path.join(devkit_1.workspaceRoot, schema.relativeToRootDestination), devkit_1.workspaceRoot)
         .split(path.sep)
-        .join('/') + '/';
+        .join('/');
     const oldRelativeRoot = path
         .relative(path.join(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot)
         .split(path.sep)
@@ -67,7 +67,7 @@ function updateFilesForNonRootProjects(tree, schema, project) {
         return;
     }
     const dots = /\./g;
-    const regex = new RegExp(`(?<!\\.\\.\\/)${oldRelativeRoot.replace(dots, '\\.')}\/(?!\\.\\.\\/)`, 'g');
+    const regex = new RegExp(`(?<!\\.\\.\\/)${oldRelativeRoot.replace(dots, '\\.')}(?!\\/\\.\\.)`, 'g');
     for (const file of tree.children(schema.relativeToRootDestination)) {
         const ext = (0, path_1.extname)(file);
         if (!allowedExt.includes(ext)) {

package/src/generators/move/move.js

@@ -33,6 +33,7 @@ async function moveGeneratorInternal(tree, rawSchema) {
     if (projectConfig.root === '.') {
         (0, extract_base_configs_1.maybeExtractTsConfigBase)(tree);
         await (0, extract_base_configs_1.maybeExtractJestConfigBase)(tree);
+        (0, extract_base_configs_1.maybeExtractEslintConfigIfRootProject)(tree, projectConfig);
         // Reload config since it has been updated after extracting base configs
         projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
     }
@@ -50,10 +51,6 @@ async function moveGeneratorInternal(tree, rawSchema) {
     (0, update_build_targets_1.updateBuildTargets)(tree, schema);
     (0, update_default_project_1.updateDefaultProject)(tree, schema);
     (0, update_implicit_dependencies_1.updateImplicitDependencies)(tree, schema);
-    if (projectConfig.root === '.') {
-        // we want to migrate eslint config once the root project files are moved
-        (0, extract_base_configs_1.maybeMigrateEslintConfigIfRootProject)(tree, projectConfig);
-    }
     await (0, run_angular_plugin_1.runAngularPlugin)(tree, schema);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/move/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxWorkspaceMove",
   "cli": "nx",
   "title": "Nx Move",

package/src/generators/new/files-readme/README.md.template

@@ -2,85 +2,59 @@
 
 <a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
 
-✨ **This workspace has been generated by [Nx, Smart Monorepos · Fast CI.](https://nx.dev)** ✨
+✨ **This workspace has been generated by [Nx, a Smart, fast and extensible build system.](https://nx.dev)** ✨<% if (!!appName) { %>
 
-## Integrate with editors
+<% if (includeServe) { %>
+## Start the app
 
-Enhance your Nx experience by installing [Nx Console](https://nx.dev/nx-console) for your favorite editor. Nx Console
-provides an interactive UI to view your projects, run tasks, generate code, and more! Available for VSCode, IntelliJ and
-comes with a LSP for Vim users.
-<% if (!!appName) {
-    if (isJsStandalone) { %>
-## Build the library
-
-Run `npx nx build` to build the library. The build artifacts are stored in the output directory (i.e. `dist/`), ready to be published.
-<% } else { %>
-## Start the application
-
-Run `npx nx <%= serveCommand %> <%= appName %>` to start the development server. Happy coding!
-
-## Build for production
-
-Run `npx nx build <%= appName %>` to build the application. The build artifacts are stored in the output directory (e.g. `dist/` or `build/`), ready to be deployed.
-<% } } else { %>
-## Nx plugins and code generators
-
-Add Nx plugins to leverage their code generators and automated, inferred tasks.
-
-```
-# Add plugin
-npx nx add @nx/react
+To start the development server run `nx serve <%= appName %>`. Open your browser and navigate to http://localhost:4200/. Happy coding!<% } %>
+<% } %>
 
-# Use code generator
-npx nx generate @nx/react:app demo
+## Generate code
 
-# Run development server
-npx nx serve demo
+If you happen to use Nx plugins, you can leverage code generators that might come with it.
 
-# View project details
-npx nx show project demo --web
-```
+Run `nx list` to get a list of available plugins and whether they have generators. Then run `nx list <plugin-name>` to see what generators are available.
 
-Run `npx nx list` to get a list of available plugins and whether they have generators. Then run `npx nx list <plugin-name>` to see what generators are available.
+Learn more about [Nx generators on the docs](https://nx.dev/plugin-features/use-code-generators).
 
-Learn more about [code generators](https://nx.dev/features/generate-code) and [inferred tasks](https://nx.dev/concepts/inferred-tasks) in the docs.
-<% } %>
 ## Running tasks
 
 To execute tasks with Nx use the following syntax:
 
 ```
-npx nx <target> <project> <...options>
+nx <target> <project> <...options>
 ```
 
 You can also run multiple targets:
 
 ```
-npx nx run-many -t <target1> <target2>
+nx run-many -t <target1> <target2>
 ```
 
 ..or add `-p` to filter specific projects
 
 ```
-npx nx run-many -t <target1> <target2> -p <proj1> <proj2>
+nx run-many -t <target1> <target2> -p <proj1> <proj2>
 ```
 
-Targets can be defined in the `package.json` or `projects.json`. Learn more [in the docs](https://nx.dev/features/run-tasks).
+Targets can be defined in the `package.json` or `projects.json`. Learn more [in the docs](https://nx.dev/core-features/run-tasks).
 
-## Set up CI!
+## Want better Editor Integration?
 
-Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
+Have a look at the [Nx Console extensions](https://nx.dev/nx-console). It provides autocomplete support, a UI for exploring and running tasks & generators, and more! Available for VSCode, IntelliJ and comes with a LSP for Vim users.
 
-- [Set up remote caching](https://nx.dev/features/share-your-cache)
-- [Set up task distribution across multiple machines](https://nx.dev/nx-cloud/features/distribute-task-execution)
-- [Learn more how to setup CI](https://nx.dev/recipes/ci)
+## Ready to deploy?
 
-## Explore the project graph
+Just run `nx build demoapp` to build the application. The build artifacts will be stored in the `dist/` directory, ready to be deployed.
 
-Run `npx nx graph` to show the graph of the workspace.
-It will show tasks that you can run with Nx.
+## Set up CI!
+
+Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
 
-- [Learn more about Exploring the Project Graph](https://nx.dev/core-features/explore-graph)
+- [Set up remote caching](https://nx.dev/core-features/share-your-cache)
+- [Set up task distribution across multiple machines](https://nx.dev/core-features/distribute-task-execution)
+- [Learn more how to setup CI](https://nx.dev/recipes/ci)
 
 ## Connect with us!
 

package/src/generators/new/files-root-app/package.json__tmpl__

@@ -10,8 +10,5 @@
   "devDependencies": {
     "@nx/workspace": "<%= nxVersion %>",
     "nx": "<%= nxVersion %>"
-  },
-  "nx": {
-    "includedScripts": []
   }
 }

package/src/generators/new/generate-preset.js

@@ -56,7 +56,6 @@ function generatePreset(host, opts) {
             opts.docker ? `--docker=${opts.docker}` : null,
             opts.js ? `--js` : null,
             opts.nextAppDir ? '--nextAppDir=true' : '--nextAppDir=false',
-            opts.nextSrcDir ? '--nextSrcDir=true' : '--nextSrcDir=false',
             opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
             opts.standaloneApi !== undefined
                 ? `--standaloneApi=${opts.standaloneApi}`
@@ -66,8 +65,6 @@ function generatePreset(host, opts) {
             opts.e2eTestRunner !== undefined
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,
-            opts.ssr ? `--ssr` : null,
-            opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
         ].filter((e) => !!e);
     }
 }
@@ -98,9 +95,6 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
         case presets_1.Preset.NextJs:
         case presets_1.Preset.NextJsStandalone:
             return { dependencies: { '@nx/next': versions_1.nxVersion }, dev: {} };
-        case presets_1.Preset.RemixStandalone:
-        case presets_1.Preset.RemixMonorepo:
-            return { dependencies: { '@nx/remix': versions_1.nxVersion }, dev: {} };
         case presets_1.Preset.VueMonorepo:
         case presets_1.Preset.VueStandalone:
             return {
@@ -112,16 +106,6 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
                     '@nx/vite': versions_1.nxVersion,
                 },
             };
-        case presets_1.Preset.Nuxt:
-        case presets_1.Preset.NuxtStandalone:
-            return {
-                dependencies: {},
-                dev: {
-                    '@nx/nuxt': versions_1.nxVersion,
-                    '@nx/cypress': e2eTestRunner === 'cypress' ? versions_1.nxVersion : undefined,
-                    '@nx/playwright': e2eTestRunner === 'playwright' ? versions_1.nxVersion : undefined,
-                },
-            };
         case presets_1.Preset.ReactMonorepo:
         case presets_1.Preset.ReactStandalone:
             return {

package/src/generators/new/generate-workspace-files.js

@@ -45,21 +45,27 @@ function setPresetProperty(tree, options) {
 function createNxJson(tree, { directory, defaultBase, preset }) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
-        defaultBase,
-        targetDefaults: process.env.NX_ADD_PLUGINS === 'false'
-            ? {
-                build: {
-                    cache: true,
-                    dependsOn: ['^build'],
-                },
-                lint: {
-                    cache: true,
-                },
-            }
-            : undefined,
+        affected: {
+            defaultBase,
+        },
+        targetDefaults: {
+            build: {
+                cache: true,
+                dependsOn: ['^build'],
+            },
+            lint: {
+                cache: true,
+            },
+            test: {
+                cache: true,
+            },
+            e2e: {
+                cache: true,
+            },
+        },
     };
     if (defaultBase === 'main') {
-        delete nxJson.defaultBase;
+        delete nxJson.affected;
     }
     if (preset !== presets_1.Preset.NPM) {
         nxJson.namedInputs = {
@@ -67,10 +73,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             production: ['default'],
             sharedGlobals: [],
         };
-        if (process.env.NX_ADD_PLUGINS === 'false') {
-            nxJson.targetDefaults.build.inputs = ['production', '^production'];
-            nxJson.useInferencePlugins = false;
-        }
+        nxJson.targetDefaults.build.inputs = ['production', '^production'];
     }
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
 }
@@ -79,10 +82,8 @@ function createFiles(tree, options) {
     const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.VueStandalone ||
-        options.preset === presets_1.Preset.NuxtStandalone ||
         options.preset === presets_1.Preset.NodeStandalone ||
         options.preset === presets_1.Preset.NextJsStandalone ||
-        options.preset === presets_1.Preset.RemixStandalone ||
         options.preset === presets_1.Preset.TsStandalone
         ? './files-root-app'
         : options.preset === presets_1.Preset.NPM
@@ -103,11 +104,8 @@ function createReadme(tree, { name, appName, directory, preset }) {
     const formattedNames = (0, devkit_1.names)(name);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,
-        isJsStandalone: preset === presets_1.Preset.TsStandalone,
+        includeServe: preset !== presets_1.Preset.TsStandalone,
         appName,
-        serveCommand: preset === presets_1.Preset.NextJs || preset === presets_1.Preset.NextJsStandalone
-            ? 'dev'
-            : 'serve',
         name,
     });
 }
@@ -123,8 +121,8 @@ function addNpmScripts(tree, options) {
     if (options.preset === presets_1.Preset.AngularStandalone ||
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.VueStandalone ||
-        options.preset === presets_1.Preset.NuxtStandalone ||
-        options.preset === presets_1.Preset.NodeStandalone) {
+        options.preset === presets_1.Preset.NodeStandalone ||
+        options.preset === presets_1.Preset.NextJsStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {
                 start: 'nx serve',
@@ -134,17 +132,6 @@ function addNpmScripts(tree, options) {
             return json;
         });
     }
-    if (options.preset === presets_1.Preset.NextJsStandalone) {
-        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
-            Object.assign(json.scripts, {
-                dev: 'nx dev',
-                build: 'nx build',
-                start: 'nx start',
-                test: 'nx test',
-            });
-            return json;
-        });
-    }
     if (options.preset === presets_1.Preset.TsStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {

package/src/generators/new/new.d.ts

@@ -12,15 +12,12 @@ interface Schema {
     docker?: boolean;
     js?: boolean;
     nextAppDir?: boolean;
-    nextSrcDir?: boolean;
     linter?: Linter;
     bundler?: 'vite' | 'webpack';
     standaloneApi?: boolean;
     routing?: boolean;
     packageManager?: PackageManager;
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
-    ssr?: boolean;
-    prefix?: string;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;