Merge pull request #1483 from alphagov/vite-build-improvements

Make tweaks to frontend build
alphagov · Oct 7, 2024 · f18114f · f18114f
2 parents 88afc17 + a888d7c
commit f18114f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 27 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -57,7 +57,7 @@ jobs:
       # Add or replace test runners here
       - name: Run Ruby tests
         run: bundle exec rspec
-      - name: Run JS tests & JS/CSS linting
+      - name: Run JS tests
         run: npm test
       # Add or replace any other lints here
       - name: Security audit dependencies
@@ -66,3 +66,5 @@ jobs:
         run: bundle exec brakeman -q -w2
       - name: Lint Ruby files
         run: bundle exec rubocop --parallel
+      - name: Lint JS and CSS files
+        run: npm run lint
diff --git a/app/components/markdown_editor_component/_index.scss b/app/components/markdown_editor_component/_index.scss
@@ -63,23 +63,23 @@
   margin: 0;
 
   &--h2 {
-    background-image: url("../../assets/icons/markdown-editor-h2.svg");
+    background-image: url("~/icons/markdown-editor-h2.svg");
   }
 
   &--h3 {
-    background-image: url("../../assets/icons/markdown-editor-h3.svg");
+    background-image: url("~/icons/markdown-editor-h3.svg");
   }
 
   &--bullet-list {
-    background-image: url("../../assets/icons/markdown-editor-bullet-list.svg");
+    background-image: url("~/icons/markdown-editor-bullet-list.svg");
   }
 
   &--numbered-list {
-    background-image: url("../../assets/icons/markdown-editor-numbered-list.svg");
+    background-image: url("~/icons/markdown-editor-numbered-list.svg");
   }
 
   &--link {
-    background-image: url("../../assets/icons/markdown-editor-link.svg");
+    background-image: url("~/icons/markdown-editor-link.svg");
   }
 }
 

diff --git a/...ets/icons/markdown-editor-bullet-list.svg → ...end/icons/markdown-editor-bullet-list.svg b/...ets/icons/markdown-editor-bullet-list.svg → ...end/icons/markdown-editor-bullet-list.svg
diff --git a/app/assets/icons/markdown-editor-h2.svg → app/frontend/icons/markdown-editor-h2.svg b/app/assets/icons/markdown-editor-h2.svg → app/frontend/icons/markdown-editor-h2.svg
diff --git a/app/assets/icons/markdown-editor-h3.svg → app/frontend/icons/markdown-editor-h3.svg b/app/assets/icons/markdown-editor-h3.svg → app/frontend/icons/markdown-editor-h3.svg
diff --git a/app/assets/icons/markdown-editor-link.svg → app/frontend/icons/markdown-editor-link.svg b/app/assets/icons/markdown-editor-link.svg → app/frontend/icons/markdown-editor-link.svg
diff --git a/...s/icons/markdown-editor-numbered-list.svg → ...d/icons/markdown-editor-numbered-list.svg b/...s/icons/markdown-editor-numbered-list.svg → ...d/icons/markdown-editor-numbered-list.svg
diff --git a/app/frontend/plugins/vite/vite-plugin-lint.js b/app/frontend/plugins/vite/vite-plugin-lint.js
diff --git a/config/vite.json b/config/vite.json
@@ -15,7 +15,8 @@
     "autoBuild": false
   },
   "development": {
-    "port": 3036
+    "port": 3036,
+    "autoBuild": true
   },
   "test": {
     "port": 3037,

diff --git a/vite.config.js b/vite.config.js
@@ -3,10 +3,9 @@
 import { defineConfig } from 'vite'
 import RubyPlugin from 'vite-plugin-ruby'
 import * as path from 'node:path'
-import lintPlugin from './app/frontend/plugins/vite/vite-plugin-lint'
 
 export default defineConfig({
-  plugins: [RubyPlugin(), { ...lintPlugin(), apply: 'serve' }],
+  plugins: [RubyPlugin()],
   build: { emptyOutDir: true },
   css: {
     preprocessorOptions: {