Merge branch 'canary' into fix/reland-static-prefetches

vercel · Oct 2, 2023 · 9b3091f · 9b3091f
2 parents e11ba4d + be952fb
commit 9b3091f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/with-stripe-typescript/app/api/webhooks/route.ts b/examples/with-stripe-typescript/app/api/webhooks/route.ts
@@ -51,7 +51,7 @@ export async function POST(req: Request) {
           console.log(`💰 PaymentIntent status: ${data.status}`)
           break
         default:
-          throw new Error(`Unhhandled event: ${event.type}`)
+          throw new Error(`Unhandled event: ${event.type}`)
       }
     } catch (error) {
       console.log(error)

diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts
@@ -64,6 +64,8 @@ const supportedTurbopackNextConfigOptions = [
   'experimental.deploymentId',
 
   // Experimental options that don't affect compilation
+  'serverRuntimeConfig',
+  'publicRuntimeConfig',
   'experimental.proxyTimeout',
   'experimental.caseSensitiveRoutes',
   'experimental.workerThreads',

diff --git a/test/e2e/app-dir/app/index.test.ts b/test/e2e/app-dir/app/index.test.ts
@@ -71,7 +71,7 @@ createNextDescribe(
       if (!process.env.NEXT_EXPERIMENTAL_COMPILE) {
         it('should have correct size in build output', async () => {
           expect(next.cliOutput).toMatch(
-            /\/dashboard\/another.*? [^0]{1,} [\w]{1,}B/
+            /\/dashboard\/another.*? *?[^0]\d{1,} [\w]{1,}B/
           )
         })
       }

diff --git a/test/integration/config-mjs/next.config.mjs b/test/integration/config-mjs/next.config.mjs
@@ -4,7 +4,6 @@ export default {
     maxInactiveAge: 1000 * 60 * 60,
   },
   poweredByHeader: false,
-  cssModules: true,
   serverRuntimeConfig: {
     mySecret: 'secret',
   },

diff --git a/test/integration/config/next.config.js b/test/integration/config/next.config.js
@@ -4,7 +4,6 @@ module.exports = {
     maxInactiveAge: 1000 * 60 * 60,
   },
   poweredByHeader: false,
-  cssModules: true,
   serverRuntimeConfig: {
     mySecret: 'secret',
   },