Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/load referenced config from packagejson #14044

Merged
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3210659
Loads .json config file when jest key has a path
rafaelrabelos Apr 1, 2023
398dc06
Adds feature explaining section for docs
rafaelrabelos Apr 1, 2023
d0fd07d
Adds changelog info
rafaelrabelos Apr 1, 2023
2225077
Update changelog with PR info
rafaelrabelos Apr 1, 2023
0948287
Update CHANGELOG.md
SimenB Apr 5, 2023
b6a58ff
Merge branch 'main' into feat/load_referenced_config_from_packagejson
SimenB Apr 5, 2023
c539a99
fix non callable expressions
rafaelrabelos Apr 5, 2023
0a21122
Fixed formatting issues in Configuration.md
rafaelrabelos Apr 5, 2023
111ce11
Refactor to optimize readFileAsync calls
rafaelrabelos Apr 6, 2023
a06ed19
Merge branch 'main' into feat/load_referenced_config_from_packagejson
SimenB Apr 19, 2023
6fa9dde
Merge branch 'main' into feat/load_referenced_config_from_packagejson
rafaelrabelos Aug 9, 2023
26f5427
Lint fixing for resolveConfigPath
rafaelrabelos Aug 9, 2023
b3379dc
Fixes code style issues from prettier
rafaelrabelos Aug 9, 2023
dd4238b
Avoid multiple configuration files
rafaelrabelos Aug 11, 2023
517e302
Remove unecessary try-catch
rafaelrabelos Aug 11, 2023
8f326a2
Refactor for "jest" key catch on parse errors
rafaelrabelos Aug 11, 2023
e50fda7
adds test case for load config file from jest key
rafaelrabelos Aug 11, 2023
1f3b8f0
Adds fs dependency
rafaelrabelos Aug 11, 2023
94e23f2
Test and fix file resolution
rafaelrabelos Aug 12, 2023
8fcfa68
Improves doc example
rafaelrabelos Aug 12, 2023
d174794
Update docs/Configuration.md
rafaelrabelos Aug 13, 2023
a551494
Merge branch 'main' into feat/load_referenced_config_from_packagejson
SimenB Aug 13, 2023
fce78ca
Remove AAA comments from tests
rafaelrabelos Aug 16, 2023
6149986
make resolveJestKey types well defined
rafaelrabelos Aug 16, 2023
ddbb1c8
Merge branch 'feat/load_referenced_config_from_packagejson' of https:…
rafaelrabelos Aug 16, 2023
af8716b
Aditional typing refactor
rafaelrabelos Aug 16, 2023
78c0ba5
Test case for when jest key is not a valid file
rafaelrabelos Aug 16, 2023
b552e19
Optmize Parse calls
rafaelrabelos Aug 17, 2023
ab6d71f
Merge branch 'main' into feat/load_referenced_config_from_packagejson
SimenB Nov 27, 2023
00167af
do not support directory
SimenB Nov 27, 2023
886420c
bring test back, and simplify
SimenB Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Aditional typing refactor
rafaelrabelos committed Aug 16, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit af8716bbe0c0c2f3f5439d4c8467e3faa8f4429c
2 changes: 1 addition & 1 deletion packages/jest-config/src/resolveConfigPath.ts
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ const resolveJestKey = (packageContent: string, packagePath: string) => {
return undefined;
};

const hasPackageJsonJestKey = (packageContent: any) => {
const hasPackageJsonJestKey = (packageContent: string) => {
try {
return 'jest' in JSON.parse(packageContent);
} catch {