Skip to content

Commit 0ad3af1

Browse files
authored
Merge pull request #356 from reduxjs/feature/3.0-bump-deps-rc
2 parents 3eea8af + 8863682 commit 0ad3af1

File tree

3 files changed

+367
-427
lines changed

3 files changed

+367
-427
lines changed

.github/workflows/test.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
node: ['16.x']
60-
ts: ['4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9', '5.0']
60+
ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2']
6161

6262
steps:
6363
- name: Checkout repo
@@ -89,16 +89,7 @@ jobs:
8989
fail-fast: false
9090
matrix:
9191
node: ['16.x']
92-
example:
93-
[
94-
'cra4',
95-
'cra5',
96-
'next',
97-
'vite',
98-
'node-standard',
99-
'node-esm',
100-
'are-the-types-wrong'
101-
]
92+
example: ['cra4', 'cra5', 'next', 'vite', 'node-standard', 'node-esm']
10293
steps:
10394
- name: Checkout repo
10495
uses: actions/checkout@v2
@@ -143,10 +134,25 @@ jobs:
143134
- name: Run test step
144135
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
145136
run: yarn test
146-
if: matrix.example != 'are-the-types-wrong'
147137

148-
- name: Run test step (attw)
149-
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
150-
# Ignore "FalseCJS" errors in the `attw` job
151-
run: yarn test -n FalseCJS
152-
if: matrix.example == 'are-the-types-wrong'
138+
are-the-types-wrong:
139+
name: Check package config with are-the-types-wrong
140+
141+
needs: [build]
142+
runs-on: ubuntu-latest
143+
strategy:
144+
fail-fast: false
145+
matrix:
146+
node: ['16.x']
147+
steps:
148+
- name: Checkout repo
149+
uses: actions/checkout@v3
150+
151+
- uses: actions/download-artifact@v3
152+
with:
153+
name: package
154+
path: .
155+
156+
# Note: We currently expect "FalseCJS" failures for Node16 + `moduleResolution: "node16"
157+
- name: Run are-the-types-wrong
158+
run: npx @arethetypeswrong/cli ./package.tgz --format table --ignore-rules false-cjs

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"prepack": "yarn build"
5050
},
5151
"peerDependencies": {
52-
"redux": "^4 || ^5.0.0-beta.0"
52+
"redux": "^5.0.0-rc.0"
5353
},
5454
"devDependencies": {
5555
"@typescript-eslint/eslint-plugin": "^5.1.0",
@@ -60,8 +60,8 @@
6060
"prettier": "^2.4.1",
6161
"redux": "^4",
6262
"rimraf": "^3.0.2",
63-
"tsup": "^6.7.0",
64-
"typescript": "^4.4",
65-
"vitest": "^0.29.8"
63+
"tsup": "7.0.0",
64+
"typescript": "^5.0",
65+
"vitest": "^0.32.0"
6666
}
6767
}

0 commit comments

Comments
 (0)