Skip to content

Commit cc11222

Browse files
ellatrixdmsnell
ellatrix
authored and
dmsnell
committed
Restore: Sync Gutenberg @ e499abfb843a43ac88455ca319220c5f181e1cf3
See changelog in e7d40e7 > Gutenberg ref update. > CI run: WordPress#11167. > > See #64595.
1 parent afe4b73 commit cc11222

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2782
-1343
lines changed

‎src/wp-includes/assets/script-loader-packages.min.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
'wp-primitives',
6262
'wp-url'
6363
),
64-
'version' => '17c7b74296ea735c0361'
64+
'version' => '23207f52d0d266f6e1c4'
6565
),
6666
'block-editor.min.js' => array(
6767
'dependencies' => array(
@@ -100,7 +100,7 @@
100100
'wp-url',
101101
'wp-warning'
102102
),
103-
'version' => '7b33c6ba9b2696b1ea8a'
103+
'version' => '5140a363580d1c7cd43c'
104104
),
105105
'block-library.min.js' => array(
106106
'dependencies' => array(
@@ -142,7 +142,7 @@
142142
'import' => 'dynamic'
143143
)
144144
),
145-
'version' => 'd9167688508056e822dc'
145+
'version' => '7c541503acf57eac5326'
146146
),
147147
'block-serialization-default-parser.min.js' => array(
148148
'dependencies' => array(
@@ -214,7 +214,7 @@
214214
'wp-rich-text',
215215
'wp-warning'
216216
),
217-
'version' => 'b74a67bb06b8634a2418'
217+
'version' => '0405cfa25ddf48f7c0f2'
218218
),
219219
'compose.min.js' => array(
220220
'dependencies' => array(
@@ -266,7 +266,7 @@
266266
'wp-url',
267267
'wp-warning'
268268
),
269-
'version' => '0c143303cd44c5f33a31'
269+
'version' => '94b1c2f6db3c8822c7cb'
270270
),
271271
'customize-widgets.min.js' => array(
272272
'dependencies' => array(
@@ -331,7 +331,7 @@
331331
'dependencies' => array(
332332
'wp-deprecated'
333333
),
334-
'version' => 'aac39fc255d02334a74e'
334+
'version' => '66a6cf58e0c4cd128af0'
335335
),
336336
'dom-ready.min.js' => array(
337337
'dependencies' => array(
@@ -377,7 +377,7 @@
377377
'import' => 'static'
378378
)
379379
),
380-
'version' => '1a6b82c9f517652a242b'
380+
'version' => '553c68d537faab610eea'
381381
),
382382
'edit-site.min.js' => array(
383383
'dependencies' => array(
@@ -424,7 +424,7 @@
424424
'import' => 'static'
425425
)
426426
),
427-
'version' => '70ba63504dc660357661'
427+
'version' => 'b73b3bc48dddd6b78b65'
428428
),
429429
'edit-widgets.min.js' => array(
430430
'dependencies' => array(
@@ -511,7 +511,7 @@
511511
'import' => 'static'
512512
)
513513
),
514-
'version' => 'afa9e650be87393abdae'
514+
'version' => 'f6b5f35286ac82ea0bc7'
515515
),
516516
'element.min.js' => array(
517517
'dependencies' => array(
@@ -626,15 +626,15 @@
626626
'wp-url',
627627
'wp-warning'
628628
),
629-
'version' => 'c217f9fd229e5c053fab'
629+
'version' => '68f7334c7a77bb83ffee'
630630
),
631631
'notices.min.js' => array(
632632
'dependencies' => array(
633633
'react-jsx-runtime',
634634
'wp-components',
635635
'wp-data'
636636
),
637-
'version' => '1dbbef2ee01d4c76acb3'
637+
'version' => '218d0173a31ae7269246'
638638
),
639639
'nux.min.js' => array(
640640
'dependencies' => array(
@@ -667,7 +667,7 @@
667667
'wp-private-apis',
668668
'wp-url'
669669
),
670-
'version' => '3229838e98981966c8f5'
670+
'version' => '6a1e1df3db4f7198a518'
671671
),
672672
'plugins.min.js' => array(
673673
'dependencies' => array(
@@ -679,7 +679,7 @@
679679
'wp-is-shallow-equal',
680680
'wp-primitives'
681681
),
682-
'version' => 'b03040c408cd5bcc9f89'
682+
'version' => '72e3cf01c2b3535a9432'
683683
),
684684
'preferences.min.js' => array(
685685
'dependencies' => array(
@@ -695,7 +695,7 @@
695695
'wp-primitives',
696696
'wp-private-apis'
697697
),
698-
'version' => 'd3f26a2b3620d15a60a3'
698+
'version' => '035813168e404aa30193'
699699
),
700700
'preferences-persistence.min.js' => array(
701701
'dependencies' => array(
@@ -809,7 +809,7 @@
809809
'wp-hooks',
810810
'wp-private-apis'
811811
),
812-
'version' => '1156ddd6b9b4ba0f9015'
812+
'version' => '44b4d0543749363ed20d'
813813
),
814814
'theme.min.js' => array(
815815
'dependencies' => array(
@@ -848,7 +848,7 @@
848848
'import' => 'dynamic'
849849
)
850850
),
851-
'version' => 'b1456f7dd2b61c0e72cd'
851+
'version' => '7e012a6701be0a6ad8f3'
852852
),
853853
'url.min.js' => array(
854854
'dependencies' => array(
@@ -885,7 +885,7 @@
885885
'wp-notices',
886886
'wp-primitives'
887887
),
888-
'version' => '7064da49d4dd3848ba8a'
888+
'version' => '02b8dd683bc610f979fa'
889889
),
890890
'wordcount.min.js' => array(
891891
'dependencies' => array(

‎src/wp-includes/assets/script-modules-packages.min.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
'import' => 'static'
165165
)
166166
),
167-
'version' => '4c5f43f6950193300099'
167+
'version' => '77514d54b76613289de5'
168168
),
169169
'connectors/index.min.js' => array(
170170
'dependencies' => array(
@@ -175,7 +175,7 @@
175175
'wp-i18n',
176176
'wp-private-apis'
177177
),
178-
'version' => '00a04c7280e7ad762a10'
178+
'version' => 'fb1bf5511eb12e411ec6'
179179
),
180180
'core-abilities/index.min.js' => array(
181181
'dependencies' => array(
@@ -203,13 +203,13 @@
203203
'import' => 'static'
204204
)
205205
),
206-
'version' => 'c636e2e534fd52f7c77c'
206+
'version' => 'e57f44d1a9f69e75d2d9'
207207
),
208208
'interactivity/index.min.js' => array(
209209
'dependencies' => array(
210210

211211
),
212-
'version' => '4d9d9330d767da3813cc'
212+
'version' => 'f5a180d17cd8a38658aa'
213213
),
214214
'interactivity-router/full-page.min.js' => array(
215215
'dependencies' => array(
@@ -237,7 +237,7 @@
237237
'import' => 'static'
238238
)
239239
),
240-
'version' => '493dd3de12e3112b3130'
240+
'version' => '71aa17bac91628a0f874'
241241
),
242242
'latex-to-mathml/index.min.js' => array(
243243
'dependencies' => array(
@@ -271,7 +271,7 @@
271271
'wp-private-apis',
272272
'wp-style-engine'
273273
),
274-
'version' => '9750cba8a806aa170cf4'
274+
'version' => '30ab62f45bfe9f971ea0'
275275
),
276276
'route/index.min.js' => array(
277277
'dependencies' => array(
@@ -298,7 +298,7 @@
298298
'dependencies' => array(
299299

300300
),
301-
'version' => '52add8dbf585e013d5a6'
301+
'version' => '4064876f4a80da877c25'
302302
),
303303
'workflow/index.min.js' => array(
304304
'dependencies' => array(
@@ -319,6 +319,6 @@
319319
'import' => 'static'
320320
)
321321
),
322-
'version' => 'fcc73952f871fd953358'
322+
'version' => '13556bc597bbf2a8d620'
323323
)
324324
);

‎src/wp-includes/blocks/blocks-json.php‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3094,7 +3094,8 @@
30943094
'interactivity' => array(
30953095
'clientNavigation' => true
30963096
),
3097-
'customCSS' => false
3097+
'customCSS' => false,
3098+
'visibility' => false
30983099
),
30993100
'editorStyle' => 'wp-block-html-editor'
31003101
),
@@ -3170,19 +3171,10 @@
31703171
)
31713172
),
31723173
'selectors' => array(
3173-
'root' => '.wp-block-icon',
3174-
'color' => array(
3175-
'root' => '.wp-block-icon svg'
3176-
),
3177-
'border' => array(
3178-
'root' => '.wp-block-icon svg'
3179-
),
3174+
'root' => '.wp-block-icon svg',
3175+
'css' => '.wp-block-icon',
31803176
'spacing' => array(
3181-
'padding' => '.wp-block-icon svg'
3182-
),
3183-
'dimensions' => array(
3184-
'root' => '.wp-block-icon svg',
3185-
'width' => '.wp-block-icon svg'
3177+
'margin' => '.wp-block-icon'
31863178
)
31873179
),
31883180
'style' => 'wp-block-icon',
@@ -7140,7 +7132,8 @@
71407132
'className' => false,
71417133
'customClassName' => false,
71427134
'html' => false,
7143-
'customCSS' => false
7135+
'customCSS' => false,
7136+
'visibility' => false
71447137
),
71457138
'editorStyle' => 'wp-block-shortcode-editor'
71467139
),

‎src/wp-includes/blocks/html/block.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"interactivity": {
2222
"clientNavigation": true
2323
},
24-
"customCSS": false
24+
"customCSS": false,
25+
"visibility": false
2526
},
2627
"editorStyle": "wp-block-html-editor"
2728
}

‎src/wp-includes/blocks/icon/block.json‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,10 @@
5959
}
6060
},
6161
"selectors": {
62-
"root": ".wp-block-icon",
63-
"color": {
64-
"root": ".wp-block-icon svg"
65-
},
66-
"border": {
67-
"root": ".wp-block-icon svg"
68-
},
62+
"root": ".wp-block-icon svg",
63+
"css": ".wp-block-icon",
6964
"spacing": {
70-
"padding": ".wp-block-icon svg"
71-
},
72-
"dimensions": {
73-
"root": ".wp-block-icon svg",
74-
"width": ".wp-block-icon svg"
65+
"margin": ".wp-block-icon"
7566
}
7667
},
7768
"style": "wp-block-icon",

‎src/wp-includes/blocks/image.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ function block_core_image_render_lightbox( $block_content, $block, $block_instan
218218
if ( isset( $block['attrs']['id'] ) ) {
219219
$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
220220
$img_metadata = wp_get_attachment_metadata( $block['attrs']['id'] );
221-
$img_srcset = wp_get_attachment_image_srcset( $block['attrs']['id'] );
221+
$has_dimensions = ( $img_metadata['width'] ?? '' ) && ( $img_metadata['height'] ?? '' );
222+
$srcset_size = $has_dimensions ? array( $img_metadata['width'], $img_metadata['height'] ) : 'large';
223+
$img_srcset = wp_get_attachment_image_srcset( $block['attrs']['id'], $srcset_size );
222224
$img_width = $img_metadata['width'] ?? 'none';
223225
$img_height = $img_metadata['height'] ?? 'none';
224226
}

‎src/wp-includes/build/pages.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
require_once __DIR__ . '/pages/site-editor-v2/page-wp-admin.php';
1111
require_once __DIR__ . '/pages/font-library/page.php';
1212
require_once __DIR__ . '/pages/font-library/page-wp-admin.php';
13-
require_once __DIR__ . '/pages/connectors/page.php';
14-
require_once __DIR__ . '/pages/connectors/page-wp-admin.php';
13+
require_once __DIR__ . '/pages/options-connectors/page.php';
14+
require_once __DIR__ . '/pages/options-connectors/page-wp-admin.php';

0 commit comments

Comments
 (0)