Skip to content

Commit

Permalink
Merge branch 'master' into try/boost-javascript-tests-workflow
Browse files Browse the repository at this point in the history
* master:
  Backport Connection Package Changelog from Release (#20942)
  Tiled gallery: fix transform again (#20928)
  Jetpack Sync: Checksums: Better handling of WooCommerce tables (#20937)
  VideoPress Block: New Icon for Edit Button (#20916)
  Backup: fix dashboard styling (#20900)
  Connection: remove invalid user token before reconnect (#20919)
  Widget Visibility build tools: adjust command in readme (#20935)
  storybook: Use webpack 5 everywhere (#20891)
  • Loading branch information
davidlonjon committed Sep 3, 2021
2 parents c18d4f1 + af2d690 commit 9f575aa
Show file tree
Hide file tree
Showing 22 changed files with 207 additions and 1,085 deletions.
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@
"pnpm": {
"overrides": {
"@automattic/calypso-build>enzyme-adapter-react-16@*": "npm:@wojtekmaj/enzyme-adapter-react-17@0.6.3",
"@storybook/addon-docs>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5",
"@storybook/core-common>webpack@4": ">= 4",
"@storybook/core-server>webpack@4": ">= 4",
"@storybook/core-server>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5",
"@storybook/core-server>@storybook/manager-webpack4": "npm:@storybook/manager-webpack5",
"@storybook/react>webpack@4": ">= 4",
"isomorphic-fetch>node-fetch@^1.0.1": "^2.6.1",
"jest-environment-jsdom@^24.0.0": "^26.0.1",
"react-dev-utils>browserslist@^4": "^4",
Expand Down
Loading

0 comments on commit 9f575aa

Please sign in to comment.