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

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 11.2.0
+
+### Minor Changes
+
+- [#175583](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175583)
+  [`75911cb003bd5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/75911cb003bd5) - ####
+  no-legacy-icons
+
+  Add new `shouldUseSafeMigrationMode` flag to no-legacy-icons rule. When set to true, the autofixer
+  will only attempt to migrate icons that are visually similar and do not include secondary colors
+  or sizes other than medium.
+
+  Additionally, the autofixer will no longer attempt to explicity add `color="currentColor"` for
+  every migration as this is now the default.
+
+  #### no-deprecated-apis
+
+  Refactored to fix type errors and match code style of other rules.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 11.1.0
 
 ### Minor Changes

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

@@ -1,43 +1,36 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.noDeprecatedJSXAttributeMessageId = exports.name = exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _utils = require("@typescript-eslint/utils");
+var _eslintCodemodUtils = require("eslint-codemod-utils");
 var _createRule = require("../utils/create-rule");
 var _getDeprecatedConfig = require("../utils/get-deprecated-config");
 var _types = require("../utils/types");
 var noDeprecatedJSXAttributeMessageId = exports.noDeprecatedJSXAttributeMessageId = 'noDeprecatedJSXAttributes';
-var isNodeOfType = function isNodeOfType(node, nodeType) {
-  return _utils.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, _utils.AST_NODE_TYPES.JSXOpeningElement)) {
+  if (!jsxAttributeNode.parent || !(0, _eslintCodemodUtils.isNodeOfType)(jsxAttributeNode === null || jsxAttributeNode === void 0 ? void 0 : jsxAttributeNode.parent, 'JSXOpeningElement')) {
     return;
   }
   var openingElement = jsxAttributeNode.parent;
-  if (!isNodeOfType(openingElement.name, _utils.AST_NODE_TYPES.JSXIdentifier)) {
+  if (!(0, _eslintCodemodUtils.isNodeOfType)(openingElement.name, 'JSXIdentifier')) {
     return;
   }
   return openingElement.name.name;
 };
 var name = exports.name = 'no-deprecated-apis';
-var rule = (0, _createRule.createRule)({
-  name: name,
-  defaultOptions: [{
-    deprecatedConfig: (0, _getDeprecatedConfig.getConfig)('jsxAttributes')
-  }],
+var rule = (0, _createRule.createLintRule)({
   meta: {
+    name: name,
     type: 'suggestion',
     docs: {
       description: 'Disallow using deprecated APIs.',
-      recommended: 'strict'
+      recommended: true,
+      severity: 'error'
     },
     messages: {
       noDeprecatedJSXAttributes: 'The JSX attribute {{propName}} has been deprecated.'
@@ -75,24 +68,18 @@ var rule = (0, _createRule.createRule)({
       }
     }]
   },
-  create: function create(context, _ref) {
+  create: function create(context) {
     var _context$options$;
-    var _ref2 = (0, _slicedToArray2.default)(_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) || (0, _getDeprecatedConfig.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, _utils.AST_NODE_TYPES.JSXIdentifier)) {
+        if (!(0, _eslintCodemodUtils.isNodeOfType)(node, 'JSXAttribute') || !(0, _eslintCodemodUtils.isNodeOfType)(node.name, 'JSXIdentifier')) {
           return;
         }
-        var jsxAttributeName = jsxAttributeIdentifier.name;
+        var jsxAttributeName = node.name.name;
         if (!(0, _types.isDeprecatedJSXAttributeConfig)(deprecatedConfig) || !deprecatedConfig[jsxAttributeName]) {
           return;
         }
@@ -100,13 +87,13 @@ var rule = (0, _createRule.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/cjs/rules/no-legacy-icons/checks.js

@@ -10,7 +10,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var createChecks = exports.createChecks = function createChecks(context) {
-  //create global variables to be shared by the checks
+  // Create global variables to be shared by the checks
   var _createHelpers = (0, _helpers.createHelpers)(context),
     getPrimaryColor = _createHelpers.getPrimaryColor,
     getConfigFlag = _createHelpers.getConfigFlag;
@@ -27,6 +27,7 @@ var createChecks = exports.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 = [];
@@ -411,10 +412,11 @@ var createChecks = exports.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 {
@@ -449,6 +451,9 @@ var createChecks = exports.createChecks = function createChecks(context) {
               primaryColor = getPrimaryColor(attr);
               hasPrimaryColorProp = true;
               break;
+            case 'secondaryColor':
+              hasSecondaryColorProp = true;
+              break;
           }
         }
       } catch (err) {
@@ -457,6 +462,8 @@ var createChecks = exports.createChecks = function createChecks(context) {
         _iterator8.f();
       }
       var hasManualMigration = false;
+
+      // Flag manual migration if primary color cannot be migrated
       if (primaryColor && !(0, _helpers.canMigrateColor)(primaryColor) || hasPrimaryColorProp && !primaryColor) {
         (0, _helpers.createCantMigrateColorError)(node, primaryColor ? "the value of '".concat(primaryColor, "'") : 'a statically unknown value', errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
@@ -468,6 +475,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
         (0, _helpers.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);
@@ -478,6 +486,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
         (0, _helpers.createCantMigrateSpreadPropsError)(node, missingProps, errorsManual, legacyIconImports[name].packageName, name);
         hasManualMigration = true;
       }
+
       // Check if it is an exported component?
       if (legacyIconImports[name].exported) {
         (0, _helpers.createCantMigrateReExportError)(node, legacyIconImports[name].packageName, name, errorsManual);
@@ -507,7 +516,9 @@ var createChecks = exports.createChecks = function createChecks(context) {
           spacing = 'spacious';
         }
       }
-      if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
+      if (shouldUseSafeMigrationMode && !hasManualMigration && (newIcon !== null && newIcon !== void 0 && newIcon.isMigrationUnsafe || size !== 'medium' || hasSecondaryColorProp)) {
+        (0, _helpers.createCantFindSuitableReplacementError)(node, legacyIconImports[name].packageName, name, errorsManual, upcomingIcon ? true : migrationMapObject ? true : false);
+      } else if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
         (0, _helpers.createAutoMigrationError)({
           node: node,
           importSource: legacyIconImports[name].packageName,

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

@@ -480,8 +480,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;
   }
@@ -498,16 +497,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
@@ -637,12 +626,12 @@ var throwAutoErrors = exports.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 = (0, _slicedToArray2.default)(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/cjs/rules/no-legacy-icons/index.js

@@ -28,6 +28,9 @@ var rule = (0, _createRule.createLintRule)({
         shouldErrorForAutoMigration: {
           type: 'boolean'
         },
+        shouldUseSafeMigrationMode: {
+          type: 'boolean'
+        },
         quiet: {
           type: 'boolean'
         },

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: 'strict'
+      recommended: true,
+      severity: 'error'
     },
     messages: {
       noDeprecatedJSXAttributes: 'The JSX attribute {{propName}} has been deprecated.'
@@ -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/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: 'strict'
+      recommended: true,
+      severity: 'error'
     },
     messages: {
       noDeprecatedJSXAttributes: 'The JSX attribute {{propName}} has been deprecated.'
@@ -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/types/index.codegen.d.ts

@@ -13,9 +13,7 @@ export declare const plugin: {
         'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
         'no-custom-icons': import("eslint").Rule.RuleModule;
         'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-        'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [{
-            deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-        }], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+        'no-deprecated-apis': import("eslint").Rule.RuleModule;
         'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
         'no-deprecated-imports': import("eslint").Rule.RuleModule;
         'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;
@@ -303,9 +301,7 @@ export declare const configs: {
                     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
                     'no-custom-icons': import("eslint").Rule.RuleModule;
                     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-                    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [{
-                        deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-                    }], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+                    'no-deprecated-apis': import("eslint").Rule.RuleModule;
                     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
                     'no-deprecated-imports': import("eslint").Rule.RuleModule;
                     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;
@@ -448,9 +444,7 @@ export declare const configs: {
                     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
                     'no-custom-icons': import("eslint").Rule.RuleModule;
                     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-                    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [{
-                        deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-                    }], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+                    'no-deprecated-apis': import("eslint").Rule.RuleModule;
                     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
                     'no-deprecated-imports': import("eslint").Rule.RuleModule;
                     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;

package/dist/types/rules/index.codegen.d.ts

@@ -8,9 +8,7 @@ export declare const rules: {
     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
     'no-custom-icons': import("eslint").Rule.RuleModule;
     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [{
-        deprecatedConfig: import("./utils/types").DeprecatedConfig;
-    }], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+    'no-deprecated-apis': import("eslint").Rule.RuleModule;
     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
     'no-deprecated-imports': import("eslint").Rule.RuleModule;
     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;

package/dist/types/rules/no-deprecated-apis/index.d.ts

@@ -1,7 +1,5 @@
-import { type DeprecatedConfig } from '../utils/types';
+import type { Rule } from 'eslint';
 export declare const noDeprecatedJSXAttributeMessageId = "noDeprecatedJSXAttributes";
 export declare const name = "no-deprecated-apis";
-declare const rule: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [{
-    deprecatedConfig: DeprecatedConfig;
-}], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+declare const rule: Rule.RuleModule;
 export default rule;

package/dist/types/rules/no-legacy-icons/helpers.d.ts

@@ -48,6 +48,7 @@ export declare const getMigrationMapObject: (iconPackage: string) => {
         name: string;
         type: string;
         package: string;
+        isMigrationUnsafe?: boolean | undefined;
     } | undefined;
     additionalIcons?: {
         name: string;

package/dist/types-ts4.5/index.codegen.d.ts

@@ -13,11 +13,7 @@ export declare const plugin: {
         'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
         'no-custom-icons': import("eslint").Rule.RuleModule;
         'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-        'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [
-            {
-                deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-            }
-        ], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+        'no-deprecated-apis': import("eslint").Rule.RuleModule;
         'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
         'no-deprecated-imports': import("eslint").Rule.RuleModule;
         'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;
@@ -351,11 +347,7 @@ export declare const configs: {
                     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
                     'no-custom-icons': import("eslint").Rule.RuleModule;
                     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-                    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [
-                        {
-                            deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-                        }
-                    ], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+                    'no-deprecated-apis': import("eslint").Rule.RuleModule;
                     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
                     'no-deprecated-imports': import("eslint").Rule.RuleModule;
                     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;
@@ -516,11 +508,7 @@ export declare const configs: {
                     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
                     'no-custom-icons': import("eslint").Rule.RuleModule;
                     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-                    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [
-                        {
-                            deprecatedConfig: import("./rules/utils/types").DeprecatedConfig;
-                        }
-                    ], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+                    'no-deprecated-apis': import("eslint").Rule.RuleModule;
                     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
                     'no-deprecated-imports': import("eslint").Rule.RuleModule;
                     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;

package/dist/types-ts4.5/rules/index.codegen.d.ts

@@ -8,11 +8,7 @@ export declare const rules: {
     'no-css-tagged-template-expression': import("eslint").Rule.RuleModule;
     'no-custom-icons': import("eslint").Rule.RuleModule;
     'no-dark-theme-vr-tests': import("eslint").Rule.RuleModule;
-    'no-deprecated-apis': import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [
-        {
-            deprecatedConfig: import("./utils/types").DeprecatedConfig;
-        }
-    ], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+    'no-deprecated-apis': import("eslint").Rule.RuleModule;
     'no-deprecated-design-token-usage': import("eslint").Rule.RuleModule;
     'no-deprecated-imports': import("eslint").Rule.RuleModule;
     'no-direct-use-of-web-platform-drag-and-drop': import("eslint").Rule.RuleModule;

package/dist/types-ts4.5/rules/no-deprecated-apis/index.d.ts

@@ -1,9 +1,5 @@
-import { type DeprecatedConfig } from '../utils/types';
+import type { Rule } from 'eslint';
 export declare const noDeprecatedJSXAttributeMessageId = "noDeprecatedJSXAttributes";
 export declare const name = "no-deprecated-apis";
-declare const rule: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<string, [
-    {
-        deprecatedConfig: DeprecatedConfig;
-    }
-], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
+declare const rule: Rule.RuleModule;
 export default rule;

package/dist/types-ts4.5/rules/no-legacy-icons/helpers.d.ts

@@ -53,6 +53,7 @@ export declare const getMigrationMapObject: (iconPackage: string) => {
         name: string;
         type: string;
         package: string;
+        isMigrationUnsafe?: boolean | undefined;
     } | undefined;
     additionalIcons?: {
         name: string;

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": "11.1.0",
+	"version": "11.2.0",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
@@ -44,7 +44,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/eslint-utils": "^1.7.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/icon-lab": "^2.0.0",
 		"@atlaskit/tokens": "*",
 		"@babel/runtime": "^7.0.0",