Skip to content

Commit df02e8f

Browse files
authored
Merge branch 'WordPress:trunk' into trunk
2 parents 85da886 + 7cede9a commit df02e8f

172 files changed

Lines changed: 12087 additions & 3239 deletions

File tree

Some content is hidden

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://develop.svn.wordpress.org/trunk"
88
},
99
"gutenberg": {
10-
"sha": "954fe7f9e04631c41aec4552acd627a7203a2aad",
10+
"sha": "7b95ee96b54de2e35886971ccf7eb449c324c830",
1111
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
1212
},
1313
"engines": {

‎src/wp-admin/includes/update-core.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,9 @@
11701170
* 'wp-includes/images/icon-library/update.svg',
11711171
* 'wp-includes/images/icon-library/wordpress.svg',
11721172
*/
1173+
// 7.2
1174+
'wp-includes/js/dist/sync.js',
1175+
'wp-includes/js/dist/sync.min.js',
11731176
);
11741177

11751178
/**

‎src/wp-includes/assets/icon-library-manifest.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@
4949
'label' => _x( 'At Symbol (@)', 'icon label' ),
5050
'filePath' => 'at-symbol.svg',
5151
'collections' => array( 'core' ),
52+
'keywords' => array( _x( 'email', 'icon keyword' ) ),
5253
),
5354
'audio' => array(
5455
'label' => _x( 'Audio', 'icon label' ),
5556
'filePath' => 'audio.svg',
5657
'collections' => array( 'core' ),
58+
'keywords' => array( _x( 'music', 'icon keyword' ), _x( 'note', 'icon keyword' ) ),
5759
),
5860
'bell' => array(
5961
'label' => _x( 'Bell', 'icon label' ),
@@ -109,6 +111,7 @@
109111
'label' => _x( 'Caution', 'icon label' ),
110112
'filePath' => 'caution.svg',
111113
'collections' => array( 'core' ),
114+
'keywords' => array( _x( 'alert', 'icon keyword' ), _x( 'exclamation', 'icon keyword' ), _x( 'warning', 'icon keyword' ) ),
112115
),
113116
'chart-bar' => array(
114117
'label' => _x( 'Chart Bar', 'icon label' ),
@@ -179,6 +182,7 @@
179182
'label' => _x( 'Create', 'icon label' ),
180183
'filePath' => 'create.svg',
181184
'collections' => array( 'core' ),
185+
'keywords' => array( _x( 'add', 'icon keyword' ), _x( 'new', 'icon keyword' ), _x( 'plus', 'icon keyword' ) ),
182186
),
183187
'dashboard' => array(
184188
'label' => _x( 'Dashboard', 'icon label' ),
@@ -209,11 +213,13 @@
209213
'label' => _x( 'Envelope', 'icon label' ),
210214
'filePath' => 'envelope.svg',
211215
'collections' => array( 'core' ),
216+
'keywords' => array( _x( 'email', 'icon keyword' ), _x( 'letter', 'icon keyword' ), _x( 'post', 'icon keyword' ) ),
212217
),
213218
'error' => array(
214219
'label' => _x( 'Error', 'icon label' ),
215220
'filePath' => 'error.svg',
216221
'collections' => array( 'core' ),
222+
'keywords' => array( _x( 'alert', 'icon keyword' ), _x( 'caution', 'icon keyword' ), _x( 'exclamation', 'icon keyword' ), _x( 'warning', 'icon keyword' ) ),
217223
),
218224
'external' => array(
219225
'label' => _x( 'External', 'icon label' ),
@@ -224,6 +230,7 @@
224230
'label' => _x( 'File', 'icon label' ),
225231
'filePath' => 'file.svg',
226232
'collections' => array( 'core' ),
233+
'keywords' => array( _x( 'archive', 'icon keyword' ), _x( 'document', 'icon keyword' ), _x( 'folder', 'icon keyword' ) ),
227234
),
228235
'gallery' => array(
229236
'label' => _x( 'Gallery', 'icon label' ),
@@ -329,6 +336,7 @@
329336
'label' => _x( 'Pencil', 'icon label' ),
330337
'filePath' => 'pencil.svg',
331338
'collections' => array( 'core', 'core-admin' ),
339+
'keywords' => array( _x( 'edit', 'icon keyword' ) ),
332340
),
333341
'people' => array(
334342
'label' => _x( 'People', 'icon label' ),
@@ -429,6 +437,7 @@
429437
'label' => _x( 'Star Filled', 'icon label' ),
430438
'filePath' => 'star-filled.svg',
431439
'collections' => array( 'core' ),
440+
'keywords' => array( _x( 'favorite', 'icon keyword' ) ),
432441
),
433442
'star-half' => array(
434443
'label' => _x( 'Star Half', 'icon label' ),

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

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'wp-dom-ready',
55
'wp-i18n'
66
),
7-
'version' => '31c6cec5a4ff7aff483d'
7+
'version' => '5faef02d497f248e93ee'
88
),
99
'annotations.js' => array(
1010
'dependencies' => array(
@@ -67,7 +67,7 @@
6767
'wp-url',
6868
'wp-warning'
6969
),
70-
'version' => '56da94f1b6ed56573e78'
70+
'version' => '6d6b3181a753252387e7'
7171
),
7272
'block-editor.js' => array(
7373
'dependencies' => array(
@@ -105,7 +105,7 @@
105105
'wp-url',
106106
'wp-warning'
107107
),
108-
'version' => '578ad9eb61ae8af0123d'
108+
'version' => '6e282539cf0a135ed4a5'
109109
),
110110
'block-library.js' => array(
111111
'dependencies' => array(
@@ -151,7 +151,7 @@
151151
'import' => 'dynamic'
152152
)
153153
),
154-
'version' => '0999d15ea60b2ca101bc'
154+
'version' => '9442f80186e1fd6c9d4b'
155155
),
156156
'block-serialization-default-parser.js' => array(
157157
'dependencies' => array(
@@ -184,7 +184,7 @@
184184
'wp-shortcode',
185185
'wp-warning'
186186
),
187-
'version' => 'c453468c6e4fc4dacf25'
187+
'version' => '3a5d55524352cd1635f7'
188188
),
189189
'commands.js' => array(
190190
'dependencies' => array(
@@ -201,7 +201,7 @@
201201
'wp-primitives',
202202
'wp-private-apis'
203203
),
204-
'version' => '4a4a518ce9c4838666fe'
204+
'version' => '0f782aaf1624cdb1148e'
205205
),
206206
'components.js' => array(
207207
'dependencies' => array(
@@ -226,11 +226,10 @@
226226
'wp-theme',
227227
'wp-warning'
228228
),
229-
'version' => 'fecbc7a454bacff1527c'
229+
'version' => 'b719ac135662ae191dd9'
230230
),
231231
'compose.js' => array(
232232
'dependencies' => array(
233-
'react',
234233
'react-jsx-runtime',
235234
'wp-deprecated',
236235
'wp-dom',
@@ -241,7 +240,7 @@
241240
'wp-private-apis',
242241
'wp-undo-manager'
243242
),
244-
'version' => '18547cd8d2e6674f7b98'
243+
'version' => '502412777bc436c79a5e'
245244
),
246245
'core-commands.js' => array(
247246
'dependencies' => array(
@@ -258,7 +257,7 @@
258257
'wp-router',
259258
'wp-url'
260259
),
261-
'version' => '738a4beca871c27833f1'
260+
'version' => '8839a8b3ea5cc4eb698e'
262261
),
263262
'core-data.js' => array(
264263
'dependencies' => array(
@@ -271,19 +270,19 @@
271270
'wp-data',
272271
'wp-deprecated',
273272
'wp-element',
273+
'wp-hooks',
274274
'wp-html-entities',
275275
'wp-i18n',
276276
'wp-notices',
277277
'wp-primitives',
278278
'wp-private-apis',
279279
'wp-rich-text',
280280
'wp-style-engine',
281-
'wp-sync',
282281
'wp-undo-manager',
283282
'wp-url',
284283
'wp-warning'
285284
),
286-
'version' => 'a1d74a5d3b46ac893e05'
285+
'version' => '85a2af40c63fbc42dfd4'
287286
),
288287
'customize-widgets.js' => array(
289288
'dependencies' => array(
@@ -319,7 +318,7 @@
319318
'import' => 'static'
320319
)
321320
),
322-
'version' => 'dcab974f036fbee73086'
321+
'version' => 'b8cdb457de36ea41f05c'
323322
),
324323
'data.js' => array(
325324
'dependencies' => array(
@@ -347,7 +346,7 @@
347346
'moment',
348347
'wp-deprecated'
349348
),
350-
'version' => '8173fc0fc12b7bb7eaf0'
349+
'version' => 'af0f72250d99230696c5'
351350
),
352351
'deprecated.js' => array(
353352
'dependencies' => array(
@@ -410,7 +409,7 @@
410409
'import' => 'static'
411410
)
412411
),
413-
'version' => 'b4b1fb53ee012caa42fb'
412+
'version' => '2c15b75d60d41653fe34'
414413
),
415414
'edit-site.js' => array(
416415
'dependencies' => array(
@@ -459,7 +458,7 @@
459458
'import' => 'static'
460459
)
461460
),
462-
'version' => '1d1116c276ed95618737'
461+
'version' => '8690337206dfcb4ce13d'
463462
),
464463
'edit-widgets.js' => array(
465464
'dependencies' => array(
@@ -501,7 +500,7 @@
501500
'import' => 'static'
502501
)
503502
),
504-
'version' => 'b66dc643708560ba6922'
503+
'version' => '09222c649dc37fa9ac75'
505504
),
506505
'editor.js' => array(
507506
'dependencies' => array(
@@ -552,15 +551,15 @@
552551
'import' => 'static'
553552
)
554553
),
555-
'version' => '021570d5ceb676201638'
554+
'version' => 'a4fe21d0704817acc70d'
556555
),
557556
'element.js' => array(
558557
'dependencies' => array(
559558
'react',
560559
'react-dom',
561560
'wp-escape-html'
562561
),
563-
'version' => '4822427ad9c627826631'
562+
'version' => '5a4b1aa0e42aad8ef7db'
564563
),
565564
'escape-html.js' => array(
566565
'dependencies' => array(
@@ -594,7 +593,7 @@
594593
'import' => 'dynamic'
595594
)
596595
),
597-
'version' => 'f9ce39fe8a3d8aaf2fd6'
596+
'version' => '8a12998b72d8407956ee'
598597
),
599598
'hooks.js' => array(
600599
'dependencies' => array(
@@ -627,7 +626,7 @@
627626
'wp-element',
628627
'wp-keycodes'
629628
),
630-
'version' => 'ba3985e44a8fdca9462f'
629+
'version' => '2871b9b36c2a9aef74c4'
631630
),
632631
'keycodes.js' => array(
633632
'dependencies' => array(
@@ -662,6 +661,7 @@
662661
'wp-date',
663662
'wp-deprecated',
664663
'wp-element',
664+
'wp-html-entities',
665665
'wp-i18n',
666666
'wp-keycodes',
667667
'wp-notices',
@@ -672,7 +672,7 @@
672672
'wp-url',
673673
'wp-warning'
674674
),
675-
'version' => '64a4692e40e4685caccd'
675+
'version' => '688e248d5d924b36f889'
676676
),
677677
'notices.js' => array(
678678
'dependencies' => array(
@@ -711,7 +711,7 @@
711711
'wp-url',
712712
'wp-warning'
713713
),
714-
'version' => 'bb86130c876014c4db11'
714+
'version' => '6738120a1e2a12899699'
715715
),
716716
'plugins.js' => array(
717717
'dependencies' => array(
@@ -723,7 +723,7 @@
723723
'wp-is-shallow-equal',
724724
'wp-primitives'
725725
),
726-
'version' => 'a03a674fba0130981f2d'
726+
'version' => '4c53884fe0283a7ee4c5'
727727
),
728728
'preferences.js' => array(
729729
'dependencies' => array(
@@ -739,7 +739,7 @@
739739
'wp-primitives',
740740
'wp-private-apis'
741741
),
742-
'version' => 'f0a611a312173e6b7648'
742+
'version' => '00228fed7f2d274a78ab'
743743
),
744744
'preferences-persistence.js' => array(
745745
'dependencies' => array(
@@ -764,7 +764,7 @@
764764
'dependencies' => array(
765765

766766
),
767-
'version' => 'df3615fd5cb379fb7ffe'
767+
'version' => 'c12220e72e4bcdfac6f3'
768768
),
769769
'react-i18n.js' => array(
770770
'dependencies' => array(
@@ -824,7 +824,7 @@
824824
'wp-i18n',
825825
'wp-url'
826826
),
827-
'version' => '83e806a0634df6b93530'
827+
'version' => '3ddc6eaa634c653fb483'
828828
),
829829
'shortcode.js' => array(
830830
'dependencies' => array(
@@ -836,15 +836,7 @@
836836
'dependencies' => array(
837837

838838
),
839-
'version' => '914befb08774033e6265'
840-
),
841-
'sync.js' => array(
842-
'dependencies' => array(
843-
'wp-api-fetch',
844-
'wp-hooks',
845-
'wp-private-apis'
846-
),
847-
'version' => '7179e38284ff7aba21e6'
839+
'version' => '7d2c0a2a9e5ae3f8e1c9'
848840
),
849841
'theme.js' => array(
850842
'dependencies' => array(
@@ -854,7 +846,7 @@
854846
'wp-element',
855847
'wp-private-apis'
856848
),
857-
'version' => '795a74a11c336f95159b'
849+
'version' => '21b0c3318f26c7b3d71e'
858850
),
859851
'token-list.js' => array(
860852
'dependencies' => array(
@@ -926,7 +918,7 @@
926918
'wp-notices',
927919
'wp-primitives'
928920
),
929-
'version' => 'f2802a2d8ac37b86bc43'
921+
'version' => '27c5c0b8c8fcd1753149'
930922
),
931923
'wordcount.js' => array(
932924
'dependencies' => array(

0 commit comments

Comments
 (0)