Merge pull request #732 from alphagov/namespace-exports

Namespace exports with 'govuk'
alphagov · May 31, 2018 · ed8607f · ed8607f
2 parents 27780ef + 6d32e40
commit ed8607f
Show file tree

Hide file tree

Showing 44 changed files with 47 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,10 @@ Note: We're not following semantic versioning yet, we are going to talk about th
 
 🔧 Fixes:
 
+- Namespacing SCSS exports with 'govuk' prefix to avoid clashes with
+  exports in applications consuming GOV.UK Frontend
+  ([PR #732](https://github.com/alphagov/govuk-frontend/pull/732))
+
 - Fixes a bug whereby print styles were being 'rasterized' into the screen
   styles when generating the IE8 stylesheet (this is a bug in sass-mq, and has
   also been raised upstream – https://github.com/sass-mq/sass-mq/pull/111).

diff --git a/src/components/back-link/_back-link.scss b/src/components/back-link/_back-link.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("back-link") {
+@include govuk-exports("govuk/component/back-link") {
 
   .govuk-back-link {
     @include govuk-typography-responsive($govuk-font-16);

diff --git a/src/components/breadcrumbs/_breadcrumbs.scss b/src/components/breadcrumbs/_breadcrumbs.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("breadcrumbs") {
+@include govuk-exports("govuk/component/breadcrumbs") {
 
   // Size of chevron (excluding border)
   $chevron-size: 7px;

diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("button") {
+@include govuk-exports("govuk/component/button") {
 
   // Because the shadow (s0) is visually 'part of' the button, we need to reduce
   // the height of the button to compensate by adjusting its padding (s1) and

diff --git a/src/components/checkboxes/_checkboxes.scss b/src/components/checkboxes/_checkboxes.scss
@@ -7,7 +7,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("checkboxes") {
+@include govuk-exports("govuk/component/checkboxes") {
   $govuk-checkboxes-size: $govuk-spacing-scale-7;
   $govuk-checkboxes-label-padding-left-right: $govuk-spacing-scale-3;
 

diff --git a/src/components/date-input/_date-input.scss b/src/components/date-input/_date-input.scss
@@ -7,7 +7,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("date-input") {
+@include govuk-exports("govuk/component/date-input") {
   .govuk-date-input {
     @include govuk-clearfix;
   }

diff --git a/src/components/details/_details.scss b/src/components/details/_details.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("details") {
+@include govuk-exports("govuk/component/details") {
 
   .govuk-details {
     @include govuk-font-regular-19;

diff --git a/src/components/error-message/_error-message.scss b/src/components/error-message/_error-message.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("error-message") {
+@include govuk-exports("govuk/component/error-message") {
   .govuk-error-message {
     @include govuk-font-bold-19;
 

diff --git a/src/components/error-summary/_error-summary.scss b/src/components/error-summary/_error-summary.scss
@@ -4,7 +4,7 @@
 
 @import "../../core/lists";
 
-@include govuk-exports("error-summary") {
+@include govuk-exports("govuk/component/error-summary") {
 
   .govuk-error-summary {
     @include govuk-text-colour;

diff --git a/src/components/fieldset/_fieldset.scss b/src/components/fieldset/_fieldset.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("fieldset") {
+@include govuk-exports("govuk/component/fieldset") {
   .govuk-fieldset {
     margin: 0;
     padding: 0;

diff --git a/src/components/file-upload/_file-upload.scss b/src/components/file-upload/_file-upload.scss
@@ -6,7 +6,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("file-upload") {
+@include govuk-exports("govuk/component/file-upload") {
   .govuk-file-upload {
     @include govuk-font-regular-19;
     @include govuk-text-colour;

diff --git a/src/components/footer/_footer.scss b/src/components/footer/_footer.scss
@@ -4,7 +4,7 @@
 
 @import "../../helpers/typography";
 
-@include govuk-exports("footer") {
+@include govuk-exports("govuk/component/footer") {
 
   $govuk-footer-background: $govuk-grey-3;
   $govuk-footer-border-top: #a1acb2;

diff --git a/src/components/header/_header.scss b/src/components/header/_header.scss
@@ -4,7 +4,7 @@
 
 @import "../../helpers/typography";
 
-@include govuk-exports("header") {
+@include govuk-exports("govuk/component/header") {
 
   $govuk-header-background: $govuk-black;
   $govuk-header-border-color: $govuk-blue;

diff --git a/src/components/hint/_hint.scss b/src/components/hint/_hint.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("hint") {
+@include govuk-exports("govuk/component/hint") {
   .govuk-hint {
     @include govuk-font-regular-19;
 

diff --git a/src/components/input/_input.scss b/src/components/input/_input.scss
@@ -6,7 +6,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("input") {
+@include govuk-exports("govuk/component/input") {
   .govuk-input {
     @include govuk-font-regular-19;
     @include govuk-focusable;

diff --git a/src/components/inset-text/_inset-text.scss b/src/components/inset-text/_inset-text.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("inset-text") {
+@include govuk-exports("govuk/component/inset-text") {
   .govuk-inset-text {
     @include govuk-font-regular-19;
     @include govuk-text-colour;

diff --git a/src/components/label/_label.scss b/src/components/label/_label.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("label") {
+@include govuk-exports("govuk/component/label") {
   .govuk-label {
     @include govuk-font-regular-19;
     @include govuk-text-colour;

diff --git a/src/components/panel/_panel.scss b/src/components/panel/_panel.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("panel") {
+@include govuk-exports("govuk/component/panel") {
 
   .govuk-panel {
     @include govuk-font-regular-19;

diff --git a/src/components/phase-banner/_phase-banner.scss b/src/components/phase-banner/_phase-banner.scss
@@ -4,7 +4,7 @@
 
 @import "../tag/tag";
 
-@include govuk-exports("phase-banner") {
+@include govuk-exports("govuk/component/phase-banner") {
   .govuk-phase-banner {
     @include govuk-font-regular-16;
     @include govuk-text-colour;

diff --git a/src/components/radios/_radios.scss b/src/components/radios/_radios.scss
@@ -7,7 +7,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("radios") {
+@include govuk-exports("govuk/component/radios") {
   $govuk-radios-size: $govuk-spacing-scale-7;
   $govuk-radios-label-padding-left-right: $govuk-spacing-scale-3;
 

diff --git a/src/components/select/_select.scss b/src/components/select/_select.scss
@@ -6,7 +6,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("select") {
+@include govuk-exports("govuk/component/select") {
   .govuk-select {
     @include govuk-font-regular;
     @include govuk-typography-responsive(

diff --git a/src/components/skip-link/_skip-link.scss b/src/components/skip-link/_skip-link.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("skip-link") {
+@include govuk-exports("govuk/component/skip-link") {
   .govuk-skip-link {
     @include govuk-visually-hidden-focusable;
     @include govuk-link-common;

diff --git a/src/components/table/_table.scss b/src/components/table/_table.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("table") {
+@include govuk-exports("govuk/component/table") {
   .govuk-table {
     @include govuk-font-regular-19;
     @include govuk-text-colour;

diff --git a/src/components/tag/_tag.scss b/src/components/tag/_tag.scss
@@ -2,7 +2,7 @@
 @import "../../tools/all";
 @import "../../helpers/all";
 
-@include govuk-exports("tag") {
+@include govuk-exports("govuk/component/tag") {
   .govuk-tag {
     @include govuk-font-bold;
     @include govuk-typography-responsive(

diff --git a/src/components/textarea/_textarea.scss b/src/components/textarea/_textarea.scss
@@ -6,7 +6,7 @@
 @import "../hint/hint";
 @import "../label/label";
 
-@include govuk-exports("textarea") {
+@include govuk-exports("govuk/component/textarea") {
   .govuk-textarea {
     @include govuk-font-regular;
     @include govuk-typography-responsive(

diff --git a/src/components/warning-text/_warning-text.scss b/src/components/warning-text/_warning-text.scss
@@ -4,7 +4,7 @@
 
 @import "../../objects/shapes";
 
-@include govuk-exports("warning-text") {
+@include govuk-exports("govuk/component/warning-text") {
 
   .govuk-warning-text {
     @include govuk-font-regular-19;

diff --git a/src/core/_global-styles.scss b/src/core/_global-styles.scss
@@ -11,7 +11,7 @@
   }
 }
 
-@include govuk-exports("govuk-global-styles") {
+@include govuk-exports("govuk/core/global-styles") {
 
   @if $govuk-global-styles == true {
     @include govuk-global-styles;

diff --git a/src/core/_links.scss b/src/core/_links.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("links") {
+@include govuk-exports("govuk/core/links") {
 
   // We use a placeholder class here so that we can @extend from the prose scope
   // without also applying every other occurrence of the .govuk-link selector to

diff --git a/src/core/_lists.scss b/src/core/_lists.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("lists") {
+@include govuk-exports("govuk/core/lists") {
 
   // We use a placeholder class here so that we can @extend from the prose scope
   // without also applying every other occurrence of the .govuk-list selector to

diff --git a/src/core/_prose-scope.scss b/src/core/_prose-scope.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("prose-scope") {
+@include govuk-exports("govuk/core/prose-scope") {
   .govuk-prose-scope {
 
     // @extend inheritance

diff --git a/src/core/_section-break.scss b/src/core/_section-break.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("section-break") {
+@include govuk-exports("govuk/core/section-break") {
 
   // We use placeholder classes here so that we can @extend from the prose scope
 

diff --git a/src/core/_typography.scss b/src/core/_typography.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("typography") {
+@include govuk-exports("govuk/core/typography") {
 
   // We use placeholder classes here so that we can @extend from the prose scope
   // without also applying every other occurrence of the typography selectors to

diff --git a/src/helpers/_font-faces.scss b/src/helpers/_font-faces.scss
@@ -4,7 +4,7 @@
 // sass-lint:disable no-css-comments, no-duplicate-properties, property-sort-order, indentation
 
 @mixin govuk-font-face-nta {
-  @include govuk-exports("font-face") {
+  @include govuk-exports("govuk/helpers/font-face") {
     @at-root {
       /*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */
 

diff --git a/src/objects/_form-group.scss b/src/objects/_form-group.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("form-group") {
+@include govuk-exports("govuk/objects/form-group") {
 
   .govuk-form-group {
     @include govuk-responsive-margin($govuk-spacing-responsive-6, "bottom");

diff --git a/src/objects/_grid.scss b/src/objects/_grid.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("govuk-grid") {
+@include govuk-exports("govuk/objects/grid") {
   //most common usage
   @include govuk-grid-row;
   @include govuk-grid-column(one-quarter);

diff --git a/src/objects/_main-wrapper.scss b/src/objects/_main-wrapper.scss
@@ -26,7 +26,7 @@
   @include govuk-responsive-padding($govuk-spacing-responsive-8, "top");
 }
 
-@include govuk-exports("main-wrapper") {
+@include govuk-exports("govuk/objects/main-wrapper") {
   .govuk-main-wrapper {
     @include govuk-main-wrapper;
   }

diff --git a/src/objects/_shapes.scss b/src/objects/_shapes.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("shapes") {
+@include govuk-exports("govuk/objects/shapes") {
   .govuk-circle {
     display: inline-block;
     border-radius: 50%;

diff --git a/src/objects/_width-container.scss b/src/objects/_width-container.scss
@@ -21,7 +21,7 @@
   }
 }
 
-@include govuk-exports("width-container") {
+@include govuk-exports("govuk/objects/width-container") {
   .govuk-width-container {
     @include govuk-width-container;
   }

diff --git a/src/overrides/_display.scss b/src/overrides/_display.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("display-overrides") {
+@include govuk-exports("govuk/overrides/display") {
 
   .govuk-\!-display-inline {
     display: inline !important;

diff --git a/src/overrides/_spacing.scss b/src/overrides/_spacing.scss
@@ -44,7 +44,7 @@ $spacing-directions: (
   }
 }
 
-@include govuk-exports("spacing-overrides") {
+@include govuk-exports("govuk/overrides/spacing") {
   @include generate-spacing-overrides("margin", "m");
   @include generate-spacing-overrides("padding", "p");
 }
diff --git a/src/overrides/_typography.scss b/src/overrides/_typography.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("typography-overrides") {
+@include govuk-exports("govuk/overrides/typography") {
   // Font size and line height
 
   // Generate typography override classes for each responsive font map in the

diff --git a/src/overrides/_width.scss b/src/overrides/_width.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("width-overrides") {
+@include govuk-exports("govuk/overrides/width") {
   .govuk-\!-width-three-quarters {
     width: 100% !important;
 

diff --git a/src/utilities/_clearfix.scss b/src/utilities/_clearfix.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("clearfix") {
+@include govuk-exports("govuk/utilities/clearfix") {
   .govuk-clearfix {
     @include govuk-clearfix;
   }

diff --git a/src/utilities/_visually-hidden.scss b/src/utilities/_visually-hidden.scss
@@ -1,4 +1,4 @@
-@include govuk-exports("visually-hidden") {
+@include govuk-exports("govuk/utilities/visually-hidden") {
   .govuk-visually-hidden {
     @include govuk-visually-hidden;
   }