@nx/vue 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "private": false,
   "description": "The Vue plugin for Nx contains executors and generators for managing Vue 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,11 +30,11 @@
   "dependencies": {
     "minimatch": "3.0.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/vite": "17.3.0-beta.3",
-    "@nx/web": "17.3.0-beta.3"
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/eslint": "17.3.0-beta.4",
+    "@nx/vite": "17.3.0-beta.4",
+    "@nx/web": "17.3.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const js_1 = require("@nx/js");
 const normalize_options_1 = require("./lib/normalize-options");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
@@ -10,6 +11,7 @@ const add_e2e_1 = require("./lib/add-e2e");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_vite_1 = require("./lib/add-vite");
 const create_ts_config_1 = require("../../utils/create-ts-config");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 async function applicationGenerator(tree, _options) {
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
     const tasks = [];
@@ -19,10 +21,20 @@ async function applicationGenerator(tree, _options) {
         sourceRoot: `${options.appProjectRoot}/src`,
         targets: {},
     });
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...options,
+        tsConfigName: options.rootProject
+            ? 'tsconfig.json'
+            : 'tsconfig.base.json',
+        skipFormat: true,
+    }));
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,
     }));
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
+    }
     if (!options.rootProject) {
         (0, create_ts_config_1.extractTsConfigBase)(tree);
     }

package/src/generators/init/init.js

@@ -2,40 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vueInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(host, schema) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/vue'], []);
-    let dependencies = {
-        vue: versions_1.vueVersion,
-    };
-    let devDependencies = {
-        '@nx/vue': versions_1.nxVersion,
-        '@vue/tsconfig': versions_1.vueTsconfigVersion,
-        '@vue/test-utils': versions_1.vueTestUtilsVersion,
-        '@vitejs/plugin-vue': versions_1.vitePluginVueVersion,
-        'vue-tsc': versions_1.vueTscVersion,
-    };
-    if (schema.routing) {
-        dependencies['vue-router'] = versions_1.vueRouterVersion;
-    }
-    if (schema.style === 'scss') {
-        devDependencies['sass'] = versions_1.sassVersion;
-    }
-    else if (schema.style === 'less') {
-        devDependencies['less'] = versions_1.lessVersion;
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
-}
-async function vueInitGenerator(host, schema) {
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        skipFormat: true,
-    }));
-    tasks.push(updateDependencies(host, schema));
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/vue'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { vue: versions_1.vueVersion }, { '@nx/vue': versions_1.nxVersion }));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+async function vueInitGenerator(host, schema) {
+    let installTask = () => { };
+    if (!schema.skipPackageJson) {
+        installTask = updateDependencies(host, schema);
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return installTask;
+}
 exports.vueInitGenerator = vueInitGenerator;
 exports.default = vueInitGenerator;

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

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

package/src/generators/init/schema.json

@@ -11,26 +11,10 @@
       "type": "boolean",
       "default": false
     },
-    "js": {
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
-      "description": "Use JavaScript instead of TypeScript",
       "default": false
-    },
-    "rootProject": {
-      "description": "Create a project at the root of the workspace",
-      "type": "boolean",
-      "default": false
-    },
-    "routing": {
-      "type": "boolean",
-      "description": "Generate application with routes.",
-      "x-prompt": "Would you like to add Vue Router to this application?",
-      "default": false
-    },
-    "style": {
-      "description": "The file extension to be used for style files.",
-      "type": "string",
-      "default": "css"
     }
   },
   "required": []

package/src/generators/library/library.js

@@ -10,6 +10,7 @@ const create_library_files_1 = require("./lib/create-library-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const component_1 = require("../component/component");
 const add_vite_1 = require("./lib/add-vite");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 async function libraryGenerator(tree, schema) {
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
@@ -23,10 +24,14 @@ async function libraryGenerator(tree, schema) {
         tags: options.parsedTags,
         targets: {},
     });
+    tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,
     }));
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
+    }
     (0, create_ts_config_1.extractTsConfigBase)(tree);
     tasks.push(await (0, add_linting_1.addLinting)(tree, options, 'lib'));
     (0, create_library_files_1.createLibraryFiles)(tree, options);

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,6 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export type EnsureDependenciesOptions = {
+    routing?: boolean;
+    style?: 'scss' | 'less' | 'none' | 'css';
+};
+export declare function ensureDependencies(tree: Tree, options: EnsureDependenciesOptions): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("./versions");
+function ensureDependencies(tree, options) {
+    const dependencies = {};
+    const devDependencies = {
+        '@vue/tsconfig': versions_1.vueTsconfigVersion,
+        '@vue/test-utils': versions_1.vueTestUtilsVersion,
+        '@vitejs/plugin-vue': versions_1.vitePluginVueVersion,
+        'vue-tsc': versions_1.vueTscVersion,
+    };
+    if (options.routing) {
+        dependencies['vue-router'] = versions_1.vueRouterVersion;
+    }
+    if (options.style === 'scss') {
+        devDependencies['sass'] = versions_1.sassVersion;
+    }
+    else if (options.style === 'less') {
+        devDependencies['less'] = versions_1.lessVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+}
+exports.ensureDependencies = ensureDependencies;