@nx/nuxt 22.2.0-beta.0 → 22.2.0-beta.1

package/src/generators/application/lib/ensure-dependencies.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { NormalizedSchema } from '../schema';
-export declare function ensureDependencies(host: Tree, options: NormalizedSchema): import("@nx/devkit").GeneratorCallback;
+export declare function ensureDependencies(host: Tree, options: NormalizedSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 //# sourceMappingURL=ensure-dependencies.d.ts.map

package/src/generators/application/lib/ensure-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/ensure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAerE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,0CAoBvE"}
+{"version":3,"file":"ensure-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/ensure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAUrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,mDAuB1B"}

package/src/generators/application/lib/ensure-dependencies.js

@@ -4,14 +4,16 @@ exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
 const vue_1 = require("@nx/vue");
 const versions_1 = require("../../../utils/versions");
-function ensureDependencies(host, options) {
+const version_utils_1 = require("../../../utils/version-utils");
+async function ensureDependencies(host, options) {
+    const nuxtVersions = await (0, version_utils_1.getNuxtDependenciesVersionsToInstall)(host);
     const devDependencies = {
         '@nx/vite': versions_1.nxVersion, // needed for the nxViteTsPaths plugin and @nx/vite/plugin
-        '@nuxt/devtools': versions_1.nuxtDevtoolsVersion,
-        '@nuxt/kit': versions_1.nuxtVersion,
-        '@nuxt/ui-templates': versions_1.nuxtUiTemplatesVersion,
-        nuxt: versions_1.nuxtVersion,
-        h3: versions_1.h3Version,
+        '@nuxt/devtools': nuxtVersions.nuxtDevtools,
+        '@nuxt/kit': nuxtVersions.nuxtKit,
+        '@nuxt/ui-templates': nuxtVersions.nuxtUiTemplates,
+        nuxt: nuxtVersions.nuxt,
+        h3: nuxtVersions.h3,
         vue: vue_1.vueVersion,
         'vue-router': vue_1.vueRouterVersion,
         'vue-tsc': vue_1.vueTscVersion,

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAE,MAAM,YAAY,CAAC;AAKzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CA4C3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAE,MAAM,YAAY,CAAC;AAKzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAqD3B"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const version_utils_1 = require("../../../utils/version-utils");
 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, {
@@ -19,6 +20,11 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    // Detect workspace Nuxt version
+    const nuxtVersions = await (0, version_utils_1.getNuxtDependenciesVersionsToInstall)(host);
+    const nuxtMajorVersion = nuxtVersions.nuxt.startsWith('^4') ? 4 : 3;
+    // Set useAppDir default based on version (v4 defaults to true, v3 defaults to false)
+    const useAppDir = options.useAppDir ?? nuxtMajorVersion >= 4;
     const normalized = {
         ...options,
         name: projectNames.projectFileName,
@@ -31,6 +37,8 @@ async function normalizeOptions(host, options) {
         style: options.style ?? 'none',
         isUsingTsSolutionConfig,
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        useAppDir,
+        nuxtMajorVersion,
     };
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';

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

@@ -17,6 +17,7 @@ export interface Schema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   useProjectJson?: boolean;
+  useAppDir?: boolean;
 }
 
 export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
@@ -27,4 +28,6 @@ export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
   e2eProjectRoot: string;
   parsedTags: string[];
   isUsingTsSolutionConfig: boolean;
+  useAppDir: boolean;
+  nuxtMajorVersion: 3 | 4;
 }

package/src/generators/application/schema.json

@@ -110,6 +110,11 @@
     "useProjectJson": {
       "type": "boolean",
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
+    },
+    "useAppDir": {
+      "type": "boolean",
+      "description": "Use Nuxt 4 app/ directory structure instead of src/ directory. Defaults to true for Nuxt v4, false for Nuxt v3.",
+      "x-priority": "important"
     }
   },
   "required": ["directory"],

package/src/generators/init/init.js

@@ -14,7 +14,7 @@ async function nuxtInitGenerator(host, schema) {
     }, schema.updatePackageScripts);
     let installTask = () => { };
     if (!schema.skipPackageJson) {
-        installTask = (0, utils_1.updateDependencies)(host, schema);
+        installTask = await (0, utils_1.updateDependencies)(host, schema);
     }
     return installTask;
 }

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

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { InitSchema } from '../schema';
-export declare function updateDependencies(host: Tree, schema: InitSchema): import("@nx/devkit").GeneratorCallback;
+export declare function updateDependencies(host: Tree, schema: InitSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export declare function addVitestTargetDefaults(tree: Tree): void;
 export declare function addPlugin(tree: Tree): void;
 //# sourceMappingURL=utils.d.ts.map

package/src/generators/init/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,0CAYhE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,QAcjD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,QAiDnC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,mDActE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,QAcjD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,QAiDnC"}

package/src/generators/init/lib/utils.js

@@ -5,10 +5,12 @@ exports.addVitestTargetDefaults = addVitestTargetDefaults;
 exports.addPlugin = addPlugin;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-function updateDependencies(host, schema) {
+const version_utils_1 = require("../../../utils/version-utils");
+async function updateDependencies(host, schema) {
+    const nuxtVersions = await (0, version_utils_1.getNuxtDependenciesVersionsToInstall)(host);
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
         '@nx/nuxt': versions_1.nxVersion,
-        nuxt: versions_1.nuxtVersion,
+        nuxt: nuxtVersions.nuxt,
         '@nx/vite': versions_1.nxVersion,
     }, undefined, schema.keepExistingVersions);
 }

package/src/generators/storybook-configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/nuxt/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMlC,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,mDA6BhB;AAED,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/nuxt/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMlC,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,mDAyChB;AAED,eAAe,+BAA+B,CAAC"}

package/src/generators/storybook-configuration/configuration.js

@@ -8,12 +8,22 @@ const vue_1 = require("@nx/vue");
  * are just adding the styles in `.storybook/preview.ts`
  */
 async function storybookConfigurationGenerator(tree, options) {
+    const { root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    // Determine the source directory (app/ for Nuxt v4, src/ for Nuxt v3)
+    const sourceDir = sourceRoot?.endsWith('/app')
+        ? 'app'
+        : sourceRoot?.endsWith('/src')
+            ? 'src'
+            : 'src'; // default to src for backward compatibility
     const storybookConfigurationGenerator = await (0, vue_1.storybookConfigurationGenerator)(tree, {
         ...options,
         addPlugin: true,
     });
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    tree.write((0, devkit_1.joinPathFragments)(root, '.storybook', 'preview.' + (options.tsConfiguration ? 'ts' : 'js')), `import '../src/assets/css/styles.css';`);
+    // Default tsConfiguration to true to match schema default
+    const tsConfiguration = options.tsConfiguration ?? true;
+    // Write the preview file after the base storybook configuration is set up
+    // This ensures we overwrite any default content with our Nuxt-specific import
+    tree.write((0, devkit_1.joinPathFragments)(root, '.storybook', 'preview.' + (tsConfiguration ? 'ts' : 'js')), `import '../${sourceDir}/assets/css/styles.css';`);
     (0, devkit_1.updateJson)(tree, `${root}/tsconfig.storybook.json`, (json) => {
         json.compilerOptions = {
             ...json.compilerOptions,

package/src/migrations/update-22-2-0/create-ai-instructions-for-nuxt-4.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function createAiInstructionsForNuxt(tree: Tree): Promise<string[]>;
+//# sourceMappingURL=create-ai-instructions-for-nuxt-4.d.ts.map

package/src/migrations/update-22-2-0/create-ai-instructions-for-nuxt-4.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-ai-instructions-for-nuxt-4.d.ts","sourceRoot":"","sources":["../../../../../../packages/nuxt/src/migrations/update-22-2-0/create-ai-instructions-for-nuxt-4.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,wBAA8B,2BAA2B,CAAC,IAAI,EAAE,IAAI,qBAenE"}

package/src/migrations/update-22-2-0/create-ai-instructions-for-nuxt-4.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = createAiInstructionsForNuxt;
+const path_1 = require("path");
+const fs_1 = require("fs");
+async function createAiInstructionsForNuxt(tree) {
+    const pathToAiInstructions = (0, path_1.join)(__dirname, 'files', 'ai-instructions-for-nuxt-4.md');
+    if (!(0, fs_1.existsSync)(pathToAiInstructions)) {
+        return;
+    }
+    const contents = (0, fs_1.readFileSync)(pathToAiInstructions);
+    tree.write('ai-migrations/MIGRATE_NUXT_4.md', contents);
+    return [
+        `We created 'ai-migrations/MIGRATE_NUXT_4.md' with instructions for an AI Agent to help migrate your Nuxt projects to Nuxt 4.`,
+    ];
+}