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

build: deduplicate node dependencies #23243

Merged
merged 2 commits into from Jul 27, 2021
Merged

build: deduplicate node dependencies #23243

merged 2 commits into from Jul 27, 2021

Conversation

devversion
Copy link
Member

See individual commits.

@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jul 25, 2021
@devversion devversion added merge safe target: patch This PR is targeted for the next patch release labels Jul 25, 2021
@devversion devversion marked this pull request as ready for review July 25, 2021 15:10
@devversion devversion requested a review from a team as a code owner July 25, 2021 15:10
@devversion
Copy link
Member Author

@mmalerba I've incorporated your change from #23238 into this PR and fixed the CI issue by bumping the cache key (because the old node module cache being restored from the fallback cache resulted in the Bazel failures)

crisbeto
crisbeto reviewed Jul 26, 2021
View reviewed changes
package.json
"@angular/common": "12.1.2",
"@angular/compiler": "12.1.2",
"@angular/core": "12.1.2",
"@angular/forms": "12.1.2",
Copy link
Member

Choose a reason for hiding this comment

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

Why do we have to lock down to a specific version?

Copy link
Member Author

Choose a reason for hiding this comment

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

If we'd not lock them there, then this lock file update would have updated to the most recent patch/minor. This would be acceptable but I figured we want to explicitly update Angular versions together with it being reflected in the package.json

josephperrott
josephperrott approved these changes Jul 26, 2021
View reviewed changes
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

LGTM

mmalerba
mmalerba approved these changes Jul 26, 2021
View reviewed changes
Copy link
Contributor

@mmalerba mmalerba left a comment

Choose a reason for hiding this comment

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

LGTM

@mmalerba mmalerba added the action: merge The PR is ready for merge by the caretaker label Jul 26, 2021
@mmalerba mmalerba mentioned this pull request Jul 26, 2021
Closed
@devversion devversion added the merge: preserve commits When the PR is merged, a rebase and merge should be performed label Jul 26, 2021
@mmalerba mmalerba added target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Jul 27, 2021
mmalerba and others added 2 commits July 26, 2021 23:56
@mmalerba
build: update @octokit/rest to fix merge tool
f765d43
@devversion @mmalerba
build: deduplicate node dependencies
c15af0c 
Deduplicates some node dependencies by cleaning up the Yarn
lock file so that dependencies can be deduplicated and merged
together (to a version that satisfies multiple ranges).
@mmalerba mmalerba force-pushed the build/deduplicate-lock-file branch from eabd624 to c15af0c Compare July 27, 2021 06:57
@mmalerba mmalerba merged commit 3ffaa1a into angular:master Jul 27, 2021
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Aug 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@crisbeto crisbeto crisbeto left review comments

@josephperrott josephperrott josephperrott approved these changes

@mmalerba mmalerba mmalerba approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement merge: preserve commits When the PR is merged, a rebase and merge should be performed target: minor This PR is targeted for the next minor release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@devversion @crisbeto @josephperrott @mmalerba