Skip to content

Commit 7251a67

Browse files
committed
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into update-ts-to-5.4
2 parents 8edbe4f + e31224f commit 7251a67

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
contents: read
2323
steps:
2424
- uses: actions/checkout@v4
25-
- uses: actions/setup-node@v3
25+
- uses: actions/setup-node@v4
2626
with:
2727
node-version: '20.x'
2828
registry-url: 'https://registry.npmjs.org'

.github/workflows/test-codegen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
codegen: ${{ steps.filter.outputs.codegen }}
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: dorny/paths-filter@v2
19+
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:
2222
filters: |
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v4
3838
- name: Use Node.js ${{ matrix.node-version }}
39-
uses: actions/setup-node@v2
39+
uses: actions/setup-node@v4
4040
with:
4141
node-version: ${{ matrix.node }}
4242
cache: 'yarn'

.github/workflows/tests.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
toolkit: ${{ steps.filter.outputs.toolkit }}
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: dorny/paths-filter@v2
15+
- uses: dorny/paths-filter@v3
1616
id: filter
1717
with:
1818
filters: |
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@v4
3838

3939
- name: Use node ${{ matrix.node }}
40-
uses: actions/setup-node@v2
40+
uses: actions/setup-node@v4
4141
with:
4242
node-version: ${{ matrix.node }}
4343
cache: 'yarn'
@@ -55,7 +55,7 @@ jobs:
5555
- name: Pack
5656
run: yarn pack
5757

58-
- uses: actions/upload-artifact@v2
58+
- uses: actions/upload-artifact@v4
5959
with:
6060
name: package
6161
path: packages/toolkit/package.tgz
@@ -73,15 +73,15 @@ jobs:
7373
uses: actions/checkout@v4
7474

7575
- name: Use node ${{ matrix.node }}
76-
uses: actions/setup-node@v2
76+
uses: actions/setup-node@v4
7777
with:
7878
node-version: ${{ matrix.node }}
7979
cache: 'yarn'
8080

8181
- name: Install deps
8282
run: yarn install
8383

84-
- uses: actions/download-artifact@v2
84+
- uses: actions/download-artifact@v4
8585
with:
8686
name: package
8787
path: packages/toolkit
@@ -111,7 +111,7 @@ jobs:
111111
uses: actions/checkout@v4
112112

113113
- name: Use node ${{ matrix.node }}
114-
uses: actions/setup-node@v2
114+
uses: actions/setup-node@v4
115115
with:
116116
node-version: ${{ matrix.node }}
117117
cache: 'yarn'
@@ -122,7 +122,7 @@ jobs:
122122
- name: Install TypeScript ${{ matrix.ts }}
123123
run: yarn add typescript@${{ matrix.ts }}
124124

125-
- uses: actions/download-artifact@v2
125+
- uses: actions/download-artifact@v4
126126
with:
127127
name: package
128128
path: packages/toolkit
@@ -164,13 +164,13 @@ jobs:
164164
run:
165165
working-directory: ./examples/publish-ci/${{ matrix.example }}
166166
env:
167-
YARN_ENABLE_IMMUTABLE_INSTALLS: 'false'
167+
YARN_ENABLE_IMMUTABLE_INSTALLS: false
168168
steps:
169169
- name: Checkout repo
170170
uses: actions/checkout@v4
171171

172172
- name: Use node ${{ matrix.node }}
173-
uses: actions/setup-node@v2
173+
uses: actions/setup-node@v4
174174
with:
175175
node-version: ${{ matrix.node }}
176176
cache: 'yarn'
@@ -181,7 +181,7 @@ jobs:
181181
- name: Remove existing RTK
182182
run: yarn remove @reduxjs/toolkit
183183

184-
- uses: actions/download-artifact@v2
184+
- uses: actions/download-artifact@v4
185185
with:
186186
name: package
187187
path: ./examples/publish-ci/${{ matrix.example }}
@@ -197,13 +197,15 @@ jobs:
197197

198198
- name: Set up JDK 17 for React Native build
199199
if: matrix.example == 'react-native' || matrix.example == 'expo'
200-
uses: actions/setup-java@v2
200+
uses: actions/setup-java@v4
201201
with:
202202
java-version: '17.x'
203203
distribution: 'temurin'
204204

205205
- name: Build example
206-
run: NODE_OPTIONS=--openssl-legacy-provider yarn build
206+
env:
207+
NODE_OPTIONS: --openssl-legacy-provider
208+
run: yarn build
207209

208210
- name: Run test step
209211
run: yarn test
@@ -222,15 +224,15 @@ jobs:
222224
uses: actions/checkout@v4
223225

224226
- name: Use node ${{ matrix.node }}
225-
uses: actions/setup-node@v2
227+
uses: actions/setup-node@v4
226228
with:
227229
node-version: ${{ matrix.node }}
228230
cache: 'yarn'
229231

230232
- name: Install deps
231233
run: yarn install
232234

233-
- uses: actions/download-artifact@v2
235+
- uses: actions/download-artifact@v4
234236
with:
235237
name: package
236238
path: packages/toolkit
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Learn more https://docs.expo.io/guides/customizing-metro
2+
const { getDefaultConfig } = require('expo/metro-config');
3+
4+
/** @type {import('expo/metro-config').MetroConfig} */
5+
const config = getDefaultConfig(__dirname);
6+
7+
module.exports = config;

examples/publish-ci/expo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"main": "node_modules/expo/AppEntry.js",
55
"scripts": {
6-
"build": "expo prebuild --clean -p android && cd android && chmod +x ./gradlew && ./gradlew bundleRelease --no-daemon && cd .. && react-native build-android",
6+
"build": "react-native bundle --entry-file App.tsx --bundle-output app.bundle",
77
"start": "expo start",
88
"android": "expo run:android",
99
"ios": "expo run:ios",

examples/publish-ci/react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"private": true,
55
"scripts": {
6-
"build": "cd android && chmod +x ./gradlew && ./gradlew bundleRelease --no-daemon && cd .. && react-native build-android",
6+
"build": "react-native bundle --entry-file index.js --bundle-output app.bundle",
77
"android": "react-native run-android",
88
"ios": "react-native run-ios",
99
"lint": "eslint .",

packages/rtk-codemods/.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: actions/setup-node@v1
22+
- uses: actions/setup-node@v4
2323
with:
2424
node-version: 12.x
2525
- name: install dependencies
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- uses: actions/checkout@v4
40-
- uses: actions/setup-node@v1
40+
- uses: actions/setup-node@v4
4141
with:
4242
node-version: ${{ matrix.node }}
4343
- name: install dependencies
@@ -51,7 +51,7 @@ jobs:
5151

5252
steps:
5353
- uses: actions/checkout@v4
54-
- uses: actions/setup-node@v1
54+
- uses: actions/setup-node@v4
5555
with:
5656
node-version: '12.x'
5757
- name: install dependencies

0 commit comments

Comments
 (0)