From 8bd2846b5b906904a49e9ffec9c317e560f2eaa6 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Tue, 7 Feb 2023 15:06:59 +0100
Subject: [PATCH] Add support for configuring default `font-variation-settings`
 for a `font-family` (#10515)

* Add support for configuring default `font-variation-settings` for a `font-family`

* update changelog

---------

Co-authored-by: Nikolai Grushkovsky <n@ngrushkovsky.com>
---
 CHANGELOG.md                            |   1 +
 src/corePlugins.js                      |   5 +-
 src/css/preflight.css                   |   2 +
 tests/evaluateTailwindFunctions.test.js |  66 +++
 tests/plugins/fontFamily.test.js        |  40 ++
 tests/source-maps.test.js               | 569 ++++++++++++------------
 types/config.d.ts                       |   8 +-
 7 files changed, 405 insertions(+), 286 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 562bc0de066d..c6bbea7f9266 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
 - Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
 - [Oxide] Use `lightningcss` for nesting and vendor prefixes in PostCSS plugin ([#10399](https://github.com/tailwindlabs/tailwindcss/pull/10399))
+- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
 
 ### Fixed
 
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 570699cdf9af..5036c674c369 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1915,13 +1915,16 @@ export let corePlugins = {
         font: (value) => {
           let [families, options = {}] =
             Array.isArray(value) && isPlainObject(value[1]) ? value : [value]
-          let { fontFeatureSettings } = options
+          let { fontFeatureSettings, fontVariationSettings } = options
 
           return {
             'font-family': Array.isArray(families) ? families.join(', ') : families,
             ...(fontFeatureSettings === undefined
               ? {}
               : { 'font-feature-settings': fontFeatureSettings }),
+            ...(fontVariationSettings === undefined
+              ? {}
+              : { 'font-variation-settings': fontVariationSettings }),
           }
         },
       },
diff --git a/src/css/preflight.css b/src/css/preflight.css
index 3029044290d5..fab875d95904 100644
--- a/src/css/preflight.css
+++ b/src/css/preflight.css
@@ -23,6 +23,7 @@
 3. Use a more readable tab size.
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
+6. Use the user's configured `sans` font-variation-settings by default.
 */
 
 html {
@@ -32,6 +33,7 @@ html {
   tab-size: 4; /* 3 */
   font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
   font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
+  font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
 }
 
 /*
diff --git a/tests/evaluateTailwindFunctions.test.js b/tests/evaluateTailwindFunctions.test.js
index 82aa9b7da21f..5b41a70307c7 100644
--- a/tests/evaluateTailwindFunctions.test.js
+++ b/tests/evaluateTailwindFunctions.test.js
@@ -591,6 +591,72 @@ crosscheck(({ stable, oxide }) => {
     })
   })
 
+  test('font-family values are retrieved without font-variation-settings', () => {
+    let input = css`
+      .heading-1 {
+        font-family: theme('fontFamily.sans');
+      }
+      .heading-2 {
+        font-family: theme('fontFamily.serif');
+      }
+      .heading-3 {
+        font-family: theme('fontFamily.mono');
+      }
+    `
+
+    let output = css`
+      .heading-1 {
+        font-family: Inter;
+      }
+      .heading-2 {
+        font-family: Times, serif;
+      }
+      .heading-3 {
+        font-family: Menlo, monospace;
+      }
+    `
+
+    return run(input, {
+      theme: {
+        fontFamily: {
+          sans: ['Inter', { fontVariationSettings: '"opsz" 32' }],
+          serif: [['Times', 'serif'], { fontVariationSettings: '"opsz" 32' }],
+          mono: ['Menlo, monospace', { fontVariationSettings: '"opsz" 32' }],
+        },
+      },
+    }).then((result) => {
+      expect(result.css).toMatchCss(output)
+      expect(result.warnings().length).toBe(0)
+    })
+  })
+
+  test('font-variation-settings values can be retrieved', () => {
+    let input = css`
+      .heading {
+        font-family: theme('fontFamily.sans');
+        font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings');
+      }
+    `
+
+    let output = css`
+      .heading {
+        font-family: Inter;
+        font-variation-settings: 'opsz' 32;
+      }
+    `
+
+    return run(input, {
+      theme: {
+        fontFamily: {
+          sans: ['Inter', { fontVariationSettings: "'opsz' 32" }],
+        },
+      },
+    }).then((result) => {
+      expect(result.css).toMatchCss(output)
+      expect(result.warnings().length).toBe(0)
+    })
+  })
+
   test('font-family values are joined when an array', () => {
     let input = css`
       .element {
diff --git a/tests/plugins/fontFamily.test.js b/tests/plugins/fontFamily.test.js
index fb025720a02b..1170dac8e9e6 100644
--- a/tests/plugins/fontFamily.test.js
+++ b/tests/plugins/fontFamily.test.js
@@ -98,3 +98,43 @@ crosscheck(() => {
     })
   })
 })
+
+test('font-variation-settings can be provided when families are defined as a string', () => {
+  let config = {
+    content: [{ raw: html`<div class="font-sans"></div>` }],
+    theme: {
+      fontFamily: {
+        sans: ['Inter, sans-serif', { fontVariationSettings: '"opsz" 32' }],
+      },
+    },
+  }
+
+  return run('@tailwind utilities', config).then((result) => {
+    expect(result.css).toMatchCss(`
+      .font-sans {
+        font-family: Inter, sans-serif;
+        font-variation-settings: "opsz" 32;
+      }
+    `)
+  })
+})
+
+test('font-variation-settings can be provided when families are defined as an array', () => {
+  let config = {
+    content: [{ raw: html`<div class="font-sans"></div>` }],
+    theme: {
+      fontFamily: {
+        sans: [['Inter', 'sans-serif'], { fontVariationSettings: '"opsz" 32' }],
+      },
+    },
+  }
+
+  return run('@tailwind utilities', config).then((result) => {
+    expect(result.css).toMatchCss(`
+      .font-sans {
+        font-family: Inter, sans-serif;
+        font-variation-settings: "opsz" 32;
+      }
+    `)
+  })
+})
diff --git a/tests/source-maps.test.js b/tests/source-maps.test.js
index cb7d5f1af6c6..4f6c522a1bb1 100644
--- a/tests/source-maps.test.js
+++ b/tests/source-maps.test.js
@@ -98,293 +98,294 @@ crosscheck(({ stable, oxide }) => {
       '2:6-20 -> 19:2-18',
       '2:20 -> 20:0',
       '2:6 -> 22:0',
-      '2:20 -> 28:1',
-      '2:6 -> 30:0',
-      '2:6-20 -> 31:2-26',
-      '2:6-20 -> 32:2-40',
-      '2:6-20 -> 33:2-26',
-      '2:6-20 -> 34:2-21',
-      '2:6-20 -> 35:2-230',
-      '2:6-20 -> 36:2-39',
-      '2:20 -> 37:0',
-      '2:6 -> 39:0',
-      '2:20 -> 42:1',
-      '2:6 -> 44:0',
-      '2:6-20 -> 45:2-19',
-      '2:6-20 -> 46:2-30',
-      '2:20 -> 47:0',
-      '2:6 -> 49:0',
-      '2:20 -> 53:1',
-      '2:6 -> 55:0',
-      '2:6-20 -> 56:2-19',
-      '2:6-20 -> 57:2-24',
-      '2:6-20 -> 58:2-31',
-      '2:20 -> 59:0',
-      '2:6 -> 61:0',
-      '2:20 -> 63:1',
-      '2:6 -> 65:0',
-      '2:6-20 -> 66:2-35',
-      '2:20 -> 67:0',
-      '2:6 -> 69:0',
-      '2:20 -> 71:1',
-      '2:6 -> 73:0',
-      '2:6-20 -> 79:2-20',
-      '2:6-20 -> 80:2-22',
-      '2:20 -> 81:0',
-      '2:6 -> 83:0',
-      '2:20 -> 85:1',
-      '2:6 -> 87:0',
-      '2:6-20 -> 88:2-16',
-      '2:6-20 -> 89:2-26',
-      '2:20 -> 90:0',
-      '2:6 -> 92:0',
-      '2:20 -> 94:1',
-      '2:6 -> 96:0',
-      '2:6-20 -> 98:2-21',
-      '2:20 -> 99:0',
-      '2:6 -> 101:0',
-      '2:20 -> 104:1',
-      '2:6 -> 106:0',
-      '2:6-20 -> 110:2-121',
-      '2:6-20 -> 111:2-24',
-      '2:20 -> 112:0',
-      '2:6 -> 114:0',
-      '2:20 -> 116:1',
-      '2:6 -> 118:0',
-      '2:6-20 -> 119:2-16',
-      '2:20 -> 120:0',
-      '2:6 -> 122:0',
-      '2:20 -> 124:1',
-      '2:6 -> 126:0',
-      '2:6-20 -> 128:2-16',
-      '2:6-20 -> 129:2-16',
-      '2:6-20 -> 130:2-20',
-      '2:6-20 -> 131:2-26',
-      '2:20 -> 132:0',
-      '2:6 -> 134:0',
-      '2:6-20 -> 135:2-17',
-      '2:20 -> 136:0',
-      '2:6 -> 138:0',
-      '2:6-20 -> 139:2-13',
-      '2:20 -> 140:0',
-      '2:6 -> 142:0',
-      '2:20 -> 146:1',
-      '2:6 -> 148:0',
-      '2:6-20 -> 149:2-24',
-      '2:6-20 -> 150:2-31',
-      '2:6-20 -> 151:2-35',
-      '2:20 -> 152:0',
-      '2:6 -> 154:0',
-      '2:20 -> 158:1',
-      '2:6 -> 160:0',
-      '2:6-20 -> 165:2-30',
-      '2:6-20 -> 166:2-25',
+      '2:20 -> 29:1',
+      '2:6 -> 31:0',
+      '2:6-20 -> 32:2-26',
+      '2:6-20 -> 33:2-40',
+      '2:6-20 -> 34:2-26',
+      '2:6-20 -> 35:2-21',
+      '2:6-20 -> 36:2-230',
+      '2:6-20 -> 37:2-39',
+      '2:6-20 -> 38:2-41',
+      '2:20 -> 39:0',
+      '2:6 -> 41:0',
+      '2:20 -> 44:1',
+      '2:6 -> 46:0',
+      '2:6-20 -> 47:2-19',
+      '2:6-20 -> 48:2-30',
+      '2:20 -> 49:0',
+      '2:6 -> 51:0',
+      '2:20 -> 55:1',
+      '2:6 -> 57:0',
+      '2:6-20 -> 58:2-19',
+      '2:6-20 -> 59:2-24',
+      '2:6-20 -> 60:2-31',
+      '2:20 -> 61:0',
+      '2:6 -> 63:0',
+      '2:20 -> 65:1',
+      '2:6 -> 67:0',
+      '2:6-20 -> 68:2-35',
+      '2:20 -> 69:0',
+      '2:6 -> 71:0',
+      '2:20 -> 73:1',
+      '2:6 -> 75:0',
+      '2:6-20 -> 81:2-20',
+      '2:6-20 -> 82:2-22',
+      '2:20 -> 83:0',
+      '2:6 -> 85:0',
+      '2:20 -> 87:1',
+      '2:6 -> 89:0',
+      '2:6-20 -> 90:2-16',
+      '2:6-20 -> 91:2-26',
+      '2:20 -> 92:0',
+      '2:6 -> 94:0',
+      '2:20 -> 96:1',
+      '2:6 -> 98:0',
+      '2:6-20 -> 100:2-21',
+      '2:20 -> 101:0',
+      '2:6 -> 103:0',
+      '2:20 -> 106:1',
+      '2:6 -> 108:0',
+      '2:6-20 -> 112:2-121',
+      '2:6-20 -> 113:2-24',
+      '2:20 -> 114:0',
+      '2:6 -> 116:0',
+      '2:20 -> 118:1',
+      '2:6 -> 120:0',
+      '2:6-20 -> 121:2-16',
+      '2:20 -> 122:0',
+      '2:6 -> 124:0',
+      '2:20 -> 126:1',
+      '2:6 -> 128:0',
+      '2:6-20 -> 130:2-16',
+      '2:6-20 -> 131:2-16',
+      '2:6-20 -> 132:2-20',
+      '2:6-20 -> 133:2-26',
+      '2:20 -> 134:0',
+      '2:6 -> 136:0',
+      '2:6-20 -> 137:2-17',
+      '2:20 -> 138:0',
+      '2:6 -> 140:0',
+      '2:6-20 -> 141:2-13',
+      '2:20 -> 142:0',
+      '2:6 -> 144:0',
+      '2:20 -> 148:1',
+      '2:6 -> 150:0',
+      '2:6-20 -> 151:2-24',
+      '2:6-20 -> 152:2-31',
+      '2:6-20 -> 153:2-35',
+      '2:20 -> 154:0',
+      '2:6 -> 156:0',
+      '2:20 -> 160:1',
+      '2:6 -> 162:0',
       '2:6-20 -> 167:2-30',
-      '2:6-20 -> 168:2-30',
-      '2:6-20 -> 169:2-24',
-      '2:6-20 -> 170:2-19',
-      '2:6-20 -> 171:2-20',
-      '2:20 -> 172:0',
-      '2:6 -> 174:0',
-      '2:20 -> 176:1',
-      '2:6 -> 178:0',
-      '2:6-20 -> 180:2-22',
-      '2:20 -> 181:0',
-      '2:6 -> 183:0',
-      '2:20 -> 186:1',
-      '2:6 -> 188:0',
-      '2:6-20 -> 192:2-36',
-      '2:6-20 -> 193:2-39',
-      '2:6-20 -> 194:2-32',
-      '2:20 -> 195:0',
-      '2:6 -> 197:0',
-      '2:20 -> 199:1',
-      '2:6 -> 201:0',
-      '2:6-20 -> 202:2-15',
-      '2:20 -> 203:0',
-      '2:6 -> 205:0',
-      '2:20 -> 207:1',
-      '2:6 -> 209:0',
-      '2:6-20 -> 210:2-18',
-      '2:20 -> 211:0',
-      '2:6 -> 213:0',
-      '2:20 -> 215:1',
-      '2:6 -> 217:0',
-      '2:6-20 -> 218:2-26',
-      '2:20 -> 219:0',
-      '2:6 -> 221:0',
-      '2:20 -> 223:1',
-      '2:6 -> 225:0',
-      '2:6-20 -> 227:2-14',
-      '2:20 -> 228:0',
-      '2:6 -> 230:0',
-      '2:20 -> 233:1',
-      '2:6 -> 235:0',
-      '2:6-20 -> 236:2-39',
-      '2:6-20 -> 237:2-30',
-      '2:20 -> 238:0',
-      '2:6 -> 240:0',
-      '2:20 -> 242:1',
-      '2:6 -> 244:0',
-      '2:6-20 -> 245:2-26',
-      '2:20 -> 246:0',
-      '2:6 -> 248:0',
-      '2:20 -> 251:1',
-      '2:6 -> 253:0',
-      '2:6-20 -> 254:2-36',
-      '2:6-20 -> 255:2-23',
-      '2:20 -> 256:0',
-      '2:6 -> 258:0',
-      '2:20 -> 260:1',
-      '2:6 -> 262:0',
-      '2:6-20 -> 263:2-20',
-      '2:20 -> 264:0',
-      '2:6 -> 266:0',
-      '2:20 -> 268:1',
-      '2:6 -> 270:0',
-      '2:6-20 -> 283:2-11',
-      '2:20 -> 284:0',
-      '2:6 -> 286:0',
-      '2:6-20 -> 287:2-11',
-      '2:6-20 -> 288:2-12',
-      '2:20 -> 289:0',
-      '2:6 -> 291:0',
-      '2:6-20 -> 292:2-12',
-      '2:20 -> 293:0',
-      '2:6 -> 295:0',
-      '2:6-20 -> 298:2-18',
-      '2:6-20 -> 299:2-11',
-      '2:6-20 -> 300:2-12',
-      '2:20 -> 301:0',
-      '2:6 -> 303:0',
-      '2:20 -> 305:1',
-      '2:6 -> 307:0',
-      '2:6-20 -> 308:2-18',
-      '2:20 -> 309:0',
-      '2:6 -> 311:0',
-      '2:20 -> 314:1',
-      '2:6 -> 316:0',
-      '2:6-20 -> 318:2-20',
-      '2:6-20 -> 319:2-24',
-      '2:20 -> 320:0',
-      '2:6 -> 322:0',
-      '2:20 -> 324:1',
-      '2:6 -> 326:0',
-      '2:6-20 -> 328:2-17',
-      '2:20 -> 329:0',
-      '2:6 -> 331:0',
-      '2:20 -> 333:1',
-      '2:6 -> 334:0',
-      '2:6-20 -> 335:2-17',
-      '2:20 -> 336:0',
-      '2:6 -> 338:0',
-      '2:20 -> 342:1',
-      '2:6 -> 344:0',
-      '2:6-20 -> 352:2-24',
-      '2:6-20 -> 353:2-32',
-      '2:20 -> 354:0',
-      '2:6 -> 356:0',
-      '2:20 -> 358:1',
-      '2:6 -> 360:0',
-      '2:6-20 -> 362:2-17',
-      '2:6-20 -> 363:2-14',
-      '2:20 -> 364:0',
-      '2:6-20 -> 366:0-72',
-      '2:6 -> 367:0',
-      '2:6-20 -> 368:2-15',
-      '2:20 -> 369:0',
-      '2:6 -> 371:0',
-      '2:6-20 -> 372:2-26',
-      '2:6-20 -> 373:2-26',
-      '2:6-20 -> 374:2-21',
-      '2:6-20 -> 375:2-21',
-      '2:6-20 -> 376:2-16',
-      '2:6-20 -> 377:2-16',
+      '2:6-20 -> 168:2-25',
+      '2:6-20 -> 169:2-30',
+      '2:6-20 -> 170:2-30',
+      '2:6-20 -> 171:2-24',
+      '2:6-20 -> 172:2-19',
+      '2:6-20 -> 173:2-20',
+      '2:20 -> 174:0',
+      '2:6 -> 176:0',
+      '2:20 -> 178:1',
+      '2:6 -> 180:0',
+      '2:6-20 -> 182:2-22',
+      '2:20 -> 183:0',
+      '2:6 -> 185:0',
+      '2:20 -> 188:1',
+      '2:6 -> 190:0',
+      '2:6-20 -> 194:2-36',
+      '2:6-20 -> 195:2-39',
+      '2:6-20 -> 196:2-32',
+      '2:20 -> 197:0',
+      '2:6 -> 199:0',
+      '2:20 -> 201:1',
+      '2:6 -> 203:0',
+      '2:6-20 -> 204:2-15',
+      '2:20 -> 205:0',
+      '2:6 -> 207:0',
+      '2:20 -> 209:1',
+      '2:6 -> 211:0',
+      '2:6-20 -> 212:2-18',
+      '2:20 -> 213:0',
+      '2:6 -> 215:0',
+      '2:20 -> 217:1',
+      '2:6 -> 219:0',
+      '2:6-20 -> 220:2-26',
+      '2:20 -> 221:0',
+      '2:6 -> 223:0',
+      '2:20 -> 225:1',
+      '2:6 -> 227:0',
+      '2:6-20 -> 229:2-14',
+      '2:20 -> 230:0',
+      '2:6 -> 232:0',
+      '2:20 -> 235:1',
+      '2:6 -> 237:0',
+      '2:6-20 -> 238:2-39',
+      '2:6-20 -> 239:2-30',
+      '2:20 -> 240:0',
+      '2:6 -> 242:0',
+      '2:20 -> 244:1',
+      '2:6 -> 246:0',
+      '2:6-20 -> 247:2-26',
+      '2:20 -> 248:0',
+      '2:6 -> 250:0',
+      '2:20 -> 253:1',
+      '2:6 -> 255:0',
+      '2:6-20 -> 256:2-36',
+      '2:6-20 -> 257:2-23',
+      '2:20 -> 258:0',
+      '2:6 -> 260:0',
+      '2:20 -> 262:1',
+      '2:6 -> 264:0',
+      '2:6-20 -> 265:2-20',
+      '2:20 -> 266:0',
+      '2:6 -> 268:0',
+      '2:20 -> 270:1',
+      '2:6 -> 272:0',
+      '2:6-20 -> 285:2-11',
+      '2:20 -> 286:0',
+      '2:6 -> 288:0',
+      '2:6-20 -> 289:2-11',
+      '2:6-20 -> 290:2-12',
+      '2:20 -> 291:0',
+      '2:6 -> 293:0',
+      '2:6-20 -> 294:2-12',
+      '2:20 -> 295:0',
+      '2:6 -> 297:0',
+      '2:6-20 -> 300:2-18',
+      '2:6-20 -> 301:2-11',
+      '2:6-20 -> 302:2-12',
+      '2:20 -> 303:0',
+      '2:6 -> 305:0',
+      '2:20 -> 307:1',
+      '2:6 -> 309:0',
+      '2:6-20 -> 310:2-18',
+      '2:20 -> 311:0',
+      '2:6 -> 313:0',
+      '2:20 -> 316:1',
+      '2:6 -> 318:0',
+      '2:6-20 -> 320:2-20',
+      '2:6-20 -> 321:2-24',
+      '2:20 -> 322:0',
+      '2:6 -> 324:0',
+      '2:20 -> 326:1',
+      '2:6 -> 328:0',
+      '2:6-20 -> 330:2-17',
+      '2:20 -> 331:0',
+      '2:6 -> 333:0',
+      '2:20 -> 335:1',
+      '2:6 -> 336:0',
+      '2:6-20 -> 337:2-17',
+      '2:20 -> 338:0',
+      '2:6 -> 340:0',
+      '2:20 -> 344:1',
+      '2:6 -> 346:0',
+      '2:6-20 -> 354:2-24',
+      '2:6-20 -> 355:2-32',
+      '2:20 -> 356:0',
+      '2:6 -> 358:0',
+      '2:20 -> 360:1',
+      '2:6 -> 362:0',
+      '2:6-20 -> 364:2-17',
+      '2:6-20 -> 365:2-14',
+      '2:20 -> 366:0',
+      '2:6-20 -> 368:0-72',
+      '2:6 -> 369:0',
+      '2:6-20 -> 370:2-15',
+      '2:20 -> 371:0',
+      '2:6 -> 373:0',
+      '2:6-20 -> 374:2-26',
+      '2:6-20 -> 375:2-26',
+      '2:6-20 -> 376:2-21',
+      '2:6-20 -> 377:2-21',
       '2:6-20 -> 378:2-16',
-      '2:6-20 -> 379:2-17',
-      '2:6-20 -> 380:2-17',
-      '2:6-20 -> 381:2-15',
-      '2:6-20 -> 382:2-15',
-      '2:6-20 -> 383:2-20',
-      '2:6-20 -> 384:2-40',
-      '2:6-20 -> 385:2-17',
-      '2:6-20 -> 386:2-22',
-      '2:6-20 -> 387:2-24',
-      '2:6-20 -> 388:2-25',
-      '2:6-20 -> 389:2-26',
-      '2:6-20 -> 390:2-20',
-      '2:6-20 -> 391:2-29',
-      '2:6-20 -> 392:2-30',
-      '2:6-20 -> 393:2-40',
-      '2:6-20 -> 394:2-36',
-      '2:6-20 -> 395:2-29',
-      '2:6-20 -> 396:2-24',
-      '2:6-20 -> 397:2-32',
-      '2:6-20 -> 398:2-14',
-      '2:6-20 -> 399:2-20',
-      '2:6-20 -> 400:2-18',
-      '2:6-20 -> 401:2-19',
-      '2:6-20 -> 402:2-20',
-      '2:6-20 -> 403:2-16',
-      '2:6-20 -> 404:2-18',
-      '2:6-20 -> 405:2-15',
-      '2:6-20 -> 406:2-21',
-      '2:6-20 -> 407:2-23',
-      '2:6-20 -> 408:2-29',
-      '2:6-20 -> 409:2-27',
-      '2:6-20 -> 410:2-28',
-      '2:6-20 -> 411:2-29',
-      '2:6-20 -> 412:2-25',
-      '2:6-20 -> 413:2-26',
-      '2:6-20 -> 414:2-27',
-      '2:6 -> 415:2',
-      '2:20 -> 416:0',
-      '2:6 -> 418:0',
-      '2:6-20 -> 419:2-26',
-      '2:6-20 -> 420:2-26',
-      '2:6-20 -> 421:2-21',
-      '2:6-20 -> 422:2-21',
-      '2:6-20 -> 423:2-16',
-      '2:6-20 -> 424:2-16',
+      '2:6-20 -> 379:2-16',
+      '2:6-20 -> 380:2-16',
+      '2:6-20 -> 381:2-17',
+      '2:6-20 -> 382:2-17',
+      '2:6-20 -> 383:2-15',
+      '2:6-20 -> 384:2-15',
+      '2:6-20 -> 385:2-20',
+      '2:6-20 -> 386:2-40',
+      '2:6-20 -> 387:2-17',
+      '2:6-20 -> 388:2-22',
+      '2:6-20 -> 389:2-24',
+      '2:6-20 -> 390:2-25',
+      '2:6-20 -> 391:2-26',
+      '2:6-20 -> 392:2-20',
+      '2:6-20 -> 393:2-29',
+      '2:6-20 -> 394:2-30',
+      '2:6-20 -> 395:2-40',
+      '2:6-20 -> 396:2-36',
+      '2:6-20 -> 397:2-29',
+      '2:6-20 -> 398:2-24',
+      '2:6-20 -> 399:2-32',
+      '2:6-20 -> 400:2-14',
+      '2:6-20 -> 401:2-20',
+      '2:6-20 -> 402:2-18',
+      '2:6-20 -> 403:2-19',
+      '2:6-20 -> 404:2-20',
+      '2:6-20 -> 405:2-16',
+      '2:6-20 -> 406:2-18',
+      '2:6-20 -> 407:2-15',
+      '2:6-20 -> 408:2-21',
+      '2:6-20 -> 409:2-23',
+      '2:6-20 -> 410:2-29',
+      '2:6-20 -> 411:2-27',
+      '2:6-20 -> 412:2-28',
+      '2:6-20 -> 413:2-29',
+      '2:6-20 -> 414:2-25',
+      '2:6-20 -> 415:2-26',
+      '2:6-20 -> 416:2-27',
+      '2:6 -> 417:2',
+      '2:20 -> 418:0',
+      '2:6 -> 420:0',
+      '2:6-20 -> 421:2-26',
+      '2:6-20 -> 422:2-26',
+      '2:6-20 -> 423:2-21',
+      '2:6-20 -> 424:2-21',
       '2:6-20 -> 425:2-16',
-      '2:6-20 -> 426:2-17',
-      '2:6-20 -> 427:2-17',
-      '2:6-20 -> 428:2-15',
-      '2:6-20 -> 429:2-15',
-      '2:6-20 -> 430:2-20',
-      '2:6-20 -> 431:2-40',
-      '2:6-20 -> 432:2-17',
-      '2:6-20 -> 433:2-22',
-      '2:6-20 -> 434:2-24',
-      '2:6-20 -> 435:2-25',
-      '2:6-20 -> 436:2-26',
-      '2:6-20 -> 437:2-20',
-      '2:6-20 -> 438:2-29',
-      '2:6-20 -> 439:2-30',
-      '2:6-20 -> 440:2-40',
-      '2:6-20 -> 441:2-36',
-      '2:6-20 -> 442:2-29',
-      '2:6-20 -> 443:2-24',
-      '2:6-20 -> 444:2-32',
-      '2:6-20 -> 445:2-14',
-      '2:6-20 -> 446:2-20',
-      '2:6-20 -> 447:2-18',
-      '2:6-20 -> 448:2-19',
-      '2:6-20 -> 449:2-20',
-      '2:6-20 -> 450:2-16',
-      '2:6-20 -> 451:2-18',
-      '2:6-20 -> 452:2-15',
-      '2:6-20 -> 453:2-21',
-      '2:6-20 -> 454:2-23',
-      '2:6-20 -> 455:2-29',
-      '2:6-20 -> 456:2-27',
-      '2:6-20 -> 457:2-28',
-      '2:6-20 -> 458:2-29',
-      '2:6-20 -> 459:2-25',
-      '2:6-20 -> 460:2-26',
-      '2:6-20 -> 461:2-27',
-      '2:6 -> 462:2',
-      '2:20 -> 463:0',
+      '2:6-20 -> 426:2-16',
+      '2:6-20 -> 427:2-16',
+      '2:6-20 -> 428:2-17',
+      '2:6-20 -> 429:2-17',
+      '2:6-20 -> 430:2-15',
+      '2:6-20 -> 431:2-15',
+      '2:6-20 -> 432:2-20',
+      '2:6-20 -> 433:2-40',
+      '2:6-20 -> 434:2-17',
+      '2:6-20 -> 435:2-22',
+      '2:6-20 -> 436:2-24',
+      '2:6-20 -> 437:2-25',
+      '2:6-20 -> 438:2-26',
+      '2:6-20 -> 439:2-20',
+      '2:6-20 -> 440:2-29',
+      '2:6-20 -> 441:2-30',
+      '2:6-20 -> 442:2-40',
+      '2:6-20 -> 443:2-36',
+      '2:6-20 -> 444:2-29',
+      '2:6-20 -> 445:2-24',
+      '2:6-20 -> 446:2-32',
+      '2:6-20 -> 447:2-14',
+      '2:6-20 -> 448:2-20',
+      '2:6-20 -> 449:2-18',
+      '2:6-20 -> 450:2-19',
+      '2:6-20 -> 451:2-20',
+      '2:6-20 -> 452:2-16',
+      '2:6-20 -> 453:2-18',
+      '2:6-20 -> 454:2-15',
+      '2:6-20 -> 455:2-21',
+      '2:6-20 -> 456:2-23',
+      '2:6-20 -> 457:2-29',
+      '2:6-20 -> 458:2-27',
+      '2:6-20 -> 459:2-28',
+      '2:6-20 -> 460:2-29',
+      '2:6-20 -> 461:2-25',
+      '2:6-20 -> 462:2-26',
+      '2:6-20 -> 463:2-27',
+      '2:6 -> 464:2',
+      '2:20 -> 465:0',
     ])
   })
 
diff --git a/types/config.d.ts b/types/config.d.ts
index 7b2a3eebcf60..81e3c342db16 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -168,7 +168,13 @@ interface ThemeConfig {
       string,
       | string
       | string[]
-      | [fontFamily: string | string[], configuration: Partial<{ fontFeatureSettings: string }>]
+      | [
+          fontFamily: string | string[],
+          configuration: Partial<{
+            fontFeatureSettings: string
+            fontVariationSettings: string
+          }>
+        ]
     >
   >
   fontSize: ResolvableTo<