@atlaskit/eslint-plugin-design-system 10.12.3 → 10.12.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 10.12.5
+
+### Patch Changes
+
+- [#127454](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127454)
+  [`e869f31dbe200`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e869f31dbe200) -
+  No-legacy-icons ESLint rule errors at all references to a legacy icon.
+
+## 10.12.4
+
+### Patch Changes
+
+- [#126974](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/126974)
+  [`bf10ab6817404`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bf10ab6817404) -
+  Updates the no-legacy-icons eslint rule to account for upcoming icons.
+
 ## 10.12.3
 
 ### Patch Changes

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

@@ -27,6 +27,9 @@ var createChecks = exports.createChecks = function createChecks(context) {
   var shouldErrorForAutoMigration = getConfigFlag('shouldErrorForAutoMigration', true);
   var isQuietMode = getConfigFlag('quiet', false);
 
+  // Sorted list of ranges
+  var errorRanges = [];
+
   /**
    * Adds the legacy Icon and new button imports to the correct global arrays to be used by the other checks
    * @param node The import node found by ESLint
@@ -90,8 +93,8 @@ var createChecks = exports.createChecks = function createChecks(context) {
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var decl = _step3.value;
-          if ((0, _eslintCodemodUtils.isNodeOfType)(decl, 'VariableDeclarator') && 'init' in decl && 'id' in decl && decl.init && decl.id && 'name' in decl.id && decl.id.name && (0, _eslintCodemodUtils.isNodeOfType)(decl.init, 'Identifier')) {
-            if (decl.init.name in legacyIconImports) {
+          if ((0, _eslintCodemodUtils.isNodeOfType)(decl, 'VariableDeclarator') && Object.keys(decl).includes('init') && Object.keys(decl).includes('id') && decl.init && decl.id && 'name' in decl.id && decl.id.name && (0, _eslintCodemodUtils.isNodeOfType)(decl.init, 'Identifier')) {
+            if (Object.keys(legacyIconImports).includes(decl.init.name)) {
               legacyIconImports[decl.id.name] = {
                 packageName: legacyIconImports[decl.init.name].packageName,
                 exported: legacyIconImports[decl.init.name].exported || isExported
@@ -116,16 +119,17 @@ var createChecks = exports.createChecks = function createChecks(context) {
   var checkExportDefaultDeclaration = function checkExportDefaultDeclaration(node) {
     var exportName = '';
     var packageName = '';
-    if ('declaration' in node && node.declaration && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration, 'Identifier') && node.declaration.name in legacyIconImports) {
+    if (Object.keys(node).includes('declaration') && node.declaration && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration, 'Identifier') && Object.keys(legacyIconImports).includes(node.declaration.name)) {
       packageName = legacyIconImports[node.declaration.name].packageName;
       exportName = 'Default export';
-    } else if ('declaration' in node && node.declaration && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration, 'AssignmentExpression') && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration.left, 'Identifier') && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration.right, 'Identifier') && node.declaration.right.name in legacyIconImports) {
+    } else if (Object.keys(node).includes('declaration') && node.declaration && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration, 'AssignmentExpression') && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration.left, 'Identifier') && (0, _eslintCodemodUtils.isNodeOfType)(node.declaration.right, 'Identifier') && Object.keys(legacyIconImports).includes(node.declaration.right.name)) {
       packageName = legacyIconImports[node.declaration.right.name].packageName;
       exportName = node.declaration.left.name;
     } else {
       return;
     }
     (0, _helpers.createCantMigrateReExportError)(node, packageName, exportName, errorsManual);
+    (0, _helpers.addToListOfRanges)(node, errorRanges);
     guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(packageName);
   };
 
@@ -135,7 +139,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
    */
   var checkExportNamedVariables = function checkExportNamedVariables(node) {
     // export {default as AddIcon} from '@atlaskit/icon/glyph/add';
-    if (node.source && (0, _eslintCodemodUtils.isNodeOfType)(node.source, 'Literal') && 'value' in node.source) {
+    if (node.source && (0, _eslintCodemodUtils.isNodeOfType)(node.source, 'Literal') && Object.keys(node.source).includes('value')) {
       var moduleSource = node.source.value;
       if (typeof moduleSource === 'string' && ['@atlaskit/icon/glyph/', '@atlaskit/icon-object/glyph/'].find(function (val) {
         return moduleSource.startsWith(val);
@@ -146,6 +150,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var spec = _step4.value;
             (0, _helpers.createCantMigrateReExportError)(spec, moduleSource, spec.exported.name, errorsManual);
+            (0, _helpers.addToListOfRanges)(spec, errorRanges);
             guidance[(0, _helpers.locToString)(spec)] = (0, _helpers.createGuidance)(moduleSource);
           }
         } catch (err) {
@@ -161,8 +166,9 @@ var createChecks = exports.createChecks = function createChecks(context) {
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var decl = _step5.value;
-          if ((0, _eslintCodemodUtils.isNodeOfType)(decl, 'VariableDeclarator') && 'init' in decl && decl.init && (0, _eslintCodemodUtils.isNodeOfType)(decl.init, 'Identifier') && decl.init.name in legacyIconImports) {
+          if ((0, _eslintCodemodUtils.isNodeOfType)(decl, 'VariableDeclarator') && Object.keys(decl).includes('init') && decl.init && (0, _eslintCodemodUtils.isNodeOfType)(decl.init, 'Identifier') && Object.keys(legacyIconImports).includes(decl.init.name)) {
             (0, _helpers.createCantMigrateReExportError)(node, legacyIconImports[decl.init.name].packageName, decl.init.name, errorsManual);
+            (0, _helpers.addToListOfRanges)(node, errorRanges);
             guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[decl.init.name].packageName);
           }
         }
@@ -183,13 +189,14 @@ var createChecks = exports.createChecks = function createChecks(context) {
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           var _spec2 = _step6.value;
-          if (_spec2.local.name in legacyIconImports) {
+          if (Object.keys(legacyIconImports).includes(_spec2.local.name)) {
             //update legacy imports to be exported
             legacyIconImports[_spec2.local.name] = {
               packageName: legacyIconImports[_spec2.local.name].packageName,
               exported: true
             };
             (0, _helpers.createCantMigrateReExportError)(_spec2, legacyIconImports[_spec2.local.name].packageName, _spec2.exported.name, errorsManual);
+            (0, _helpers.addToListOfRanges)(_spec2, errorRanges);
             guidance[(0, _helpers.locToString)(_spec2)] = (0, _helpers.createGuidance)(legacyIconImports[_spec2.local.name].packageName);
           }
         }
@@ -209,8 +216,9 @@ var createChecks = exports.createChecks = function createChecks(context) {
     if (!(0, _eslintCodemodUtils.isNodeOfType)(node, 'Identifier')) {
       return;
     }
-    if (node.name && node.name in legacyIconImports && legacyIconImports[node.name].packageName) {
-      (0, _helpers.createCantMigrateIdentifierError)(node, legacyIconImports[node.name].packageName, node.name, errorsManual);
+    if (node.name && Object.keys(legacyIconImports).includes(node.name) && legacyIconImports[node.name].packageName) {
+      (0, _helpers.createCantMigrateIdentifierMapOrArrayError)(node, legacyIconImports[node.name].packageName, node.name, errorsManual);
+      (0, _helpers.addToListOfRanges)(node, errorRanges);
       guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[node.name].packageName);
     }
   };
@@ -229,24 +237,44 @@ var createChecks = exports.createChecks = function createChecks(context) {
     if (!(0, _eslintCodemodUtils.isNodeOfType)(node.parent, 'JSXExpressionContainer') || !(0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent, 'JSXAttribute') || !(0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent.parent, 'JSXOpeningElement')) {
       return;
     }
-    if (node.name in legacyIconImports && (0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent.name, 'JSXIdentifier') && node.parent.parent.name.name !== 'LEGACY_fallbackIcon') {
+    if (Object.keys(legacyIconImports).includes(node.name) && (0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent.name, 'JSXIdentifier') && node.parent.parent.name.name !== 'LEGACY_fallbackIcon') {
       var _migrationMapObject$s;
       var migrationMapObject = (0, _helpers.getMigrationMapObject)(legacyIconImports[node.name].packageName);
+      var upcomingIcon = (0, _helpers.getUpcomingIcons)(legacyIconImports[node.name].packageName);
       var newIcon = migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.newIcon;
-      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(migrationMapObject === null || migrationMapObject === void 0 || (_migrationMapObject$s = migrationMapObject.sizeGuidance) === null || _migrationMapObject$s === void 0 ? void 0 : _migrationMapObject$s.medium);
+      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(upcomingIcon ? upcomingIcon.sizeGuidance.medium : migrationMapObject === null || migrationMapObject === void 0 || (_migrationMapObject$s = migrationMapObject.sizeGuidance) === null || _migrationMapObject$s === void 0 ? void 0 : _migrationMapObject$s.medium);
       var isInNewButton = (0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent.parent.name, 'JSXIdentifier') && newButtonImports.has(node.parent.parent.parent.name.name);
-      if (newIcon && isInNewButton && isNewIconMigratable) {
+      if (newIcon && isInNewButton && isNewIconMigratable || upcomingIcon && isInNewButton && isNewIconMigratable) {
         (0, _helpers.createAutoMigrationError)(node, legacyIconImports[node.name].packageName, node.name, errorsAuto);
+        (0, _helpers.addToListOfRanges)(node, errorRanges);
         guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[node.name].packageName, isInNewButton, 'medium');
-      } else if (!newIcon || !isNewIconMigratable) {
+      } else if (!newIcon && !upcomingIcon || !isNewIconMigratable) {
         (0, _helpers.createCantFindSuitableReplacementError)(node, legacyIconImports[node.name].packageName, node.name, errorsManual);
+        (0, _helpers.addToListOfRanges)(node, errorRanges);
         guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[node.name].packageName, isInNewButton);
       } else if (!isInNewButton) {
         (0, _helpers.createCantMigrateFunctionUnknownError)(node, legacyIconImports[node.name].packageName, node.name, errorsManual);
+        (0, _helpers.addToListOfRanges)(node, errorRanges);
         guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[node.name].packageName, isInNewButton);
       }
     }
   };
+  var checkIconReference = function checkIconReference(node) {
+    //check the reference to see if it's a legacy icon, if not exit early
+    if (!Object.keys(legacyIconImports).includes(node.name)) {
+      return;
+    }
+    //if this is an import statement then exit early
+    if (node.parent && ((0, _eslintCodemodUtils.isNodeOfType)(node.parent, 'ImportSpecifier') || (0, _eslintCodemodUtils.isNodeOfType)(node.parent, 'ImportDefaultSpecifier'))) {
+      return;
+    }
+    //if in Fallback prop, do not error
+    if (node.parent && node.parent.parent && (0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent, 'JSXAttribute') && (0, _eslintCodemodUtils.isNodeOfType)(node.parent.parent.name, 'JSXIdentifier') && node.parent.parent.name.name === 'LEGACY_fallbackIcon') {
+      return;
+    }
+    // manually error
+    (0, _helpers.createCantMigrateIdentifierError)(node, legacyIconImports[node.name].packageName, node.name, errorsManual);
+  };
 
   /**
    * Checks if a legacy icon is being rendered and stores the errors in the global array
@@ -264,8 +292,8 @@ var createChecks = exports.createChecks = function createChecks(context) {
     }
     var name = node.openingElement.name.name;
     // Legacy icons rendered as JSX elements
-    if (name in legacyIconImports) {
-      var _node$parent2, _node$parent3, _size;
+    if (Object.keys(legacyIconImports).includes(name)) {
+      var _node$parent2, _node$parent3, _size, _size2;
       // Determine if inside a new button - if so:
       // - Assume spread props are safe - still error if props explicitly set to unmigratable values
       var insideNewButton = false;
@@ -349,13 +377,15 @@ var createChecks = exports.createChecks = function createChecks(context) {
         hasManualMigration = true;
       }
       var migrationMapObject = (0, _helpers.getMigrationMapObject)(legacyIconImports[name].packageName);
+      var upcomingIcon = (0, _helpers.getUpcomingIcons)(legacyIconImports[name].packageName);
       var newIcon = migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.newIcon;
-      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[(_size = size) !== null && _size !== void 0 ? _size : 'medium']);
-      if (!hasManualMigration && newIcon && isNewIconMigratable) {
+      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(upcomingIcon ? upcomingIcon.sizeGuidance[(_size = size) !== null && _size !== void 0 ? _size : 'medium'] : migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[(_size2 = size) !== null && _size2 !== void 0 ? _size2 : 'medium']);
+      if (!hasManualMigration && (newIcon || upcomingIcon) && isNewIconMigratable) {
         (0, _helpers.createAutoMigrationError)(node, legacyIconImports[name].packageName, name, errorsAuto);
-      } else if ((!newIcon || !isNewIconMigratable) && size) {
-        (0, _helpers.createCantFindSuitableReplacementError)(node, legacyIconImports[name].packageName, name, errorsManual, migrationMapObject ? true : false);
+      } else if ((!newIcon && !upcomingIcon || !isNewIconMigratable) && size) {
+        (0, _helpers.createCantFindSuitableReplacementError)(node, legacyIconImports[name].packageName, name, errorsManual, upcomingIcon ? true : migrationMapObject ? true : false);
       }
+      (0, _helpers.addToListOfRanges)(node, errorRanges);
       guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[name].packageName, insideNewButton, size && (0, _helpers.isSize)(size) ? size : undefined);
     }
   };
@@ -365,14 +395,15 @@ var createChecks = exports.createChecks = function createChecks(context) {
    * @param node The function call node found by ESLint
    */
   var checkCallExpression = function checkCallExpression(node) {
-    if ('arguments' in node && node.arguments.length) {
+    if (Object.keys(node).includes('arguments') && node.arguments.length) {
       var _iterator8 = _createForOfIteratorHelper(node.arguments),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var arg = _step8.value;
-          if ((0, _eslintCodemodUtils.isNodeOfType)(arg, 'Identifier') && arg.name in legacyIconImports && legacyIconImports[arg.name].packageName) {
+          if ((0, _eslintCodemodUtils.isNodeOfType)(arg, 'Identifier') && Object.keys(legacyIconImports).includes(arg.name) && legacyIconImports[arg.name].packageName) {
             (0, _helpers.createCantMigrateFunctionUnknownError)(node, legacyIconImports[arg.name].packageName, arg.name, errorsManual);
+            (0, _helpers.addToListOfRanges)(node, errorRanges);
             guidance[(0, _helpers.locToString)(node)] = (0, _helpers.createGuidance)(legacyIconImports[arg.name].packageName);
           }
         }
@@ -393,30 +424,41 @@ var createChecks = exports.createChecks = function createChecks(context) {
         var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
           _key = _Object$entries$_i[0],
           errorList = _Object$entries$_i[1];
-        var node = 'node' in errorList.errors[0] ? errorList.errors[0].node : null;
-        if (node) {
-          var guidanceMessage = _key in guidance ? guidance[_key] : '';
-          context.report({
-            node: node,
-            messageId: 'noLegacyIconsManualMigration',
-            data: {
-              iconName: errorList.iconName,
-              importSource: errorList.importSource,
-              guidance: isQuietMode ? guidanceMessage : "".concat(guidanceMessage, "For more information see the below errors.\n")
-            }
-          });
-          if (!isQuietMode) {
-            var _iterator9 = _createForOfIteratorHelper(errorList.errors),
-              _step9;
-            try {
-              for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                var error = _step9.value;
-                context.report(error);
+        var _node = 'node' in errorList.errors[0] ? errorList.errors[0].node : null;
+        var cantMigrateIdentifierError = errorList.errors.find(function (x) {
+          return 'messageId' in x && x.messageId === 'cantMigrateIdentifier';
+        });
+        if (_node) {
+          var isInRange = false;
+          if (cantMigrateIdentifierError && (0, _helpers.isInRangeList)(_node, errorRanges)) {
+            isInRange = true;
+          }
+          if (isInRange && errorList.errors.length - 1 > 0 || !isInRange && errorList.errors.length > 0) {
+            var guidanceMessage = Object.keys(guidance).includes(_key) ? guidance[_key] : '';
+            context.report({
+              node: _node,
+              messageId: 'noLegacyIconsManualMigration',
+              data: {
+                iconName: errorList.iconName,
+                importSource: errorList.importSource,
+                guidance: isQuietMode ? guidanceMessage : "".concat(guidanceMessage, "For more information see the below errors.\n")
+              }
+            });
+            if (!isQuietMode) {
+              var _iterator9 = _createForOfIteratorHelper(errorList.errors),
+                _step9;
+              try {
+                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                  var error = _step9.value;
+                  if ('messageId' in error && (error.messageId !== 'cantMigrateIdentifier' || error.messageId === 'cantMigrateIdentifier' && !isInRange)) {
+                    context.report(error);
+                  }
+                }
+              } catch (err) {
+                _iterator9.e(err);
+              } finally {
+                _iterator9.f();
               }
-            } catch (err) {
-              _iterator9.e(err);
-            } finally {
-              _iterator9.f();
             }
           }
         }
@@ -429,14 +471,19 @@ var createChecks = exports.createChecks = function createChecks(context) {
           _error = _Object$entries2$_i[1];
         // If there's a manual error that exists for this same component,
         // don't throw the auto error
-        if (_key2 in errorsManual) {
-          delete errorsAuto[_key2];
-          continue;
+        if (Object.keys(errorsManual).includes(_key2)) {
+          var _cantMigrateIdentifierError = errorsManual[_key2].errors.find(function (x) {
+            return 'messageId' in x && x.messageId === 'cantMigrateIdentifier';
+          });
+          if (!_cantMigrateIdentifierError || _cantMigrateIdentifierError && errorsManual[_key2].errors.length > 1) {
+            delete errorsAuto[_key2];
+            continue;
+          }
         }
-        var _node = 'node' in _error ? _error.node : null;
-        if (_node) {
-          var _guidanceMessage = _key2 in guidance ? guidance[_key2] : '';
-          if ('data' in _error && _error.data) {
+        var _node2 = 'node' in _error ? _error.node : null;
+        if (_node2) {
+          var _guidanceMessage = Object.keys(guidance).includes(_key2) ? guidance[_key2] : '';
+          if (Object.keys(_error).includes('data') && _error.data) {
             _error.data.guidance = _guidanceMessage;
           }
           context.report(_error);
@@ -453,6 +500,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
     checkIconAsProp: checkIconAsProp,
     checkJSXElement: checkJSXElement,
     checkCallExpression: checkCallExpression,
-    throwErrors: throwErrors
+    throwErrors: throwErrors,
+    checkIconReference: checkIconReference
   };
 };

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

@@ -5,11 +5,12 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.locToString = exports.isSize = exports.getMigrationMapObject = exports.getLiteralStringValue = exports.createHelpers = exports.createGuidance = exports.createCantMigrateSpreadPropsError = exports.createCantMigrateSizeUnknown = exports.createCantMigrateReExportError = exports.createCantMigrateIdentifierError = exports.createCantMigrateFunctionUnknownError = exports.createCantMigrateColorError = exports.createCantFindSuitableReplacementError = exports.createAutoMigrationError = exports.canMigrateColor = exports.canAutoMigrateNewIconBasedOnSize = void 0;
+exports.locToString = exports.isSize = exports.isInRangeList = exports.getUpcomingIcons = exports.getMigrationMapObject = exports.getLiteralStringValue = exports.createHelpers = exports.createGuidance = exports.createCantMigrateSpreadPropsError = exports.createCantMigrateSizeUnknown = exports.createCantMigrateReExportError = exports.createCantMigrateIdentifierMapOrArrayError = exports.createCantMigrateIdentifierError = exports.createCantMigrateFunctionUnknownError = exports.createCantMigrateColorError = exports.createCantFindSuitableReplacementError = exports.createAutoMigrationError = exports.canMigrateColor = exports.canAutoMigrateNewIconBasedOnSize = exports.addToListOfRanges = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _eslintCodemodUtils = require("eslint-codemod-utils");
 var _UNSAFE_migrationMap = _interopRequireWildcard(require("@atlaskit/icon/UNSAFE_migration-map"));
 var _getImportName = require("../utils/get-import-name");
+var _upcomingIcons = require("./upcoming-icons");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var sizes = ['small', 'medium', 'large', 'xlarge'];
@@ -24,11 +25,26 @@ var isSize = exports.isSize = function isSize(size) {
  */
 var getMigrationMapObject = exports.getMigrationMapObject = function getMigrationMapObject(iconPackage) {
   var key = getIconKey(iconPackage);
-  if (key in _UNSAFE_migrationMap.default) {
+  if (Object.keys(_UNSAFE_migrationMap.default).includes(key)) {
     return _UNSAFE_migrationMap.default[key];
   }
   return null;
 };
+var getUpcomingIcons = exports.getUpcomingIcons = function getUpcomingIcons(iconPackage) {
+  var key = getIconKey(iconPackage);
+  if (_upcomingIcons.upcomingIcons.includes(key)) {
+    var retval = {
+      sizeGuidance: {
+        small: 'swap',
+        medium: 'swap',
+        large: 'icon-tile',
+        xlarge: 'icon-tile'
+      }
+    };
+    return retval;
+  }
+  return null;
+};
 
 /**
  * Returns the key of a legacy icon
@@ -54,42 +70,67 @@ var createGuidance = exports.createGuidance = function createGuidance(iconPackag
   var insideNewButton = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var size = arguments.length > 2 ? arguments[2] : undefined;
   var migrationMapObject = getMigrationMapObject(iconPackage);
-  if (migrationMapObject) {
+  var upcomingIcon = getUpcomingIcons(iconPackage);
+  if (upcomingIcon) {
+    var guidance = '';
+    if (size) {
+      if (upcomingIcon.sizeGuidance[size] && canAutoMigrateNewIconBasedOnSize(upcomingIcon.sizeGuidance[size])) {
+        guidance += "Fix: An upcoming icon release is planned to migrate this legacy icon.";
+      } else {
+        guidance += "No equivalent icon for this size, ".concat(size, ", in the current or upcoming set of icons.");
+      }
+      guidance += "".concat(Object.keys(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap).includes(upcomingIcon.sizeGuidance[size]) ? " Once the upcoming icons are released, please: ".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[upcomingIcon.sizeGuidance[size]]) : ' No migration size advice given.', "\n");
+    } else {
+      guidance = "Please wait for the upcoming icons released, as it will contain an alternative for this legacy icon.\nMigration suggestions, depending on the legacy icon size:\n";
+      for (var _i = 0, _Object$entries = Object.entries(upcomingIcon.sizeGuidance); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
+          _size = _Object$entries$_i[0],
+          value = _Object$entries$_i[1];
+        guidance += "\t- ".concat(_size, ": ");
+        if (!Object.keys(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap).includes(value)) {
+          guidance += 'No migration advice given.\n';
+        } else {
+          guidance += "".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[value], ".\n");
+        }
+      }
+    }
+    return guidance;
+  } else if (migrationMapObject) {
     var newIcon = migrationMapObject.newIcon;
     if (!newIcon) {
       return 'No equivalent icon in new set. An option is to contribute a custom icon into icon-labs package instead.\n';
     }
     var buttonGuidanceStr = "Please set 'spacing' property of the new icon to 'none', to ensure appropriate spacing inside `@atlaskit/button`.\n";
-    var guidance = '';
+    var _guidance = '';
     if (size) {
       if (migrationMapObject.sizeGuidance[size] && canAutoMigrateNewIconBasedOnSize(migrationMapObject.sizeGuidance[size])) {
-        guidance += "Fix: Use ".concat(newIcon.name, " from ").concat(newIcon.package, "/").concat(newIcon.type, "/").concat(newIcon.name, " instead.");
+        _guidance += "Fix: Use ".concat(newIcon.name, " from ").concat(newIcon.package, "/").concat(newIcon.type, "/").concat(newIcon.name, " instead.");
       } else {
-        guidance += "No equivalent icon for this size, ".concat(size, ", in new set.");
+        _guidance += "No equivalent icon for this size, ".concat(size, ", in new set.");
       }
-      guidance += "".concat(migrationMapObject.sizeGuidance[size] in _UNSAFE_migrationMap.migrationOutcomeDescriptionMap ? " Please: ".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[migrationMapObject.sizeGuidance[size]]) : ' No migration size advice given.', "\n");
+      _guidance += "".concat(Object.keys(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap).includes(migrationMapObject.sizeGuidance[size]) ? " Please: ".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[migrationMapObject.sizeGuidance[size]]) : ' No migration size advice given.', "\n");
     } else {
-      guidance = "Use ".concat(newIcon.name, " from ").concat(newIcon.package, "/").concat(newIcon.type, "/").concat(newIcon.name, " instead.\nMigration suggestions, depending on the legacy icon size:\n");
+      _guidance = "Use ".concat(newIcon.name, " from ").concat(newIcon.package, "/").concat(newIcon.type, "/").concat(newIcon.name, " instead.\nMigration suggestions, depending on the legacy icon size:\n");
       Object.entries(migrationMapObject.sizeGuidance).forEach(function (_ref) {
         var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
           size = _ref2[0],
           value = _ref2[1];
-        guidance += "\t- ".concat(size, ": ");
-        if (!(value in _UNSAFE_migrationMap.migrationOutcomeDescriptionMap)) {
-          guidance += 'No migration advice given.\n';
+        _guidance += "\t- ".concat(size, ": ");
+        if (!Object.keys(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap).includes(value)) {
+          _guidance += 'No migration advice given.\n';
         } else {
-          guidance += "".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[value], ".\n");
+          _guidance += "".concat(_UNSAFE_migrationMap.migrationOutcomeDescriptionMap[value], ".\n");
         }
       });
     }
     if (insideNewButton) {
-      guidance += buttonGuidanceStr;
+      _guidance += buttonGuidanceStr;
     } else if (size && size === 'medium') {
-      guidance += "Setting the spacing property to 'spacious' will maintain the icon's box dimensions - but consider setting spacing='none' as it allows for easier control of spacing by parent elements.\n";
+      _guidance += "Setting the spacing property to 'spacious' will maintain the icon's box dimensions - but consider setting spacing='none' as it allows for easier control of spacing by parent elements.\n";
     } else if (size) {
-      guidance += "In the new icon, please use spacing='none'.\n";
+      _guidance += "In the new icon, please use spacing='none'.\n";
     }
-    return guidance;
+    return _guidance;
   } else {
     return "Migration suggestions not found for \"".concat(iconPackage, "\".\n");
   }
@@ -114,8 +155,11 @@ var canMigrateColor = exports.canMigrateColor = function canMigrateColor(color)
   }
 };
 var locToString = exports.locToString = function locToString(node) {
-  var _node$loc, _node$loc2, _node$loc3, _node$loc4;
-  return "".concat((_node$loc = node.loc) === null || _node$loc === void 0 ? void 0 : _node$loc.start.line, ":").concat((_node$loc2 = node.loc) === null || _node$loc2 === void 0 ? void 0 : _node$loc2.start.column, ":").concat((_node$loc3 = node.loc) === null || _node$loc3 === void 0 ? void 0 : _node$loc3.end.line, ":").concat((_node$loc4 = node.loc) === null || _node$loc4 === void 0 ? void 0 : _node$loc4.end.column);
+  if (node.range && node.range.length >= 2) {
+    return "".concat(node.range[0], ":").concat(node.range[1]);
+  } else {
+    return '';
+  }
 };
 var createCantMigrateReExportError = exports.createCantMigrateReExportError = function createCantMigrateReExportError(node, packageName, exportName, errors) {
   var myError = {
@@ -128,10 +172,10 @@ var createCantMigrateReExportError = exports.createCantMigrateReExportError = fu
   };
   pushManualError(locToString(node), errors, myError, packageName, exportName);
 };
-var createCantMigrateIdentifierError = exports.createCantMigrateIdentifierError = function createCantMigrateIdentifierError(node, packageName, exportName, errors) {
+var createCantMigrateIdentifierMapOrArrayError = exports.createCantMigrateIdentifierMapOrArrayError = function createCantMigrateIdentifierMapOrArrayError(node, packageName, exportName, errors) {
   var myError = {
     node: node,
-    messageId: 'cantMigrateIdentifier',
+    messageId: 'cantMigrateIdentifierMapOrArray',
     data: {
       packageName: packageName,
       exportName: exportName
@@ -139,6 +183,17 @@ var createCantMigrateIdentifierError = exports.createCantMigrateIdentifierError
   };
   pushManualError(locToString(node), errors, myError, packageName, exportName);
 };
+var createCantMigrateIdentifierError = exports.createCantMigrateIdentifierError = function createCantMigrateIdentifierError(node, packageName, exportName, errors) {
+  var myError = {
+    node: node,
+    messageId: 'cantMigrateIdentifier',
+    data: {
+      iconSource: packageName,
+      iconName: exportName
+    }
+  };
+  pushManualError(locToString(node), errors, myError, packageName, exportName);
+};
 var createCantFindSuitableReplacementError = exports.createCantFindSuitableReplacementError = function createCantFindSuitableReplacementError(node, importSource, iconName, errors, sizeIssue) {
   var myError = {
     node: node,
@@ -201,7 +256,7 @@ var createAutoMigrationError = exports.createAutoMigrationError = function creat
   errors[locToString(node)] = myError;
 };
 var pushManualError = function pushManualError(key, errors, myError, importSource, iconName) {
-  if (key in errors) {
+  if (Object.keys(errors).includes(key)) {
     errors[key].errors.push(myError);
   } else {
     errors[key] = {
@@ -249,7 +304,7 @@ var createHelpers = exports.createHelpers = function createHelpers(context) {
    * @returns defaultValue if the configuration flag is not set, the defaultValue of the configuration flag otherwise
    */
   var getConfigFlag = function getConfigFlag(key, defaultValue) {
-    if (context.options.length > 0 && context.options[0] && key in context.options[0]) {
+    if (context.options.length > 0 && context.options[0] && Object.keys(context.options[0]).includes(key)) {
       return context.options[0][key] === !defaultValue ? !defaultValue : defaultValue;
     }
     return defaultValue;
@@ -266,4 +321,22 @@ var createHelpers = exports.createHelpers = function createHelpers(context) {
     getTokenCallValue: getTokenCallValue,
     getConfigFlag: getConfigFlag
   };
+};
+var addToListOfRanges = exports.addToListOfRanges = function addToListOfRanges(node, sortedListOfRangesForErrors) {
+  if (node.range && node.range.length >= 2) {
+    sortedListOfRangesForErrors.push({
+      start: node.range[0],
+      end: node.range[1]
+    });
+  }
+};
+var isInRangeList = exports.isInRangeList = function isInRangeList(node, sortedListOfRangesForErrors) {
+  var range = node.range;
+  if (!range || range.length < 2) {
+    return false;
+  }
+  var found = sortedListOfRangesForErrors.find(function (currRange) {
+    return range[0] >= currRange.start && range[1] <= currRange.end;
+  });
+  return !!found;
 };

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

@@ -41,8 +41,8 @@ var rule = (0, _createRule.createLintRule)({
       cantMigrateSpreadProps: "This usage of Icon uses spread props in a way that can't be automatically migrated. Please explicitly define the following props after spread: '{{missingProps}}' ",
       cantMigrateSizeUnknown: "This usage of Icon sets the size via a variable or function that can't be determined.",
       cantMigrateFunctionUnknown: "'{{iconName}}' from legacy '{{importSource}}' is used in unknown function/component. Please manually migrate this icon.",
-      cantMigrateIdentifier: "This icon is passed to other components via a map or array, in a way that can't be automatically migrated. Please manually migrate wherever this expression is used and use the icon components directly.",
-      cantMigrateUnsafeProp: "Property '{{propName}}' with value of '{{value}}' is unable to be auto-migrated to the new button. Please manually migrate this icon."
+      cantMigrateIdentifierMapOrArray: "This icon is passed to other components via a map or array, in a way that can't be automatically migrated. Please manually migrate wherever this expression is used and use the icon components directly.",
+      cantMigrateIdentifier: "This is a legacy icon, {{iconName}} from {{iconSource}}, being referenced. Please manually migrate."
     }
   },
   create: function create(context) {
@@ -58,7 +58,8 @@ var rule = (0, _createRule.createLintRule)({
       checkIconAsProp = _createChecks.checkIconAsProp,
       checkJSXElement = _createChecks.checkJSXElement,
       checkCallExpression = _createChecks.checkCallExpression,
-      throwErrors = _createChecks.throwErrors;
+      throwErrors = _createChecks.throwErrors,
+      checkIconReference = _createChecks.checkIconReference;
     return (0, _errorBoundary.errorBoundary)({
       // Track imports of relevant components
       ImportDeclaration: checkImportDeclarations,
@@ -74,6 +75,7 @@ var rule = (0, _createRule.createLintRule)({
       JSXElement: checkJSXElement,
       // Icons called as an argument of a function (i.e. icon={DefaultIcon(AddIcon)})
       CallExpression: checkCallExpression,
+      Identifier: checkIconReference,
       'Program:exit': throwErrors
     }, failSilently);
   }

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

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.upcomingIcons = void 0;
+var upcomingIcons = exports.upcomingIcons = ['app-switcher', 'check-circle-outline', 'export', 'file', 'flag-filled', 'lightbulb-filled', 'lock-filled', 'menu-expand', 'menu', 'notification-direct', 'notification', 'people-group', 'people', 'refresh', 'switcher', 'editor/align-image-center', 'editor/align-image-left', 'editor/align-image-right', 'editor/background-color', 'editor/bold', 'editor/indent', 'editor/italic', 'editor/horizontal-rule', 'editor-layout-three-equal', 'editor-layout-three-with-sidebars', 'editor/layout-two-equal', 'editor/layout-two-left-sidebars', 'editor/layout-two-right-sidebar', 'editor/media-center', 'editor/media-full-width', 'editor/media-wide', 'editor/number-list', 'emoji/activity', 'editor/file', 'emoji/flags', 'emoji/food', 'emoji/nature', 'emoji/people', 'emoji/productivity', 'emoji/travel', 'bitbucket/repos'];