@nx/vue 18.0.0-beta.1 → 18.0.0-beta.3

package/generators.json

@@ -10,13 +10,13 @@
       "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 Vue application."
     },
     "library": {
-      "factory": "./src/generators/library/library",
+      "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",
@@ -35,7 +35,7 @@
       "description": "Set up Tailwind configuration for a project."
     },
     "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/configuration",
+      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGeneratorInternal",
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Set up storybook for a Vue app or library.",
       "hidden": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.0-beta.3",
   "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": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-beta.1",
-    "@nx/js": "18.0.0-beta.1",
-    "@nx/eslint": "18.0.0-beta.1",
-    "@nx/vite": "18.0.0-beta.1",
-    "@nx/web": "18.0.0-beta.1"
+    "@nx/devkit": "18.0.0-beta.3",
+    "@nx/js": "18.0.0-beta.3",
+    "@nx/eslint": "18.0.0-beta.3",
+    "@nx/vite": "18.0.0-beta.3",
+    "@nx/web": "18.0.0-beta.3"
   },
   "publishConfig": {
     "access": "public"

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, _options: Schema): Promise<GeneratorCallback>;
+export declare function applicationGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
+export declare function applicationGeneratorInternal(tree: Tree, _options: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationGenerator = void 0;
+exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
@@ -13,7 +13,11 @@ 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");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-async function applicationGenerator(tree, _options) {
+function applicationGenerator(tree, options) {
+    return applicationGeneratorInternal(tree, { addPlugin: false, ...options });
+}
+exports.applicationGenerator = applicationGenerator;
+async function applicationGeneratorInternal(tree, _options) {
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
     const tasks = [];
     (0, devkit_1.addProjectConfiguration)(tree, options.name, {
@@ -48,6 +52,7 @@ async function applicationGenerator(tree, _options) {
         skipPackageJson: options.skipPackageJson,
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
     }, 'app'));
     tasks.push(await (0, add_vite_1.addVite)(tree, options));
     tasks.push(await (0, add_e2e_1.addE2e)(tree, options));
@@ -60,5 +65,5 @@ async function applicationGenerator(tree, _options) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

package/src/generators/application/files/common/src/app/NxWelcome.vue.template

@@ -377,6 +377,25 @@ defineProps<{
             nx g @nx/vue:component ui/src/lib/button
           </pre>
         </details>
+        <details>
+          <summary>
+            <svg
+              fill="none"
+              stroke="currentColor"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth="2"
+                d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+              />
+            </svg>
+            View project details
+          </summary>
+          <pre>nx show project {{ title }} --web</pre>
+        </details>
         <details>
           <summary>
             <svg

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

@@ -13,6 +13,7 @@ async function addVite(tree, options) {
         includeVitest: options.unitTestRunner === 'vitest',
         skipFormat: true,
         testEnvironment: 'jsdom',
+        addPlugin: options.addPlugin,
     });
     (0, vite_1.createOrEditViteConfig)(tree, {
         project: options.name,

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

@@ -18,6 +18,7 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   rootProject?: boolean;
+  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/library/lib/add-vite.js

@@ -17,6 +17,7 @@ async function addVite(tree, options) {
             includeVitest: options.unitTestRunner === 'vitest',
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(tree, {
@@ -40,6 +41,7 @@ async function addVite(tree, options) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {

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

@@ -24,6 +24,7 @@ async function normalizeOptions(host, options) {
         }
     }
     const normalized = {
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
         ...options,
         bundler,
         fileName,

package/src/generators/library/library.d.ts

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

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.libraryGenerator = void 0;
+exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
@@ -12,7 +12,11 @@ const component_1 = require("../component/component");
 const add_vite_1 = require("./lib/add-vite");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-async function libraryGenerator(tree, schema) {
+function libraryGenerator(tree, schema) {
+    return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
+}
+exports.libraryGenerator = libraryGenerator;
+async function libraryGeneratorInternal(tree, schema) {
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     if (options.publishable === true && !schema.importPath) {
@@ -72,5 +76,5 @@ async function libraryGenerator(tree, schema) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.libraryGenerator = libraryGenerator;
+exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;

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

@@ -25,6 +25,7 @@ export interface Schema {
   unitTestRunner?: 'vitest' | 'none';
   minimal?: boolean;
   e2eTestRunner?: 'cypress' | 'none';
+  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

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

@@ -1,4 +1,5 @@
 import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storybookConfigurationGenerator = void 0;
+exports.storybookConfigurationGeneratorInternal = exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
@@ -13,7 +13,14 @@ async function generateStories(host, schema) {
         interactionTests: schema.interactionTests ?? true,
     });
 }
-async function storybookConfigurationGenerator(host, schema) {
+function storybookConfigurationGenerator(host, schema) {
+    return storybookConfigurationGeneratorInternal(host, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+async function storybookConfigurationGeneratorInternal(host, schema) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     const installTask = await configurationGenerator(host, {
         project: schema.project,
@@ -24,6 +31,7 @@ async function storybookConfigurationGenerator(host, schema) {
         configureStaticServe: schema.configureStaticServe,
         uiFramework: '@storybook/vue3-vite',
         skipFormat: true,
+        addPlugin: schema.addPlugin,
     });
     if (schema.generateStories) {
         await generateStories(host, schema);
@@ -31,5 +39,5 @@ async function storybookConfigurationGenerator(host, schema) {
     await (0, devkit_1.formatFiles)(host);
     return installTask;
 }
-exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
 exports.default = storybookConfigurationGenerator;

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

@@ -9,4 +9,5 @@ export interface StorybookConfigureSchema {
   linter?: Linter;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
+  addPlugin?: boolean;
 }

package/src/utils/add-linting.d.ts

@@ -8,5 +8,6 @@ export declare function addLinting(host: Tree, options: {
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     rootProject?: boolean;
+    addPlugin?: boolean;
 }, projectType: 'lib' | 'app'): Promise<import("@nx/devkit").GeneratorCallback>;
 export declare function editEslintConfigFiles(tree: Tree, projectRoot: string, rootProject?: boolean): void;

package/src/utils/add-linting.js

@@ -18,6 +18,7 @@ async function addLinting(host, options, projectType) {
             skipFormat: true,
             setParserOptionsProject: options.setParserOptionsProject,
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         });
         if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
             (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, [