@nx/nuxt 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 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/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![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/generators.json

@@ -11,7 +11,7 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "description": "Create a Nuxt application."

package/migrations.json

@@ -7,24 +7,5 @@
       "implementation": "./src/migrations/update-19-6-0/add-vue-plugin-to-storybook-config"
     }
   },
-  "packageJsonUpdates": {
-    "18.2.0": {
-      "version": "18.2.0-beta.0",
-      "packages": {
-        "@nuxt/eslint-config": {
-          "version": "~0.3.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "18.3.0": {
-      "version": "18.3.0-beta.2",
-      "packages": {
-        "@nuxt/eslint-config": {
-          "version": "~0.3.6",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    }
-  }
+  "packageJsonUpdates": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "0.0.0-pr-31222-862e973",
+  "version": "0.0.0-pr-31313-387cdca",
   "private": false,
   "description": "The Nuxt plugin for Nx contains executors and generators for managing Nuxt applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -31,24 +31,29 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "0.0.0-pr-31222-862e973",
-    "@nx/js": "0.0.0-pr-31222-862e973",
-    "@nx/eslint": "0.0.0-pr-31222-862e973",
-    "@nx/vue": "0.0.0-pr-31222-862e973",
-    "@nx/vite": "0.0.0-pr-31222-862e973",
+    "@nx/devkit": "0.0.0-pr-31313-387cdca",
+    "@nx/js": "0.0.0-pr-31313-387cdca",
+    "@nx/eslint": "0.0.0-pr-31313-387cdca",
+    "@nx/vue": "0.0.0-pr-31313-387cdca",
+    "@nx/vite": "0.0.0-pr-31313-387cdca",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
-  "peerDependencies": {},
+  "peerDependencies": {
+    "@nuxt/schema": "^3.10.0"
+  },
   "publishConfig": {
     "access": "public"
   },
   "exports": {
     "./package.json": "./package.json",
-    ".": "./index.js",
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./index.js"
+    },
     "./generators.json": "./generators.json",
     "./migrations.json": "./migrations.json",
     "./plugin": "./plugin.js"
   },
-  "type": "commonjs",
-  "types": "./index.d.ts"
+  "types": "./index.d.ts",
+  "type": "commonjs"
 }

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, NuxtPluginOptions } from './src/plugins/plugin';
+export { createNodes, createNodesV2, NuxtPluginOptions, } from './src/plugins/plugin';

package/plugin.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
+exports.createNodesV2 = exports.createNodes = void 0;
 var plugin_1 = require("./src/plugins/plugin");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });

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

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

package/src/generators/application/application.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const js_1 = require("@nx/js");
 const update_gitignore_1 = require("../../utils/update-gitignore");
-const eslint_1 = require("@nx/eslint");
 const add_e2e_1 = require("./lib/add-e2e");
 const add_linting_1 = require("../../utils/add-linting");
 const add_vitest_1 = require("./lib/add-vitest");
@@ -16,26 +16,56 @@ const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const node_child_process_1 = require("node:child_process");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+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");
 async function applicationGenerator(tree, schema) {
+    return await applicationGeneratorInternal(tree, {
+        useProjectJson: true,
+        ...schema,
+    });
+}
+async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
-    const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
-    const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
-    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
-    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
-        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+        platform: 'web',
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
+    const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
-    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-        root: options.appProjectRoot,
-        projectType: 'application',
-        sourceRoot: `${options.appProjectRoot}/src`,
-        targets: {},
-    });
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
+            root: options.appProjectRoot,
+            projectType: 'application',
+            sourceRoot: `${options.appProjectRoot}/src`,
+            tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            targets: {},
+        });
+    }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/base'), options.appProjectRoot, {
         ...options,
         offsetFromRoot: projectOffsetFromRoot,
@@ -64,12 +94,18 @@ async function applicationGenerator(tree, schema) {
         projectRoot: options.appProjectRoot,
         rootProject: options.rootProject,
         unitTestRunner: options.unitTestRunner,
+        isUsingTsSolutionConfig: options.isUsingTsSolutionConfig,
     }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
     (0, update_gitignore_1.updateGitIgnore)(tree);
+    // 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);
+    }
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
         projectName: options.projectName,
         projectRoot: options.appProjectRoot,
-        linter: options.linter ?? eslint_1.Linter.EsLint,
+        linter: options.linter ?? 'eslint',
         unitTestRunner: options.unitTestRunner,
         rootProject: options.rootProject,
     }));
@@ -88,13 +124,25 @@ async function applicationGenerator(tree, schema) {
     tasks.push(await (0, add_e2e_1.addE2e)(tree, options));
     if (options.js)
         (0, devkit_1.toJS)(tree);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+            jsx: 'preserve',
+            jsxImportSource: 'vue',
+            module: 'esnext',
+            moduleResolution: 'bundler',
+            resolveJsonModule: true,
+        }, 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);
     tasks.push(() => {
         try {
             (0, node_child_process_1.execSync)(`npx -y nuxi prepare`, {
                 cwd: options.appProjectRoot,
-                windowsHide: true,
+                windowsHide: false,
             });
         }
         catch (e) {

package/src/generators/application/files/base/nuxt.config.ts__tmpl__

@@ -19,9 +19,9 @@ export default defineNuxtConfig({
   imports: {
     autoImport: true,
   },
-  <% if (style !== 'none') { %>
+  <%_ if (style !== 'none') { _%>
   css: ['~/assets/css/styles.<%= style %>'],
-  <% } %>
+  <%_ } _%>
   vite: {
     plugins: [
       nxViteTsPaths()

package/src/generators/application/files/base/src/server/tsconfig.json__tmpl__

@@ -1,3 +1,3 @@
 {
-  "extends": "../.nuxt/tsconfig.server.json"
+  "extends": "../../.nuxt/tsconfig.server.json"
 }

package/src/generators/application/lib/add-e2e.js

@@ -4,20 +4,33 @@ exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 const versions_1 = require("../../../utils/versions");
-const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(host, options) {
     const e2eWebServerInfo = await getNuxtE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            projectType: 'application',
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
@@ -34,22 +47,32 @@ async function addE2e(host, options) {
             jsx: true,
             addPlugin: true,
         });
-        let buildTarget = '^build-static';
-        const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, '@nx/nuxt/plugin', (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
-        if (matchingPlugin && typeof matchingPlugin !== 'string') {
-            buildTarget = `^${matchingPlugin.options?.buildStaticTargetName ?? 'build-static'}`;
-        }
-        await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.${options.js ? 'js' : 'ts'}`));
         return e2eTask;
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            implicitDependencies: [options.projectName],
-        });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.projectName],
+            });
+        }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const e2eTask = await configurationGenerator(host, {
             project: options.e2eProjectName,
             skipFormat: true,
@@ -58,16 +81,10 @@ async function addE2e(host, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerAddress: e2eWebServerInfo.e2eCiWebServerCommand,
-            webServerCommand: e2eWebServerInfo.e2eCiBaseUrl,
+            webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+            webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             addPlugin: true,
         });
-        let buildTarget = '^build-static';
-        const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, '@nx/nuxt/plugin', (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
-        if (matchingPlugin && typeof matchingPlugin !== 'string') {
-            buildTarget = `^${matchingPlugin.options?.buildStaticTargetName ?? 'build-static'}`;
-        }
-        await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
         return e2eTask;
     }
     return () => { };

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
-export declare function normalizeDirectory(options: Schema): string;
-export declare function normalizeOptions(host: Tree, options: Schema, callingGenerator?: string): Promise<NormalizedSchema>;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -1,28 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDirectory = normalizeDirectory;
 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");
-function normalizeDirectory(options) {
-    options.directory = options.directory?.replace(/\\{1,2}/g, '/');
-    const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    return projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-}
-async function normalizeOptions(host, options, callingGenerator = '@nx/nuxt:application') {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+async function normalizeOptions(host, options) {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = 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,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -30,13 +21,16 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/nuxt:appl
         : [];
     const normalized = {
         ...options,
-        name: (0, devkit_1.names)(options.name).fileName,
+        name: projectNames.projectFileName,
         projectName: appProjectName,
         appProjectRoot,
+        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
         style: options.style ?? 'none',
+        isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';

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

@@ -1,11 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   linter?: Linter | LinterType;
+  formatter?: 'none' | 'prettier';
   skipFormat?: boolean;
   unitTestRunner?: 'vitest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
@@ -16,12 +15,16 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   style?: 'css' | 'scss' | 'less' | 'none';
   nxCloudToken?: string;
+  useTsSolution?: boolean;
+  useProjectJson?: boolean;
 }
 
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
   projectName: string;
   appProjectRoot: string;
+  importPath: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
   parsedTags: string[];
+  isUsingTsSolutionConfig: boolean;
 }

package/src/generators/application/schema.json

@@ -6,46 +6,43 @@
   "description": "Create a Nuxt 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"]
-    },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
     },
+    "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"
+    },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "Which unit test runner would you like to use?",
-      "default": "none"
+      "default": "none",
+      "x-priority": "important"
     },
     "e2eTestRunner": {
       "type": "string",
@@ -86,7 +83,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          ]"
@@ -95,7 +95,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
-          { "value": "none", "label": "None" }
+          {
+            "value": "none",
+            "label": "None"
+          }
         ]
       }
     },
@@ -103,8 +106,12 @@
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": [],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

package/src/generators/init/init.js

@@ -6,9 +6,11 @@ const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const utils_1 = require("./lib/utils");
 async function nuxtInitGenerator(host, schema) {
-    await (0, add_plugin_1.addPluginV1)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodes, {
+    await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodesV2, {
         buildTargetName: ['build', 'nuxt:build', 'nuxt-build'],
         serveTargetName: ['serve', 'nuxt:serve', 'nuxt-serve'],
+        buildDepsTargetName: ['build-deps', 'nuxt:build-deps', 'nuxt-build-deps'],
+        watchDepsTargetName: ['watch-deps', 'nuxt:watch-deps', 'nuxt-watch-deps'],
     }, schema.updatePackageScripts);
     let installTask = () => { };
     if (!schema.skipPackageJson) {

package/src/plugins/plugin.d.ts

@@ -1,9 +1,11 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
-export declare const createDependencies: CreateDependencies;
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface NuxtPluginOptions {
     buildTargetName?: string;
     serveTargetName?: string;
     serveStaticTargetName?: string;
     buildStaticTargetName?: string;
+    buildDepsTargetName?: string;
+    watchDepsTargetName?: string;
 }
+export declare const createNodesV2: CreateNodesV2<NuxtPluginOptions>;
 export declare const createNodes: CreateNodes<NuxtPluginOptions>;

package/src/plugins/plugin.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodes = exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const path_1 = require("path");
+const fs_1 = require("fs");
+const executor_utils_1 = require("../utils/executor-utils");
+const util_1 = require("@nx/js/src/plugins/typescript/util");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'nuxt.hash');
 const targetsCache = readTargetsCache();
+const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache() {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -21,11 +24,15 @@ function writeTargetsToCache() {
         ...targetsCache,
     });
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
+exports.createNodesV2 = [
+    '**/nuxt.config.{js,ts,mjs,mts,cjs,cts}',
+    async (files, options, context) => {
+        //TODO(@nrwl/nx-vue-reviewers): This should batch hashing like our other plugins.
+        const result = await (0, devkit_1.createNodesFromFiles)(exports.createNodes[1], files, options, context);
+        writeTargetsToCache();
+        return result;
+    },
+];
 exports.createNodes = [
     '**/nuxt.config.{js,ts,mjs,mts,cjs,cts}',
     async (configFilePath, options, context) => {
@@ -58,6 +65,7 @@ async function buildNuxtTargets(configFilePath, projectRoot, options, context) {
     targets[options.serveTargetName] = serveTarget(projectRoot);
     targets[options.serveStaticTargetName] = serveStaticTarget(options);
     targets[options.buildStaticTargetName] = buildStaticTarget(options.buildStaticTargetName, namedInputs, buildOutputs, projectRoot);
+    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function buildTarget(buildTargetName, namedInputs, buildOutputs, projectRoot) {
@@ -83,11 +91,14 @@ function serveTarget(projectRoot) {
         options: {
             cwd: projectRoot,
         },
+        continuous: true,
     };
     return targetConfig;
 }
 function serveStaticTarget(options) {
     const targetConfig = {
+        dependsOn: [`${options.buildStaticTargetName}`],
+        continuous: true,
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.buildStaticTargetName}`,
@@ -118,8 +129,15 @@ function buildStaticTarget(buildStaticTargetName, namedInputs, buildOutputs, pro
     return targetConfig;
 }
 async function getInfoFromNuxtConfig(configFilePath, context, projectRoot) {
-    // TODO(Colum): Once plugins are isolated we can go back to @nuxt/kit since each plugin will be run in its own worker.
-    const config = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
+    let config;
+    if (process.env.NX_ISOLATE_PLUGINS !== 'false') {
+        config = await (await (0, executor_utils_1.loadNuxtKitDynamicImport)()).loadNuxtConfig({
+            configFile: configFilePath,
+        });
+    }
+    else {
+        config = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
+    }
     return {
         buildDir: config?.buildDir ??
             // Match .nuxt default build dir from '@nuxt/schema'

package/src/utils/add-linting.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
 const eslint_1 = require("@nx/eslint");
+const versions_1 = require("@nx/eslint/src/utils/versions");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const versions_1 = require("./versions");
+const versions_2 = require("./versions");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 // TODO(colum): Look into the recommended set up using `withNuxt` inside eslint.config.mjs. https://eslint.nuxt.com/packages/config
 async function addLinting(host, options) {
@@ -21,6 +22,9 @@ async function addLinting(host, options) {
             addPlugin: true,
         });
         tasks.push(lintTask);
+        const devDependencies = {
+            '@nuxt/eslint-config': versions_2.nuxtEslintConfigVersion,
+        };
         if ((0, eslint_file_1.isEslintConfigSupported)(host, options.projectRoot)) {
             editEslintConfigFiles(host, options.projectRoot);
             const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, ['@nuxt/eslint-config'], true);
@@ -33,6 +37,7 @@ async function addLinting(host, options) {
                     },
                 } // languageOptions is not in eslintrc format but for flat config
                 );
+                devDependencies['@typescript-eslint/parser'] = versions_1.typescriptESLintVersion;
             }
             (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, [
                 '.nuxt/**',
@@ -40,9 +45,7 @@ async function addLinting(host, options) {
                 'node_modules',
             ]);
         }
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@nuxt/eslint-config': versions_1.nuxtEslintConfigVersion,
-        });
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
         tasks.push(installTask);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);

package/src/utils/create-ts-config.d.ts

@@ -3,4 +3,5 @@ export declare function createTsConfig(host: Tree, options: {
     projectRoot: string;
     rootProject?: boolean;
     unitTestRunner?: string;
+    isUsingTsSolutionConfig: boolean;
 }, relativePathToRootTsConfig: string): void;

package/src/utils/create-ts-config.js

@@ -6,9 +6,8 @@ const shared = require("@nx/js/src/utils/typescript/create-ts-config");
 function createTsConfig(host, options, relativePathToRootTsConfig) {
     createAppTsConfig(host, options);
     const json = {
-        compilerOptions: {},
         files: [],
-        include: ['.nuxt/nuxt.d.ts'],
+        include: options.isUsingTsSolutionConfig ? undefined : ['.nuxt/nuxt.d.ts'],
         references: [
             {
                 path: './tsconfig.app.json',