Merge branch 'devel' into 5170-cb-6198-migrate-secrets-ui-public-from-backend-to-frontend-part

webapp/common-react/@dbeaver/ui-kit/package.json

@@ -23,7 +23,7 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "@wroud/vite-plugin-asset-resolver": "^0",
-    "@wroud/vite-plugin-tsc": "^0.11.6",
+    "@wroud/vite-plugin-tsc": "^0",
     "rimraf": "^6",
     "tailwindcss": "4.0.7",
     "typescript": "^5",

webapp/packages/core-utils/package.json

@@ -28,7 +28,7 @@
     "mobx": "^6",
     "tslib": "^2",
     "underscore": "^1",
-    "uuid": "^11",
+    "uuid": "^13",
     "whatwg-mimetype": "^4",
     "zod": "^4",
     "zod-validation-error": "^4"

webapp/packages/product-base/package.json

@@ -33,7 +33,7 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@vitejs/plugin-react": "^4",
+    "@vitejs/plugin-react": "^5",
     "@wroud/vite-plugin-asset-resolver": "^0",
     "@wroud/vite-plugin-tsc": "^0",
     "fs-extra": "^11",

webapp/packages/product-default/vite.config.ts

@@ -15,9 +15,19 @@ import packageJson from './package.json';
 export default defineConfig(
   ({ mode }): UserConfig => ({
     /*
-    Fixes https://github.com/dbeaver/cloudbeaver/issues/3308
-    ROOT_URI approach for assets doesn't work well when we serve our application not from a root folder. In that case inner Vite asset handling system add indices to CSS files using absolute path ignoring injected ROOT_URI. When using relative path in base property, we ask Vite to generate paths relatively to each file https://vite.dev/guide/build#public-base-path.  */
+      Fixes https://github.com/dbeaver/cloudbeaver/issues/3308
+      ROOT_URI approach for assets doesn't work well when we serve our application not from a root folder. 
+      In that case inner Vite asset handling system add indices to CSS files using absolute path ignoring 
+      injected ROOT_URI. When using relative path in base property, we ask Vite to generate paths relatively 
+      to each file https://vite.dev/guide/build#public-base-path. 
+    */
     base: './',
+    resolve: {
+      // resolves sass to sass-embedded package to avoid issues with builder trying to use incorrect sass package
+      alias: {
+        sass: 'sass-embedded',
+      },
+    },
     plugins: [baseConfigurationPlugin(mode, packageJson)],
   }),
 );