diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /storybook | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'storybook')
| -rw-r--r-- | storybook/config/preview.js | 10 | ||||
| -rw-r--r-- | storybook/package.json | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/storybook/config/preview.js b/storybook/config/preview.js index a372aea68ad..4f496665de6 100644 --- a/storybook/config/preview.js +++ b/storybook/config/preview.js @@ -1,7 +1,15 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import Vue from 'vue'; +import translateMixin from '../../app/assets/javascripts/vue_shared/translate'; + const stylesheetsRequireCtx = require.context( '../../app/assets/stylesheets', true, - /application\.scss$/, + /(application|application_utilities)\.scss$/, ); +window.gon = {}; +translateMixin(Vue); + stylesheetsRequireCtx('./application.scss'); +stylesheetsRequireCtx('./application_utilities.scss'); diff --git a/storybook/package.json b/storybook/package.json index 028133dd5e3..4b922a4776c 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -5,7 +5,9 @@ "start": "start-storybook -p 9002 -c config", "build": "build-storybook -c config -o public" }, - "dependencies": {}, + "blockedDependencies": { + "vue": "https://gitlab.com/gitlab-org/gitlab/-/issues/340511" + }, "devDependencies": { "@storybook/addon-a11y": "^6.2.9", "@storybook/addon-actions": "^6.2.9", |