From 0e1c0fa5af3d0b64713eea8e442055f099e65693 Mon Sep 17 00:00:00 2001
From: Colin Rotherham <work@colinr.com>
Date: Fri, 21 Feb 2025 11:41:22 +0000
Subject: [PATCH] chore: remove `node_modules` from all import paths

---
 docs/_includes/layouts/partials/navigation.njk       | 2 +-
 docs/assets/stylesheets/application.scss             | 6 +++---
 docs/assets/stylesheets/govuk-frontend.scss          | 2 +-
 docs/assets/stylesheets/moj-frontend.scss            | 2 +-
 gulp/dist-scss/all.scss                              | 6 +++---
 gulp/tasks/styles.js                                 | 2 +-
 src/moj/all.scss                                     | 2 +-
 src/moj/components/cookie-banner/_cookie-banner.scss | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/_includes/layouts/partials/navigation.njk b/docs/_includes/layouts/partials/navigation.njk
index 51a4d3486..ff182d724 100644
--- a/docs/_includes/layouts/partials/navigation.njk
+++ b/docs/_includes/layouts/partials/navigation.njk
@@ -1,4 +1,4 @@
-{%- from "node_modules/@ministryofjustice/frontend/moj/components/primary-navigation/macro.njk" import mojPrimaryNavigation %}
+{%- from "moj/components/primary-navigation/macro.njk" import mojPrimaryNavigation %}
 
 {{ mojPrimaryNavigation({
   items: [
diff --git a/docs/assets/stylesheets/application.scss b/docs/assets/stylesheets/application.scss
index ff661be12..b6a0e427b 100755
--- a/docs/assets/stylesheets/application.scss
+++ b/docs/assets/stylesheets/application.scss
@@ -5,13 +5,13 @@ $govuk-assets-path: "../" !default;
 $govuk-suppressed-warnings: ("govuk-typography-scale-14");
 
 // GOV.UK Frontend
-@import "node_modules/govuk-frontend/dist/govuk";
+@import "govuk-frontend/dist/govuk";
 
 // MOJ Frontend
-@import "src/moj/all";
+@import "../../../src/moj/all";
 
 // highlight.js
-@import "node_modules/highlight.js/scss/github";
+@import "highlight.js/scss/github";
 
 // Custom documentation components
 @import "./components/accordions";
diff --git a/docs/assets/stylesheets/govuk-frontend.scss b/docs/assets/stylesheets/govuk-frontend.scss
index 8e6f56feb..19b95406a 100755
--- a/docs/assets/stylesheets/govuk-frontend.scss
+++ b/docs/assets/stylesheets/govuk-frontend.scss
@@ -4,4 +4,4 @@ $govuk-global-styles: false;
 $govuk-suppressed-warnings: ("govuk-typography-scale-14");
 
 // GOV.UK Frontend
-@import "node_modules/govuk-frontend/dist/govuk";
+@import "govuk-frontend/dist/govuk";
diff --git a/docs/assets/stylesheets/moj-frontend.scss b/docs/assets/stylesheets/moj-frontend.scss
index 692594aff..87e156479 100755
--- a/docs/assets/stylesheets/moj-frontend.scss
+++ b/docs/assets/stylesheets/moj-frontend.scss
@@ -2,4 +2,4 @@ $moj-page-width: 1220px !default;
 $moj-assets-path: "../" !default;
 
 // MOJ Frontend
-@import "src/moj/all";
+@import "../../../src/moj/all";
diff --git a/gulp/dist-scss/all.scss b/gulp/dist-scss/all.scss
index 2bf533caf..d78e41a0f 100644
--- a/gulp/dist-scss/all.scss
+++ b/gulp/dist-scss/all.scss
@@ -1,5 +1,5 @@
 $_govuk-imported-modules: ("govuk/objects/width-container") !default;
 
-@import "node_modules/govuk-frontend/dist/govuk/base";
-@import "node_modules/govuk-frontend/dist/govuk/objects/width-container";
-@import "package/moj/all";
+@import "govuk-frontend/dist/govuk/base";
+@import "govuk-frontend/dist/govuk/objects/width-container";
+@import "@ministryofjustice/frontend/moj/all";
diff --git a/gulp/tasks/styles.js b/gulp/tasks/styles.js
index 878a85d7d..0d7319fd6 100644
--- a/gulp/tasks/styles.js
+++ b/gulp/tasks/styles.js
@@ -21,7 +21,7 @@ function compileStyles(assetPath, { srcPath, destPath, output = {} }) {
 
   const taskFn = async () => {
     const { css } = await compileAsync(from, {
-      loadPaths: ['./'],
+      loadPaths: ['node_modules'],
       quietDeps: true,
       silenceDeprecations: [
         'color-functions',
diff --git a/src/moj/all.scss b/src/moj/all.scss
index 9c8782dd0..b1df2df8c 100755
--- a/src/moj/all.scss
+++ b/src/moj/all.scss
@@ -1,6 +1,6 @@
 $govuk-suppressed-warnings: ("govuk-typography-scale-14");
 
-@import "node_modules/govuk-frontend/dist/govuk/base";
+@import "govuk-frontend/dist/govuk/base";
 
 @import "settings/all";
 @import "helpers/all";
diff --git a/src/moj/components/cookie-banner/_cookie-banner.scss b/src/moj/components/cookie-banner/_cookie-banner.scss
index 0a612d5c7..f23d6de92 100755
--- a/src/moj/components/cookie-banner/_cookie-banner.scss
+++ b/src/moj/components/cookie-banner/_cookie-banner.scss
@@ -1,4 +1,4 @@
-@import "node_modules/govuk-frontend/dist/govuk/objects/width-container";
+@import "govuk-frontend/dist/govuk/objects/width-container";
 
 .moj-cookie-banner {
   box-sizing: border-box;