Fix HMR with full assetPrefix URLs

vercel · May 8, 2024 · 9d13afe · 9d13afe
1 parent 0edf4f9
commit 9d13afe
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/next/src/server/lib/router-server.ts b/packages/next/src/server/lib/router-server.ts
@@ -650,8 +650,15 @@ export async function initialize(opts: {
       if (opts.dev && developmentBundler && req.url) {
         const { basePath, assetPrefix } = config
 
+        // only prefix the URL with the asset prefix if it lacks a protocol
+        const prefix =
+          assetPrefix.startsWith('http://') ||
+          assetPrefix.startsWith('https://')
+            ? ''
+            : assetPrefix || basePath
+
         const isHMRRequest = req.url.startsWith(
-          ensureLeadingSlash(`${assetPrefix || basePath}/_next/webpack-hmr`)
+          ensureLeadingSlash(`${prefix}/_next/webpack-hmr`)
         )
 
         // only handle HMR requests if the basePath in the request