Merge branch 'canary' into 10-21-Fix_SCSS_and_SCSS_loader_handling_te…

…sts_for_Turbopack
vercel · Oct 21, 2023 · 87257b0 · 87257b0
2 parents 4bbe601 + 2bb9b2a
commit 87257b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts
@@ -45,6 +45,9 @@ const supportedTurbopackNextConfigOptions = [
   'webpack',
   'onDemandEntries',
   'experimental.cpus',
+  'serverRuntimeConfig',
+  'publicRuntimeConfig',
+  'exportPathMap',
 
   // Experimental options that affect compilation
   'experimental.swcPlugins',
@@ -64,8 +67,6 @@ const supportedTurbopackNextConfigOptions = [
   'experimental.deploymentId',
 
   // Experimental options that don't affect compilation
-  'serverRuntimeConfig',
-  'publicRuntimeConfig',
   'experimental.proxyTimeout',
   'experimental.caseSensitiveRoutes',
   'experimental.workerThreads',

diff --git a/test/integration/filesystempublicroutes/test/index.test.js b/test/integration/filesystempublicroutes/test/index.test.js
@@ -40,7 +40,9 @@ describe('FileSystemPublicRoutes', () => {
     const res = await fetch('/exportpathmap-route')
     expect(res.status).toBe(200)
     const body = await res.text()
-    expect(body).toMatch(/exportpathmap was here/)
+    expect(body).toMatch(
+      process.env.TURBOPACK ? /turbopack/ : /exportpathmap was here/
+    )
   })
 
   it('should still handle /_next routes', async () => {
@@ -52,7 +54,9 @@ describe('FileSystemPublicRoutes', () => {
     const res = await fetch(join('/_next', pageFile))
     expect(res.status).toBe(200)
     const body = await res.text()
-    expect(body).toMatch(/exportpathmap was here/)
+    expect(body).toMatch(
+      process.env.TURBOPACK ? /turbopack/ : /exportpathmap was here/
+    )
   })
 
   it('should route to public folder files', async () => {