Merge pull request #2455 from alphagov/remove-base-imports

Remove 'base' import from files in `core` and `overrides` layers
alphagov · Dec 6, 2021 · 873cc06 · 873cc06
2 parents c558ad1 + 5050b3f
commit 873cc06
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -159,6 +159,19 @@ If you're passing custom HTML into the cookie banner component (for example, usi
 
 This change was introduced in [pull request #2432: Remove default font styles from cookie banner Sass](https://github.com/alphagov/govuk-frontend/pull/2432).
 
+#### Import 'base' before importing Sass files from `core` or `overrides` layers
+
+If you import individual files from the `core` or `overrides` layers, you might see the error `Undefined mixin 'govuk-exports'` or `no mixin named govuk-exports` when compiling your Sass.
+
+To fix the error, import `node_modules/govuk-frontend/govuk/base` first. For example:
+
+```scss
+@import "node_modules/govuk-frontend/govuk/base";
+@import "node_modules/govuk-frontend/core/typography";
+```
+
+This change was introduced in [pull request #2455: Remove 'base' import from files in `core` and `overrides` layers](https://github.com/alphagov/govuk-frontend/pull/2455).
+
 ### Optional changes
 
 We've recently made some other changes to GOV.UK Frontend. While these are not breaking changes, implementing them will make your service work better.

diff --git a/src/govuk/core/_global-styles.scss b/src/govuk/core/_global-styles.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @import "links";
 @import "typography";
 

diff --git a/src/govuk/core/_links.scss b/src/govuk/core/_links.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/core/links") {
 
   %govuk-link {

diff --git a/src/govuk/core/_lists.scss b/src/govuk/core/_lists.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/core/lists") {
 
   %govuk-list {

diff --git a/src/govuk/core/_section-break.scss b/src/govuk/core/_section-break.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/core/section-break") {
 
   %govuk-section-break {

diff --git a/src/govuk/core/_template.scss b/src/govuk/core/_template.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/core/template") {
 
   // Applied to the <html> element

diff --git a/src/govuk/core/_typography.scss b/src/govuk/core/_typography.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the core layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/core/typography") {
 
   // Headings

diff --git a/src/govuk/core/core.test.js b/src/govuk/core/core.test.js
diff --git a/src/govuk/overrides/_display.scss b/src/govuk/overrides/_display.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 // stylelint-disable declaration-no-important
 @include govuk-exports("govuk/overrides/display") {
   .govuk-\!-display-inline {

diff --git a/src/govuk/overrides/_spacing.scss b/src/govuk/overrides/_spacing.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 ////
 /// @group overrides
 ////

diff --git a/src/govuk/overrides/_text-align.scss b/src/govuk/overrides/_text-align.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 // stylelint-disable declaration-no-important
 @include govuk-exports("govuk/overrides/text-align") {
   .govuk-\!-text-align-left {

diff --git a/src/govuk/overrides/_typography.scss b/src/govuk/overrides/_typography.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 @include govuk-exports("govuk/overrides/typography") {
   // Font size and line height
 

diff --git a/src/govuk/overrides/_width.scss b/src/govuk/overrides/_width.scss
@@ -1,9 +1,3 @@
-@if not mixin-exists("govuk-exports") {
-  @warn "Importing items from the overrides layer without first importing `base` is deprecated, and will no longer work as of GOV.UK Frontend v4.0.";
-}
-
-@import "../base";
-
 // stylelint-disable declaration-no-important
 @include govuk-exports("govuk/overrides/width") {
   .govuk-\!-width-full {

diff --git a/src/govuk/overrides/overrides.test.js b/src/govuk/overrides/overrides.test.js