Merge branch 'master' into v1.9-integration

Author: markerikson

docs/api/createSlice.mdx

@@ -213,6 +213,10 @@ The generated `reducer` function is suitable for passing to the Redux `combineRe
 You may want to consider destructuring the action creators and exporting them individually, for ease of searching
 for references in a larger codebase.
 
+The functions passed to the `reducers` parameter can be accessed through the `caseReducers` return field. This can be particularly useful for testing or direct access to reducers created inline.
+
+Result's function `getInitialState` provides access to the initial state value given to the slice. If a lazy state initializer was provided, it will be called and a fresh value returned.
+
 > **Note**: the result object is conceptually similar to a
 > ["Redux duck" code structure](https://redux.js.org/faq/code-structure#what-should-my-file-structure-look-like-how-should-i-group-my-action-creators-and-reducers-in-my-project-where-should-my-selectors-go).
 > The actual code structure you use is up to you, but there are a couple caveats to keep in mind:

packages/toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reduxjs/toolkit",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "The official, opinionated, batteries-included toolset for efficient Redux development",
   "author": "Mark Erikson <mark@isquaredsoftware.com>",
   "license": "MIT",

packages/toolkit/src/query/tests/utils.test.ts

@@ -74,31 +74,25 @@ describe('isDocumentVisible', () => {
 })
 
 describe('joinUrls', () => {
-  test('correctly joins variations of relative urls', () => {
-    expect(joinUrls('/api/', '/banana')).toBe('/api/banana')
-    expect(joinUrls('/api/', 'banana')).toBe('/api/banana')
-
-    expect(joinUrls('/api', 'banana')).toBe('/api/banana')
-    expect(joinUrls('/api', '/banana/')).toBe('/api/banana/')
-
-    expect(joinUrls('', '/banana')).toBe('/banana')
-    expect(joinUrls('', 'banana')).toBe('banana')
-  })
-
-  test('correctly joins variations of absolute urls', () => {
-    expect(joinUrls('https://example.com/api', 'banana')).toBe(
-      'https://example.com/api/banana'
-    )
-    expect(joinUrls('https://example.com/api', '/banana')).toBe(
-      'https://example.com/api/banana'
-    )
-
-    expect(joinUrls('https://example.com/api/', 'banana')).toBe(
-      'https://example.com/api/banana'
-    )
-    expect(joinUrls('https://example.com/api/', '/banana/')).toBe(
-      'https://example.com/api/banana/'
-    )
+  test.each([
+    ['/api/', '/banana', '/api/banana'],
+    ['/api/', 'banana', '/api/banana'],
+    ['/api', '/banana', '/api/banana'],
+    ['/api', 'banana', '/api/banana'],
+    ['', '/banana', '/banana'],
+    ['', 'banana', 'banana'],
+    ['api', '?a=1', 'api?a=1'],
+    ['api/', '?a=1', 'api/?a=1'],
+    ['api', 'banana?a=1', 'api/banana?a=1'],
+    ['api/', 'banana?a=1', 'api/banana?a=1'],
+    ['https://example.com/api', 'banana', 'https://example.com/api/banana'],
+    ['https://example.com/api', '/banana', 'https://example.com/api/banana'],
+    ['https://example.com/api/', 'banana', 'https://example.com/api/banana'],
+    ['https://example.com/api/', '/banana', 'https://example.com/api/banana'],
+    ['https://example.com/api/', 'https://example.org', 'https://example.org'],
+    ['https://example.com/api/', '//example.org', '//example.org'],
+  ])('%s and %s join to %s', (base, url, expected) => {
+    expect(joinUrls(base, url)).toBe(expected)
   })
 })
 

packages/toolkit/src/query/utils/joinUrls.ts

@@ -18,8 +18,9 @@ export function joinUrls(
     return url
   }
 
+  const delimiter = base.endsWith('/') || !url.startsWith('?') ? '/' : ''
   base = withoutTrailingSlash(base)
   url = withoutLeadingSlash(url)
 
-  return `${base}/${url}`
+  return `${base}${delimiter}${url}`;
 }