Skip to content

Commit 7517b17

Browse files
committed
chore(deps): fix conflict
2 parents 988c130 + 1cf0068 commit 7517b17

3 files changed

Lines changed: 67 additions & 2307 deletions

File tree

.eslintrc

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

package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,10 @@
2626
"prepare": "npm run build"
2727
},
2828
"devDependencies": {
29-
"@getflywheel/eslint-config-local": "1.0.4",
3029
"@getflywheel/local": "^9.2.4",
3130
"@types/classnames": "^2.3.4",
3231
"@types/prop-types": "^15.7.14",
3332
"@types/react": "^19.0.12",
34-
"eslint": "^9.23.0",
35-
"eslint-plugin-import": "^2.31.0",
36-
"eslint-plugin-react": "^7.37.4",
3733
"typescript": "^5.8.2"
3834
},
3935
"peerDependencies": {
@@ -44,8 +40,8 @@
4440
"dependencies": {
4541
"@getflywheel/local-components": "^17.8.0",
4642
"classnames": "^2.5.1",
47-
"lodash": "^4.17.21",
48-
"path-to-regexp": "^8.2.0",
43+
"lodash": "4.18.0",
44+
"path-to-regexp": "8.4.2",
4945
"prop-types": "^15.6.2",
5046
"react": "^19.1.0",
5147
"react-dom": "^19.1.0",
@@ -63,7 +59,7 @@
6359
},
6460
"resolutions": {
6561
"trim": "1.0.1",
66-
"path-to-regexp": "1.9.0",
67-
"react-router": "7.5.2"
62+
"react-router": "7.12.0",
63+
"electron": "^42.2.0"
6864
}
6965
}

0 commit comments

Comments
 (0)