From 0c8f5094016487241d6ba4012736cd835e2372a7 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 21 Jan 2021 14:24:52 -0600
Subject: [PATCH] Add new alias

---
 packages/next/build/webpack-config.ts                  | 10 ++++++++++
 .../lib/router/utils/resolve-rewrites-noop.ts          |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 packages/next/next-server/lib/router/utils/resolve-rewrites-noop.ts

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index d75f5d6ad3ba..c36610e0a04b 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -341,6 +341,13 @@ 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
@@ -379,6 +386,9 @@ export default async function getBaseWebpackConfig(
       [DOT_NEXT_ALIAS]: distDir,
       ...getOptimizedAliases(isServer),
       ...getReactProfilingInProduction(),
+      [clientResolveRewrites]: hasRewrites
+        ? clientResolveRewrites
+        : clientResolveRewritesNoop,
     },
     mainFields: isServer ? ['main', 'module'] : ['browser', 'module', 'main'],
     plugins: isWebpack5
diff --git a/packages/next/next-server/lib/router/utils/resolve-rewrites-noop.ts b/packages/next/next-server/lib/router/utils/resolve-rewrites-noop.ts
new file mode 100644
index 000000000000..7104c3881eb4
--- /dev/null
+++ b/packages/next/next-server/lib/router/utils/resolve-rewrites-noop.ts
@@ -0,0 +1 @@
+export default function resolveRewrites() {}