(superset) branch remove-AVOID_COLORS_COLLISION-flag updated: fixing eslint/prettier conflicts

[rusackas]

This is an automated email from the ASF dual-hosted git repository.

rusackas pushed a commit to branch remove-AVOID_COLORS_COLLISION-flag
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to 
refs/heads/remove-AVOID_COLORS_COLLISION-flag by this push:
     new 11f840a041 fixing eslint/prettier conflicts
11f840a041 is described below

commit 11f840a0417a0c8a096df438802f10ff357b951a
Author: Evan Rusackas <e...@rusackas.com>
AuthorDate: Thu Jan 16 15:13:09 2025 -0700

    fixing eslint/prettier conflicts
---
 .pre-commit-config.yaml                                  | 16 ++++++++--------
 .../components/menu/BackgroundStyleDropdown.tsx          |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bb34ee4055..0ccf9d7385 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -52,14 +52,6 @@ repos:
       - id: trailing-whitespace
         exclude: ^.*\.(snap)
         args: ["--markdown-linebreak-ext=md"]
-  - repo: local
-    hooks:
-      - id: eslint
-        name: eslint
-        entry: bash -c 'cd superset-frontend && npm run eslint -- $(echo "$@" 
| sed "s|superset-frontend/||g")'
-        language: system
-        pass_filenames: true
-        files: \.(js|jsx|ts|tsx)$
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8 # Use the sha or tag you want to point at
     hooks:
@@ -68,6 +60,14 @@ repos:
           - prettier@3.3.3
         args: ["--ignore-path=./superset-frontend/.prettierignore"]
         files: "superset-frontend"
+  - repo: local
+    hooks:
+      - id: eslint
+        name: eslint
+        entry: bash -c 'cd superset-frontend && npm run eslint'
+        language: system
+        pass_filenames: true
+        files: \.(js|jsx|ts|tsx)$
   # blacklist unsafe functions like make_url (see #19526)
   - repo: https://github.com/skorokithakis/blacklist-pre-commit-hook
     rev: e2f070289d8eddcaec0b580d3bde29437e7c8221
diff --git 
a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx 
b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
index ccf11bc854..eb44ee81c0 100644
--- 
a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
+++ 
b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
@@ -62,11 +62,7 @@ const BackgroundStyleOption = styled.div`
           ${theme.colors.text.label} 25%,
           transparent 25%
         ),
-        linear-gradient(
-          -45deg,
-          ${theme.colors.text.label} 25%,
-          transparent 25%
-        ),
+        linear-gradient(-45deg, ${theme.colors.text.label} 25%, transparent 
25%),
         linear-gradient(45deg, transparent 75%, ${theme.colors.text.label} 
75%),
         linear-gradient(-45deg, transparent 75%, ${theme.colors.text.label} 
75%);
       background-size: ${theme.gridUnit * 2}px ${theme.gridUnit * 2}px;