Change tree shaking of resolve-rewrites

Timer · Mar 19, 2021 · f731a59 · f731a59
1 parent 1100f29
commit f731a59
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 61 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -348,13 +348,6 @@ export default async function getBaseWebpackConfig(
     }
   }
 
-  const clientResolveRewrites = require.resolve(
-    'next/dist/next-server/lib/router/utils/resolve-rewrites'
-  )
-  const clientResolveRewritesNoop = require.resolve(
-    'next/dist/next-server/lib/router/utils/resolve-rewrites-noop'
-  )
-
   const resolveConfig = {
     // Disable .mjs for node_modules bundling
     extensions: isServer
@@ -384,9 +377,6 @@ export default async function getBaseWebpackConfig(
       [DOT_NEXT_ALIAS]: distDir,
       ...getOptimizedAliases(isServer),
       ...getReactProfilingInProduction(),
-      [clientResolveRewrites]: hasRewrites
-        ? clientResolveRewrites
-        : clientResolveRewritesNoop,
     },
     ...(isWebpack5 && !isServer
       ? {

diff --git a/packages/next/next-server/lib/router/utils/resolve-rewrites.ts b/packages/next/next-server/lib/router/utils/resolve-rewrites.ts
@@ -16,65 +16,69 @@ export default function resolveRewrites(
   query: ParsedUrlQuery,
   resolveHref: (path: string) => string,
   locales?: string[]
-): {
-  matchedPage: boolean
-  parsedAs: ReturnType<typeof parseRelativeUrl>
-  asPath: string
-  resolvedHref?: string
-} {
-  let matchedPage = false
-  let parsedAs = parseRelativeUrl(asPath)
-  let fsPathname = removePathTrailingSlash(
-    normalizeLocalePath(delBasePath(parsedAs.pathname), locales).pathname
-  )
-  let resolvedHref
+):
+  | {
+      matchedPage: boolean
+      parsedAs: ReturnType<typeof parseRelativeUrl>
+      asPath: string
+      resolvedHref?: string
+    }
+  | undefined {
+  if (process.env.__NEXT_HAS_REWRITES) {
+    let matchedPage = false
+    let parsedAs = parseRelativeUrl(asPath)
+    let fsPathname = removePathTrailingSlash(
+      normalizeLocalePath(delBasePath(parsedAs.pathname), locales).pathname
+    )
+    let resolvedHref
 
-  if (!pages.includes(fsPathname)) {
-    for (const rewrite of rewrites) {
-      const matcher = customRouteMatcher(rewrite.source)
-      const params = matcher(parsedAs.pathname)
+    if (!pages.includes(fsPathname)) {
+      for (const rewrite of rewrites) {
+        const matcher = customRouteMatcher(rewrite.source)
+        const params = matcher(parsedAs.pathname)
 
-      if (params) {
-        if (!rewrite.destination) {
-          // this is a proxied rewrite which isn't handled on the client
-          break
-        }
-        const destRes = prepareDestination(
-          rewrite.destination,
-          params,
-          query,
-          true
-        )
-        parsedAs = destRes.parsedDestination
-        asPath = destRes.newUrl
-        Object.assign(query, destRes.parsedDestination.query)
+        if (params) {
+          if (!rewrite.destination) {
+            // this is a proxied rewrite which isn't handled on the client
+            break
+          }
+          const destRes = prepareDestination(
+            rewrite.destination,
+            params,
+            query,
+            true
+          )
+          parsedAs = destRes.parsedDestination
+          asPath = destRes.newUrl
+          Object.assign(query, destRes.parsedDestination.query)
 
-        fsPathname = removePathTrailingSlash(
-          normalizeLocalePath(delBasePath(asPath), locales).pathname
-        )
+          fsPathname = removePathTrailingSlash(
+            normalizeLocalePath(delBasePath(asPath), locales).pathname
+          )
 
-        if (pages.includes(fsPathname)) {
-          // check if we now match a page as this means we are done
-          // resolving the rewrites
-          matchedPage = true
-          resolvedHref = fsPathname
-          break
-        }
+          if (pages.includes(fsPathname)) {
+            // check if we now match a page as this means we are done
+            // resolving the rewrites
+            matchedPage = true
+            resolvedHref = fsPathname
+            break
+          }
 
-        // check if we match a dynamic-route, if so we break the rewrites chain
-        resolvedHref = resolveHref(fsPathname)
+          // check if we match a dynamic-route, if so we break the rewrites chain
+          resolvedHref = resolveHref(fsPathname)
 
-        if (resolvedHref !== asPath && pages.includes(resolvedHref)) {
-          matchedPage = true
-          break
+          if (resolvedHref !== asPath && pages.includes(resolvedHref)) {
+            matchedPage = true
+            break
+          }
         }
       }
     }
-  }
-  return {
-    asPath,
-    parsedAs,
-    matchedPage,
-    resolvedHref,
+    return {
+      asPath,
+      parsedAs,
+      matchedPage,
+      resolvedHref,
+    }
   }
 }