Index: package-lock.json
===================================================================
--- package-lock.json (revision 43910)
+++ package-lock.json (working copy)
@@ -237,15 +237,15 @@
}
},
"@wordpress/annotations": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-1.0.1.tgz",
- "integrity": "sha512-p3x69/bECmnVCGbcacp/+W+oXG41ilAgMqO5AegFKOUdGajIs5gXsCWl3wD3e/07cI9DDuFwtx476jadxfZBhA==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-1.0.2.tgz",
+ "integrity": "sha512-PHdezirBAsaNxvnjKWatre2F1LVD9EjUWtWj2jmBC+ueupLhclUWG5c5QM5Td1fS4DiDzmrRTCize+rSn7XtAQ==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/data": "^4.0.1",
"@wordpress/hooks": "^2.0.3",
"@wordpress/i18n": "^3.1.0",
- "@wordpress/rich-text": "^3.0.0",
+ "@wordpress/rich-text": "^3.0.1",
"lodash": "^4.17.10",
"rememo": "^3.0.0",
"uuid": "^3.3.2"
@@ -252,14 +252,14 @@
}
},
"@wordpress/api-fetch": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-2.2.4.tgz",
- "integrity": "sha512-4F/soEicQTTAgZujeJ0oMAh/YPX56dUIzlB4ndswp3dvTJP/FNg2Nng9LnicCfQQHDhIrDFkwRNM4MfAVWk7WA==",
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-2.2.5.tgz",
+ "integrity": "sha512-/59udJQAG5ynrA7j/E6mBhl0gv1MXpBDiuMhY7TBOdgNYIdltrcBbI2PF0r42EGPRtm+rOzBKrEM7WDkWTCkvA==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/hooks": "^2.0.3",
"@wordpress/i18n": "^3.1.0",
- "@wordpress/url": "^2.3.0"
+ "@wordpress/url": "^2.3.1"
}
},
"@wordpress/autop": {
@@ -279,25 +279,25 @@
}
},
"@wordpress/block-library": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.4.tgz",
- "integrity": "sha512-Z/EmYdzB3GQpw8Rva/Y7xG9IS7W/cy1KWR7DrT3/bb7sGwQ4f37KPttY4s7qkRZlkKRakzEfqAIVtci6w2pqmg==",
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.5.tgz",
+ "integrity": "sha512-k9ym0oZQdubTdFbPpBz0obz+2Q40lxBgbeAngrstukOLcK7KzbneUPfOzQRaZaCRYoplQvGH6PO1WU/Ws1rzvw==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/autop": "^2.0.2",
"@wordpress/blob": "^2.1.0",
- "@wordpress/blocks": "^6.0.0",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/blocks": "^6.0.1",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/core-data": "^2.0.13",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/core-data": "^2.0.14",
+ "@wordpress/data": "^4.0.1",
"@wordpress/deprecated": "^2.0.3",
- "@wordpress/editor": "^8.0.0",
+ "@wordpress/editor": "^9.0.0",
"@wordpress/element": "^2.1.8",
"@wordpress/html-entities": "^2.0.2",
"@wordpress/i18n": "^3.1.0",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/viewport": "^2.0.11",
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/viewport": "^2.0.12",
"classnames": "^2.2.5",
"lodash": "^4.17.10",
"memize": "^1.0.5",
@@ -321,9 +321,9 @@
"integrity": "sha512-l5N0o2Tkc4IcDhhMfX2W3KuEV/4F7TeitJEDtBpLYf7eRMIn3Uh6l5rPDmmuTDv7UFlMWTiA8z/oCpl13ZyBOw=="
},
"@wordpress/blocks": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-6.0.0.tgz",
- "integrity": "sha512-mVRY8VptqIRuGWJRhm7B5BjBJRUKvmIViljUG0mAD3mAcFR9PKNADabbEGSSoH3clUOkUBqLRLzDceQuWOsaYw==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-6.0.1.tgz",
+ "integrity": "sha512-2lzVMiA8E/y9AVa3zVyL4jc4/de+o+kxLKjEpcelZXk6j2YA5KneHDQ/qfrW4XGEui5J6Q0Kqpw49mE77fQ2rw==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/autop": "^2.0.2",
@@ -330,8 +330,8 @@
"@wordpress/blob": "^2.1.0",
"@wordpress/block-serialization-default-parser": "^2.0.0",
"@wordpress/block-serialization-spec-parser": "^2.0.0",
- "@wordpress/data": "^4.0.0",
- "@wordpress/dom": "^2.0.6",
+ "@wordpress/data": "^4.0.1",
+ "@wordpress/dom": "^2.0.7",
"@wordpress/element": "^2.1.8",
"@wordpress/hooks": "^2.0.3",
"@wordpress/html-entities": "^2.0.2",
@@ -348,23 +348,22 @@
}
},
"@wordpress/components": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-6.0.2.tgz",
- "integrity": "sha512-La9RsHC4IBqfsUbY2hOwQyIHnrd5zzcT+HbbKPV1GPlYOxgIpX41gh8/ktAsuNcZQWOmgze5MRFVl4+2OQEV9Q==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-7.0.0.tgz",
+ "integrity": "sha512-hzAfP8TrqA9CIYgwIFdQG1XsrTG7FVBY+rnpMEgtqAN1DWfJsDIMNYPZHB6moFMN6bbLEfMY/NTr8J8+55NKsQ==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/a11y": "^2.0.2",
- "@wordpress/api-fetch": "^2.2.4",
+ "@wordpress/api-fetch": "^2.2.5",
"@wordpress/compose": "^3.0.0",
- "@wordpress/deprecated": "^2.0.3",
- "@wordpress/dom": "^2.0.6",
+ "@wordpress/dom": "^2.0.7",
"@wordpress/element": "^2.1.8",
"@wordpress/hooks": "^2.0.3",
"@wordpress/i18n": "^3.1.0",
"@wordpress/is-shallow-equal": "^1.1.4",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/rich-text": "^3.0.0",
- "@wordpress/url": "^2.3.0",
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/rich-text": "^3.0.1",
+ "@wordpress/url": "^2.3.1",
"classnames": "^2.2.5",
"clipboard": "^2.0.1",
"diff": "^3.5.0",
@@ -393,14 +392,14 @@
}
},
"@wordpress/core-data": {
- "version": "2.0.13",
- "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-2.0.13.tgz",
- "integrity": "sha512-vRVcBJXQ9QqC4PZOGzyC29ygvAxPr2BmzH+bPTd+EHjYypmLf3nXj8JhC6jjTCjlHt9mmYLVy/lI97kC3Jdfdg==",
+ "version": "2.0.14",
+ "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-2.0.14.tgz",
+ "integrity": "sha512-Hbd9tOfxv41jO1VwN9KzKCVgWuUzvZwIhXj848SFi0CzV0E57fiIVAkB/7bQj1EUOGT1qzIRLHhsBAEpxrVaeA==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/api-fetch": "^2.2.4",
- "@wordpress/data": "^4.0.0",
- "@wordpress/url": "^2.3.0",
+ "@wordpress/api-fetch": "^2.2.5",
+ "@wordpress/data": "^4.0.1",
+ "@wordpress/url": "^2.3.1",
"equivalent-key-map": "^0.2.2",
"lodash": "^4.17.10",
"rememo": "^3.0.0"
@@ -417,9 +416,9 @@
}
},
"@wordpress/data": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-4.0.0.tgz",
- "integrity": "sha512-7DlfLBcSdZb8XzpO+1lUXX3DfCnUVoNN/kc/1iGYndWtEaW6EXOBHAUMqno+DeDzriZRdYbJfqRy9cTbQtwhBQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-4.0.1.tgz",
+ "integrity": "sha512-UfuSPjyA4xssOVcgg1wRlngBNGVbMmZGtwoGpAWej/XRpGI26P6Xi+8skPQfLTP2yl+/nMoFd9PTwpE0MwDQ7Q==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/compose": "^3.0.0",
@@ -453,9 +452,9 @@
}
},
"@wordpress/dom": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.0.6.tgz",
- "integrity": "sha512-z1xdNASrkJc+FTdYAEDKub7pqrizAo2WFlkBmqrurwBcY/HoOTTEqg6wzq2SwvEq/rff741BCWD/JmGU7tI3AQ==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.0.7.tgz",
+ "integrity": "sha512-vjOdGSpW3WdHH5oOoamfzdoyF4BbUJOWNNT7bBb2y15GII8rN1cGyGxqVDiiajMDe51p3lyWWCpUeY4ppxj/UA==",
"requires": {
"@babel/runtime": "^7.0.0",
"lodash": "^4.17.10"
@@ -470,29 +469,29 @@
}
},
"@wordpress/edit-post": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.0.2.tgz",
- "integrity": "sha512-bJRjyr+b4rGax/wOr+5u/ez+NbidRDKXDs35GWc8n2O0ElVFJLeNyrz2tbxLlp+uS5tZTw4P7bGtmMSgh87wcw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.0.tgz",
+ "integrity": "sha512-C6jDrN1AbG2xwhsS4O9BFdikLWaV4c36QDHjZxlUBTl8rKtXePlBC2M2j/2zxr2N46nWM0tpQaeOm1Cn6JhwSw==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/a11y": "^2.0.2",
- "@wordpress/api-fetch": "^2.2.4",
- "@wordpress/block-library": "^2.2.4",
- "@wordpress/blocks": "^6.0.0",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/api-fetch": "^2.2.5",
+ "@wordpress/block-library": "^2.2.5",
+ "@wordpress/blocks": "^6.0.1",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/core-data": "^2.0.13",
- "@wordpress/data": "^4.0.0",
- "@wordpress/editor": "^8.0.0",
+ "@wordpress/core-data": "^2.0.14",
+ "@wordpress/data": "^4.0.1",
+ "@wordpress/editor": "^9.0.0",
"@wordpress/element": "^2.1.8",
- "@wordpress/format-library": "^1.2.2",
+ "@wordpress/format-library": "^1.2.3",
"@wordpress/hooks": "^2.0.3",
"@wordpress/i18n": "^3.1.0",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/nux": "^3.0.0",
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/nux": "^3.0.1",
"@wordpress/plugins": "^2.0.9",
- "@wordpress/url": "^2.3.0",
- "@wordpress/viewport": "^2.0.11",
+ "@wordpress/url": "^2.3.1",
+ "@wordpress/viewport": "^2.0.12",
"classnames": "^2.2.5",
"lodash": "^4.17.10",
"refx": "^3.0.0"
@@ -499,33 +498,33 @@
}
},
"@wordpress/editor": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-8.0.0.tgz",
- "integrity": "sha512-948dOGeRyrtZyopzdPVqhmEzbAbCaGtRfuwoywOiMJb/HCXuILEbv2fg9FDjTC0bG2HX4OAdE404Win0TL9Xgg==",
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.0.tgz",
+ "integrity": "sha512-JDUsau7lwPI1DjVitQqmgUORJEEszEMbhQuqXbUGVO6T6uWYj6RtIEGS02CJ4ruu2sb6dtjDsmXK6M+v6T715Q==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/a11y": "^2.0.2",
- "@wordpress/api-fetch": "^2.2.4",
+ "@wordpress/api-fetch": "^2.2.5",
"@wordpress/blob": "^2.1.0",
- "@wordpress/blocks": "^6.0.0",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/blocks": "^6.0.1",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/core-data": "^2.0.13",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/core-data": "^2.0.14",
+ "@wordpress/data": "^4.0.1",
"@wordpress/date": "^3.0.0",
"@wordpress/deprecated": "^2.0.3",
- "@wordpress/dom": "^2.0.6",
+ "@wordpress/dom": "^2.0.7",
"@wordpress/element": "^2.1.8",
"@wordpress/hooks": "^2.0.3",
"@wordpress/html-entities": "^2.0.2",
"@wordpress/i18n": "^3.1.0",
"@wordpress/is-shallow-equal": "^1.1.4",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/notices": "^1.0.5",
- "@wordpress/nux": "^3.0.0",
- "@wordpress/token-list": "^1.0.2",
- "@wordpress/url": "^2.3.0",
- "@wordpress/viewport": "^2.0.11",
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/notices": "^1.1.0",
+ "@wordpress/nux": "^3.0.1",
+ "@wordpress/token-list": "^1.1.0",
+ "@wordpress/url": "^2.3.1",
+ "@wordpress/viewport": "^2.0.12",
"@wordpress/wordcount": "^2.0.3",
"classnames": "^2.2.5",
"dom-scroll-into-view": "^1.2.1",
@@ -597,19 +596,19 @@
}
},
"@wordpress/format-library": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.2.tgz",
- "integrity": "sha512-AvCfqy+eXk9M+usLKdtPafjgDRGLCrke0Jsh1IDB+oTIC1Ung3iGbwXFr9LrcRzjqQ9C5vA4ofGI5fFpUOP7bA==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.3.tgz",
+ "integrity": "sha512-CW+Cvrb9WtA8PfbYRFvlDVJ6y3uEjblJKlkM0+pFZ/JfpkSrTgNFDi8zuQtMvZhXfq/cYB/p5/BvpST3R4LTkw==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/components": "^6.0.2",
- "@wordpress/dom": "^2.0.6",
- "@wordpress/editor": "^8.0.0",
+ "@wordpress/components": "^7.0.0",
+ "@wordpress/dom": "^2.0.7",
+ "@wordpress/editor": "^9.0.0",
"@wordpress/element": "^2.1.8",
"@wordpress/i18n": "^3.1.0",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/rich-text": "^3.0.0",
- "@wordpress/url": "^2.3.0"
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/rich-text": "^3.0.1",
+ "@wordpress/url": "^2.3.1"
}
},
"@wordpress/hooks": {
@@ -657,9 +656,9 @@
}
},
"@wordpress/keycodes": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.0.3.tgz",
- "integrity": "sha512-cg4IHxz9BjRHBIhs/e0NwO/snImNqMQLZfduPf6Y+GGlq28BbQuxnucDj0ktYw/4X9jxf6IHzWUq9bkX65QGiA==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.0.4.tgz",
+ "integrity": "sha512-cRpHxUNzeI/L+A3mVUCITzRhsczkKTotD3hQfkuZTAFBHi97k4bI1gAq8/yX+pCnfKMBfw91eM97vd9+ZYbmEQ==",
"requires": {
"@babel/runtime": "^7.0.0",
"lodash": "^4.17.10"
@@ -677,13 +676,13 @@
}
},
"@wordpress/list-reusable-blocks": {
- "version": "1.1.12",
- "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.12.tgz",
- "integrity": "sha512-12z10twim7R6nxgEfNOZ4MkfobyeORKzTaz3IF5aN0Fz7gq83Y+ppJehMfrZEZ2KvlBp7FEqv3E81h/XKtTGNA==",
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.13.tgz",
+ "integrity": "sha512-83gyxVcyPB0OwqZfgzr+kEdViDVz6nS4aYuNjGF9rh02G5Gnf992FBWFeFLNDJ7sdQHsTrLDSEDkU6B0vbQNWQ==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/api-fetch": "^2.2.4",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/api-fetch": "^2.2.5",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
"@wordpress/element": "^2.1.8",
"@wordpress/i18n": "^3.1.0",
@@ -691,25 +690,25 @@
}
},
"@wordpress/notices": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-1.0.5.tgz",
- "integrity": "sha512-Cg7WIM3Sk2FiNEWGd2lp+dAn8pPWBjNFrh+Q5ouokEDVy4VTIy0NZYwTm/+VNmmJsHZyfKhp29LU8YrW6VsNuw==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-1.1.0.tgz",
+ "integrity": "sha512-dVbHKUq1xo4ecGy1j/cxbnRY1L/by+O4Xu+QBdrX5MPCOEU0TLak8k9PUS+nm13zFAJg4kzZip301Udb/OgoZg==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/a11y": "^2.0.2",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/data": "^4.0.1",
"lodash": "^4.17.10"
}
},
"@wordpress/nux": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0.0.tgz",
- "integrity": "sha512-O2Xn6arvgja4ciNhmE2Vgv5FtrtTXLqc4kU0LCm9okbILyvoEO53mIsU1sDjMklbzdoOimtAXJVIuow7BLLlvA==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0.1.tgz",
+ "integrity": "sha512-z+CkcYzKQVLyqJK8oOoD3Sv6fGLZXOA+MT+ogdvmol3ENsguUSNPYIn/sx3Zayd4+kUGnPfhBXzgkg+mFoTibw==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/data": "^4.0.1",
"@wordpress/element": "^2.1.8",
"@wordpress/i18n": "^3.1.0",
"lodash": "^4.17.10",
@@ -739,12 +738,13 @@
}
},
"@wordpress/rich-text": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-3.0.0.tgz",
- "integrity": "sha512-T+FMlYbItXoMWCVRaQ7lp9fRG7P1gvekze86aK1O+/w2nlTL4Jee4zCCq6BGUtbzOInTQWz0j1R1BHNBxnXi/Q==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-3.0.1.tgz",
+ "integrity": "sha512-MqxoYvg3lMHJpSlPTIQRrZ/GliBf7hE4SdwgKHrxUjiaCPx7bVIEh6YBjiJc5H0IwPfC5ciJ3fYuIftArmwgVg==",
"requires": {
"@babel/runtime": "^7.0.0",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/compose": "^3.0.0",
+ "@wordpress/data": "^4.0.1",
"@wordpress/escape-html": "^1.0.1",
"lodash": "^4.17.10",
"rememo": "^3.0.0"
@@ -761,9 +761,9 @@
}
},
"@wordpress/token-list": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-1.0.2.tgz",
- "integrity": "sha512-hyk3xsLB1OlS52kFlR9PcSzvD6fkB2uOG4Uchs1pd304M/G3WTdD6iPiRVZeMmpWbwMq9KFtu9f8hwUzQTrTow==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-1.1.0.tgz",
+ "integrity": "sha512-1InK0ic0syqUEyY3XkiDiZW9rJB/C/KZEzaOZjyzl/mwDR0npMiAouY3fTQ6qZSsMHjszhSl90yXz1I9M/DapA==",
"requires": {
"@babel/runtime": "^7.0.0",
"lodash": "^4.17.10"
@@ -770,9 +770,9 @@
}
},
"@wordpress/url": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.3.0.tgz",
- "integrity": "sha512-Uzl6RZnPZZHM67Z6Rs4lHgGY7dJO6OHjWrcw5/Pnoy/WQGDAg1vl5lfTbRXSNKsubOsbvB9IF8qTwVoPEl/ezA==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.3.1.tgz",
+ "integrity": "sha512-Z4tCYMsW3DHOLnBXM7MK2kcuX26Pszpxjst8x5hzWmYa6zJRn8MA8Bd5RF++R1NwpWJZGk4m47rj6Q36zkr86g==",
"requires": {
"@babel/runtime": "^7.0.0",
"qs": "^6.5.2"
@@ -779,13 +779,13 @@
}
},
"@wordpress/viewport": {
- "version": "2.0.11",
- "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-2.0.11.tgz",
- "integrity": "sha512-PG6/RM3YhMl/0ZNclZnGUZtfuO1z4sXkaFyfGtzbSmwqBNl0w+cs7DvJkIO4B5qCTufx+2Svvm+X88Vnjn1zSg==",
+ "version": "2.0.12",
+ "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-2.0.12.tgz",
+ "integrity": "sha512-W2M+RIbAlfIn7B8nQtR10SD5lLpLNu2bMXk18h5ToS8BhBwEK9dagjSh1i4nJplzNzZUB/JsaVXDRRCFymuT3A==",
"requires": {
"@babel/runtime": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/data": "^4.0.1",
"@wordpress/element": "^2.1.8",
"lodash": "^4.17.10"
}
@@ -1474,7 +1474,7 @@
},
"util": {
"version": "0.10.3",
- "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
@@ -2450,7 +2450,7 @@
},
"browserify-rsa": {
"version": "4.0.1",
- "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
@@ -2747,7 +2747,7 @@
},
"chalk": {
"version": "1.1.3",
- "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@@ -4542,7 +4542,7 @@
},
"events": {
"version": "1.1.1",
- "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
"dev": true
},
@@ -5815,7 +5815,7 @@
},
"gettext-parser": {
"version": "1.4.0",
- "resolved": "http://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
+ "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
"requires": {
"encoding": "^0.1.12",
@@ -10192,7 +10192,7 @@
},
"onetime": {
"version": "1.1.0",
- "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true
},
@@ -10614,7 +10614,7 @@
"dependencies": {
"async": {
"version": "1.5.2",
- "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
+ "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
}
@@ -11320,9 +11320,9 @@
}
},
"re-resizable": {
- "version": "4.9.3",
- "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-4.9.3.tgz",
- "integrity": "sha512-JKzmZdUAYWs85YErkmZNB7hjGR9qUOHFUZUtEplZlEZBFHRguiWck5J+HFTy/NjlMJtqQsYPQq57nQAO2BuRRg=="
+ "version": "4.10.0",
+ "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-4.10.0.tgz",
+ "integrity": "sha512-g5Q5IswKX7LM+MtYFnuzaQrTEGr/kpserqGV8V6HYkjwbV60XnJv00VlKugLHEwlQ5pgrV08spm0TjyyYVbWmQ=="
},
"react": {
"version": "16.6.3",
@@ -11959,7 +11959,7 @@
},
"regjsgen": {
"version": "0.2.0",
- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+ "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
},
"regjsparser": {
Index: package.json
===================================================================
--- package.json (revision 43910)
+++ package.json (working copy)
@@ -51,41 +51,41 @@
"dependencies": {
"@babel/polyfill": "^7.0.0",
"@wordpress/a11y": "^2.0.2",
- "@wordpress/annotations": "^1.0.1",
- "@wordpress/api-fetch": "^2.2.4",
+ "@wordpress/annotations": "^1.0.2",
+ "@wordpress/api-fetch": "^2.2.5",
"@wordpress/autop": "^2.0.2",
"@wordpress/blob": "^2.1.0",
- "@wordpress/block-library": "^2.2.4",
+ "@wordpress/block-library": "^2.2.5",
"@wordpress/block-serialization-default-parser": "^2.0.0",
- "@wordpress/blocks": "^6.0.0",
- "@wordpress/components": "^6.0.2",
+ "@wordpress/blocks": "^6.0.1",
+ "@wordpress/components": "^7.0.0",
"@wordpress/compose": "^3.0.0",
- "@wordpress/core-data": "^2.0.13",
- "@wordpress/data": "^4.0.0",
+ "@wordpress/core-data": "^2.0.14",
+ "@wordpress/data": "^4.0.1",
"@wordpress/date": "^3.0.0",
"@wordpress/deprecated": "^2.0.3",
- "@wordpress/dom": "^2.0.6",
+ "@wordpress/dom": "^2.0.7",
"@wordpress/dom-ready": "^2.0.2",
- "@wordpress/edit-post": "^3.0.2",
- "@wordpress/editor": "^8.0.0",
+ "@wordpress/edit-post": "^3.1.0",
+ "@wordpress/editor": "^9.0.0",
"@wordpress/element": "^2.1.8",
"@wordpress/escape-html": "^1.0.1",
- "@wordpress/format-library": "^1.2.2",
+ "@wordpress/format-library": "^1.2.3",
"@wordpress/hooks": "^2.0.3",
"@wordpress/html-entities": "^2.0.2",
"@wordpress/i18n": "^3.1.0",
"@wordpress/is-shallow-equal": "^1.1.4",
- "@wordpress/keycodes": "^2.0.3",
- "@wordpress/list-reusable-blocks": "^1.1.12",
- "@wordpress/notices": "^1.0.5",
- "@wordpress/nux": "^3.0.0",
+ "@wordpress/keycodes": "^2.0.4",
+ "@wordpress/list-reusable-blocks": "^1.1.13",
+ "@wordpress/notices": "^1.1.0",
+ "@wordpress/nux": "^3.0.1",
"@wordpress/plugins": "^2.0.9",
"@wordpress/redux-routine": "^3.0.3",
- "@wordpress/rich-text": "^3.0.0",
+ "@wordpress/rich-text": "^3.0.1",
"@wordpress/shortcode": "^2.0.2",
- "@wordpress/token-list": "^1.0.2",
- "@wordpress/url": "^2.3.0",
- "@wordpress/viewport": "^2.0.11",
+ "@wordpress/token-list": "^1.1.0",
+ "@wordpress/url": "^2.3.1",
+ "@wordpress/viewport": "^2.0.12",
"@wordpress/wordcount": "^2.0.3",
"element-closest": "^2.0.2",
"formdata-polyfill": "^3.0.12",
Index: src/wp-admin/edit-form-blocks.php
===================================================================
--- src/wp-admin/edit-form-blocks.php (revision 43910)
+++ src/wp-admin/edit-form-blocks.php (working copy)
@@ -177,6 +177,16 @@
),
),
);
+
+/*
+ * Set a locale specific default font.
+ * Translators: Use this to specify the CSS font family for the default font
+ */
+$locale_font_family = esc_html_x( 'Noto Serif', 'CSS Font Family for Editor Font' );
+$styles[] = array(
+ 'css' => "body { font-family: '$locale_font_family' }",
+);
+
if ( $editor_styles && current_theme_supports( 'editor-styles' ) ) {
foreach ( $editor_styles as $style ) {
if ( preg_match( '~^(https?:)?//~', $style ) ) {
Index: src/wp-includes/blocks/archives.php
===================================================================
--- src/wp-includes/blocks/archives.php (revision 43910)
+++ src/wp-includes/blocks/archives.php (working copy)
@@ -32,7 +32,7 @@
$class .= ' wp-block-archives-dropdown';
$dropdown_id = esc_attr( uniqid( 'wp-block-archives-' ) );
- $title = __( 'Archives', 'gutenberg' );
+ $title = __( 'Archives', 'default' );
/** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
$dropdown_args = apply_filters(
@@ -50,19 +50,19 @@
switch ( $dropdown_args['type'] ) {
case 'yearly':
- $label = __( 'Select Year', 'gutenberg' );
+ $label = __( 'Select Year', 'default' );
break;
case 'monthly':
- $label = __( 'Select Month', 'gutenberg' );
+ $label = __( 'Select Month', 'default' );
break;
case 'daily':
- $label = __( 'Select Day', 'gutenberg' );
+ $label = __( 'Select Day', 'default' );
break;
case 'weekly':
- $label = __( 'Select Week', 'gutenberg' );
+ $label = __( 'Select Week', 'default' );
break;
default:
- $label = __( 'Select Post', 'gutenberg' );
+ $label = __( 'Select Post', 'default' );
break;
}
@@ -101,7 +101,7 @@
$block_content = sprintf(
'%2$s
',
$classnames,
- __( 'No archives to show.', 'gutenberg' )
+ __( 'No archives to show.', 'default' )
);
} else {
Index: src/wp-includes/blocks/categories.php
===================================================================
--- src/wp-includes/blocks/categories.php (revision 43910)
+++ src/wp-includes/blocks/categories.php (working copy)
@@ -27,7 +27,7 @@
if ( ! empty( $attributes['displayAsDropdown'] ) ) {
$id = 'wp-block-categories-' . $block_id;
$args['id'] = $id;
- $args['show_option_none'] = __( 'Select Category', 'gutenberg' );
+ $args['show_option_none'] = __( 'Select Category', 'default' );
$wrapper_markup = '%2$s
';
$items_markup = wp_dropdown_categories( $args );
$type = 'dropdown';
Index: src/wp-includes/blocks/latest-comments.php
===================================================================
--- src/wp-includes/blocks/latest-comments.php (revision 43910)
+++ src/wp-includes/blocks/latest-comments.php (working copy)
@@ -29,7 +29,7 @@
function gutenberg_draft_or_post_title( $post = 0 ) {
$title = get_the_title( $post );
if ( empty( $title ) ) {
- $title = __( '(no title)', 'gutenberg' );
+ $title = __( '(no title)', 'default' );
}
return esc_html( $title );
}
@@ -98,7 +98,7 @@
$list_items_markup .= sprintf(
/* translators: 1: author name (inside or tag, based on if they have a URL), 2: post title related to this comment */
- __( '%1$s on %2$s', 'gutenberg' ),
+ __( '%1$s on %2$s', 'default' ),
$author_markup,
$post_title
);
@@ -143,7 +143,7 @@
) : sprintf(
'%2$s
',
$classnames,
- __( 'No comments to show.', 'gutenberg' )
+ __( 'No comments to show.', 'default' )
);
return $block_content;
Index: src/wp-includes/blocks/latest-posts.php
===================================================================
--- src/wp-includes/blocks/latest-posts.php (revision 43910)
+++ src/wp-includes/blocks/latest-posts.php (working copy)
@@ -30,7 +30,7 @@
$title = get_the_title( $post_id );
if ( ! $title ) {
- $title = __( '(Untitled)', 'gutenberg' );
+ $title = __( '(Untitled)', 'default' );
}
$list_items_markup .= sprintf(
'%2$s',
Index: src/wp-includes/class-wp-block-type.php
===================================================================
--- src/wp-includes/class-wp-block-type.php (revision 43910)
+++ src/wp-includes/class-wp-block-type.php (working copy)
@@ -123,7 +123,7 @@
/**
* Validates attributes against the current block schema, populating
- * defaulted and missing values, and omitting unknown attributes.
+ * defaulted and missing values.
*
* @since 5.0.0
*
@@ -131,30 +131,41 @@
* @return array Prepared block attributes.
*/
public function prepare_attributes_for_render( $attributes ) {
+ // If there are no attribute definitions for the block type, skip
+ // processing and return vebatim.
if ( ! isset( $this->attributes ) ) {
return $attributes;
}
- $prepared_attributes = array();
+ foreach ( $attributes as $attribute_name => $value ) {
+ // If the attribute is not defined by the block type, it cannot be
+ // validated.
+ if ( ! isset( $this->attributes[ $attribute_name ] ) ) {
+ continue;
+ }
- foreach ( $this->attributes as $attribute_name => $schema ) {
- $value = null;
+ $schema = $this->attributes[ $attribute_name ];
- if ( isset( $attributes[ $attribute_name ] ) ) {
- $is_valid = rest_validate_value_from_schema( $attributes[ $attribute_name ], $schema );
- if ( ! is_wp_error( $is_valid ) ) {
- $value = rest_sanitize_value_from_schema( $attributes[ $attribute_name ], $schema );
- }
+ // Validate value by JSON schema. An invalid value should revert to
+ // its default, if one exists. This occurs by virtue of the missing
+ // attributes loop immediately following. If there is not a default
+ // assigned, the attribute value should remain unset.
+ $is_valid = rest_validate_value_from_schema( $value, $schema );
+ if ( is_wp_error( $is_valid ) ) {
+ unset( $attributes[ $attribute_name ] );
}
+ }
- if ( is_null( $value ) && isset( $schema['default'] ) ) {
- $value = $schema['default'];
+ // Populate values of any missing attributes for which the block type
+ // defines a default.
+ $missing_schema_attributes = array_diff_key( $this->attributes, $attributes );
+ foreach ( $missing_schema_attributes as $attribute_name => $schema ) {
+ if ( isset( $schema['default'] ) ) {
+ $attributes[ $attribute_name ] = $schema['default'];
}
-
- $prepared_attributes[ $attribute_name ] = $value;
}
- return $prepared_attributes;
+ return $attributes;
}
/**
Index: src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php
===================================================================
--- src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php (revision 43910)
+++ src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php (working copy)
@@ -61,6 +61,7 @@
'type' => 'object',
'additionalProperties' => false,
'properties' => $block_type->get_attributes(),
+ 'default' => array(),
),
'post_id' => array(
'description' => __( 'ID of the post context.' ),
Index: src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php
===================================================================
--- src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php (revision 43910)
+++ src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php (working copy)
@@ -36,4 +36,57 @@
return parent::check_read_permission( $post );
}
+
+ /**
+ * Filters a response based on the context defined in the schema.
+ *
+ * @since 5.0.0
+ *
+ * @param array $data Response data to fiter.
+ * @param string $context Context defined in the schema.
+ * @return array Filtered response.
+ */
+ public function filter_response_by_context( $data, $context ) {
+ $data = parent::filter_response_by_context( $data, $context );
+
+ /*
+ * Remove `title.rendered` and `content.rendered` from the response. It
+ * doesn't make sense for a reusable block to have rendered content on its
+ * own, since rendering a block requires it to be inside a post or a page.
+ */
+ unset( $data['title']['rendered'] );
+ unset( $data['content']['rendered'] );
+
+ return $data;
+ }
+
+ /**
+ * Retrieves the block's schema, conforming to JSON Schema.
+ *
+ * @since 5.0.0
+ *
+ * @return array Item schema data.
+ */
+ public function get_item_schema() {
+ $schema = parent::get_item_schema();
+
+ /*
+ * Allow all contexts to access `title.raw` and `content.raw`. Clients always
+ * need the raw markup of a reusable block to do anything useful, e.g. parse
+ * it or display it in an editor.
+ */
+ $schema['properties']['title']['properties']['raw']['context'] = array( 'view', 'edit' );
+ $schema['properties']['content']['properties']['raw']['context'] = array( 'view', 'edit' );
+
+ /*
+ * Remove `title.rendered` and `content.rendered` from the schema. It doesn’t
+ * make sense for a reusable block to have rendered content on its own, since
+ * rendering a block requires it to be inside a post or a page.
+ */
+ unset( $schema['properties']['title']['properties']['rendered'] );
+ unset( $schema['properties']['content']['properties']['rendered'] );
+
+ return $schema;
+ }
+
}
Index: src/wp-includes/script-loader.php
===================================================================
--- src/wp-includes/script-loader.php (revision 43910)
+++ src/wp-includes/script-loader.php (working copy)
@@ -74,6 +74,8 @@
* @param WP_Scripts $scripts WP_Scripts object.
*/
function wp_default_packages_vendor( &$scripts ) {
+ global $wp_locale;
+
$dev_suffix = wp_scripts_get_suffix( 'dev' );
$vendor_scripts = array(
@@ -100,9 +102,8 @@
}
$scripts->add( 'wp-polyfill', null, array( 'wp-polyfill' ) );
- did_action( 'init' ) && $scripts->add_data(
+ did_action( 'init' ) && $scripts->add_inline_script(
'wp-polyfill',
- 'data',
wp_get_script_polyfill(
$scripts,
array(
@@ -110,11 +111,40 @@
'document.contains' => 'wp-polyfill-node-contains',
'window.FormData && window.FormData.prototype.keys' => 'wp-polyfill-formdata',
'Element.prototype.matches && Element.prototype.closest' => 'wp-polyfill-element-closest',
- )
+ ),
+ 'after'
)
);
did_action( 'init' ) && $scripts->add_inline_script( 'lodash', 'window.lodash = _.noConflict();' );
+
+ did_action( 'init' ) && $scripts->add_inline_script(
+ 'moment',
+ sprintf(
+ "moment.locale( '%s', %s );",
+ get_user_locale(),
+ wp_json_encode(
+ array(
+ 'months' => array_values( $wp_locale->month ),
+ 'monthsShort' => array_values( $wp_locale->month_abbrev ),
+ 'weekdays' => array_values( $wp_locale->weekday ),
+ 'weekdaysShort' => array_values( $wp_locale->weekday_abbrev ),
+ 'week' => array(
+ 'dow' => (int) get_option( 'start_of_week', 0 ),
+ ),
+ 'longDateFormat' => array(
+ 'LT' => get_option( 'time_format', __( 'g:i a', 'default' ) ),
+ 'LTS' => null,
+ 'L' => null,
+ 'LL' => get_option( 'date_format', __( 'F j, Y', 'default' ) ),
+ 'LLL' => __( 'F j, Y g:i a', 'default' ),
+ 'LLLL' => null,
+ ),
+ )
+ )
+ ),
+ 'after'
+ );
}
/**
@@ -221,7 +251,6 @@
'wp-a11y',
'wp-api-fetch',
'wp-compose',
- 'wp-deprecated',
'wp-dom',
'wp-element',
'wp-hooks',
@@ -272,6 +301,7 @@
'wp-embed',
'wp-i18n',
'wp-keycodes',
+ 'wp-notices',
'wp-nux',
'wp-plugins',
'wp-polyfill',
@@ -344,6 +374,7 @@
),
'nux' => array(
'wp-element',
+ 'lodash',
'wp-components',
'wp-compose',
'wp-data',
@@ -355,7 +386,6 @@
'redux-routine' => array( 'wp-polyfill' ),
'rich-text' => array(
'lodash',
- 'wp-blocks',
'wp-data',
'wp-escape-html',
'wp-polyfill',
@@ -533,7 +563,7 @@
'wp_more',
'spellchecker',
'wp_add_media',
- 'wp_adv',
+ 'wp_adv', // FIXME found as 'kitchensink' in Gutenberg
);
/* This filter is documented in wp-includes/class-wp-editor.php */
@@ -1667,11 +1697,16 @@
$fonts_url = '';
/*
- * Translators: If there are characters in your language that are not supported
- * by Noto Serif, translate this to 'off'. Do not translate into your own language.
+ * Translators: Use this to specify the proper Google Font name and variants
+ * to load that is supported by your language. Do not translate.
+ * Set to 'off' to disable loading.
*/
- if ( 'off' !== _x( 'on', 'Noto Serif font: on or off' ) ) {
- $fonts_url = 'https://fonts.googleapis.com/css?family=Noto+Serif%3A400%2C400i%2C700%2C700i';
+ $font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
+ if ( 'off' !== $font_family ) {
+ $query_args = array(
+ 'family' => urlencode( $font_family ),
+ );
+ $fonts_url = esc_url_raw( add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ) );
}
$styles->add( 'wp-editor-font', $fonts_url );
Index: tests/phpunit/tests/blocks/block-type.php
===================================================================
--- tests/phpunit/tests/blocks/block-type.php (revision 43910)
+++ tests/phpunit/tests/blocks/block-type.php (working copy)
@@ -168,7 +168,8 @@
'wrongType' => 5,
'wrongTypeDefaulted' => 5,
/* missingDefaulted */
- 'undefined' => 'omit',
+ 'undefined' => 'include',
+ 'intendedNull' => null,
);
$block_type = new WP_Block_Type(
@@ -189,6 +190,10 @@
'type' => 'string',
'default' => 'define',
),
+ 'intendedNull' => array(
+ 'type' => array( 'string', 'null' ),
+ 'default' => 'wrong',
+ ),
),
)
);
@@ -198,9 +203,11 @@
$this->assertEquals(
array(
'correct' => 'include',
- 'wrongType' => null,
+ /* wrongType */
'wrongTypeDefaulted' => 'defaulted',
'missingDefaulted' => 'define',
+ 'undefined' => 'include',
+ 'intendedNull' => null,
),
$prepared_attributes
);
@@ -207,6 +214,19 @@
}
/**
+ * @ticket 45145
+ */
+ function test_prepare_attributes_none_defined() {
+ $attributes = array( 'exists' => 'keep' );
+
+ $block_type = new WP_Block_Type( 'core/dummy', array() );
+
+ $prepared_attributes = $block_type->prepare_attributes_for_render( $attributes );
+
+ $this->assertEquals( $attributes, $prepared_attributes );
+ }
+
+ /**
* @ticket 45097
*/
public function test_has_block_with_mixed_content() {
Index: tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
===================================================================
--- tests/phpunit/tests/rest-api/rest-block-renderer-controller.php (revision 43910)
+++ tests/phpunit/tests/rest-api/rest-block-renderer-controller.php (working copy)
@@ -319,7 +319,9 @@
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( self::$block_name );
$defaults = array();
foreach ( $block_type->attributes as $key => $attribute ) {
- $defaults[ $key ] = isset( $attribute['default'] ) ? $attribute['default'] : null;
+ if ( isset( $attribute['default'] ) ) {
+ $defaults[ $key ] = $attribute['default'];
+ }
}
$request = new WP_REST_Request( 'GET', self::$rest_api_route . self::$block_name );
Index: tests/phpunit/tests/rest-api/rest-blocks-controller.php
===================================================================
--- tests/phpunit/tests/rest-api/rest-blocks-controller.php (revision 43910)
+++ tests/phpunit/tests/rest-api/rest-blocks-controller.php (working copy)
@@ -29,13 +29,13 @@
protected static $post_id;
/**
- * Our fake user's ID.
+ * Our fake user IDs, keyed by their role.
*
* @since 5.0.0
*
- * @var int
+ * @var array
*/
- protected static $user_id;
+ protected static $user_ids;
/**
* Create fake data before our tests run.
@@ -50,14 +50,14 @@
'post_type' => 'wp_block',
'post_status' => 'publish',
'post_title' => 'My cool block',
- 'post_content' => 'Hello!
',
+ 'post_content' => 'Hello!
',
)
);
- self::$user_id = $factory->user->create(
- array(
- 'role' => 'editor',
- )
+ self::$user_ids = array(
+ 'editor' => $factory->user->create( array( 'role' => 'editor' ) ),
+ 'author' => $factory->user->create( array( 'role' => 'author' ) ),
+ 'contributor' => $factory->user->create( array( 'role' => 'contributor' ) ),
);
}
@@ -69,7 +69,9 @@
public static function wpTearDownAfterClass() {
wp_delete_post( self::$post_id );
- self::delete_user( self::$user_id );
+ foreach ( self::$user_ids as $user_id ) {
+ self::delete_user( $user_id );
+ }
}
/**
@@ -114,7 +116,7 @@
*/
public function test_capabilities( $action, $role, $expected_status ) {
if ( $role ) {
- $user_id = $this->factory->user->create( array( 'role' => $role ) );
+ $user_id = self::$user_ids[ $role ];
wp_set_current_user( $user_id );
} else {
wp_set_current_user( 0 );
@@ -126,7 +128,7 @@
$request->set_body_params(
array(
'title' => 'Test',
- 'content' => 'Test
',
+ 'content' => 'Test
',
)
);
@@ -149,7 +151,7 @@
'post_type' => 'wp_block',
'post_status' => 'publish',
'post_title' => 'My cool block',
- 'post_content' => 'Hello!
',
+ 'post_content' => 'Hello!
',
'post_author' => $user_id,
)
);
@@ -158,7 +160,7 @@
$request->set_body_params(
array(
'title' => 'Test',
- 'content' => 'Test
',
+ 'content' => 'Test
',
)
);
@@ -179,7 +181,7 @@
$request->set_body_params(
array(
'title' => 'Test',
- 'content' => 'Test
',
+ 'content' => 'Test
',
)
);
@@ -196,9 +198,32 @@
default:
$this->fail( "'$action' is not a valid action." );
}
+ }
- if ( isset( $user_id ) ) {
- self::delete_user( $user_id );
- }
+ /**
+ * Check that the raw title and content of a block can be accessed when there
+ * is no set schema, and that the rendered content of a block is not included
+ * in the response.
+ */
+ public function test_content() {
+ wp_set_current_user( self::$user_ids['author'] );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/blocks/' . self::$post_id );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertEquals(
+ array(
+ 'raw' => 'My cool block',
+ ),
+ $data['title']
+ );
+ $this->assertEquals(
+ array(
+ 'raw' => 'Hello!
',
+ 'protected' => false,
+ ),
+ $data['content']
+ );
}
}
Index: tests/qunit/fixtures/wp-api-generated.js
===================================================================
--- tests/qunit/fixtures/wp-api-generated.js (revision 43910)
+++ tests/qunit/fixtures/wp-api-generated.js (working copy)
@@ -4314,6 +4314,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/block block",
"type": "object"
},
@@ -4353,6 +4354,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/latest-comments block",
"type": "object"
},
@@ -4392,6 +4394,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/archives block",
"type": "object"
},
@@ -4431,6 +4434,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/categories block",
"type": "object"
},
@@ -4470,6 +4474,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/latest-posts block",
"type": "object"
},
@@ -4509,6 +4514,7 @@
},
"attributes": {
"required": false,
+ "default": [],
"description": "Attributes for core/shortcode block",
"type": "object"
},
Index: tools/webpack/packages.js
===================================================================
--- tools/webpack/packages.js (revision 43910)
+++ tools/webpack/packages.js (working copy)
@@ -225,6 +225,7 @@
'deprecated',
'dom-ready',
'redux-routine',
+ 'token-list',
].map( camelCaseDash ) ),
new CustomTemplatedPathPlugin( {
basename( path, data ) {