From aea2602e15133b0ffd2ba6e583c19ecde7ea109d Mon Sep 17 00:00:00 2001
From: KIvanow <kristiyan.ivanov@redis.com>
Date: Tue, 15 Jul 2025 13:57:08 +0300
Subject: [PATCH 1/2] fix for the builds failing with redis ui

---
 redisinsight/ui/src/packages/vite.config.mjs | 25 ++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/redisinsight/ui/src/packages/vite.config.mjs b/redisinsight/ui/src/packages/vite.config.mjs
index 6374f7455b..505a0b7cc9 100644
--- a/redisinsight/ui/src/packages/vite.config.mjs
+++ b/redisinsight/ui/src/packages/vite.config.mjs
@@ -4,8 +4,8 @@ import react from '@vitejs/plugin-react';
 import svgr from 'vite-plugin-svgr';
 import { ViteEjsPlugin } from 'vite-plugin-ejs';
 import { viteStaticCopy } from 'vite-plugin-static-copy';
-import { resolve } from 'path';
-import { fileURLToPath } from 'url';
+import path, { resolve } from 'path'
+import { fileURLToPath } from 'url'
 
 const riPlugins = [
   { name: 'redisearch', entry: 'src/main.tsx' },
@@ -83,6 +83,27 @@ export default defineConfig({
       this: 'window',
     },
   },
+  css: {
+    preprocessorOptions: {
+      scss: {
+        // add @layer app for css ordering. Styles without layer have the highest priority
+        // https://github.com/vitejs/vite/issues/3924
+        additionalData: (source, filename) => {
+          if (path.extname(filename) === '.scss') {
+            const skipFiles = ['/main.scss', '/App.scss'];
+            if (skipFiles.every((file) => !filename.endsWith(file))) {
+              return `
+                @use "uiSrc/styles/mixins/_eui.scss";
+                @use "uiSrc/styles/mixins/_global.scss";
+                @layer app { ${source} }
+              `;
+            }
+          }
+          return source;
+        },
+      },
+    },
+  },
   define: {
     global: 'globalThis',
     'process.env': {},

From d6291cac52ae44ea0b94a20e7ce39a630fc506cd Mon Sep 17 00:00:00 2001
From: KIvanow <kristiyan.ivanov@redis.com>
Date: Tue, 15 Jul 2025 14:04:28 +0300
Subject: [PATCH 2/2] fix for the builds failing with redis ui

---
 redisinsight/ui/src/packages/vite.config.mjs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/redisinsight/ui/src/packages/vite.config.mjs b/redisinsight/ui/src/packages/vite.config.mjs
index 505a0b7cc9..4463176f5e 100644
--- a/redisinsight/ui/src/packages/vite.config.mjs
+++ b/redisinsight/ui/src/packages/vite.config.mjs
@@ -90,7 +90,12 @@ export default defineConfig({
         // https://github.com/vitejs/vite/issues/3924
         additionalData: (source, filename) => {
           if (path.extname(filename) === '.scss') {
-            const skipFiles = ['/main.scss', '/App.scss'];
+            const skipFiles = [
+              '/main.scss',
+              '/App.scss',
+              '/packages/clients-list/src/styles/styles.scss',
+              '/packages/redisearch/src/styles/styles.scss'
+            ];
             if (skipFiles.every((file) => !filename.endsWith(file))) {
               return `
                 @use "uiSrc/styles/mixins/_eui.scss";