From 76ca614688e2741c5e016245e3f9ac7e2eaed6cd Mon Sep 17 00:00:00 2001 From: Grzegorz Ziolkowski Date: Tue, 6 Apr 2021 10:07:57 +0200 Subject: [PATCH] Merge changes published in the Gutenberg plugin "release/10.3" branch --- packages/api-fetch/CHANGELOG.md | 2 -- packages/api-fetch/package.json | 2 +- packages/babel-preset-default/CHANGELOG.md | 2 -- packages/babel-preset-default/package.json | 2 +- .../create-block-tutorial-template/CHANGELOG.md | 2 -- .../create-block-tutorial-template/package.json | 2 +- packages/create-block/CHANGELOG.md | 2 -- packages/create-block/package.json | 2 +- packages/date/CHANGELOG.md | 2 -- packages/date/package.json | 2 +- packages/e2e-tests/package.json | 2 +- packages/eslint-plugin/CHANGELOG.md | 2 +- packages/eslint-plugin/package.json | 2 +- packages/interface/CHANGELOG.md | 4 ++++ .../interface/src/components/action-item/index.js | 15 +-------------- packages/scripts/CHANGELOG.md | 2 -- packages/scripts/package.json | 2 +- 17 files changed, 14 insertions(+), 35 deletions(-) diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md index 60d0c2990156de..b69ef5840fe9e4 100644 --- a/packages/api-fetch/CHANGELOG.md +++ b/packages/api-fetch/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## 3.23.0 (2021-04-02) - ### New Feature - Publish TypeScript definitions. diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json index c608af64bafd55..d19dedf66ab44d 100644 --- a/packages/api-fetch/package.json +++ b/packages/api-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/api-fetch", - "version": "3.23.0-prerelease", + "version": "3.22.0", "description": "Utility to make WordPress REST API requests.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md index 63b99c1a428951..b966b9757147ea 100644 --- a/packages/babel-preset-default/CHANGELOG.md +++ b/packages/babel-preset-default/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## 5.2.0 (2021-04-02) - ### Enhancements - The bundled `@babel/core` dependency has been updated from requiring `^7.12.9` to requiring `^7.13.10` ([#30018](https://github.com/WordPress/gutenberg/pull/30018)). diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json index 52e24d2d97fb36..9757bf5caa02fd 100644 --- a/packages/babel-preset-default/package.json +++ b/packages/babel-preset-default/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/babel-preset-default", - "version": "5.2.0-prerelease", + "version": "5.1.0", "description": "Default Babel preset for WordPress development.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/create-block-tutorial-template/CHANGELOG.md b/packages/create-block-tutorial-template/CHANGELOG.md index b88e19695bdcf1..004a0c6cacbda9 100644 --- a/packages/create-block-tutorial-template/CHANGELOG.md +++ b/packages/create-block-tutorial-template/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## 1.2.0 (2021-04-02) - ### Enhancement - Scaffolded plugin requires WordPress 5.7 now ([#29757](https://github.com/WordPress/gutenberg/pull/29757). diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json index 4c846606b470d8..5a60c5887d3099 100644 --- a/packages/create-block-tutorial-template/package.json +++ b/packages/create-block-tutorial-template/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/create-block-tutorial-template", - "version": "1.2.0-prerelease", + "version": "1.1.0", "description": "Template for @wordpress/create-block used in the official WordPress tutorial.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md index d9c8c1e073ad6b..0f1f8eb155ee95 100644 --- a/packages/create-block/CHANGELOG.md +++ b/packages/create-block/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## 2.2.0 (2021-04-02) - ### Enhancement - Scaffolded plugin requires WordPress 5.7 now ([#29757](https://github.com/WordPress/gutenberg/pull/29757)). diff --git a/packages/create-block/package.json b/packages/create-block/package.json index 7c6df7aa7d5a73..c42d64d4b29329 100644 --- a/packages/create-block/package.json +++ b/packages/create-block/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/create-block", - "version": "2.2.0-prerelease", + "version": "2.1.0", "description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md index 221d1904ed0ea6..831375aefd6a12 100644 --- a/packages/date/CHANGELOG.md +++ b/packages/date/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## 3.15.0 (2021-04-02) - ### New Feature - Bundle type definitions. diff --git a/packages/date/package.json b/packages/date/package.json index ef0ef2a082f334..94df3dbcfbd620 100644 --- a/packages/date/package.json +++ b/packages/date/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/date", - "version": "3.15.0-prerelease", + "version": "3.14.0", "description": "Date module for WordPress.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index b6a1878c624eea..e7f28f8137126a 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/e2e-tests", - "version": "2.1.0", + "version": "2.1.1", "description": "End-To-End (E2E) tests for WordPress.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md index 944564f8c12cd1..2931efc71ccca2 100644 --- a/packages/eslint-plugin/CHANGELOG.md +++ b/packages/eslint-plugin/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -## 9.0.1 (2021-04-02) +## 9.0.1 (2021-03-19) ### Bug Fix diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index ac292918775e1e..f05aa17fae5b01 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/eslint-plugin", - "version": "9.0.1-prerelease", + "version": "9.0.1", "description": "ESLint plugin for WordPress development.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md index b7e838b04ad30b..8fe1eb16ff1a96 100644 --- a/packages/interface/CHANGELOG.md +++ b/packages/interface/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Breaking Changes + +- Passing a tuple of components with `as` prop to `ActionItem.Slot` component is no longer supported. Please pass a component with `as` prop instead ([#30417](https://github.com/WordPress/gutenberg/pull/30417)). + ## 1.1.0 (2021-03-17) ### Deprecations diff --git a/packages/interface/src/components/action-item/index.js b/packages/interface/src/components/action-item/index.js index 23d3e147eefe3c..b19a573f1016b0 100644 --- a/packages/interface/src/components/action-item/index.js +++ b/packages/interface/src/components/action-item/index.js @@ -1,13 +1,12 @@ /** * External dependencies */ -import { isArray, isEmpty, noop } from 'lodash'; +import { isEmpty, noop } from 'lodash'; /** * WordPress dependencies */ import { ButtonGroup, Button, Slot, Fill } from '@wordpress/components'; -import deprecated from '@wordpress/deprecated'; import { Children } from '@wordpress/element'; function ActionItemSlot( { @@ -17,18 +16,6 @@ function ActionItemSlot( { bubblesVirtually, ...props } ) { - if ( isArray( Component ) ) { - deprecated( - 'Passing a tuple of components with `as` prop to `ActionItem.Slot` component', - { - since: '10.2', - plugin: 'Gutenberg', - alternative: 'a component with `as` prop', - version: '10.3', - } - ); - Component = Component[ 0 ]; - } return (