From 16763f72f45c2b04fd77b9f107c14c90d006276c Mon Sep 17 00:00:00 2001
From: Vahid Nesro <63849626+Vahid1919@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:22:37 +0100
Subject: [PATCH 1/3] fix: add missing 2.5 and 5 spacing tokens

---
 packages/tokens/scripts/tailwind/index.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/tokens/scripts/tailwind/index.js b/packages/tokens/scripts/tailwind/index.js
index f3565fe49..fb7050d01 100644
--- a/packages/tokens/scripts/tailwind/index.js
+++ b/packages/tokens/scripts/tailwind/index.js
@@ -255,6 +255,15 @@ function buildSpacing(themeTokens, rawSpacing = {}) {
     spacing[key] = `var(--${token.name})`;
   }
 
+  // Merge sizing tokens — sizing and spacing share the same numeric scale
+  for (const token of themeTokens) {
+    if (!token.name.startsWith('sd-sizing-')) continue;
+    const key = token.name.slice('sd-sizing-'.length);
+    if (!(key in spacing)) {
+      spacing[key] = `var(--${token.name})`;
+    }
+  }
+
   // Fill gaps with raw values from tokens.json (not CSS vars, so use the value directly)
   for (const [key, value] of Object.entries(rawSpacing)) {
     if (!(key in spacing)) {

From 2e39c68e239dc38b25e97e2e589db4e83c73bfdc Mon Sep 17 00:00:00 2001
From: Vahid Nesro <63849626+Vahid1919@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:30:29 +0100
Subject: [PATCH 2/3] fix: add changeset

---
 .changeset/better-glasses-spend.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/better-glasses-spend.md

diff --git a/.changeset/better-glasses-spend.md b/.changeset/better-glasses-spend.md
new file mode 100644
index 000000000..68333916a
--- /dev/null
+++ b/.changeset/better-glasses-spend.md
@@ -0,0 +1,5 @@
+---
+'@solid-design-system/tokens': minor
+---
+
+Merged sizing and spacing tokens so that `spacing-5` and `spacing-2.5` work again.

From 48d5bf5e0c3f9d230312cb131a773f440ca7884e Mon Sep 17 00:00:00 2001
From: Vahid Nesro <63849626+Vahid1919@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:42:13 +0100
Subject: [PATCH 3/3] Update changeset

Fixed missing `spacing-5` and `spacing-2.5` tokens by merging sizing and spacing tokens for development.
---
 .changeset/better-glasses-spend.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/better-glasses-spend.md b/.changeset/better-glasses-spend.md
index 68333916a..a772bbff9 100644
--- a/.changeset/better-glasses-spend.md
+++ b/.changeset/better-glasses-spend.md
@@ -2,4 +2,4 @@
 '@solid-design-system/tokens': minor
 ---
 
-Merged sizing and spacing tokens so that `spacing-5` and `spacing-2.5` work again.
+Fixed missing `spacing-5` and `spacing-2.5` tokens by merging sizing and spacing tokens for development.