diff --git a/jest.config.js b/jest.config.js index b8b005063..a83b3e8af 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,9 +1,6 @@ module.exports = { preset: '@react-native/jest-preset', setupFiles: ['/src/__mocks__/jest.setup.ts'], - setupFilesAfterEnv: [ - '/node_modules/@testing-library/jest-native/extend-expect', - ], testMatch: ['/src/**/*.(test|spec).[jt]s?(x)'], transformIgnorePatterns: [ 'node_modules/(?!(react-native|@react-native|@react-navigation|react-native-screens|react-native-safe-area-context|react-native-gesture-handler|react-native-webview)/)', diff --git a/lefthook.yml b/lefthook.yml index 8b7cac89d..f5a5f8870 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -9,6 +9,8 @@ pre-commit: run: npx tsc circular: glob: "src/**/*.{ts,tsx}" + env: + CI: "true" run: yarn check:circular # version-check: # glob: "package.json" diff --git a/package.json b/package.json index 5eaecfd4a..88ed7a9d2 100644 --- a/package.json +++ b/package.json @@ -79,9 +79,8 @@ "@react-native/typescript-config": "0.85.3", "@react-navigation/native": "^7.1.14", "@release-it/conventional-changelog": "^9.0.4", - "@testing-library/jest-native": "^5.4.3", "@testing-library/react-native": "^13.3.3", - "@types/jest": "^29.5.5", + "@types/jest": "^29.5.14", "@types/react": "^19.2.0", "@typescript-eslint/eslint-plugin": "^8.13.0", "@typescript-eslint/parser": "^8.13.0", @@ -114,6 +113,8 @@ }, "resolutions": { "@types/react": "^19.2.0", + "babel-jest": "29.7.0", + "jest-environment-node": "29.7.0", "eslint-plugin-ft-flow": "^3.0.11" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index adfe31cff..d8f4d7a9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2264,9 +2264,8 @@ __metadata: "@react-native/typescript-config": 0.85.3 "@react-navigation/native": ^7.1.14 "@release-it/conventional-changelog": ^9.0.4 - "@testing-library/jest-native": ^5.4.3 "@testing-library/react-native": ^13.3.3 - "@types/jest": ^29.5.5 + "@types/jest": ^29.5.14 "@types/react": ^19.2.0 "@typescript-eslint/eslint-plugin": ^8.13.0 "@typescript-eslint/parser": ^8.13.0 @@ -3532,23 +3531,6 @@ __metadata: languageName: node linkType: hard -"@testing-library/jest-native@npm:^5.4.3": - version: 5.4.3 - resolution: "@testing-library/jest-native@npm:5.4.3" - dependencies: - chalk: ^4.1.2 - jest-diff: ^29.0.1 - jest-matcher-utils: ^29.0.1 - pretty-format: ^29.0.3 - redent: ^3.0.0 - peerDependencies: - react: ">=16.0.0" - react-native: ">=0.59" - react-test-renderer: ">=16.0.0" - checksum: 2a4ebfeff09523860771cfddac6fcc3faa2f855dc63255b9efc016e727132320f16f935cec9717d6d79cfa6715fce6ded877215c8ec85d236a5c3136a65b1020 - languageName: node - linkType: hard - "@testing-library/react-native@npm:^13.3.3": version: 13.3.3 resolution: "@testing-library/react-native@npm:13.3.3" @@ -3683,7 +3665,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^29.5.13, @types/jest@npm:^29.5.5": +"@types/jest@npm:^29.5.13, @types/jest@npm:^29.5.14": version: 29.5.14 resolution: "@types/jest@npm:29.5.14" dependencies: @@ -4707,7 +4689,7 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^29.7.0": +"babel-jest@npm:29.7.0": version: 29.7.0 resolution: "babel-jest@npm:29.7.0" dependencies: @@ -9103,7 +9085,7 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.0.1, jest-diff@npm:^29.7.0": +"jest-diff@npm:^29.7.0": version: 29.7.0 resolution: "jest-diff@npm:29.7.0" dependencies: @@ -9137,7 +9119,7 @@ __metadata: languageName: node linkType: hard -"jest-environment-node@npm:^29.7.0": +"jest-environment-node@npm:29.7.0": version: 29.7.0 resolution: "jest-environment-node@npm:29.7.0" dependencies: @@ -9191,7 +9173,7 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.0.1, jest-matcher-utils@npm:^29.7.0": +"jest-matcher-utils@npm:^29.7.0": version: 29.7.0 resolution: "jest-matcher-utils@npm:29.7.0" dependencies: @@ -11767,7 +11749,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.0.3, pretty-format@npm:^29.7.0": +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0": version: 29.7.0 resolution: "pretty-format@npm:29.7.0" dependencies: