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.

Sign up for GitHub

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

Jump to bottom

Allow projects in TypeScript Config to be an array of ProjectConfig #11285

Merged
merged 13 commits into from Apr 12, 2021
Merged

Allow projects in TypeScript Config to be an array of ProjectConfig #11285

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e4ccddf
Fix moduleNameMapper in ProjectConfig
TranquilMarmot Apr 8, 2021
b469696
Update changelog
TranquilMarmot Apr 8, 2021
99c3c8f
Fix type
TranquilMarmot Apr 8, 2021
0c36b9e
Undo unnecessary changes
TranquilMarmot Apr 8, 2021
1a1dfcd
Projects is an array of InitialOptions?
TranquilMarmot Apr 8, 2021
bb0563b
Omit GlobalConfig from InitialOptions
TranquilMarmot Apr 8, 2021
67b0733
Fix types and ignore project objects in normailize
TranquilMarmot Apr 8, 2021
a2079f1
Add to top-level-config test
TranquilMarmot Apr 8, 2021
2bc36a3
Better type and fix normalize
TranquilMarmot Apr 8, 2021
7d53a53
More accurate changelog entry
TranquilMarmot Apr 8, 2021
0cd0a75
Allow projects in TypeScript Config to be an array of ProjectConfig
Apr 9, 2021
51396d3
Better handle when displayName is a string instead of an object
TranquilMarmot Apr 8, 2021
59f94f4
Even more betterer changelog entry
Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@
- `[jest-jasmine2]` Fixed the issue of `beforeAll` & `afterAll` hooks getting executed even if it is inside a skipped `describe` block when it has child `tests` marked as either `only` or `todo` [#10451](https://github.com/facebook/jest/issues/10451)
- `[jest-jasmine2]` Fixed the issues of child `tests` marked with `only` or `todo` getting executed even if it is inside a skipped parent `describe` block [#10451](https://github.com/facebook/jest/issues/10451)
- `[jest-reporter]` Handle empty files when reporting code coverage with V8 ([#10819](https://github.com/facebook/jest/pull/10819))
- `[jest-reporters]` Fix `Config.ts` `projects` types and better handle `displayName` ([#11285](https://github.com/facebook/jest/pull/11285))
- `[jest-resolve]` Replace read-pkg-up with escalade package ([#10781](https://github.com/facebook/jest/pull/10781))
- `[jest-resolve]` Disable `jest-pnp-resolver` for Yarn 2 ([#10847](https://github.com/facebook/jest/pull/10847))
- `[jest-runtime]` [**BREAKING**] Do not inject `global` variable into module wrapper ([#10644](https://github.com/facebook/jest/pull/10644))
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-types/src/Config.ts
View file
Open in desktop
Expand Up @@ -184,7 +184,7 @@ export type InitialOptions = Partial<{
preprocessorIgnorePatterns: Array<Glob>;
preset: string | null | undefined;
prettierPath: string | null | undefined;
projects: Array<Glob>;
projects: Array<Glob> | Array<Omit<InitialOptions, keyof GlobalConfig>>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self reference works? if not we can have one type without projects, and then one that extends it

replname: string | null | undefined;
resetMocks: boolean;
resetModules: boolean;
Expand Down