Clean up

onurtemizkan · onurtemizkan · commit 5fb8ac2e3d01 · 2023-01-24T11:19:40.000Z
diff --git a/packages/nextjs/jest.config.js b/packages/nextjs/jest.config.js
@@ -4,5 +4,5 @@ module.exports = {
   ...baseConfig,
   // This prevents the build tests from running when unit tests run. (If they do, they fail, because the build being
   // tested hasn't necessarily run yet.)
-  testPathIgnorePatterns: ['<rootDir>/test/buildProcess/'],
+  testPathIgnorePatterns: ['<rootDir>/test/buildProcess/', '<rootDir>/test/integration/'],
 };
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
@@ -3,7 +3,7 @@
 import { getSentryRelease } from '@sentry/node';
 import { arrayify, dropUndefinedKeys, escapeStringForRegex, logger, stringMatchesSomePattern } from '@sentry/utils';
 import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as fs from 'fs';
 import * as path from 'path';
 
diff --git a/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts b/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('CommonJS API Endpoints', () => {
   it('should not intercept unwrapped request', async () => {
diff --git a/packages/nextjs/test/integration/test/server/doubleEndMethodOnVercel.test.ts b/packages/nextjs/test/integration/test/server/doubleEndMethodOnVercel.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 // This test asserts that our wrapping of `res.end` doesn't break API routes on Vercel if people call `res.json` or
 // `res.send` multiple times in one request handler.
diff --git a/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts b/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 jest.spyOn(console, 'error').mockImplementation();
 
diff --git a/packages/nextjs/test/integration/test/server/errorServerSideProps.test.ts b/packages/nextjs/test/integration/test/server/errorServerSideProps.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('Error Server-side Props', () => {
   it('should capture an error event', async () => {
diff --git a/packages/nextjs/test/integration/test/server/excludedApiEndpoints.test.ts b/packages/nextjs/test/integration/test/server/excludedApiEndpoints.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('Excluded API Endpoints', () => {
   it('Should exclude API endpoint via RegExp', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracing200.test.ts b/packages/nextjs/test/integration/test/server/tracing200.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('Tracing 200', () => {
   it('should capture a transaction', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracing500.test.ts b/packages/nextjs/test/integration/test/server/tracing500.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('Tracing 500', () => {
   it('should capture an erroneous transaction', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracingHttp.test.ts b/packages/nextjs/test/integration/test/server/tracingHttp.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 import nock from 'nock';
 
 describe('Tracing HTTP', () => {
diff --git a/packages/nextjs/test/integration/test/server/tracingServerGetInitialProps.test.ts b/packages/nextjs/test/integration/test/server/tracingServerGetInitialProps.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('getInitialProps', () => {
   it('should capture a transaction', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracingServerGetServerSideProps.test.ts b/packages/nextjs/test/integration/test/server/tracingServerGetServerSideProps.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('getServerSideProps', () => {
   it('should capture a transaction', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracingServerGetServerSidePropsCustomPageExtension.test.ts b/packages/nextjs/test/integration/test/server/tracingServerGetServerSidePropsCustomPageExtension.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 describe('tracingServerGetServerSidePropsCustomPageExtension', () => {
   it('should capture a transaction', async () => {
diff --git a/packages/nextjs/test/integration/test/server/tracingWithSentryAPI.test.ts b/packages/nextjs/test/integration/test/server/tracingWithSentryAPI.test.ts
@@ -1,4 +1,4 @@
-import { NextTestEnv } from '../utils/server';
+import { NextTestEnv } from './utils/helpers';
 
 const cases = [
   {
diff --git a/packages/nextjs/test/integration/test/server/utils/helpers.ts b/packages/nextjs/test/integration/test/server/utils/helpers.ts
@@ -0,0 +1,23 @@
+import { getPortPromise } from 'portfinder';
+import { TestEnv } from '../../../../../../node-integration-tests/utils';
+import * as http from 'http';
+import * as path from 'path';
+import { createNextServer, startServer } from '../../utils/common';
+
+export class NextTestEnv extends TestEnv {
+  private constructor(public readonly server: http.Server, public readonly url: string) {
+    super(server, url);
+  }
+
+  public static async init(): Promise<NextTestEnv> {
+    const port = await getPortPromise();
+    const server = await createNextServer({
+      dev: false,
+      dir: path.resolve(__dirname, '../../..'),
+    });
+
+    await startServer(server, port);
+
+    return new NextTestEnv(server, `http://localhost:${port}`);
+  }
+}
diff --git a/packages/nextjs/test/integration/test/utils/server.ts b/packages/nextjs/test/integration/test/utils/server.ts
diff --git a/packages/nextjs/test/integration/tsconfig.test.json b/packages/nextjs/test/integration/tsconfig.test.json
@@ -4,6 +4,7 @@
   "include": ["test/**/*"],
 
   "compilerOptions": {
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "esModuleInterop": true
   }
 }
diff --git a/packages/nextjs/test/tsconfig.json b/packages/nextjs/test/tsconfig.json
@@ -4,5 +4,10 @@
 {
   "extends": "../tsconfig.test.json",
 
-  "include": ["./**/*", "../playwright.config.ts"]
+  "include": ["./**/*", "../playwright.config.ts"],
+
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "esModuleInterop": true
+  }
 }
diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json
@@ -4,7 +4,6 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "esModuleInterop": true
     // package-specific options
   }
 }
diff --git a/packages/nextjs/tsconfig.test.json b/packages/nextjs/tsconfig.test.json
@@ -4,6 +4,7 @@
   "include": ["test/**/*"],
 
   "compilerOptions": {
+    "esModuleInterop": true,
     // should include all types from `./tsconfig.json` plus types for all test frameworks used
     "types": ["node", "jest"]
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { NextTestEnv } from '../utils/server';`
	`1`	`+import { NextTestEnv } from './utils/helpers';`
`2`	`2`
`3`	`3`	`describe('CommonJS API Endpoints', () => {`
`4`	`4`	`it('should not intercept unwrapped request', async () => {`