fix to working storybook version and remove QWIK_LOADER eval

QwikDev · Dec 16, 2022 · 9ad387e · 9ad387e
1 parent c5f7512
commit 9ad387e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/starters/features/storybook/.storybook/main.ts b/starters/features/storybook/.storybook/main.ts
@@ -1,29 +1,19 @@
 import type { StorybookConfig } from '@storybook/builder-vite';
-import { mergeConfig, UserConfig } from 'vite';
-import baseConfig from '../vite.config';
+import { mergeConfig } from 'vite';
 
 const config: StorybookConfig = {
-  addons: ['@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-a11y'],
   stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
   framework: '@storybook/html-vite',
-  features: {
-    storyStoreV7: true,
-  },
-  viteFinal: async (defaultConfig) => {
-    const config = mergeConfig(defaultConfig, {
+  viteFinal: (config) => {
+    return mergeConfig(config, {
       build: {
         target: 'es2020',
         rollupOptions: {
-          external: ['@qwik-city-sw-register', '@qwik-city-plan'],
+          external: ['@qwik-city-plan'],
         },
       },
     });
-
-    const projectConfig = (baseConfig as () => UserConfig)();
-
-    config.plugins = [...(projectConfig.plugins ?? []), ...(defaultConfig.plugins ?? [])];
-
-    return config;
   },
 };
 

diff --git a/starters/features/storybook/.storybook/preview.tsx b/starters/features/storybook/.storybook/preview.tsx
@@ -1,10 +1,8 @@
 import { JSXNode, render } from '@builder.io/qwik';
 import { QwikCityMockProvider } from '@builder.io/qwik-city';
 import { jsx as _jsx } from '@builder.io/qwik/jsx-runtime';
-import { QWIK_LOADER } from '@builder.io/qwik/loader/index';
-import '../src/global.css';
 
-eval(QWIK_LOADER);
+import '../src/global.css';
 
 export const parameters = {
   actions: { argTypesRegex: '^on[A-Z].*' },

diff --git a/starters/features/storybook/package.json b/starters/features/storybook/package.json
@@ -1,19 +1,21 @@
 {
   "description": "Use Storybook with your Qwik app",
   "devDependencies": {
-    "@storybook/addon-actions": "^7.0.0-beta.8",
-    "@storybook/addon-essentials": "^7.0.0-beta.8",
-    "@storybook/addon-interactions": "^7.0.0-beta.8",
-    "@storybook/addon-links": "^7.0.0-beta.8",
+    "@storybook/addon-a11y": "7.0.0-beta.8",
+    "@storybook/addon-actions": "7.0.0-beta.8",
+    "@storybook/addon-essentials": "7.0.0-beta.8",
+    "@storybook/addon-interactions": "7.0.0-beta.8",
+    "@storybook/addon-links": "7.0.0-beta.8",
     "@storybook/builder-vite": "7.0.0-beta.8",
+    "@storybook/cli": "7.0.0-beta.8",
     "@storybook/html": "7.0.0-beta.8",
     "@storybook/html-vite": "7.0.0-beta.8",
-    "@storybook/node-logger": "^7.0.0-beta.8",
+    "@storybook/node-logger": "7.0.0-beta.8",
     "@storybook/testing-library": "^0.0.14-next.1",
     "@storybook/theming": "7.0.0-beta.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "storybook": "^7.0.0-beta.8"
+    "storybook": "7.0.0-beta.8"
   },
   "scripts": {
     "storybook": "storybook dev -p 6006 -s public",