From 633d5e0ce19d9f7aece49da723df1b3babd00c32 Mon Sep 17 00:00:00 2001
From: Enrique Alcantara <ealcantara@gitlab.com>
Date: Wed, 26 May 2021 15:19:17 -0400
Subject: [PATCH] Slightly tweak storybook asset paths
And fix eslint errors.
---
.gitlab/ci/frontend.gitlab-ci.yml | 2 +-
.gitlab/ci/pages.gitlab-ci.yml | 2 +-
storybook/config/preview.js | 1 -
storybook/config/webpack.config.js | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 5d59315ce24fd..955b1a17c7cb8 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -360,4 +360,4 @@ compile-storybook:
expire_in: 31d
when: always
paths:
- - public
+ - storybook/public
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index 4dcca9d1638bc..0633ca5f6f2b4 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -14,9 +14,9 @@ pages:
- mv coverage/ public/coverage-ruby/ || true
- mv coverage-frontend/ public/coverage-frontend/ || true
- mv coverage-javascript/ public/coverage-javascript/ || true
+ - mv storybook/public public/storybook || true
- cp .public/assets/application-*.css public/application.css || true
- cp .public/assets/application-*.css.gz public/application.css.gz || true
- - cp .public/storybook public/storybook || true
artifacts:
paths:
- public
diff --git a/storybook/config/preview.js b/storybook/config/preview.js
index 24d97bc8e6bed..eee30aa48c37a 100644
--- a/storybook/config/preview.js
+++ b/storybook/config/preview.js
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-unresolved, import/no-commonjs */
const stylesheetsRequireCtx = require.context(
'../../app/assets/stylesheets',
true,
diff --git a/storybook/config/webpack.config.js b/storybook/config/webpack.config.js
index db892c60abf7d..b9415a5103957 100644
--- a/storybook/config/webpack.config.js
+++ b/storybook/config/webpack.config.js
@@ -1,9 +1,9 @@
/* eslint-disable no-param-reassign */
const { statSync } = require('fs');
+const path = require('path');
const sass = require('node-sass');
const { buildIncludePaths, resolveGlobUrl } = require('node-sass-magic-importer/dist/toolbox');
-const path = require('path');
const webpack = require('webpack');
const gitlabWebpackConfig = require('../../config/webpack.config.js');
--
GitLab