@atlaskit/eslint-plugin-design-system 11.0.2 → 11.2.0

package/dist/es2019/rules/no-deprecated-apis/index.js

@@ -1,33 +1,30 @@
-import { AST_NODE_TYPES, ASTUtils } from '@typescript-eslint/utils';
-import { createRule } from '../utils/create-rule';
+import { isNodeOfType } from 'eslint-codemod-utils';
+import { createLintRule } from '../utils/create-rule';
 import { getConfig } from '../utils/get-deprecated-config';
 import { isDeprecatedJSXAttributeConfig } from '../utils/types';
 export const noDeprecatedJSXAttributeMessageId = 'noDeprecatedJSXAttributes';
-const isNodeOfType = (node, nodeType) => ASTUtils.isNodeOfType(nodeType)(node);
 const isImportDeclaration = programStatement => {
   return (programStatement === null || programStatement === void 0 ? void 0 : programStatement.type) === 'ImportDeclaration';
 };
 const findJSXElementName = jsxAttributeNode => {
-  if (!jsxAttributeNode.parent || !isNodeOfType(jsxAttributeNode.parent, AST_NODE_TYPES.JSXOpeningElement)) {
+  if (!jsxAttributeNode.parent || !isNodeOfType(jsxAttributeNode === null || jsxAttributeNode === void 0 ? void 0 : jsxAttributeNode.parent, 'JSXOpeningElement')) {
     return;
   }
   const openingElement = jsxAttributeNode.parent;
-  if (!isNodeOfType(openingElement.name, AST_NODE_TYPES.JSXIdentifier)) {
+  if (!isNodeOfType(openingElement.name, 'JSXIdentifier')) {
     return;
   }
   return openingElement.name.name;
 };
 export const name = 'no-deprecated-apis';
-const rule = createRule({
-  name,
-  defaultOptions: [{
-    deprecatedConfig: getConfig('jsxAttributes')
-  }],
+const rule = createLintRule({
   meta: {
+    name,
     type: 'suggestion',
     docs: {
       description: 'Disallow using deprecated APIs.',
-      recommended: 'error'
+      recommended: true,
+      severity: 'error'
     },
     messages: {
       noDeprecatedJSXAttributes: 'The JSX attribute {{propName}} has been deprecated.'
@@ -57,7 +54,7 @@ const rule = createRule({
                   }
                 },
                 required: ['moduleSpecifier'],
-                additionalProperites: false
+                additionalProperties: false
               }
             }
           }
@@ -65,24 +62,18 @@ const rule = createRule({
       }
     }]
   },
-  create(context, [options]) {
+  create(context) {
     var _context$options$;
-    // Get rule configuration
-    const {
-      deprecatedConfig: defaultDeprecatedConfig
-    } = options;
-
     // Get the rule configuration specified otherwise use default config.
     // A bit confusing as it seems that the default options have precedence over the user specified options.
-    const deprecatedConfig = ((_context$options$ = context.options[0]) === null || _context$options$ === void 0 ? void 0 : _context$options$.deprecatedConfig) || defaultDeprecatedConfig;
+    const deprecatedConfig = ((_context$options$ = context.options[0]) === null || _context$options$ === void 0 ? void 0 : _context$options$.deprecatedConfig) || getConfig('jsxAttributes');
     return {
       // find JSX atribute - find name of attribute - get source and find relevant identifiers.
       JSXAttribute(node) {
-        const jsxAttributeIdentifier = node.name;
-        if (!isNodeOfType(jsxAttributeIdentifier, AST_NODE_TYPES.JSXIdentifier)) {
+        if (!isNodeOfType(node, 'JSXAttribute') || !isNodeOfType(node.name, 'JSXIdentifier')) {
           return;
         }
-        const jsxAttributeName = jsxAttributeIdentifier.name;
+        const jsxAttributeName = node.name.name;
         if (!isDeprecatedJSXAttributeConfig(deprecatedConfig) || !deprecatedConfig[jsxAttributeName]) {
           return;
         }
@@ -90,12 +81,12 @@ const rule = createRule({
         if (!jsxElementName) {
           return;
         }
-        const source = context.getSourceCode();
+        const source = context.sourceCode;
 
         // find an import for the path of the banned api
         deprecatedConfig[jsxAttributeName].forEach(importItem => {
           var _importItem$namedSpec;
-          const importNode = source.ast.body.filter(isImportDeclaration).find(node => node.source.value.includes(importItem.moduleSpecifier));
+          const importNode = source.ast.body.filter(isImportDeclaration).find(node => node && node.source.value && typeof node.source.value === 'string' && node.source.value.includes(importItem.moduleSpecifier));
           if (!importNode) {
             return;
           }

package/dist/es2019/rules/no-legacy-icons/checks.js

@@ -1,7 +1,7 @@
 import { isNodeOfType } from 'eslint-codemod-utils';
 import { addToListOfRanges, canAutoMigrateNewIconBasedOnSize, canMigrateColor, createAutoMigrationError, createCantFindSuitableReplacementError, createCantMigrateColorError, createCantMigrateFunctionUnknownError, createCantMigrateIdentifierError, createCantMigrateIdentifierMapOrArrayError, createCantMigrateReExportError, createCantMigrateSizeUnknown, createCantMigrateSpreadPropsError, createGuidance, createHelpers, getMigrationMapObject, getUpcomingIcons, isInsideLegacyButton, isInsideNewButton, isSize, locToString, throwAutoErrors, throwManualErrors } from './helpers';
 export const createChecks = context => {
-  //create global variables to be shared by the checks
+  // Create global variables to be shared by the checks
   const {
     getPrimaryColor,
     getConfigFlag
@@ -19,6 +19,7 @@ export const createChecks = context => {
   const shouldErrorForAutoMigration = getConfigFlag('shouldErrorForAutoMigration', true);
   const isQuietMode = getConfigFlag('quiet', false);
   const shouldUseMigrationPath = getConfigFlag('shouldUseMigrationPath', true);
+  const shouldUseSafeMigrationMode = getConfigFlag('shouldUseSafeMigrationMode', false);
 
   // Sorted list of ranges
   let errorRanges = [];
@@ -334,10 +335,11 @@ export const createChecks = context => {
       // Find size prop on node
       let size = 'medium';
       let primaryColor = null;
+      let hasPrimaryColorProp = false;
+      let hasSecondaryColorProp = false;
       let afterSpreadSet = new Set();
       let requiredAttributesAfterSpread = new Set(['size', 'primaryColor', 'secondaryColor']);
       let hasSpread = false;
-      let hasPrimaryColorProp = false;
       for (const attr of node.openingElement.attributes) {
         // Detect spread props
         if (isNodeOfType(attr, 'JSXSpreadAttribute')) {
@@ -368,9 +370,14 @@ export const createChecks = context => {
             primaryColor = getPrimaryColor(attr);
             hasPrimaryColorProp = true;
             break;
+          case 'secondaryColor':
+            hasSecondaryColorProp = true;
+            break;
         }
       }
       let hasManualMigration = false;
+
+      // Flag manual migration if primary color cannot be migrated
       if (primaryColor && !canMigrateColor(primaryColor) || hasPrimaryColorProp && !primaryColor) {
         createCantMigrateColorError(node, primaryColor ? `the value of '${primaryColor}'` : 'a statically unknown value', errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
@@ -382,12 +389,14 @@ export const createChecks = context => {
         createCantMigrateSizeUnknown(node, errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
       }
+
       // Do a set comparison - is requiredAttributesAfterSpread a subset of afterSpreadSet?
       if (hasSpread === true && !Array.from(requiredAttributesAfterSpread).every(val => afterSpreadSet.has(val)) && !insideNewButton) {
         const missingProps = Array.from(requiredAttributesAfterSpread).filter(val => !afterSpreadSet.has(val));
         createCantMigrateSpreadPropsError(node, missingProps, errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
       }
+
       // Check if it is an exported component?
       if (legacyIconImports[name].exported) {
         createCantMigrateReExportError(node, legacyIconImports[name].packageName, name, errorsManual);
@@ -415,7 +424,9 @@ export const createChecks = context => {
           spacing = 'spacious';
         }
       }
-      if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
+      if (shouldUseSafeMigrationMode && !hasManualMigration && (newIcon !== null && newIcon !== void 0 && newIcon.isMigrationUnsafe || size !== 'medium' || hasSecondaryColorProp)) {
+        createCantFindSuitableReplacementError(node, legacyIconImports[name].packageName, name, errorsManual, upcomingIcon ? true : migrationMapObject ? true : false);
+      } else if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
         createAutoMigrationError({
           node,
           importSource: legacyIconImports[name].packageName,

package/dist/es2019/rules/no-legacy-icons/helpers.js

@@ -462,8 +462,7 @@ const createPropFixes = ({
 }) => {
   const fixes = [];
   const {
-    spacing,
-    insideNewButton
+    spacing
   } = metadata;
   if (shouldUseMigrationPath && !legacyImportNode) {
     return fixes;
@@ -485,16 +484,6 @@ const createPropFixes = ({
       fixes.push(fixer.replaceText(primaryColor.name, 'color'));
     }
 
-    // add color="currentColor" if
-    // 1. primaryColor prop is not set
-    // 2. icon is not imported from migration entrypoint
-    // 3. icon element is not inside a new button
-    if (legacyImportNode && !primaryColor && !migrationImportNode &&
-    // value type need to be a string in Rule.ReportDescriptor
-    insideNewButton !== 'true') {
-      fixes.push(fixer.insertTextAfter(openingElement.name, ` color="currentColor"`));
-    }
-
     // rename or remove size prop based on shouldUseMigrationPath,
     // add spacing="spacious" if
     // 1. it's in error metadata, which means size is medium
@@ -611,10 +600,10 @@ export const throwAutoErrors = ({
     }
     return result;
   }, new Set());
-  //group errors by import source and remove any unwanted errors
+  // Group errors by import source and remove any unwanted errors
   const groupedErrorList = Object.entries(errorsAuto).reduce((result, option) => {
     const [key, error] = option;
-    //return early if no data
+    // Return early if no data
     if (!error.data) {
       return result;
     }

package/dist/es2019/rules/no-legacy-icons/index.js

@@ -22,6 +22,9 @@ const rule = createLintRule({
         shouldErrorForAutoMigration: {
           type: 'boolean'
         },
+        shouldUseSafeMigrationMode: {
+          type: 'boolean'
+        },
         quiet: {
           type: 'boolean'
         },

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

@@ -24,7 +24,7 @@ const rule = createLintRule({
       severity: 'warn'
     },
     messages: {
-      noRawTypographyValues: 'Typography primitives or tokens should be used instead of hard-coded values.\n\n@meta <<{{payload}}>>.'
+      noRawTypographyValues: 'Typography primitives or tokens should be used instead of hard-coded values.\n\n@meta <<{{payload}}>>.\n\nNOTE: Using tokens with the `fontSize` property is invalid. Any `font.heading` or `font.body` tokens must use the CSS `font` property.'
     },
     schema: ruleSchema
   },

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

@@ -4,7 +4,7 @@ import { isNodeOfType } from 'eslint-codemod-utils';
 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, notUndefined } from '../utils';
+import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontFamilyValueForToken, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertFallbackImportFull, insertFallbackImportSpecifier, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
 export const StyleObject = {
   lint(node, {
     context,
@@ -67,18 +67,39 @@ export const StyleObject = {
     }
 
     // -- Match tokens --
-    let matchingTokens = findTypographyTokenForValues(fontSizeValue, lineHeightValue);
-    if (matchingTokens.length) {
-      // If we have multiple matching tokens, try matching fontWeight
-      let matchingTokensWithWeight = matchingTokens.filter(token => fontWeightValue ? token.values.fontWeight === fontWeightValue : token);
-      if (matchingTokensWithWeight.length) {
-        // Possibly narrowed down tokens
-        matchingTokens = matchingTokensWithWeight;
-      } else {
-        // Ended up with 0 matches by matching fontWeight
-        // return body token and add fontWeight manually
-        matchingTokens = matchingTokens.filter(token => token.tokenName.includes('.body'));
-        shouldAddFontWeight = true;
+    // Check if fontSize is a token (this is invalid syntax but unfortunately a common occurence)
+    // We may as well auto-fix `fontSize` to `font` and keep the token.
+    // Other tokens like `fontSize: token('space.100')` will not autofix, but still report
+    let matchingTokens = [];
+    const isFontSizeAToken = isDecendantOfGlobalToken(fontSizeNode.value);
+    if (isFontSizeAToken) {
+      // Specifically match for valid, non-deprecated font.heading|body|code tokens
+      const match = fontSizeValue.match(/font.(body|heading|code)[^']*/);
+      if (match) {
+        const matchedTokenName = match[0];
+        // This is really just a double check to be 100% certain the token exists
+        // and that we're not trying to apply a deprecated fontSize token to the font property
+        if (isValidTypographyToken(matchedTokenName)) {
+          matchingTokens = [{
+            tokenName: matchedTokenName
+          }];
+        }
+      }
+    } else {
+      // Standard matching against fontSize/lineHeight values
+      matchingTokens = findTypographyTokenForValues(fontSizeValue, lineHeightValue);
+      if (matchingTokens.length) {
+        // If we have multiple matching tokens, try matching fontWeight
+        let matchingTokensWithWeight = matchingTokens.filter(token => fontWeightValue ? token.values.fontWeight === fontWeightValue : token);
+        if (matchingTokensWithWeight.length) {
+          // Possibly narrowed down tokens
+          matchingTokens = matchingTokensWithWeight;
+        } else {
+          // Ended up with 0 matches by matching fontWeight
+          // return body token and add fontWeight manually
+          matchingTokens = matchingTokens.filter(token => token.tokenName.includes('.body'));
+          shouldAddFontWeight = true;
+        }
       }
     }
 
@@ -185,7 +206,7 @@ export const StyleObject = {
 
     // -- Font size --
     const fontSizeNode = ASTObject.getEntryByPropertyName(node, 'fontSize');
-    if (!fontSizeNode || !isValidPropertyNode(fontSizeNode) || isDecendantOfGlobalToken(fontSizeNode.value)) {
+    if (!fontSizeNode || !isValidPropertyNode(fontSizeNode)) {
       return {
         success: false
       };

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

@@ -31,6 +31,9 @@ export const typographyValueToToken = typographyTokens
     values: individualValues
   };
 });
+export function isValidTypographyToken(tokenName) {
+  return typographyTokens.filter(t => t.attributes.group === 'typography').filter(t => t.cleanName.includes('font.heading') || t.cleanName.includes('font.body') || t.cleanName.includes('font.code')).find(t => t.cleanName === tokenName);
+}
 export function findTypographyTokenForValues(fontSize, lineHeight) {
   let matchingTokens = typographyValueToToken.filter(token => token.values.fontSize === fontSize)
   // If lineHeight == 1, we don't match to a token

package/dist/esm/rules/no-deprecated-apis/index.js

@@ -1,36 +1,30 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { AST_NODE_TYPES, ASTUtils } from '@typescript-eslint/utils';
-import { createRule } from '../utils/create-rule';
+import { isNodeOfType } from 'eslint-codemod-utils';
+import { createLintRule } from '../utils/create-rule';
 import { getConfig } from '../utils/get-deprecated-config';
 import { isDeprecatedJSXAttributeConfig } from '../utils/types';
 export var noDeprecatedJSXAttributeMessageId = 'noDeprecatedJSXAttributes';
-var isNodeOfType = function isNodeOfType(node, nodeType) {
-  return ASTUtils.isNodeOfType(nodeType)(node);
-};
 var isImportDeclaration = function isImportDeclaration(programStatement) {
   return (programStatement === null || programStatement === void 0 ? void 0 : programStatement.type) === 'ImportDeclaration';
 };
 var findJSXElementName = function findJSXElementName(jsxAttributeNode) {
-  if (!jsxAttributeNode.parent || !isNodeOfType(jsxAttributeNode.parent, AST_NODE_TYPES.JSXOpeningElement)) {
+  if (!jsxAttributeNode.parent || !isNodeOfType(jsxAttributeNode === null || jsxAttributeNode === void 0 ? void 0 : jsxAttributeNode.parent, 'JSXOpeningElement')) {
     return;
   }
   var openingElement = jsxAttributeNode.parent;
-  if (!isNodeOfType(openingElement.name, AST_NODE_TYPES.JSXIdentifier)) {
+  if (!isNodeOfType(openingElement.name, 'JSXIdentifier')) {
     return;
   }
   return openingElement.name.name;
 };
 export var name = 'no-deprecated-apis';
-var rule = createRule({
-  name: name,
-  defaultOptions: [{
-    deprecatedConfig: getConfig('jsxAttributes')
-  }],
+var rule = createLintRule({
   meta: {
+    name: name,
     type: 'suggestion',
     docs: {
       description: 'Disallow using deprecated APIs.',
-      recommended: 'error'
+      recommended: true,
+      severity: 'error'
     },
     messages: {
       noDeprecatedJSXAttributes: 'The JSX attribute {{propName}} has been deprecated.'
@@ -60,7 +54,7 @@ var rule = createRule({
                   }
                 },
                 required: ['moduleSpecifier'],
-                additionalProperites: false
+                additionalProperties: false
               }
             }
           }
@@ -68,24 +62,18 @@ var rule = createRule({
       }
     }]
   },
-  create: function create(context, _ref) {
+  create: function create(context) {
     var _context$options$;
-    var _ref2 = _slicedToArray(_ref, 1),
-      options = _ref2[0];
-    // Get rule configuration
-    var defaultDeprecatedConfig = options.deprecatedConfig;
-
     // Get the rule configuration specified otherwise use default config.
     // A bit confusing as it seems that the default options have precedence over the user specified options.
-    var deprecatedConfig = ((_context$options$ = context.options[0]) === null || _context$options$ === void 0 ? void 0 : _context$options$.deprecatedConfig) || defaultDeprecatedConfig;
+    var deprecatedConfig = ((_context$options$ = context.options[0]) === null || _context$options$ === void 0 ? void 0 : _context$options$.deprecatedConfig) || getConfig('jsxAttributes');
     return {
       // find JSX atribute - find name of attribute - get source and find relevant identifiers.
       JSXAttribute: function JSXAttribute(node) {
-        var jsxAttributeIdentifier = node.name;
-        if (!isNodeOfType(jsxAttributeIdentifier, AST_NODE_TYPES.JSXIdentifier)) {
+        if (!isNodeOfType(node, 'JSXAttribute') || !isNodeOfType(node.name, 'JSXIdentifier')) {
           return;
         }
-        var jsxAttributeName = jsxAttributeIdentifier.name;
+        var jsxAttributeName = node.name.name;
         if (!isDeprecatedJSXAttributeConfig(deprecatedConfig) || !deprecatedConfig[jsxAttributeName]) {
           return;
         }
@@ -93,13 +81,13 @@ var rule = createRule({
         if (!jsxElementName) {
           return;
         }
-        var source = context.getSourceCode();
+        var source = context.sourceCode;
 
         // find an import for the path of the banned api
         deprecatedConfig[jsxAttributeName].forEach(function (importItem) {
           var _importItem$namedSpec;
           var importNode = source.ast.body.filter(isImportDeclaration).find(function (node) {
-            return node.source.value.includes(importItem.moduleSpecifier);
+            return node && node.source.value && typeof node.source.value === 'string' && node.source.value.includes(importItem.moduleSpecifier);
           });
           if (!importNode) {
             return;

package/dist/esm/rules/no-legacy-icons/checks.js

@@ -4,7 +4,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import { isNodeOfType } from 'eslint-codemod-utils';
 import { addToListOfRanges, canAutoMigrateNewIconBasedOnSize, canMigrateColor, createAutoMigrationError, createCantFindSuitableReplacementError, createCantMigrateColorError, createCantMigrateFunctionUnknownError, createCantMigrateIdentifierError, createCantMigrateIdentifierMapOrArrayError, createCantMigrateReExportError, createCantMigrateSizeUnknown, createCantMigrateSpreadPropsError, createGuidance, createHelpers, getMigrationMapObject, getUpcomingIcons, isInsideLegacyButton, isInsideNewButton, isSize, locToString, throwAutoErrors, throwManualErrors } from './helpers';
 export var createChecks = function createChecks(context) {
-  //create global variables to be shared by the checks
+  // Create global variables to be shared by the checks
   var _createHelpers = createHelpers(context),
     getPrimaryColor = _createHelpers.getPrimaryColor,
     getConfigFlag = _createHelpers.getConfigFlag;
@@ -21,6 +21,7 @@ export var createChecks = function createChecks(context) {
   var shouldErrorForAutoMigration = getConfigFlag('shouldErrorForAutoMigration', true);
   var isQuietMode = getConfigFlag('quiet', false);
   var shouldUseMigrationPath = getConfigFlag('shouldUseMigrationPath', true);
+  var shouldUseSafeMigrationMode = getConfigFlag('shouldUseSafeMigrationMode', false);
 
   // Sorted list of ranges
   var errorRanges = [];
@@ -405,10 +406,11 @@ export var createChecks = function createChecks(context) {
       // Find size prop on node
       var size = 'medium';
       var primaryColor = null;
+      var hasPrimaryColorProp = false;
+      var hasSecondaryColorProp = false;
       var afterSpreadSet = new Set();
       var requiredAttributesAfterSpread = new Set(['size', 'primaryColor', 'secondaryColor']);
       var hasSpread = false;
-      var hasPrimaryColorProp = false;
       var _iterator8 = _createForOfIteratorHelper(node.openingElement.attributes),
         _step8;
       try {
@@ -443,6 +445,9 @@ export var createChecks = function createChecks(context) {
               primaryColor = getPrimaryColor(attr);
               hasPrimaryColorProp = true;
               break;
+            case 'secondaryColor':
+              hasSecondaryColorProp = true;
+              break;
           }
         }
       } catch (err) {
@@ -451,6 +456,8 @@ export var createChecks = function createChecks(context) {
         _iterator8.f();
       }
       var hasManualMigration = false;
+
+      // Flag manual migration if primary color cannot be migrated
       if (primaryColor && !canMigrateColor(primaryColor) || hasPrimaryColorProp && !primaryColor) {
         createCantMigrateColorError(node, primaryColor ? "the value of '".concat(primaryColor, "'") : 'a statically unknown value', errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
@@ -462,6 +469,7 @@ export var createChecks = function createChecks(context) {
         createCantMigrateSizeUnknown(node, errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
       }
+
       // Do a set comparison - is requiredAttributesAfterSpread a subset of afterSpreadSet?
       if (hasSpread === true && !Array.from(requiredAttributesAfterSpread).every(function (val) {
         return afterSpreadSet.has(val);
@@ -472,6 +480,7 @@ export var createChecks = function createChecks(context) {
         createCantMigrateSpreadPropsError(node, missingProps, errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
       }
+
       // Check if it is an exported component?
       if (legacyIconImports[name].exported) {
         createCantMigrateReExportError(node, legacyIconImports[name].packageName, name, errorsManual);
@@ -501,7 +510,9 @@ export var createChecks = function createChecks(context) {
           spacing = 'spacious';
         }
       }
-      if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
+      if (shouldUseSafeMigrationMode && !hasManualMigration && (newIcon !== null && newIcon !== void 0 && newIcon.isMigrationUnsafe || size !== 'medium' || hasSecondaryColorProp)) {
+        createCantFindSuitableReplacementError(node, legacyIconImports[name].packageName, name, errorsManual, upcomingIcon ? true : migrationMapObject ? true : false);
+      } else if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
         createAutoMigrationError({
           node: node,
           importSource: legacyIconImports[name].packageName,

package/dist/esm/rules/no-legacy-icons/helpers.js

@@ -470,8 +470,7 @@ var createPropFixes = function createPropFixes(_ref7) {
     migrationImportNode = _ref7.migrationImportNode,
     newIconName = _ref7.newIconName;
   var fixes = [];
-  var spacing = metadata.spacing,
-    insideNewButton = metadata.insideNewButton;
+  var spacing = metadata.spacing;
   if (shouldUseMigrationPath && !legacyImportNode) {
     return fixes;
   }
@@ -488,16 +487,6 @@ var createPropFixes = function createPropFixes(_ref7) {
       fixes.push(fixer.replaceText(primaryColor.name, 'color'));
     }
 
-    // add color="currentColor" if
-    // 1. primaryColor prop is not set
-    // 2. icon is not imported from migration entrypoint
-    // 3. icon element is not inside a new button
-    if (legacyImportNode && !primaryColor && !migrationImportNode &&
-    // value type need to be a string in Rule.ReportDescriptor
-    insideNewButton !== 'true') {
-      fixes.push(fixer.insertTextAfter(openingElement.name, " color=\"currentColor\""));
-    }
-
     // rename or remove size prop based on shouldUseMigrationPath,
     // add spacing="spacious" if
     // 1. it's in error metadata, which means size is medium
@@ -627,12 +616,12 @@ export var throwAutoErrors = function throwAutoErrors(_ref10) {
     }
     return result;
   }, new Set());
-  //group errors by import source and remove any unwanted errors
+  // Group errors by import source and remove any unwanted errors
   var groupedErrorList = Object.entries(errorsAuto).reduce(function (result, option) {
     var _option2 = _slicedToArray(option, 2),
       key = _option2[0],
       error = _option2[1];
-    //return early if no data
+    // Return early if no data
     if (!error.data) {
       return result;
     }

package/dist/esm/rules/no-legacy-icons/index.js

@@ -22,6 +22,9 @@ var rule = createLintRule({
         shouldErrorForAutoMigration: {
           type: 'boolean'
         },
+        shouldUseSafeMigrationMode: {
+          type: 'boolean'
+        },
         quiet: {
           type: 'boolean'
         },

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

@@ -26,7 +26,7 @@ var rule = createLintRule({
       severity: 'warn'
     },
     messages: {
-      noRawTypographyValues: 'Typography primitives or tokens should be used instead of hard-coded values.\n\n@meta <<{{payload}}>>.'
+      noRawTypographyValues: 'Typography primitives or tokens should be used instead of hard-coded values.\n\n@meta <<{{payload}}>>.\n\nNOTE: Using tokens with the `fontSize` property is invalid. Any `font.heading` or `font.body` tokens must use the CSS `font` property.'
     },
     schema: ruleSchema
   },

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

@@ -7,7 +7,7 @@ import { isNodeOfType } from 'eslint-codemod-utils';
 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, notUndefined } from '../utils';
+import { convertPropertyNodeToStringableNode, defaultFontWeight, findFontFamilyValueForToken, findFontWeightTokenForValue, findTypographyTokenForValues, fontWeightMap, getLiteralProperty, getTokenProperty, insertFallbackImportFull, insertFallbackImportSpecifier, insertTokensImport, isValidPropertyNode, isValidTypographyToken, notUndefined } from '../utils';
 export var StyleObject = {
   lint: function lint(node, _ref) {
     var context = _ref.context,
@@ -66,22 +66,43 @@ export var StyleObject = {
     }
 
     // -- Match tokens --
-    var matchingTokens = findTypographyTokenForValues(fontSizeValue, lineHeightValue);
-    if (matchingTokens.length) {
-      // If we have multiple matching tokens, try matching fontWeight
-      var matchingTokensWithWeight = matchingTokens.filter(function (token) {
-        return fontWeightValue ? token.values.fontWeight === fontWeightValue : token;
-      });
-      if (matchingTokensWithWeight.length) {
-        // Possibly narrowed down tokens
-        matchingTokens = matchingTokensWithWeight;
-      } else {
-        // Ended up with 0 matches by matching fontWeight
-        // return body token and add fontWeight manually
-        matchingTokens = matchingTokens.filter(function (token) {
-          return token.tokenName.includes('.body');
+    // Check if fontSize is a token (this is invalid syntax but unfortunately a common occurence)
+    // We may as well auto-fix `fontSize` to `font` and keep the token.
+    // Other tokens like `fontSize: token('space.100')` will not autofix, but still report
+    var matchingTokens = [];
+    var isFontSizeAToken = isDecendantOfGlobalToken(fontSizeNode.value);
+    if (isFontSizeAToken) {
+      // Specifically match for valid, non-deprecated font.heading|body|code tokens
+      var match = fontSizeValue.match(/font.(body|heading|code)[^']*/);
+      if (match) {
+        var matchedTokenName = match[0];
+        // This is really just a double check to be 100% certain the token exists
+        // and that we're not trying to apply a deprecated fontSize token to the font property
+        if (isValidTypographyToken(matchedTokenName)) {
+          matchingTokens = [{
+            tokenName: matchedTokenName
+          }];
+        }
+      }
+    } else {
+      // Standard matching against fontSize/lineHeight values
+      matchingTokens = findTypographyTokenForValues(fontSizeValue, lineHeightValue);
+      if (matchingTokens.length) {
+        // If we have multiple matching tokens, try matching fontWeight
+        var matchingTokensWithWeight = matchingTokens.filter(function (token) {
+          return fontWeightValue ? token.values.fontWeight === fontWeightValue : token;
         });
-        shouldAddFontWeight = true;
+        if (matchingTokensWithWeight.length) {
+          // Possibly narrowed down tokens
+          matchingTokens = matchingTokensWithWeight;
+        } else {
+          // Ended up with 0 matches by matching fontWeight
+          // return body token and add fontWeight manually
+          matchingTokens = matchingTokens.filter(function (token) {
+            return token.tokenName.includes('.body');
+          });
+          shouldAddFontWeight = true;
+        }
       }
     }
 
@@ -186,7 +207,7 @@ export var StyleObject = {
 
     // -- Font size --
     var fontSizeNode = ASTObject.getEntryByPropertyName(node, 'fontSize');
-    if (!fontSizeNode || !isValidPropertyNode(fontSizeNode) || isDecendantOfGlobalToken(fontSizeNode.value)) {
+    if (!fontSizeNode || !isValidPropertyNode(fontSizeNode)) {
       return {
         success: false
       };

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

@@ -49,6 +49,15 @@ export var typographyValueToToken = typographyTokens
     values: individualValues
   };
 });
+export function isValidTypographyToken(tokenName) {
+  return typographyTokens.filter(function (t) {
+    return t.attributes.group === 'typography';
+  }).filter(function (t) {
+    return t.cleanName.includes('font.heading') || t.cleanName.includes('font.body') || t.cleanName.includes('font.code');
+  }).find(function (t) {
+    return t.cleanName === tokenName;
+  });
+}
 export function findTypographyTokenForValues(fontSize, lineHeight) {
   var matchingTokens = typographyValueToToken.filter(function (token) {
     return token.values.fontSize === fontSize;