From e101566aa217f5ed96382d80d7ba1690619061f5 Mon Sep 17 00:00:00 2001
From: Tmk <i@tmk.im>
Date: Sun, 3 Jul 2022 14:43:15 +0800
Subject: [PATCH 1/3] Support font-weight in font-size utilities

---
 src/corePlugins.js             |  3 ++-
 tests/plugins/fontSize.test.js | 11 +++++++++--
 types/config.d.ts              |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/corePlugins.js b/src/corePlugins.js
index 5781905db4b5..62f9d24aa8f0 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1613,7 +1613,7 @@ export let corePlugins = {
       {
         text: (value) => {
           let [fontSize, options] = Array.isArray(value) ? value : [value]
-          let { lineHeight, letterSpacing } = isPlainObject(options)
+          let { lineHeight, letterSpacing, fontWeight } = isPlainObject(options)
             ? options
             : { lineHeight: options }
 
@@ -1621,6 +1621,7 @@ export let corePlugins = {
             'font-size': fontSize,
             ...(lineHeight === undefined ? {} : { 'line-height': lineHeight }),
             ...(letterSpacing === undefined ? {} : { 'letter-spacing': letterSpacing }),
+            ...(fontWeight === undefined ? {} : { 'font-weight': fontWeight }),
           }
         },
       },
diff --git a/tests/plugins/fontSize.test.js b/tests/plugins/fontSize.test.js
index 7304ae3bb839..659e0f170710 100644
--- a/tests/plugins/fontSize.test.js
+++ b/tests/plugins/fontSize.test.js
@@ -31,12 +31,13 @@ test('font-size utilities can include a default line-height', () => {
 
 test('font-size utilities can include a default letter-spacing', () => {
   let config = {
-    content: [{ raw: html`<div class="text-md text-sm text-lg"></div>` }],
+    content: [{ raw: html`<div class="text-md text-sm text-lg text-xl"></div>` }],
     theme: {
       fontSize: {
         sm: '12px',
         md: ['16px', { letterSpacing: '-0.01em' }],
-        lg: ['20px', { letterSpacing: '-0.02em' }],
+        lg: ['20px', { letterSpacing: '-0.02em', fontWeight: 500 }],
+        xl: ['24px', { letterSpacing: '-0.03em', fontWeight: 'bold' }],
       },
     },
   }
@@ -53,6 +54,12 @@ test('font-size utilities can include a default letter-spacing', () => {
       .text-lg {
         font-size: 20px;
         letter-spacing: -0.02em;
+        font-weight: 500;
+      }
+      .text-xl {
+        font-size: 24px;
+        letter-spacing: -0.03em;
+        font-weight: bold;
       }
     `)
   })
diff --git a/types/config.d.ts b/types/config.d.ts
index 703d56c2a472..344ddc28ee16 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -164,6 +164,7 @@ interface ThemeConfig {
           configuration: Partial<{
             lineHeight: string
             letterSpacing: string
+            fontWeight: string | number
           }>
         ]
     >

From b3235b38d2a11e82835f668839d0b0b2c8ab3ea3 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Mon, 4 Jul 2022 16:53:04 -0400
Subject: [PATCH 2/3] WIP update tests

---
 tests/plugins/fontSize.test.js | 42 ++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/tests/plugins/fontSize.test.js b/tests/plugins/fontSize.test.js
index 659e0f170710..f26735db94e5 100644
--- a/tests/plugins/fontSize.test.js
+++ b/tests/plugins/fontSize.test.js
@@ -31,13 +31,12 @@ test('font-size utilities can include a default line-height', () => {
 
 test('font-size utilities can include a default letter-spacing', () => {
   let config = {
-    content: [{ raw: html`<div class="text-md text-sm text-lg text-xl"></div>` }],
+    content: [{ raw: html`<div class="text-md text-sm text-lg"></div>` }],
     theme: {
       fontSize: {
         sm: '12px',
         md: ['16px', { letterSpacing: '-0.01em' }],
-        lg: ['20px', { letterSpacing: '-0.02em', fontWeight: 500 }],
-        xl: ['24px', { letterSpacing: '-0.03em', fontWeight: 'bold' }],
+        lg: ['20px', { letterSpacing: '-0.02em' }],
       },
     },
   }
@@ -54,12 +53,6 @@ test('font-size utilities can include a default letter-spacing', () => {
       .text-lg {
         font-size: 20px;
         letter-spacing: -0.02em;
-        font-weight: 500;
-      }
-      .text-xl {
-        font-size: 24px;
-        letter-spacing: -0.03em;
-        font-weight: bold;
       }
     `)
   })
@@ -95,3 +88,34 @@ test('font-size utilities can include a default line-height and letter-spacing',
     `)
   })
 })
+
+test('font-size utilities can include a font-weight', () => {
+  let config = {
+    content: [{ raw: html`<div class="text-md text-sm text-lg"></div>` }],
+    theme: {
+      fontSize: {
+        sm: '12px',
+        md: ['16px', { lineHeight: '24px', fontWeight: 500 }],
+        lg: ['20px', { lineHeight: '28px', fontWeight: 'bold' }],
+      },
+    },
+  }
+
+  return run('@tailwind utilities', config).then((result) => {
+    expect(result.css).toMatchCss(css`
+      .text-md {
+        font-size: 16px;
+        line-height: 24px;
+        font-weight: 500;
+      }
+      .text-sm {
+        font-size: 12px;
+      }
+      .text-lg {
+        font-size: 20px;
+        line-height: 28px;
+        font-weight: bold;
+      }
+    `)
+  })
+})

From 6e6478d6c1a394bc8370afd420f7562bfd8c6c62 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Mon, 4 Jul 2022 16:57:48 -0400
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92b0214f772e..f9e14df7e014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix usage of special-character prefixes ([#8772](https://github.com/tailwindlabs/tailwindcss/pull/8772))
 - Don’t prefix selectors in arbitrary variants ([#8773](https://github.com/tailwindlabs/tailwindcss/pull/8773))
 - Add support for alpha values in safe list ([#8774](https://github.com/tailwindlabs/tailwindcss/pull/8774))
+- Support default `font-weight`s in font size utilities ([#8763](https://github.com/tailwindlabs/tailwindcss/pull/8763))
 
 ## [3.1.4] - 2022-06-21