chore(repo): revert enable e2e splitting for nx-dev-e2e (#21922) (#22164)

.circleci/config.yml

@@ -162,7 +162,7 @@ jobs:
             pids+=($!)
 
             (pnpm nx affected --targets=lint,test,build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &&
-            pnpm nx affected --targets=e2e,e2e-ci --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
+            pnpm nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --parallel=1) &
             pids+=($!)
 
             for pid in "${pids[@]}"; do

.nx/workflows/agents.yaml

@@ -19,7 +19,6 @@ launch-templates:
           PATHS: |
             node_modules
             ~/.cache/Cypress
-            ~/.cache/ms-playwright
             ~/.pnpm-store
             ~/.sdkman
             ~/.sdkman/candidates/gradle
@@ -36,10 +35,8 @@ launch-templates:
         script: |
           pnpm install --frozen-lockfile
 
-      - name: Install Browsers
+      - name: Install Cypress
-        script: |
+        script: pnpm exec cypress install
-          pnpm exec cypress install
-          pnpm exec playwright install
 
       - name: Install Rust
         script: |

nx-dev/nx-dev-e2e/playwright.config.ts

@@ -1,47 +1,27 @@
 import { defineConfig, devices } from '@playwright/test';
-
+import { nxE2EPreset } from '@nx/playwright/preset';
-/*
- * NOTE: We're not using the `nxE2EPreset` from `@nx/playwright` because there is an issue with `nx-ignore` + nx repo + crystal.
- *
- * The problem is specific to Nx repo, because of the following incompatible combination:
- * 1. `nx-ignore` only installs nx + necessary plugins (as defined in nx.json).
- * 2. `@nx/playwright/plugin` registers tsconfig-paths, thus `@nx/devkit` and `nx` packages are read from source
- *    e.g. packages/devkit rather than node_modules/@nx/devkit
- * 3. When `@nx/playwright/plugin` reads this config file (playwright.config.ts), it eventually loads `packages/devkit` instead of `node_modules/@nx/devkit`.
- *
- * Then, you will see an error like this:
- * Unable to create nodes for nx-dev/nx-dev-e2e/playwright.config.ts using plugin @nx/playwright/plugin.
- * 	 Inner Error: Error: Cannot find module 'fs-extra'
- * Require stack:
- * - /vercel/path0/packages/nx/src/project-graph/nx-deps-cache.ts
- * - /vercel/path0/packages/nx/src/project-graph/project-graph.ts
- * - /vercel/path0/packages/nx/src/config/workspaces.ts
- * - /vercel/path0/packages/nx/src/devkit-exports.ts
- * - /vercel/path0/packages/devkit/index.ts
- *
- * Again, this is specific to Nx repo only, because we both install nx + plugins to node_modules, but they are also mapped to source in tsconfig paths.
- */
 
 // nx-ignore-next-line
+import { workspaceRoot } from '@nx/devkit';
+
 // For CI, you may want to set BASE_URL to the deployed application.
 const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
 
+const preset = nxE2EPreset(__filename, { testDir: './src' });
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
 /**
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  testDir: './src',
+  ...preset,
-  outputDir: '../../dist/.playwright/nx-dev-e2e/test-output',
+  // CI default is 'dot', which doesn't show error output in CI.
-  /* Run tests in files in parallel */
+  // use list so errors are visible in CI logs
-  fullyParallel: true,
+  reporter: process.env.CI ? 'list' : preset.reporter,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'list',
   // how long the entire suite can run, prevent CI from timing out
   globalTimeout: process.env.CI ? 1_800_000 : undefined,
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
@@ -54,14 +34,25 @@ export default defineConfig({
   },
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'pnpm exec nx run nx-dev:next-start',
+    command: 'pnpm exec nx run nx-dev:serve:production',
     url: 'http://localhost:4200',
     reuseExistingServer: !process.env.CI,
+    cwd: workspaceRoot,
   },
   projects: [
     {
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
   ],
 });

nx-dev/nx-dev-e2e/project.json

@@ -4,7 +4,21 @@
   "sourceRoot": "nx-dev/nx-dev-e2e/src",
   "projectType": "application",
   "targets": {
-    "lint": {}
+    "lint": {},
+    "e2e": {
+      "dependsOn": [
+        {
+          "target": "build-base",
+          "dependencies": true
+        }
+      ],
+      "executor": "@nx/playwright:playwright",
+      "outputs": ["{workspaceRoot}/dist/.playwright/nx-dev/nx-dev-e2e"],
+      "options": {
+        "config": "nx-dev/nx-dev-e2e/playwright.config.ts",
+        "project": ["chromium"]
+      }
+    }
   },
   "tags": ["scope:nx-dev", "type:e2e"],
   "implicitDependencies": ["nx-dev"]

nx-dev/nx-dev/next-sitemap.config.js

@@ -1,4 +1,4 @@
-const path = require('node:path');
+const path = require('path');
 
 module.exports = {
   siteUrl: process.env.SITE_URL || 'https://nx.dev',

nx-dev/nx-dev/next.config.js

@@ -3,8 +3,6 @@ const { withNx } = require('@nx/next/plugins/with-nx');
 const redirectRules = require('./redirect-rules');
 
 module.exports = withNx({
-  // This is technically invalid, but we need to update our Vercel setting it order to change this.
-  distDir: '../../dist/nx-dev/nx-dev/.next',
   // For both client and server
   env: {
     VERCEL: process.env.VERCEL,

nx-dev/nx-dev/project.json

@@ -4,26 +4,15 @@
   "sourceRoot": "nx-dev/nx-dev",
   "projectType": "application",
   "targets": {
-    "next-build": {
-      "dependsOn": ["copy-docs"]
-    },
-    "next-dev": {
-      "dependsOn": ["copy-docs"],
-      "options": {
-        "args": "--port 4200"
-      }
-    },
-    "next-start": {
-      "options": {
-        "args": "--port 4200"
-      }
-    },
     "build": {
-      "dependsOn": ["next-build"],
+      "dependsOn": [
+        {
+          "target": "build-base"
+        }
+      ],
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "ls -lsa dist/nx-dev/nx-dev/.next",
           "nx run nx-dev:sitemap",
           "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/documentation/internal-link-checker.ts"
         ],
@@ -35,13 +24,14 @@
         "{workspaceRoot}/scripts/tsconfig.scripts.json",
         "{workspaceRoot}/scripts/documentation/internal-link-checker.ts"
       ],
-      "outputs": [
+      "outputs": ["{workspaceRoot}/dist/nx-dev/nx-dev"]
-        "{workspaceRoot}/dist/nx-dev/nx-dev/.next",
-        "{workspaceRoot}/dist/nx-dev/nx-dev/.next/!(cache)"
-      ]
     },
     "sitemap": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/nx-dev/nx-dev/public"],
+      "options": {
         "command": "pnpm next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
+      }
     },
     "sync-documentation": {
       "executor": "nx:run-commands",
@@ -57,6 +47,21 @@
         "command": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/documentation/open-graph/generate-images.ts"
       }
     },
+    "build-base": {
+      "executor": "@nx/next:build",
+      "dependsOn": ["copy-docs"],
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "root": "nx-dev/nx-dev",
+        "outputPath": "dist/nx-dev/nx-dev"
+      },
+      "configurations": {
+        "development": {
+          "outputPath": "nx-dev/nx-dev"
+        },
+        "production": {}
+      }
+    },
     "copy-docs": {
       "inputs": ["{workspaceRoot}/docs/**/*"],
       "outputs": ["{projectRoot}/public/documentation"],
@@ -70,11 +75,30 @@
       "options": {
         "commands": [
           "nx watch --projects=docs -- nx run nx-dev:copy-docs",
-          "nx run nx-dev:next-dev"
+          "nx run nx-dev:serve"
         ],
         "parallel": true
       }
     },
+    "serve": {
+      "executor": "@nx/next:server",
+      "dependsOn": ["copy-docs"],
+      "options": {
+        "buildTarget": "nx-dev:build-base",
+        "dev": true
+      },
+      "configurations": {
+        "production": {
+          "buildTarget": "nx-dev:build-base:production",
+          "dev": false
+        },
+        "development": {
+          "buildTarget": "nx-dev:build-base:development",
+          "dev": true
+        }
+      },
+      "defaultConfiguration": "development"
+    },
     "deploy-build": {
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/public/documentation"],
@@ -105,6 +129,12 @@
         "parallel": false
       }
     },
+    "export": {
+      "executor": "@nx/next:export",
+      "options": {
+        "buildTarget": "nx-dev:build:production"
+      }
+    },
     "lint": {},
     "test": {}
   },

nx.json

@@ -210,24 +210,7 @@
       }
     }
   },
-  "plugins": [
+  "plugins": ["@monodon/rust"],
-    "@monodon/rust",
-    {
-      "plugin": "@nx/next/plugin",
-      "options": {
-        "buildTargetName": "next-build",
-        "devTargetName": "next-dev",
-        "startTargetName": "next-start"
-      }
-    },
-    {
-      "plugin": "@nx/playwright/plugin",
-      "options": {
-        "targetName": "pw-e2e",
-        "ciTargetName": "e2e-ci"
-      }
-    }
-  ],
   "nxCloudAccessToken": "YmZiOWQyNzctOThiZC00MjYwLWI3YTAtZDA3MDg4YWY1YTExfHJlYWQ=",
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,