Skip to content

Commit 4c9c157

Browse files
committed
Merge remote-tracking branch 'origin/master' into v1.7.0-integration
2 parents 12d5797 + 5fa0d4a commit 4c9c157

31 files changed

+5686
-2822
lines changed

.codesandbox/ci.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
"buildCommand": "build:packages",
1111
"packages": [
1212
"packages/toolkit",
13-
"packages/rtk-query-graphql-request-base-query"
13+
"packages/rtk-query-graphql-request-base-query",
14+
"packages/action-listener-middleware"
1415
],
1516
"publishDirectory": {
1617
"@reduxjs/toolkit": "packages/toolkit",
17-
"@rtk-query/graphql-request-base-query": "packages/rtk-query-graphql-request-base-query"
18+
"@rtk-query/graphql-request-base-query": "packages/rtk-query-graphql-request-base-query",
19+
"@rtk-incubator/action-listener-middleware": "packages/action-listener-middleware"
1820
}
1921
}

.github/workflows/size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
env:
77
CI_JOB_NUMBER: 1
88
steps:
9-
- uses: actions/checkout@v1
9+
- uses: actions/checkout@v2
1010
- uses: andresz1/size-limit-action@v1
1111
with:
1212
directory: packages/toolkit

.github/workflows/tests.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ jobs:
1818
uses: actions/checkout@v2
1919

2020
- name: Use node ${{ matrix.node }}
21-
uses: actions/setup-node@v1
21+
uses: actions/setup-node@v2
2222
with:
2323
node-version: ${{ matrix.node }}
24-
25-
- uses: actions/cache@v2
26-
with:
27-
path: .yarn/cache
28-
key: yarn-${{ hashFiles('yarn.lock') }}
29-
restore-keys: yarn-
24+
cache: 'yarn'
3025

3126
- name: Install deps
3227
run: yarn install
@@ -52,15 +47,10 @@ jobs:
5247
uses: actions/checkout@v2
5348

5449
- name: Use node ${{ matrix.node }}
55-
uses: actions/setup-node@v1
50+
uses: actions/setup-node@v2
5651
with:
5752
node-version: ${{ matrix.node }}
58-
59-
- uses: actions/cache@v2
60-
with:
61-
path: .yarn/cache
62-
key: yarn-${{ hashFiles('yarn.lock') }}
63-
restore-keys: yarn-
53+
cache: 'yarn'
6454

6555
- name: Install deps
6656
run: yarn install
@@ -95,15 +85,10 @@ jobs:
9585
uses: actions/checkout@v2
9686

9787
- name: Use node ${{ matrix.node }}
98-
uses: actions/setup-node@v1
88+
uses: actions/setup-node@v2
9989
with:
10090
node-version: ${{ matrix.node }}
101-
102-
- uses: actions/cache@v2
103-
with:
104-
path: .yarn/cache
105-
key: yarn-${{ hashFiles('yarn.lock') }}
106-
restore-keys: yarn-
91+
cache: 'yarn'
10792

10893
- name: Install deps
10994
run: yarn install

.yarn/plugins/@yarnpkg/plugin-compat.cjs

Lines changed: 0 additions & 9 deletions
This file was deleted.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 4 additions & 5 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.1.0.cjs

Lines changed: 768 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-berry.cjs

Lines changed: 0 additions & 55 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ nodeLinker: node-modules
33
plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
55
spec: '@yarnpkg/plugin-workspace-tools'
6-
- path: .yarn/plugins/@yarnpkg/plugin-compat.cjs
7-
spec: '@yarnpkg/plugin-compat'
86

9-
yarnPath: .yarn/releases/yarn-berry.cjs
7+
yarnPath: .yarn/releases/yarn-3.1.0.cjs

docs/api/createSlice.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and automatically generates action creators and action types that correspond to
1515
This API is the standard approach for writing Redux logic.
1616

1717
Internally, it uses [`createAction`](./createAction.mdx) and [`createReducer`](./createReducer.mdx), so
18-
you may also use Immer to write "mutating" immutable updates:
18+
you may also use [Immer](https://immerjs.github.io/immer/) to write "mutating" immutable updates:
1919

2020
```ts
2121
import { createSlice, PayloadAction } from '@reduxjs/toolkit'

docs/api/serializabilityMiddleware.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ interface SerializableStateInvariantMiddlewareOptions {
4040

4141
/**
4242
* An array of dot-separated path strings to ignore when checking
43-
* for serializability, Defaults to ['meta.arg']
43+
* for serializability, Defaults to ['meta.arg', 'meta.baseQueryMeta']
4444
*/
4545
ignoredActionPaths?: string[]
4646

0 commit comments

Comments
 (0)