Commit b5603ae2aaa for woocommerce
commit b5603ae2aaa2d3a1d29bb9cb6dfc5b45af361c34
Author: Jill Q. <jill.quek@automattic.com>
Date: Wed May 20 10:11:38 2026 +0800
internal-style-build: alias WordPress-defaults SCSS vars to @wordpress/base-styles (#65157)
* internal-style-build: alias WordPress-defaults vars to @wordpress/base-styles
Replace the four hardcoded px values in the "WordPress defaults" section
($adminbar-height, $adminbar-height-mobile, $admin-menu-width,
$admin-menu-width-collapsed) with aliases to their @wordpress/base-styles
equivalents ($admin-bar-height, $admin-bar-height-big, $admin-sidebar-width,
$admin-sidebar-width-collapsed). The base-styles import is already on line 5
so no new dependency. Woo's local variable names are preserved — no callsite
changes needed.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fix missing changelog directory for woocommerce-analytics package
The package has `automattic/jetpack-changelogger` configured in
composer.json but the changelog/ directory was never created, causing
`changelogger validate` to throw a DirectoryIterator error in CI.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/packages/js/internal-style-build/abstracts/_variables.scss b/packages/js/internal-style-build/abstracts/_variables.scss
index 9270dda6a4b..94d32a73441 100644
--- a/packages/js/internal-style-build/abstracts/_variables.scss
+++ b/packages/js/internal-style-build/abstracts/_variables.scss
@@ -53,11 +53,12 @@ $alert-red: $error-red;
$alert-yellow: $notice-yellow;
$alert-green: $valid-green;
-// WordPress defaults
-$adminbar-height: 32px;
-$adminbar-height-mobile: 46px;
-$admin-menu-width: 160px;
-$admin-menu-width-collapsed: 36px;
+// WordPress defaults — aliased from @wordpress/base-styles/variables (already
+// imported above) so these track Core automatically if the upstream values change.
+$adminbar-height: $admin-bar-height;
+$adminbar-height-mobile: $admin-bar-height-big;
+$admin-menu-width: $admin-sidebar-width;
+$admin-menu-width-collapsed: $admin-sidebar-width-collapsed;
// wp-admin colors. Hardcoded because WordPress doesn't expose them as CSS
// custom properties on `:root` (verified via the `wp-token-check` skill).
diff --git a/packages/js/internal-style-build/changelog/sprinkle-adminbar-height-from-base-styles b/packages/js/internal-style-build/changelog/sprinkle-adminbar-height-from-base-styles
new file mode 100644
index 00000000000..4008260ff21
--- /dev/null
+++ b/packages/js/internal-style-build/changelog/sprinkle-adminbar-height-from-base-styles
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Alias the four WordPress-defaults SCSS variables ($adminbar-height, $adminbar-height-mobile, $admin-menu-width, $admin-menu-width-collapsed) to their @wordpress/base-styles equivalents instead of hardcoding raw px values, so they track Core automatically.
diff --git a/packages/php/woocommerce-analytics/changelog/.gitkeep b/packages/php/woocommerce-analytics/changelog/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d