Merge branch 'master' into simeonoff/indigo-themes-contd

IgniteUI · May 16, 2024 · 626f21f · 626f21f
2 parents 6b6d130 + 1f86e38
commit 626f21f
Show file tree

Hide file tree

Showing 4 changed files with 262 additions and 260 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -1,18 +1,22 @@
 import type { StorybookConfig } from '@storybook/web-components-vite';
 
 const config: StorybookConfig = {
-  stories: ['../stories/**/*.stories.@(js|jsx|ts|tsx)'],
+  stories: ['../stories/**/*.stories.ts'],
   addons: [
     '@storybook/addon-a11y',
     '@storybook/addon-links',
     '@storybook/addon-essentials',
   ],
+  core: {
+    builder: '@storybook/builder-vite',
+  },
   framework: {
     name: '@storybook/web-components-vite',
     options: {},
   },
   viteFinal: async (config, options) => {
     const { mergeConfig } = await import('vite');
+
     if (options.configType === 'PRODUCTION') {
       return mergeConfig(config, {
         build: {
@@ -28,7 +32,7 @@ const config: StorybookConfig = {
       });
     }
 
-    return config;
+    return mergeConfig(config, {});
   },
 };
 

diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -4,9 +4,6 @@
   href="https://fonts.googleapis.com/css2?family=Titillium+Web:ital,wght@0,300;0,400;0,600;0,700;1,300;1,400;1,600;1,700&display=swap"
   rel="stylesheet"
 />
-<script>
-  window.global = window;
-</script>
 
 <style>
   body {