Merge branch 'master' into projects-on-schema

nrwl · Dec 7, 2023 · 1f8ae49 · 1f8ae49
2 parents 1b203af + 61429c0
commit 1f8ae49
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/packages/cypress/src/generators/configuration/configuration.spec.ts b/packages/cypress/src/generators/configuration/configuration.spec.ts
@@ -43,6 +43,11 @@ describe('Cypress e2e configuration', () => {
       await cypressE2EConfigurationGenerator(tree, {
         project: 'my-app',
         baseUrl: 'http://localhost:4200',
+        webServerCommands: {
+          default: 'nx run my-app:serve',
+          production: 'nx run my-app:serve:production',
+        },
+        ciWebServerCommand: 'nx run my-app:serve-static',
       });
       expect(tree.read('apps/my-app/cypress.config.ts', 'utf-8'))
         .toMatchInlineSnapshot(`

diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts
@@ -40,6 +40,9 @@ export interface CypressE2EConfigSchema {
   port?: number | 'cypress-auto';
   jsx?: boolean;
   rootProject?: boolean;
+
+  webServerCommands?: Record<string, string>;
+  ciWebServerCommand?: string;
 }
 
 type NormalizedSchema = ReturnType<typeof normalizeOptions>;
@@ -166,9 +169,12 @@ async function addFiles(
     const cyFile = joinPathFragments(projectConfig.root, 'cypress.config.ts');
     let webServerCommands: Record<string, string>;
 
-    let ciDevServerTarget: string;
+    let ciWebServerCommand: string;
 
-    if (hasPlugin && options.devServerTarget) {
+    if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {
+      webServerCommands = options.webServerCommands;
+      ciWebServerCommand = options.ciWebServerCommand;
+    } else if (hasPlugin && options.devServerTarget) {
       webServerCommands = {};
 
       webServerCommands.default = 'nx run ' + options.devServerTarget;
@@ -192,7 +198,7 @@ async function addFiles(
       }
       // Add ci/static e2e target if serve target is found
       if (devServerProjectConfig.targets?.['serve-static']) {
-        ciDevServerTarget = `nx run ${parsedTarget.project}:serve-static`;
+        ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;
       }
     }
     const updatedCyConfig = await addDefaultE2EConfig(
@@ -201,7 +207,7 @@ async function addFiles(
         cypressDir: options.directory,
         bundler: options.bundler === 'vite' ? 'vite' : undefined,
         webServerCommands,
-        ciWebServerCommand: ciDevServerTarget,
+        ciWebServerCommand: ciWebServerCommand,
       },
       options.baseUrl
     );

diff --git a/packages/nx/src/nx-cloud/update-manager.ts b/packages/nx/src/nx-cloud/update-manager.ts
@@ -315,7 +315,8 @@ async function downloadAndExtractClientBundle(
         const writeStream = createWriteStream(outputFilePath);
         stream.pipe(writeStream);
 
-        stream.on('end', function () {
+        // Continue the tar stream after the write stream closes
+        writeStream.on('close', () => {
           next();
         });
 

diff --git a/packages/react/src/generators/application/lib/add-e2e.ts b/packages/react/src/generators/application/lib/add-e2e.ts
@@ -18,10 +18,10 @@ export async function addE2e(
 ): Promise<GeneratorCallback> {
   switch (options.e2eTestRunner) {
     case 'cypress': {
-      if (
-        (options.bundler === 'webpack' && !hasWebpackPlugin(tree)) ||
-        (options.bundler === 'vite' && !hasVitePlugin(tree))
-      ) {
+      const hasNxBuildPlugin =
+        (options.bundler === 'webpack' && hasWebpackPlugin(tree)) ||
+        (options.bundler === 'vite' && hasVitePlugin(tree));
+      if (!hasNxBuildPlugin) {
         webStaticServeGenerator(tree, {
           buildTarget: `${options.projectName}:build`,
           targetName: 'serve-static',
@@ -52,6 +52,15 @@ export async function addE2e(
         baseUrl: 'http://localhost:4200',
         jsx: true,
         rootProject: options.rootProject,
+        webServerCommands: hasNxBuildPlugin
+          ? {
+              default: `nx run ${options.projectName}:serve`,
+              production: `nx run ${options.projectName}:preview`,
+            }
+          : undefined,
+        ciWebServerCommand: hasNxBuildPlugin
+          ? `nx run ${options.projectName}:serve-static`
+          : undefined,
       });
     }
     case 'playwright': {