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

fix(read-config): allow multiple projects with programmatic usage #11307

Merged
merged 14 commits into from Apr 23, 2021
Merged

fix(read-config): allow multiple projects with programmatic usage #11307

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
634e097
fix(read-config): allow multiple projects with programmatic usage
nicojs Apr 16, 2021
bc21bd7
Add e2e test
nicojs Apr 22, 2021
343d6a3
fix lint
nicojs Apr 23, 2021
57d22e8
Rename runcli -\> run-programmatically
nicojs Apr 23, 2021
dd50ee7
Fix e2e test
nicojs Apr 23, 2021
04d329b
Update changelog
nicojs Apr 23, 2021
40361e3
Apply suggestions from code review
nicojs Apr 23, 2021
db3d960
Review comments: copy right header and less generic done message
nicojs Apr 23, 2021
d512dec
Implement test with snapshot result
nicojs Apr 23, 2021
ee9eb58
2 more missing copyright headers
nicojs Apr 23, 2021
240f18d
Merge branch 'master' into fix/issue-11213
SimenB Apr 23, 2021
cb2edc6
tweak test
SimenB Apr 23, 2021
0f9364e
Remove duplicate assertion
nicojs Apr 23, 2021
fce7fc3
strip-ansi
nicojs Apr 23, 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
14 changes: 6 additions & 8 deletions packages/jest-config/src/index.ts
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ export async function readConfig(
// `project` property, we don't want to read `--config` value and rather
// read individual configs for every project.
skipArgvConfigOption?: boolean,
parentConfigPath?: Config.Path | null,
parentConfigDirname?: Config.Path | null,
projectIndex: number = Infinity,
): Promise<ReadConfig> {
let rawOptions:
Expand All @@ -47,8 +47,7 @@ export async function readConfig(
let configPath = null;

if (typeof packageRootOrConfig !== 'string') {
if (parentConfigPath) {
const parentConfigDirname = path.dirname(parentConfigPath);
if (parentConfigDirname) {
rawOptions = packageRootOrConfig;
rawOptions.rootDir = rawOptions.rootDir
? replaceRootDirInPath(parentConfigDirname, rawOptions.rootDir)
Expand Down Expand Up @@ -301,10 +300,9 @@ export async function readConfigs(
}

if (projects.length > 0) {
const projectIsCwd =
process.platform === 'win32'
? projects[0] === tryRealpath(process.cwd())
: projects[0] === process.cwd();
const cwd =
process.platform === 'win32' ? tryRealpath(process.cwd()) : process.cwd();
const projectIsCwd = projects[0] === cwd;

const parsedConfigs = await Promise.all(
projects
Expand Down Expand Up @@ -332,7 +330,7 @@ export async function readConfigs(
argv,
root,
skipArgvConfigOption,
configPath,
configPath ? path.dirname(configPath) : cwd,
projectIndex,
);
}),
Expand Down