Skip to content

Commit d1380fa

Browse files
committed
Merge branch 'master' of https://github.com/reduxjs/react-redux into migrate-typetests-to-vitest
2 parents 1f8dcd7 + 4d0b645 commit d1380fa

File tree

14 files changed

+7273
-7101
lines changed

14 files changed

+7273
-7101
lines changed

.codesandbox/ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sandboxes": ["vanilla", "vanilla-ts"],
3-
"node": "14",
3+
"node": "18",
44
"buildCommand": "build",
55
"packages": ["."]
66
}

.github/workflows/publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
id-token: write
1212
contents: read
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-node@v3
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
1616
with:
1717
node-version: '20.x'
1818
registry-url: 'https://registry.npmjs.org'

.github/workflows/size.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 1
1414
- uses: preactjs/compressed-size-action@v2

.github/workflows/test.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Tests
22

33
on:
44
push:
5-
branches: [master, v9.0-integration]
5+
branches: [master]
66
pull_request:
7-
branches: [master, v9.0-integration]
7+
branches: [master]
88
workflow_dispatch:
99

1010
jobs:
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Set up Node
20-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2121
with:
2222
node-version: 20.x
2323
cache: 'yarn'
@@ -34,7 +34,7 @@ jobs:
3434
- name: Pack
3535
run: yarn pack
3636

37-
- uses: actions/upload-artifact@v3
37+
- uses: actions/upload-artifact@v4
3838
with:
3939
name: package
4040
path: ./package.tgz
@@ -88,10 +88,10 @@ jobs:
8888

8989
steps:
9090
- name: Checkout repo
91-
uses: actions/checkout@v3
91+
uses: actions/checkout@v4
9292

9393
- name: Use node ${{ matrix.node }}
94-
uses: actions/setup-node@v3
94+
uses: actions/setup-node@v4
9595
with:
9696
node-version: ${{ matrix.node }}
9797
cache: 'yarn'
@@ -118,9 +118,9 @@ jobs:
118118
node: ['20.x']
119119
steps:
120120
- name: Checkout repo
121-
uses: actions/checkout@v3
121+
uses: actions/checkout@v4
122122

123-
- uses: actions/download-artifact@v3
123+
- uses: actions/download-artifact@v4
124124
with:
125125
name: package
126126
path: .
@@ -156,7 +156,7 @@ jobs:
156156
uses: actions/checkout@v4
157157

158158
- name: Use node ${{ matrix.node }}
159-
uses: actions/setup-node@v3.8.1
159+
uses: actions/setup-node@v4
160160
with:
161161
node-version: ${{ matrix.node }}
162162
cache: 'yarn'
@@ -179,14 +179,16 @@ jobs:
179179

180180
- name: Install deps
181181
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
182-
run: rm yarn.lock && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
182+
env:
183+
YARN_ENABLE_IMMUTABLE_INSTALLS: false
184+
run: rm yarn.lock && yarn install
183185

184186
- name: Install Playwright browser if necessary
185187
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
186188
continue-on-error: true
187189
run: yarn playwright install
188190

189-
- uses: actions/download-artifact@v2
191+
- uses: actions/download-artifact@v4
190192
with:
191193
name: package
192194
path: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
@@ -212,7 +214,9 @@ jobs:
212214

213215
- name: Build example
214216
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
215-
run: NODE_OPTIONS=--openssl-legacy-provider yarn build
217+
env:
218+
NODE_OPTIONS: --openssl-legacy-provider
219+
run: yarn build
216220

217221
- name: Run test step
218222
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
@@ -233,10 +237,10 @@ jobs:
233237
working-directory: ./examples/publish-ci/${{ matrix.example }}
234238
steps:
235239
- name: Checkout repo
236-
uses: actions/checkout@v3
240+
uses: actions/checkout@v4
237241

238242
- name: Use node ${{ matrix.node }}
239-
uses: actions/setup-node@v3
243+
uses: actions/setup-node@v4
240244
with:
241245
node-version: ${{ matrix.node }}
242246
cache: 'yarn'
@@ -247,7 +251,7 @@ jobs:
247251
- name: Remove existing React-Redux
248252
run: yarn remove react-redux
249253

250-
- uses: actions/download-artifact@v3
254+
- uses: actions/download-artifact@v4
251255
with:
252256
name: package
253257
path: ./examples/publish-ci/${{ matrix.example }}

.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: 0 additions & 29 deletions
This file was deleted.

.yarn/releases/yarn-3.4.1.cjs

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

.yarn/releases/yarn-4.1.0.cjs

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

.yarnrc.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
nodeLinker: node-modules
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
24

3-
plugins:
4-
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
5-
spec: "@yarnpkg/plugin-workspace-tools"
6-
- path: .yarn/plugins/@yarnpkg/plugin-compat.cjs
7-
spec: "@yarnpkg/plugin-compat"
5+
nodeLinker: node-modules
86

9-
yarnPath: .yarn/releases/yarn-3.4.1.cjs
7+
yarnPath: .yarn/releases/yarn-4.1.0.cjs

0 commit comments

Comments
 (0)