Merge remote-tracking branch 'upstream/trunk' into remove/matchdep

# Conflicts: # package-lock.json # src/wp-includes/assets/script-loader-packages.min.php
WordPress · Feb 7, 2025 · 0ad783a · 0ad783a
2 parents c691f1f + 712a7af
commit 0ad783a
Show file tree

Hide file tree

Showing 66 changed files with 4,239 additions and 3,843 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1701,6 +1701,7 @@ module.exports = function(grunt) {
 	grunt.registerTask( 'verify:source-maps', function() {
 		const ignoredFiles = [
 			'build/wp-includes/js/dist/components.js',
+			'build/wp-includes/js/dist/data.js',
 		];
 		const files = buildFiles.reduce( ( acc, path ) => {
 			// Skip excluded paths and any path that isn't a file.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,12 +27,12 @@
 		"@lodder/grunt-postcss": "^3.1.1",
 		"@playwright/test": "1.49.1",
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
-		"@wordpress/babel-preset-default": "8.8.2",
-		"@wordpress/dependency-extraction-webpack-plugin": "6.8.3",
-		"@wordpress/e2e-test-utils": "11.8.2",
-		"@wordpress/e2e-test-utils-playwright": "1.8.1",
-		"@wordpress/prettier-config": "4.8.1",
-		"@wordpress/scripts": "30.0.6",
+		"@wordpress/babel-preset-default": "8.17.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "6.17.0",
+		"@wordpress/e2e-test-utils": "11.17.0",
+		"@wordpress/e2e-test-utils-playwright": "1.17.0",
+		"@wordpress/prettier-config": "4.17.0",
+		"@wordpress/scripts": "30.10.0",
 		"autoprefixer": "10.4.20",
 		"chalk": "5.3.0",
 		"check-node-version": "4.2.1",
@@ -61,7 +61,6 @@
 		"grunt-webpack": "7.0.0",
 		"ink-docstrap": "1.3.2",
 		"install-changed": "1.1.0",
-		"matchdep": "~2.0.0",
 		"postcss": "8.4.49",
 		"prettier": "npm:[email protected]",
 		"qunit": "~2.23.1",
@@ -78,73 +77,74 @@
 		"webpack-livereload-plugin": "3.0.2"
 	},
 	"dependencies": {
-		"@wordpress/a11y": "4.8.2",
-		"@wordpress/annotations": "3.8.3",
-		"@wordpress/api-fetch": "7.8.2",
-		"@wordpress/autop": "4.8.1",
-		"@wordpress/blob": "4.8.1",
-		"@wordpress/block-directory": "5.8.18",
-		"@wordpress/block-editor": "14.3.15",
-		"@wordpress/block-library": "9.8.16",
-		"@wordpress/block-serialization-default-parser": "5.8.1",
-		"@wordpress/blocks": "13.8.5",
-		"@wordpress/commands": "1.8.11",
-		"@wordpress/components": "28.8.11",
-		"@wordpress/compose": "7.8.3",
-		"@wordpress/core-commands": "1.8.15",
-		"@wordpress/core-data": "7.8.15",
-		"@wordpress/customize-widgets": "5.8.16",
-		"@wordpress/data": "10.8.3",
-		"@wordpress/data-controls": "4.8.3",
-		"@wordpress/dataviews": "4.4.11",
-		"@wordpress/date": "5.8.2",
-		"@wordpress/deprecated": "4.8.2",
-		"@wordpress/dom": "4.8.2",
-		"@wordpress/dom-ready": "4.8.1",
-		"@wordpress/edit-post": "8.8.18",
-		"@wordpress/edit-site": "6.8.18",
-		"@wordpress/edit-widgets": "6.8.16",
-		"@wordpress/editor": "14.8.18",
-		"@wordpress/element": "6.8.1",
-		"@wordpress/escape-html": "3.8.1",
-		"@wordpress/fields": "0.0.16",
-		"@wordpress/format-library": "5.8.15",
-		"@wordpress/hooks": "4.8.2",
-		"@wordpress/html-entities": "4.8.1",
-		"@wordpress/i18n": "5.8.2",
-		"@wordpress/icons": "10.8.2",
-		"@wordpress/interactivity": "6.8.5",
-		"@wordpress/interactivity-router": "2.8.6",
-		"@wordpress/interface": "6.8.11",
-		"@wordpress/is-shallow-equal": "5.8.1",
-		"@wordpress/keyboard-shortcuts": "5.8.3",
-		"@wordpress/keycodes": "4.8.2",
-		"@wordpress/list-reusable-blocks": "5.8.11",
-		"@wordpress/media-utils": "5.8.2",
-		"@wordpress/notices": "5.8.3",
-		"@wordpress/nux": "9.8.11",
-		"@wordpress/patterns": "2.8.15",
-		"@wordpress/plugins": "7.8.11",
-		"@wordpress/preferences": "4.8.11",
-		"@wordpress/preferences-persistence": "2.8.2",
-		"@wordpress/primitives": "4.8.1",
-		"@wordpress/priority-queue": "3.8.1",
-		"@wordpress/private-apis": "1.8.1",
-		"@wordpress/redux-routine": "5.8.1",
-		"@wordpress/reusable-blocks": "5.8.15",
-		"@wordpress/rich-text": "7.8.3",
-		"@wordpress/router": "1.8.1",
-		"@wordpress/server-side-render": "5.8.11",
-		"@wordpress/shortcode": "4.8.1",
-		"@wordpress/style-engine": "2.8.1",
-		"@wordpress/sync": "1.8.1",
-		"@wordpress/token-list": "3.8.1",
-		"@wordpress/undo-manager": "1.8.1",
-		"@wordpress/url": "4.8.1",
-		"@wordpress/viewport": "6.8.3",
-		"@wordpress/warning": "3.8.1",
-		"@wordpress/widgets": "4.8.15",
-		"@wordpress/wordcount": "4.8.1",
+		"@wordpress/a11y": "4.17.0",
+		"@wordpress/annotations": "3.17.0",
+		"@wordpress/api-fetch": "7.17.0",
+		"@wordpress/autop": "4.17.0",
+		"@wordpress/blob": "4.17.0",
+		"@wordpress/block-directory": "5.17.1",
+		"@wordpress/block-editor": "14.12.0",
+		"@wordpress/block-library": "9.17.0",
+		"@wordpress/block-serialization-default-parser": "5.17.0",
+		"@wordpress/blocks": "14.6.0",
+		"@wordpress/commands": "1.17.0",
+		"@wordpress/components": "29.3.0",
+		"@wordpress/compose": "7.17.0",
+		"@wordpress/core-commands": "1.17.0",
+		"@wordpress/core-data": "7.17.0",
+		"@wordpress/customize-widgets": "5.17.0",
+		"@wordpress/data": "10.17.0",
+		"@wordpress/data-controls": "4.17.0",
+		"@wordpress/dataviews": "4.13.0",
+		"@wordpress/date": "5.17.0",
+		"@wordpress/deprecated": "4.17.0",
+		"@wordpress/dom": "4.17.0",
+		"@wordpress/dom-ready": "4.17.0",
+		"@wordpress/edit-post": "8.17.1",
+		"@wordpress/edit-site": "6.17.1",
+		"@wordpress/edit-widgets": "6.17.0",
+		"@wordpress/editor": "14.17.1",
+		"@wordpress/element": "6.17.0",
+		"@wordpress/escape-html": "3.17.0",
+		"@wordpress/fields": "0.9.0",
+		"@wordpress/format-library": "5.17.0",
+		"@wordpress/hooks": "4.17.0",
+		"@wordpress/html-entities": "4.17.0",
+		"@wordpress/i18n": "5.17.0",
+		"@wordpress/icons": "10.17.0",
+		"@wordpress/interactivity": "6.17.0",
+		"@wordpress/interactivity-router": "2.17.0",
+		"@wordpress/interface": "9.2.0",
+		"@wordpress/is-shallow-equal": "5.17.0",
+		"@wordpress/keyboard-shortcuts": "5.17.0",
+		"@wordpress/keycodes": "4.17.0",
+		"@wordpress/list-reusable-blocks": "5.17.0",
+		"@wordpress/media-utils": "5.17.0",
+		"@wordpress/notices": "5.17.0",
+		"@wordpress/nux": "9.17.0",
+		"@wordpress/patterns": "2.17.0",
+		"@wordpress/plugins": "7.17.0",
+		"@wordpress/preferences": "4.17.0",
+		"@wordpress/preferences-persistence": "2.17.0",
+		"@wordpress/primitives": "4.17.0",
+		"@wordpress/priority-queue": "3.17.0",
+		"@wordpress/private-apis": "1.17.0",
+		"@wordpress/redux-routine": "5.17.0",
+		"@wordpress/reusable-blocks": "5.17.0",
+		"@wordpress/rich-text": "7.17.0",
+		"@wordpress/router": "1.17.0",
+		"@wordpress/server-side-render": "5.17.0",
+		"@wordpress/shortcode": "4.17.0",
+		"@wordpress/style-engine": "2.17.0",
+		"@wordpress/sync": "1.17.0",
+		"@wordpress/token-list": "3.17.0",
+		"@wordpress/undo-manager": "1.17.0",
+		"@wordpress/upload-media": "0.2.0",
+		"@wordpress/url": "4.17.0",
+		"@wordpress/viewport": "6.17.0",
+		"@wordpress/warning": "3.17.0",
+		"@wordpress/widgets": "4.17.0",
+		"@wordpress/wordcount": "4.17.0",
 		"backbone": "1.6.0",
 		"clipboard": "2.0.11",
 		"core-js-url-browser": "3.6.4",

diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
@@ -2433,6 +2433,12 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 .nav-menus-php .metabox-holder h3 {
 	padding: 0;
 }
+
+.accordion-container h3.accordion-section-title {
+	padding: 0 !important;
+}
+
+.accordion-section-title button.accordion-trigger,
 .nav-menus-php .metabox-holder .accordion-section-title button.accordion-trigger {
 	background: inherit;
 	color: #1d2327;
@@ -2446,27 +2452,38 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 	line-height: 1.5;
 	cursor: pointer;
 }
+
+.accordion-section-title button.accordion-trigger:focus,
 .nav-menus-php .metabox-holder .accordion-section-title button.accordion-trigger:focus {
 	box-shadow: 0 0 0 2px #2271b1;
 	outline: 2px solid transparent;
 }
+
+.accordion-section-title span.dashicons.dashicons-arrow-down,
 .nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down {
 	position: absolute;
 	right: 10px;
 	left: auto;
 	color: #787c82;
 	border-radius: 50px;
+	top: 50%;
+	transform: translateY(-50%);
 }
+
+.accordion-section-title:hover span.dashicons.dashicons-arrow-down,
 .nav-menus-php .metabox-holder .accordion-section-title:hover span.dashicons.dashicons-arrow-down {
 	color: #1d2327;
 }
+
+.accordion-section-title span.dashicons.dashicons-arrow-down::before,
 .nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down::before {
 	position: relative;
 	left: -1px;
 }
 
+.accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down,
 .nav-menus-php .metabox-holder .accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down {
-	transform: rotate(180deg);
+	transform: rotate(180deg) translate(0, 50%);
 }
 
 #templateside ul li a {
@@ -3648,7 +3665,6 @@ img {
 
 .accordion-section-title {
 	margin: 0;
-	padding: 12px 15px 15px;
 	position: relative;
 	border-left: 1px solid #dcdcde;
 	border-right: 1px solid #dcdcde;

diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
@@ -431,6 +431,7 @@ body.trashing #publish-settings {
 	border-right: none;
 	border-bottom: none;
 	cursor: default;
+	padding: 10px 10px 11px 14px;
 }
 
 #customize-controls .customize-info.open .accordion-section-title:after,
@@ -1727,7 +1728,7 @@ p.customize-section-description {
 	border-left: none;
 	border-right: none;
 	margin: 0 0 15px;
-	padding-right: 100px; /* Space for the button */
+	padding: 12px 100px 15px 15px; /* Space for the button */
 }
 
 #customize-theme-controls .control-section-themes .customize-themes-panel .accordion-section-title:first-child:hover, /* Not a focusable element. */

diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
@@ -308,7 +308,6 @@ ul.wp-tab-bar li {
 #postimagediv .inside img {
 	max-width: 100%;
 	height: auto;
-	width: auto;
 	vertical-align: top;
 	background-image: linear-gradient(45deg, #c3c4c7 25%, transparent 25%, transparent 75%, #c3c4c7 75%, #c3c4c7), linear-gradient(45deg, #c3c4c7 25%, transparent 25%, transparent 75%, #c3c4c7 75%, #c3c4c7);
 	background-position: 0 0, 10px 10px;