Skip to content

Commit

Permalink
Merge branch 'master' into add/boost-e2e-tests
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
davidlonjon committed Dec 7, 2021
2 parents fa5407a + a5f0652 commit be7ff06
Show file tree
Hide file tree
Showing 215 changed files with 5,100 additions and 3,486 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@
},
"pnpm": {
"overrides": {
"@storybook/addon-docs>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5",
"@automattic/format-currency>i18n-calypso": "^5",
"@storybook/addon-docs>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5@^6",
"@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/core-server>@storybook/builder-webpack4": "npm:@storybook/builder-webpack5@^6",
"@storybook/core-server>@storybook/manager-webpack4": "npm:@storybook/manager-webpack5@^6",
"@storybook/react>webpack@4": ">= 4",
"isomorphic-fetch>node-fetch@^1.0.1": "^2.6.1",
"jest-environment-jsdom@^24.0.0": "^26.0.1",
"i18n-calypso>interpolate-components": "npm:@automattic/interpolate-components@^1.2.0",
"jest-environment-enzyme>jest-environment-jsdom@^24.0.0": "^27",
"react-dev-utils>browserslist@^4": "^4",
"terser-webpack-plugin>serialize-javascript@^4.0.0": "^5.0.0",
"[email protected]": "^0.0.3",
"yargs>yargs-parser@^5.0.1": "^20.0.0"
}
Expand Down
Loading

0 comments on commit be7ff06

Please sign in to comment.