refactor: use URL obj

vercel · Aug 5, 2024 · c6fa55c · c6fa55c
1 parent 1182627
commit c6fa55c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 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
@@ -14,13 +14,9 @@ function getSocketProtocol(assetPrefix: string): string {
 export function getSocketUrl(assetPrefix: string | undefined): string {
   const { hostname, port } = window.location
   const protocol = getSocketProtocol(assetPrefix || '')
+  // if original assetPrefix is a URL with protocol
+  // the prefix should be normalized to pathname
   const prefix = normalizedAssetPrefix(assetPrefix)
 
-  // if original assetPrefix is a full URL with protocol
-  // we just update to use the correct `ws` protocol
-  if (assetPrefix?.startsWith('http')) {
-    return `${protocol}://${prefix}`
-  }
-
   return `${protocol}://${hostname}:${port}${prefix}`
 }
diff --git a/packages/next/src/shared/lib/normalized-asset-prefix.ts b/packages/next/src/shared/lib/normalized-asset-prefix.ts
@@ -1,12 +1,11 @@
 export function normalizedAssetPrefix(assetPrefix: string | undefined): string {
-  const escapedAssetPrefix = assetPrefix?.replace(/^\/+/, '') || false
-
-  if (escapedAssetPrefix && escapedAssetPrefix.startsWith('http')) {
-    // remove protocol for socket url
-    // https://example.com/path/to/asset -> example.com/path/to/asset
-    return escapedAssetPrefix.split('://', 2)[1]
+  // if assetPrefix is a URL, we return the pathname
+  if (assetPrefix?.startsWith('http')) {
+    return new URL(assetPrefix).pathname
   }
 
+  const escapedAssetPrefix = assetPrefix?.replace(/^\/+/, '') || false
+
   // assetPrefix is set to `undefined` or '/'
   if (!escapedAssetPrefix) {
     return ''