From 39e168c5748e136dcba0a1cf9568346b0cc405d3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jun 2021 21:45:18 +0100
Subject: [PATCH] Build front-end assets on CircleCI

This means we don't need a bogus "eslint-disable-next-line import/no-unresolved" directive when importing built CSS, which ends up breaking lint locally. Fixes #7177
---
 .circleci/config.yml                                 | 1 +
 client/src/components/CommentApp/utils/storybook.tsx | 3 +--
 client/src/components/Sidebar/Sidebar.stories.tsx    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59d8502227..6e3b2a6998 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,7 @@ jobs:
           paths:
             - ~/project/node_modules/
           key: node-v1-{{ .Branch }}-{{ checksum "package-lock.json" }}
+      - run: npm run build
       - run: npm run lint:js
       - run: npm run lint:css
       - run: npm run test:unit:coverage -- --runInBand
diff --git a/client/src/components/CommentApp/utils/storybook.tsx b/client/src/components/CommentApp/utils/storybook.tsx
index 5ff47a507f..33aa3f0aba 100644
--- a/client/src/components/CommentApp/utils/storybook.tsx
+++ b/client/src/components/CommentApp/utils/storybook.tsx
@@ -20,8 +20,7 @@ import { defaultStrings } from '../main';
 
 import CommentComponent from '../components/Comment/index';
 
-// Requires Wagtail static to be built, so raises error on CI
-// eslint-disable-next-line import/no-unresolved
+// Requires Wagtail static to be built
 import '../../../../../wagtail/admin/static/wagtailadmin/css/core.css';
 
 export function RenderCommentsForStorybook({
diff --git a/client/src/components/Sidebar/Sidebar.stories.tsx b/client/src/components/Sidebar/Sidebar.stories.tsx
index 3e49d498b5..4d2edcbe39 100644
--- a/client/src/components/Sidebar/Sidebar.stories.tsx
+++ b/client/src/components/Sidebar/Sidebar.stories.tsx
@@ -9,7 +9,6 @@ import { LinkMenuItemDefinition } from './menu/LinkMenuItem';
 import { SubMenuItemDefinition } from './menu/SubMenuItem';
 import { initFocusOutline } from '../../utils/focus';
 
-// eslint-disable-next-line import/no-unresolved
 import '../../../../wagtail/admin/static/wagtailadmin/css/sidebar.css';
 import { CustomBrandingModuleDefinition } from './modules/CustomBranding';