fix(react): ensure playwright configuration is using correct port in …

…app gen
nrwl · Feb 22, 2024 · 917ac8e · 917ac8e
1 parent 28cd744
commit 917ac8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/react/src/generators/application/lib/add-e2e.ts b/packages/react/src/generators/application/lib/add-e2e.ts
@@ -49,7 +49,7 @@ export async function addE2e(
         bundler: options.bundler === 'rspack' ? 'webpack' : options.bundler,
         skipFormat: true,
         devServerTarget: `${options.projectName}:serve`,
-        baseUrl: 'http://localhost:4200',
+        baseUrl: `http://localhost:${options.devServerPort ?? 4200}`,
         jsx: true,
         rootProject: options.rootProject,
         webServerCommands: hasNxBuildPlugin
@@ -85,7 +85,7 @@ export async function addE2e(
         webServerCommand: `${getPackageManagerCommand().exec} nx serve ${
           options.name
         }`,
-        webServerAddress: 'http://localhost:4200',
+        webServerAddress: `http://localhost:${options.devServerPort ?? 4200}`,
         rootProject: options.rootProject,
         addPlugin: options.addPlugin,
       });

diff --git a/packages/react/src/generators/host/lib/update-module-federation-e2e-project.ts b/packages/react/src/generators/host/lib/update-module-federation-e2e-project.ts
@@ -11,11 +11,13 @@ export function updateModuleFederationE2eProject(
 ) {
   try {
     let projectConfig = readProjectConfiguration(host, options.e2eProjectName);
-    projectConfig.targets.e2e.options = {
-      ...projectConfig.targets.e2e.options,
-      baseUrl: `http://localhost:${options.devServerPort}`,
-    };
-    updateProjectConfiguration(host, options.e2eProjectName, projectConfig);
+    if (projectConfig.targets.e2e.executor !== '@nx/playwright:playwright') {
+      projectConfig.targets.e2e.options = {
+        ...projectConfig.targets.e2e.options,
+        baseUrl: `http://localhost:${options.devServerPort}`,
+      };
+      updateProjectConfiguration(host, options.e2eProjectName, projectConfig);
+    }
   } catch {
     // nothing
   }