Merge branch 'votto-update-eslint-plugin' into 'main'

chore(deps): Update @gitlab/eslint-plugin to v20.4.1

See merge request !4690



Merged-by: Peter Hegman <phegman@gitlab.com>
Approved-by: Peter Hegman <phegman@gitlab.com>
Co-authored-by: Vanessa Otto <votto@gitlab.com>

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
   rules: {
     'import/no-extraneous-dependencies': 'off',
     'import/no-relative-packages': 'off',
-    '@gitlab/tailwind': 'error',
+    '@gitlab/tailwind-no-interpolation': 'error',
     'no-restricted-imports': [
       'error',
       {
@@ -95,7 +95,7 @@ module.exports = {
             ],
           },
         ],
-        '@gitlab/tailwind': 'off',
+        '@gitlab/tailwind-no-interpolation': 'off',
       },
     },
     {

package.json

@@ -113,7 +113,7 @@
     "@babel/preset-env": "^7.25.8",
     "@babel/preset-react": "^7.25.7",
     "@cypress/grep": "^4.0.1",
-    "@gitlab/eslint-plugin": "20.3.0",
+    "@gitlab/eslint-plugin": "20.4.1",
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/stylelint-config": "6.2.2",
     "@gitlab/svgs": "3.117.0",

src/components/base/alert/alert.vue

@@ -156,7 +156,7 @@ export default {
       }, []);
     },
     variantClass() {
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return `gl-alert-${this.variant}`;
     },
   },

src/components/base/avatar/avatar.vue

@@ -72,17 +72,17 @@ export default {
   computed: {
     sizeClasses() {
       if (isNumber(this.size)) {
-        // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+        // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
         return `gl-avatar-s${this.size}`;
       }
 
       const { default: defaultSize, ...nonDefaultSizes } = this.size;
 
       return [
-        // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+        // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
         `gl-avatar-s${defaultSize || avatarSizeOptions[1]}`,
         ...Object.entries(nonDefaultSizes).map(
-          // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+          // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
           ([breakpoint, size]) => `gl-${breakpoint}-avatar-s${size}`
         ),
       ];
@@ -96,7 +96,7 @@ export default {
        * Gets the remainder after dividing the 'entityId' by the number of available backgrounds.
        */
       const type = (this.entityId % IDENTICON_BG_COUNT) + 1;
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return `gl-avatar-identicon-bg${type}`;
     },
     identiconText() {

src/components/base/datepicker/datepicker.vue

@@ -245,7 +245,7 @@ export default {
         'gl-datepicker',
         'd-inline-block',
         'gl-w-full',
-        // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+        // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
         `gl-form-input-${this.computedWidth}`,
       ];
     },

src/components/base/drawer/drawer.vue

@@ -62,7 +62,7 @@ export default {
       return Boolean(this.$slots.footer);
     },
     variantClass() {
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return `gl-drawer-${this.variant}`;
     },
   },

src/components/base/form/form_input/form_input.vue

@@ -42,16 +42,16 @@ export default {
         const { default: defaultWidth, ...nonDefaultWidths } = this.width;
 
         return [
-          // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+          // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
           ...(defaultWidth ? [`gl-form-input-${defaultWidth}`] : []),
           ...Object.entries(nonDefaultWidths).map(
-            // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+            // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
             ([breakpoint, width]) => `gl-${breakpoint}-form-input-${width}`
           ),
         ];
       }
 
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return [`gl-form-input-${this.width}`];
     },
     listeners() {

src/components/base/form/form_select/form_select.vue

@@ -34,16 +34,16 @@ export default {
         const { default: defaultWidth, ...nonDefaultWidths } = this.width;
 
         return [
-          // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+          // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
           ...(defaultWidth ? [`gl-form-select-${defaultWidth}`] : []),
           ...Object.entries(nonDefaultWidths).map(
-            // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+            // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
             ([breakpoint, width]) => `gl-${breakpoint}-form-select-${width}`
           ),
         ];
       }
 
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return [`gl-form-select-${this.width}`];
     },
   },

src/components/base/toast/toast.js

@@ -44,7 +44,7 @@ function renderTitle(h, toast, options) {
 }
 
 function showToast(message, options = {}) {
-  // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+  // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
   const id = `gl-toast-${toastsCount}`;
   toastsCount += 1;
   const hide = () => {

src/components/base/token/token.vue

@@ -35,7 +35,7 @@ export default {
   },
   computed: {
     variantClass() {
-      // eslint-disable-next-line @gitlab/tailwind -- Not a CSS utility
+      // eslint-disable-next-line @gitlab/tailwind-no-interpolation -- Not a CSS utility
       return `gl-token-${this.variant}-variant`;
     },
     viewOnlyClass() {

yarn.lock

@@ -1320,10 +1320,10 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9"
   integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==
-"@gitlab/eslint-plugin@20.3.0":
-  version "20.3.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-20.3.0.tgz#b6a7ff9b94e62f0c371e8f1e13f6a789e45630a7"
-  integrity sha512-Yhosw+Ct3F/7BK36pyMyPjc9YHFNpydTwnA2Zs2miIEJg9zBBlRz2+K4G0IZ25HmSnbCfru+R+KaZURWxPg5Sg==
+"@gitlab/eslint-plugin@20.4.1":
+  version "20.4.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-20.4.1.tgz#79cf7679528a1769d32faf20bab9ac9614aebf8a"
+  integrity sha512-OXCP04WFYa7TkVNXb2gFcgW4BlS2jvlQ/xk7BbvZ3vuHBGzQH9v6Hec709bVJ25iKe2mpHi2C4V5RMaiZUeZew==
   dependencies:
     "@typescript-eslint/eslint-plugin" "^7.14.1"
     eslint-config-airbnb-base "^15.0.0"