@nx/nuxt 17.3.0-beta.3 → 17.3.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.5",
   "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, 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": {
@@ -30,10 +30,10 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.8.1",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/vue": "17.3.0-beta.3"
+    "@nx/devkit": "17.3.0-beta.5",
+    "@nx/js": "17.3.0-beta.5",
+    "@nx/eslint": "17.3.0-beta.5",
+    "@nx/vue": "17.3.0-beta.5"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/application.js

@@ -12,15 +12,23 @@ const add_e2e_1 = require("./lib/add-e2e");
 const add_linting_1 = require("../../utils/add-linting");
 const add_vitest_1 = require("./lib/add-vitest");
 const vue_1 = require("@nx/vue");
+const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 async function applicationGenerator(tree, schema) {
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
+    const jsInitTask = await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const nuxtInitTask = await (0, init_1.default)(tree, {
         ...options,
         skipFormat: true,
     });
     tasks.push(nuxtInitTask);
+    tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     (0, devkit_1.addProjectConfiguration)(tree, options.name, {
         root: options.appProjectRoot,
         projectType: 'application',

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

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from '../schema';
+export declare function ensureDependencies(host: Tree, options: NormalizedSchema): import("@nx/devkit").GeneratorCallback;

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

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const vue_1 = require("@nx/vue");
+const versions_1 = require("../../../utils/versions");
+function ensureDependencies(host, options) {
+    const devDependencies = {
+        '@nx/vite': versions_1.nxVersion,
+        '@nuxt/devtools': versions_1.nuxtDevtoolsVersion,
+        '@nuxt/kit': versions_1.nuxtVersion,
+        '@nuxt/ui-templates': versions_1.nuxtUiTemplatesVersion,
+        nuxt: versions_1.nuxtVersion,
+        h3: versions_1.h3Version,
+        vue: vue_1.vueVersion,
+        'vue-router': vue_1.vueRouterVersion,
+        'vue-tsc': vue_1.vueTscVersion,
+    };
+    if (options.style === 'scss') {
+        devDependencies['sass'] = vue_1.sassVersion;
+    }
+    else if (options.style === 'less') {
+        devDependencies['less'] = vue_1.lessVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
+}
+exports.ensureDependencies = ensureDependencies;

package/src/generators/init/init.js

@@ -1,22 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nuxtInitGenerator = void 0;
-const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
 const utils_1 = require("./lib/utils");
 async function nuxtInitGenerator(host, schema) {
-    const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        skipFormat: true,
-    }));
+    (0, utils_1.addPlugin)(host);
+    let installTask = () => { };
     if (!schema.skipPackageJson) {
-        const installTask = (0, utils_1.updateDependencies)(host, schema);
-        tasks.push(installTask);
+        installTask = (0, utils_1.updateDependencies)(host, schema);
     }
-    (0, utils_1.addPlugin)(host);
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.nuxtInitGenerator = nuxtInitGenerator;
 exports.default = nuxtInitGenerator;

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

@@ -3,28 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPlugin = exports.addVitestTargetDefaults = exports.updateDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const vue_1 = require("@nx/vue");
 function updateDependencies(host, schema) {
-    let devDependencies = {
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
         '@nx/nuxt': versions_1.nxVersion,
-        '@nx/vite': versions_1.nxVersion,
-        '@nuxt/devtools': versions_1.nuxtDevtoolsVersion,
-        '@nuxt/kit': versions_1.nuxtVersion,
-        '@nuxt/ui-templates': versions_1.nuxtUiTemplatesVersion,
         nuxi: versions_1.nuxtVersion,
-        nuxt: versions_1.nuxtVersion,
-        h3: versions_1.h3Version,
-        vue: vue_1.vueVersion,
-        'vue-router': vue_1.vueRouterVersion,
-        'vue-tsc': vue_1.vueTscVersion,
-    };
-    if (schema.style === 'scss') {
-        devDependencies['sass'] = vue_1.sassVersion;
-    }
-    else if (schema.style === 'less') {
-        devDependencies['less'] = vue_1.lessVersion;
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
+    });
 }
 exports.updateDependencies = updateDependencies;
 function addVitestTargetDefaults(tree) {

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

@@ -1,6 +1,4 @@
 export interface InitSchema {
-  skipFormat: boolean;
+  skipFormat?: boolean;
   skipPackageJson?: boolean;
-  rootProject?: boolean;
-  style?: 'css' | 'scss' | 'less' | 'none';
 }

package/src/generators/init/schema.json

@@ -11,20 +11,10 @@
       "type": "boolean",
       "default": false
     },
-    "rootProject": {
-      "description": "Create a project at the root of the workspace",
-      "type": "boolean",
-      "default": false
-    },
     "skipPackageJson": {
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
       "default": false
-    },
-    "style": {
-      "description": "The file extension to be used for style files.",
-      "type": "string",
-      "default": "css"
     }
   },
   "required": []