Leverage @wordpress/base-styles admin schemes stylesheet instead of duplicate declarations in various packages

backport-changelog/6.9/8909.md

@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8909
+
+* https://github.com/WordPress/gutenberg/pull/69130

lib/client-assets.php

@@ -151,6 +151,18 @@ function gutenberg_register_packages_styles( $styles ) {
 	// wp-customize-widgets: add wp-edit-blocks (custom handle not auto-inferred)
 	$styles->query( 'wp-customize-widgets', 'registered' )->deps[] = 'wp-edit-blocks';
 
+	// Register wp-base-styles and add it to the already registered wp-admin stylesheet
+	gutenberg_override_style(
+		$styles,
+		'wp-base-styles',
+		gutenberg_url( 'build/styles/base-styles/admin-schemes.css' ),
+		array(),
+		$version
+	);
+	$styles->add_data( 'wp-base-styles', 'rtl', 'replace' );
+	$styles->add_data( 'wp-base-styles', 'path', gutenberg_dir_path() . 'build/styles/base-styles/admin-schemes.css' );
+	$styles->query( 'wp-admin', 'registered' )->deps[] = 'wp-base-styles';
+
 	gutenberg_override_style(
 		$styles,
 		'wp-block-editor-content',
@@ -181,6 +193,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		// Until #37466, we can't specifically add them as editor styles yet,
 		// so we must hard-code it here as a dependency.
 		'wp-block-editor-content',
+		'wp-base-styles',
 	);
 
 	// Only load the default layout and margin styles for themes without theme.json file.

packages/base-styles/package.json

@@ -24,6 +24,24 @@
 		"node": ">=18.12.0",
 		"npm": ">=8.19.2"
 	},
+	"main": "index.js",
+	"module": "index.js",
+	"exports": {
+		"./package.json": "./package.json",
+		"./build-style/": "./build-style/",
+		"./_*.scss": "./_*.scss",
+		"./animations": "./_animations.scss",
+		"./breakpoints": "./_breakpoints.scss",
+		"./colors": "./_colors.scss",
+		"./colors.native": "./_colors.native.scss",
+		"./default-custom-properties": "./_default-custom-properties.scss",
+		"./functions": "./_functions.scss",
+		"./long-content-fade": "./_long-content-fade.scss",
+		"./mixins": "./_mixins.scss",
+		"./variables": "./_variables.scss",
+		"./z-index": "./_z-index.scss"
+	},
+	"wpScript": true,
 	"publishConfig": {
 		"access": "public"
 	}

packages/block-editor/src/content.scss

@@ -14,7 +14,3 @@
 @use "./components/plain-text/content.scss" as *;
 @use "./components/rich-text/content.scss" as *;
 @use "./components/warning/content.scss" as *;
-
-// To do: ideally the iframe does not contain UI, but there's still the block
-// placeholders that will be moved to shadow DOM in the future.
-@include wordpress-admin-schemes();

packages/block-editor/src/style.scss

@@ -65,5 +65,3 @@
 @use "./components/block-toolbar/style.scss" as *;
 @use "./components/inserter/style.scss" as *;
 @use "./components/spacing-sizes-control/style.scss" as *;
-
-@include wordpress-admin-schemes();

packages/commands/src/style.scss

@@ -1,5 +1,3 @@
 @use "@wordpress/base-styles/default-custom-properties" as *;
 @use "@wordpress/base-styles/mixins" as *;
 @use "./components/style.scss" as *;
-
-@include wordpress-admin-schemes();

packages/edit-post/src/style.scss

@@ -49,5 +49,3 @@ body.js.block-editor-page {
 		height: auto;
 	}
 }
-
-@include wordpress-admin-schemes();

packages/edit-site/src/style.scss

@@ -89,5 +89,3 @@ body.js.site-editor-php {
 		top: 0;
 	}
 }
-
-@include wordpress-admin-schemes();

packages/edit-widgets/src/style.scss

@@ -57,5 +57,3 @@ body.js.widgets-php {
 .js .widgets-php .notice {
 	display: none !important;
 }
-
-@include wordpress-admin-schemes();

packages/list-reusable-blocks/src/style.scss

@@ -8,5 +8,3 @@
 	position: relative;
 	top: -3px;
 }
-
-@include wordpress-admin-schemes();