@nx/react 19.5.7 → 19.6.0-beta.1

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

@@ -6,18 +6,20 @@ const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const has_vite_plugin_1 = require("../../../utils/has-vite-plugin");
+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 hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
+        (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
+    if (!hasNxBuildPlugin) {
+        await (0, web_1.webStaticServeGenerator)(tree, {
+            buildTarget: `${options.projectName}:build`,
+            targetName: 'serve-static',
+            spa: true,
+        });
+    }
     switch (options.e2eTestRunner) {
         case 'cypress': {
-            const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
-                (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
-            if (!hasNxBuildPlugin) {
-                await (0, web_1.webStaticServeGenerator)(tree, {
-                    buildTarget: `${options.projectName}:build`,
-                    targetName: 'serve-static',
-                    spa: true,
-                });
-            }
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
                 projectType: 'application',
@@ -27,7 +29,7 @@ async function addE2e(tree, options) {
                 implicitDependencies: [options.projectName],
                 tags: [],
             });
-            return await configurationGenerator(tree, {
+            const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
                 directory: 'src',
@@ -45,9 +47,29 @@ async function addE2e(tree, options) {
                     }
                     : undefined,
                 ciWebServerCommand: hasNxBuildPlugin
-                    ? `nx run ${options.projectName}:serve-static`
+                    ? `nx run ${options.projectName}:${options.e2eCiWebServerTarget}`
                     : undefined,
+                ciBaseUrl: options.bundler === 'vite' ? options.e2eCiBaseUrl : undefined,
             });
+            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 (hasNxBuildPlugin) {
+                    const configFile = options.bundler === 'webpack'
+                        ? 'webpack.config.js'
+                        : options.bundler === 'vite'
+                            ? `vite.config.${options.js ? 'js' : 'ts'}`
+                            : 'webpack.config.js';
+                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/${options.bundler}/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, configFile));
+                    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);
@@ -58,7 +80,7 @@ async function addE2e(tree, options) {
                 targets: {},
                 implicitDependencies: [options.projectName],
             });
-            return configurationGenerator(tree, {
+            const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,
                 skipPackageJson: options.skipPackageJson,
@@ -66,11 +88,30 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-                webServerAddress: options.e2eWebServerAddress,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:${options.e2eCiWebServerTarget}`,
+                webServerAddress: options.e2eCiBaseUrl,
                 rootProject: options.rootProject,
                 addPlugin: options.addPlugin,
             });
+            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 (hasNxBuildPlugin) {
+                    const configFile = options.bundler === 'webpack'
+                        ? 'webpack.config.js'
+                        : options.bundler === 'vite'
+                            ? `vite.config.${options.js ? 'js' : 'ts'}`
+                            : 'webpack.config.js';
+                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/${options.bundler}/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, configFile));
+                    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(host: Tree, options: NormalizedSchema): void;
+export declare function createApplicationFiles(host: Tree, options: NormalizedSchema): Promise<void>;

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

@@ -9,7 +9,8 @@ const get_in_source_vitest_tests_template_1 = require("../../../utils/get-in-sou
 const maybe_js_1 = require("../../../utils/maybe-js");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
-function createApplicationFiles(host, options) {
+const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+async function createApplicationFiles(host, options) {
     let styleSolutionSpecificAppFiles;
     if (options.styledModule && options.style !== 'styled-jsx') {
         styleSolutionSpecificAppFiles = '../files/style-styled-module';
@@ -29,6 +30,9 @@ function createApplicationFiles(host, options) {
     else {
         styleSolutionSpecificAppFiles = '../files/style-css-module';
     }
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(host, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
     const appTests = (0, get_app_tests_1.getAppTests)(options);
     const templateVariables = {
@@ -114,7 +118,10 @@ function createApplicationFiles(host, options) {
         host.delete(`${options.appProjectRoot}/src/app/${options.fileName}.spec.tsx`);
     }
     if (!options.minimal) {
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/nx-welcome'), options.appProjectRoot, templateVariables);
+        const tutorialUrl = options.rootProject
+            ? 'https://nx.dev/getting-started/tutorials/react-standalone-tutorial'
+            : 'https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project';
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/nx-welcome', onBoardingStatus), options.appProjectRoot, { ...templateVariables, connectCloudUrl, tutorialUrl });
     }
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles), options.appProjectRoot, templateVariables);
     if (options.js) {

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

@@ -32,28 +32,35 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    let e2ePort = options.devServerPort ?? 4200;
     let e2eWebServerTarget = 'serve';
+    let e2eCiWebServerTarget = options.bundler === 'vite' ? 'preview' : 'serve-static';
     if (options.addPlugin) {
         if (nxJson.plugins) {
             for (const plugin of nxJson.plugins) {
                 if (options.bundler === 'vite' &&
                     typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/vite/plugin' &&
-                    plugin.options.serveTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .serveTargetName;
+                    plugin.plugin === '@nx/vite/plugin') {
+                    e2eCiWebServerTarget =
+                        plugin.options?.previewTargetName ??
+                            e2eCiWebServerTarget;
+                    e2eWebServerTarget =
+                        plugin.options?.serveTargetName ??
+                            e2eWebServerTarget;
                 }
                 else if (options.bundler === 'webpack' &&
                     typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/webpack/plugin' &&
-                    plugin.options.serveTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .serveTargetName;
+                    plugin.plugin === '@nx/webpack/plugin') {
+                    e2eCiWebServerTarget =
+                        plugin.options?.serveStaticTargetName ??
+                            e2eCiWebServerTarget;
+                    e2eWebServerTarget =
+                        plugin.options?.serveTargetName ??
+                            e2eWebServerTarget;
                 }
             }
         }
     }
-    let e2ePort = options.devServerPort ?? 4200;
     if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
         nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
         e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
@@ -61,6 +68,9 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const e2eWebServerAddress = `http://localhost:${e2ePort}`;
+    const e2eCiBaseUrl = options.bundler === 'vite'
+        ? 'http://localhost:4300'
+        : `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -78,6 +88,8 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
         e2eProjectRoot,
         e2eWebServerAddress,
         e2eWebServerTarget,
+        e2eCiWebServerTarget,
+        e2eCiBaseUrl,
         e2ePort,
         parsedTags,
         fileName,

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

@@ -29,6 +29,7 @@ export interface Schema {
   bundler?: 'webpack' | 'vite' | 'rspack';
   minimal?: boolean;
   addPlugin?: boolean;
+  nxCloudToken?: string;
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {
@@ -38,6 +39,8 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   e2eProjectRoot: string;
   e2eWebServerAddress: string;
   e2eWebServerTarget: string;
+  e2eCiWebServerTarget: string;
+  e2eCiBaseUrl: string;
   e2ePort: number;
   parsedTags: string[];
   fileName: string;