apply suggestions from review

vercel · Jul 30, 2024 · 5922a08 · 5922a08
1 parent 33ac621
commit 5922a08
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/next/src/client/components/react-dev-overlay/internal/helpers/get-socket-url.ts b/packages/next/src/client/components/react-dev-overlay/internal/helpers/get-socket-url.ts
@@ -16,8 +16,9 @@ export function getSocketUrl(assetPrefix: string | undefined): string {
   const protocol = getSocketProtocol(assetPrefix || '')
   const prefix = normalizedAssetPrefix(assetPrefix)
 
-  // same check but on original assetPrefix value
-  if (assetPrefix?.replace(/^\/+/, '').startsWith('http')) {
+  // if original assetPrefix is a full URL with protocol
+  // we just update to use the correct `ws` protocol
+  if (assetPrefix?.replace(/^\/+/, '').includes('://')) {
     return `${protocol}://${prefix}`
   }
 

diff --git a/packages/next/src/server/lib/router-server.ts b/packages/next/src/server/lib/router-server.ts
@@ -664,6 +664,8 @@ export async function initialize(opts: {
         const { basePath, assetPrefix } = config
 
         let hmrPrefix = basePath
+
+        // assetPrefix overrides basePath for HMR path
         if (assetPrefix) {
           hmrPrefix = normalizedAssetPrefix(assetPrefix)
         }

diff --git a/packages/next/src/shared/lib/normalized-asset-prefix.ts b/packages/next/src/shared/lib/normalized-asset-prefix.ts
@@ -2,12 +2,12 @@ export function normalizedAssetPrefix(assetPrefix: string | undefined): string {
   const escapedAssetPrefix = assetPrefix?.replace(/^\/+/, '') || false
 
   // assetPrefix as a url
-  if (escapedAssetPrefix && escapedAssetPrefix.startsWith('http')) {
+  if (escapedAssetPrefix && escapedAssetPrefix.startsWith('://')) {
     return escapedAssetPrefix.split('://', 2)[1]
   }
 
   // assetPrefix is set to `undefined` or '/'
-  if (!escapedAssetPrefix || escapedAssetPrefix === '') {
+  if (!escapedAssetPrefix) {
     return ''
   }
 

diff --git a/test/development/basic/hmr.test.ts b/test/development/basic/hmr.test.ts
@@ -20,11 +20,9 @@ import type { NextConfig } from 'next'
 
 describe.each([
   { basePath: '', assetPrefix: '' },
-  { basePath: '', assetPrefix: undefined },
-  { basePath: '', assetPrefix: '/ap' },
+  { basePath: '', assetPrefix: '/asset-prefix' },
   { basePath: '/docs', assetPrefix: '' },
-  { basePath: '/docs', assetPrefix: undefined },
-  { basePath: '/docs', assetPrefix: '/ap' },
+  { basePath: '/docs', assetPrefix: '/asset-prefix' },
 ])('basic HMR, nextConfig: %o', (nextConfig: Partial<NextConfig>) => {
   const { basePath } = nextConfig
   let next: NextInstance