From ed4b67b17eb59c35008dfa5da862b2dd70127e91 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 5 Nov 2019 21:57:47 +0000 Subject: [PATCH] Block Editor: Revert [46663] which was itself an erroneous revert. See #48502 git-svn-id: https://develop.svn.wordpress.org/trunk@46664 602fd350-edb4-49c9-b593-d223f7449a82 --- package-lock.json | 68 +++++++++++++++---------------- package.json | 10 ++--- src/wp-includes/script-loader.php | 10 ++--- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index f410170868..758ccd5cb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2056,12 +2056,12 @@ } }, "@wordpress/block-directory": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-1.0.4.tgz", - "integrity": "sha512-qUWJzIg9LowzeXaNMdhxb79SV9Bhdv7AIjX+uJA9XuYuKkOiru+9tysj/+5M2R8FuAXQevAVPgmKII0F16vo0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-1.0.5.tgz", + "integrity": "sha512-ReMD46SPbylm8MEKhoZdsIerOJqTl7dQ0zFC5gZxqmLsbJtQzsDDFg4XlfRCiIW79claQSbbSsxQsEM/qOvLkA==", "requires": { "@wordpress/api-fetch": "^3.6.4", - "@wordpress/block-editor": "^3.2.3", + "@wordpress/block-editor": "^3.2.4", "@wordpress/blocks": "^6.7.2", "@wordpress/components": "^8.3.2", "@wordpress/compose": "^3.7.2", @@ -2072,9 +2072,9 @@ } }, "@wordpress/block-editor": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-3.2.3.tgz", - "integrity": "sha512-uGcyE5uQxKECe5zCMDVAZNvC0q0f/QVjvhVyJ6LdD4ggq2EhxlDk3kAPcrnUg3Awc77RfLAaq8jghY20JvgJAA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-3.2.4.tgz", + "integrity": "sha512-VVCUegDIzfzkQyou3RKVqXlYnjpbEnCM4w3RqIlq8Y2KyTE4n9slkxvydgFtcPSUbNkus1/iX4bjE3z5uKW33Q==", "requires": { "@babel/runtime": "^7.4.4", "@wordpress/a11y": "^2.5.1", @@ -2112,16 +2112,16 @@ } }, "@wordpress/block-library": { - "version": "2.9.4", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.9.4.tgz", - "integrity": "sha512-NtS0z0hJ0rLyFM4i6JQjBU8oKfDXS44ziPuF2S0x9a1N8y20JRpChI0FU0WBrOEStrP4MPJjU21k5LC6tNmLYQ==", + "version": "2.9.5", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.9.5.tgz", + "integrity": "sha512-0rSlDiw6uvChs8XnmVyCDBL8taeihE6WYJK2EwcK4emVwtWqYgTzO539INY6bQ8j+iBQwWDFHyK/65T4iVvVfA==", "requires": { "@babel/runtime": "^7.4.4", "@wordpress/a11y": "^2.5.1", "@wordpress/api-fetch": "^3.6.4", "@wordpress/autop": "^2.5.1", "@wordpress/blob": "^2.5.1", - "@wordpress/block-editor": "^3.2.3", + "@wordpress/block-editor": "^3.2.4", "@wordpress/blocks": "^6.7.2", "@wordpress/components": "^8.3.2", "@wordpress/compose": "^3.7.2", @@ -2129,7 +2129,7 @@ "@wordpress/data": "^4.9.2", "@wordpress/date": "^3.5.0", "@wordpress/deprecated": "^2.6.1", - "@wordpress/editor": "^9.7.4", + "@wordpress/editor": "^9.7.5", "@wordpress/element": "^2.8.2", "@wordpress/i18n": "^3.6.1", "@wordpress/is-shallow-equal": "^1.6.1", @@ -2400,21 +2400,21 @@ } }, "@wordpress/edit-post": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.8.4.tgz", - "integrity": "sha512-EhcXW5DMhHaZs4z9JS8FZ1YWLF0B4KtCQ+jJUBB13AtZ4PwDxHPG/cCKp8mTpnDXL8HwHr+0prNhABAwTn11gQ==", + "version": "3.8.5", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.8.5.tgz", + "integrity": "sha512-FgF0XZfM5C1Bgv4eyt+uC9saUGaQ32E6HWMYNG7o86DEzg/IU3KPyAMvN/mNjAzCUi3A6Zzx0wkEH5PB1ozx6w==", "requires": { "@babel/runtime": "^7.4.4", "@wordpress/a11y": "^2.5.1", "@wordpress/api-fetch": "^3.6.4", - "@wordpress/block-editor": "^3.2.3", - "@wordpress/block-library": "^2.9.4", + "@wordpress/block-editor": "^3.2.4", + "@wordpress/block-library": "^2.9.5", "@wordpress/blocks": "^6.7.2", "@wordpress/components": "^8.3.2", "@wordpress/compose": "^3.7.2", "@wordpress/core-data": "^2.7.4", "@wordpress/data": "^4.9.2", - "@wordpress/editor": "^9.7.4", + "@wordpress/editor": "^9.7.5", "@wordpress/element": "^2.8.2", "@wordpress/hooks": "^2.6.0", "@wordpress/i18n": "^3.6.1", @@ -2433,16 +2433,16 @@ } }, "@wordpress/editor": { - "version": "9.7.4", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.7.4.tgz", - "integrity": "sha512-jHax8gwZQf2dfa18qIbI3FeyWqOE7oLmlLBKiq4p34VDb7mTV/CSODl8oa8yp4hJ4psRNLm8oG3eMqUN9+M7jg==", + "version": "9.7.5", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.7.5.tgz", + "integrity": "sha512-CKnfkX8fAT6Fp5V+/FgZuOH4V+SHyuBYL73t9CgzZeiwW5YLmD4e63oFo8esryzQyvdZHXFaffmkfTGhZTnK/w==", "requires": { "@babel/runtime": "^7.4.4", "@wordpress/api-fetch": "^3.6.4", "@wordpress/autop": "^2.5.1", "@wordpress/blob": "^2.5.1", - "@wordpress/block-directory": "^1.0.4", - "@wordpress/block-editor": "^3.2.3", + "@wordpress/block-directory": "^1.0.5", + "@wordpress/block-editor": "^3.2.4", "@wordpress/blocks": "^6.7.2", "@wordpress/components": "^8.3.2", "@wordpress/compose": "^3.7.2", @@ -2522,12 +2522,12 @@ } }, "@wordpress/format-library": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.9.3.tgz", - "integrity": "sha512-gEuHOP2FCA2fioAZTi9biI6KeJPfybgK8a21yz4fScDdY5FTIq+rhJeUSA8KKiz3/CYrkZfQORR9U1fhj9N32g==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.9.4.tgz", + "integrity": "sha512-DI+mUtVSKYL3RFOaEl5TSapgm/EB6qoTczpI2xw83YxwCAw1FLnAxBZ94zwAP6y9Drktjm31p4z/SujXCv5P4A==", "requires": { "@babel/runtime": "^7.4.4", - "@wordpress/block-editor": "^3.2.3", + "@wordpress/block-editor": "^3.2.4", "@wordpress/components": "^8.3.2", "@wordpress/dom": "^2.5.2", "@wordpress/element": "^2.8.2", @@ -6095,7 +6095,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -6108,7 +6108,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -6168,7 +6168,7 @@ }, "css-color-names": { "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", "dev": true }, @@ -7049,7 +7049,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -8379,7 +8379,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" } } @@ -17217,7 +17217,7 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" }, "regjsparser": { @@ -18180,7 +18180,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { diff --git a/package.json b/package.json index 8a474e0172..8f1ae533d5 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,8 @@ "@wordpress/api-fetch": "3.6.4", "@wordpress/autop": "2.5.1", "@wordpress/blob": "2.5.1", - "@wordpress/block-editor": "3.2.3", - "@wordpress/block-library": "2.9.4", + "@wordpress/block-editor": "3.2.4", + "@wordpress/block-library": "2.9.5", "@wordpress/block-serialization-default-parser": "3.4.1", "@wordpress/blocks": "6.7.2", "@wordpress/components": "8.3.2", @@ -89,11 +89,11 @@ "@wordpress/deprecated": "2.6.1", "@wordpress/dom-ready": "2.5.1", "@wordpress/dom": "2.5.2", - "@wordpress/edit-post": "3.8.4", - "@wordpress/editor": "9.7.4", + "@wordpress/edit-post": "3.8.5", + "@wordpress/editor": "9.7.5", "@wordpress/element": "2.8.2", "@wordpress/escape-html": "1.5.1", - "@wordpress/format-library": "1.9.3", + "@wordpress/format-library": "1.9.4", "@wordpress/hooks": "2.6.0", "@wordpress/html-entities": "2.5.0", "@wordpress/i18n": "3.6.1", diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 9c505cf494..8672fe5769 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -229,8 +229,8 @@ function wp_default_packages_scripts( &$scripts ) { 'api-fetch' => '3.6.4', 'autop' => '2.5.1', 'blob' => '2.5.1', - 'block-editor' => '3.2.3', - 'block-library' => '2.9.4', + 'block-editor' => '3.2.4', + 'block-library' => '2.9.5', 'block-serialization-default-parser' => '3.4.1', 'blocks' => '6.7.2', 'components' => '8.3.2', @@ -242,11 +242,11 @@ function wp_default_packages_scripts( &$scripts ) { 'deprecated' => '2.6.1', 'dom-ready' => '2.5.1', 'dom' => '2.5.2', - 'edit-post' => '3.8.4', - 'editor' => '9.7.4', + 'edit-post' => '3.8.5', + 'editor' => '9.7.5', 'element' => '2.8.2', 'escape-html' => '1.5.1', - 'format-library' => '1.9.3', + 'format-library' => '1.9.4', 'hooks' => '2.6.0', 'html-entities' => '2.5.0', 'i18n' => '3.6.1',