From 294b1cc8eddc8c234939eb678d5a4c61c610d671 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 31 May 2022 13:06:09 +0200 Subject: [PATCH 1/6] Vue: export applyDecorators for storyStoreV7 --- app/vue/src/client/preview/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/vue/src/client/preview/config.ts b/app/vue/src/client/preview/config.ts index 036f51eba182..759c77b9abeb 100644 --- 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' }; From fcb61e10a3fb0ef5c59137c09c7766699a309b14 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 31 May 2022 13:06:35 +0200 Subject: [PATCH 2/6] Vue3: export applyDecorators for storyStoreV7 --- app/vue3/src/client/preview/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/vue3/src/client/preview/config.ts b/app/vue3/src/client/preview/config.ts index 69f6b3b8683e..589efca6a13f 100644 --- 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' }; From 68458171bffc4824c358fc242f4d2c721de16a06 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 31 May 2022 13:52:38 +0200 Subject: [PATCH 3/6] chore(storybook): upgrade vue examples to use storyStoreV7 --- examples/vue-3-cli/.storybook/main.js | 1 + examples/vue-cli/.storybook/main.js | 1 + examples/vue-kitchen-sink/.storybook/main.js | 1 + 3 files changed, 3 insertions(+) diff --git a/examples/vue-3-cli/.storybook/main.js b/examples/vue-3-cli/.storybook/main.js index 5858049fd74c..0699c40dfc40 100644 --- 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 index 742a7b1d5ab4..e80616cd0d8f 100644 --- 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 index eb7979f07f20..6068e3c04089 100644 --- 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'), }, }; From 22fff177ae67952263afbc8c6c6430e7f76b4b27 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 31 May 2022 16:09:45 +0200 Subject: [PATCH 4/6] chore(vue-kitchen-sink): update example with older syntax --- examples/vue-kitchen-sink/.storybook/preview.js | 1 + examples/vue-kitchen-sink/src/stories/core.stories.js | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/vue-kitchen-sink/.storybook/preview.js b/examples/vue-kitchen-sink/.storybook/preview.js index 65ca5b85929d..9f879a2bad57 100644 --- 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/stories/core.stories.js b/examples/vue-kitchen-sink/src/stories/core.stories.js index 7f328fe356ed..ab20c8286818 100644 --- 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, }, }; From ea2a136d4db5af0c1e508a72db1d897ab58e5909 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 31 May 2022 17:34:12 +0200 Subject: [PATCH 5/6] update snapshots --- .../src/stories/__snapshots__/core.stories.storyshot | 4 ++-- .../stories/__snapshots__/custom-decorators.stories.storyshot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/core.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/core.stories.storyshot index c6f10f6e74ef..79adbe9aa5b8 100644 --- 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 index 037ca9020eee..0be37ed065fa 100644 --- 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": {}, From fc2edfaa40485af9fe8d9cb59cb99ca4553a7798 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Wed, 1 Jun 2022 11:05:24 +0200 Subject: [PATCH 6/6] chore(vue-kitchen-sink): scope styles in App.vue --- examples/vue-kitchen-sink/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vue-kitchen-sink/src/App.vue b/examples/vue-kitchen-sink/src/App.vue index 06f14e40a8ca..7695b522c011 100644 --- a/examples/vue-kitchen-sink/src/App.vue +++ b/examples/vue-kitchen-sink/src/App.vue @@ -30,7 +30,7 @@ export default { } -