Skip to content

Commit

Permalink
Update wordpress monorepo (#21702)
Browse files Browse the repository at this point in the history 
* Fix tweetstorm test for good

  It keeps flopping between 1 and 2, so accept either

* Fix use of InnerBlocks.Content

  It looks like we were using it wrong, in a way that worked before
  WordPress/gutenberg#26031 but breaks after.

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: matticbot <[email protected]>
Co-authored-by: Brad Jorsch <[email protected]>
  • Loading branch information
@renovate @renovate-bot
@matticbot @anomiex
4 people authored Nov 10, 2021
1 parent bfef583 commit 4f34c3a
Show file tree
Hide file tree
Showing 30 changed files with 397 additions and 686 deletions.
921 changes: 284 additions & 637 deletions pnpm-lock.yaml
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo#3
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
2 changes: 1 addition & 1 deletion projects/js-packages/base-styles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"install-if-deps-outdated": "pnpm install --no-prod --frozen-lockfile"
},
"devDependencies": {
"@wordpress/base-styles": "4.0.2"
"@wordpress/base-styles": "4.0.3"
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/components/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 2 additions & 2 deletions projects/js-packages/components/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@automattic/jetpack-components",
"version": "0.6.0",
"version": "0.6.1-alpha",
"description": "Jetpack Components Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
"dependencies": {
"@automattic/format-currency": "1.0.0-alpha.0",
"@wordpress/browserslist-config": "4.1.0",
"@wordpress/components": "19.0.0",
"@wordpress/components": "19.0.1",
"@wordpress/i18n": "4.2.3",
"classnames": "2.3.1",
"lodash": "4.17.21",
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/connection/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/js-packages/connection/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
10 changes: 5 additions & 5 deletions projects/js-packages/connection/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@automattic/jetpack-connection",
"version": "0.9.1",
"version": "0.9.2-alpha",
"description": "Jetpack Connection Component",
"author": "Automattic",
"license": "GPL-2.0-or-later",
"dependencies": {
"@automattic/jetpack-api": "workspace:^0.5.0",
"@automattic/jetpack-components": "workspace:^0.6.0",
"@wordpress/base-styles": "4.0.2",
"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
"@wordpress/base-styles": "4.0.3",
"@wordpress/browserslist-config": "4.1.0",
"@wordpress/components": "19.0.0",
"@wordpress/data": "6.1.2",
"@wordpress/components": "19.0.1",
"@wordpress/data": "6.1.3",
"@wordpress/element": "4.0.3",
"@wordpress/i18n": "4.2.3",
"lodash": "4.17.21",
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/idc/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/js-packages/idc/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
12 changes: 6 additions & 6 deletions projects/js-packages/idc/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@automattic/jetpack-idc",
"version": "0.4.2",
"version": "0.4.3-alpha",
"description": "Jetpack Connection Component",
"author": "Automattic",
"license": "GPL-2.0-or-later",
"dependencies": {
"@automattic/jetpack-api": "workspace:^0.5.0",
"@automattic/jetpack-components": "workspace:^0.6.0",
"@wordpress/base-styles": "4.0.2",
"@wordpress/components": "19.0.0",
"@wordpress/compose": "5.0.4",
"@wordpress/data": "6.1.2",
"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
"@wordpress/base-styles": "4.0.3",
"@wordpress/components": "19.0.1",
"@wordpress/compose": "5.0.5",
"@wordpress/data": "6.1.3",
"@wordpress/element": "4.0.3",
"@wordpress/i18n": "4.2.3",
"prop-types": "^15.7.2"
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#4
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
14 changes: 7 additions & 7 deletions projects/js-packages/storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
},
"devDependencies": {
"@automattic/jetpack-base-styles": "workspace:^0.1.0-alpha",
"@automattic/jetpack-components": "workspace:^0.6.0",
"@automattic/jetpack-connection": "workspace:^0.9.1",
"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
"@babel/core": "7.16.0",
"@babel/plugin-syntax-jsx": "7.16.0",
"@babel/runtime-corejs3": "7.16.0",
Expand All @@ -50,11 +50,11 @@
"@storybook/manager-webpack5": "6.3.12",
"@storybook/react": "6.3.12",
"@wordpress/babel-preset-default": "6.3.4",
"@wordpress/block-editor": "7.0.4",
"@wordpress/block-library": "6.0.2",
"@wordpress/components": "19.0.0",
"@wordpress/format-library": "3.0.4",
"@wordpress/postcss-plugins-preset": "3.2.3",
"@wordpress/block-editor": "8.0.1",
"@wordpress/block-library": "6.0.4",
"@wordpress/components": "19.0.1",
"@wordpress/format-library": "3.0.6",
"@wordpress/postcss-plugins-preset": "3.2.4",
"babel-plugin-inline-json-import": "0.3.2",
"concurrently": "6.0.2",
"css-loader": "6.2.0",
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/connection-ui/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/packages/connection-ui/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
6 changes: 3 additions & 3 deletions projects/packages/connection-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
},
"dependencies": {
"@automattic/jetpack-api": "workspace:^0.5.0",
"@automattic/jetpack-connection": "workspace:^0.9.1",
"@automattic/jetpack-idc": "workspace:^0.4.2",
"@wordpress/data": "6.1.2"
"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
"@automattic/jetpack-idc": "workspace:^0.4.3-alpha",
"@wordpress/data": "6.1.3"
},
"devDependencies": {
"@automattic/jetpack-webpack-config": "workspace:^0.1.1-alpha",
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
2 changes: 1 addition & 1 deletion projects/packages/identity-crisis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"watch": "pnpm run build && pnpx gulp watch"
},
"dependencies": {
"@wordpress/data": "6.1.2"
"@wordpress/data": "6.1.3"
},
"devDependencies": {
"@automattic/jetpack-webpack-config": "workspace:^0.1.1-alpha",
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/backup/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/plugins/backup/changelog/renovate-wordpress-monorepo#3
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies.
8 changes: 4 additions & 4 deletions projects/plugins/backup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
],
"dependencies": {
"@automattic/jetpack-api": "workspace:^0.5.0",
"@automattic/jetpack-components": "workspace:^0.6.0",
"@automattic/jetpack-connection": "workspace:^0.9.1",
"@wordpress/api-fetch": "5.2.4",
"@wordpress/data": "6.1.2",
"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
"@wordpress/api-fetch": "5.2.5",
"@wordpress/data": "6.1.3",
"@wordpress/date": "4.2.2",
"@wordpress/element": "4.0.3",
"@wordpress/i18n": "4.2.3",
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/boost/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Updated package dependencies
4 changes: 2 additions & 2 deletions projects/plugins/boost/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"test": "tests"
},
"dependencies": {
"@wordpress/components": "19.0.0",
"@wordpress/components": "19.0.1",
"@wordpress/element": "4.0.3",
"jetpack-boost-critical-css-gen": "github:automattic/jetpack-boost-critical-css-gen#release-0.0.2"
},
Expand All @@ -20,7 +20,7 @@
"@tsconfig/svelte": "2.0.1",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@wordpress/e2e-test-utils": "5.4.5",
"@wordpress/e2e-test-utils": "5.4.6",
"@wordpress/eslint-plugin": "9.2.0",
"@wordpress/i18n": "4.2.3",
"eslint-plugin-import": "2.25.3",
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/renovate-wordpress-monorepo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Updated package dependencies
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/renovate-wordpress-monorepo#2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Updated package dependencies.
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/contact-form/deprecated.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ export default [

return false;
},
save: InnerBlocks.Content,
save: () => <InnerBlocks.Content />,
},
];
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/contact-form/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const settings = {
},
attributes: defaultAttributes,
edit,
save: InnerBlocks.Content,
save: () => <InnerBlocks.Content />,
variations,
category: 'grow',
transforms,
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/gathering-tweetstorms/test/editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe( 'addTweetstormToTweets', () => {
const wrapper = mount( <wrappedBlock.edit { ...block.props } /> );

expect( wrapper.exists( '#baseEdit' ) ).toEqual( true );
expect( wrapper.find( 'BlockControlsFill' ) ).toHaveLength( 1 );
expect( wrapper.find( 'BlockControlsFill' ).length ).toBeGreaterThan( 0 );
} );

it( 'should not add block controls when passed a core/embed block definition with a different providerNameSlug', () => {
Expand Down
30 changes: 15 additions & 15 deletions projects/plugins/jetpack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,26 @@
"@automattic/format-currency": "1.0.0-alpha.0",
"@automattic/jetpack-analytics": "workspace:^0.1.2",
"@automattic/jetpack-api": "workspace:^0.5.0",
"@automattic/jetpack-components": "workspace:^0.6.0",
"@automattic/jetpack-connection": "workspace:^0.9.1",
"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
"@automattic/popup-monitor": "1.0.0",
"@automattic/request-external-access": "1.0.0",
"@automattic/social-previews": "1.1.1",
"@automattic/viewport": "1.0.0",
"@wordpress/annotations": "2.2.5",
"@wordpress/base-styles": "4.0.2",
"@wordpress/block-editor": "7.0.4",
"@wordpress/blocks": "11.1.2",
"@wordpress/annotations": "2.2.6",
"@wordpress/base-styles": "4.0.3",
"@wordpress/block-editor": "8.0.1",
"@wordpress/blocks": "11.1.3",
"@wordpress/browserslist-config": "4.1.0",
"@wordpress/compose": "5.0.4",
"@wordpress/data": "6.1.2",
"@wordpress/compose": "5.0.5",
"@wordpress/data": "6.1.3",
"@wordpress/date": "4.2.2",
"@wordpress/element": "4.0.3",
"@wordpress/hooks": "3.2.1",
"@wordpress/i18n": "4.2.3",
"@wordpress/icons": "6.0.1",
"@wordpress/url": "3.2.3",
"@wordpress/viewport": "4.0.4",
"@wordpress/icons": "6.1.0",
"@wordpress/url": "3.3.0",
"@wordpress/viewport": "4.0.5",
"bounding-client-rect": "1.0.5",
"classnames": "2.3.1",
"click-outside": "2.0.2",
Expand Down Expand Up @@ -167,11 +167,11 @@
"@testing-library/react-hooks": "4.0.1",
"@testing-library/user-event": "12.8.3",
"@wordpress/babel-plugin-import-jsx-pragma": "3.1.0",
"@wordpress/components": "19.0.0",
"@wordpress/core-data": "4.0.4",
"@wordpress/components": "19.0.1",
"@wordpress/core-data": "4.0.5",
"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
"@wordpress/editor": "12.0.1",
"@wordpress/server-side-render": "3.0.4",
"@wordpress/editor": "12.0.3",
"@wordpress/server-side-render": "3.0.5",
"chai": "4.3.4",
"chalk": "4.1.2",
"commander": "7.2.0",
Expand Down

0 comments on commit 4f34c3a

Please sign in to comment.