@atlaskit/eslint-plugin-design-system 8.36.0 → 8.36.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 8.36.1
+
+### Patch Changes
+
+- [#79810](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79810) [`8c6e96aa3cf0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8c6e96aa3cf0) - Fixed an issue with `ensure-design-token-usage` where color props on primitive components could report an error.
+
 ## 8.36.0
 
 ### Minor Changes

package/dist/cjs/rules/ensure-design-token-usage/color.js

@@ -143,6 +143,11 @@ var lintJSXLiteralForColor = exports.lintJSXLiteralForColor = function lintJSXLi
   if ((0, _isNode.isDecendantOfSvgElement)(node.parent)) {
     return;
   }
+
+  // Box backgroundColor prop accepts token names directly - don't lint against this
+  if ((0, _isNode.isDecendantOfPrimitive)(node.parent, context)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/cjs/rules/utils/is-node.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPropertyKey = exports.isDecendantOfType = exports.isDecendantOfSvgElement = exports.isDecendantOfStyleJsxAttribute = exports.isDecendantOfStyleBlock = exports.isDecendantOfGlobalToken = exports.isCssInJsTemplateNode = exports.isCssInJsObjectNode = exports.isCssInJsCallNode = exports.isChildOfType = void 0;
+exports.isPropertyKey = exports.isDecendantOfType = exports.isDecendantOfSvgElement = exports.isDecendantOfStyleJsxAttribute = exports.isDecendantOfStyleBlock = exports.isDecendantOfPrimitive = exports.isDecendantOfGlobalToken = exports.isCssInJsTemplateNode = exports.isCssInJsObjectNode = exports.isCssInJsCallNode = exports.isChildOfType = void 0;
 var _eslintCodemodUtils = require("eslint-codemod-utils");
+var _astNodes = require("../../ast-nodes");
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 var isDecendantOfGlobalToken = exports.isDecendantOfGlobalToken = function isDecendantOfGlobalToken(node) {
@@ -54,6 +55,22 @@ var isDecendantOfSvgElement = exports.isDecendantOfSvgElement = function isDecen
   }
   return false;
 };
+var isDecendantOfPrimitive = exports.isDecendantOfPrimitive = function isDecendantOfPrimitive(node, context) {
+  var primitivesToCheck = ['Box', 'Text'];
+  if ((0, _eslintCodemodUtils.isNodeOfType)(node, 'JSXElement')) {
+    // @ts-ignore
+    if (primitivesToCheck.includes(node.openingElement.name.name)) {
+      var importDeclaration = _astNodes.Root.findImportsByModule(context.getSourceCode().ast.body, '@atlaskit/primitives');
+      if (importDeclaration.length) {
+        return true;
+      }
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfPrimitive(node.parent, context);
+  }
+  return false;
+};
 var cssInJsCallees = ['css', 'styled', 'styled2'];
 var isCssInJsTemplateNode = exports.isCssInJsTemplateNode = function isCssInJsTemplateNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';

package/dist/es2019/rules/ensure-design-token-usage/color.js

@@ -4,7 +4,7 @@ import { node as generate, isNodeOfType } from 'eslint-codemod-utils';
 import { getIsException } from '../utils/get-is-exception';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from '../utils/is-color';
 import { isLegacyElevation } from '../utils/is-elevation';
-import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
+import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfPrimitive, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
 // TemplateLiteral > Identifier
 export const lintTemplateIdentifierForColor = (node, context, config) => {
   if (node.type !== 'Identifier') {
@@ -138,6 +138,11 @@ export const lintJSXLiteralForColor = (node, context, config) => {
   if (isDecendantOfSvgElement(node.parent)) {
     return;
   }
+
+  // Box backgroundColor prop accepts token names directly - don't lint against this
+  if (isDecendantOfPrimitive(node.parent, context)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/es2019/rules/utils/is-node.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 import { isNodeOfType } from 'eslint-codemod-utils';
+import { Root } from '../../ast-nodes';
 export const isDecendantOfGlobalToken = node => {
   if (isNodeOfType(node, 'CallExpression') && isNodeOfType(node.callee, 'Identifier') && (node.callee.name === 'token' || node.callee.name === 'getTokenValue')) {
     return true;
@@ -47,6 +48,22 @@ export const isDecendantOfSvgElement = node => {
   }
   return false;
 };
+export const isDecendantOfPrimitive = (node, context) => {
+  const primitivesToCheck = ['Box', 'Text'];
+  if (isNodeOfType(node, 'JSXElement')) {
+    // @ts-ignore
+    if (primitivesToCheck.includes(node.openingElement.name.name)) {
+      const importDeclaration = Root.findImportsByModule(context.getSourceCode().ast.body, '@atlaskit/primitives');
+      if (importDeclaration.length) {
+        return true;
+      }
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfPrimitive(node.parent, context);
+  }
+  return false;
+};
 const cssInJsCallees = ['css', 'styled', 'styled2'];
 export const isCssInJsTemplateNode = node => (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';
 export const isCssInJsCallNode = node => (node === null || node === void 0 ? void 0 : node.type) === 'CallExpression' && node.callee.type === 'Identifier' && cssInJsCallees.includes(node.callee.name);

package/dist/esm/rules/ensure-design-token-usage/color.js

@@ -4,7 +4,7 @@ import { node as generate, isNodeOfType } from 'eslint-codemod-utils';
 import { getIsException } from '../utils/get-is-exception';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from '../utils/is-color';
 import { isLegacyElevation } from '../utils/is-elevation';
-import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
+import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfPrimitive, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
 // TemplateLiteral > Identifier
 export var lintTemplateIdentifierForColor = function lintTemplateIdentifierForColor(node, context, config) {
   if (node.type !== 'Identifier') {
@@ -137,6 +137,11 @@ export var lintJSXLiteralForColor = function lintJSXLiteralForColor(node, contex
   if (isDecendantOfSvgElement(node.parent)) {
     return;
   }
+
+  // Box backgroundColor prop accepts token names directly - don't lint against this
+  if (isDecendantOfPrimitive(node.parent, context)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/esm/rules/utils/is-node.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 import { isNodeOfType } from 'eslint-codemod-utils';
+import { Root } from '../../ast-nodes';
 export var isDecendantOfGlobalToken = function isDecendantOfGlobalToken(node) {
   if (isNodeOfType(node, 'CallExpression') && isNodeOfType(node.callee, 'Identifier') && (node.callee.name === 'token' || node.callee.name === 'getTokenValue')) {
     return true;
@@ -48,6 +49,22 @@ export var isDecendantOfSvgElement = function isDecendantOfSvgElement(node) {
   }
   return false;
 };
+export var isDecendantOfPrimitive = function isDecendantOfPrimitive(node, context) {
+  var primitivesToCheck = ['Box', 'Text'];
+  if (isNodeOfType(node, 'JSXElement')) {
+    // @ts-ignore
+    if (primitivesToCheck.includes(node.openingElement.name.name)) {
+      var importDeclaration = Root.findImportsByModule(context.getSourceCode().ast.body, '@atlaskit/primitives');
+      if (importDeclaration.length) {
+        return true;
+      }
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfPrimitive(node.parent, context);
+  }
+  return false;
+};
 var cssInJsCallees = ['css', 'styled', 'styled2'];
 export var isCssInJsTemplateNode = function isCssInJsTemplateNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';

package/dist/types/rules/utils/is-node.d.ts

@@ -5,6 +5,7 @@ export declare const isDecendantOfType: (node: Rule.Node, type: Rule.Node['type'
 export declare const isPropertyKey: (node: Rule.Node) => boolean;
 export declare const isDecendantOfStyleJsxAttribute: (node: Rule.Node) => boolean;
 export declare const isDecendantOfSvgElement: (node: Rule.Node) => boolean;
+export declare const isDecendantOfPrimitive: (node: Rule.Node, context: Rule.RuleContext) => boolean;
 export declare const isCssInJsTemplateNode: (node?: Expression | null) => node is TaggedTemplateExpression;
 export declare const isCssInJsCallNode: (node?: Expression | null) => node is CallExpression;
 export declare const isCssInJsObjectNode: (node?: Expression | null) => node is CallExpression;

package/dist/types-ts4.5/rules/utils/is-node.d.ts

@@ -5,6 +5,7 @@ export declare const isDecendantOfType: (node: Rule.Node, type: Rule.Node['type'
 export declare const isPropertyKey: (node: Rule.Node) => boolean;
 export declare const isDecendantOfStyleJsxAttribute: (node: Rule.Node) => boolean;
 export declare const isDecendantOfSvgElement: (node: Rule.Node) => boolean;
+export declare const isDecendantOfPrimitive: (node: Rule.Node, context: Rule.RuleContext) => boolean;
 export declare const isCssInJsTemplateNode: (node?: Expression | null) => node is TaggedTemplateExpression;
 export declare const isCssInJsCallNode: (node?: Expression | null) => node is CallExpression;
 export declare const isCssInJsObjectNode: (node?: Expression | null) => node is CallExpression;

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": "8.36.0",
+  "version": "8.36.1",
   "author": "Atlassian Pty Ltd",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"