@atlaskit/eslint-plugin-design-system 13.43.2 → 13.44.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 13.44.0
+
+### Minor Changes
+
+- [`bc69c1d196bae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bc69c1d196bae) -
+  Removed `shouldEnforceFallbacks` option from the `use-tokens-typography` rule. The auto-fixer no
+  longer adds `fontFallback` imports from `@atlaskit/theme/typography`.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.43.2
 
 ### Patch Changes

package/dist/cjs/rules/use-tokens-typography/config/index.js

@@ -14,9 +14,6 @@ var ruleSchema = exports.ruleSchema = {
       failSilently: {
         type: 'boolean'
       },
-      shouldEnforceFallbacks: {
-        type: 'boolean'
-      },
       enableUnsafeAutofix: {
         type: 'boolean'
       },
@@ -32,7 +29,6 @@ var ruleSchema = exports.ruleSchema = {
 };
 var defaultConfig = {
   failSilently: false,
-  shouldEnforceFallbacks: false,
   enableUnsafeAutofix: false,
   patterns: ['style-object', 'font-weight', 'font-family', 'untokenized-properties', 'banned-properties', 'restricted-capitalisation']
 };

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

@@ -37,10 +37,7 @@ var StyleObject = exports.StyleObject = {
     }
     var fontSizeNode = refs.fontSizeNode,
       fontSizeRaw = refs.fontSizeRaw,
-      tokensImportNode = refs.tokensImportNode,
-      themeImportNode = refs.themeImportNode,
-      shouldAddFallback = refs.shouldAddFallback,
-      shouldAddFallbackImport = refs.shouldAddFallbackImport;
+      tokensImportNode = refs.tokensImportNode;
     var fontSizeValue = (0, _utils.normaliseValue)('fontSize', fontSizeRaw);
 
     // -- Font weight --
@@ -158,18 +155,15 @@ var StyleObject = exports.StyleObject = {
       var nodesToReplace = [fontSizeNode, fontWeightNode, lineHeightNode, fontFamilyNode, fontStyleNode, letterSpacingNode].filter(_utils2.notUndefined);
       var fontFamilyTokenName = fontFamilyToAdd ? "font.family.brand.".concat(fontFamilyToAdd) : '';
       var fontWeightReplacementToken = shouldAddFontWeight ? (0, _utils2.findFontWeightTokenForValue)(fontWeightValue) : undefined;
-      var fontWeightReplacement = fontWeightReplacementToken && (0, _utils2.getTokenProperty)('fontWeight', fontWeightReplacementToken.tokenName, shouldAddFallback ? fontWeightValue : undefined);
+      var fontWeightReplacement = fontWeightReplacementToken && (0, _utils2.getTokenProperty)('fontWeight', fontWeightReplacementToken.tokenName);
       var fontFamilyReplacement = fontFamilyToAdd && (fontFamilyToAdd === 'original' ? (0, _utils2.convertPropertyNodeToStringableNode)(
       // This will always exist if fontFamilyToAdd === 'original', TS can't figure that out.
-      fontFamilyNode) : (0, _utils2.getTokenProperty)('fontFamily', fontFamilyTokenName, shouldAddFallback ? (0, _utils2.findFontFamilyValueForToken)(fontFamilyTokenName) : undefined));
+      fontFamilyNode) : (0, _utils2.getTokenProperty)('fontFamily', fontFamilyTokenName));
       var fontStyleReplacement = fontStyleToAdd && (0, _utils2.getLiteralProperty)('fontStyle', fontStyleToAdd);
       var fixerRefs = {
         matchingToken: matchingToken,
         nodesToReplace: nodesToReplace,
         tokensImportNode: tokensImportNode,
-        themeImportNode: themeImportNode,
-        shouldAddFallback: shouldAddFallback,
-        shouldAddFallbackImport: shouldAddFallbackImport,
         fontWeightReplacement: fontWeightReplacement,
         fontFamilyReplacement: fontFamilyReplacement,
         fontStyleReplacement: fontStyleReplacement
@@ -231,40 +225,12 @@ var StyleObject = exports.StyleObject = {
         success: false
       };
     }
-    var shouldAddFallback = Boolean(config.shouldEnforceFallbacks);
-    // This exists purely because we're not inlining the fallback values
-    // and instead referencing a `fontFallback` object that exists in @atlaskit/theme/typography.
-    // This is a temporary measure until fallbacks are no longer required
-    var shouldAddFallbackImport = shouldAddFallback && 'full';
-    var themeImportDeclaration = _astNodes.Root.findImportsByModule((0, _contextCompat.getSourceCode)(context).ast.body, '@atlaskit/theme/typography');
-    if (themeImportDeclaration.length && shouldAddFallback) {
-      // Import exists, check if specifier exists
-      shouldAddFallbackImport = 'specifier';
-      var fallbackImport = themeImportDeclaration[0].specifiers.find(function (specifier) {
-        // @atlaskit/theme/typography has no default export so we can safely narrow this type
-        if (!(0, _eslintCodemodUtils.isNodeOfType)(specifier, 'ImportSpecifier')) {
-          return false;
-        }
-        if ('name' in specifier.imported && specifier.imported.name === 'fontFallback') {
-          return true;
-        }
-        return false;
-      });
-
-      // Exact import already exists, no need to add
-      if (fallbackImport) {
-        shouldAddFallbackImport = false;
-      }
-    }
     return {
       success: true,
       refs: {
         fontSizeNode: fontSizeNode,
         fontSizeRaw: fontSizeRaw,
-        tokensImportNode: tokensImportDeclaration[0],
-        themeImportNode: themeImportDeclaration[0],
-        shouldAddFallback: shouldAddFallback,
-        shouldAddFallbackImport: shouldAddFallbackImport
+        tokensImportNode: tokensImportDeclaration[0]
       }
     };
   },
@@ -273,25 +239,15 @@ var StyleObject = exports.StyleObject = {
       var matchingToken = refs.matchingToken,
         nodesToReplace = refs.nodesToReplace,
         tokensImportNode = refs.tokensImportNode,
-        themeImportNode = refs.themeImportNode,
-        shouldAddFallback = refs.shouldAddFallback,
-        shouldAddFallbackImport = refs.shouldAddFallbackImport,
         fontWeightReplacement = refs.fontWeightReplacement,
         fontFamilyReplacement = refs.fontFamilyReplacement,
         fontStyleReplacement = refs.fontStyleReplacement;
       var fontSizeNode = nodesToReplace[0];
       var root = (0, _contextCompat.getSourceCode)(context).ast.body;
-      var fallbackImport;
-      if (shouldAddFallbackImport === 'full') {
-        fallbackImport = (0, _utils2.insertFallbackImportFull)(root, fixer);
-      } else if (shouldAddFallbackImport === 'specifier') {
-        fallbackImport = (0, _utils2.insertFallbackImportSpecifier)(fixer, themeImportNode);
-      }
-      var fallbackName = (matchingToken.tokenName === 'font.body' ? 'font.body.medium' : matchingToken.tokenName).replace('font', 'fontFallback');
-      return (!tokensImportNode ? [(0, _utils2.insertTokensImport)(root, fixer)] : []).concat(fallbackImport ? [fallbackImport] : [], nodesToReplace.map(function (node, index) {
+      return (!tokensImportNode ? [(0, _utils2.insertTokensImport)(root, fixer)] : []).concat(nodesToReplace.map(function (node, index) {
         // Replace first node with token, delete remaining nodes. Guaranteed to be fontSize
         if (index === 0) {
-          return fixer.replaceText(node, "".concat((0, _utils2.getTokenProperty)('font', matchingToken.tokenName, shouldAddFallback ? fallbackName : undefined, true)));
+          return fixer.replaceText(node, "".concat((0, _utils2.getTokenProperty)('font', matchingToken.tokenName, undefined, true)));
         }
 
         // We don't replace fontWeight/fontFamily/fontStyle here in case it occurs before the font property.

package/dist/cjs/rules/use-tokens-typography/utils.js

@@ -6,14 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.convertPropertyNodeToStringableNode = convertPropertyNodeToStringableNode;
 exports.defaultFontWeight = void 0;
 exports.findFontFamilyTokenForValue = findFontFamilyTokenForValue;
-exports.findFontFamilyValueForToken = findFontFamilyValueForToken;
 exports.findFontWeightTokenForValue = findFontWeightTokenForValue;
 exports.findTypographyTokenForValues = findTypographyTokenForValues;
-exports.fontWeightTokens = exports.fontWeightMap = exports.fontFamilyTokens = void 0;
+exports.fontWeightTokens = exports.fontWeightMap = void 0;
 exports.getLiteralProperty = getLiteralProperty;
 exports.getTokenProperty = getTokenProperty;
-exports.insertFallbackImportFull = insertFallbackImportFull;
-exports.insertFallbackImportSpecifier = insertFallbackImportSpecifier;
 exports.insertTokensImport = insertTokensImport;
 exports.isTypographyProperty = exports.isFontSizeSmall = exports.isFontSize = exports.isFontFamily = exports.isCodeFontFamily = void 0;
 exports.isValidPropertyNode = isValidPropertyNode;
@@ -130,16 +127,6 @@ var fontWeightMap = exports.fontWeightMap = {
   bold: '700'
 };
 var defaultFontWeight = exports.defaultFontWeight = fontWeightMap.regular;
-var fontFamilyTokens = exports.fontFamilyTokens = _tokensRaw.typography.filter(function (token) {
-  return token.attributes.group === 'fontFamily';
-});
-function findFontFamilyValueForToken(tokenName) {
-  var _fontFamilyTokens$fin;
-  // Note this will only ever be undefined if the tokens get renamed, and should never happen.
-  return ((_fontFamilyTokens$fin = fontFamilyTokens.find(function (token) {
-    return token.cleanName === tokenName;
-  })) === null || _fontFamilyTokens$fin === void 0 ? void 0 : _fontFamilyTokens$fin.value) || '';
-}
 function findFontFamilyTokenForValue(value) {
   if (/charlie[\s-]?display/i.test(value)) {
     return 'font.family.brand.heading';
@@ -211,13 +198,4 @@ function insertTokensImport(root, fixer) {
     module: '@atlaskit/tokens',
     specifiers: ['token']
   }, fixer);
-}
-function insertFallbackImportFull(root, fixer) {
-  return _astNodes.Root.insertImport(root, {
-    module: '@atlaskit/theme/typography',
-    specifiers: ['fontFallback']
-  }, fixer);
-}
-function insertFallbackImportSpecifier(fixer, themeImportNode) {
-  return _astNodes.Import.insertNamedSpecifiers(themeImportNode, ['fontFallback'], fixer);
 }

package/dist/es2019/rules/use-tokens-typography/config/index.js

@@ -8,9 +8,6 @@ export const ruleSchema = {
       failSilently: {
         type: 'boolean'
       },
-      shouldEnforceFallbacks: {
-        type: 'boolean'
-      },
       enableUnsafeAutofix: {
         type: 'boolean'
       },
@@ -26,7 +23,6 @@ export const ruleSchema = {
 };
 const defaultConfig = {
   failSilently: false,
-  shouldEnforceFallbacks: false,
   enableUnsafeAutofix: false,
   patterns: ['style-object', 'font-weight', 'font-family', 'untokenized-properties', 'banned-properties', 'restricted-capitalisation']
 };

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

@@ -5,7 +5,7 @@ import { getSourceCode } from '@atlaskit/eslint-utils/context-compat';
 import { Object as ASTObject, ObjectEntry, Root } from '../../../ast-nodes';
 import { getValueForPropertyNode, normaliseValue } from '../../ensure-design-token-usage/utils';
 import { isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfType } from '../../utils/is-node';
-import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontFamilyValueForToken, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertFallbackImportFull, insertFallbackImportSpecifier, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
+import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
 export const StyleObject = {
   lint(node, {
     context,
@@ -32,10 +32,7 @@ export const StyleObject = {
     const {
       fontSizeNode,
       fontSizeRaw,
-      tokensImportNode,
-      themeImportNode,
-      shouldAddFallback,
-      shouldAddFallbackImport
+      tokensImportNode
     } = refs;
     const fontSizeValue = normaliseValue('fontSize', fontSizeRaw);
 
@@ -152,18 +149,15 @@ export const StyleObject = {
       const nodesToReplace = [fontSizeNode, fontWeightNode, lineHeightNode, fontFamilyNode, fontStyleNode, letterSpacingNode].filter(notUndefined);
       const fontFamilyTokenName = fontFamilyToAdd ? `font.family.brand.${fontFamilyToAdd}` : '';
       const fontWeightReplacementToken = shouldAddFontWeight ? findFontWeightTokenForValue(fontWeightValue) : undefined;
-      const fontWeightReplacement = fontWeightReplacementToken && getTokenProperty('fontWeight', fontWeightReplacementToken.tokenName, shouldAddFallback ? fontWeightValue : undefined);
+      const fontWeightReplacement = fontWeightReplacementToken && getTokenProperty('fontWeight', fontWeightReplacementToken.tokenName);
       const fontFamilyReplacement = fontFamilyToAdd && (fontFamilyToAdd === 'original' ? convertPropertyNodeToStringableNode(
       // This will always exist if fontFamilyToAdd === 'original', TS can't figure that out.
-      fontFamilyNode) : getTokenProperty('fontFamily', fontFamilyTokenName, shouldAddFallback ? findFontFamilyValueForToken(fontFamilyTokenName) : undefined));
+      fontFamilyNode) : getTokenProperty('fontFamily', fontFamilyTokenName));
       const fontStyleReplacement = fontStyleToAdd && getLiteralProperty('fontStyle', fontStyleToAdd);
       const fixerRefs = {
         matchingToken,
         nodesToReplace,
         tokensImportNode,
-        themeImportNode,
-        shouldAddFallback,
-        shouldAddFallbackImport,
         fontWeightReplacement,
         fontFamilyReplacement,
         fontStyleReplacement
@@ -227,40 +221,12 @@ export const StyleObject = {
         success: false
       };
     }
-    const shouldAddFallback = Boolean(config.shouldEnforceFallbacks);
-    // This exists purely because we're not inlining the fallback values
-    // and instead referencing a `fontFallback` object that exists in @atlaskit/theme/typography.
-    // This is a temporary measure until fallbacks are no longer required
-    let shouldAddFallbackImport = shouldAddFallback && 'full';
-    const themeImportDeclaration = Root.findImportsByModule(getSourceCode(context).ast.body, '@atlaskit/theme/typography');
-    if (themeImportDeclaration.length && shouldAddFallback) {
-      // Import exists, check if specifier exists
-      shouldAddFallbackImport = 'specifier';
-      const fallbackImport = themeImportDeclaration[0].specifiers.find(specifier => {
-        // @atlaskit/theme/typography has no default export so we can safely narrow this type
-        if (!isNodeOfType(specifier, 'ImportSpecifier')) {
-          return false;
-        }
-        if ('name' in specifier.imported && specifier.imported.name === 'fontFallback') {
-          return true;
-        }
-        return false;
-      });
-
-      // Exact import already exists, no need to add
-      if (fallbackImport) {
-        shouldAddFallbackImport = false;
-      }
-    }
     return {
       success: true,
       refs: {
         fontSizeNode,
         fontSizeRaw,
-        tokensImportNode: tokensImportDeclaration[0],
-        themeImportNode: themeImportDeclaration[0],
-        shouldAddFallback,
-        shouldAddFallbackImport
+        tokensImportNode: tokensImportDeclaration[0]
       }
     };
   },
@@ -270,26 +236,16 @@ export const StyleObject = {
         matchingToken,
         nodesToReplace,
         tokensImportNode,
-        themeImportNode,
-        shouldAddFallback,
-        shouldAddFallbackImport,
         fontWeightReplacement,
         fontFamilyReplacement,
         fontStyleReplacement
       } = refs;
       const fontSizeNode = nodesToReplace[0];
       const root = getSourceCode(context).ast.body;
-      let fallbackImport;
-      if (shouldAddFallbackImport === 'full') {
-        fallbackImport = insertFallbackImportFull(root, fixer);
-      } else if (shouldAddFallbackImport === 'specifier') {
-        fallbackImport = insertFallbackImportSpecifier(fixer, themeImportNode);
-      }
-      const fallbackName = (matchingToken.tokenName === 'font.body' ? 'font.body.medium' : matchingToken.tokenName).replace('font', 'fontFallback');
-      return (!tokensImportNode ? [insertTokensImport(root, fixer)] : []).concat(fallbackImport ? [fallbackImport] : [], nodesToReplace.map((node, index) => {
+      return (!tokensImportNode ? [insertTokensImport(root, fixer)] : []).concat(nodesToReplace.map((node, index) => {
         // Replace first node with token, delete remaining nodes. Guaranteed to be fontSize
         if (index === 0) {
-          return fixer.replaceText(node, `${getTokenProperty('font', matchingToken.tokenName, shouldAddFallback ? fallbackName : undefined, true)}`);
+          return fixer.replaceText(node, `${getTokenProperty('font', matchingToken.tokenName, undefined, true)}`);
         }
 
         // We don't replace fontWeight/fontFamily/fontStyle here in case it occurs before the font property.

package/dist/es2019/rules/use-tokens-typography/utils.js

@@ -1,7 +1,7 @@
 import { callExpression, identifier, isNodeOfType, literal, memberExpression, property } from 'eslint-codemod-utils';
 import { typographyPalette } from '@atlaskit/tokens/palettes-raw';
 import { typography as typographyTokens } from '@atlaskit/tokens/tokens-raw';
-import { Import, Root } from '../../ast-nodes';
+import { Root } from '../../ast-nodes';
 export const typographyProperties = ['fontSize', 'fontWeight', 'fontFamily', 'lineHeight'];
 export const isTypographyProperty = propertyName => {
   return typographyProperties.includes(propertyName);
@@ -73,12 +73,6 @@ export const fontWeightMap = {
   bold: '700'
 };
 export const defaultFontWeight = fontWeightMap.regular;
-export const fontFamilyTokens = typographyTokens.filter(token => token.attributes.group === 'fontFamily');
-export function findFontFamilyValueForToken(tokenName) {
-  var _fontFamilyTokens$fin;
-  // Note this will only ever be undefined if the tokens get renamed, and should never happen.
-  return ((_fontFamilyTokens$fin = fontFamilyTokens.find(token => token.cleanName === tokenName)) === null || _fontFamilyTokens$fin === void 0 ? void 0 : _fontFamilyTokens$fin.value) || '';
-}
 export function findFontFamilyTokenForValue(value) {
   if (/charlie[\s-]?display/i.test(value)) {
     return 'font.family.brand.heading';
@@ -148,13 +142,4 @@ export function insertTokensImport(root, fixer) {
     module: '@atlaskit/tokens',
     specifiers: ['token']
   }, fixer);
-}
-export function insertFallbackImportFull(root, fixer) {
-  return Root.insertImport(root, {
-    module: '@atlaskit/theme/typography',
-    specifiers: ['fontFallback']
-  }, fixer);
-}
-export function insertFallbackImportSpecifier(fixer, themeImportNode) {
-  return Import.insertNamedSpecifiers(themeImportNode, ['fontFallback'], fixer);
 }

package/dist/esm/rules/use-tokens-typography/config/index.js

@@ -8,9 +8,6 @@ export var ruleSchema = {
       failSilently: {
         type: 'boolean'
       },
-      shouldEnforceFallbacks: {
-        type: 'boolean'
-      },
       enableUnsafeAutofix: {
         type: 'boolean'
       },
@@ -26,7 +23,6 @@ export var ruleSchema = {
 };
 var defaultConfig = {
   failSilently: false,
-  shouldEnforceFallbacks: false,
   enableUnsafeAutofix: false,
   patterns: ['style-object', 'font-weight', 'font-family', 'untokenized-properties', 'banned-properties', 'restricted-capitalisation']
 };

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

@@ -8,7 +8,7 @@ import { getSourceCode } from '@atlaskit/eslint-utils/context-compat';
 import { Object as ASTObject, ObjectEntry, Root } from '../../../ast-nodes';
 import { getValueForPropertyNode, normaliseValue } from '../../ensure-design-token-usage/utils';
 import { isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfType } from '../../utils/is-node';
-import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontFamilyValueForToken, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertFallbackImportFull, insertFallbackImportSpecifier, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
+import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
 export var StyleObject = {
   lint: function lint(node, _ref) {
     var context = _ref.context,
@@ -32,10 +32,7 @@ export var StyleObject = {
     }
     var fontSizeNode = refs.fontSizeNode,
       fontSizeRaw = refs.fontSizeRaw,
-      tokensImportNode = refs.tokensImportNode,
-      themeImportNode = refs.themeImportNode,
-      shouldAddFallback = refs.shouldAddFallback,
-      shouldAddFallbackImport = refs.shouldAddFallbackImport;
+      tokensImportNode = refs.tokensImportNode;
     var fontSizeValue = normaliseValue('fontSize', fontSizeRaw);
 
     // -- Font weight --
@@ -153,18 +150,15 @@ export var StyleObject = {
       var nodesToReplace = [fontSizeNode, fontWeightNode, lineHeightNode, fontFamilyNode, fontStyleNode, letterSpacingNode].filter(notUndefined);
       var fontFamilyTokenName = fontFamilyToAdd ? "font.family.brand.".concat(fontFamilyToAdd) : '';
       var fontWeightReplacementToken = shouldAddFontWeight ? findFontWeightTokenForValue(fontWeightValue) : undefined;
-      var fontWeightReplacement = fontWeightReplacementToken && getTokenProperty('fontWeight', fontWeightReplacementToken.tokenName, shouldAddFallback ? fontWeightValue : undefined);
+      var fontWeightReplacement = fontWeightReplacementToken && getTokenProperty('fontWeight', fontWeightReplacementToken.tokenName);
       var fontFamilyReplacement = fontFamilyToAdd && (fontFamilyToAdd === 'original' ? convertPropertyNodeToStringableNode(
       // This will always exist if fontFamilyToAdd === 'original', TS can't figure that out.
-      fontFamilyNode) : getTokenProperty('fontFamily', fontFamilyTokenName, shouldAddFallback ? findFontFamilyValueForToken(fontFamilyTokenName) : undefined));
+      fontFamilyNode) : getTokenProperty('fontFamily', fontFamilyTokenName));
       var fontStyleReplacement = fontStyleToAdd && getLiteralProperty('fontStyle', fontStyleToAdd);
       var fixerRefs = {
         matchingToken: matchingToken,
         nodesToReplace: nodesToReplace,
         tokensImportNode: tokensImportNode,
-        themeImportNode: themeImportNode,
-        shouldAddFallback: shouldAddFallback,
-        shouldAddFallbackImport: shouldAddFallbackImport,
         fontWeightReplacement: fontWeightReplacement,
         fontFamilyReplacement: fontFamilyReplacement,
         fontStyleReplacement: fontStyleReplacement
@@ -226,40 +220,12 @@ export var StyleObject = {
         success: false
       };
     }
-    var shouldAddFallback = Boolean(config.shouldEnforceFallbacks);
-    // This exists purely because we're not inlining the fallback values
-    // and instead referencing a `fontFallback` object that exists in @atlaskit/theme/typography.
-    // This is a temporary measure until fallbacks are no longer required
-    var shouldAddFallbackImport = shouldAddFallback && 'full';
-    var themeImportDeclaration = Root.findImportsByModule(getSourceCode(context).ast.body, '@atlaskit/theme/typography');
-    if (themeImportDeclaration.length && shouldAddFallback) {
-      // Import exists, check if specifier exists
-      shouldAddFallbackImport = 'specifier';
-      var fallbackImport = themeImportDeclaration[0].specifiers.find(function (specifier) {
-        // @atlaskit/theme/typography has no default export so we can safely narrow this type
-        if (!isNodeOfType(specifier, 'ImportSpecifier')) {
-          return false;
-        }
-        if ('name' in specifier.imported && specifier.imported.name === 'fontFallback') {
-          return true;
-        }
-        return false;
-      });
-
-      // Exact import already exists, no need to add
-      if (fallbackImport) {
-        shouldAddFallbackImport = false;
-      }
-    }
     return {
       success: true,
       refs: {
         fontSizeNode: fontSizeNode,
         fontSizeRaw: fontSizeRaw,
-        tokensImportNode: tokensImportDeclaration[0],
-        themeImportNode: themeImportDeclaration[0],
-        shouldAddFallback: shouldAddFallback,
-        shouldAddFallbackImport: shouldAddFallbackImport
+        tokensImportNode: tokensImportDeclaration[0]
       }
     };
   },
@@ -268,25 +234,15 @@ export var StyleObject = {
       var matchingToken = refs.matchingToken,
         nodesToReplace = refs.nodesToReplace,
         tokensImportNode = refs.tokensImportNode,
-        themeImportNode = refs.themeImportNode,
-        shouldAddFallback = refs.shouldAddFallback,
-        shouldAddFallbackImport = refs.shouldAddFallbackImport,
         fontWeightReplacement = refs.fontWeightReplacement,
         fontFamilyReplacement = refs.fontFamilyReplacement,
         fontStyleReplacement = refs.fontStyleReplacement;
       var fontSizeNode = nodesToReplace[0];
       var root = getSourceCode(context).ast.body;
-      var fallbackImport;
-      if (shouldAddFallbackImport === 'full') {
-        fallbackImport = insertFallbackImportFull(root, fixer);
-      } else if (shouldAddFallbackImport === 'specifier') {
-        fallbackImport = insertFallbackImportSpecifier(fixer, themeImportNode);
-      }
-      var fallbackName = (matchingToken.tokenName === 'font.body' ? 'font.body.medium' : matchingToken.tokenName).replace('font', 'fontFallback');
-      return (!tokensImportNode ? [insertTokensImport(root, fixer)] : []).concat(fallbackImport ? [fallbackImport] : [], nodesToReplace.map(function (node, index) {
+      return (!tokensImportNode ? [insertTokensImport(root, fixer)] : []).concat(nodesToReplace.map(function (node, index) {
         // Replace first node with token, delete remaining nodes. Guaranteed to be fontSize
         if (index === 0) {
-          return fixer.replaceText(node, "".concat(getTokenProperty('font', matchingToken.tokenName, shouldAddFallback ? fallbackName : undefined, true)));
+          return fixer.replaceText(node, "".concat(getTokenProperty('font', matchingToken.tokenName, undefined, true)));
         }
 
         // We don't replace fontWeight/fontFamily/fontStyle here in case it occurs before the font property.

package/dist/esm/rules/use-tokens-typography/utils.js

@@ -1,7 +1,7 @@
 import { callExpression, identifier, isNodeOfType, literal, memberExpression, property } from 'eslint-codemod-utils';
 import { typographyPalette } from '@atlaskit/tokens/palettes-raw';
 import { typography as typographyTokens } from '@atlaskit/tokens/tokens-raw';
-import { Import, Root } from '../../ast-nodes';
+import { Root } from '../../ast-nodes';
 export var typographyProperties = ['fontSize', 'fontWeight', 'fontFamily', 'lineHeight'];
 export var isTypographyProperty = function isTypographyProperty(propertyName) {
   return typographyProperties.includes(propertyName);
@@ -108,16 +108,6 @@ export var fontWeightMap = {
   bold: '700'
 };
 export var defaultFontWeight = fontWeightMap.regular;
-export var fontFamilyTokens = typographyTokens.filter(function (token) {
-  return token.attributes.group === 'fontFamily';
-});
-export function findFontFamilyValueForToken(tokenName) {
-  var _fontFamilyTokens$fin;
-  // Note this will only ever be undefined if the tokens get renamed, and should never happen.
-  return ((_fontFamilyTokens$fin = fontFamilyTokens.find(function (token) {
-    return token.cleanName === tokenName;
-  })) === null || _fontFamilyTokens$fin === void 0 ? void 0 : _fontFamilyTokens$fin.value) || '';
-}
 export function findFontFamilyTokenForValue(value) {
   if (/charlie[\s-]?display/i.test(value)) {
     return 'font.family.brand.heading';
@@ -189,13 +179,4 @@ export function insertTokensImport(root, fixer) {
     module: '@atlaskit/tokens',
     specifiers: ['token']
   }, fixer);
-}
-export function insertFallbackImportFull(root, fixer) {
-  return Root.insertImport(root, {
-    module: '@atlaskit/theme/typography',
-    specifiers: ['fontFallback']
-  }, fixer);
-}
-export function insertFallbackImportSpecifier(fixer, themeImportNode) {
-  return Import.insertNamedSpecifiers(themeImportNode, ['fontFallback'], fixer);
 }

package/dist/types/rules/use-tokens-typography/config/index.d.ts

@@ -2,7 +2,6 @@ import type { JSONSchema4 } from '@typescript-eslint/utils/dist/json-schema';
 type Pattern = 'style-object' | 'font-weight' | 'font-family' | 'untokenized-properties' | 'banned-properties' | 'restricted-capitalisation';
 export type RuleConfig = {
     failSilently: boolean;
-    shouldEnforceFallbacks: boolean;
     enableUnsafeAutofix: boolean;
     patterns: Pattern[];
 };

package/dist/types/rules/use-tokens-typography/transformers/style-object.d.ts

@@ -10,9 +10,6 @@ interface Refs {
     fontSizeNode: Property;
     fontSizeRaw: string | number;
     tokensImportNode: ImportDeclaration | undefined;
-    themeImportNode: ImportDeclaration | undefined;
-    shouldAddFallback: boolean;
-    shouldAddFallbackImport: 'full' | 'specifier' | false;
 }
 type Check = {
     success: boolean;
@@ -22,9 +19,6 @@ interface FixerRefs {
     matchingToken: TokenValueMap;
     nodesToReplace: Property[];
     tokensImportNode: ImportDeclaration | undefined;
-    themeImportNode: ImportDeclaration | undefined;
-    shouldAddFallback: boolean;
-    shouldAddFallbackImport: Refs['shouldAddFallbackImport'];
     fontWeightReplacement: StringableASTNode<Property> | undefined;
     fontFamilyReplacement: StringableASTNode<Property> | undefined;
     fontStyleReplacement: StringableASTNode<Property> | undefined;

package/dist/types/rules/use-tokens-typography/utils.d.ts

@@ -1,6 +1,5 @@
 import type { Rule } from 'eslint';
-import { type CallExpression, type Directive, type EslintNode, type ImportDeclaration, type ModuleDeclaration, type Property, type Statement, type StringableASTNode } from 'eslint-codemod-utils';
-import { typography as typographyTokens } from '@atlaskit/tokens/tokens-raw';
+import { type CallExpression, type Directive, type EslintNode, type ModuleDeclaration, type Property, type Statement, type StringableASTNode } from 'eslint-codemod-utils';
 export declare const typographyProperties: string[];
 export declare const isTypographyProperty: (propertyName: string) => boolean;
 export declare const isFontSize: (node: EslintNode) => node is CallExpression;
@@ -64,8 +63,6 @@ export type FontWeightMap = {
     bold: string;
 };
 export declare const defaultFontWeight: string;
-export declare const fontFamilyTokens: typeof typographyTokens;
-export declare function findFontFamilyValueForToken(tokenName: string): string;
 export declare function findFontFamilyTokenForValue(value: string): 'font.family.brand.heading' | 'font.family.brand.body' | 'font.family.body' | 'font.family.code' | undefined;
 export declare function notUndefined<V>(value: V | undefined): value is V;
 export declare function isValidPropertyNode(node: Property): boolean;
@@ -73,5 +70,3 @@ export declare function getTokenProperty(propertyName: string, tokenName: string
 export declare function getLiteralProperty(propertyName: string, propertyValue: string): StringableASTNode<Property>;
 export declare function convertPropertyNodeToStringableNode(node: Property): StringableASTNode<Property>;
 export declare function insertTokensImport(root: (Directive | Statement | ModuleDeclaration)[], fixer: Rule.RuleFixer): Rule.Fix;
-export declare function insertFallbackImportFull(root: (Directive | Statement | ModuleDeclaration)[], fixer: Rule.RuleFixer): Rule.Fix;
-export declare function insertFallbackImportSpecifier(fixer: Rule.RuleFixer, themeImportNode: ImportDeclaration): Rule.Fix | undefined;

package/dist/types-ts4.5/rules/use-tokens-typography/config/index.d.ts

@@ -2,7 +2,6 @@ import type { JSONSchema4 } from '@typescript-eslint/utils/dist/json-schema';
 type Pattern = 'style-object' | 'font-weight' | 'font-family' | 'untokenized-properties' | 'banned-properties' | 'restricted-capitalisation';
 export type RuleConfig = {
     failSilently: boolean;
-    shouldEnforceFallbacks: boolean;
     enableUnsafeAutofix: boolean;
     patterns: Pattern[];
 };

package/dist/types-ts4.5/rules/use-tokens-typography/transformers/style-object.d.ts

@@ -10,9 +10,6 @@ interface Refs {
     fontSizeNode: Property;
     fontSizeRaw: string | number;
     tokensImportNode: ImportDeclaration | undefined;
-    themeImportNode: ImportDeclaration | undefined;
-    shouldAddFallback: boolean;
-    shouldAddFallbackImport: 'full' | 'specifier' | false;
 }
 type Check = {
     success: boolean;
@@ -22,9 +19,6 @@ interface FixerRefs {
     matchingToken: TokenValueMap;
     nodesToReplace: Property[];
     tokensImportNode: ImportDeclaration | undefined;
-    themeImportNode: ImportDeclaration | undefined;
-    shouldAddFallback: boolean;
-    shouldAddFallbackImport: Refs['shouldAddFallbackImport'];
     fontWeightReplacement: StringableASTNode<Property> | undefined;
     fontFamilyReplacement: StringableASTNode<Property> | undefined;
     fontStyleReplacement: StringableASTNode<Property> | undefined;

package/dist/types-ts4.5/rules/use-tokens-typography/utils.d.ts

@@ -1,6 +1,5 @@
 import type { Rule } from 'eslint';
-import { type CallExpression, type Directive, type EslintNode, type ImportDeclaration, type ModuleDeclaration, type Property, type Statement, type StringableASTNode } from 'eslint-codemod-utils';
-import { typography as typographyTokens } from '@atlaskit/tokens/tokens-raw';
+import { type CallExpression, type Directive, type EslintNode, type ModuleDeclaration, type Property, type Statement, type StringableASTNode } from 'eslint-codemod-utils';
 export declare const typographyProperties: string[];
 export declare const isTypographyProperty: (propertyName: string) => boolean;
 export declare const isFontSize: (node: EslintNode) => node is CallExpression;
@@ -64,8 +63,6 @@ export type FontWeightMap = {
     bold: string;
 };
 export declare const defaultFontWeight: string;
-export declare const fontFamilyTokens: typeof typographyTokens;
-export declare function findFontFamilyValueForToken(tokenName: string): string;
 export declare function findFontFamilyTokenForValue(value: string): 'font.family.brand.heading' | 'font.family.brand.body' | 'font.family.body' | 'font.family.code' | undefined;
 export declare function notUndefined<V>(value: V | undefined): value is V;
 export declare function isValidPropertyNode(node: Property): boolean;
@@ -73,5 +70,3 @@ export declare function getTokenProperty(propertyName: string, tokenName: string
 export declare function getLiteralProperty(propertyName: string, propertyValue: string): StringableASTNode<Property>;
 export declare function convertPropertyNodeToStringableNode(node: Property): StringableASTNode<Property>;
 export declare function insertTokensImport(root: (Directive | Statement | ModuleDeclaration)[], fixer: Rule.RuleFixer): Rule.Fix;
-export declare function insertFallbackImportFull(root: (Directive | Statement | ModuleDeclaration)[], fixer: Rule.RuleFixer): Rule.Fix;
-export declare function insertFallbackImportSpecifier(fixer: Rule.RuleFixer, themeImportNode: ImportDeclaration): Rule.Fix | undefined;

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": "13.43.2",
+	"version": "13.44.0",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
@@ -40,7 +40,7 @@
 	"dependencies": {
 		"@atlaskit/eslint-utils": "^2.0.0",
 		"@atlaskit/icon": "^34.0.0",
-		"@atlaskit/icon-lab": "^6.2.0",
+		"@atlaskit/icon-lab": "^6.4.0",
 		"@atlaskit/tokens": "^11.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@typescript-eslint/utils": "^7.1.0",
@@ -56,7 +56,7 @@
 	"devDependencies": {
 		"@af/formatting": "workspace:^",
 		"@atlaskit/ds-lib": "^6.0.0",
-		"@atlaskit/theme": "^22.0.0",
+		"@atlaskit/theme": "^23.0.0",
 		"@atlassian/codegen": "^0.1.0",
 		"@atlassian/eslint-utils": "^0.5.0",
 		"@atlassian/ts-loader": "^0.1.0",