Merge pull request #18375 from storybookjs/fix/vue-apply-decorator

Vue/Vue3: Fix decorators in StoryStoreV7
storybookjs · Jun 1, 2022 · 02ca9da · 02ca9da
2 parents 01fba57 + fc2edfa
commit 02ca9da
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/app/vue/src/client/preview/config.ts b/app/vue/src/client/preview/config.ts
@@ -1,4 +1,4 @@
 export { render, renderToDOM } from './render';
-export { decorateStory } from './decorateStory';
+export { decorateStory as applyDecorators } from './decorateStory';
 
 export const parameters = { framework: 'vue' };
diff --git a/app/vue3/src/client/preview/config.ts b/app/vue3/src/client/preview/config.ts
@@ -1,4 +1,4 @@
 export { render, renderToDOM } from './render';
-export { decorateStory } from './decorateStory';
+export { decorateStory as applyDecorators } from './decorateStory';
 
 export const parameters = { framework: 'vue3' };
diff --git a/examples/vue-3-cli/.storybook/main.js b/examples/vue-3-cli/.storybook/main.js
@@ -10,6 +10,7 @@ module.exports = {
     disableTelemetry: true,
   },
   features: {
+    storyStoreV7: !global.navigator?.userAgent?.match?.('jsdom'),
     buildStoriesJson: true,
     channelOptions: { allowFunction: false, maxDepth: 10 },
   },

diff --git a/examples/vue-cli/.storybook/main.js b/examples/vue-cli/.storybook/main.js
@@ -13,6 +13,7 @@ module.exports = {
     disableTelemetry: true,
   },
   features: {
+    storyStoreV7: true,
     buildStoriesJson: true,
   },
 };
diff --git a/examples/vue-kitchen-sink/.storybook/main.js b/examples/vue-kitchen-sink/.storybook/main.js
@@ -20,5 +20,6 @@ module.exports = {
   staticDirs: ['../public'],
   features: {
     buildStoriesJson: true,
+    storyStoreV7: !global.navigator?.userAgent?.match?.('jsdom'),
   },
 };
diff --git a/examples/vue-kitchen-sink/.storybook/preview.js b/examples/vue-kitchen-sink/.storybook/preview.js
@@ -10,4 +10,5 @@ export const parameters = {
   docs: {
     iframeHeight: '60px',
   },
+  globalParameter: 'globalParameter',
 };
diff --git a/examples/vue-kitchen-sink/src/App.vue b/examples/vue-kitchen-sink/src/App.vue
@@ -30,7 +30,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 #app {
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;

diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/core.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/core.stories.storyshot
@@ -8,9 +8,9 @@ exports[`Storyshots Core/Parameters passed to story 1`] = `
   "docs": {
     "iframeHeight": "60px"
   },
-  "framework": "vue",
   "globalParameter": "globalParameter",
-  "chapterParameter": "chapterParameter",
+  "framework": "vue",
+  "componentParameter": "componentParameter",
   "storyParameter": "storyParameter",
   "__isArgsStory": true,
   "__id": "core-parameters--passed-to-story",

diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot
@@ -53,8 +53,8 @@ exports[`Storyshots Custom/Decorator for Vue With Data 1`] = `
     "docs": {
       "iframeHeight": "60px"
     },
-    "framework": "vue",
     "globalParameter": "globalParameter",
+    "framework": "vue",
     "__isArgsStory": true,
     "__id": "custom-decorator-for-vue--with-data",
     "args": {},

diff --git a/examples/vue-kitchen-sink/src/stories/core.stories.js b/examples/vue-kitchen-sink/src/stories/core.stories.js
@@ -1,15 +1,10 @@
-import { addParameters } from '@storybook/vue';
-
-const globalParameter = 'globalParameter';
-const chapterParameter = 'chapterParameter';
+const componentParameter = 'componentParameter';
 const storyParameter = 'storyParameter';
 
-addParameters({ globalParameter });
-
 export default {
   title: 'Core/Parameters',
   parameters: {
-    chapterParameter,
+    componentParameter,
   },
 };