Fix a few more tests

vercel · Oct 18, 2022 · e93d0ce · e93d0ce
1 parent 7c6df66
commit e93d0ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
@@ -261,10 +261,9 @@ export default class NextNodeServer extends BaseServer {
     }
   }
 
-  private compression =
-    this.nextConfig.compress && this.nextConfig.target === 'server'
-      ? (compression() as ExpressMiddleware)
-      : undefined
+  private compression = this.nextConfig.compress
+    ? (compression() as ExpressMiddleware)
+    : undefined
 
   protected loadEnvConfig({
     dev,

diff --git a/packages/next/telemetry/events/version.ts b/packages/next/telemetry/events/version.ts
@@ -91,7 +91,7 @@ export function eventCliSession(
     hasNowJson: event.hasNowJson,
     isCustomServer: event.isCustomServer,
     hasNextConfig: nextConfig.configOrigin !== 'default',
-    buildTarget: nextConfig.target === 'server' ? 'default' : nextConfig.target,
+    buildTarget: 'default',
     hasWebpackConfig: typeof nextConfig?.webpack === 'function',
     hasBabelConfig: hasBabelConfig(dir),
     imageEnabled: !!images,

diff --git a/test/integration/config-experimental-warning/test/index.test.js b/test/integration/config-experimental-warning/test/index.test.js
@@ -19,7 +19,6 @@ describe('Config Experimental Warning', () => {
     configFile.write(`
       module.exports = (phase, { defaultConfig }) => {
         return {
-          target: 'server',
           ...defaultConfig,
         }
       }
@@ -32,7 +31,7 @@ describe('Config Experimental Warning', () => {
   it('should not show warning with config from object', async () => {
     configFile.write(`
       module.exports = {
-        target: 'server'
+        images: {},
       }
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
@@ -42,7 +41,6 @@ describe('Config Experimental Warning', () => {
   it('should show warning with config from object with experimental', async () => {
     configFile.write(`
       module.exports = {
-        target: 'server',
         experimental: {
           newNextLinkBehavior: true
         }
@@ -57,7 +55,6 @@ describe('Config Experimental Warning', () => {
   it('should show warning with config from function with experimental', async () => {
     configFile.write(`
       module.exports = (phase) => ({
-        target: 'server',
         experimental: {
           newNextLinkBehavior: true
         }
@@ -72,7 +69,6 @@ describe('Config Experimental Warning', () => {
   it('should not show warning with default value', async () => {
     configFile.write(`
       module.exports = (phase) => ({
-        target: 'server',
         experimental: {
           newNextLinkBehavior: false
         }

diff --git a/test/integration/required-server-files-ssr-404/next.config.js b/test/integration/required-server-files-ssr-404/next.config.js
@@ -1,6 +1,4 @@
 module.exports = {
-  // ensure incorrect target is overridden by env
-  target: 'serverless',
   rewrites() {
     return [
       {