@atlaskit/eslint-plugin-design-system 10.17.1 → 10.17.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 10.17.2
+
+### Patch Changes
+
+- [#133689](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133689)
+  [`5b1de3a5df2be`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5b1de3a5df2be) -
+  Fix bug in no-legacy-icons where in certain tooling, the token() function wasn't recognised
+  correctly when resolving icon colors.
+
 ## 10.17.1
 
 ### Patch Changes

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

@@ -9,7 +9,6 @@ exports.locToString = exports.isSize = exports.isInsideNewButton = exports.isIns
 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; }
@@ -322,8 +321,12 @@ var createHelpers = exports.createHelpers = function createHelpers(context) {
    * @returns The value of the token call, or null if it could not be extracted
    */
   var getTokenCallValue = function getTokenCallValue(value) {
-    var tokenName = (0, _getImportName.getImportName)(context.sourceCode.getScope(value), '@atlaskit/tokens', 'token');
-    if (tokenName && (0, _eslintCodemodUtils.isNodeOfType)(value, 'JSXExpressionContainer') && (0, _eslintCodemodUtils.isNodeOfType)(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === tokenName) {
+    /**
+     * Previously, we used getImportName() to extract the token name from a token() call.
+     * However, this was failing in the Issue Automat so we are now using a simpler approach.
+     */
+
+    if ((0, _eslintCodemodUtils.isNodeOfType)(value, 'JSXExpressionContainer') && (0, _eslintCodemodUtils.isNodeOfType)(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === 'token') {
       // propName={token("color...."}
       return getLiteralStringValue(value.expression.arguments[0]);
     }

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

@@ -1,6 +1,5 @@
 import { isNodeOfType, literal } from 'eslint-codemod-utils';
 import baseMigrationMap, { migrationOutcomeDescriptionMap } from '@atlaskit/icon/UNSAFE_migration-map';
-import { getImportName } from '../utils/get-import-name';
 import { upcomingIcons } from './upcoming-icons';
 const sizes = ['small', 'medium', 'large', 'xlarge'];
 export const isSize = size => sizes.includes(size);
@@ -308,8 +307,12 @@ export const createHelpers = context => {
    * @returns The value of the token call, or null if it could not be extracted
    */
   const getTokenCallValue = value => {
-    const tokenName = getImportName(context.sourceCode.getScope(value), '@atlaskit/tokens', 'token');
-    if (tokenName && isNodeOfType(value, 'JSXExpressionContainer') && isNodeOfType(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === tokenName) {
+    /**
+     * Previously, we used getImportName() to extract the token name from a token() call.
+     * However, this was failing in the Issue Automat so we are now using a simpler approach.
+     */
+
+    if (isNodeOfType(value, 'JSXExpressionContainer') && isNodeOfType(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === 'token') {
       // propName={token("color...."}
       return getLiteralStringValue(value.expression.arguments[0]);
     }

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

@@ -1,7 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { isNodeOfType, literal } from 'eslint-codemod-utils';
 import baseMigrationMap, { migrationOutcomeDescriptionMap } from '@atlaskit/icon/UNSAFE_migration-map';
-import { getImportName } from '../utils/get-import-name';
 import { upcomingIcons } from './upcoming-icons';
 var sizes = ['small', 'medium', 'large', 'xlarge'];
 export var isSize = function isSize(size) {
@@ -312,8 +311,12 @@ export var createHelpers = function createHelpers(context) {
    * @returns The value of the token call, or null if it could not be extracted
    */
   var getTokenCallValue = function getTokenCallValue(value) {
-    var tokenName = getImportName(context.sourceCode.getScope(value), '@atlaskit/tokens', 'token');
-    if (tokenName && isNodeOfType(value, 'JSXExpressionContainer') && isNodeOfType(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === tokenName) {
+    /**
+     * Previously, we used getImportName() to extract the token name from a token() call.
+     * However, this was failing in the Issue Automat so we are now using a simpler approach.
+     */
+
+    if (isNodeOfType(value, 'JSXExpressionContainer') && isNodeOfType(value.expression, 'CallExpression') && 'name' in value.expression.callee && value.expression.callee.name === 'token') {
       // propName={token("color...."}
       return getLiteralStringValue(value.expression.arguments[0]);
     }

package/package.json

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