Skip to content

Commit e2aa28d

Browse files
committed
Merge branch 'renovate/primer-octicons-react-19.x' of https://github.com/gitify-app/gitify into renovate/primer-octicons-react-19.x
2 parents 3e4b460 + 5632467 commit e2aa28d

File tree

15 files changed

+248
-170
lines changed

15 files changed

+248
-170
lines changed

jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Config } from 'jest';
22

33
const config: Config = {
44
preset: 'ts-jest',
5-
setupFiles: ['<rootDir>/src/renderer/__helpers__/setupEnvVars.js'],
5+
setupFiles: ['<rootDir>/src/renderer/__helpers__/jest.setup.ts'],
66
testEnvironment: 'jsdom',
77
collectCoverage: true,
88
collectCoverageFrom: ['src/**/*', '!**/__snapshots__/**'],

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
"menubar": "9.5.1",
133133
"react": "19.0.0",
134134
"react-dom": "19.0.0",
135-
"react-router-dom": "6.28.0",
136-
"update-electron-app": "3.0.0"
135+
"react-router-dom": "7.1.1",
136+
"update-electron-app": "3.1.0"
137137
},
138138
"devDependencies": {
139139
"@biomejs/biome": "1.9.4",
@@ -144,10 +144,10 @@
144144
"@types/jest": "29.5.14",
145145
"@types/node": "22.10.2",
146146
"@types/nprogress": "0.2.3",
147-
"@types/react": "19.0.1",
147+
"@types/react": "19.0.2",
148148
"@types/react-dom": "19.0.2",
149149
"@types/react-router-dom": "5.3.3",
150-
"@types/semver": "^7.5.8",
150+
"@types/semver": "7.5.8",
151151
"autoprefixer": "10.4.20",
152152
"axios": "1.7.9",
153153
"class-variance-authority": "0.7.1",
@@ -173,18 +173,18 @@
173173
"react-final-form": "6.5.9",
174174
"rimraf": "6.0.1",
175175
"semver": "7.6.3",
176-
"tailwind-merge": "2.5.5",
177-
"tailwindcss": "3.4.16",
178-
"terser-webpack-plugin": "5.3.10",
176+
"tailwind-merge": "2.6.0",
177+
"tailwindcss": "3.4.17",
178+
"terser-webpack-plugin": "5.3.11",
179179
"ts-jest": "29.2.5",
180180
"ts-loader": "9.5.1",
181181
"ts-node": "10.9.2",
182182
"typescript": "5.7.2",
183183
"webpack": "5.97.1",
184-
"webpack-cli": "5.1.4",
184+
"webpack-cli": "6.0.1",
185185
"webpack-merge": "6.0.1"
186186
},
187-
"packageManager": "[email protected].0",
187+
"packageManager": "[email protected].1",
188188
"lint-staged": {
189189
"*": "biome check --fix --no-errors-on-unmatched",
190190
"*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests"

0 commit comments

Comments
 (0)