From 9ae2587b761d76826d91c0f896f7e8a1888a9c2e Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 8 Jun 2021 17:31:14 +0000 Subject: [PATCH] Block Editor: Package updates for WordPress 5.8 beta 1 (batch2). This includes the following fixes: - Fix inspector opening when clicking outside the widget areas - Assume light theme when a transparent background is used - Make Post blocks non editable inside Query block - Rename QueryLoop to PostTemplate block Props ntsekouras. See #52991. git-svn-id: https://develop.svn.wordpress.org/trunk@51101 602fd350-edb4-49c9-b593-d223f7449a82 --- package-lock.json | 252 +++++++++--------- package.json | 26 +- .../assets/script-loader-packages.php | 2 +- .../block-patterns/query-grid-posts.php | 4 +- .../query-large-title-posts.php | 4 +- .../block-patterns/query-medium-posts.php | 4 +- .../block-patterns/query-offset-posts.php | 8 +- .../block-patterns/query-small-posts.php | 4 +- .../block-patterns/query-standard-posts.php | 4 +- src/wp-includes/blocks/index.php | 2 +- src/wp-includes/blocks/post-template.php | 148 ++++++++++ .../{query-loop => post-template}/block.json | 10 +- src/wp-includes/blocks/query-loop.php | 88 ------ src/wp-includes/blocks/query/block.json | 2 +- tests/phpunit/includes/functions.php | 3 +- tools/webpack/packages.js | 2 +- 16 files changed, 312 insertions(+), 251 deletions(-) create mode 100644 src/wp-includes/blocks/post-template.php rename src/wp-includes/blocks/{query-loop => post-template}/block.json (60%) delete mode 100644 src/wp-includes/blocks/query-loop.php diff --git a/package-lock.json b/package-lock.json index ba81490ed0..4ae07c9d0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2799,13 +2799,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz", - "integrity": "sha512-yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz", + "integrity": "sha512-aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.26.0", - "@typescript-eslint/scope-manager": "4.26.0", + "@typescript-eslint/experimental-utils": "4.26.1", + "@typescript-eslint/scope-manager": "4.26.1", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "lodash": "^4.17.21", @@ -2841,15 +2841,15 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz", - "integrity": "sha512-TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz", + "integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.26.1", + "@typescript-eslint/types": "4.26.1", + "@typescript-eslint/typescript-estree": "4.26.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -2873,14 +2873,14 @@ } }, "@typescript-eslint/parser": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz", - "integrity": "sha512-b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz", + "integrity": "sha512-q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.26.0", - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/typescript-estree": "4.26.0", + "@typescript-eslint/scope-manager": "4.26.1", + "@typescript-eslint/types": "4.26.1", + "@typescript-eslint/typescript-estree": "4.26.1", "debug": "^4.3.1" }, "dependencies": { @@ -2902,29 +2902,29 @@ } }, "@typescript-eslint/scope-manager": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz", - "integrity": "sha512-G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz", + "integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0" + "@typescript-eslint/types": "4.26.1", + "@typescript-eslint/visitor-keys": "4.26.1" } }, "@typescript-eslint/types": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz", - "integrity": "sha512-rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz", + "integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz", - "integrity": "sha512-GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz", + "integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", - "@typescript-eslint/visitor-keys": "4.26.0", + "@typescript-eslint/types": "4.26.1", + "@typescript-eslint/visitor-keys": "4.26.1", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -2979,12 +2979,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz", - "integrity": "sha512-cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==", + "version": "4.26.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz", + "integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.26.0", + "@typescript-eslint/types": "4.26.1", "eslint-visitor-keys": "^2.0.0" } }, @@ -3260,22 +3260,22 @@ } }, "@wordpress/block-directory": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-2.1.4.tgz", - "integrity": "sha512-2c+EUSwAj0Zh6x3Rg3xfAmUKMFTJar5K91/N37ICK43Zls/3y807QcEXBIYRL767QvQi2eIo+ZWoSD0HAr/hDA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-2.1.5.tgz", + "integrity": "sha512-aj3VCWantvUjP9dc8n/2fBE1zwAg+pQ0434Rekolsd7gti3RaLIP0DhmVXnngWZMCd2AL75N6dcoWNG1k//38A==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", "@wordpress/api-fetch": "^5.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/data-controls": "^2.1.1", - "@wordpress/edit-post": "^4.1.4", - "@wordpress/editor": "^10.1.3", + "@wordpress/edit-post": "^4.1.5", + "@wordpress/editor": "^10.1.4", "@wordpress/element": "^3.1.1", "@wordpress/hooks": "^3.1.1", "@wordpress/html-entities": "^3.1.1", @@ -3288,15 +3288,15 @@ } }, "@wordpress/block-editor": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-6.1.2.tgz", - "integrity": "sha512-0jDHpJwgX1eSqOZI0P2mblJGBW/AqZ/IFzHzcesvXScBnHF5ub1GZnnYXSnoQFiUoDYjnb3QuvbwZjRXwt1fCA==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-6.1.3.tgz", + "integrity": "sha512-q8bBsjq5Vzygzwk0X3W9hv6Xo6YcHRNXE4D4k57KsEkLnQe6ByJC9otsRKzJG4uDTEdbx5PETpr6kOXbBP2Rrw==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", "@wordpress/blob": "^3.1.1", "@wordpress/block-serialization-default-parser": "^4.1.1", - "@wordpress/blocks": "^9.1.2", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", "@wordpress/data": "^5.1.1", @@ -3333,25 +3333,25 @@ } }, "@wordpress/block-library": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-3.2.3.tgz", - "integrity": "sha512-jfa7l3mop9dIWxqN6LaIqSKtXPVvm881m9z0OVlM4fiZ+Xd1U92mI6TUChZm9UM2AJO43GQYECeZ1T8sJz+sSQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-3.2.4.tgz", + "integrity": "sha512-/neeBbjCHP0C0fHr/96YTvReA1QyjAe8RiGz0o5RGb41YOrQuR2fmtv05OyRycVgH+bGN5s1/FFvwmdKfLUVvA==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", "@wordpress/api-fetch": "^5.1.1", "@wordpress/autop": "^3.1.1", "@wordpress/blob": "^3.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/date": "^4.1.1", "@wordpress/deprecated": "^3.1.1", "@wordpress/dom": "^3.1.1", - "@wordpress/editor": "^10.1.3", + "@wordpress/editor": "^10.1.4", "@wordpress/element": "^3.1.1", "@wordpress/escape-html": "^2.1.1", "@wordpress/hooks": "^3.1.1", @@ -3361,9 +3361,9 @@ "@wordpress/keycodes": "^3.1.1", "@wordpress/notices": "^3.1.1", "@wordpress/primitives": "^2.1.1", - "@wordpress/reusable-blocks": "^2.1.3", + "@wordpress/reusable-blocks": "^2.1.4", "@wordpress/rich-text": "^4.1.1", - "@wordpress/server-side-render": "^2.1.2", + "@wordpress/server-side-render": "^2.1.3", "@wordpress/url": "^3.1.1", "@wordpress/viewport": "^3.1.1", "classnames": "^2.2.5", @@ -3385,9 +3385,9 @@ } }, "@wordpress/blocks": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-9.1.2.tgz", - "integrity": "sha512-JCc3zV3fJzmJ114nN4g7yzA+Dp8jbwp5IzqO3VdjEifd+nbnTzrikeAlddTHYl55DKeQFMsVMsV9L0q7PhgcnQ==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-9.1.3.tgz", + "integrity": "sha512-hmldR/VhqWqolWBkZ3xAMKif0yxe0582XIkAcWevgHYbsVr1Otqa/5QsHCNmqus3P5O6BpXiJGtf39F45gyD0A==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/autop": "^3.1.1", @@ -3484,13 +3484,13 @@ } }, "@wordpress/core-data": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-3.1.3.tgz", - "integrity": "sha512-CEIF39cugCfMQ9pYinmJCut7xvpel5G6pOJTAiQ3HjgdjsLq4frPSJgzHaIVDcfXjRoSYaClv/bkZV1rhoVcJw==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-3.1.4.tgz", + "integrity": "sha512-8Lv1OwK4XqMLS4AXNdUyVrcLdvbY8sKnGzecFkG48X21qOMIoIZAcb2KiAcoetUFWk/XWKU5zqKnv9aagUwUFg==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/api-fetch": "^5.1.1", - "@wordpress/blocks": "^9.1.2", + "@wordpress/blocks": "^9.1.3", "@wordpress/data": "^5.1.1", "@wordpress/data-controls": "^2.1.1", "@wordpress/element": "^3.1.1", @@ -3514,18 +3514,18 @@ } }, "@wordpress/customize-widgets": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-1.0.3.tgz", - "integrity": "sha512-2nICoprIR3jHlJyHdivwYWaC6N2cKzjsdhQk315zcbr51E83mirO5yEaK4V0wtu/fad6gDAqahydMRSAiJxTHA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-1.0.4.tgz", + "integrity": "sha512-ckWWZ0ikuHoc4z/WppyKqdTSRJumAh9Jt5DRT711e3bnWtq6AZXVk8NiM4kY0h1+4eRoFwwXiSV9X7AQXDDvOw==", "requires": { "@babel/runtime": "^7.11.2", "@wordpress/a11y": "^3.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/block-library": "^3.2.3", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/block-library": "^3.2.4", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/dom": "^3.1.1", "@wordpress/element": "^3.1.1", @@ -3536,7 +3536,7 @@ "@wordpress/keyboard-shortcuts": "^2.1.1", "@wordpress/keycodes": "^3.1.1", "@wordpress/media-utils": "^2.1.1", - "@wordpress/widgets": "^1.1.3", + "@wordpress/widgets": "^1.1.4", "classnames": "^2.2.6", "lodash": "^4.17.21" } @@ -3651,22 +3651,22 @@ } }, "@wordpress/edit-post": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-4.1.4.tgz", - "integrity": "sha512-ZvMvclyDgEPqRiNDuon6K8jubM9spFeyFV4tRVJWswbWyobUpwgLj2FqLS7Iv0MiprmakpjH5qVUPNrn+B1U6w==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-4.1.5.tgz", + "integrity": "sha512-tkBtUUkOkaLzDHPO9kfNYKYA9ttvpxu89zgMwA0/pSnC80XWeqM4TbZXrSkCevVBpBtlDIn3qtzVlEqRxQHr3Q==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", "@wordpress/api-fetch": "^5.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/block-library": "^3.2.3", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/block-library": "^3.2.4", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/data-controls": "^2.1.1", - "@wordpress/editor": "^10.1.3", + "@wordpress/editor": "^10.1.4", "@wordpress/element": "^3.1.1", "@wordpress/hooks": "^3.1.1", "@wordpress/i18n": "^4.1.1", @@ -3697,19 +3697,19 @@ } }, "@wordpress/edit-widgets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-2.1.4.tgz", - "integrity": "sha512-E+z1JiA0FF45vy3kURgsO9mMGE9ea5y/tiVCVL7vhcwDwOXx+YHNSZKLuCDcCTRNdbJYGfDyU0yYVdeCnopgog==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-2.1.5.tgz", + "integrity": "sha512-wqNQ0IAgfptq0m2OmLNikXIcvwyQdhUnxU4pzioNCIIIHH5Ldg56xUUtM09mJJ43c0pQzgzmPvl9KmmKzgLWAw==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", "@wordpress/api-fetch": "^5.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/block-library": "^3.2.3", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/block-library": "^3.2.4", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/data-controls": "^2.1.1", "@wordpress/element": "^3.1.1", @@ -3722,10 +3722,10 @@ "@wordpress/media-utils": "^2.1.1", "@wordpress/notices": "^3.1.1", "@wordpress/plugins": "^3.1.1", - "@wordpress/reusable-blocks": "^2.1.3", - "@wordpress/server-side-render": "^2.1.2", + "@wordpress/reusable-blocks": "^2.1.4", + "@wordpress/server-side-render": "^2.1.3", "@wordpress/url": "^3.1.1", - "@wordpress/widgets": "^1.1.3", + "@wordpress/widgets": "^1.1.4", "classnames": "^2.2.5", "lodash": "^4.17.21", "rememo": "^3.0.0", @@ -3733,19 +3733,19 @@ } }, "@wordpress/editor": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-10.1.3.tgz", - "integrity": "sha512-ZOkJUwUVHaKslmQ6k7E0mSUBsastEdz/NfszR87r/PMkrkVxAYpWignQPyI5FKWnpvfHqbAkk50gX0Ey6ohAEw==", + "version": "10.1.4", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-10.1.4.tgz", + "integrity": "sha512-9H45LlitHpvh7lSuDK+6i9gCySDZGFGZd4e2+sOmkqFE4A8M8dB0zhqbCC4UFcQAXxqGR5/X/Mih43Y2Cr3ZrQ==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/api-fetch": "^5.1.1", "@wordpress/autop": "^3.1.1", "@wordpress/blob": "^3.1.1", - "@wordpress/block-editor": "^6.1.2", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/data-controls": "^2.1.1", "@wordpress/date": "^4.1.1", @@ -3760,9 +3760,9 @@ "@wordpress/keycodes": "^3.1.1", "@wordpress/media-utils": "^2.1.1", "@wordpress/notices": "^3.1.1", - "@wordpress/reusable-blocks": "^2.1.3", + "@wordpress/reusable-blocks": "^2.1.4", "@wordpress/rich-text": "^4.1.1", - "@wordpress/server-side-render": "^2.1.2", + "@wordpress/server-side-render": "^2.1.3", "@wordpress/url": "^3.1.1", "@wordpress/wordcount": "^3.1.1", "classnames": "^2.2.5", @@ -3849,13 +3849,13 @@ } }, "@wordpress/format-library": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-2.1.2.tgz", - "integrity": "sha512-O6DHdVuDw0SJaxu6NGiDONYUu9kKxe3tKHVlwpluTkSPEUk4f9wVHv5A82X2b+zkEY5K19667Tz0qNQ3+PImiA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-2.1.3.tgz", + "integrity": "sha512-NE41hS6u1I7sjZTsxPS71D3ORqEVR/kAiSmLflSlq2OrxMwTVk1zx7sZg3y/hj5/KmkVPdU7Q0GvFi0Oerf41w==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/a11y": "^3.1.1", - "@wordpress/block-editor": "^6.1.2", + "@wordpress/block-editor": "^6.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", "@wordpress/data": "^5.1.1", @@ -4168,15 +4168,15 @@ } }, "@wordpress/reusable-blocks": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-2.1.3.tgz", - "integrity": "sha512-vzfmPM+nguOgBpx/Y0i9mIU3bo48dwXn1f8kBF/0mvhkBM36EmQZgdPZIpZp1D6oFCuokd0Ct8DXWPkf2XijsA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-2.1.4.tgz", + "integrity": "sha512-P+Z25kJlqyFsL1eEdt76gR/r7UnzRD1QiJtIHCtDQw31lfGk9B909T1YOXO670aTupteXvOrUzHo7DYQr1LDxA==", "requires": { - "@wordpress/block-editor": "^6.1.2", - "@wordpress/blocks": "^9.1.2", + "@wordpress/block-editor": "^6.1.3", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/element": "^3.1.1", "@wordpress/i18n": "^4.1.1", @@ -4765,13 +4765,13 @@ } }, "@wordpress/server-side-render": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-2.1.2.tgz", - "integrity": "sha512-YCkeaX+9F23N29xRwR25jnfuYH/dnZm71bUvj5fzN9KLdDp0bEEe4N/l0hO/oZaGEqPBWR3gAZqCWkToo+Iz8A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-2.1.3.tgz", + "integrity": "sha512-YCIFKTqGmS8OauVD/iBW6FH/8D5oYhi0+A8rBSu6GScwTi6NQb1b6RheiR6M302iWpoAFSmOrxbyicsW+bPjTQ==", "requires": { "@babel/runtime": "^7.13.10", "@wordpress/api-fetch": "^5.1.1", - "@wordpress/blocks": "^9.1.2", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", "@wordpress/compose": "^4.1.1", "@wordpress/data": "^5.1.1", @@ -4839,14 +4839,14 @@ "integrity": "sha512-EX+/6P2bWO0zRrKJYx1yck0rY2K5z5aPb67DTU+2ggcowW8JRP7hBzGdzhXqoE32oMS7RO97nG3uD9sZtn2DJA==" }, "@wordpress/widgets": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-1.1.3.tgz", - "integrity": "sha512-atpYcBSKQy0Nn3mooy+MCMGY1XTAKh9/BGFuy2YahtVZvizdNlQSq0hQNjv9tAO4uA95GaE+uFeMJ6DaPrkATA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-1.1.4.tgz", + "integrity": "sha512-Exk8p8rFGfI+VXL7QXUs6rL6/SSY2mBAaB79iO9YIXgQv9K2DVSOkkRLJlJbTHtzQS6wAQ/e+sMKRBwNlAFoUg==", "requires": { "@babel/runtime": "^7.13.10", - "@wordpress/blocks": "^9.1.2", + "@wordpress/blocks": "^9.1.3", "@wordpress/components": "^14.1.2", - "@wordpress/core-data": "^3.1.3", + "@wordpress/core-data": "^3.1.4", "@wordpress/data": "^5.1.1", "@wordpress/i18n": "^4.1.1", "@wordpress/icons": "^4.0.1" @@ -7373,13 +7373,13 @@ } }, "cheerio": { - "version": "1.0.0-rc.9", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.9.tgz", - "integrity": "sha512-QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng==", + "version": "1.0.0-rc.10", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", + "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", "dev": true, "requires": { - "cheerio-select": "^1.4.0", - "dom-serializer": "^1.3.1", + "cheerio-select": "^1.5.0", + "dom-serializer": "^1.3.2", "domhandler": "^4.2.0", "htmlparser2": "^6.1.0", "parse5": "^6.0.1", @@ -7413,16 +7413,16 @@ } }, "cheerio-select": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.4.0.tgz", - "integrity": "sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz", + "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==", "dev": true, "requires": { - "css-select": "^4.1.2", - "css-what": "^5.0.0", + "css-select": "^4.1.3", + "css-what": "^5.0.1", "domelementtype": "^2.2.0", "domhandler": "^4.2.0", - "domutils": "^2.6.0" + "domutils": "^2.7.0" }, "dependencies": { "css-select": { diff --git a/package.json b/package.json index 8117c7a8b5..acb6fed8b6 100644 --- a/package.json +++ b/package.json @@ -82,27 +82,27 @@ "@wordpress/api-fetch": "5.1.1", "@wordpress/autop": "3.1.1", "@wordpress/blob": "3.1.1", - "@wordpress/block-directory": "2.1.4", - "@wordpress/block-editor": "6.1.2", - "@wordpress/block-library": "3.2.3", + "@wordpress/block-directory": "2.1.5", + "@wordpress/block-editor": "6.1.3", + "@wordpress/block-library": "3.2.4", "@wordpress/block-serialization-default-parser": "4.1.1", - "@wordpress/blocks": "9.1.2", + "@wordpress/blocks": "9.1.3", "@wordpress/components": "14.1.2", "@wordpress/compose": "4.1.1", - "@wordpress/core-data": "3.1.3", - "@wordpress/customize-widgets": "1.0.3", + "@wordpress/core-data": "3.1.4", + "@wordpress/customize-widgets": "1.0.4", "@wordpress/data": "5.1.1", "@wordpress/data-controls": "2.1.1", "@wordpress/date": "4.1.1", "@wordpress/deprecated": "3.1.1", "@wordpress/dom": "3.1.1", "@wordpress/dom-ready": "3.1.1", - "@wordpress/edit-post": "4.1.4", - "@wordpress/edit-widgets": "2.1.4", - "@wordpress/editor": "10.1.3", + "@wordpress/edit-post": "4.1.5", + "@wordpress/edit-widgets": "2.1.5", + "@wordpress/editor": "10.1.4", "@wordpress/element": "3.1.1", "@wordpress/escape-html": "2.1.1", - "@wordpress/format-library": "2.1.2", + "@wordpress/format-library": "2.1.3", "@wordpress/hooks": "3.1.1", "@wordpress/html-entities": "3.1.1", "@wordpress/i18n": "4.1.1", @@ -119,15 +119,15 @@ "@wordpress/primitives": "2.1.1", "@wordpress/priority-queue": "2.1.1", "@wordpress/redux-routine": "4.1.1", - "@wordpress/reusable-blocks": "2.1.3", + "@wordpress/reusable-blocks": "2.1.4", "@wordpress/rich-text": "4.1.1", - "@wordpress/server-side-render": "2.1.2", + "@wordpress/server-side-render": "2.1.3", "@wordpress/shortcode": "3.1.1", "@wordpress/token-list": "2.1.1", "@wordpress/url": "3.1.1", "@wordpress/viewport": "3.1.1", "@wordpress/warning": "2.1.1", - "@wordpress/widgets": "1.1.3", + "@wordpress/widgets": "1.1.4", "@wordpress/wordcount": "3.1.1", "backbone": "1.4.0", "clipboard": "2.0.8", diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php index c8649c68a9..ee241295ac 100644 --- a/src/wp-includes/assets/script-loader-packages.php +++ b/src/wp-includes/assets/script-loader-packages.php @@ -1 +1 @@ - array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '3243bf46da298d46850bacd71bcc111e'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '4556c7bbdf2d9d6a81c1ca770cf73893'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '293ce6ecd6439249249485d369385617'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bed28c77ea305cd8e02b0529011189f9'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'b471a46218b45512872b205f5684f390'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-wordcount'), 'version' => '3c1cba840926b275f0ffbea8f08f0290'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => 'eba0d7cd6ae96f0c39c7a5c6d0860cb4'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives', 'wp-shortcode'), 'version' => '4e17533e5353cce270a728187f51b91e'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '81fbc59ac7c5abcd280b254b241c04b9'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => 'c6d0b8dc5425477346847d4ad0688185'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '8cc9c436eaf87fb78cfe5137d63c607f'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '1e93868d933a9e0bd7e84dd5a47f1181'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => '9f1a3d6ac652e9da7ef51f01de8243a0'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ceef9ce8c9c058d69ebf44db39353687'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '2abad43cdd2da929e01f7d7648e392ab'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '13724e4923d40e224e7c99fdc350a6a1'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd964a25eeb2e148dbb51da5fad4cc9fe'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '1e1b9c1535c1c32d3236d41aa27c7bf9'), 'edit-post.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => 'af1259793651e5bd7dded1d7e936c9e2'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'ad8829da67393d9d82f0d38c9eb6101d'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '14a01b5f8bfac6899d950b0baa1beae4'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '669f5c11ca4fe7c44d64157347343913'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => 'eb83de0befbc72e594aab5d708ca128e'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f7ecf196f38940ae0673c46c6c30cd86'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'd897c43bea0c2753dd7368eb2d990898'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-keycodes', 'wp-polyfill'), 'version' => '8a860f4afab68874dffb1e7eec6c1bc1'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => 'cf38e80b47baf72f4822ddb8847f4f24'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '80af68069161321e8e131bad6a00d5dc'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'df373dcd13d7abc3f8b042f369b88557'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b08e53c1e070954fa0884cad9a164683'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '0575a03bf7a434453e3768c23cd45a54'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => 'f976fd36733989ed2c1409c712cd0e02'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'dc0962ac2885a26f8c2abdbe0cf0e333'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c50c6bd1563bc7fb88433198400a74c'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'ec5d97a08f4ba305bcc6f0de27fda10f'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-keycodes', 'wp-polyfill'), 'version' => '17198c4dd83a20f1f820c6cf500bd5f1'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7c732c1add9f9667bdf8dd66fbf74759'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '15757929bc8d52a3b184c3fcaeb38c64'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7bcd3684420783ef1f6ebb7680fe958e'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'e9868cffba8a348b31011f87dd53b3c4'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '0a54bbdc44c5f135018c568a887b8279'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '202ac16e99afe7c33c257b248625a947'), 'widgets.js' => array('dependencies' => array('wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '71f70729a158b4f607a172e7f488545b'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007')); \ No newline at end of file + array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '3243bf46da298d46850bacd71bcc111e'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '4556c7bbdf2d9d6a81c1ca770cf73893'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '293ce6ecd6439249249485d369385617'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bed28c77ea305cd8e02b0529011189f9'), 'blob.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b8855b04f6a52a7bca89f8d945d46866'), 'block-directory.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'b471a46218b45512872b205f5684f390'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-token-list', 'wp-url', 'wp-wordcount'), 'version' => '6aac88f056ee7d80b0fae2a94d48760b'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '5bf2c7b39a445eec8e4fce01955d7004'), 'block-serialization-default-parser.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'cc8e5d0e23cf68bb9944bf2a7a016e52'), 'blocks.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives', 'wp-shortcode'), 'version' => 'c46f2427fb0c8d873f6b003bb05d64ba'), 'components.js' => array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '81fbc59ac7c5abcd280b254b241c04b9'), 'compose.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => 'c6d0b8dc5425477346847d4ad0688185'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '8cc9c436eaf87fb78cfe5137d63c607f'), 'customize-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-primitives', 'wp-widgets'), 'version' => '1e93868d933a9e0bd7e84dd5a47f1181'), 'data.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => '9f1a3d6ac652e9da7ef51f01de8243a0'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ceef9ce8c9c058d69ebf44db39353687'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => '2abad43cdd2da929e01f7d7648e392ab'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '13724e4923d40e224e7c99fdc350a6a1'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd964a25eeb2e148dbb51da5fad4cc9fe'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '1e1b9c1535c1c32d3236d41aa27c7bf9'), 'edit-post.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => 'af1259793651e5bd7dded1d7e936c9e2'), 'edit-widgets.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '70e9d81d637fd8c488db1c15258ee1d3'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '14a01b5f8bfac6899d950b0baa1beae4'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '669f5c11ca4fe7c44d64157347343913'), 'escape-html.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4f03d9c45a01df8191f6833373fe1cfa'), 'format-library.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => 'eb83de0befbc72e594aab5d708ca128e'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f7ecf196f38940ae0673c46c6c30cd86'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'd897c43bea0c2753dd7368eb2d990898'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-keycodes', 'wp-polyfill'), 'version' => '8a860f4afab68874dffb1e7eec6c1bc1'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => 'cf38e80b47baf72f4822ddb8847f4f24'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '80af68069161321e8e131bad6a00d5dc'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'df373dcd13d7abc3f8b042f369b88557'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b08e53c1e070954fa0884cad9a164683'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '0575a03bf7a434453e3768c23cd45a54'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => 'f976fd36733989ed2c1409c712cd0e02'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'dc0962ac2885a26f8c2abdbe0cf0e333'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '3c50c6bd1563bc7fb88433198400a74c'), 'reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'ec5d97a08f4ba305bcc6f0de27fda10f'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-keycodes', 'wp-polyfill'), 'version' => '17198c4dd83a20f1f820c6cf500bd5f1'), 'server-side-render.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7c732c1add9f9667bdf8dd66fbf74759'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '15757929bc8d52a3b184c3fcaeb38c64'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7bcd3684420783ef1f6ebb7680fe958e'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'e9868cffba8a348b31011f87dd53b3c4'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '0a54bbdc44c5f135018c568a887b8279'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '202ac16e99afe7c33c257b248625a947'), 'widgets.js' => array('dependencies' => array('wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '71f70729a158b4f607a172e7f488545b'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007')); \ No newline at end of file diff --git a/src/wp-includes/block-patterns/query-grid-posts.php b/src/wp-includes/block-patterns/query-grid-posts.php index a665c18ad7..8091d75c35 100644 --- a/src/wp-includes/block-patterns/query-grid-posts.php +++ b/src/wp-includes/block-patterns/query-grid-posts.php @@ -11,13 +11,13 @@ return array( 'categories' => array( 'query' ), 'content' => '
- +
- + ', ); diff --git a/src/wp-includes/block-patterns/query-large-title-posts.php b/src/wp-includes/block-patterns/query-large-title-posts.php index 89ed1cf17c..f2d09e6987 100644 --- a/src/wp-includes/block-patterns/query-large-title-posts.php +++ b/src/wp-includes/block-patterns/query-large-title-posts.php @@ -11,7 +11,7 @@ return array( 'categories' => array( 'query' ), 'content' => '
-
+

@@ -25,7 +25,7 @@ return array(
-
+
', ); diff --git a/src/wp-includes/block-patterns/query-medium-posts.php b/src/wp-includes/block-patterns/query-medium-posts.php index 87ac552056..fdcbce323a 100644 --- a/src/wp-includes/block-patterns/query-medium-posts.php +++ b/src/wp-includes/block-patterns/query-medium-posts.php @@ -11,7 +11,7 @@ return array( 'categories' => array( 'query' ), 'content' => '
- +
@@ -21,7 +21,7 @@ return array(
- + ', ); diff --git a/src/wp-includes/block-patterns/query-offset-posts.php b/src/wp-includes/block-patterns/query-offset-posts.php index 88b6110b27..31064b92e2 100644 --- a/src/wp-includes/block-patterns/query-offset-posts.php +++ b/src/wp-includes/block-patterns/query-offset-posts.php @@ -13,26 +13,26 @@ return array(
-
+
-
+
-
+
-
+
diff --git a/src/wp-includes/block-patterns/query-small-posts.php b/src/wp-includes/block-patterns/query-small-posts.php index 4cc4d36f03..c858f19813 100644 --- a/src/wp-includes/block-patterns/query-small-posts.php +++ b/src/wp-includes/block-patterns/query-small-posts.php @@ -11,7 +11,7 @@ return array( 'categories' => array( 'query' ), 'content' => '
- +
@@ -20,7 +20,7 @@ return array(
- +
', ); diff --git a/src/wp-includes/block-patterns/query-standard-posts.php b/src/wp-includes/block-patterns/query-standard-posts.php index b17df9791f..50fa37d637 100644 --- a/src/wp-includes/block-patterns/query-standard-posts.php +++ b/src/wp-includes/block-patterns/query-standard-posts.php @@ -11,7 +11,7 @@ return array( 'categories' => array( 'query' ), 'content' => '
- + @@ -19,7 +19,7 @@ return array(
- +
', ); diff --git a/src/wp-includes/blocks/index.php b/src/wp-includes/blocks/index.php index 92f9d8683c..c06618372e 100644 --- a/src/wp-includes/blocks/index.php +++ b/src/wp-includes/blocks/index.php @@ -21,8 +21,8 @@ require ABSPATH . WPINC . '/blocks/post-excerpt.php'; require ABSPATH . WPINC . '/blocks/post-featured-image.php'; require ABSPATH . WPINC . '/blocks/post-terms.php'; require ABSPATH . WPINC . '/blocks/post-title.php'; +require ABSPATH . WPINC . '/blocks/post-template.php'; require ABSPATH . WPINC . '/blocks/query.php'; -require ABSPATH . WPINC . '/blocks/query-loop.php'; require ABSPATH . WPINC . '/blocks/query-pagination.php'; require ABSPATH . WPINC . '/blocks/query-pagination-next.php'; require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php'; diff --git a/src/wp-includes/blocks/post-template.php b/src/wp-includes/blocks/post-template.php new file mode 100644 index 0000000000..88e029946c --- /dev/null +++ b/src/wp-includes/blocks/post-template.php @@ -0,0 +1,148 @@ +context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page'; + $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ]; + + $query_args = build_query_vars_from_query_block( $block, $page ); + // Override the custom query with the global query if needed. + $use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ); + if ( $use_global_query ) { + global $wp_query; + if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) { + // Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination. + unset( $query_args['offset'] ); + $query_args = wp_parse_args( $wp_query->query_vars, $query_args ); + + if ( empty( $query_args['post_type'] ) && is_singular() ) { + $query_args['post_type'] = get_post_type( get_the_ID() ); + } + } + } + + $query = new WP_Query( $query_args ); + + if ( ! $query->have_posts() ) { + return ''; + } + + $classnames = ''; + if ( isset( $block->context['displayLayout'] ) && isset( $block->context['query'] ) ) { + if ( isset( $block->context['displayLayout']['type'] ) && 'flex' === $block->context['displayLayout']['type'] ) { + $classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}"; + } + } + + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); + + $content = ''; + while ( $query->have_posts() ) { + $query->the_post(); + $block_content = ( + new WP_Block( + $block->parsed_block, + array( + 'postType' => get_post_type(), + 'postId' => get_the_ID(), + ) + ) + )->render( array( 'dynamic' => false ) ); + $content .= "
  • {$block_content}
  • "; + } + + wp_reset_postdata(); + + return sprintf( + '', + $wrapper_attributes, + $content + ); +} + +/** + * Registers the `core/post-template` block on the server. + */ +function register_block_core_post_template() { + register_block_type_from_metadata( + __DIR__ . '/post-template', + array( + 'render_callback' => 'render_block_core_post_template', + 'skip_inner_blocks' => true, + ) + ); +} +add_action( 'init', 'register_block_core_post_template' ); + +/** + * Renders the legacy `core/query-loop` block on the server. + * It triggers a developer warning and then calls the renamed + * block's `render_callback` function output. + * + * This can be removed when WordPress 5.9 is released. + * + * @param array $attributes Block attributes. + * @param string $content Block default content. + * @param WP_Block $block Block instance. + * + * @return string Returns the output of the query, structured using the layout defined by the block's inner blocks. + */ +function render_legacy_query_loop_block( $attributes, $content, $block ) { + trigger_error( + /* translators: %1$s: Block type */ + sprintf( __( 'Block %1$s has been renamed to Post Template. %1$s will be supported until WordPress version 5.9.', 'gutenberg' ), $block->name ), + headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE + ); + return render_block_core_post_template( $attributes, $content, $block ); +} + +/** + * Complements the renaming of `Query Loop` to `Post Template`. + * This ensures backwards compatibility for any users running the Gutenberg + * plugin who have used Query Loop prior to its renaming. + * + * This can be removed when WordPress 5.9 is released. + * + * @see https://github.com/WordPress/gutenberg/pull/32514 + */ +function gutenberg_register_legacy_query_loop_block() { + $registry = WP_Block_Type_Registry::get_instance(); + if ( $registry->is_registered( 'core/query-loop' ) ) { + unregister_block_type( 'core/query-loop' ); + } + register_block_type( + 'core/query-loop', + array( + 'category' => 'design', + 'uses_context' => array( + 'queryId', + 'query', + 'queryContext', + 'displayLayout', + 'templateSlug', + ), + 'supports' => array( + 'reusable' => false, + 'html' => false, + 'align' => true, + ), + 'style' => 'wp-block-post-template', + 'render_callback' => 'render_legacy_query_loop_block', + 'skip_inner_blocks' => true, + ) + ); +} +add_action( 'init', 'gutenberg_register_legacy_query_loop_block' ); diff --git a/src/wp-includes/blocks/query-loop/block.json b/src/wp-includes/blocks/post-template/block.json similarity index 60% rename from src/wp-includes/blocks/query-loop/block.json rename to src/wp-includes/blocks/post-template/block.json index 1d714c2f38..e4d5de8281 100644 --- a/src/wp-includes/blocks/query-loop/block.json +++ b/src/wp-includes/blocks/post-template/block.json @@ -1,10 +1,10 @@ { "apiVersion": 2, - "name": "core/query-loop", - "title": "Query Loop", + "name": "core/post-template", + "title": "Post Template", "category": "design", "parent": [ "core/query" ], - "description": "Query loop.", + "description": "Post Template.", "textdomain": "default", "usesContext": [ "queryId", @@ -18,6 +18,6 @@ "html": false, "align": true }, - "style": "wp-block-query-loop", - "editorStyle": "wp-block-query-loop-editor" + "style": "wp-block-post-template", + "editorStyle": "wp-block-post-template-editor" } diff --git a/src/wp-includes/blocks/query-loop.php b/src/wp-includes/blocks/query-loop.php deleted file mode 100644 index 9bdeb13f4b..0000000000 --- a/src/wp-includes/blocks/query-loop.php +++ /dev/null @@ -1,88 +0,0 @@ -context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page'; - $page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ]; - - $query_args = build_query_vars_from_query_block( $block, $page ); - // Override the custom query with the global query if needed. - $use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ); - if ( $use_global_query ) { - global $wp_query; - if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) { - // Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination. - unset( $query_args['offset'] ); - $query_args = wp_parse_args( $wp_query->query_vars, $query_args ); - - if ( empty( $query_args['post_type'] ) && is_singular() ) { - $query_args['post_type'] = get_post_type( get_the_ID() ); - } - } - } - - $query = new WP_Query( $query_args ); - - if ( ! $query->have_posts() ) { - return ''; - } - - $classnames = ''; - if ( isset( $block->context['displayLayout'] ) && isset( $block->context['query'] ) ) { - if ( isset( $block->context['displayLayout']['type'] ) && 'flex' === $block->context['displayLayout']['type'] ) { - $classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}"; - } - } - - $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) ); - - $content = ''; - while ( $query->have_posts() ) { - $query->the_post(); - $block_content = ( - new WP_Block( - $block->parsed_block, - array( - 'postType' => get_post_type(), - 'postId' => get_the_ID(), - ) - ) - )->render( array( 'dynamic' => false ) ); - $content .= "
  • {$block_content}
  • "; - } - - wp_reset_postdata(); - - return sprintf( - '', - $wrapper_attributes, - $content - ); -} - -/** - * Registers the `core/query-loop` block on the server. - */ -function register_block_core_query_loop() { - register_block_type_from_metadata( - __DIR__ . '/query-loop', - array( - 'render_callback' => 'render_block_core_query_loop', - 'skip_inner_blocks' => true, - ) - ); -} -add_action( 'init', 'register_block_core_query_loop' ); diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json index b54713a75a..a08dbc2e13 100644 --- a/src/wp-includes/blocks/query/block.json +++ b/src/wp-includes/blocks/query/block.json @@ -1,7 +1,7 @@ { "apiVersion": 2, "name": "core/query", - "title": "Query", + "title": "Query Loop", "category": "design", "description": "Displays a list of posts as a result of a query.", "textdomain": "default", diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index 84dfbafd0b..2341304edd 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -318,7 +318,8 @@ function _unhook_block_registration() { remove_action( 'init', 'register_block_core_post_terms' ); remove_action( 'init', 'register_block_core_post_title' ); remove_action( 'init', 'register_block_core_query' ); - remove_action( 'init', 'register_block_core_query_loop' ); + remove_action( 'init', 'register_block_core_post_template' ); + remove_action( 'init', 'gutenberg_register_legacy_query_loop_block' ); remove_action( 'init', 'register_block_core_query_pagination' ); remove_action( 'init', 'register_block_core_query_pagination_next' ); remove_action( 'init', 'register_block_core_query_pagination_numbers' ); diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js index 207947a936..0c57717301 100644 --- a/tools/webpack/packages.js +++ b/tools/webpack/packages.js @@ -120,8 +120,8 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'post-featured-image', 'post-terms', 'post-title', + 'post-template', 'query', - 'query-loop', 'query-pagination', 'query-pagination-next', 'query-pagination-numbers',