WordPress.org

Make WordPress Core

Changeset 52364


Ignore:
Timestamp:
12/14/2021 01:55:28 AM (5 weeks ago)
Author:
noisysocks
Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

  • Image block: Set image display to grid when no alignment sent to properly align caption on resize
  • Update and align template descriptions
  • Site Editor - prevent loading state from showing the admin menu.
  • Add client side routing for Site Editor
  • Navigation: Add clearance for appender in submenus.
  • Fix CSS Custom Properties for presets in the site editor
  • Add/navigation blocks post processing after migration from menu items
  • Allow selector ordering to ensure theme.json root selector margin takes precedence
  • Do not remove theme presets if defaults are hidden
  • Format library: fix unsetting highlight color
  • FSE: Fix template resolution to give precedence to child theme PHP templates over parent theme block templates with equal specificity
  • ColorPalette: Improving accessibility and visibility
  • Update: Make the color popover on the gradient picker appear as expected
  • Site Editor: Display a notice if export fails
  • Fix docs and function naming for gallery block registration in PHP
  • Switch to addEventListener for load event in the navigation block view script
  • Fix mistake in _remove_theme_attribute_in_block_template_content
  • Better synchronisation between Gutenberg and Core code
  • Move the block page templates hook into compat/5.9 folder
  • Moves to the template loader hooks and functions into lib/compat folder
  • Refactor the gutenberg_is_fse_theme function to use wp_is_block_theme
  • Site Editor: Update support doc URL in Welcome Guide
  • Global Styles: Add Welcome Guide toggle
  • Hide remove control point when removing would break gradient control
  • Don't request the deprecated navigation areas endpoint outside of the Gutenberg plugin
  • Image: Fix resizer controls being hidden in Safari when switching between alignments
  • Remove Navigation Menus from WP Admin sidebar
  • Site Editor: Hide the block appender in the Template Part editor
  • Site Editor: Use server definition for the Template Areas
  • Synchronize wp_is_block_theme and block-templates block support with Core
  • E2E: Retry login again after a bad nonce request to prevent intermittent test failures
  • Fix theme requirement validation with WP 5.8
  • Fix WP 5.9 check for conditionally running code
  • Fix post comment form input width
  • Border Style Control: Update styling for consistency with border width control
  • Fix form-submit styles by adding button classes to the submit-button in post-comments block
  • Site Editor: Fix edit template part link in header dropdown
  • Move duotone palette to the bottom of global styles gradients
  • Fix how appearanceTools works
  • Move WP 5.9 wp-admin menus compatibility code to lib/compat folder
  • Revert "Site Editor: Set the <title> on the list page to be same as the CPT name"
  • Site Editor: Document Actions: add SR text to heading 1
  • Do not register global styles CPT in WordPress 5.9
  • Global Styles: Move the 'Edit colors' button to a standard menu item
  • Fix styles for previews and patterns
  • Site Editor: Fix failing E2E test
  • Templates: Search for old template names in the parent theme too
  • Remove 4 instances of 'gutenberg' text domain from WordPress core
  • Fix content loss when ungrouping template parts or reusable blocks
  • Simplify the RESET_BLOCK action to fix template part focus mode content loss
  • [Global Styles]: Make Blocks section more distinguishable
  • Only use block markup for comment form button when using a block theme
  • Navigation: Fix vertical alignment of page list in modal.
  • Fix: ToggleGroupControl active state
  • Remove gutenberg_ prefix from @wordpress/block-library

Props ocean90, oandregal, hellofromtonya, youknowriad.
See #54487.

Location:
trunk
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/package-lock.json

    r52324 r52364  
    13851385        },
    13861386        "@emotion/babel-plugin": {
    1387             "version": "11.3.0",
    1388             "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz",
    1389             "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==",
     1387            "version": "11.7.1",
     1388            "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.1.tgz",
     1389            "integrity": "sha512-K3/6Y+J/sIAjplf3uIteWLhPuOyuMNnE+iyYnTF/m294vc6IL90kTHp7y8ldZYbpKlP17rpOWDKM9DvTcrOmNQ==",
    13901390            "requires": {
    13911391                "@babel/helper-module-imports": "^7.12.13",
     
    14001400                "find-root": "^1.1.0",
    14011401                "source-map": "^0.5.7",
    1402                 "stylis": "^4.0.3"
     1402                "stylis": "4.0.13"
    14031403            },
    14041404            "dependencies": {
     
    14111411        },
    14121412        "@emotion/cache": {
    1413             "version": "11.6.0",
    1414             "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.6.0.tgz",
    1415             "integrity": "sha512-ElbsWY1KMwEowkv42vGo0UPuLgtPYfIs9BxxVrmvsaJVvktknsHYYlx5NQ5g6zLDcOTyamlDc7FkRg2TAcQDKQ==",
     1413            "version": "11.7.1",
     1414            "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz",
     1415            "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==",
    14161416            "requires": {
    14171417                "@emotion/memoize": "^0.7.4",
     
    14191419                "@emotion/utils": "^1.0.0",
    14201420                "@emotion/weak-memoize": "^0.2.5",
    1421                 "stylis": "^4.0.10"
     1421                "stylis": "4.0.13"
    14221422            }
    14231423        },
    14241424        "@emotion/css": {
    1425             "version": "11.5.0",
    1426             "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.5.0.tgz",
    1427             "integrity": "sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==",
    1428             "requires": {
    1429                 "@emotion/babel-plugin": "^11.0.0",
    1430                 "@emotion/cache": "^11.5.0",
     1425            "version": "11.7.1",
     1426            "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz",
     1427            "integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==",
     1428            "requires": {
     1429                "@emotion/babel-plugin": "^11.7.1",
     1430                "@emotion/cache": "^11.7.1",
    14311431                "@emotion/serialize": "^1.0.0",
    14321432                "@emotion/sheet": "^1.0.3",
     
    14531453        },
    14541454        "@emotion/react": {
    1455             "version": "11.7.0",
    1456             "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.0.tgz",
    1457             "integrity": "sha512-WL93hf9+/2s3cA1JVJlz8+Uy6p6QWukqQFOm2OZO5ki51hfucHMOmbSjiyC3t2Y4RI8XUmBoepoc/24ny/VBbA==",
     1455            "version": "11.7.1",
     1456            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz",
     1457            "integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==",
    14581458            "requires": {
    14591459                "@babel/runtime": "^7.13.10",
    1460                 "@emotion/cache": "^11.6.0",
     1460                "@emotion/cache": "^11.7.1",
    14611461                "@emotion/serialize": "^1.0.2",
    14621462                "@emotion/sheet": "^1.1.0",
     
    35303530        },
    35313531        "@wordpress/block-directory": {
    3532             "version": "3.0.14",
    3533             "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.14.tgz",
    3534             "integrity": "sha512-c9fSb3JHosUJb8HdatmvZg8iI9AtYfVwyaARt/5LT0xVtsOlNP6+WeaJa2ikpkdxpIt+sUG28YAgOWuCnLkALA==",
     3532            "version": "3.0.17",
     3533            "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.0.17.tgz",
     3534            "integrity": "sha512-OpD5qBIO8Nac1BJG2GGb3o5I7hfGpTAEG2LI3cIAq4JgTZI0hJwLTak+ENvb8K3EBgCH4QYXqS6ZaZQaG2VQzw==",
    35353535            "requires": {
    35363536                "@babel/runtime": "^7.16.0",
    35373537                "@wordpress/a11y": "^3.2.4",
    35383538                "@wordpress/api-fetch": "^5.2.6",
    3539                 "@wordpress/block-editor": "^8.0.8",
     3539                "@wordpress/block-editor": "^8.0.11",
    35403540                "@wordpress/blocks": "^11.1.4",
    3541                 "@wordpress/components": "^19.1.2",
     3541                "@wordpress/components": "^19.1.5",
    35423542                "@wordpress/compose": "^5.0.6",
    35433543                "@wordpress/core-data": "^4.0.8",
    35443544                "@wordpress/data": "^6.1.4",
    3545                 "@wordpress/edit-post": "^5.0.14",
    3546                 "@wordpress/editor": "^12.0.11",
     3545                "@wordpress/edit-post": "^5.0.17",
     3546                "@wordpress/editor": "^12.0.14",
    35473547                "@wordpress/element": "^4.0.4",
    35483548                "@wordpress/hooks": "^3.2.2",
     
    35573557        },
    35583558        "@wordpress/block-editor": {
    3559             "version": "8.0.8",
    3560             "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.8.tgz",
    3561             "integrity": "sha512-3KFD0gQZ6gvP98b3mvDYtZS/APaxWfw02L8/ur23i79HpKfNYheT+3HMrUf/MUxmsJX++BgWWU86r5kqH0Ug0A==",
     3559            "version": "8.0.11",
     3560            "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.11.tgz",
     3561            "integrity": "sha512-U70TL7m/TQNGw6gKMe+gzAh3bzziCW5JcFrF8hv42c4uZk1BL8P4WGHpP5WNvr5Ae529VpN+rSaDmqE7pY4IyQ==",
    35623562            "requires": {
    35633563                "@babel/runtime": "^7.16.0",
     
    35683568                "@wordpress/block-serialization-default-parser": "^4.2.3",
    35693569                "@wordpress/blocks": "^11.1.4",
    3570                 "@wordpress/components": "^19.1.2",
     3570                "@wordpress/components": "^19.1.5",
    35713571                "@wordpress/compose": "^5.0.6",
    35723572                "@wordpress/data": "^6.1.4",
     
    36043604        },
    36053605        "@wordpress/block-library": {
    3606             "version": "6.0.12",
    3607             "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.12.tgz",
    3608             "integrity": "sha512-Mdlspqpezzq0WSmBd2jTlUXb2/Y4CC+AFyOzY5X47ErWbwZPZnwZtqOmeAjrVwfdQpkqAyMJWjMdj7C71qoRTQ==",
     3606            "version": "6.0.15",
     3607            "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.15.tgz",
     3608            "integrity": "sha512-jE2k9YPOE/AfDJHM0cCInQYY8/OA3xwnbCZb0aazTCfm2UlJYzSc8BluPydX8Pyv4915cLAZ614RueViou6P0g==",
    36093609            "requires": {
    36103610                "@babel/runtime": "^7.16.0",
     
    36133613                "@wordpress/autop": "^3.2.3",
    36143614                "@wordpress/blob": "^3.2.2",
    3615                 "@wordpress/block-editor": "^8.0.8",
     3615                "@wordpress/block-editor": "^8.0.11",
    36163616                "@wordpress/blocks": "^11.1.4",
    3617                 "@wordpress/components": "^19.1.2",
     3617                "@wordpress/components": "^19.1.5",
    36183618                "@wordpress/compose": "^5.0.6",
    36193619                "@wordpress/core-data": "^4.0.8",
     
    36283628                "@wordpress/i18n": "^4.2.4",
    36293629                "@wordpress/icons": "^6.1.1",
    3630                 "@wordpress/interface": "^4.1.10",
     3630                "@wordpress/interface": "^4.1.13",
    36313631                "@wordpress/is-shallow-equal": "^4.2.1",
    36323632                "@wordpress/keycodes": "^3.2.4",
    36333633                "@wordpress/notices": "^3.2.7",
    36343634                "@wordpress/primitives": "^3.0.4",
    3635                 "@wordpress/reusable-blocks": "^3.0.14",
     3635                "@wordpress/reusable-blocks": "^3.0.17",
    36363636                "@wordpress/rich-text": "^5.0.6",
    3637                 "@wordpress/server-side-render": "^3.0.12",
     3637                "@wordpress/server-side-render": "^3.0.15",
    36383638                "@wordpress/url": "^3.3.1",
    36393639                "@wordpress/viewport": "^4.0.6",
     
    36903690        },
    36913691        "@wordpress/components": {
    3692             "version": "19.1.2",
    3693             "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.2.tgz",
    3694             "integrity": "sha512-Qdj8l+/3wwkwxP1/pG3369/2xhKz07lpDXlNyAOMEctA8o8YhVLKvHhAiOKMNL/TQkPz9hWai9MEK/5aPsXffg==",
     3692            "version": "19.1.5",
     3693            "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.5.tgz",
     3694            "integrity": "sha512-dZLrGhhjYWhxbDc72kSjgsWUkTksXa5XhCF4hAXXA9zCVMTUksOWFTIozsgQhUDQpHuq1JKWnDvzVo/Gzo24zQ==",
    36953695            "requires": {
    36963696                "@babel/runtime": "^7.16.0",
     
    37863786        },
    37873787        "@wordpress/customize-widgets": {
    3788             "version": "2.0.14",
    3789             "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.14.tgz",
    3790             "integrity": "sha512-QGHulwm/osqTMnVIcGjCz+hHTNNb1VSucr1zp/pr294H9StOIENer20dr7WSFiUavTRtXdcAWxpbiJkcaeEwYw==",
     3788            "version": "2.0.17",
     3789            "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.17.tgz",
     3790            "integrity": "sha512-d0piCMwzS6ShBk72RLn6npVGY0XoNcdk1B8Z8h7X2bOQPNZ5UDQw6jMQurQIIbxnsMR9VeluTP5qBVrhc3kqNQ==",
    37913791            "requires": {
    37923792                "@babel/runtime": "^7.16.0",
    37933793                "@wordpress/a11y": "^3.2.4",
    3794                 "@wordpress/block-editor": "^8.0.8",
    3795                 "@wordpress/block-library": "^6.0.12",
     3794                "@wordpress/block-editor": "^8.0.11",
     3795                "@wordpress/block-library": "^6.0.15",
    37963796                "@wordpress/blocks": "^11.1.4",
    3797                 "@wordpress/components": "^19.1.2",
     3797                "@wordpress/components": "^19.1.5",
    37983798                "@wordpress/compose": "^5.0.6",
    37993799                "@wordpress/core-data": "^4.0.8",
     
    38043804                "@wordpress/i18n": "^4.2.4",
    38053805                "@wordpress/icons": "^6.1.1",
    3806                 "@wordpress/interface": "^4.1.10",
     3806                "@wordpress/interface": "^4.1.13",
    38073807                "@wordpress/is-shallow-equal": "^4.2.1",
    38083808                "@wordpress/keyboard-shortcuts": "^3.0.6",
    38093809                "@wordpress/keycodes": "^3.2.4",
    38103810                "@wordpress/media-utils": "^3.0.5",
    3811                 "@wordpress/widgets": "^2.0.14",
     3811                "@wordpress/widgets": "^2.0.17",
    38123812                "classnames": "^2.3.1",
    38133813                "lodash": "^4.17.21"
     
    39103910        },
    39113911        "@wordpress/e2e-test-utils": {
    3912             "version": "5.4.9",
    3913             "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.9.tgz",
    3914             "integrity": "sha512-L0ReQGU8N9soIUoomVEILR7/PX0BrlBMltH9yjFuNxUweqZxoKd5vhNEDQfN2BZM24Zrnm9P/XQmdNwr9r/vPw==",
     3912            "version": "5.4.10",
     3913            "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.10.tgz",
     3914            "integrity": "sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==",
    39153915            "dev": true,
    39163916            "requires": {
     
    39383938        },
    39393939        "@wordpress/edit-post": {
    3940             "version": "5.0.14",
    3941             "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.14.tgz",
    3942             "integrity": "sha512-5groMRI4CT6I6TcZeG2T5GC5j4Uj1dNlk69DF4q+eLJf6bs3EO3A2gIfzr2fuMTsfOO9pyrk+Y3yjEG8fDg3AA==",
     3940            "version": "5.0.17",
     3941            "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.17.tgz",
     3942            "integrity": "sha512-nqRMXTWlutu8OQnqLpp052PqZoBvTjv59hT28QvFagOngGb5/iirqaauCe7iLEZDyIQW95k7K3goxGPhdqzDTA==",
    39433943            "requires": {
    39443944                "@babel/runtime": "^7.16.0",
    39453945                "@wordpress/a11y": "^3.2.4",
    39463946                "@wordpress/api-fetch": "^5.2.6",
    3947                 "@wordpress/block-editor": "^8.0.8",
    3948                 "@wordpress/block-library": "^6.0.12",
     3947                "@wordpress/block-editor": "^8.0.11",
     3948                "@wordpress/block-library": "^6.0.15",
    39493949                "@wordpress/blocks": "^11.1.4",
    3950                 "@wordpress/components": "^19.1.2",
     3950                "@wordpress/components": "^19.1.5",
    39513951                "@wordpress/compose": "^5.0.6",
    39523952                "@wordpress/core-data": "^4.0.8",
    39533953                "@wordpress/data": "^6.1.4",
    39543954                "@wordpress/data-controls": "^2.2.7",
    3955                 "@wordpress/editor": "^12.0.11",
     3955                "@wordpress/editor": "^12.0.14",
    39563956                "@wordpress/element": "^4.0.4",
    39573957                "@wordpress/hooks": "^3.2.2",
    39583958                "@wordpress/i18n": "^4.2.4",
    39593959                "@wordpress/icons": "^6.1.1",
    3960                 "@wordpress/interface": "^4.1.10",
     3960                "@wordpress/interface": "^4.1.13",
    39613961                "@wordpress/keyboard-shortcuts": "^3.0.6",
    39623962                "@wordpress/keycodes": "^3.2.4",
     
    39833983        },
    39843984        "@wordpress/edit-site": {
    3985             "version": "3.0.14",
    3986             "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.14.tgz",
    3987             "integrity": "sha512-mG3D1rad/HK87HqxvnZE7wiQl9ZC2fqrxiUwfQgyOU9F+2T3s6DCKMquJhDrs0TPCmZMj+y4H/cHN46Yw8hhbw==",
     3985            "version": "3.0.17",
     3986            "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.17.tgz",
     3987            "integrity": "sha512-CC3JB4L7Dg33kxSkxpBqsqksn30GiFH5x1dcLMt9BYTAGDGwlmShCQJhZI6ifSD9/F+CA1JviG4fB9UATmgMow==",
    39883988            "requires": {
    39893989                "@babel/runtime": "^7.16.0",
    39903990                "@wordpress/a11y": "^3.2.4",
    39913991                "@wordpress/api-fetch": "^5.2.6",
    3992                 "@wordpress/block-editor": "^8.0.8",
    3993                 "@wordpress/block-library": "^6.0.12",
     3992                "@wordpress/block-editor": "^8.0.11",
     3993                "@wordpress/block-library": "^6.0.15",
    39943994                "@wordpress/blocks": "^11.1.4",
    3995                 "@wordpress/components": "^19.1.2",
     3995                "@wordpress/components": "^19.1.5",
    39963996                "@wordpress/compose": "^5.0.6",
    39973997                "@wordpress/core-data": "^4.0.8",
    39983998                "@wordpress/data": "^6.1.4",
    39993999                "@wordpress/data-controls": "^2.2.7",
    4000                 "@wordpress/editor": "^12.0.11",
     4000                "@wordpress/editor": "^12.0.14",
    40014001                "@wordpress/element": "^4.0.4",
    40024002                "@wordpress/hooks": "^3.2.2",
     
    40044004                "@wordpress/i18n": "^4.2.4",
    40054005                "@wordpress/icons": "^6.1.1",
    4006                 "@wordpress/interface": "^4.1.10",
     4006                "@wordpress/interface": "^4.1.13",
    40074007                "@wordpress/keyboard-shortcuts": "^3.0.6",
    40084008                "@wordpress/keycodes": "^3.2.4",
     
    40114011                "@wordpress/plugins": "^4.0.6",
    40124012                "@wordpress/primitives": "^3.0.4",
    4013                 "@wordpress/reusable-blocks": "^3.0.14",
     4013                "@wordpress/reusable-blocks": "^3.0.17",
    40144014                "@wordpress/url": "^3.3.1",
    40154015                "@wordpress/viewport": "^4.0.6",
     
    40174017                "downloadjs": "^1.4.7",
    40184018                "file-saver": "^2.0.2",
     4019                "history": "^5.1.0",
    40194020                "jszip": "^3.2.2",
    40204021                "lodash": "^4.17.21",
     
    40234024        },
    40244025        "@wordpress/edit-widgets": {
    4025             "version": "3.1.9",
    4026             "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.9.tgz",
    4027             "integrity": "sha512-ivcnkftK+0N6lZjtcIbj2onsfvmt7/oo6e5Uh+ZcYXQGoX9t+02zFik23gOgqPqbb7XkbkQGf1sHWs5eaFFo5g==",
     4026            "version": "3.1.12",
     4027            "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.12.tgz",
     4028            "integrity": "sha512-u/610TaZbZgE6ArZPBqRvkzCbEJFgtlCrzCEnBIHE93oeytmzUyNo/+vyzj3NvJG40WQIrjWJbmBfuU1Ze+m3w==",
    40284029            "requires": {
    40294030                "@babel/runtime": "^7.16.0",
    40304031                "@wordpress/a11y": "^3.2.4",
    40314032                "@wordpress/api-fetch": "^5.2.6",
    4032                 "@wordpress/block-editor": "^8.0.8",
    4033                 "@wordpress/block-library": "^6.0.12",
     4033                "@wordpress/block-editor": "^8.0.11",
     4034                "@wordpress/block-library": "^6.0.15",
    40344035                "@wordpress/blocks": "^11.1.4",
    4035                 "@wordpress/components": "^19.1.2",
     4036                "@wordpress/components": "^19.1.5",
    40364037                "@wordpress/compose": "^5.0.6",
    40374038                "@wordpress/core-data": "^4.0.8",
     
    40424043                "@wordpress/i18n": "^4.2.4",
    40434044                "@wordpress/icons": "^6.1.1",
    4044                 "@wordpress/interface": "^4.1.10",
     4045                "@wordpress/interface": "^4.1.13",
    40454046                "@wordpress/keyboard-shortcuts": "^3.0.6",
    40464047                "@wordpress/keycodes": "^3.2.4",
     
    40484049                "@wordpress/notices": "^3.2.7",
    40494050                "@wordpress/plugins": "^4.0.6",
    4050                 "@wordpress/reusable-blocks": "^3.0.14",
    4051                 "@wordpress/server-side-render": "^3.0.12",
     4051                "@wordpress/reusable-blocks": "^3.0.17",
     4052                "@wordpress/server-side-render": "^3.0.15",
    40524053                "@wordpress/url": "^3.3.1",
    4053                 "@wordpress/widgets": "^2.0.14",
     4054                "@wordpress/widgets": "^2.0.17",
    40544055                "classnames": "^2.3.1",
    40554056                "lodash": "^4.17.21",
     
    40594060        },
    40604061        "@wordpress/editor": {
    4061             "version": "12.0.11",
    4062             "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.11.tgz",
    4063             "integrity": "sha512-qZ2WJ7JiycKtkPuSUoRApOVECZC5XuseRhfDl3dUwlaRl0jND83B/kj3NoHfZPNB09621j+bwBT39qH78e953g==",
     4062            "version": "12.0.14",
     4063            "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.14.tgz",
     4064            "integrity": "sha512-CO4I5g4Qve5HOeXcHaQT1sOjZ/VJ5C4K49IIzrgl/P5IEkkw5kwIq94Ori8CtPQZQllzSBWJGpO3QoKhQoVSsg==",
    40644065            "requires": {
    40654066                "@babel/runtime": "^7.16.0",
     
    40684069                "@wordpress/autop": "^3.2.3",
    40694070                "@wordpress/blob": "^3.2.2",
    4070                 "@wordpress/block-editor": "^8.0.8",
     4071                "@wordpress/block-editor": "^8.0.11",
    40714072                "@wordpress/blocks": "^11.1.4",
    4072                 "@wordpress/components": "^19.1.2",
     4073                "@wordpress/components": "^19.1.5",
    40734074                "@wordpress/compose": "^5.0.6",
    40744075                "@wordpress/core-data": "^4.0.8",
     
    40874088                "@wordpress/media-utils": "^3.0.5",
    40884089                "@wordpress/notices": "^3.2.7",
    4089                 "@wordpress/reusable-blocks": "^3.0.14",
     4090                "@wordpress/reusable-blocks": "^3.0.17",
    40904091                "@wordpress/rich-text": "^5.0.6",
    4091                 "@wordpress/server-side-render": "^3.0.12",
     4092                "@wordpress/server-side-render": "^3.0.15",
    40924093                "@wordpress/url": "^3.3.1",
    40934094                "@wordpress/wordcount": "^3.2.3",
     
    41764177        },
    41774178        "@wordpress/format-library": {
    4178             "version": "3.0.14",
    4179             "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.14.tgz",
    4180             "integrity": "sha512-iemQKg711CrFmpJvPh1isceiorAGPkKXouPt+UF7Ic8G6YggyUf8hnyGuPIWZM7wTlbh5PD2XeL90+pChJVfRQ==",
     4179            "version": "3.0.17",
     4180            "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.0.17.tgz",
     4181            "integrity": "sha512-QAA0FwJJGW4tj1D/52f28aKtd95yV0md6gVLgoBIgGW+LZV52VYMPMycfxpP/dDBMOzc+8GDQhcutvbpe8weaA==",
    41814182            "requires": {
    41824183                "@babel/runtime": "^7.16.0",
    41834184                "@wordpress/a11y": "^3.2.4",
    4184                 "@wordpress/block-editor": "^8.0.8",
    4185                 "@wordpress/components": "^19.1.2",
     4185                "@wordpress/block-editor": "^8.0.11",
     4186                "@wordpress/components": "^19.1.5",
    41864187                "@wordpress/compose": "^5.0.6",
    41874188                "@wordpress/data": "^6.1.4",
     
    42384239        },
    42394240        "@wordpress/interface": {
    4240             "version": "4.1.10",
    4241             "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.10.tgz",
    4242             "integrity": "sha512-3nUDqo69m0EBPpXW83Zv4MjTDRmmeoo2cYWNi2tUEi117Ls7Nuw+zXMdHCdYk1QcqVfVOmRg77tZlPDapDZBqQ==",
     4241            "version": "4.1.13",
     4242            "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.13.tgz",
     4243            "integrity": "sha512-XWTJtSlqTOTDU19Pq+TMRlYOXRSn2rHRyonp0Il8zSIj6UlMO1FvEXhgGbZcwLfS4bGAqTq7ji5YMxfbTD4QiA==",
    42434244            "requires": {
    42444245                "@babel/runtime": "^7.16.0",
    42454246                "@wordpress/a11y": "^3.2.4",
    4246                 "@wordpress/components": "^19.1.2",
     4247                "@wordpress/components": "^19.1.5",
    42474248                "@wordpress/compose": "^5.0.6",
    42484249                "@wordpress/data": "^6.1.4",
     
    43424343        },
    43434344        "@wordpress/list-reusable-blocks": {
    4344             "version": "3.0.12",
    4345             "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.12.tgz",
    4346             "integrity": "sha512-slGIu0ABCws87Ch8urInCpg/YI/B7Ap2U8AJ5FSM5cQ6ex+JCbMexABOwiuIHL065hEaw/wI/LNrgP75MRjT8A==",
     4345            "version": "3.0.15",
     4346            "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.0.15.tgz",
     4347            "integrity": "sha512-QQ3wH3SAbzQgFbvEzU6gpX1Dc/PzQTwqChVLsXzB7J7538Ulcd+mOvyK9pLn8LCvIeZDBCW5Opp7EPmbWwtN8A==",
    43474348            "requires": {
    43484349                "@babel/runtime": "^7.16.0",
    43494350                "@wordpress/api-fetch": "^5.2.6",
    4350                 "@wordpress/components": "^19.1.2",
     4351                "@wordpress/components": "^19.1.5",
    43514352                "@wordpress/compose": "^5.0.6",
    43524353                "@wordpress/element": "^4.0.4",
     
    43864387        },
    43874388        "@wordpress/nux": {
    4388             "version": "5.0.12",
    4389             "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.12.tgz",
    4390             "integrity": "sha512-qMWUHyACqTMI6vGXQA20nUGlagaQ/GOGuk1al6acMrHMbk3b5LCgrA6nYPuHDXfgheZ5dZ85p8r2onos1bUkig==",
     4389            "version": "5.0.15",
     4390            "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.0.15.tgz",
     4391            "integrity": "sha512-dfpR300xRtj2SgNe2gYp/4KS2ETdixdoIx2B+aap6GdyKW01fF9dmRF8+/bmt3rJs6b3cGE8BaqnS2TEwPH5OA==",
    43914392            "requires": {
    43924393                "@babel/runtime": "^7.16.0",
    4393                 "@wordpress/components": "^19.1.2",
     4394                "@wordpress/components": "^19.1.5",
    43944395                "@wordpress/compose": "^5.0.6",
    43954396                "@wordpress/data": "^6.1.4",
     
    45164517        },
    45174518        "@wordpress/reusable-blocks": {
    4518             "version": "3.0.14",
    4519             "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.14.tgz",
    4520             "integrity": "sha512-jR4byu0is1n4FX53wVxuTR60bTU3wYv+yS+nvUPqgo7Ngh/8m3HP6PeKFP35/w3L3zYXM309s9tox7mUsycadg==",
    4521             "requires": {
    4522                 "@wordpress/block-editor": "^8.0.8",
     4519            "version": "3.0.17",
     4520            "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.17.tgz",
     4521            "integrity": "sha512-V12Kr7jzkEbaatSfPdS9u7HSf7KeFe6zO218a51eMqmStHzb9HljO0FKSFLCINq1hjqDiwceeC+S9gfOgIgslg==",
     4522            "requires": {
     4523                "@wordpress/block-editor": "^8.0.11",
    45234524                "@wordpress/blocks": "^11.1.4",
    4524                 "@wordpress/components": "^19.1.2",
     4525                "@wordpress/components": "^19.1.5",
    45254526                "@wordpress/compose": "^5.0.6",
    45264527                "@wordpress/core-data": "^4.0.8",
     
    54885489        },
    54895490        "@wordpress/server-side-render": {
    5490             "version": "3.0.12",
    5491             "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.12.tgz",
    5492             "integrity": "sha512-ctiH9X/8Yn/Cp7Yvpcq7ee/kG6FDVhgLbCtNLFN+4estKfcKXfdMuzEsV0Lhi3z8SF9pRewwvas0cdIo+maK7g==",
     5491            "version": "3.0.15",
     5492            "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.15.tgz",
     5493            "integrity": "sha512-mrcemEw1eG0i8MGy912rHhi1/FqzneCKv6D/E8QmRX7m2WUz/M5g7XNksRIor44eNLg6dTjQkAM4AzuwAq9C9Q==",
    54935494            "requires": {
    54945495                "@babel/runtime": "^7.16.0",
    54955496                "@wordpress/api-fetch": "^5.2.6",
    54965497                "@wordpress/blocks": "^11.1.4",
    5497                 "@wordpress/components": "^19.1.2",
     5498                "@wordpress/components": "^19.1.5",
    54985499                "@wordpress/compose": "^5.0.6",
    54995500                "@wordpress/data": "^6.1.4",
     
    55615562        },
    55625563        "@wordpress/widgets": {
    5563             "version": "2.0.14",
    5564             "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.14.tgz",
    5565             "integrity": "sha512-fMAWwEcK79esTIttuQkCFTHhPsrWbCQmletT8IjpUmT34RXbwGreBXnief8n9H4BC8eTe1JAE/kI3AhtdYfrRg==",
     5564            "version": "2.0.17",
     5565            "resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.0.17.tgz",
     5566            "integrity": "sha512-jKUIgcu6dlOSk09HEC9p+vnn5J5vc9K0y1NuWumNopqC3/iy9+EwKgpTWkfvytl+pWnDA9Ha+IBa6a99sgcHfw==",
    55665567            "requires": {
    55675568                "@babel/runtime": "^7.16.0",
    55685569                "@wordpress/api-fetch": "^5.2.6",
    5569                 "@wordpress/block-editor": "^8.0.8",
     5570                "@wordpress/block-editor": "^8.0.11",
    55705571                "@wordpress/blocks": "^11.1.4",
    5571                 "@wordpress/components": "^19.1.2",
     5572                "@wordpress/components": "^19.1.5",
    55725573                "@wordpress/compose": "^5.0.6",
    55735574                "@wordpress/core-data": "^4.0.8",
     
    62506251                },
    62516252                "object-inspect": {
    6252                     "version": "1.11.0",
    6253                     "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
    6254                     "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
     6253                    "version": "1.11.1",
     6254                    "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
     6255                    "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
    62556256                },
    62566257                "string.prototype.trimend": {
     
    1398713988            "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz",
    1398813989            "integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
     13990        },
     13991        "history": {
     13992            "version": "5.1.0",
     13993            "resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz",
     13994            "integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==",
     13995            "requires": {
     13996                "@babel/runtime": "^7.7.6"
     13997            }
    1398913998        },
    1399013999        "hmac-drbg": {
     
    2182521834                },
    2182621835                "object-inspect": {
    21827                     "version": "1.11.0",
    21828                     "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
    21829                     "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
     21836                    "version": "1.11.1",
     21837                    "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
     21838                    "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
    2183021839                },
    2183121840                "object.values": {
     
    2486524874        },
    2486624875        "stylis": {
    24867             "version": "4.0.10",
    24868             "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
    24869             "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
     24876            "version": "4.0.13",
     24877            "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
     24878            "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
    2487024879        },
    2487124880        "sugarss": {
  • trunk/package.json

    r52324 r52364  
    2828        "@wordpress/custom-templated-path-webpack-plugin": "2.1.0",
    2929        "@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
    30         "@wordpress/e2e-test-utils": "5.4.9",
     30        "@wordpress/e2e-test-utils": "5.4.10",
    3131        "@wordpress/library-export-default-webpack-plugin": "2.2.0",
    3232        "@wordpress/scripts": "19.2.2",
     
    8383        "@wordpress/autop": "3.2.3",
    8484        "@wordpress/blob": "3.2.2",
    85         "@wordpress/block-directory": "3.0.14",
    86         "@wordpress/block-editor": "8.0.8",
    87         "@wordpress/block-library": "6.0.12",
     85        "@wordpress/block-directory": "3.0.17",
     86        "@wordpress/block-editor": "8.0.11",
     87        "@wordpress/block-library": "6.0.15",
    8888        "@wordpress/block-serialization-default-parser": "4.2.3",
    8989        "@wordpress/blocks": "11.1.4",
    90         "@wordpress/components": "19.1.2",
     90        "@wordpress/components": "19.1.5",
    9191        "@wordpress/compose": "5.0.6",
    9292        "@wordpress/core-data": "4.0.8",
    93         "@wordpress/customize-widgets": "2.0.14",
     93        "@wordpress/customize-widgets": "2.0.17",
    9494        "@wordpress/data": "6.1.4",
    9595        "@wordpress/data-controls": "2.2.7",
     
    9898        "@wordpress/dom": "3.2.7",
    9999        "@wordpress/dom-ready": "3.2.3",
    100         "@wordpress/edit-post": "5.0.14",
    101         "@wordpress/edit-site": "3.0.14",
    102         "@wordpress/edit-widgets": "3.1.9",
    103         "@wordpress/editor": "12.0.11",
     100        "@wordpress/edit-post": "5.0.17",
     101        "@wordpress/edit-site": "3.0.17",
     102        "@wordpress/edit-widgets": "3.1.12",
     103        "@wordpress/editor": "12.0.14",
    104104        "@wordpress/element": "4.0.4",
    105105        "@wordpress/escape-html": "2.2.3",
    106         "@wordpress/format-library": "3.0.14",
     106        "@wordpress/format-library": "3.0.17",
    107107        "@wordpress/hooks": "3.2.2",
    108108        "@wordpress/html-entities": "3.2.3",
    109109        "@wordpress/i18n": "4.2.4",
    110110        "@wordpress/icons": "6.1.1",
    111         "@wordpress/interface": "4.1.10",
     111        "@wordpress/interface": "4.1.13",
    112112        "@wordpress/is-shallow-equal": "4.2.1",
    113113        "@wordpress/keyboard-shortcuts": "3.0.6",
    114114        "@wordpress/keycodes": "3.2.4",
    115         "@wordpress/list-reusable-blocks": "3.0.12",
     115        "@wordpress/list-reusable-blocks": "3.0.15",
    116116        "@wordpress/media-utils": "3.0.5",
    117117        "@wordpress/notices": "3.2.7",
    118         "@wordpress/nux": "5.0.12",
     118        "@wordpress/nux": "5.0.15",
    119119        "@wordpress/plugins": "4.0.6",
    120120        "@wordpress/primitives": "3.0.4",
    121121        "@wordpress/priority-queue": "2.2.3",
    122122        "@wordpress/redux-routine": "4.2.2",
    123         "@wordpress/reusable-blocks": "3.0.14",
     123        "@wordpress/reusable-blocks": "3.0.17",
    124124        "@wordpress/rich-text": "5.0.6",
    125         "@wordpress/server-side-render": "3.0.12",
     125        "@wordpress/server-side-render": "3.0.15",
    126126        "@wordpress/shortcode": "3.2.3",
    127127        "@wordpress/token-list": "2.2.2",
     
    129129        "@wordpress/viewport": "4.0.6",
    130130        "@wordpress/warning": "2.2.2",
    131         "@wordpress/widgets": "2.0.14",
     131        "@wordpress/widgets": "2.0.17",
    132132        "@wordpress/wordcount": "3.2.3",
    133133        "backbone": "1.4.0",
  • trunk/src/wp-admin/site-editor.php

    r52336 r52364  
    2424}
    2525
     26// Used in the HTML title tag.
     27$title       = __( 'Editor (beta)' );
    2628$parent_file = 'themes.php';
    2729
     
    5759
    5860if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) {
    59 
    6061    $post_type = get_post_type_object( $_GET['postType'] );
    61 
    6262    if ( ! $post_type ) {
    6363        wp_die( __( 'Invalid post type.' ) );
    6464    }
     65}
    6566
    66     // Used in the HTML title tag.
    67     $title = $post_type->labels->name;
     67$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
     68$active_theme            = wp_get_theme()->get_stylesheet();
     69$preload_paths           = array(
     70    array( '/wp/v2/media', 'OPTIONS' ),
     71    '/',
     72    '/wp/v2/types?context=edit',
     73    '/wp/v2/types/wp_template?context=edit',
     74    '/wp/v2/types/wp_template-part?context=edit',
     75    '/wp/v2/taxonomies?context=edit',
     76    '/wp/v2/pages?context=edit',
     77    '/wp/v2/categories?context=edit',
     78    '/wp/v2/posts?context=edit',
     79    '/wp/v2/tags?context=edit',
     80    '/wp/v2/templates?context=edit&per_page=-1',
     81    '/wp/v2/template-parts?context=edit&per_page=-1',
     82    '/wp/v2/settings',
     83    '/wp/v2/themes?context=edit&status=active',
     84    '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
     85    '/wp/v2/global-styles/' . $active_global_styles_id,
     86    '/wp/v2/global-styles/themes/' . $active_theme,
     87);
    6888
    69     $preload_paths = array(
    70         '/',
    71         '/wp/v2/types/' . $post_type->name . '?context=edit',
    72         '/wp/v2/types?context=edit',
    73         add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( $post_type->name ) ),
    74     );
     89block_editor_rest_api_preload( $preload_paths, $block_editor_context );
    7590
    76     block_editor_rest_api_preload( $preload_paths, $block_editor_context );
    77 
    78     wp_add_inline_script(
    79         'wp-edit-site',
    80         sprintf(
    81             'wp.domReady( function() {
    82                 wp.editSite.initializeList( "site-editor", "%s", %s );
    83             } );',
    84             $post_type->name,
    85             wp_json_encode( $editor_settings )
    86         )
    87     );
    88 
    89 } else {
    90 
    91     // Used in the HTML title tag.
    92     $title = __( 'Editor (beta)' );
    93 
    94     $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
    95     $active_theme            = wp_get_theme()->get_stylesheet();
    96     $preload_paths           = array(
    97         array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ),
    98         '/',
    99         '/wp/v2/types?context=edit',
    100         '/wp/v2/taxonomies?context=edit',
    101         add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'page' ) ),
    102         add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'post' ) ),
    103         add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'category' ) ),
    104         add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'post_tag' ) ),
    105         add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template' ) ),
    106         add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template_part' ) ),
    107         '/wp/v2/settings',
    108         '/wp/v2/themes?context=edit&status=active',
    109         '/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
    110         '/wp/v2/global-styles/' . $active_global_styles_id,
    111         '/wp/v2/themes/' . $active_theme . '/global-styles',
    112     );
    113 
    114     block_editor_rest_api_preload( $preload_paths, $block_editor_context );
    115 
    116     wp_add_inline_script(
    117         'wp-edit-site',
    118         sprintf(
    119             'wp.domReady( function() {
    120                 wp.editSite.initializeEditor( "site-editor", %s );
    121             } );',
    122             wp_json_encode( $editor_settings )
    123         )
    124     );
    125 
    126 }
     91wp_add_inline_script(
     92    'wp-edit-site',
     93    sprintf(
     94        'wp.domReady( function() {
     95            wp.editSite.initializeEditor( "site-editor", %s );
     96        } );',
     97        wp_json_encode( $editor_settings )
     98    )
     99);
    127100
    128101// Preload server-registered block schemas.
  • trunk/src/wp-includes/assets/script-loader-packages.php

    r52324 r52364  
    1 <?php return array('a11y.js' => 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'));
     1<?php return array('a11y.js' => 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'));
  • trunk/src/wp-includes/block-editor.php

    r52349 r52364  
    312312            'css'                     => 'variables',
    313313            '__unstableType'          => 'presets',
    314             '__experimentalNoWrapper' => true,
    315314        ),
    316315        array(
  • trunk/src/wp-includes/block-template-utils.php

    r52340 r52364  
    4242    $theme_dir  = "$root_dir/$theme_name";
    4343
    44     if ( is_readable( $theme_dir . '/block-templates/index.html' ) ) {
     44    if ( file_exists( $theme_dir . '/block-templates' ) || file_exists( $theme_dir . '/block-template-parts' ) ) {
    4545        return array(
    4646            'wp_template'      => 'block-templates',
  • trunk/src/wp-includes/blocks/index.php

    r52272 r52364  
    1212require ABSPATH . WPINC . '/blocks/categories.php';
    1313require ABSPATH . WPINC . '/blocks/file.php';
     14require ABSPATH . WPINC . '/blocks/gallery.php';
     15require ABSPATH . WPINC . '/blocks/image.php';
    1416require ABSPATH . WPINC . '/blocks/latest-comments.php';
    1517require ABSPATH . WPINC . '/blocks/latest-posts.php';
     
    6567        'embed',
    6668        'freeform',
    67         'gallery',
    6869        'group',
    6970        'heading',
    7071        'html',
    71         'image',
    7272        'list',
    7373        'media-text',
  • trunk/src/wp-includes/blocks/navigation-submenu.php

    r52324 r52364  
    189189    }
    190190
     191    $aria_label = sprintf(
     192        /* translators: Accessibility text. %s: Parent page title. */
     193        __( '%s submenu' ),
     194        $label
     195    );
     196
    191197    $html = '<li ' . $wrapper_attributes . '>';
    192198
     
    227233            // The submenu icon is rendered in a button here
    228234            // so that there's a clickable elment to open the submenu.
    229             $html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
     235            $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
    230236        }
    231237    } else {
    232238        // If menus open on click, we render the parent as a button.
    233         $html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
     239        $html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
    234240
    235241        // Wrap title with span to isolate it from submenu icon.
  • trunk/src/wp-includes/blocks/navigation/view.asset.php

    r52275 r52364  
    1 <?php return array('dependencies' => array(), 'version' => '133b84f32422a9ad94c4533f85fa4e87');
     1<?php return array('dependencies' => array(), 'version' => '34d9f07c7910e83c264c6c4406619c5e');
  • trunk/src/wp-includes/blocks/navigation/view.min.asset.php

    r52275 r52364  
    1 <?php return array('dependencies' => array(), 'version' => 'f3cbbfbf9b9c434c39d6f77037d5267c');
     1<?php return array('dependencies' => array(), 'version' => 'd5ab04a497b4f1465f1f0060b6b71ae3');
  • trunk/src/wp-includes/blocks/page-list.php

    r52324 r52364  
    174174        }
    175175
    176         $title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
     176        $title      = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
     177        $aria_label = sprintf(
     178            /* translators: Accessibility text. %s: Parent page title. */
     179            __( '%s submenu' ),
     180            $title
     181        );
    177182
    178183        $markup .= '<li class="wp-block-pages-list__item' . $css_class . '"' . $style_attribute . '>';
    179184
    180185        if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
    181             $markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
     186            $markup .= '<button aria-label="' . $aria_label . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
    182187            '</button>';
    183188        } else {
     
    187192        if ( isset( $page['children'] ) ) {
    188193            if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
    189                 $markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
     194                $markup .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
    190195                $markup .= '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
    191196                $markup .= '</button>';
  • trunk/src/wp-includes/blocks/post-comments.php

    r52069 r52364  
    6767}
    6868add_action( 'init', 'register_block_core_post_comments' );
     69
     70/**
     71 * Use the button block classes for the form-submit button.
     72 *
     73 * @param array $fields The default comment form arguments.
     74 *
     75 * @return array Returns the modified fields.
     76 */
     77function post_comments_block_form_defaults( $fields ) {
     78    if ( wp_is_block_theme() ) {
     79        $fields['submit_button'] = '<input name="%1$s" type="submit" id="%2$s" class="%3$s wp-block-button__link" value="%4$s" />';
     80        $fields['submit_field']  = '<p class="form-submit wp-block-button">%1$s %2$s</p>';
     81    }
     82
     83    return $fields;
     84}
     85add_filter( 'comment_form_defaults', 'post_comments_block_form_defaults' );
  • trunk/src/wp-includes/blocks/post-comments/block.json

    r52069 r52364  
    3131        }
    3232    },
    33     "style": "wp-block-post-comments"
     33    "style": [
     34        "wp-block-post-comments",
     35        "wp-block-buttons",
     36        "wp-block-button"
     37    ]
    3438}
  • trunk/src/wp-includes/blocks/template-part.php

    r52324 r52364  
    6565            // Else, if the template part was provided by the active theme,
    6666            // render the corresponding file content.
    67             $theme_folders           = get_block_theme_folders();
    68             $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
     67            $parent_theme_folders        = get_block_theme_folders( get_template() );
     68            $child_theme_folders         = get_block_theme_folders( get_stylesheet() );
     69            $child_theme_part_file_path  = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
     70            $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
     71            $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;
    6972            if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
    7073                $content = file_get_contents( $template_part_file_path );
  • trunk/src/wp-includes/class-wp-theme-json.php

    r52329 r52364  
    108108        array(
    109109            'path'       => array( 'color', 'palette' ),
    110             'override'   => false,
     110            'override'   => array( 'color', 'defaultPalette' ),
    111111            'value_key'  => 'color',
    112112            'css_vars'   => '--wp--preset--color--$slug',
     
    120120        array(
    121121            'path'       => array( 'color', 'gradients' ),
    122             'override'   => false,
     122            'override'   => array( 'color', 'defaultGradients' ),
    123123            'value_key'  => 'gradient',
    124124            'css_vars'   => '--wp--preset--gradient--$slug',
     
    398398        $new_theme_json = $theme_json;
    399399
    400         if ( isset( $new_theme_json['settings']['appearanceTools'] ) ) {
     400        if (
     401            isset( $new_theme_json['settings']['appearanceTools'] ) &&
     402            true === $new_theme_json['settings']['appearanceTools']
     403        ) {
    401404            self::do_opt_in_into_settings( $new_theme_json['settings'] );
    402405        }
     
    404407        if ( isset( $new_theme_json['settings']['blocks'] ) && is_array( $new_theme_json['settings']['blocks'] ) ) {
    405408            foreach ( $new_theme_json['settings']['blocks'] as &$block ) {
    406                 if ( isset( $block['appearanceTools'] ) ) {
     409                if ( isset( $block['appearanceTools'] ) && ( true === $block['appearanceTools'] ) ) {
    407410                    self::do_opt_in_into_settings( $block );
    408411                }
     
    434437
    435438        foreach ( $to_opt_in as $path ) {
    436             if ( null === _wp_array_get( $context, $path, null ) ) {
     439            // Use "unset prop" as a marker instead of "null" because
     440            // "null" can be a valid value for some props (e.g. blockGap).
     441            if ( 'unset prop' === _wp_array_get( $context, $path, 'unset prop' ) ) {
    437442                _wp_array_set( $context, $path, true );
    438443            }
     
    15031508         */
    15041509        $nodes        = self::get_setting_nodes( $incoming_data );
    1505         $slugs_global = self::get_slugs_not_to_override( $this->theme_json );
     1510        $slugs_global = self::get_default_slugs( $this->theme_json, array( 'settings' ) );
    15061511        foreach ( $nodes as $node ) {
    1507             $slugs_node = self::get_slugs_not_to_override( $this->theme_json, $node['path'] );
     1512            $slugs_node = self::get_default_slugs( $this->theme_json, $node['path'] );
    15081513            $slugs      = array_merge_recursive( $slugs_global, $slugs_node );
    15091514
     
    15171522            // Replace the presets.
    15181523            foreach ( self::PRESETS_METADATA as $preset ) {
     1524                $override_preset = self::should_override_preset( $this->theme_json, $node['path'], $preset['override'] );
     1525
    15191526                foreach ( self::VALID_ORIGINS as $origin ) {
    15201527                    $path    = array_merge( $node['path'], $preset['path'], array( $origin ) );
     
    15261533                    if (
    15271534                        ( 'theme' !== $origin ) ||
    1528                         ( 'theme' === $origin && $preset['override'] )
     1535                        ( 'theme' === $origin && $override_preset )
    15291536                    ) {
    15301537                        _wp_array_set( $this->theme_json, $path, $content );
    1531                     }
    1532 
    1533                     if ( 'theme' === $origin && ! $preset['override'] ) {
    1534                         $content = self::filter_slugs( $content, $preset['path'], $slugs );
     1538                    } else {
     1539                        $slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() );
     1540                        $content          = self::filter_slugs( $content, $slugs_for_preset );
    15351541                        _wp_array_set( $this->theme_json, $path, $content );
    15361542                    }
     
    15411547
    15421548    /**
    1543      * Returns the slugs for all the presets that cannot be overriden
    1544      * in the given path. It returns an associative array
     1549     * Returns whether a presets should be overriden or not.
     1550     *
     1551     * @since 5.9.0
     1552     *
     1553     * @param array      $theme_json The theme.json like structure to inspect.
     1554     * @param array      $path Path to inspect.
     1555     * @param bool|array $override Data to compute whether to override the preset.
     1556     * @return boolean
     1557     */
     1558    private static function should_override_preset( $theme_json, $path, $override ) {
     1559        if ( is_bool( $override ) ) {
     1560            return $override;
     1561        }
     1562
     1563        /*
     1564         * The relationship between whether to override the defaults
     1565         * and whether the defaults are enabled is inverse:
     1566         *
     1567         * - If defaults are enabled  => theme presets should not be overriden
     1568         * - If defaults are disabled => theme presets should be overriden
     1569         *
     1570         * For example, a theme sets defaultPalette to false,
     1571         * making the default palette hidden from the user.
     1572         * In that case, we want all the theme presets to be present,
     1573         * so they should override the defaults.
     1574         */
     1575        if ( is_array( $override ) ) {
     1576            $value = _wp_array_get( $theme_json, array_merge( $path, $override ) );
     1577            if ( isset( $value ) ) {
     1578                return ! $value;
     1579            }
     1580
     1581            // Search the top-level key if none was found for this node.
     1582            $value = _wp_array_get( $theme_json, array_merge( array( 'settings' ), $override ) );
     1583            if ( isset( $value ) ) {
     1584                return ! $value;
     1585            }
     1586
     1587            return true;
     1588        }
     1589    }
     1590
     1591    /**
     1592     * Returns the default slugs for all the presets in an associative array
    15451593     * whose keys are the preset paths and the leafs is the list of slugs.
    15461594     *
    15471595     * For example:
    15481596     *
    1549      * array(
     1597     *  array(
    15501598     *   'color' => array(
    15511599     *     'palette'   => array( 'slug-1', 'slug-2' ),
     
    15561604     * @since 5.9.0
    15571605     *
    1558      * @param array $data      A theme.json like structure to inspect.
    1559      * @param array $node_path The path to inspect. Default `array( 'settings' )`.
    1560      * @return array An associative array containing the slugs for the given path.
    1561      */
    1562     private static function get_slugs_not_to_override( $data, $node_path = array( 'settings' ) ) {
     1606     * @param array $data      A theme.json like structure.
     1607     * @param array $node_path The path to inspect. It's 'settings' by default.
     1608     * @return array
     1609     */
     1610    private static function get_default_slugs( $data, $node_path ) {
    15631611        $slugs = array();
     1612
    15641613        foreach ( self::PRESETS_METADATA as $metadata ) {
    1565             if ( $metadata['override'] ) {
    1566                 continue;
    1567             }
    1568 
    1569             $slugs_for_preset = array();
    1570             $path             = array_merge( $node_path, $metadata['path'], array( 'default' ) );
    1571             $preset           = _wp_array_get( $data, $path, null );
     1614            $path   = array_merge( $node_path, $metadata['path'], array( 'default' ) );
     1615            $preset = _wp_array_get( $data, $path, null );
    15721616            if ( ! isset( $preset ) ) {
    15731617                continue;
    15741618            }
    15751619
     1620            $slugs_for_preset = array();
    15761621            $slugs_for_preset = array_map(
    1577                 function( $value ) {
     1622                static function( $value ) {
    15781623                    return isset( $value['slug'] ) ? $value['slug'] : null;
    15791624                },
     
    15921637     *
    15931638     * @param array $node  The node with the presets to validate.
    1594      * @param array $path  The path to the preset type to inspect.
    15951639     * @param array $slugs The slugs that should not be overriden.
    15961640     * @return array The new node.
    15971641     */
    1598     private static function filter_slugs( $node, $path, $slugs ) {
    1599         $slugs_for_preset = _wp_array_get( $slugs, $path, array() );
    1600         if ( empty( $slugs_for_preset ) ) {
     1642    private static function filter_slugs( $node, $slugs ) {
     1643        if ( empty( $slugs ) ) {
    16011644            return $node;
    16021645        }
     
    16041647        $new_node = array();
    16051648        foreach ( $node as $value ) {
    1606             if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs_for_preset, true ) ) {
     1649            if ( isset( $value['slug'] ) && ! in_array( $value['slug'], $slugs, true ) ) {
    16071650                $new_node[] = $value;
    16081651            }
  • trunk/src/wp-includes/default-filters.php

    r52352 r52364  
    564564add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
    565565add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' );
     566add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );
    566567add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' );
    567568add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
  • trunk/src/wp-includes/post.php

    r52330 r52364  
    505505            'has_archive'           => false,
    506506            'show_ui'               => wp_is_block_theme(),
    507             'show_in_menu'          => 'themes.php',
     507            'show_in_menu'          => false,
    508508            'show_in_admin_bar'     => false,
    509509            'show_in_rest'          => true,
  • trunk/src/wp-includes/script-loader.php

    r52285 r52364  
    28642864    echo "<script>window.__editorAssets = $editor_assets</script>";
    28652865}
     2866
     2867/**
     2868 * Function that enqueues the CSS Custom Properties coming from theme.json.
     2869 *
     2870 * @since 5.9.0
     2871 */
     2872function wp_enqueue_global_styles_css_custom_properties() {
     2873    wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
     2874    wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
     2875    wp_enqueue_style( 'global-styles-css-custom-properties' );
     2876}
  • trunk/tests/phpunit/includes/functions.php

    r52272 r52364  
    308308    remove_action( 'init', 'register_block_core_categories' );
    309309    remove_action( 'init', 'register_block_core_file' );
     310    remove_action( 'init', 'register_block_core_gallery', 20 );
     311    remove_action( 'init', 'register_block_core_image' );
    310312    remove_action( 'init', 'register_block_core_latest_comments' );
    311313    remove_action( 'init', 'register_block_core_latest_posts' );
  • trunk/tests/phpunit/tests/theme/wpThemeJson.php

    r52329 r52364  
    201201    }
    202202
    203     function test_get_settings_using_opt_in_key() {
     203    function test_get_settings_appearance_true_opts_in() {
    204204        $theme_json = new WP_Theme_JSON(
    205205            array(
     
    207207                'settings' => array(
    208208                    'appearanceTools' => true,
     209                    'spacing'         => array(
     210                        'blockGap' => false, // This should override appearanceTools.
     211                    ),
    209212                    'blocks'          => array(
    210213                        'core/paragraph' => array(
     
    217220                            'typography'      => array(
    218221                                'lineHeight' => false, // This should override appearanceTools.
     222                            ),
     223                            'spacing'         => array(
     224                                'blockGap' => null,
    219225                            ),
    220226                        ),
     
    236242            ),
    237243            'spacing'    => array(
    238                 'blockGap' => true,
     244                'blockGap' => false,
    239245                'margin'   => true,
    240246                'padding'  => true,
     
    260266                    ),
    261267                    'spacing'    => array(
    262                         'blockGap' => true,
     268                        'blockGap' => false,
    263269                        'margin'   => true,
    264270                        'padding'  => true,
    265271                    ),
     272                    'typography' => array(
     273                        'lineHeight' => false,
     274                    ),
     275                ),
     276            ),
     277        );
     278
     279        $this->assertEqualSetsWithIndex( $expected, $actual );
     280    }
     281
     282    function test_get_settings_appearance_false_does_not_opt_in() {
     283        $theme_json = new WP_Theme_JSON(
     284            array(
     285                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     286                'settings' => array(
     287                    'appearanceTools' => false,
     288                    'border'          => array(
     289                        'width' => true,
     290                    ),
     291                    'blocks'          => array(
     292                        'core/paragraph' => array(
     293                            'typography' => array(
     294                                'lineHeight' => false,
     295                            ),
     296                        ),
     297                        'core/group'     => array(
     298                            'typography' => array(
     299                                'lineHeight' => false,
     300                            ),
     301                        ),
     302                    ),
     303                ),
     304            )
     305        );
     306
     307        $actual   = $theme_json->get_settings();
     308        $expected = array(
     309            'appearanceTools' => false,
     310            'border'          => array(
     311                'width' => true,
     312            ),
     313            'blocks'          => array(
     314                'core/paragraph' => array(
     315                    'typography' => array(
     316                        'lineHeight' => false,
     317                    ),
     318                ),
     319                'core/group'     => array(
    266320                    'typography' => array(
    267321                        'lineHeight' => false,
     
    11341188    }
    11351189
    1136     public function test_merge_incoming_data_removes_theme_presets_with_slugs_as_default_presets() {
     1190    public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_removed() {
    11371191        $defaults = new WP_Theme_JSON(
     1192            array(
     1193                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     1194                'settings' => array(
     1195                    'color'  => array(
     1196                        'defaultPalette' => true,
     1197                        'palette'        => array(
     1198                            array(
     1199                                'slug'  => 'red',
     1200                                'color' => 'red',
     1201                                'name'  => 'Red',
     1202                            ),
     1203                            array(
     1204                                'slug'  => 'green',
     1205                                'color' => 'green',
     1206                                'name'  => 'Green',
     1207                            ),
     1208                        ),
     1209                    ),
     1210                    'blocks' => array(
     1211                        'core/paragraph' => array(
     1212                            'color' => array(
     1213                                'palette' => array(
     1214                                    array(
     1215                                        'slug'  => 'blue',
     1216                                        'color' => 'blue',
     1217                                        'name'  => 'Blue',
     1218                                    ),
     1219                                ),
     1220                            ),
     1221                        ),
     1222                    ),
     1223                ),
     1224            ),
     1225            'default'
     1226        );
     1227        $theme    = new WP_Theme_JSON(
    11381228            array(
    11391229                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     
    11421232                        'palette' => array(
    11431233                            array(
    1144                                 'slug'  => 'red',
    1145                                 'color' => 'red',
    1146                                 'name'  => 'Red',
     1234                                'slug'  => 'pink',
     1235                                'color' => 'pink',
     1236                                'name'  => 'Pink',
    11471237                            ),
    11481238                            array(
    11491239                                'slug'  => 'green',
    11501240                                'color' => 'green',
    1151                                 'name'  => 'Green',
     1241                                'name'  => 'Greenish',
    11521242                            ),
    11531243                        ),
     
    11601250                                        'slug'  => 'blue',
    11611251                                        'color' => 'blue',
    1162                                         'name'  => 'Blue',
    1163                                     ),
    1164                                 ),
    1165                             ),
    1166                         ),
    1167                     ),
    1168                 ),
    1169             ),
    1170             'default'
    1171         );
    1172         $theme    = new WP_Theme_JSON(
    1173             array(
    1174                 'version'  => WP_Theme_JSON::LATEST_SCHEMA,
    1175                 'settings' => array(
    1176                     'color'  => array(
    1177                         'palette' => array(
    1178                             array(
    1179                                 'slug'  => 'pink',
    1180                                 'color' => 'pink',
    1181                                 'name'  => 'Pink',
    1182                             ),
    1183                             array(
    1184                                 'slug'  => 'green',
    1185                                 'color' => 'green',
    1186                                 'name'  => 'Greenish',
    1187                             ),
    1188                         ),
    1189                     ),
    1190                     'blocks' => array(
    1191                         'core/paragraph' => array(
    1192                             'color' => array(
    1193                                 'palette' => array(
    1194                                     array(
    1195                                         'slug'  => 'blue',
    1196                                         'color' => 'blue',
    11971252                                        'name'  => 'Bluish',
    11981253                                    ),
     
    12191274            'settings' => array(
    12201275                'color'  => array(
    1221                     'palette' => array(
     1276                    'palette'        => array(
    12221277                        'default' => array(
    12231278                            array(
     
    12401295                        ),
    12411296                    ),
     1297                    'defaultPalette' => true,
    12421298                ),
    12431299                'blocks' => array(
     
    12571313                                        'color' => 'yellow',
    12581314                                        'name'  => 'Yellow',
     1315                                    ),
     1316                                ),
     1317                            ),
     1318                        ),
     1319                    ),
     1320                ),
     1321            ),
     1322        );
     1323
     1324        $defaults->merge( $theme );
     1325        $actual = $defaults->get_raw_data();
     1326
     1327        $this->assertEqualSetsWithIndex( $expected, $actual );
     1328    }
     1329
     1330    public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_not_removed_if_defaults_are_disabled() {
     1331        $defaults = new WP_Theme_JSON(
     1332            array(
     1333                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     1334                'settings' => array(
     1335                    'color'  => array(
     1336                        'defaultPalette' => true, // Emulate the defaults from core theme.json.
     1337                        'palette'        => array(
     1338                            array(
     1339                                'slug'  => 'red',
     1340                                'color' => 'red',
     1341                                'name'  => 'Red',
     1342                            ),
     1343                            array(
     1344                                'slug'  => 'green',
     1345                                'color' => 'green',
     1346                                'name'  => 'Green',
     1347                            ),
     1348                        ),
     1349                    ),
     1350                    'blocks' => array(
     1351                        'core/paragraph' => array(
     1352                            'color' => array(
     1353                                'palette' => array(
     1354                                    array(
     1355                                        'slug'  => 'blue',
     1356                                        'color' => 'blue',
     1357                                        'name'  => 'Blue',
     1358                                    ),
     1359                                ),
     1360                            ),
     1361                        ),
     1362                    ),
     1363                ),
     1364            ),
     1365            'default'
     1366        );
     1367        $theme    = new WP_Theme_JSON(
     1368            array(
     1369                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     1370                'settings' => array(
     1371                    'color'  => array(
     1372                        'defaultPalette' => false,
     1373                        'palette'        => array(
     1374                            array(
     1375                                'slug'  => 'pink',
     1376                                'color' => 'pink',
     1377                                'name'  => 'Pink',
     1378                            ),
     1379                            array(
     1380                                'slug'  => 'green',
     1381                                'color' => 'green',
     1382                                'name'  => 'Greenish',
     1383                            ),
     1384                        ),
     1385                    ),
     1386                    'blocks' => array(
     1387                        'core/paragraph' => array(
     1388                            'color' => array(
     1389                                'palette' => array(
     1390                                    array(
     1391                                        'slug'  => 'blue',
     1392                                        'color' => 'blue',
     1393                                        'name'  => 'Bluish',
     1394                                    ),
     1395                                    array(
     1396                                        'slug'  => 'yellow',
     1397                                        'color' => 'yellow',
     1398                                        'name'  => 'Yellow',
     1399                                    ),
     1400                                    array(
     1401                                        'slug'  => 'green',
     1402                                        'color' => 'green',
     1403                                        'name'  => 'Block Green',
     1404                                    ),
     1405                                ),
     1406                            ),
     1407                        ),
     1408                    ),
     1409                ),
     1410            )
     1411        );
     1412
     1413        $expected = array(
     1414            'version'  => WP_Theme_JSON::LATEST_SCHEMA,
     1415            'settings' => array(
     1416                'color'  => array(
     1417                    'defaultPalette' => false,
     1418                    'palette'        => array(
     1419                        'default' => array(
     1420                            array(
     1421                                'slug'  => 'red',
     1422                                'color' => 'red',
     1423                                'name'  => 'Red',
     1424                            ),
     1425                            array(
     1426                                'slug'  => 'green',
     1427                                'color' => 'green',
     1428                                'name'  => 'Green',
     1429                            ),
     1430                        ),
     1431                        'theme'   => array(
     1432                            array(
     1433                                'slug'  => 'pink',
     1434                                'color' => 'pink',
     1435                                'name'  => 'Pink',
     1436                            ),
     1437                            array(
     1438                                'slug'  => 'green',
     1439                                'color' => 'green',
     1440                                'name'  => 'Greenish',
     1441                            ),
     1442                        ),
     1443                    ),
     1444                ),
     1445                'blocks' => array(
     1446                    'core/paragraph' => array(
     1447                        'color' => array(
     1448                            'palette' => array(
     1449                                'default' => array(
     1450                                    array(
     1451                                        'slug'  => 'blue',
     1452                                        'color' => 'blue',
     1453                                        'name'  => 'Blue',
     1454                                    ),
     1455                                ),
     1456                                'theme'   => array(
     1457                                    array(
     1458                                        'slug'  => 'blue',
     1459                                        'color' => 'blue',
     1460                                        'name'  => 'Bluish',
     1461                                    ),
     1462                                    array(
     1463                                        'slug'  => 'yellow',
     1464                                        'color' => 'yellow',
     1465                                        'name'  => 'Yellow',
     1466                                    ),
     1467                                    array(
     1468                                        'slug'  => 'green',
     1469                                        'color' => 'green',
     1470                                        'name'  => 'Block Green',
    12591471                                    ),
    12601472                                ),
  • trunk/tools/webpack/blocks.js

    r52272 r52364  
    2929        'categories',
    3030        'file',
     31        'gallery',
     32        'image',
    3133        'latest-comments',
    3234        'latest-posts',
     
    7476        'embed',
    7577        'freeform',
    76         'gallery',
    7778        'group',
    7879        'heading',
    7980        'html',
    80         'image',
    8181        'list',
    8282        'media-text',
Note: See TracChangeset for help on using the changeset viewer.