@nx/vue 19.5.7 → 19.6.0-beta.1

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

@@ -4,13 +4,25 @@ exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
 const web_1 = require("@nx/web");
 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(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const hasPlugin = nxJson.plugins?.find((p) => typeof p === 'string'
+        ? p === '@nx/vite/plugin'
+        : p.plugin === '@nx/vite/plugin');
+    const e2eWebServerTarget = hasPlugin
+        ? typeof hasPlugin === 'string'
+            ? 'serve'
+            : hasPlugin.options?.serveTargetName ?? 'serve'
+        : 'serve';
+    const e2eCiWebServerTarget = hasPlugin
+        ? typeof hasPlugin === 'string'
+            ? 'preview'
+            : hasPlugin.options?.previewTargetName ?? 'preview'
+        : 'preview';
     switch (options.e2eTestRunner) {
         case 'cypress': {
-            const nxJson = (0, devkit_1.readNxJson)(tree);
-            const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-                ? p === '@nx/vite/plugin'
-                : p.plugin === '@nx/vite/plugin');
             if (!hasPlugin) {
                 await (0, web_1.webStaticServeGenerator)(tree, {
                     buildTarget: `${options.projectName}:build`,
@@ -27,16 +39,38 @@ async function addE2e(tree, options) {
                 tags: [],
                 implicitDependencies: [options.projectName],
             });
-            return await configurationGenerator(tree, {
+            const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
                 directory: 'src',
                 bundler: 'vite',
                 skipFormat: true,
-                devServerTarget: `${options.projectName}:serve`,
+                devServerTarget: `${options.projectName}:${e2eWebServerTarget}`,
                 baseUrl: 'http://localhost:4200',
                 jsx: true,
+                webServerCommands: hasPlugin
+                    ? {
+                        default: `nx run ${options.projectName}:${e2eWebServerTarget}`,
+                        production: `nx run ${options.projectName}:preview`,
+                    }
+                    : undefined,
+                ciWebServerCommand: `nx run ${options.projectName}:${e2eCiWebServerTarget}`,
+                ciBaseUrl: 'http://localhost:4300',
             });
+            if (options.addPlugin ||
+                (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
+                    ? p === '@nx/cypress/plugin'
+                    : p.plugin === '@nx/cypress/plugin')) {
+                let buildTarget = '^build';
+                if (hasPlugin) {
+                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/vite/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`));
+                    if (matchingPlugin && typeof matchingPlugin !== 'string') {
+                        buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
+                    }
+                }
+                await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.${options.js ? 'js' : 'ts'}`));
+            }
+            return e2eTask;
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
@@ -47,7 +81,7 @@ async function addE2e(tree, options) {
                 targets: {},
                 implicitDependencies: [options.projectName],
             });
-            return configurationGenerator(tree, {
+            const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
                 skipFormat: true,
@@ -56,9 +90,23 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-                webServerAddress: 'http://localhost:4200',
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:${e2eCiWebServerTarget}`,
+                webServerAddress: 'http://localhost:4300',
             });
+            if (options.addPlugin ||
+                (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
+                    ? p === '@nx/playwright/plugin'
+                    : p.plugin === '@nx/playwright/plugin')) {
+                let buildTarget = '^build';
+                if (hasPlugin) {
+                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/vite/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`));
+                    if (matchingPlugin && typeof matchingPlugin !== 'string') {
+                        buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
+                    }
+                }
+                await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
+            }
+            return e2eTask;
         }
         case 'none':
         default:

package/src/generators/application/lib/create-application-files.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function createApplicationFiles(tree: Tree, options: NormalizedSchema): void;
+export declare function createApplicationFiles(tree: Tree, options: NormalizedSchema): Promise<void>;

package/src/generators/application/lib/create-application-files.js

@@ -5,12 +5,22 @@ const path = require("path");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const create_ts_config_1 = require("../../../utils/create-ts-config");
-function createApplicationFiles(tree, options) {
+const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+async function createApplicationFiles(tree, options) {
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     (0, devkit_1.generateFiles)(tree, path.join(__dirname, '../files/common'), options.appProjectRoot, {
         ...options,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         title: options.projectName,
     });
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, '../files/nx-welcome', onBoardingStatus), options.appProjectRoot, {
+        ...options,
+        connectCloudUrl,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        title: options.projectName,
+    });
     if (options.style !== 'none') {
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, '../files/stylesheet'), options.appProjectRoot, {
             ...options,

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

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