Merge pull request #2468 from reduxjs/revert-2465-feature/utils

reduxjs · Jun 29, 2022 · 720f143 · 720f143
2 parents d63dad9 + 3da5d74
commit 720f143
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/packages/toolkit/src/query/tests/utils.test.ts b/packages/toolkit/src/query/tests/utils.test.ts
@@ -83,8 +83,6 @@ describe('joinUrls', () => {
 
     expect(joinUrls('', '/banana')).toBe('/banana')
     expect(joinUrls('', 'banana')).toBe('banana')
-
-    expect(joinUrls('/api', '?foo=bar')).toBe('/api?foo=bar')
   })
 
   test('correctly joins variations of absolute urls', () => {
@@ -101,10 +99,6 @@ describe('joinUrls', () => {
     expect(joinUrls('https://example.com/api/', '/banana/')).toBe(
       'https://example.com/api/banana/'
     )
-
-    expect(joinUrls('https://example.com/api/', '?foo=bar')).toBe(
-      'https://example.com/api?foo=bar'
-    )
   })
 })
 

diff --git a/packages/toolkit/src/query/utils/joinUrls.ts b/packages/toolkit/src/query/utils/joinUrls.ts
@@ -20,7 +20,6 @@ export function joinUrls(
 
   base = withoutTrailingSlash(base)
   url = withoutLeadingSlash(url)
-  const delimiter = url.startsWith('?') ? '' : '/'
 
-  return `${base}${delimiter}${url}`;
+  return `${base}/${url}`
 }