Skip to content

Commit

Permalink
Cleanup pnpm overrides (#21944)
Browse files Browse the repository at this point in the history
* 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

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/1546542590
  • Loading branch information
anomiex authored and matticbot committed Dec 6, 2021
1 parent f33d372 commit 4cc3884
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,4 @@



window['STORIES'] = [{"titlePrefix":"","directory":"./storybook/stories","files":"**/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-base-styles/stories","files":"*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-base-styles\\/stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-components/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-components\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-connection/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-connection/components","files":"**/**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-idc/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-idc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"}];</script><script src="runtime~main.23e70362.iframe.bundle.js"></script><script src="962.6d0f74c0.iframe.bundle.js"></script><script src="main.cc2ae58f.iframe.bundle.js"></script></body></html>
window['STORIES'] = [{"titlePrefix":"","directory":"./storybook/stories","files":"**/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-base-styles/stories","files":"*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-base-styles\\/stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-components/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-components\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-connection/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-connection/components","files":"**/**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-connection\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"},{"titlePrefix":"","directory":"./node_modules/@automattic/jetpack-idc/components","files":"**/stories/*.@(js|jsx|mdx)","importPathMatcher":"^\\.[\\\\/](?:node_modules\\/@automattic\\/jetpack-idc\\/components(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.(js|jsx|mdx))$"}];</script><script src="runtime~main.23e70362.iframe.bundle.js"></script><script src="494.e1f4e243.iframe.bundle.js"></script><script src="main.6101cbd9.iframe.bundle.js"></script></body></html>
1 change: 1 addition & 0 deletions docs/main.6101cbd9.iframe.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/main.cc2ae58f.iframe.bundle.js

This file was deleted.

0 comments on commit 4cc3884

Please sign in to comment.