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

Cleanup pnpm overrides #21944

Merged
merged 2 commits into from
Dec 6, 2021
Merged

Cleanup pnpm overrides #21944

merged 2 commits into from
Dec 6, 2021

Conversation

anomiex
Copy link
Contributor

@anomiex anomiex commented Dec 3, 2021

Changes proposed in this Pull Request:

  • Pnpm has started wanting to update @storybook/builder-webpack5
    with every upstream release. Giving the relevant overrides a version
    makes it stick with the lockfile.
  • @automattic/format-currency seems a bit outdated. We can clean up a
    lot of the old deps we have in pnpm-lock.yaml by updating its dep on
    i18n-calypso from 4.x to 5.x, and in turn updating i18n-calypso's
    dep on interpolate-components 1.1.0 too.
  • jest-environment-enzyme is supposedly not dead, but still isn't
    being updated for several months. For our purposes at least it seems
    to work fine with jest-environment-jsdom 27.
  • Looks like we've dropped the dep on whatever old version of
    terser-webpack-plugin had a dep on an old version of
    serialize-javascript, so drop the override.

Jetpack product discussion

None

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • 🤷 I guess the main thing would be to look at whatever @automattic/format-currency is used for and see if it still works.

* Pnpm has started wanting to update `@storybook/builder-webpack5`
  with every upstream release. Giving the relevant overrides a version
  makes it stick with the lockfile.
* `@automattic/format-currency` seems a bit outdated. We can clean up a
  lot of the old deps we have in pnpm-lock.yaml by updating its dep on
  `i18n-calypso` from 4.x to 5.x, and in turn updating `i18n-calypso`'s
  dep on `interpolate-components` 1.1.0 too.
* `jest-environment-enzyme` is [supposedly not dead][1], but still isn't
  being updated for several months. For our purposes at least it seems
  to work fine with jest-environment-jsdom 27.
* Looks like we've dropped the dep on whatever old version of
  `terser-webpack-plugin` had a dep on an old version of
  `serialize-javascript`, so drop the override.

[1]: enzymejs/enzyme-matchers#353
@anomiex anomiex added [Status] Needs Review To request a review from Crew. Label will be renamed soon. [Type] Janitorial [Pri] Normal labels Dec 3, 2021
@anomiex anomiex self-assigned this Dec 3, 2021
@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello anomiex! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D71026-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@github-actions
Copy link
Contributor

github-actions bot commented Dec 3, 2021

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ All commits were linted before commit.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team review" label and ask someone from your team review the code.
Once you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.

Copy link
Contributor

@sdixon194 sdixon194 left a comment

Choose a reason for hiding this comment

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

Hmm, checking everything I could pricing wise seemed okay. Let's go for it.

@sdixon194 sdixon194 added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Dec 6, 2021
@anomiex anomiex enabled auto-merge (squash) December 6, 2021 20:44
@anomiex anomiex merged commit ea2ffbb into master Dec 6, 2021
@anomiex anomiex deleted the update/cleanup-pnpm-overrides branch December 6, 2021 20:47
@anomiex
Copy link
Contributor Author

anomiex commented Dec 6, 2021

r236132-wpcom

@github-actions
Copy link
Contributor

github-actions bot commented Dec 6, 2021

Great news! One last step: head over to your WordPress.com diff, D71026-code, and commit it.
Once you've done so, come back to this PR and add a comment with your changeset ID.

Thank you!

@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Dec 6, 2021
davidlonjon added a commit that referenced this pull request Dec 7, 2021
* master: (32 commits)
  Search: Add missing JavaScript dependencies (#21996)
  tools: Fix changelogger-release.sh logic (#22015)
  Analyzer: add JSON serialization (#21910)
  Add my jetpack page to Backup (#22009)
  Cleanup pnpm overrides (#21944)
  CLI: Add version to Jetpack Release (#21863)
  Fix some styling inconsistencies in the disconnect flow (#22001)
  VideoPress: keep blockSettings in the DOM tree while refreshing preview (#21928)
  Jetpack: Start an initial full sync if the site is connected when Jetpack is activated. (#21867)
  Backport JS Licensing Changelog (#22000)
  Disabled e2e slow tests warnings (#21998)
  Refine new License Activation Flow UX (#21933)
  PHPCS: Shortlinks and Site Icons (#21995)
  PHPCS: Monitor (#21994)
  Storybook: Fix the stories tab loading (#21946)
  PHPCBF: jetpack/tests (#21772)
  Atomic Menu: Verify submenu exists before use (#21916)
  Backport Licensing Changelog (#21942)
  IDC: extract visual components and create Storybook stories (#21917)
  VideoPress Block: Add adaptive progress bar color option (#21894)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants