Merge branch 'main' into til-del-rq

cloudoperators · Dec 19, 2024 · df3ade6 · df3ade6
2 parents 9cdf509 + 7af51d5
commit df3ade6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/.changeset/twenty-books-visit.md b/.changeset/twenty-books-visit.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ui-components/CHANGELOG.md b/packages/ui-components/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @cloudoperators/juno-ui-components
 
+## 2.35.1
+
+### Patch Changes
+
+- baccd3c: Import components styles manually in global.scss
+- 2826334: Reintroduce Modal component stories removed during TypeScript migration
+
 ## 2.35.0
 
 ### Minor Changes

diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
@@ -3,7 +3,7 @@
   "private": false,
   "source": "src/index.js",
   "style": "build/lib/variables.css",
-  "version": "2.35.0",
+  "version": "2.35.1",
   "types": "build/index.d.ts",
   "exports": {
     "./index": "./build/index.js",

diff --git a/packages/ui-components/src/global.scss b/packages/ui-components/src/global.scss
@@ -1,6 +1,14 @@
 // SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Juno contributors
 // SPDX-License-Identifier: Apache-2.0
 @use "../lib/variables";
+@use './components/Button/button.scss';
+@use './components/DateTimePicker/datetimepicker.scss';
+@use './components/FormattedText/formatted-text.scss';
+@use './components/InputGroup/input-group.scss';
+@use './components/SearchInput/searchinput.scss';
+@use './components/Select/select.scss';
+@use './components/TextInput/textinput.scss';
+@use './components/ThemeToggle/themeToggle.scss';
 
 @tailwind base;
 
@@ -40,5 +48,3 @@
     flex-basis: auto;
   }
 }
-
-
diff --git a/packages/ui-components/vite.config.ts b/packages/ui-components/vite.config.ts
@@ -3,13 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { defineConfig } from "vite"
+import { defineConfig, PluginOption } from "vite"
 import react from "@vitejs/plugin-react"
 import tailwindcss from "tailwindcss"
 import autoprefixer from "autoprefixer"
 import dts from "vite-plugin-dts"
-import viteGlobPlugin from "vite-plugin-glob"
-
 import svgr from "vite-plugin-svgr"
 
 export default defineConfig({
@@ -31,20 +29,19 @@ export default defineConfig({
     outDir: "build",
   },
   plugins: [
-    viteGlobPlugin(),
     dts({
       exclude: ["./__tests__/**/*.test.ts", "vitest.setup.ts"],
       insertTypesEntry: true, // Ensure types are properly exported
       outDir: "build/types", // Specify where to output the types
-    }),
-    react(),
+    }) as PluginOption,
+    react() as PluginOption,
     svgr({
       svgrOptions: {
         ref: true,
         svgo: false,
         titleProp: true,
       },
       include: "**/*.svg",
-    }),
+    }) as PluginOption,
   ],
 })