diff --git a/package-lock.json b/package-lock.json index 7ae30b92153b..e12cae0889d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1384,9 +1384,9 @@ "dev": true }, "@emotion/babel-plugin": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz", - "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.1.tgz", + "integrity": "sha512-K3/6Y+J/sIAjplf3uIteWLhPuOyuMNnE+iyYnTF/m294vc6IL90kTHp7y8ldZYbpKlP17rpOWDKM9DvTcrOmNQ==", "requires": { "@babel/helper-module-imports": "^7.12.13", "@babel/plugin-syntax-jsx": "^7.12.13", @@ -1399,7 +1399,7 @@ "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "^4.0.3" + "stylis": "4.0.13" }, "dependencies": { "escape-string-regexp": { @@ -1410,24 +1410,24 @@ } }, "@emotion/cache": { - "version": "11.6.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.6.0.tgz", - "integrity": "sha512-ElbsWY1KMwEowkv42vGo0UPuLgtPYfIs9BxxVrmvsaJVvktknsHYYlx5NQ5g6zLDcOTyamlDc7FkRg2TAcQDKQ==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz", + "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==", "requires": { "@emotion/memoize": "^0.7.4", "@emotion/sheet": "^1.1.0", "@emotion/utils": "^1.0.0", "@emotion/weak-memoize": "^0.2.5", - "stylis": "^4.0.10" + "stylis": "4.0.13" } }, "@emotion/css": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.5.0.tgz", - "integrity": "sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz", + "integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==", "requires": { - "@emotion/babel-plugin": "^11.0.0", - "@emotion/cache": "^11.5.0", + "@emotion/babel-plugin": "^11.7.1", + "@emotion/cache": "^11.7.1", "@emotion/serialize": "^1.0.0", "@emotion/sheet": "^1.0.3", "@emotion/utils": "^1.0.0" @@ -1452,12 +1452,12 @@ "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" }, "@emotion/react": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.0.tgz", - "integrity": "sha512-WL93hf9+/2s3cA1JVJlz8+Uy6p6QWukqQFOm2OZO5ki51hfucHMOmbSjiyC3t2Y4RI8XUmBoepoc/24ny/VBbA==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz", + "integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==", "requires": { "@babel/runtime": "^7.13.10", - "@emotion/cache": "^11.6.0", + "@emotion/cache": "^11.7.1", "@emotion/serialize": "^1.0.2", "@emotion/sheet": "^1.1.0", "@emotion/utils": "^1.0.0", @@ -3529,21 +3529,21 @@ } }, "@wordpress/block-directory": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.14.tgz", - "integrity": "sha512-c9fSb3JHosUJb8HdatmvZg8iI9AtYfVwyaARt/5LT0xVtsOlNP6+WeaJa2ikpkdxpIt+sUG28YAgOWuCnLkALA==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.17.tgz", + "integrity": "sha512-OpD5qBIO8Nac1BJG2GGb3o5I7hfGpTAEG2LI3cIAq4JgTZI0hJwLTak+ENvb8K3EBgCH4QYXqS6ZaZQaG2VQzw==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/block-editor": "^8.0.8", + "@wordpress/block-editor": "^8.0.11", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", - "@wordpress/edit-post": "^5.0.14", - "@wordpress/editor": "^12.0.11", + "@wordpress/edit-post": "^5.0.17", + "@wordpress/editor": "^12.0.14", "@wordpress/element": "^4.0.4", "@wordpress/hooks": "^3.2.2", "@wordpress/html-entities": "^3.2.3", @@ -3556,9 +3556,9 @@ } }, "@wordpress/block-editor": { - "version": "8.0.8", - "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.8.tgz", - "integrity": "sha512-3KFD0gQZ6gvP98b3mvDYtZS/APaxWfw02L8/ur23i79HpKfNYheT+3HMrUf/MUxmsJX++BgWWU86r5kqH0Ug0A==", + "version": "8.0.11", + "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.11.tgz", + "integrity": "sha512-U70TL7m/TQNGw6gKMe+gzAh3bzziCW5JcFrF8hv42c4uZk1BL8P4WGHpP5WNvr5Ae529VpN+rSaDmqE7pY4IyQ==", "requires": { "@babel/runtime": "^7.16.0", "@react-spring/web": "^9.2.4", @@ -3567,7 +3567,7 @@ "@wordpress/blob": "^3.2.2", "@wordpress/block-serialization-default-parser": "^4.2.3", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/data": "^6.1.4", "@wordpress/deprecated": "^3.2.3", @@ -3603,18 +3603,18 @@ } }, "@wordpress/block-library": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.12.tgz", - "integrity": "sha512-Mdlspqpezzq0WSmBd2jTlUXb2/Y4CC+AFyOzY5X47ErWbwZPZnwZtqOmeAjrVwfdQpkqAyMJWjMdj7C71qoRTQ==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.15.tgz", + "integrity": "sha512-jE2k9YPOE/AfDJHM0cCInQYY8/OA3xwnbCZb0aazTCfm2UlJYzSc8BluPydX8Pyv4915cLAZ614RueViou6P0g==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", "@wordpress/autop": "^3.2.3", "@wordpress/blob": "^3.2.2", - "@wordpress/block-editor": "^8.0.8", + "@wordpress/block-editor": "^8.0.11", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -3627,14 +3627,14 @@ "@wordpress/html-entities": "^3.2.3", "@wordpress/i18n": "^4.2.4", "@wordpress/icons": "^6.1.1", - "@wordpress/interface": "^4.1.10", + "@wordpress/interface": "^4.1.13", "@wordpress/is-shallow-equal": "^4.2.1", "@wordpress/keycodes": "^3.2.4", "@wordpress/notices": "^3.2.7", "@wordpress/primitives": "^3.0.4", - "@wordpress/reusable-blocks": "^3.0.14", + "@wordpress/reusable-blocks": "^3.0.17", "@wordpress/rich-text": "^5.0.6", - "@wordpress/server-side-render": "^3.0.12", + "@wordpress/server-side-render": "^3.0.15", "@wordpress/url": "^3.3.1", "@wordpress/viewport": "^4.0.6", "classnames": "^2.3.1", @@ -3689,9 +3689,9 @@ "dev": true }, "@wordpress/components": { - "version": "19.1.2", - "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.2.tgz", - "integrity": "sha512-Qdj8l+/3wwkwxP1/pG3369/2xhKz07lpDXlNyAOMEctA8o8YhVLKvHhAiOKMNL/TQkPz9hWai9MEK/5aPsXffg==", + "version": "19.1.5", + "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.5.tgz", + "integrity": "sha512-dZLrGhhjYWhxbDc72kSjgsWUkTksXa5XhCF4hAXXA9zCVMTUksOWFTIozsgQhUDQpHuq1JKWnDvzVo/Gzo24zQ==", "requires": { "@babel/runtime": "^7.16.0", "@emotion/cache": "^11.4.0", @@ -3785,16 +3785,16 @@ } }, "@wordpress/customize-widgets": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.14.tgz", - "integrity": "sha512-QGHulwm/osqTMnVIcGjCz+hHTNNb1VSucr1zp/pr294H9StOIENer20dr7WSFiUavTRtXdcAWxpbiJkcaeEwYw==", + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.17.tgz", + "integrity": "sha512-d0piCMwzS6ShBk72RLn6npVGY0XoNcdk1B8Z8h7X2bOQPNZ5UDQw6jMQurQIIbxnsMR9VeluTP5qBVrhc3kqNQ==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", - "@wordpress/block-editor": "^8.0.8", - "@wordpress/block-library": "^6.0.12", + "@wordpress/block-editor": "^8.0.11", + "@wordpress/block-library": "^6.0.15", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -3803,12 +3803,12 @@ "@wordpress/hooks": "^3.2.2", "@wordpress/i18n": "^4.2.4", "@wordpress/icons": "^6.1.1", - "@wordpress/interface": "^4.1.10", + "@wordpress/interface": "^4.1.13", "@wordpress/is-shallow-equal": "^4.2.1", "@wordpress/keyboard-shortcuts": "^3.0.6", "@wordpress/keycodes": "^3.2.4", "@wordpress/media-utils": "^3.0.5", - "@wordpress/widgets": "^2.0.14", + "@wordpress/widgets": "^2.0.17", "classnames": "^2.3.1", "lodash": "^4.17.21" } @@ -3909,9 +3909,9 @@ } }, "@wordpress/e2e-test-utils": { - "version": "5.4.9", - "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.9.tgz", - "integrity": "sha512-L0ReQGU8N9soIUoomVEILR7/PX0BrlBMltH9yjFuNxUweqZxoKd5vhNEDQfN2BZM24Zrnm9P/XQmdNwr9r/vPw==", + "version": "5.4.10", + "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.10.tgz", + "integrity": "sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==", "dev": true, "requires": { "@babel/runtime": "^7.16.0", @@ -3937,27 +3937,27 @@ } }, "@wordpress/edit-post": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.14.tgz", - "integrity": "sha512-5groMRI4CT6I6TcZeG2T5GC5j4Uj1dNlk69DF4q+eLJf6bs3EO3A2gIfzr2fuMTsfOO9pyrk+Y3yjEG8fDg3AA==", + "version": "5.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.17.tgz", + "integrity": "sha512-nqRMXTWlutu8OQnqLpp052PqZoBvTjv59hT28QvFagOngGb5/iirqaauCe7iLEZDyIQW95k7K3goxGPhdqzDTA==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/block-editor": "^8.0.8", - "@wordpress/block-library": "^6.0.12", + "@wordpress/block-editor": "^8.0.11", + "@wordpress/block-library": "^6.0.15", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", "@wordpress/data-controls": "^2.2.7", - "@wordpress/editor": "^12.0.11", + "@wordpress/editor": "^12.0.14", "@wordpress/element": "^4.0.4", "@wordpress/hooks": "^3.2.2", "@wordpress/i18n": "^4.2.4", "@wordpress/icons": "^6.1.1", - "@wordpress/interface": "^4.1.10", + "@wordpress/interface": "^4.1.13", "@wordpress/keyboard-shortcuts": "^3.0.6", "@wordpress/keycodes": "^3.2.4", "@wordpress/media-utils": "^3.0.5", @@ -3982,57 +3982,58 @@ } }, "@wordpress/edit-site": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.14.tgz", - "integrity": "sha512-mG3D1rad/HK87HqxvnZE7wiQl9ZC2fqrxiUwfQgyOU9F+2T3s6DCKMquJhDrs0TPCmZMj+y4H/cHN46Yw8hhbw==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.17.tgz", + "integrity": "sha512-CC3JB4L7Dg33kxSkxpBqsqksn30GiFH5x1dcLMt9BYTAGDGwlmShCQJhZI6ifSD9/F+CA1JviG4fB9UATmgMow==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/block-editor": "^8.0.8", - "@wordpress/block-library": "^6.0.12", + "@wordpress/block-editor": "^8.0.11", + "@wordpress/block-library": "^6.0.15", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", "@wordpress/data-controls": "^2.2.7", - "@wordpress/editor": "^12.0.11", + "@wordpress/editor": "^12.0.14", "@wordpress/element": "^4.0.4", "@wordpress/hooks": "^3.2.2", "@wordpress/html-entities": "^3.2.3", "@wordpress/i18n": "^4.2.4", "@wordpress/icons": "^6.1.1", - "@wordpress/interface": "^4.1.10", + "@wordpress/interface": "^4.1.13", "@wordpress/keyboard-shortcuts": "^3.0.6", "@wordpress/keycodes": "^3.2.4", "@wordpress/media-utils": "^3.0.5", "@wordpress/notices": "^3.2.7", "@wordpress/plugins": "^4.0.6", "@wordpress/primitives": "^3.0.4", - "@wordpress/reusable-blocks": "^3.0.14", + "@wordpress/reusable-blocks": "^3.0.17", "@wordpress/url": "^3.3.1", "@wordpress/viewport": "^4.0.6", "classnames": "^2.3.1", "downloadjs": "^1.4.7", "file-saver": "^2.0.2", + "history": "^5.1.0", "jszip": "^3.2.2", "lodash": "^4.17.21", "rememo": "^3.0.0" } }, "@wordpress/edit-widgets": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.9.tgz", - "integrity": "sha512-ivcnkftK+0N6lZjtcIbj2onsfvmt7/oo6e5Uh+ZcYXQGoX9t+02zFik23gOgqPqbb7XkbkQGf1sHWs5eaFFo5g==", + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.12.tgz", + "integrity": "sha512-u/610TaZbZgE6ArZPBqRvkzCbEJFgtlCrzCEnBIHE93oeytmzUyNo/+vyzj3NvJG40WQIrjWJbmBfuU1Ze+m3w==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/block-editor": "^8.0.8", - "@wordpress/block-library": "^6.0.12", + "@wordpress/block-editor": "^8.0.11", + "@wordpress/block-library": "^6.0.15", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -4041,16 +4042,16 @@ "@wordpress/hooks": "^3.2.2", "@wordpress/i18n": "^4.2.4", "@wordpress/icons": "^6.1.1", - "@wordpress/interface": "^4.1.10", + "@wordpress/interface": "^4.1.13", "@wordpress/keyboard-shortcuts": "^3.0.6", "@wordpress/keycodes": "^3.2.4", "@wordpress/media-utils": "^3.0.5", "@wordpress/notices": "^3.2.7", "@wordpress/plugins": "^4.0.6", - "@wordpress/reusable-blocks": "^3.0.14", - "@wordpress/server-side-render": "^3.0.12", + "@wordpress/reusable-blocks": "^3.0.17", + "@wordpress/server-side-render": "^3.0.15", "@wordpress/url": "^3.3.1", - "@wordpress/widgets": "^2.0.14", + "@wordpress/widgets": "^2.0.17", "classnames": "^2.3.1", "lodash": "^4.17.21", "rememo": "^3.0.0", @@ -4058,18 +4059,18 @@ } }, "@wordpress/editor": { - "version": "12.0.11", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.11.tgz", - "integrity": "sha512-qZ2WJ7JiycKtkPuSUoRApOVECZC5XuseRhfDl3dUwlaRl0jND83B/kj3NoHfZPNB09621j+bwBT39qH78e953g==", + "version": "12.0.14", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.14.tgz", + "integrity": "sha512-CO4I5g4Qve5HOeXcHaQT1sOjZ/VJ5C4K49IIzrgl/P5IEkkw5kwIq94Ori8CtPQZQllzSBWJGpO3QoKhQoVSsg==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", "@wordpress/api-fetch": "^5.2.6", "@wordpress/autop": "^3.2.3", "@wordpress/blob": "^3.2.2", - "@wordpress/block-editor": "^8.0.8", + "@wordpress/block-editor": "^8.0.11", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -4086,9 +4087,9 @@ "@wordpress/keycodes": "^3.2.4", "@wordpress/media-utils": "^3.0.5", "@wordpress/notices": "^3.2.7", - "@wordpress/reusable-blocks": "^3.0.14", + "@wordpress/reusable-blocks": "^3.0.17", "@wordpress/rich-text": "^5.0.6", - "@wordpress/server-side-render": "^3.0.12", + "@wordpress/server-side-render": "^3.0.15", "@wordpress/url": "^3.3.1", "@wordpress/wordcount": "^3.2.3", "classnames": "^2.3.1", @@ -4175,14 +4176,14 @@ } }, "@wordpress/format-library": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.14.tgz", - "integrity": "sha512-iemQKg711CrFmpJvPh1isceiorAGPkKXouPt+UF7Ic8G6YggyUf8hnyGuPIWZM7wTlbh5PD2XeL90+pChJVfRQ==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.17.tgz", + "integrity": "sha512-QAA0FwJJGW4tj1D/52f28aKtd95yV0md6gVLgoBIgGW+LZV52VYMPMycfxpP/dDBMOzc+8GDQhcutvbpe8weaA==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", - "@wordpress/block-editor": "^8.0.8", - "@wordpress/components": "^19.1.2", + "@wordpress/block-editor": "^8.0.11", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/data": "^6.1.4", "@wordpress/dom": "^3.2.7", @@ -4237,13 +4238,13 @@ } }, "@wordpress/interface": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.10.tgz", - "integrity": "sha512-3nUDqo69m0EBPpXW83Zv4MjTDRmmeoo2cYWNi2tUEi117Ls7Nuw+zXMdHCdYk1QcqVfVOmRg77tZlPDapDZBqQ==", + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.13.tgz", + "integrity": "sha512-XWTJtSlqTOTDU19Pq+TMRlYOXRSn2rHRyonp0Il8zSIj6UlMO1FvEXhgGbZcwLfS4bGAqTq7ji5YMxfbTD4QiA==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/a11y": "^3.2.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/data": "^6.1.4", "@wordpress/deprecated": "^3.2.3", @@ -4341,13 +4342,13 @@ } }, "@wordpress/list-reusable-blocks": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.12.tgz", - "integrity": "sha512-slGIu0ABCws87Ch8urInCpg/YI/B7Ap2U8AJ5FSM5cQ6ex+JCbMexABOwiuIHL065hEaw/wI/LNrgP75MRjT8A==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.15.tgz", + "integrity": "sha512-QQ3wH3SAbzQgFbvEzU6gpX1Dc/PzQTwqChVLsXzB7J7538Ulcd+mOvyK9pLn8LCvIeZDBCW5Opp7EPmbWwtN8A==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/element": "^4.0.4", "@wordpress/i18n": "^4.2.4", @@ -4385,12 +4386,12 @@ "dev": true }, "@wordpress/nux": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.12.tgz", - "integrity": "sha512-qMWUHyACqTMI6vGXQA20nUGlagaQ/GOGuk1al6acMrHMbk3b5LCgrA6nYPuHDXfgheZ5dZ85p8r2onos1bUkig==", + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.15.tgz", + "integrity": "sha512-dfpR300xRtj2SgNe2gYp/4KS2ETdixdoIx2B+aap6GdyKW01fF9dmRF8+/bmt3rJs6b3cGE8BaqnS2TEwPH5OA==", "requires": { "@babel/runtime": "^7.16.0", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/data": "^6.1.4", "@wordpress/deprecated": "^3.2.3", @@ -4515,13 +4516,13 @@ } }, "@wordpress/reusable-blocks": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.14.tgz", - "integrity": "sha512-jR4byu0is1n4FX53wVxuTR60bTU3wYv+yS+nvUPqgo7Ngh/8m3HP6PeKFP35/w3L3zYXM309s9tox7mUsycadg==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.17.tgz", + "integrity": "sha512-V12Kr7jzkEbaatSfPdS9u7HSf7KeFe6zO218a51eMqmStHzb9HljO0FKSFLCINq1hjqDiwceeC+S9gfOgIgslg==", "requires": { - "@wordpress/block-editor": "^8.0.8", + "@wordpress/block-editor": "^8.0.11", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -5487,14 +5488,14 @@ } }, "@wordpress/server-side-render": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.12.tgz", - "integrity": "sha512-ctiH9X/8Yn/Cp7Yvpcq7ee/kG6FDVhgLbCtNLFN+4estKfcKXfdMuzEsV0Lhi3z8SF9pRewwvas0cdIo+maK7g==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.15.tgz", + "integrity": "sha512-mrcemEw1eG0i8MGy912rHhi1/FqzneCKv6D/E8QmRX7m2WUz/M5g7XNksRIor44eNLg6dTjQkAM4AzuwAq9C9Q==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^5.2.6", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/data": "^6.1.4", "@wordpress/deprecated": "^3.2.3", @@ -5560,15 +5561,15 @@ "integrity": "sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA==" }, "@wordpress/widgets": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.14.tgz", - "integrity": "sha512-fMAWwEcK79esTIttuQkCFTHhPsrWbCQmletT8IjpUmT34RXbwGreBXnief8n9H4BC8eTe1JAE/kI3AhtdYfrRg==", + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.17.tgz", + "integrity": "sha512-jKUIgcu6dlOSk09HEC9p+vnn5J5vc9K0y1NuWumNopqC3/iy9+EwKgpTWkfvytl+pWnDA9Ha+IBa6a99sgcHfw==", "requires": { "@babel/runtime": "^7.16.0", "@wordpress/api-fetch": "^5.2.6", - "@wordpress/block-editor": "^8.0.8", + "@wordpress/block-editor": "^8.0.11", "@wordpress/blocks": "^11.1.4", - "@wordpress/components": "^19.1.2", + "@wordpress/components": "^19.1.5", "@wordpress/compose": "^5.0.6", "@wordpress/core-data": "^4.0.8", "@wordpress/data": "^6.1.4", @@ -6249,9 +6250,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==" }, "string.prototype.trimend": { "version": "1.0.4", @@ -13987,6 +13988,14 @@ "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz", "integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg==" }, + "history": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz", + "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -21824,9 +21833,9 @@ } }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==" }, "object.values": { "version": "1.1.5", @@ -24864,9 +24873,9 @@ } }, "stylis": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz", - "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==" + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", + "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" }, "sugarss": { "version": "2.0.0", diff --git a/package.json b/package.json index 1dc2515f54e9..a358b54aa291 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@wordpress/babel-preset-default": "6.4.1", "@wordpress/custom-templated-path-webpack-plugin": "2.1.0", "@wordpress/dependency-extraction-webpack-plugin": "3.2.1", - "@wordpress/e2e-test-utils": "5.4.9", + "@wordpress/e2e-test-utils": "5.4.10", "@wordpress/library-export-default-webpack-plugin": "2.2.0", "@wordpress/scripts": "19.2.2", "autoprefixer": "^9.8.8", @@ -82,53 +82,53 @@ "@wordpress/api-fetch": "5.2.6", "@wordpress/autop": "3.2.3", "@wordpress/blob": "3.2.2", - "@wordpress/block-directory": "3.0.14", - "@wordpress/block-editor": "8.0.8", - "@wordpress/block-library": "6.0.12", + "@wordpress/block-directory": "3.0.17", + "@wordpress/block-editor": "8.0.11", + "@wordpress/block-library": "6.0.15", "@wordpress/block-serialization-default-parser": "4.2.3", "@wordpress/blocks": "11.1.4", - "@wordpress/components": "19.1.2", + "@wordpress/components": "19.1.5", "@wordpress/compose": "5.0.6", "@wordpress/core-data": "4.0.8", - "@wordpress/customize-widgets": "2.0.14", + "@wordpress/customize-widgets": "2.0.17", "@wordpress/data": "6.1.4", "@wordpress/data-controls": "2.2.7", "@wordpress/date": "4.2.3", "@wordpress/deprecated": "3.2.3", "@wordpress/dom": "3.2.7", "@wordpress/dom-ready": "3.2.3", - "@wordpress/edit-post": "5.0.14", - "@wordpress/edit-site": "3.0.14", - "@wordpress/edit-widgets": "3.1.9", - "@wordpress/editor": "12.0.11", + "@wordpress/edit-post": "5.0.17", + "@wordpress/edit-site": "3.0.17", + "@wordpress/edit-widgets": "3.1.12", + "@wordpress/editor": "12.0.14", "@wordpress/element": "4.0.4", "@wordpress/escape-html": "2.2.3", - "@wordpress/format-library": "3.0.14", + "@wordpress/format-library": "3.0.17", "@wordpress/hooks": "3.2.2", "@wordpress/html-entities": "3.2.3", "@wordpress/i18n": "4.2.4", "@wordpress/icons": "6.1.1", - "@wordpress/interface": "4.1.10", + "@wordpress/interface": "4.1.13", "@wordpress/is-shallow-equal": "4.2.1", "@wordpress/keyboard-shortcuts": "3.0.6", "@wordpress/keycodes": "3.2.4", - "@wordpress/list-reusable-blocks": "3.0.12", + "@wordpress/list-reusable-blocks": "3.0.15", "@wordpress/media-utils": "3.0.5", "@wordpress/notices": "3.2.7", - "@wordpress/nux": "5.0.12", + "@wordpress/nux": "5.0.15", "@wordpress/plugins": "4.0.6", "@wordpress/primitives": "3.0.4", "@wordpress/priority-queue": "2.2.3", "@wordpress/redux-routine": "4.2.2", - "@wordpress/reusable-blocks": "3.0.14", + "@wordpress/reusable-blocks": "3.0.17", "@wordpress/rich-text": "5.0.6", - "@wordpress/server-side-render": "3.0.12", + "@wordpress/server-side-render": "3.0.15", "@wordpress/shortcode": "3.2.3", "@wordpress/token-list": "2.2.2", "@wordpress/url": "3.3.1", "@wordpress/viewport": "4.0.6", "@wordpress/warning": "2.2.2", - "@wordpress/widgets": "2.0.14", + "@wordpress/widgets": "2.0.17", "@wordpress/wordcount": "3.2.3", "backbone": "1.4.0", "clipboard": "2.0.8", diff --git a/src/wp-admin/site-editor.php b/src/wp-admin/site-editor.php index 6100f5a3101a..f038452b081d 100644 --- a/src/wp-admin/site-editor.php +++ b/src/wp-admin/site-editor.php @@ -23,6 +23,8 @@ wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) ); } +// Used in the HTML title tag. +$title = __( 'Editor (beta)' ); $parent_file = 'themes.php'; // Flag that we're loading the block editor. @@ -56,74 +58,45 @@ static function( $classes ) { $editor_settings = get_block_editor_settings( $custom_settings, $block_editor_context ); if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) { - $post_type = get_post_type_object( $_GET['postType'] ); - if ( ! $post_type ) { wp_die( __( 'Invalid post type.' ) ); } +} - // Used in the HTML title tag. - $title = $post_type->labels->name; - - $preload_paths = array( - '/', - '/wp/v2/types/' . $post_type->name . '?context=edit', - '/wp/v2/types?context=edit', - add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( $post_type->name ) ), - ); - - block_editor_rest_api_preload( $preload_paths, $block_editor_context ); - - wp_add_inline_script( - 'wp-edit-site', - sprintf( - 'wp.domReady( function() { - wp.editSite.initializeList( "site-editor", "%s", %s ); - } );', - $post_type->name, - wp_json_encode( $editor_settings ) - ) - ); - -} else { - - // Used in the HTML title tag. - $title = __( 'Editor (beta)' ); - - $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id(); - $active_theme = wp_get_theme()->get_stylesheet(); - $preload_paths = array( - array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ), - '/', - '/wp/v2/types?context=edit', - '/wp/v2/taxonomies?context=edit', - add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'page' ) ), - add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'post' ) ), - add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'category' ) ), - add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'post_tag' ) ), - add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template' ) ), - add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template_part' ) ), - '/wp/v2/settings', - '/wp/v2/themes?context=edit&status=active', - '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit', - '/wp/v2/global-styles/' . $active_global_styles_id, - '/wp/v2/themes/' . $active_theme . '/global-styles', - ); - - block_editor_rest_api_preload( $preload_paths, $block_editor_context ); +$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id(); +$active_theme = wp_get_theme()->get_stylesheet(); +$preload_paths = array( + array( '/wp/v2/media', 'OPTIONS' ), + '/', + '/wp/v2/types?context=edit', + '/wp/v2/types/wp_template?context=edit', + '/wp/v2/types/wp_template-part?context=edit', + '/wp/v2/taxonomies?context=edit', + '/wp/v2/pages?context=edit', + '/wp/v2/categories?context=edit', + '/wp/v2/posts?context=edit', + '/wp/v2/tags?context=edit', + '/wp/v2/templates?context=edit&per_page=-1', + '/wp/v2/template-parts?context=edit&per_page=-1', + '/wp/v2/settings', + '/wp/v2/themes?context=edit&status=active', + '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit', + '/wp/v2/global-styles/' . $active_global_styles_id, + '/wp/v2/global-styles/themes/' . $active_theme, +); - wp_add_inline_script( - 'wp-edit-site', - sprintf( - 'wp.domReady( function() { - wp.editSite.initializeEditor( "site-editor", %s ); - } );', - wp_json_encode( $editor_settings ) - ) - ); +block_editor_rest_api_preload( $preload_paths, $block_editor_context ); -} +wp_add_inline_script( + 'wp-edit-site', + sprintf( + 'wp.domReady( function() { + wp.editSite.initializeEditor( "site-editor", %s ); + } );', + wp_json_encode( $editor_settings ) + ) +); // Preload server-registered block schemas. wp_add_inline_script( diff --git a/src/wp-includes/assets/script-loader-packages.php b/src/wp-includes/assets/script-loader-packages.php index 2c89033a9d42..0ea85317cd03 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' => 'fa03f246887237d01c383e85ff6f107c'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'acd6ed75d460d0d3781e1ef6c12cf2aa'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '59f6dbf5a1d9a141515c25411bc4f01e'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e65166da67ee5d5ff66d36ab14532b3b'), '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-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'a8ff26eaaddf949aee8669d14277aec3'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', '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-warning', 'wp-wordcount'), 'version' => '1f942819c3ee4c8817290d91009999f9'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', '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-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '9c50f4a2655f7982925830bfa279e623'), '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-shortcode'), 'version' => 'a32036d432544d670dbd252aafb343aa'), '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' => '222096a6b8f6db7f3d31e2a7095c7624'), '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' => '9dac23239e3ee771f867989188a2e766'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), '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-plugins', 'wp-polyfill', 'wp-primitives', 'wp-viewport', 'wp-widgets'), 'version' => 'a4ae79ff9d722a302a31b7af5478e6b7'), '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' => 'f9c70b06478edf537328ed5ca3555658'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'a6b5897d9fe0799f7c5167a4a9fb3fc2'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'be8358e0f87d66f2bec405069f113602'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '64e8de35a014ff611a39da7042d361dd'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7d156934b7b48d00965baf08e162ab91'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7ad174e925c73007ee5b17358242e7d9'), 'edit-post.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-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' => '78dd73ace08da4436266d54e551f1801'), 'edit-site.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-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', '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'), 'version' => '28cef4f1147fe985ff7d5074907fc201'), '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-dom', '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' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', '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' => '22329f7ff9d35759e1a4ed63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), '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' => '314e138f1050b863fc65347b91b547d5'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '78a4020b31c5ae28f7e97405b83d5027'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '57a448b50bb24e264205e448e0b19ea2'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '411699046747b4d90f82c5b2547ff43c'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab2c70450229febbbb0a87e88074db07'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b9e78ffafe025c455d9ccf2c1a78d1de'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), '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' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), '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' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '67406a236d2370eedc90db2dfdcb46bd'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '5ebe2df53cf3c74ebffc7e2d3e76184c'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3dd8fa0fcd8381649603b755437d9be1'), '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' => 'fa03f246887237d01c383e85ff6f107c'), 'annotations.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'acd6ed75d460d0d3781e1ef6c12cf2aa'), 'api-fetch.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '59f6dbf5a1d9a141515c25411bc4f01e'), 'autop.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e65166da67ee5d5ff66d36ab14532b3b'), '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-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives'), 'version' => 'a8ff26eaaddf949aee8669d14277aec3'), 'block-editor.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', '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-warning', 'wp-wordcount'), 'version' => '5447a59462b2c774beaa2c2676852624'), 'block-library.js' => array('dependencies' => array('lodash', 'moment', 'wp-a11y', '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-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => '063fd27a71a60c93f2b842fc805b252e'), '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-shortcode'), 'version' => 'a32036d432544d670dbd252aafb343aa'), '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' => 'bbedf234d8932e76baccbf974505e69c'), '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' => '9dac23239e3ee771f867989188a2e766'), 'core-data.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => '15ee57b1f0ac2f25cdee181ee369950a'), '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-plugins', 'wp-polyfill', 'wp-primitives', 'wp-viewport', 'wp-widgets'), 'version' => 'a4ae79ff9d722a302a31b7af5478e6b7'), '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' => 'f9c70b06478edf537328ed5ca3555658'), 'data-controls.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'a6b5897d9fe0799f7c5167a4a9fb3fc2'), 'date.js' => array('dependencies' => array('moment', 'wp-polyfill'), 'version' => 'be8358e0f87d66f2bec405069f113602'), 'deprecated.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '64e8de35a014ff611a39da7042d361dd'), 'dom.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '7d156934b7b48d00965baf08e162ab91'), 'dom-ready.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7ad174e925c73007ee5b17358242e7d9'), 'edit-post.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-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' => '78dd73ace08da4436266d54e551f1801'), 'edit-site.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-data-controls', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', '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'), 'version' => 'b3c59f02b8cc936c81d89d46c2d09e1c'), '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-dom', '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' => '98424c28360f75deb941d9d5977df074'), 'editor.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', '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' => '22329f7ff9d35759e1a4ed63f50fd1f1'), 'element.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '32e0abe121ab85a88acb6472274ad136'), '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' => '638b31b2e32bdc443afa62d9aa251d8a'), 'hooks.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'fee9af3abfeb76b497fd074608dca647'), 'html-entities.js' => array('dependencies' => array('wp-polyfill'), 'version' => '140ecb91be91e7eec34220584d085033'), 'i18n.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9ddfa7e364f034c04939567c6c6079d5'), 'is-shallow-equal.js' => array('dependencies' => array('wp-polyfill'), 'version' => '798b660598677b39413fdb5f68624aa8'), 'keyboard-shortcuts.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => '78a4020b31c5ae28f7e97405b83d5027'), 'keycodes.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '57a448b50bb24e264205e448e0b19ea2'), 'list-reusable-blocks.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '411699046747b4d90f82c5b2547ff43c'), 'media-utils.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab2c70450229febbbb0a87e88074db07'), 'notices.js' => array('dependencies' => array('lodash', 'wp-data', 'wp-polyfill'), 'version' => 'b9e78ffafe025c455d9ccf2c1a78d1de'), 'nux.js' => array('dependencies' => array('lodash', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'feee5fbb3df2a20c6dc4653f33d12e13'), 'plugins.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '76d0e1ad216a273ab1359db9aaab1809'), 'primitives.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ec5aecfc61b399ed5c8fa2de6b175942'), 'priority-queue.js' => array('dependencies' => array('wp-polyfill'), 'version' => '18c93919f04bb681234310b314675b17'), 'redux-routine.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'f4483156a9bae90512f894dbd867b929'), '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' => '436b8be211e4f30893de92b1faad8984'), 'rich-text.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c491067ec9fe71eeaa2c74e4ee78f956'), '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' => 'ff256efbd27ce91d114094be9982fadc'), 'shortcode.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '0e7a194ec8387c92e8d2c2b3755c3c9b'), 'token-list.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'a50777df914543c1a77067959d6b3fbf'), 'url.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => 'd99eea3ea07b8acf242f75a06a2c49ff'), 'viewport.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '67406a236d2370eedc90db2dfdcb46bd'), 'warning.js' => array('dependencies' => array('wp-polyfill'), 'version' => '5ebe2df53cf3c74ebffc7e2d3e76184c'), 'widgets.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3dd8fa0fcd8381649603b755437d9be1'), 'wordcount.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '02339c8ad03da1e7a03f9212da004007')); \ No newline at end of file diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php index 7205ef2f4a72..f175eff85dc6 100644 --- a/src/wp-includes/block-editor.php +++ b/src/wp-includes/block-editor.php @@ -311,7 +311,6 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex array( 'css' => 'variables', '__unstableType' => 'presets', - '__experimentalNoWrapper' => true, ), array( 'css' => 'presets', diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php index 28efb5cbadf6..f1660ed6434e 100644 --- a/src/wp-includes/block-template-utils.php +++ b/src/wp-includes/block-template-utils.php @@ -41,7 +41,7 @@ function get_block_theme_folders( $theme_stylesheet = null ) { $root_dir = get_theme_root( $theme_name ); $theme_dir = "$root_dir/$theme_name"; - if ( is_readable( $theme_dir . '/block-templates/index.html' ) ) { + if ( file_exists( $theme_dir . '/block-templates' ) || file_exists( $theme_dir . '/block-template-parts' ) ) { return array( 'wp_template' => 'block-templates', 'wp_template_part' => 'block-template-parts', diff --git a/src/wp-includes/blocks/gallery.php b/src/wp-includes/blocks/gallery.php new file mode 100644 index 000000000000..a159de4df173 --- /dev/null +++ b/src/wp-includes/blocks/gallery.php @@ -0,0 +1,51 @@ + $inner_block ) { + if ( 'core/image' === $inner_block['blockName'] ) { + if ( ! isset( $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] ) && isset( $inner_block['attrs']['id'] ) ) { + $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] = esc_attr( $inner_block['attrs']['id'] ); + } + } + } + } + + return $parsed_block; +} + +add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' ); + +/** + * Registers the `core/gallery` block on server. + * This render callback needs to be here + * so that the gallery styles are loaded in block-based themes. + */ +function register_block_core_gallery() { + register_block_type_from_metadata( + __DIR__ . '/gallery', + array( + 'render_callback' => function ( $attributes, $content ) { + return $content; + }, + ) + ); +} + +add_action( 'init', 'register_block_core_gallery', 20 ); diff --git a/src/wp-includes/blocks/image.php b/src/wp-includes/blocks/image.php new file mode 100644 index 000000000000..f8f7066a970d --- /dev/null +++ b/src/wp-includes/blocks/image.php @@ -0,0 +1,42 @@ + 'render_block_core_image', + ) + ); +} +add_action( 'init', 'register_block_core_image' ); diff --git a/src/wp-includes/blocks/index.php b/src/wp-includes/blocks/index.php index 727c7f313bf8..f7382b1e9ae8 100644 --- a/src/wp-includes/blocks/index.php +++ b/src/wp-includes/blocks/index.php @@ -11,6 +11,8 @@ require ABSPATH . WPINC . '/blocks/calendar.php'; require ABSPATH . WPINC . '/blocks/categories.php'; require ABSPATH . WPINC . '/blocks/file.php'; +require ABSPATH . WPINC . '/blocks/gallery.php'; +require ABSPATH . WPINC . '/blocks/image.php'; require ABSPATH . WPINC . '/blocks/latest-comments.php'; require ABSPATH . WPINC . '/blocks/latest-posts.php'; require ABSPATH . WPINC . '/blocks/legacy-widget.php'; @@ -64,11 +66,9 @@ function register_core_block_types_from_metadata() { 'cover', 'embed', 'freeform', - 'gallery', 'group', 'heading', 'html', - 'image', 'list', 'media-text', 'missing', diff --git a/src/wp-includes/blocks/navigation-submenu.php b/src/wp-includes/blocks/navigation-submenu.php index c0fdbfa271cf..60485079897c 100644 --- a/src/wp-includes/blocks/navigation-submenu.php +++ b/src/wp-includes/blocks/navigation-submenu.php @@ -188,6 +188,12 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) { ); } + $aria_label = sprintf( + /* translators: Accessibility text. %s: Parent page title. */ + __( '%s submenu' ), + $label + ); + $html = '
  • '; // If Submenus open on hover, we render an anchor tag with attributes. @@ -226,11 +232,11 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) { if ( $show_submenu_indicators ) { // The submenu icon is rendered in a button here // so that there's a clickable elment to open the submenu. - $html .= ''; + $html .= ''; } } else { // If menus open on click, we render the parent as a button. - $html .= ''; } else { $markup .= '' . $title . ''; @@ -186,7 +191,7 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click, if ( isset( $page['children'] ) ) { if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) { - $markup .= ''; } diff --git a/src/wp-includes/blocks/post-comments.php b/src/wp-includes/blocks/post-comments.php index 42f9a8d60d94..8ddb0e6f7456 100644 --- a/src/wp-includes/blocks/post-comments.php +++ b/src/wp-includes/blocks/post-comments.php @@ -66,3 +66,20 @@ function register_block_core_post_comments() { ); } add_action( 'init', 'register_block_core_post_comments' ); + +/** + * Use the button block classes for the form-submit button. + * + * @param array $fields The default comment form arguments. + * + * @return array Returns the modified fields. + */ +function post_comments_block_form_defaults( $fields ) { + if ( wp_is_block_theme() ) { + $fields['submit_button'] = ''; + $fields['submit_field'] = '

    %1$s %2$s

    '; + } + + return $fields; +} +add_filter( 'comment_form_defaults', 'post_comments_block_form_defaults' ); diff --git a/src/wp-includes/blocks/post-comments/block.json b/src/wp-includes/blocks/post-comments/block.json index 2aab1d09f990..2c797f51154f 100644 --- a/src/wp-includes/blocks/post-comments/block.json +++ b/src/wp-includes/blocks/post-comments/block.json @@ -30,5 +30,9 @@ "link": true } }, - "style": "wp-block-post-comments" + "style": [ + "wp-block-post-comments", + "wp-block-buttons", + "wp-block-button" + ] } diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php index 1eb8e39d780e..20bc6900f83b 100644 --- a/src/wp-includes/blocks/template-part.php +++ b/src/wp-includes/blocks/template-part.php @@ -64,8 +64,11 @@ function render_block_core_template_part( $attributes ) { } else { // Else, if the template part was provided by the active theme, // render the corresponding file content. - $theme_folders = get_block_theme_folders(); - $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' ); + $parent_theme_folders = get_block_theme_folders( get_template() ); + $child_theme_folders = get_block_theme_folders( get_stylesheet() ); + $child_theme_part_file_path = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' ); + $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' ); + $template_part_file_path = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path; if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) { $content = file_get_contents( $template_part_file_path ); $content = is_string( $content ) && '' !== $content diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php index 66b7d55e7dec..3ff39b6584b1 100644 --- a/src/wp-includes/class-wp-theme-json.php +++ b/src/wp-includes/class-wp-theme-json.php @@ -107,7 +107,7 @@ class WP_Theme_JSON { const PRESETS_METADATA = array( array( 'path' => array( 'color', 'palette' ), - 'override' => false, + 'override' => array( 'color', 'defaultPalette' ), 'value_key' => 'color', 'css_vars' => '--wp--preset--color--$slug', 'classes' => array( @@ -119,7 +119,7 @@ class WP_Theme_JSON { ), array( 'path' => array( 'color', 'gradients' ), - 'override' => false, + 'override' => array( 'color', 'defaultGradients' ), 'value_key' => 'gradient', 'css_vars' => '--wp--preset--gradient--$slug', 'classes' => array( '.has-$slug-gradient-background' => 'background' ), @@ -397,13 +397,16 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) { private static function maybe_opt_in_into_settings( $theme_json ) { $new_theme_json = $theme_json; - if ( isset( $new_theme_json['settings']['appearanceTools'] ) ) { + if ( + isset( $new_theme_json['settings']['appearanceTools'] ) && + true === $new_theme_json['settings']['appearanceTools'] + ) { self::do_opt_in_into_settings( $new_theme_json['settings'] ); } if ( isset( $new_theme_json['settings']['blocks'] ) && is_array( $new_theme_json['settings']['blocks'] ) ) { foreach ( $new_theme_json['settings']['blocks'] as &$block ) { - if ( isset( $block['appearanceTools'] ) ) { + if ( isset( $block['appearanceTools'] ) && ( true === $block['appearanceTools'] ) ) { self::do_opt_in_into_settings( $block ); } } @@ -433,7 +436,9 @@ private static function do_opt_in_into_settings( &$context ) { ); foreach ( $to_opt_in as $path ) { - if ( null === _wp_array_get( $context, $path, null ) ) { + // Use "unset prop" as a marker instead of "null" because + // "null" can be a valid value for some props (e.g. blockGap). + if ( 'unset prop' === _wp_array_get( $context, $path, 'unset prop' ) ) { _wp_array_set( $context, $path, true ); } } @@ -1502,9 +1507,9 @@ public function merge( $incoming ) { * we remove it from the theme presets. */ $nodes = self::get_setting_nodes( $incoming_data ); - $slugs_global = self::get_slugs_not_to_override( $this->theme_json ); + $slugs_global = self::get_default_slugs( $this->theme_json, array( 'settings' ) ); foreach ( $nodes as $node ) { - $slugs_node = self::get_slugs_not_to_override( $this->theme_json, $node['path'] ); + $slugs_node = self::get_default_slugs( $this->theme_json, $node['path'] ); $slugs = array_merge_recursive( $slugs_global, $slugs_node ); // Replace the spacing.units. @@ -1516,6 +1521,8 @@ public function merge( $incoming ) { // Replace the presets. foreach ( self::PRESETS_METADATA as $preset ) { + $override_preset = self::should_override_preset( $this->theme_json, $node['path'], $preset['override'] ); + foreach ( self::VALID_ORIGINS as $origin ) { $path = array_merge( $node['path'], $preset['path'], array( $origin ) ); $content = _wp_array_get( $incoming_data, $path, null ); @@ -1525,13 +1532,12 @@ public function merge( $incoming ) { if ( ( 'theme' !== $origin ) || - ( 'theme' === $origin && $preset['override'] ) + ( 'theme' === $origin && $override_preset ) ) { _wp_array_set( $this->theme_json, $path, $content ); - } - - if ( 'theme' === $origin && ! $preset['override'] ) { - $content = self::filter_slugs( $content, $preset['path'], $slugs ); + } else { + $slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() ); + $content = self::filter_slugs( $content, $slugs_for_preset ); _wp_array_set( $this->theme_json, $path, $content ); } } @@ -1540,13 +1546,55 @@ public function merge( $incoming ) { } /** - * Returns the slugs for all the presets that cannot be overriden - * in the given path. It returns an associative array + * Returns whether a presets should be overriden or not. + * + * @since 5.9.0 + * + * @param array $theme_json The theme.json like structure to inspect. + * @param array $path Path to inspect. + * @param bool|array $override Data to compute whether to override the preset. + * @return boolean + */ + private static function should_override_preset( $theme_json, $path, $override ) { + if ( is_bool( $override ) ) { + return $override; + } + + /* + * The relationship between whether to override the defaults + * and whether the defaults are enabled is inverse: + * + * - If defaults are enabled => theme presets should not be overriden + * - If defaults are disabled => theme presets should be overriden + * + * For example, a theme sets defaultPalette to false, + * making the default palette hidden from the user. + * In that case, we want all the theme presets to be present, + * so they should override the defaults. + */ + if ( is_array( $override ) ) { + $value = _wp_array_get( $theme_json, array_merge( $path, $override ) ); + if ( isset( $value ) ) { + return ! $value; + } + + // Search the top-level key if none was found for this node. + $value = _wp_array_get( $theme_json, array_merge( array( 'settings' ), $override ) ); + if ( isset( $value ) ) { + return ! $value; + } + + return true; + } + } + + /** + * Returns the default slugs for all the presets in an associative array * whose keys are the preset paths and the leafs is the list of slugs. * * For example: * - * array( + * array( * 'color' => array( * 'palette' => array( 'slug-1', 'slug-2' ), * 'gradients' => array( 'slug-3', 'slug-4' ), @@ -1555,26 +1603,23 @@ public function merge( $incoming ) { * * @since 5.9.0 * - * @param array $data A theme.json like structure to inspect. - * @param array $node_path The path to inspect. Default `array( 'settings' )`. - * @return array An associative array containing the slugs for the given path. + * @param array $data A theme.json like structure. + * @param array $node_path The path to inspect. It's 'settings' by default. + * @return array */ - private static function get_slugs_not_to_override( $data, $node_path = array( 'settings' ) ) { + private static function get_default_slugs( $data, $node_path ) { $slugs = array(); - foreach ( self::PRESETS_METADATA as $metadata ) { - if ( $metadata['override'] ) { - continue; - } - $slugs_for_preset = array(); - $path = array_merge( $node_path, $metadata['path'], array( 'default' ) ); - $preset = _wp_array_get( $data, $path, null ); + foreach ( self::PRESETS_METADATA as $metadata ) { + $path = array_merge( $node_path, $metadata['path'], array( 'default' ) ); + $preset = _wp_array_get( $data, $path, null ); if ( ! isset( $preset ) ) { continue; } + $slugs_for_preset = array(); $slugs_for_preset = array_map( - function( $value ) { + static function( $value ) { return isset( $value['slug'] ) ? $value['slug'] : null; }, $preset @@ -1591,19 +1636,17 @@ function( $value ) { * @since 5.9.0 * * @param array $node The node with the presets to validate. - * @param array $path The path to the preset type to inspect. * @param array $slugs The slugs that should not be overriden. * @return array The new node. */ - private static function filter_slugs( $node, $path, $slugs ) { - $slugs_for_preset = _wp_array_get( $slugs, $path, array() ); - if ( empty( $slugs_for_preset ) ) { + private static function filter_slugs( $node, $slugs ) { + if ( empty( $slugs ) ) { return $node; } $new_node = array(); foreach ( $node as $value ) { - if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs_for_preset, true ) ) { + if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs, true ) ) { $new_node[] = $value; } } diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index 39c7119fbcec..fda548ed54dc 100644 --- a/src/wp-includes/default-filters.php +++ b/src/wp-includes/default-filters.php @@ -563,6 +563,7 @@ add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' ); +add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' ); add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' ); add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' ); add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index 3091eeb9b871..98a7ffb8f020 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -504,7 +504,7 @@ function create_initial_post_types() { '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ 'has_archive' => false, 'show_ui' => wp_is_block_theme(), - 'show_in_menu' => 'themes.php', + 'show_in_menu' => false, 'show_in_admin_bar' => false, 'show_in_rest' => true, 'rewrite' => false, diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 8313088e6731..fc34c7518089 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2863,3 +2863,14 @@ function wp_add_iframed_editor_assets_html() { echo ""; } + +/** + * Function that enqueues the CSS Custom Properties coming from theme.json. + * + * @since 5.9.0 + */ +function wp_enqueue_global_styles_css_custom_properties() { + wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true ); + wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) ); + wp_enqueue_style( 'global-styles-css-custom-properties' ); +} diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index 323043dfba30..cb8997799399 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -307,6 +307,8 @@ function _unhook_block_registration() { remove_action( 'init', 'register_block_core_calendar' ); remove_action( 'init', 'register_block_core_categories' ); remove_action( 'init', 'register_block_core_file' ); + remove_action( 'init', 'register_block_core_gallery', 20 ); + remove_action( 'init', 'register_block_core_image' ); remove_action( 'init', 'register_block_core_latest_comments' ); remove_action( 'init', 'register_block_core_latest_posts' ); remove_action( 'init', 'register_block_core_legacy_widget' ); diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php index 60c6d16eded1..3905f03d074b 100644 --- a/tests/phpunit/tests/theme/wpThemeJson.php +++ b/tests/phpunit/tests/theme/wpThemeJson.php @@ -200,12 +200,15 @@ public function test_get_settings_presets_are_keyed_by_origin() { $this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin ); } - function test_get_settings_using_opt_in_key() { + function test_get_settings_appearance_true_opts_in() { $theme_json = new WP_Theme_JSON( array( 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( 'appearanceTools' => true, + 'spacing' => array( + 'blockGap' => false, // This should override appearanceTools. + ), 'blocks' => array( 'core/paragraph' => array( 'typography' => array( @@ -217,6 +220,9 @@ function test_get_settings_using_opt_in_key() { 'typography' => array( 'lineHeight' => false, // This should override appearanceTools. ), + 'spacing' => array( + 'blockGap' => null, + ), ), ), ), @@ -235,7 +241,7 @@ function test_get_settings_using_opt_in_key() { 'link' => true, ), 'spacing' => array( - 'blockGap' => true, + 'blockGap' => false, 'margin' => true, 'padding' => true, ), @@ -259,7 +265,7 @@ function test_get_settings_using_opt_in_key() { 'link' => true, ), 'spacing' => array( - 'blockGap' => true, + 'blockGap' => false, 'margin' => true, 'padding' => true, ), @@ -273,6 +279,54 @@ function test_get_settings_using_opt_in_key() { $this->assertEqualSetsWithIndex( $expected, $actual ); } + function test_get_settings_appearance_false_does_not_opt_in() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'appearanceTools' => false, + 'border' => array( + 'width' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + ), + ), + ) + ); + + $actual = $theme_json->get_settings(); + $expected = array( + 'appearanceTools' => false, + 'border' => array( + 'width' => true, + ), + 'blocks' => array( + 'core/paragraph' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + 'core/group' => array( + 'typography' => array( + 'lineHeight' => false, + ), + ), + ), + ); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + /** * @ticket 54336 */ @@ -1133,13 +1187,14 @@ public function test_merge_incoming_data_null_presets() { $this->assertEqualSetsWithIndex( $expected, $actual ); } - public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_default_presets() { + public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_removed() { $defaults = new WP_Theme_JSON( array( 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( 'color' => array( - 'palette' => array( + 'defaultPalette' => true, + 'palette' => array( array( 'slug' => 'red', 'color' => 'red', @@ -1218,7 +1273,7 @@ public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_def 'version' => WP_Theme_JSON::LATEST_SCHEMA, 'settings' => array( 'color' => array( - 'palette' => array( + 'palette' => array( 'default' => array( array( 'slug' => 'red', @@ -1239,6 +1294,7 @@ public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_def ), ), ), + 'defaultPalette' => true, ), 'blocks' => array( 'core/paragraph' => array( @@ -1271,6 +1327,162 @@ public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_def $this->assertEqualSetsWithIndex( $expected, $actual ); } + public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_not_removed_if_defaults_are_disabled() { + $defaults = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => true, // Emulate the defaults from core theme.json. + 'palette' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + ), + ), + ), + ), + ), + 'default' + ); + $theme = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => false, + 'palette' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Greenish', + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Bluish', + ), + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Block Green', + ), + ), + ), + ), + ), + ), + ) + ); + + $expected = array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'color' => array( + 'defaultPalette' => false, + 'palette' => array( + 'default' => array( + array( + 'slug' => 'red', + 'color' => 'red', + 'name' => 'Red', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Green', + ), + ), + 'theme' => array( + array( + 'slug' => 'pink', + 'color' => 'pink', + 'name' => 'Pink', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Greenish', + ), + ), + ), + ), + 'blocks' => array( + 'core/paragraph' => array( + 'color' => array( + 'palette' => array( + 'default' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Blue', + ), + ), + 'theme' => array( + array( + 'slug' => 'blue', + 'color' => 'blue', + 'name' => 'Bluish', + ), + array( + 'slug' => 'yellow', + 'color' => 'yellow', + 'name' => 'Yellow', + ), + array( + 'slug' => 'green', + 'color' => 'green', + 'name' => 'Block Green', + ), + ), + ), + ), + ), + ), + ), + ); + + $defaults->merge( $theme ); + $actual = $defaults->get_raw_data(); + + $this->assertEqualSetsWithIndex( $expected, $actual ); + } + /** * @ticket 54336 */ diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js index bbdf8f1d4c27..2579ce11d486 100644 --- a/tools/webpack/blocks.js +++ b/tools/webpack/blocks.js @@ -28,6 +28,8 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'calendar', 'categories', 'file', + 'gallery', + 'image', 'latest-comments', 'latest-posts', 'loginout', @@ -73,11 +75,9 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'cover', 'embed', 'freeform', - 'gallery', 'group', 'heading', 'html', - 'image', 'list', 'media-text', 'missing',