Merge remote-tracking branch 'upstream/canary' into trailing-slash-ba…

…sepath
vercel · Jul 2, 2020 · 657ea99 · 657ea99
2 parents 30f575e + a0c6832
commit 657ea99
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 197 deletions.
diff --git a/packages/next/client/index.js b/packages/next/client/index.js
@@ -49,7 +49,19 @@ envConfig.setConfig({
   publicRuntimeConfig: runtimeConfig || {},
 })
 
-const asPath = delBasePath(getURL())
+let asPath = getURL()
+
+// make sure not to attempt stripping basePath for 404s
+if (
+  page !== '/404' &&
+  !(
+    page === '/_error' &&
+    hydrateProps &&
+    hydrateProps.pageProps.statusCode === '404'
+  )
+) {
+  asPath = delBasePath(asPath)
+}
 
 const pageLoader = new PageLoader(buildId, prefix, page)
 const register = ([r, f]) => pageLoader.registerPage(r, f)