Skip to content
Prev Previous commit
Next Next commit
Copy the project vite plugins
  • Loading branch information
DustinJSilk committed Jan 16, 2023
commit edf8ec63ccf4ea3496c5a3821a09356a772c50b7
16 changes: 8 additions & 8 deletions starters/features/storybook/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { qwikCity } from '@builder.io/qwik-city/vite';
import { qwikVite } from '@builder.io/qwik/optimizer';
import type { StorybookViteConfig } from '@storybook/builder-vite';
import { mergeConfig } from 'vite';
import tsconfigPaths from 'vite-tsconfig-paths';
import { mergeConfig, UserConfig } from 'vite';
import baseConfig from '../vite.config';

const config: StorybookViteConfig = {
addons: ['@storybook/addon-essentials'],
Expand All @@ -14,8 +12,8 @@ const config: StorybookViteConfig = {
features: {
storyStoreV7: true,
},
viteFinal: async (config) => {
const overridenConfig = mergeConfig(config, {
viteFinal: async (defaultConfig) => {
const config = mergeConfig(defaultConfig, {
build: {
target: 'es2020',
rollupOptions: {
Expand All @@ -24,9 +22,11 @@ const config: StorybookViteConfig = {
},
});

overridenConfig.plugins = [qwikCity(), qwikVite(), tsconfigPaths(), ...overridenConfig.plugins];
const projectConfig = (baseConfig as () => UserConfig)();

return overridenConfig;
config.plugins = [...(projectConfig.plugins ?? []), ...(defaultConfig.plugins ?? [])];

return config;
},
};

Expand Down
7 changes: 1 addition & 6 deletions starters/features/storybook/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
"emitDecoratorMetadata": true,
"composite": true
},
"exclude": [
"../**/*.spec.ts",
"../**/*.test.ts",
"../**/*.spec.tsx",
"../**/*.test.tsx"
],
"exclude": ["../**/*.spec.ts", "../**/*.test.ts", "../**/*.spec.tsx", "../**/*.test.tsx"],
"include": [
"../src/**/*.stories.ts",
"../src/**/*.stories.tsx",
Expand Down