@atlaskit/eslint-plugin-design-system 10.4.0 → 10.4.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 10.4.1
+
+### Patch Changes
+
+-   [#103215](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103215)
+    [`1108a9b46be2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1108a9b46be2) -
+    Fixed an issue with the `use-tokens-typography` rule where font family properties that were
+    already using a token could be misinterpreted and cause the font family property to be removed.
+
 ## 10.4.0
 
 ### Minor Changes

package/dist/cjs/rules/use-tokens-typography/transformers/style-object.js

@@ -95,6 +95,12 @@ var StyleObject = exports.StyleObject = {
     var fontFamilyNode = _astNodes.Object.getEntryByPropertyName(node, 'fontFamily');
     var fontFamilyRaw = fontFamilyNode && (0, _utils.getValueForPropertyNode)(fontFamilyNode, context);
     var fontFamilyValue = fontFamilyRaw && (0, _utils.normaliseValue)('fontFamily', fontFamilyRaw) || undefined;
+
+    // If font family is already a token, we remove and re-add it
+    // Only need to do this for non-default font stacks as the defaults can be safely removed
+    if (fontFamilyValue && fontFamilyValue.includes('font.family.') && !(fontFamilyValue.includes('font.family.heading') || fontFamilyValue.includes('font.family.body'))) {
+      fontFamilyValue = undefined;
+    }
     var fontFamilyToAdd;
     // If font family uses the Charlie font we can't replace; exit
     if (fontFamilyValue) {

package/dist/es2019/rules/use-tokens-typography/transformers/style-object.js

@@ -88,7 +88,13 @@ export const StyleObject = {
     // -- Font family --
     const fontFamilyNode = ASTObject.getEntryByPropertyName(node, 'fontFamily');
     const fontFamilyRaw = fontFamilyNode && getValueForPropertyNode(fontFamilyNode, context);
-    const fontFamilyValue = fontFamilyRaw && normaliseValue('fontFamily', fontFamilyRaw) || undefined;
+    let fontFamilyValue = fontFamilyRaw && normaliseValue('fontFamily', fontFamilyRaw) || undefined;
+
+    // If font family is already a token, we remove and re-add it
+    // Only need to do this for non-default font stacks as the defaults can be safely removed
+    if (fontFamilyValue && fontFamilyValue.includes('font.family.') && !(fontFamilyValue.includes('font.family.heading') || fontFamilyValue.includes('font.family.body'))) {
+      fontFamilyValue = undefined;
+    }
     let fontFamilyToAdd;
     // If font family uses the Charlie font we can't replace; exit
     if (fontFamilyValue) {

package/dist/esm/rules/use-tokens-typography/transformers/style-object.js

@@ -89,6 +89,12 @@ export var StyleObject = {
     var fontFamilyNode = ASTObject.getEntryByPropertyName(node, 'fontFamily');
     var fontFamilyRaw = fontFamilyNode && getValueForPropertyNode(fontFamilyNode, context);
     var fontFamilyValue = fontFamilyRaw && normaliseValue('fontFamily', fontFamilyRaw) || undefined;
+
+    // If font family is already a token, we remove and re-add it
+    // Only need to do this for non-default font stacks as the defaults can be safely removed
+    if (fontFamilyValue && fontFamilyValue.includes('font.family.') && !(fontFamilyValue.includes('font.family.heading') || fontFamilyValue.includes('font.family.body'))) {
+      fontFamilyValue = undefined;
+    }
     var fontFamilyToAdd;
     // If font family uses the Charlie font we can't replace; exit
     if (fontFamilyValue) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atlaskit/eslint-plugin-design-system",
   "description": "The essential plugin for use with the Atlassian Design System.",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
   "publishConfig": {