Merge branch 'canary' into add-collections

vercel · Nov 9, 2021 · 242e9c1 · 242e9c1
2 parents e55b8f5 + 764e29c
commit 242e9c1
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 8 deletions.
diff --git a/packages/next/build/swc/options.js b/packages/next/build/swc/options.js
@@ -43,7 +43,11 @@ function getBaseSWCOptions({
         },
       },
     },
-    styledComponents: styledComponents ? {} : null,
+    styledComponents: styledComponents
+      ? {
+          displayName: Boolean(development),
+        }
+      : null,
   }
 }
 

diff --git a/packages/next/shared/lib/router/router.ts b/packages/next/shared/lib/router/router.ts
@@ -1697,7 +1697,7 @@ export default class Router implements BaseRouter {
     }
 
     const effects = await this._preflightRequest({
-      as: asPath,
+      as: addBasePath(asPath),
       cache: true,
       pages,
       pathname,

diff --git a/test/integration/middleware/with-base-path/pages/_middleware.js b/test/integration/middleware/with-base-path/pages/_middleware.js
@@ -2,6 +2,16 @@ import { NextResponse } from 'next/server'
 
 export async function middleware(request) {
   const url = request.nextUrl
+
+  if (
+    request.method === 'HEAD' &&
+    url.basePath === '/root' &&
+    url.pathname === '/redirect-me-to-about'
+  ) {
+    url.pathname = '/about'
+    return NextResponse.redirect(url)
+  }
+
   if (url.pathname === '/redirect-with-basepath' && !url.basePath) {
     url.basePath = '/root'
     return NextResponse.redirect(url)

diff --git a/test/integration/middleware/with-base-path/pages/index.js b/test/integration/middleware/with-base-path/pages/index.js
@@ -22,6 +22,11 @@ export default function Main({ message }) {
             <a>Rewrite me to Vercel</a>
           </Link>
         </li>
+        <li>
+          <Link href="/redirect-me-to-about">
+            <a>redirect me to about</a>
+          </Link>
+        </li>
       </ul>
     </div>
   )

diff --git a/test/integration/middleware/with-base-path/test/index.test.js b/test/integration/middleware/with-base-path/test/index.test.js
@@ -2,7 +2,14 @@
 
 jest.setTimeout(1000 * 60 * 2)
 
-import { fetchViaHTTP, findPort, killApp, launchApp } from 'next-test-utils'
+import {
+  fetchViaHTTP,
+  findPort,
+  killApp,
+  launchApp,
+  nextBuild,
+  nextStart,
+} from 'next-test-utils'
 import { join } from 'path'
 import cheerio from 'cheerio'
 import webdriver from 'next-webdriver'
@@ -11,12 +18,25 @@ const context = {}
 context.appDir = join(__dirname, '../')
 
 describe('Middleware base tests', () => {
-  beforeAll(async () => {
-    context.appPort = await findPort()
-    context.app = await launchApp(context.appDir, context.appPort)
+  describe('dev mode', () => {
+    beforeAll(async () => {
+      context.appPort = await findPort()
+      context.app = await launchApp(context.appDir, context.appPort)
+    })
+    afterAll(() => killApp(context.app))
+    runTests()
+  })
+
+  describe('production mode', () => {
+    beforeAll(async () => {
+      await nextBuild(context.appDir)
+      context.appPort = await findPort()
+      context.app = await nextStart(context.appDir, context.appPort)
+    })
+    afterAll(() => killApp(context.app))
+    runTests()
+    runPreflightTests()
   })
-  afterAll(() => killApp(context.app))
-  runTests()
 })
 
 function runTests() {
@@ -39,3 +59,21 @@ function runTests() {
     expect($('.title').text()).toBe('About Page')
   })
 }
+
+function runPreflightTests() {
+  it('should redirect via preflight middleware request', async () => {
+    const browser = await webdriver(context.appPort, '/root')
+
+    try {
+      await browser.waitForCondition(
+        'next.router && Object.keys(next.router.sde).length == 4'
+      )
+      const redirect = await browser.eval(
+        `next.router.sde["http://localhost:${context.appPort}/root/redirect-me-to-about"].redirect`
+      )
+      expect(redirect).toBe('/root/about')
+    } finally {
+      await browser.close()
+    }
+  })
+}