fix next e2e test

mydea · mydea · commit a1ff4e08c2c4 · 2023-07-13T10:35:39.000+02:00
diff --git a/packages/e2e-tests/.gitignore b/packages/e2e-tests/.gitignore
@@ -1,2 +1,3 @@
 .env
 tmp
+.tmp_build_output
diff --git a/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts b/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts
@@ -7,7 +7,7 @@ if (!testEnv) {
   throw new Error('No test env defined');
 }
 
-const port = 9000;
+const port = 3030;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/assert-build.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/assert-build.ts
@@ -1,16 +1,16 @@
 import * as fs from 'fs';
 import * as assert from 'assert/strict';
 
-const stdin = fs.readFileSync(0).toString();
+const buildOutput = fs.readFileSync('.tmp_build_output', 'utf-8');
 
 // Assert that all static components stay static and all dynamic components stay dynamic
 
-assert.match(stdin, /○ \/client-component/);
-assert.match(stdin, /● \/client-component\/parameter\/\[\.\.\.parameters\]/);
-assert.match(stdin, /● \/client-component\/parameter\/\[parameter\]/);
+assert.match(buildOutput, /○ \/client-component/);
+assert.match(buildOutput, /● \/client-component\/parameter\/\[\.\.\.parameters\]/);
+assert.match(buildOutput, /● \/client-component\/parameter\/\[parameter\]/);
 
-assert.match(stdin, /λ \/server-component/);
-assert.match(stdin, /λ \/server-component\/parameter\/\[\.\.\.parameters\]/);
-assert.match(stdin, /λ \/server-component\/parameter\/\[parameter\]/);
+assert.match(buildOutput, /λ \/server-component/);
+assert.match(buildOutput, /λ \/server-component\/parameter\/\[\.\.\.parameters\]/);
+assert.match(buildOutput, /λ \/server-component\/parameter\/\[parameter\]/);
 
 export {};
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/package.json b/packages/e2e-tests/test-applications/nextjs-app-dir/package.json
@@ -6,7 +6,7 @@
     "build": "next build",
     "test:prod": "TEST_ENV=production playwright test",
     "test:dev": "TEST_ENV=development playwright test",
-    "test:build": "pnpm install && npx playwright install && pnpm build",
+    "test:build": "pnpm install && npx playwright install && pnpm build > .tmp_build_output",
     "test:test-build": "pnpm ts-node --script-mode assert-build.ts",
     "test:build-canary": "pnpm install && pnpm add next@canary && npx playwright install && pnpm build",
     "test:build-latest": "pnpm install && pnpm add next@latest && npx playwright install && pnpm build",
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts
@@ -7,8 +7,8 @@ if (!testEnv) {
   throw new Error('No test env defined');
 }
 
-const nextPort = 9000;
-const eventProxyPort = 9001;
+const nextPort = 3030;
+const eventProxyPort = 3031;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.client.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.client.config.ts
@@ -3,10 +3,6 @@ import * as Sentry from '@sentry/nextjs';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-  tunnel: `http://localhost:${
-    Number(process.env.NEXT_PUBLIC_BASE_PORT) +
-    Number(process.env.NEXT_PUBLIC_PORT_MODULO) +
-    Number(process.env.NEXT_PUBLIC_PORT_GAP)
-  }/`, // proxy server
+  tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
 });
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts
@@ -3,10 +3,6 @@ import * as Sentry from '@sentry/nextjs';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-  tunnel: `http://localhost:${
-    Number(process.env.NEXT_PUBLIC_BASE_PORT) +
-    Number(process.env.NEXT_PUBLIC_PORT_MODULO) +
-    Number(process.env.NEXT_PUBLIC_PORT_GAP)
-  }/`, // proxy server
+  tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
 });
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts
@@ -3,10 +3,6 @@ import * as Sentry from '@sentry/nextjs';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-  tunnel: `http://localhost:${
-    Number(process.env.NEXT_PUBLIC_BASE_PORT) +
-    Number(process.env.NEXT_PUBLIC_PORT_MODULO) +
-    Number(process.env.NEXT_PUBLIC_PORT_GAP)
-  }/`, // proxy server
+  tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
 });
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/start-event-proxy.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/start-event-proxy.ts
@@ -1,6 +1,6 @@
 import { startEventProxyServer } from '../../test-utils/event-proxy-server';
 
 startEventProxyServer({
-  port: 9001,
+  port: 3031,
   proxyServerName: 'nextjs-13-app-dir',
 });
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json b/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -17,10 +21,19 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "incremental": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"],
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    "next.config.js",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ],
   "ts-node": {
     "compilerOptions": {
       "module": "CommonJS"
diff --git a/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts b/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts
@@ -58,7 +58,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'pnpm start',
-    port: 9000,
+    port: 3030,
   },
 };
 
diff --git a/packages/e2e-tests/test-applications/node-express-app/src/app.ts b/packages/e2e-tests/test-applications/node-express-app/src/app.ts
@@ -18,7 +18,7 @@ Sentry.init({
 });
 
 const app = express();
-const port = 9000;
+const port = 3030;
 
 app.use(Sentry.Handlers.requestHandler());
 app.use(Sentry.Handlers.tracingHandler());
diff --git a/packages/e2e-tests/test-applications/react-create-hash-router/playwright.config.ts b/packages/e2e-tests/test-applications/react-create-hash-router/playwright.config.ts
@@ -60,9 +60,9 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'pnpm start',
-    port: 9000,
+    port: 3030,
     env: {
-      PORT: '9000',
+      PORT: '3030',
     },
   },
 };
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
@@ -60,9 +60,9 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'pnpm start',
-    port: 9000,
+    port: 3030,
     env: {
-      PORT: '9000',
+      PORT: '3030',
     },
   },
 };
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts b/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts
@@ -60,9 +60,9 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'pnpm start',
-    port: 9000,
+    port: 3030,
     env: {
-      PORT: '9000',
+      PORT: '3030',
     },
   },
 };
diff --git a/packages/e2e-tests/test-applications/sveltekit/playwright.config.ts b/packages/e2e-tests/test-applications/sveltekit/playwright.config.ts
@@ -7,7 +7,7 @@ if (!testEnv) {
   throw new Error('No test env defined');
 }
 
-const port = 9000;
+const port = 3030;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -56,7 +56,7 @@ const config: PlaywrightTestConfig = {
   webServer: [
     {
       command: 'pnpm ts-node --esm start-event-proxy.ts',
-      port: 9001,
+      port: 3031,
     },
     {
       command:
diff --git a/packages/e2e-tests/test-applications/sveltekit/src/hooks.client.ts b/packages/e2e-tests/test-applications/sveltekit/src/hooks.client.ts
@@ -5,7 +5,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: env.PUBLIC_E2E_TEST_DSN,
   debug: true,
-  tunnel: `http://localhost:9001/`, // proxy server
+  tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
 });
 
diff --git a/packages/e2e-tests/test-applications/sveltekit/src/hooks.server.ts b/packages/e2e-tests/test-applications/sveltekit/src/hooks.server.ts
@@ -5,7 +5,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: env.E2E_TEST_DSN,
   debug: true,
-  tunnel: `http://localhost:9001/`, // proxy server
+  tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
 });
 
diff --git a/packages/e2e-tests/test-applications/sveltekit/start-event-proxy.ts b/packages/e2e-tests/test-applications/sveltekit/start-event-proxy.ts
@@ -1,6 +1,6 @@
 import { startEventProxyServer } from './event-proxy-server';
 
 startEventProxyServer({
-  port: 9001,
+  port: 3031,
   proxyServerName: 'sveltekit',
 });

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`.env`
`2`	`2`	`tmp`
	`3`	`+.tmp_build_output`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ if (!testEnv) {`
`7`	`7`	`throw new Error('No test env defined');`
`8`	`8`	`}`
`9`	`9`
`10`		`-const port = 9000;`
	`10`	`+const port = 3030;`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* See https://playwright.dev/docs/test-configuration.`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ if (!testEnv) {`
`7`	`7`	`throw new Error('No test env defined');`
`8`	`8`	`}`
`9`	`9`
`10`		`-const nextPort = 9000;`
`11`		`-const eventProxyPort = 9001;`
	`10`	`+const nextPort = 3030;`
	`11`	`+const eventProxyPort = 3031;`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* See https://playwright.dev/docs/test-configuration.`