Skip to content

Fixes resolution concurrency problem #3673

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

Merged
merged 1 commit into from
Jun 22, 2017
Merged

Fixes resolution concurrency problem #3673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/package-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,10 @@ export default class PackageRequest {
}
}

await Promise.all(promises);
for (const promise of promises) {
await promise;
}

ref.addDependencies(deps);

// Now that we have all dependencies, it's safe to propagate optional
Expand Down
5 changes: 4 additions & 1 deletion src/package-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,10 @@ export default class PackageResolver {
this.frozen = Boolean(isFrozen);
this.workspaceLayout = workspaceLayout;
const activity = (this.activity = this.reporter.activity());
await Promise.all(deps.map((req): Promise<void> => this.find(req)));

for (const req of deps) {
await this.find(req);
}

// all required package versions have been discovered, so now packages that
// resolved to existing versions can be resolved to their best available version
Expand Down