From 510157658634513b2e165e9e865e49a5fdae2cc7 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Mon, 2 Mar 2020 11:05:34 -0600
Subject: [PATCH 1/2] Add failing test case

---
 .../test/index.test.js                        | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/test/integration/serverless-runtime-configs/test/index.test.js b/test/integration/serverless-runtime-configs/test/index.test.js
index 648ff080b076..c680caaedd28 100644
--- a/test/integration/serverless-runtime-configs/test/index.test.js
+++ b/test/integration/serverless-runtime-configs/test/index.test.js
@@ -31,15 +31,16 @@ const nextStart = async (appDir, appPort) => {
   )
 }
 
-describe('Serverless runtime configs', () => {
-  beforeAll(() => cleanUp())
-  afterAll(() => cleanUp())
+const runTests = (oldServerless = false) => {
+  const serverlessMode = oldServerless
+    ? 'serverless'
+    : 'experimental-serverless-trace'
 
   it('should not error on usage of publicRuntimeConfig', async () => {
     await fs.writeFile(
       nextConfigPath,
       `module.exports = {
-      target: 'serverless',
+      target: '${serverlessMode}',
       publicRuntimeConfig: {
         hello: 'world'
       }
@@ -59,7 +60,7 @@ describe('Serverless runtime configs', () => {
     await fs.writeFile(
       nextConfigPath,
       `module.exports = {
-      target: 'serverless',
+      target: '${serverlessMode}',
       serverRuntimeConfig: {
         hello: 'world'
       }
@@ -130,7 +131,7 @@ describe('Serverless runtime configs', () => {
     await fs.writeFile(
       nextConfigPath,
       `module.exports = {
-        target: 'serverless',
+        target: '${serverlessMode}',
         serverRuntimeConfig: {
           hello: 'world'
         },
@@ -150,7 +151,7 @@ describe('Serverless runtime configs', () => {
     await fs.writeFile(
       nextConfigPath,
       `module.exports = {
-        target: 'serverless',
+        target: '${serverlessMode}',
         serverRuntimeConfig: {
           hello: 'world'
         },
@@ -164,4 +165,17 @@ describe('Serverless runtime configs', () => {
     const app = await launchApp(appDir, appPort)
     await testRuntimeConfig(app, appPort)
   })
+}
+
+describe('Serverless runtime configs', () => {
+  beforeAll(() => cleanUp())
+  afterAll(() => cleanUp())
+
+  describe('legacy serverless mode', () => {
+    runTests(true)
+  })
+
+  describe('experimental-serverless-trace mode', () => {
+    runTests()
+  })
 })

From 546e6af9ec5aeab1c741f1cc7b354b9a385f3bf3 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Mon, 2 Mar 2020 11:17:49 -0600
Subject: [PATCH 2/2] Update serverless-loader require to fix config module
 mismatch

---
 packages/next/build/webpack/loaders/next-serverless-loader.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
index e8c8176b513d..c50f932c8bf5 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -62,7 +62,7 @@ const nextServerlessLoader: loader.Loader = function() {
 
   const runtimeConfigImports = runtimeConfig
     ? `
-      const { setConfig } = require('next/dist/next-server/lib/runtime-config')
+      const { setConfig } = require('next/config')
     `
     : ''