Fix serverless chunking (vercel#8569)

* Fix Serverless Chunking

* Remove old test & environment variable

* Update serverless trace test case

packages/next-server/server/config.ts

@@ -18,7 +18,7 @@ const defaultConfig: { [key: string]: any } = {
   generateBuildId: () => null,
   generateEtags: true,
   pageExtensions: ['tsx', 'ts', 'jsx', 'js'],
-  target: process.env.__NEXT_BUILDER_EXPERIMENTAL_TARGET || 'server',
+  target: 'server',
   poweredByHeader: true,
   compress: true,
   onDemandEntries: {

packages/next/build/webpack-config.ts

@@ -590,7 +590,7 @@ export default async function getBaseWebpackConfig(
             )
           },
         }),
-      isServerless && new ServerlessPlugin(),
+      isServerless && isServer && new ServerlessPlugin(),
       isServer && new PagesManifestPlugin(isLikeServerless),
       target === 'server' &&
         isServer &&

test/integration/serverless-trace/pages/api/dynamic/[path]/index.js

@@ -0,0 +1,3 @@
+export default ({ query }, res) => {
+  res.json(query)
+}

test/integration/serverless-trace/pages/api/posts/[id].js

@@ -1,3 +1,3 @@
-export default (req, res) => {
-  res.json({ post: req.query.id })
+export default ({ query }, res) => {
+  res.json(query)
 }

test/integration/serverless-trace/test/index.test.js

@@ -2,7 +2,7 @@
 /* global jasmine */
 import webdriver from 'next-webdriver'
 import { join } from 'path'
-import { existsSync } from 'fs'
+import { existsSync, readdirSync, readFileSync } from 'fs'
 import {
   killApp,
   findPort,
@@ -15,11 +15,13 @@ import fetch from 'node-fetch'
 
 const appDir = join(__dirname, '../')
 const serverlessDir = join(appDir, '.next/serverless/pages')
+const chunksDir = join(appDir, '.next/static/chunks')
+const buildIdFile = join(appDir, '.next/BUILD_ID')
 let appPort
 let app
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
 
-describe('Serverless', () => {
+describe('Serverless Trace', () => {
   beforeAll(async () => {
     await nextBuild(appDir)
     appPort = await findPort()
@@ -52,6 +54,11 @@ describe('Serverless', () => {
     expect(html).toMatch(/This page could not be found/)
   })
 
+  it('should render 404 for /_next/static', async () => {
+    const html = await renderViaHTTP(appPort, '/_next/static')
+    expect(html).toMatch(/This page could not be found/)
+  })
+
   it('should render an AMP page', async () => {
     const html = await renderViaHTTP(appPort, '/some-amp?amp=1')
     expect(html).toMatch(/Hi Im an AMP page/)
@@ -93,6 +100,19 @@ describe('Serverless', () => {
     }
   })
 
+  it('should not have combined client-side chunks', () => {
+    expect(readdirSync(chunksDir).length).toBeGreaterThanOrEqual(2)
+    const buildId = readFileSync(buildIdFile, 'utf8').trim()
+
+    const pageContent = join(
+      appDir,
+      '.next/static',
+      buildId,
+      'pages/dynamic.js'
+    )
+    expect(readFileSync(pageContent, 'utf8')).not.toContain('Hello!')
+  })
+
   it('should not output _app.js and _document.js to serverless build', () => {
     expect(existsSync(join(serverlessDir, '_app.js'))).toBeFalsy()
     expect(existsSync(join(serverlessDir, '_document.js'))).toBeFalsy()
@@ -121,8 +141,28 @@ describe('Serverless', () => {
 
   it('should reply on dynamic API request successfully', async () => {
     const result = await renderViaHTTP(appPort, '/api/posts/post-1')
-    const { post } = JSON.parse(result)
-    expect(post).toBe('post-1')
+    const { id } = JSON.parse(result)
+    expect(id).toBe('post-1')
+  })
+
+  it('should reply on dynamic API request successfully with query parameters', async () => {
+    const result = await renderViaHTTP(appPort, '/api/posts/post-1?param=val')
+    const { id, param } = JSON.parse(result)
+    expect(id).toBe('post-1')
+    expect(param).toBe('val')
+  })
+
+  it('should reply on dynamic API index request successfully', async () => {
+    const result = await renderViaHTTP(appPort, '/api/dynamic/post-1')
+    const { path } = JSON.parse(result)
+    expect(path).toBe('post-1')
+  })
+
+  it('should reply on dynamic API index request successfully with query parameters', async () => {
+    const result = await renderViaHTTP(appPort, '/api/dynamic/post-1?param=val')
+    const { path, param } = JSON.parse(result)
+    expect(path).toBe('post-1')
+    expect(param).toBe('val')
   })
 
   it('should 404 on API request with trailing slash', async () => {

test/integration/serverless/test/index.test.js

@@ -2,7 +2,7 @@
 /* global jasmine */
 import webdriver from 'next-webdriver'
 import { join } from 'path'
-import { existsSync } from 'fs'
+import { existsSync, readdirSync, readFileSync } from 'fs'
 import {
   killApp,
   findPort,
@@ -15,6 +15,8 @@ import fetch from 'node-fetch'
 
 const appDir = join(__dirname, '../')
 const serverlessDir = join(appDir, '.next/serverless/pages')
+const chunksDir = join(appDir, '.next/static/chunks')
+const buildIdFile = join(appDir, '.next/BUILD_ID')
 let appPort
 let app
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
@@ -98,6 +100,19 @@ describe('Serverless', () => {
     }
   })
 
+  it('should not have combined client-side chunks', () => {
+    expect(readdirSync(chunksDir).length).toBeGreaterThanOrEqual(2)
+    const buildId = readFileSync(buildIdFile, 'utf8').trim()
+
+    const pageContent = join(
+      appDir,
+      '.next/static',
+      buildId,
+      'pages/dynamic.js'
+    )
+    expect(readFileSync(pageContent, 'utf8')).not.toContain('Hello!')
+  })
+
   it('should not output _app.js and _document.js to serverless build', () => {
     expect(existsSync(join(serverlessDir, '_app.js'))).toBeFalsy()
     expect(existsSync(join(serverlessDir, '_document.js'))).toBeFalsy()