diff --git a/app/assets/scss/app-ie8.scss b/app/assets/scss/app-ie8.scss index e310350fe5..d175986b7d 100644 --- a/app/assets/scss/app-ie8.scss +++ b/app/assets/scss/app-ie8.scss @@ -1,3 +1,3 @@ -@import "../../../src/all-ie8"; +@import "../../../src/govuk/all-ie8"; @import "partials/app"; @import "partials/banner"; diff --git a/app/assets/scss/app.scss b/app/assets/scss/app.scss index b0db00daae..5990db573e 100644 --- a/app/assets/scss/app.scss +++ b/app/assets/scss/app.scss @@ -1,6 +1,6 @@ $govuk-show-breakpoints: true; -@import "../../../src/all"; +@import "../../../src/govuk/all"; @import "partials/app"; @import "partials/banner"; @import "partials/prose"; diff --git a/app/views/macros/loadComponentTemplate.njk b/app/views/macros/loadComponentTemplate.njk index c86883c652..252e9c2afe 100644 --- a/app/views/macros/loadComponentTemplate.njk +++ b/app/views/macros/loadComponentTemplate.njk @@ -1,3 +1,3 @@ {% macro loadComponentTemplate(componentName, params) %} - {%- include "../../../src/components/" + componentName + "/template.njk" -%} + {%- include componentName + "/template.njk" -%} {% endmacro %} diff --git a/config/paths.json b/config/paths.json index 9b7700c041..29468cde4c 100644 --- a/config/paths.json +++ b/config/paths.json @@ -11,8 +11,8 @@ "package": "package/", "public": "public/", "sassdoc": "sassdoc/", - "src": "src/", - "components": "src/components/", + "src": "src/govuk/", + "components": "src/govuk/components/", "ports": { "app": 3000, "test": 8888 diff --git a/package.json b/package.json index 884cccf42e..a443f6f762 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "ignore": [ "/dist/**/*.js", "/package/**/*.js", - "/src/vendor/polyfills/**/*.js" + "/src/govuk/vendor/polyfills/**/*.js" ] }, "jest": { diff --git a/src/README.md b/src/govuk/README.md similarity index 100% rename from src/README.md rename to src/govuk/README.md diff --git a/src/all-ie8.scss b/src/govuk/all-ie8.scss similarity index 100% rename from src/all-ie8.scss rename to src/govuk/all-ie8.scss diff --git a/src/all.js b/src/govuk/all.js similarity index 100% rename from src/all.js rename to src/govuk/all.js diff --git a/src/all.scss b/src/govuk/all.scss similarity index 100% rename from src/all.scss rename to src/govuk/all.scss diff --git a/src/all.test.js b/src/govuk/all.test.js similarity index 97% rename from src/all.test.js rename to src/govuk/all.test.js index 2ddd47492d..f97c866468 100644 --- a/src/all.test.js +++ b/src/govuk/all.test.js @@ -1,9 +1,9 @@ /* eslint-env jest */ -const configPaths = require('../config/paths.json') +const configPaths = require('../../config/paths.json') const PORT = configPaths.ports.test -const { renderSass } = require('../lib/jest-helpers') +const { renderSass } = require('../../lib/jest-helpers') let baseUrl = 'http://localhost:' + PORT diff --git a/src/assets/fonts/bold-5d3836b441-v2.woff b/src/govuk/assets/fonts/bold-5d3836b441-v2.woff similarity index 100% rename from src/assets/fonts/bold-5d3836b441-v2.woff rename to src/govuk/assets/fonts/bold-5d3836b441-v2.woff diff --git a/src/assets/fonts/bold-9561e2d007-v2.woff2 b/src/govuk/assets/fonts/bold-9561e2d007-v2.woff2 similarity index 100% rename from src/assets/fonts/bold-9561e2d007-v2.woff2 rename to src/govuk/assets/fonts/bold-9561e2d007-v2.woff2 diff --git a/src/assets/fonts/light-222368e53d-v2.woff b/src/govuk/assets/fonts/light-222368e53d-v2.woff similarity index 100% rename from src/assets/fonts/light-222368e53d-v2.woff rename to src/govuk/assets/fonts/light-222368e53d-v2.woff diff --git a/src/assets/fonts/light-68f0c84f0e-v2.woff2 b/src/govuk/assets/fonts/light-68f0c84f0e-v2.woff2 similarity index 100% rename from src/assets/fonts/light-68f0c84f0e-v2.woff2 rename to src/govuk/assets/fonts/light-68f0c84f0e-v2.woff2 diff --git a/src/assets/images/favicon.ico b/src/govuk/assets/images/favicon.ico similarity index 100% rename from src/assets/images/favicon.ico rename to src/govuk/assets/images/favicon.ico diff --git a/src/assets/images/govuk-apple-touch-icon-152x152.png b/src/govuk/assets/images/govuk-apple-touch-icon-152x152.png similarity index 100% rename from src/assets/images/govuk-apple-touch-icon-152x152.png rename to src/govuk/assets/images/govuk-apple-touch-icon-152x152.png diff --git a/src/assets/images/govuk-apple-touch-icon-167x167.png b/src/govuk/assets/images/govuk-apple-touch-icon-167x167.png similarity index 100% rename from src/assets/images/govuk-apple-touch-icon-167x167.png rename to src/govuk/assets/images/govuk-apple-touch-icon-167x167.png diff --git a/src/assets/images/govuk-apple-touch-icon-180x180.png b/src/govuk/assets/images/govuk-apple-touch-icon-180x180.png similarity index 100% rename from src/assets/images/govuk-apple-touch-icon-180x180.png rename to src/govuk/assets/images/govuk-apple-touch-icon-180x180.png diff --git a/src/assets/images/govuk-apple-touch-icon.png b/src/govuk/assets/images/govuk-apple-touch-icon.png similarity index 100% rename from src/assets/images/govuk-apple-touch-icon.png rename to src/govuk/assets/images/govuk-apple-touch-icon.png diff --git a/src/assets/images/govuk-crest-2x.png b/src/govuk/assets/images/govuk-crest-2x.png similarity index 100% rename from src/assets/images/govuk-crest-2x.png rename to src/govuk/assets/images/govuk-crest-2x.png diff --git a/src/assets/images/govuk-crest.png b/src/govuk/assets/images/govuk-crest.png similarity index 100% rename from src/assets/images/govuk-crest.png rename to src/govuk/assets/images/govuk-crest.png diff --git a/src/assets/images/govuk-logotype-crown.png b/src/govuk/assets/images/govuk-logotype-crown.png similarity index 100% rename from src/assets/images/govuk-logotype-crown.png rename to src/govuk/assets/images/govuk-logotype-crown.png diff --git a/src/assets/images/govuk-mask-icon.svg b/src/govuk/assets/images/govuk-mask-icon.svg similarity index 100% rename from src/assets/images/govuk-mask-icon.svg rename to src/govuk/assets/images/govuk-mask-icon.svg diff --git a/src/assets/images/govuk-opengraph-image.png b/src/govuk/assets/images/govuk-opengraph-image.png similarity index 100% rename from src/assets/images/govuk-opengraph-image.png rename to src/govuk/assets/images/govuk-opengraph-image.png diff --git a/src/assets/images/icon-arrow-left.png b/src/govuk/assets/images/icon-arrow-left.png similarity index 100% rename from src/assets/images/icon-arrow-left.png rename to src/govuk/assets/images/icon-arrow-left.png diff --git a/src/assets/images/icon-important.png b/src/govuk/assets/images/icon-important.png similarity index 100% rename from src/assets/images/icon-important.png rename to src/govuk/assets/images/icon-important.png diff --git a/src/common.js b/src/govuk/common.js similarity index 100% rename from src/common.js rename to src/govuk/common.js diff --git a/src/components/_all.scss b/src/govuk/components/_all.scss similarity index 100% rename from src/components/_all.scss rename to src/govuk/components/_all.scss diff --git a/src/components/accordion/README.md b/src/govuk/components/accordion/README.md similarity index 100% rename from src/components/accordion/README.md rename to src/govuk/components/accordion/README.md diff --git a/src/components/accordion/_accordion.scss b/src/govuk/components/accordion/_accordion.scss similarity index 100% rename from src/components/accordion/_accordion.scss rename to src/govuk/components/accordion/_accordion.scss diff --git a/src/components/accordion/accordion.js b/src/govuk/components/accordion/accordion.js similarity index 100% rename from src/components/accordion/accordion.js rename to src/govuk/components/accordion/accordion.js diff --git a/src/components/accordion/accordion.test.js b/src/govuk/components/accordion/accordion.test.js similarity index 98% rename from src/components/accordion/accordion.test.js rename to src/govuk/components/accordion/accordion.test.js index b8a440ff0c..dcde918bc1 100644 --- a/src/components/accordion/accordion.test.js +++ b/src/govuk/components/accordion/accordion.test.js @@ -3,7 +3,7 @@ // const devices = require('puppeteer/DeviceDescriptors') // const iPhone = devices['iPhone 6'] // const iPad = devices['iPad landscape'] -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/accordion/accordion.yaml b/src/govuk/components/accordion/accordion.yaml similarity index 100% rename from src/components/accordion/accordion.yaml rename to src/govuk/components/accordion/accordion.yaml diff --git a/src/components/accordion/macro.njk b/src/govuk/components/accordion/macro.njk similarity index 100% rename from src/components/accordion/macro.njk rename to src/govuk/components/accordion/macro.njk diff --git a/src/components/accordion/template.njk b/src/govuk/components/accordion/template.njk similarity index 100% rename from src/components/accordion/template.njk rename to src/govuk/components/accordion/template.njk diff --git a/src/components/accordion/template.test.js b/src/govuk/components/accordion/template.test.js similarity index 98% rename from src/components/accordion/template.test.js rename to src/govuk/components/accordion/template.test.js index 7ff6fa97c4..891881014e 100644 --- a/src/components/accordion/template.test.js +++ b/src/govuk/components/accordion/template.test.js @@ -5,7 +5,7 @@ const { axe } = require('jest-axe') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('accordion') diff --git a/src/components/all.test.js b/src/govuk/components/all.test.js similarity index 82% rename from src/components/all.test.js rename to src/govuk/components/all.test.js index d4c64db15c..5f615bc6f4 100644 --- a/src/components/all.test.js +++ b/src/govuk/components/all.test.js @@ -1,9 +1,9 @@ /* eslint-env jest */ -const { allComponents } = require('../../lib/file-helper') -const { renderSass } = require('../../lib/jest-helpers') +const { allComponents } = require('../../../lib/file-helper') +const { renderSass } = require('../../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const configPaths = require('../../../config/paths.json') // We can't use the render function from jest-helpers, because we need control // over the nunjucks environment. diff --git a/src/components/back-link/README.md b/src/govuk/components/back-link/README.md similarity index 100% rename from src/components/back-link/README.md rename to src/govuk/components/back-link/README.md diff --git a/src/components/back-link/_back-link.scss b/src/govuk/components/back-link/_back-link.scss similarity index 100% rename from src/components/back-link/_back-link.scss rename to src/govuk/components/back-link/_back-link.scss diff --git a/src/components/back-link/back-link.yaml b/src/govuk/components/back-link/back-link.yaml similarity index 100% rename from src/components/back-link/back-link.yaml rename to src/govuk/components/back-link/back-link.yaml diff --git a/src/components/back-link/macro.njk b/src/govuk/components/back-link/macro.njk similarity index 100% rename from src/components/back-link/macro.njk rename to src/govuk/components/back-link/macro.njk diff --git a/src/components/back-link/template.njk b/src/govuk/components/back-link/template.njk similarity index 100% rename from src/components/back-link/template.njk rename to src/govuk/components/back-link/template.njk diff --git a/src/components/back-link/template.test.js b/src/govuk/components/back-link/template.test.js similarity index 95% rename from src/components/back-link/template.test.js rename to src/govuk/components/back-link/template.test.js index 2e25b804ba..73e5ae24d3 100644 --- a/src/components/back-link/template.test.js +++ b/src/govuk/components/back-link/template.test.js @@ -3,8 +3,8 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const axe = require('../../../../lib/axe-helper') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('back-link') diff --git a/src/components/breadcrumbs/README.md b/src/govuk/components/breadcrumbs/README.md similarity index 100% rename from src/components/breadcrumbs/README.md rename to src/govuk/components/breadcrumbs/README.md diff --git a/src/components/breadcrumbs/_breadcrumbs.scss b/src/govuk/components/breadcrumbs/_breadcrumbs.scss similarity index 100% rename from src/components/breadcrumbs/_breadcrumbs.scss rename to src/govuk/components/breadcrumbs/_breadcrumbs.scss diff --git a/src/components/breadcrumbs/breadcrumbs.yaml b/src/govuk/components/breadcrumbs/breadcrumbs.yaml similarity index 100% rename from src/components/breadcrumbs/breadcrumbs.yaml rename to src/govuk/components/breadcrumbs/breadcrumbs.yaml diff --git a/src/components/breadcrumbs/macro.njk b/src/govuk/components/breadcrumbs/macro.njk similarity index 100% rename from src/components/breadcrumbs/macro.njk rename to src/govuk/components/breadcrumbs/macro.njk diff --git a/src/components/breadcrumbs/template.njk b/src/govuk/components/breadcrumbs/template.njk similarity index 100% rename from src/components/breadcrumbs/template.njk rename to src/govuk/components/breadcrumbs/template.njk diff --git a/src/components/breadcrumbs/template.test.js b/src/govuk/components/breadcrumbs/template.test.js similarity index 97% rename from src/components/breadcrumbs/template.test.js rename to src/govuk/components/breadcrumbs/template.test.js index e7da920462..378f25bb23 100644 --- a/src/components/breadcrumbs/template.test.js +++ b/src/govuk/components/breadcrumbs/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('breadcrumbs') diff --git a/src/components/button/README.md b/src/govuk/components/button/README.md similarity index 100% rename from src/components/button/README.md rename to src/govuk/components/button/README.md diff --git a/src/components/button/_button.scss b/src/govuk/components/button/_button.scss similarity index 100% rename from src/components/button/_button.scss rename to src/govuk/components/button/_button.scss diff --git a/src/components/button/button.js b/src/govuk/components/button/button.js similarity index 100% rename from src/components/button/button.js rename to src/govuk/components/button/button.js diff --git a/src/components/button/button.test.js b/src/govuk/components/button/button.test.js similarity index 98% rename from src/components/button/button.test.js rename to src/govuk/components/button/button.test.js index 45dc2c7da1..b573935258 100644 --- a/src/components/button/button.test.js +++ b/src/govuk/components/button/button.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/button/button.yaml b/src/govuk/components/button/button.yaml similarity index 100% rename from src/components/button/button.yaml rename to src/govuk/components/button/button.yaml diff --git a/src/components/button/macro.njk b/src/govuk/components/button/macro.njk similarity index 100% rename from src/components/button/macro.njk rename to src/govuk/components/button/macro.njk diff --git a/src/components/button/template.njk b/src/govuk/components/button/template.njk similarity index 100% rename from src/components/button/template.njk rename to src/govuk/components/button/template.njk diff --git a/src/components/button/template.test.js b/src/govuk/components/button/template.test.js similarity index 98% rename from src/components/button/template.test.js rename to src/govuk/components/button/template.test.js index f79c4d63ab..41b813dfbe 100644 --- a/src/components/button/template.test.js +++ b/src/govuk/components/button/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('button') diff --git a/src/components/character-count/README.md b/src/govuk/components/character-count/README.md similarity index 100% rename from src/components/character-count/README.md rename to src/govuk/components/character-count/README.md diff --git a/src/components/character-count/__snapshots__/template.test.js.snap b/src/govuk/components/character-count/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/character-count/__snapshots__/template.test.js.snap rename to src/govuk/components/character-count/__snapshots__/template.test.js.snap diff --git a/src/components/character-count/_character-count.scss b/src/govuk/components/character-count/_character-count.scss similarity index 100% rename from src/components/character-count/_character-count.scss rename to src/govuk/components/character-count/_character-count.scss diff --git a/src/components/character-count/character-count.js b/src/govuk/components/character-count/character-count.js similarity index 100% rename from src/components/character-count/character-count.js rename to src/govuk/components/character-count/character-count.js diff --git a/src/components/character-count/character-count.test.js b/src/govuk/components/character-count/character-count.test.js similarity index 99% rename from src/components/character-count/character-count.test.js rename to src/govuk/components/character-count/character-count.test.js index 6808408264..afe948eecb 100644 --- a/src/components/character-count/character-count.test.js +++ b/src/govuk/components/character-count/character-count.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test const baseUrl = `http://localhost:${PORT}` diff --git a/src/components/character-count/character-count.yaml b/src/govuk/components/character-count/character-count.yaml similarity index 100% rename from src/components/character-count/character-count.yaml rename to src/govuk/components/character-count/character-count.yaml diff --git a/src/components/character-count/macro.njk b/src/govuk/components/character-count/macro.njk similarity index 100% rename from src/components/character-count/macro.njk rename to src/govuk/components/character-count/macro.njk diff --git a/src/components/character-count/template.njk b/src/govuk/components/character-count/template.njk similarity index 100% rename from src/components/character-count/template.njk rename to src/govuk/components/character-count/template.njk diff --git a/src/components/character-count/template.test.js b/src/govuk/components/character-count/template.test.js similarity index 99% rename from src/components/character-count/template.test.js rename to src/govuk/components/character-count/template.test.js index 4f96395432..a3662382d5 100644 --- a/src/components/character-count/template.test.js +++ b/src/govuk/components/character-count/template.test.js @@ -5,7 +5,7 @@ const { axe } = require('jest-axe') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('textarea') diff --git a/src/components/checkboxes/README.md b/src/govuk/components/checkboxes/README.md similarity index 100% rename from src/components/checkboxes/README.md rename to src/govuk/components/checkboxes/README.md diff --git a/src/components/checkboxes/__snapshots__/template.test.js.snap b/src/govuk/components/checkboxes/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/checkboxes/__snapshots__/template.test.js.snap rename to src/govuk/components/checkboxes/__snapshots__/template.test.js.snap diff --git a/src/components/checkboxes/_checkboxes.scss b/src/govuk/components/checkboxes/_checkboxes.scss similarity index 100% rename from src/components/checkboxes/_checkboxes.scss rename to src/govuk/components/checkboxes/_checkboxes.scss diff --git a/src/components/checkboxes/checkboxes.js b/src/govuk/components/checkboxes/checkboxes.js similarity index 100% rename from src/components/checkboxes/checkboxes.js rename to src/govuk/components/checkboxes/checkboxes.js diff --git a/src/components/checkboxes/checkboxes.test.js b/src/govuk/components/checkboxes/checkboxes.test.js similarity index 98% rename from src/components/checkboxes/checkboxes.test.js rename to src/govuk/components/checkboxes/checkboxes.test.js index 0c55073d13..de885b048f 100644 --- a/src/components/checkboxes/checkboxes.test.js +++ b/src/govuk/components/checkboxes/checkboxes.test.js @@ -2,7 +2,7 @@ const cheerio = require('cheerio') -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/checkboxes/checkboxes.yaml b/src/govuk/components/checkboxes/checkboxes.yaml similarity index 100% rename from src/components/checkboxes/checkboxes.yaml rename to src/govuk/components/checkboxes/checkboxes.yaml diff --git a/src/components/checkboxes/macro.njk b/src/govuk/components/checkboxes/macro.njk similarity index 100% rename from src/components/checkboxes/macro.njk rename to src/govuk/components/checkboxes/macro.njk diff --git a/src/components/checkboxes/template.njk b/src/govuk/components/checkboxes/template.njk similarity index 100% rename from src/components/checkboxes/template.njk rename to src/govuk/components/checkboxes/template.njk diff --git a/src/components/checkboxes/template.test.js b/src/govuk/components/checkboxes/template.test.js similarity index 99% rename from src/components/checkboxes/template.test.js rename to src/govuk/components/checkboxes/template.test.js index 4785e9ac52..58f4993d70 100644 --- a/src/components/checkboxes/template.test.js +++ b/src/govuk/components/checkboxes/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('checkboxes') diff --git a/src/components/date-input/README.md b/src/govuk/components/date-input/README.md similarity index 100% rename from src/components/date-input/README.md rename to src/govuk/components/date-input/README.md diff --git a/src/components/date-input/__snapshots__/template.test.js.snap b/src/govuk/components/date-input/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/date-input/__snapshots__/template.test.js.snap rename to src/govuk/components/date-input/__snapshots__/template.test.js.snap diff --git a/src/components/date-input/_date-input.scss b/src/govuk/components/date-input/_date-input.scss similarity index 100% rename from src/components/date-input/_date-input.scss rename to src/govuk/components/date-input/_date-input.scss diff --git a/src/components/date-input/date-input.yaml b/src/govuk/components/date-input/date-input.yaml similarity index 100% rename from src/components/date-input/date-input.yaml rename to src/govuk/components/date-input/date-input.yaml diff --git a/src/components/date-input/macro.njk b/src/govuk/components/date-input/macro.njk similarity index 100% rename from src/components/date-input/macro.njk rename to src/govuk/components/date-input/macro.njk diff --git a/src/components/date-input/template.njk b/src/govuk/components/date-input/template.njk similarity index 100% rename from src/components/date-input/template.njk rename to src/govuk/components/date-input/template.njk diff --git a/src/components/date-input/template.test.js b/src/govuk/components/date-input/template.test.js similarity index 99% rename from src/components/date-input/template.test.js rename to src/govuk/components/date-input/template.test.js index f14b196cbd..c095bafb26 100644 --- a/src/components/date-input/template.test.js +++ b/src/govuk/components/date-input/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('date-input') diff --git a/src/components/details/README.md b/src/govuk/components/details/README.md similarity index 100% rename from src/components/details/README.md rename to src/govuk/components/details/README.md diff --git a/src/components/details/_details.scss b/src/govuk/components/details/_details.scss similarity index 100% rename from src/components/details/_details.scss rename to src/govuk/components/details/_details.scss diff --git a/src/components/details/details.js b/src/govuk/components/details/details.js similarity index 100% rename from src/components/details/details.js rename to src/govuk/components/details/details.js diff --git a/src/components/details/details.test.js b/src/govuk/components/details/details.test.js similarity index 99% rename from src/components/details/details.test.js rename to src/govuk/components/details/details.test.js index c8c323dfd7..e634bc5a30 100644 --- a/src/components/details/details.test.js +++ b/src/govuk/components/details/details.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/details/details.yaml b/src/govuk/components/details/details.yaml similarity index 100% rename from src/components/details/details.yaml rename to src/govuk/components/details/details.yaml diff --git a/src/components/details/implementation.md b/src/govuk/components/details/implementation.md similarity index 100% rename from src/components/details/implementation.md rename to src/govuk/components/details/implementation.md diff --git a/src/components/details/macro.njk b/src/govuk/components/details/macro.njk similarity index 100% rename from src/components/details/macro.njk rename to src/govuk/components/details/macro.njk diff --git a/src/components/details/template.njk b/src/govuk/components/details/template.njk similarity index 100% rename from src/components/details/template.njk rename to src/govuk/components/details/template.njk diff --git a/src/components/details/template.test.js b/src/govuk/components/details/template.test.js similarity index 95% rename from src/components/details/template.test.js rename to src/govuk/components/details/template.test.js index fa4e20a3fe..c7ca852e2e 100644 --- a/src/components/details/template.test.js +++ b/src/govuk/components/details/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('details') diff --git a/src/components/error-message/README.md b/src/govuk/components/error-message/README.md similarity index 100% rename from src/components/error-message/README.md rename to src/govuk/components/error-message/README.md diff --git a/src/components/error-message/_error-message.scss b/src/govuk/components/error-message/_error-message.scss similarity index 100% rename from src/components/error-message/_error-message.scss rename to src/govuk/components/error-message/_error-message.scss diff --git a/src/components/error-message/error-message.yaml b/src/govuk/components/error-message/error-message.yaml similarity index 100% rename from src/components/error-message/error-message.yaml rename to src/govuk/components/error-message/error-message.yaml diff --git a/src/components/error-message/macro.njk b/src/govuk/components/error-message/macro.njk similarity index 100% rename from src/components/error-message/macro.njk rename to src/govuk/components/error-message/macro.njk diff --git a/src/components/error-message/template.njk b/src/govuk/components/error-message/template.njk similarity index 100% rename from src/components/error-message/template.njk rename to src/govuk/components/error-message/template.njk diff --git a/src/components/error-message/template.test.js b/src/govuk/components/error-message/template.test.js similarity index 95% rename from src/components/error-message/template.test.js rename to src/govuk/components/error-message/template.test.js index 6acc64d8f3..7685682f6b 100644 --- a/src/components/error-message/template.test.js +++ b/src/govuk/components/error-message/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('error-message') diff --git a/src/components/error-summary/README.md b/src/govuk/components/error-summary/README.md similarity index 100% rename from src/components/error-summary/README.md rename to src/govuk/components/error-summary/README.md diff --git a/src/components/error-summary/_error-summary.scss b/src/govuk/components/error-summary/_error-summary.scss similarity index 100% rename from src/components/error-summary/_error-summary.scss rename to src/govuk/components/error-summary/_error-summary.scss diff --git a/src/components/error-summary/error-summary.js b/src/govuk/components/error-summary/error-summary.js similarity index 100% rename from src/components/error-summary/error-summary.js rename to src/govuk/components/error-summary/error-summary.js diff --git a/src/components/error-summary/error-summary.test.js b/src/govuk/components/error-summary/error-summary.test.js similarity index 97% rename from src/components/error-summary/error-summary.test.js rename to src/govuk/components/error-summary/error-summary.test.js index 7c5b843338..78de36613f 100644 --- a/src/components/error-summary/error-summary.test.js +++ b/src/govuk/components/error-summary/error-summary.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/error-summary/error-summary.yaml b/src/govuk/components/error-summary/error-summary.yaml similarity index 100% rename from src/components/error-summary/error-summary.yaml rename to src/govuk/components/error-summary/error-summary.yaml diff --git a/src/components/error-summary/macro.njk b/src/govuk/components/error-summary/macro.njk similarity index 100% rename from src/components/error-summary/macro.njk rename to src/govuk/components/error-summary/macro.njk diff --git a/src/components/error-summary/template.njk b/src/govuk/components/error-summary/template.njk similarity index 100% rename from src/components/error-summary/template.njk rename to src/govuk/components/error-summary/template.njk diff --git a/src/components/error-summary/template.test.js b/src/govuk/components/error-summary/template.test.js similarity index 98% rename from src/components/error-summary/template.test.js rename to src/govuk/components/error-summary/template.test.js index c41b3286b6..29f5ea165a 100644 --- a/src/components/error-summary/template.test.js +++ b/src/govuk/components/error-summary/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('error-summary') diff --git a/src/components/fieldset/README.md b/src/govuk/components/fieldset/README.md similarity index 100% rename from src/components/fieldset/README.md rename to src/govuk/components/fieldset/README.md diff --git a/src/components/fieldset/_fieldset.scss b/src/govuk/components/fieldset/_fieldset.scss similarity index 100% rename from src/components/fieldset/_fieldset.scss rename to src/govuk/components/fieldset/_fieldset.scss diff --git a/src/components/fieldset/fieldset.yaml b/src/govuk/components/fieldset/fieldset.yaml similarity index 100% rename from src/components/fieldset/fieldset.yaml rename to src/govuk/components/fieldset/fieldset.yaml diff --git a/src/components/fieldset/macro.njk b/src/govuk/components/fieldset/macro.njk similarity index 100% rename from src/components/fieldset/macro.njk rename to src/govuk/components/fieldset/macro.njk diff --git a/src/components/fieldset/template.njk b/src/govuk/components/fieldset/template.njk similarity index 100% rename from src/components/fieldset/template.njk rename to src/govuk/components/fieldset/template.njk diff --git a/src/components/fieldset/template.test.js b/src/govuk/components/fieldset/template.test.js similarity index 96% rename from src/components/fieldset/template.test.js rename to src/govuk/components/fieldset/template.test.js index 1c647abf38..005dd14dd5 100644 --- a/src/components/fieldset/template.test.js +++ b/src/govuk/components/fieldset/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('fieldset') diff --git a/src/components/file-upload/README.md b/src/govuk/components/file-upload/README.md similarity index 100% rename from src/components/file-upload/README.md rename to src/govuk/components/file-upload/README.md diff --git a/src/components/file-upload/__snapshots__/template.test.js.snap b/src/govuk/components/file-upload/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/file-upload/__snapshots__/template.test.js.snap rename to src/govuk/components/file-upload/__snapshots__/template.test.js.snap diff --git a/src/components/file-upload/_file-upload.scss b/src/govuk/components/file-upload/_file-upload.scss similarity index 100% rename from src/components/file-upload/_file-upload.scss rename to src/govuk/components/file-upload/_file-upload.scss diff --git a/src/components/file-upload/file-upload.yaml b/src/govuk/components/file-upload/file-upload.yaml similarity index 100% rename from src/components/file-upload/file-upload.yaml rename to src/govuk/components/file-upload/file-upload.yaml diff --git a/src/components/file-upload/macro.njk b/src/govuk/components/file-upload/macro.njk similarity index 100% rename from src/components/file-upload/macro.njk rename to src/govuk/components/file-upload/macro.njk diff --git a/src/components/file-upload/template.njk b/src/govuk/components/file-upload/template.njk similarity index 100% rename from src/components/file-upload/template.njk rename to src/govuk/components/file-upload/template.njk diff --git a/src/components/file-upload/template.test.js b/src/govuk/components/file-upload/template.test.js similarity index 99% rename from src/components/file-upload/template.test.js rename to src/govuk/components/file-upload/template.test.js index 337da46a49..e667f5e7eb 100644 --- a/src/components/file-upload/template.test.js +++ b/src/govuk/components/file-upload/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('file-upload') diff --git a/src/components/footer/README.md b/src/govuk/components/footer/README.md similarity index 100% rename from src/components/footer/README.md rename to src/govuk/components/footer/README.md diff --git a/src/components/footer/_footer.scss b/src/govuk/components/footer/_footer.scss similarity index 100% rename from src/components/footer/_footer.scss rename to src/govuk/components/footer/_footer.scss diff --git a/src/components/footer/footer.yaml b/src/govuk/components/footer/footer.yaml similarity index 100% rename from src/components/footer/footer.yaml rename to src/govuk/components/footer/footer.yaml diff --git a/src/components/footer/macro.njk b/src/govuk/components/footer/macro.njk similarity index 100% rename from src/components/footer/macro.njk rename to src/govuk/components/footer/macro.njk diff --git a/src/components/footer/template.njk b/src/govuk/components/footer/template.njk similarity index 100% rename from src/components/footer/template.njk rename to src/govuk/components/footer/template.njk diff --git a/src/components/footer/template.test.js b/src/govuk/components/footer/template.test.js similarity index 98% rename from src/components/footer/template.test.js rename to src/govuk/components/footer/template.test.js index 93d4e98910..45a01427fd 100644 --- a/src/components/footer/template.test.js +++ b/src/govuk/components/footer/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('footer') diff --git a/src/components/header/README.md b/src/govuk/components/header/README.md similarity index 100% rename from src/components/header/README.md rename to src/govuk/components/header/README.md diff --git a/src/components/header/_header.scss b/src/govuk/components/header/_header.scss similarity index 100% rename from src/components/header/_header.scss rename to src/govuk/components/header/_header.scss diff --git a/src/components/header/header.js b/src/govuk/components/header/header.js similarity index 100% rename from src/components/header/header.js rename to src/govuk/components/header/header.js diff --git a/src/components/header/header.test.js b/src/govuk/components/header/header.test.js similarity index 98% rename from src/components/header/header.test.js rename to src/govuk/components/header/header.test.js index b3872266d0..3499391a35 100644 --- a/src/components/header/header.test.js +++ b/src/govuk/components/header/header.test.js @@ -2,7 +2,7 @@ const devices = require('puppeteer/DeviceDescriptors') const iPhone = devices['iPhone 6'] -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/header/header.yaml b/src/govuk/components/header/header.yaml similarity index 100% rename from src/components/header/header.yaml rename to src/govuk/components/header/header.yaml diff --git a/src/components/header/macro.njk b/src/govuk/components/header/macro.njk similarity index 100% rename from src/components/header/macro.njk rename to src/govuk/components/header/macro.njk diff --git a/src/components/header/template.njk b/src/govuk/components/header/template.njk similarity index 100% rename from src/components/header/template.njk rename to src/govuk/components/header/template.njk diff --git a/src/components/header/template.test.js b/src/govuk/components/header/template.test.js similarity index 97% rename from src/components/header/template.test.js rename to src/govuk/components/header/template.test.js index 20ded9e69a..dddc4031b2 100644 --- a/src/components/header/template.test.js +++ b/src/govuk/components/header/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('header') diff --git a/src/components/hint/README.md b/src/govuk/components/hint/README.md similarity index 100% rename from src/components/hint/README.md rename to src/govuk/components/hint/README.md diff --git a/src/components/hint/_hint.scss b/src/govuk/components/hint/_hint.scss similarity index 100% rename from src/components/hint/_hint.scss rename to src/govuk/components/hint/_hint.scss diff --git a/src/components/hint/hint.yaml b/src/govuk/components/hint/hint.yaml similarity index 100% rename from src/components/hint/hint.yaml rename to src/govuk/components/hint/hint.yaml diff --git a/src/components/hint/macro.njk b/src/govuk/components/hint/macro.njk similarity index 100% rename from src/components/hint/macro.njk rename to src/govuk/components/hint/macro.njk diff --git a/src/components/hint/template.njk b/src/govuk/components/hint/template.njk similarity index 100% rename from src/components/hint/template.njk rename to src/govuk/components/hint/template.njk diff --git a/src/components/hint/template.test.js b/src/govuk/components/hint/template.test.js similarity index 93% rename from src/components/hint/template.test.js rename to src/govuk/components/hint/template.test.js index 3dc399b987..bed255e23e 100644 --- a/src/components/hint/template.test.js +++ b/src/govuk/components/hint/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('hint') diff --git a/src/components/input/README.md b/src/govuk/components/input/README.md similarity index 100% rename from src/components/input/README.md rename to src/govuk/components/input/README.md diff --git a/src/components/input/__snapshots__/template.test.js.snap b/src/govuk/components/input/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/input/__snapshots__/template.test.js.snap rename to src/govuk/components/input/__snapshots__/template.test.js.snap diff --git a/src/components/input/_input.scss b/src/govuk/components/input/_input.scss similarity index 100% rename from src/components/input/_input.scss rename to src/govuk/components/input/_input.scss diff --git a/src/components/input/input.yaml b/src/govuk/components/input/input.yaml similarity index 100% rename from src/components/input/input.yaml rename to src/govuk/components/input/input.yaml diff --git a/src/components/input/macro.njk b/src/govuk/components/input/macro.njk similarity index 100% rename from src/components/input/macro.njk rename to src/govuk/components/input/macro.njk diff --git a/src/components/input/template.njk b/src/govuk/components/input/template.njk similarity index 100% rename from src/components/input/template.njk rename to src/govuk/components/input/template.njk diff --git a/src/components/input/template.test.js b/src/govuk/components/input/template.test.js similarity index 99% rename from src/components/input/template.test.js rename to src/govuk/components/input/template.test.js index 8382cfa3d5..3f67883e1e 100644 --- a/src/components/input/template.test.js +++ b/src/govuk/components/input/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('input') diff --git a/src/components/inset-text/README.md b/src/govuk/components/inset-text/README.md similarity index 100% rename from src/components/inset-text/README.md rename to src/govuk/components/inset-text/README.md diff --git a/src/components/inset-text/_inset-text.scss b/src/govuk/components/inset-text/_inset-text.scss similarity index 100% rename from src/components/inset-text/_inset-text.scss rename to src/govuk/components/inset-text/_inset-text.scss diff --git a/src/components/inset-text/inset-text.yaml b/src/govuk/components/inset-text/inset-text.yaml similarity index 100% rename from src/components/inset-text/inset-text.yaml rename to src/govuk/components/inset-text/inset-text.yaml diff --git a/src/components/inset-text/macro.njk b/src/govuk/components/inset-text/macro.njk similarity index 100% rename from src/components/inset-text/macro.njk rename to src/govuk/components/inset-text/macro.njk diff --git a/src/components/inset-text/template.njk b/src/govuk/components/inset-text/template.njk similarity index 100% rename from src/components/inset-text/template.njk rename to src/govuk/components/inset-text/template.njk diff --git a/src/components/inset-text/template.test.js b/src/govuk/components/inset-text/template.test.js similarity index 94% rename from src/components/inset-text/template.test.js rename to src/govuk/components/inset-text/template.test.js index 5afca296b9..94af7f82c4 100644 --- a/src/components/inset-text/template.test.js +++ b/src/govuk/components/inset-text/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('inset-text') diff --git a/src/components/label/README.md b/src/govuk/components/label/README.md similarity index 100% rename from src/components/label/README.md rename to src/govuk/components/label/README.md diff --git a/src/components/label/_label.scss b/src/govuk/components/label/_label.scss similarity index 100% rename from src/components/label/_label.scss rename to src/govuk/components/label/_label.scss diff --git a/src/components/label/label.yaml b/src/govuk/components/label/label.yaml similarity index 100% rename from src/components/label/label.yaml rename to src/govuk/components/label/label.yaml diff --git a/src/components/label/macro.njk b/src/govuk/components/label/macro.njk similarity index 100% rename from src/components/label/macro.njk rename to src/govuk/components/label/macro.njk diff --git a/src/components/label/template.njk b/src/govuk/components/label/template.njk similarity index 100% rename from src/components/label/template.njk rename to src/govuk/components/label/template.njk diff --git a/src/components/label/template.test.js b/src/govuk/components/label/template.test.js similarity index 96% rename from src/components/label/template.test.js rename to src/govuk/components/label/template.test.js index 44b54df707..a84b8becc3 100644 --- a/src/components/label/template.test.js +++ b/src/govuk/components/label/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('label') diff --git a/src/components/panel/README.md b/src/govuk/components/panel/README.md similarity index 100% rename from src/components/panel/README.md rename to src/govuk/components/panel/README.md diff --git a/src/components/panel/_panel.scss b/src/govuk/components/panel/_panel.scss similarity index 100% rename from src/components/panel/_panel.scss rename to src/govuk/components/panel/_panel.scss diff --git a/src/components/panel/macro.njk b/src/govuk/components/panel/macro.njk similarity index 100% rename from src/components/panel/macro.njk rename to src/govuk/components/panel/macro.njk diff --git a/src/components/panel/panel.yaml b/src/govuk/components/panel/panel.yaml similarity index 100% rename from src/components/panel/panel.yaml rename to src/govuk/components/panel/panel.yaml diff --git a/src/components/panel/template.njk b/src/govuk/components/panel/template.njk similarity index 100% rename from src/components/panel/template.njk rename to src/govuk/components/panel/template.njk diff --git a/src/components/panel/template.test.js b/src/govuk/components/panel/template.test.js similarity index 96% rename from src/components/panel/template.test.js rename to src/govuk/components/panel/template.test.js index d0fbe5e793..1bf2058804 100644 --- a/src/components/panel/template.test.js +++ b/src/govuk/components/panel/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('panel') diff --git a/src/components/phase-banner/README.md b/src/govuk/components/phase-banner/README.md similarity index 100% rename from src/components/phase-banner/README.md rename to src/govuk/components/phase-banner/README.md diff --git a/src/components/phase-banner/__snapshots__/template.test.js.snap b/src/govuk/components/phase-banner/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/phase-banner/__snapshots__/template.test.js.snap rename to src/govuk/components/phase-banner/__snapshots__/template.test.js.snap diff --git a/src/components/phase-banner/_phase-banner.scss b/src/govuk/components/phase-banner/_phase-banner.scss similarity index 100% rename from src/components/phase-banner/_phase-banner.scss rename to src/govuk/components/phase-banner/_phase-banner.scss diff --git a/src/components/phase-banner/macro.njk b/src/govuk/components/phase-banner/macro.njk similarity index 100% rename from src/components/phase-banner/macro.njk rename to src/govuk/components/phase-banner/macro.njk diff --git a/src/components/phase-banner/phase-banner.yaml b/src/govuk/components/phase-banner/phase-banner.yaml similarity index 100% rename from src/components/phase-banner/phase-banner.yaml rename to src/govuk/components/phase-banner/phase-banner.yaml diff --git a/src/components/phase-banner/template.njk b/src/govuk/components/phase-banner/template.njk similarity index 100% rename from src/components/phase-banner/template.njk rename to src/govuk/components/phase-banner/template.njk diff --git a/src/components/phase-banner/template.test.js b/src/govuk/components/phase-banner/template.test.js similarity index 97% rename from src/components/phase-banner/template.test.js rename to src/govuk/components/phase-banner/template.test.js index 63ec3d00b5..f15027bd51 100644 --- a/src/components/phase-banner/template.test.js +++ b/src/govuk/components/phase-banner/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('phase-banner') diff --git a/src/components/radios/README.md b/src/govuk/components/radios/README.md similarity index 100% rename from src/components/radios/README.md rename to src/govuk/components/radios/README.md diff --git a/src/components/radios/__snapshots__/template.test.js.snap b/src/govuk/components/radios/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/radios/__snapshots__/template.test.js.snap rename to src/govuk/components/radios/__snapshots__/template.test.js.snap diff --git a/src/components/radios/_radios.scss b/src/govuk/components/radios/_radios.scss similarity index 100% rename from src/components/radios/_radios.scss rename to src/govuk/components/radios/_radios.scss diff --git a/src/components/radios/macro.njk b/src/govuk/components/radios/macro.njk similarity index 100% rename from src/components/radios/macro.njk rename to src/govuk/components/radios/macro.njk diff --git a/src/components/radios/radios.js b/src/govuk/components/radios/radios.js similarity index 100% rename from src/components/radios/radios.js rename to src/govuk/components/radios/radios.js diff --git a/src/components/radios/radios.test.js b/src/govuk/components/radios/radios.test.js similarity index 98% rename from src/components/radios/radios.test.js rename to src/govuk/components/radios/radios.test.js index 0f4a64db0d..0745c5ed8c 100644 --- a/src/components/radios/radios.test.js +++ b/src/govuk/components/radios/radios.test.js @@ -2,7 +2,7 @@ const cheerio = require('cheerio') -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/radios/radios.yaml b/src/govuk/components/radios/radios.yaml similarity index 100% rename from src/components/radios/radios.yaml rename to src/govuk/components/radios/radios.yaml diff --git a/src/components/radios/template.njk b/src/govuk/components/radios/template.njk similarity index 100% rename from src/components/radios/template.njk rename to src/govuk/components/radios/template.njk diff --git a/src/components/radios/template.test.js b/src/govuk/components/radios/template.test.js similarity index 99% rename from src/components/radios/template.test.js rename to src/govuk/components/radios/template.test.js index 0aac90d6c4..b842c65739 100644 --- a/src/components/radios/template.test.js +++ b/src/govuk/components/radios/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('radios') diff --git a/src/components/select/README.md b/src/govuk/components/select/README.md similarity index 100% rename from src/components/select/README.md rename to src/govuk/components/select/README.md diff --git a/src/components/select/__snapshots__/template.test.js.snap b/src/govuk/components/select/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/select/__snapshots__/template.test.js.snap rename to src/govuk/components/select/__snapshots__/template.test.js.snap diff --git a/src/components/select/_select.scss b/src/govuk/components/select/_select.scss similarity index 100% rename from src/components/select/_select.scss rename to src/govuk/components/select/_select.scss diff --git a/src/components/select/macro.njk b/src/govuk/components/select/macro.njk similarity index 100% rename from src/components/select/macro.njk rename to src/govuk/components/select/macro.njk diff --git a/src/components/select/select.yaml b/src/govuk/components/select/select.yaml similarity index 100% rename from src/components/select/select.yaml rename to src/govuk/components/select/select.yaml diff --git a/src/components/select/template.njk b/src/govuk/components/select/template.njk similarity index 100% rename from src/components/select/template.njk rename to src/govuk/components/select/template.njk diff --git a/src/components/select/template.test.js b/src/govuk/components/select/template.test.js similarity index 99% rename from src/components/select/template.test.js rename to src/govuk/components/select/template.test.js index 97baff4f12..db0fe6e96f 100644 --- a/src/components/select/template.test.js +++ b/src/govuk/components/select/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('select') diff --git a/src/components/skip-link/README.md b/src/govuk/components/skip-link/README.md similarity index 100% rename from src/components/skip-link/README.md rename to src/govuk/components/skip-link/README.md diff --git a/src/components/skip-link/_skip-link.scss b/src/govuk/components/skip-link/_skip-link.scss similarity index 100% rename from src/components/skip-link/_skip-link.scss rename to src/govuk/components/skip-link/_skip-link.scss diff --git a/src/components/skip-link/macro.njk b/src/govuk/components/skip-link/macro.njk similarity index 100% rename from src/components/skip-link/macro.njk rename to src/govuk/components/skip-link/macro.njk diff --git a/src/components/skip-link/skip-link.yaml b/src/govuk/components/skip-link/skip-link.yaml similarity index 100% rename from src/components/skip-link/skip-link.yaml rename to src/govuk/components/skip-link/skip-link.yaml diff --git a/src/components/skip-link/template.njk b/src/govuk/components/skip-link/template.njk similarity index 100% rename from src/components/skip-link/template.njk rename to src/govuk/components/skip-link/template.njk diff --git a/src/components/skip-link/template.test.js b/src/govuk/components/skip-link/template.test.js similarity index 94% rename from src/components/skip-link/template.test.js rename to src/govuk/components/skip-link/template.test.js index b2be094ab0..22cc294b73 100644 --- a/src/components/skip-link/template.test.js +++ b/src/govuk/components/skip-link/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('skip-link') diff --git a/src/components/summary-list/README.md b/src/govuk/components/summary-list/README.md similarity index 100% rename from src/components/summary-list/README.md rename to src/govuk/components/summary-list/README.md diff --git a/src/components/summary-list/_summary-list.scss b/src/govuk/components/summary-list/_summary-list.scss similarity index 100% rename from src/components/summary-list/_summary-list.scss rename to src/govuk/components/summary-list/_summary-list.scss diff --git a/src/components/summary-list/macro.njk b/src/govuk/components/summary-list/macro.njk similarity index 100% rename from src/components/summary-list/macro.njk rename to src/govuk/components/summary-list/macro.njk diff --git a/src/components/summary-list/summary-list.yaml b/src/govuk/components/summary-list/summary-list.yaml similarity index 100% rename from src/components/summary-list/summary-list.yaml rename to src/govuk/components/summary-list/summary-list.yaml diff --git a/src/components/summary-list/template.njk b/src/govuk/components/summary-list/template.njk similarity index 100% rename from src/components/summary-list/template.njk rename to src/govuk/components/summary-list/template.njk diff --git a/src/components/summary-list/template.test.js b/src/govuk/components/summary-list/template.test.js similarity index 98% rename from src/components/summary-list/template.test.js rename to src/govuk/components/summary-list/template.test.js index 5a54018a2a..35d09d5ad1 100644 --- a/src/components/summary-list/template.test.js +++ b/src/govuk/components/summary-list/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('summary-list') diff --git a/src/components/table/README.md b/src/govuk/components/table/README.md similarity index 100% rename from src/components/table/README.md rename to src/govuk/components/table/README.md diff --git a/src/components/table/_table.scss b/src/govuk/components/table/_table.scss similarity index 100% rename from src/components/table/_table.scss rename to src/govuk/components/table/_table.scss diff --git a/src/components/table/macro.njk b/src/govuk/components/table/macro.njk similarity index 100% rename from src/components/table/macro.njk rename to src/govuk/components/table/macro.njk diff --git a/src/components/table/table.yaml b/src/govuk/components/table/table.yaml similarity index 100% rename from src/components/table/table.yaml rename to src/govuk/components/table/table.yaml diff --git a/src/components/table/template.njk b/src/govuk/components/table/template.njk similarity index 100% rename from src/components/table/template.njk rename to src/govuk/components/table/template.njk diff --git a/src/components/table/template.test.js b/src/govuk/components/table/template.test.js similarity index 98% rename from src/components/table/template.test.js rename to src/govuk/components/table/template.test.js index 952aa56abc..720404669e 100644 --- a/src/components/table/template.test.js +++ b/src/govuk/components/table/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('table') diff --git a/src/components/tabs/README.md b/src/govuk/components/tabs/README.md similarity index 100% rename from src/components/tabs/README.md rename to src/govuk/components/tabs/README.md diff --git a/src/components/tabs/_tabs.scss b/src/govuk/components/tabs/_tabs.scss similarity index 100% rename from src/components/tabs/_tabs.scss rename to src/govuk/components/tabs/_tabs.scss diff --git a/src/components/tabs/macro.njk b/src/govuk/components/tabs/macro.njk similarity index 100% rename from src/components/tabs/macro.njk rename to src/govuk/components/tabs/macro.njk diff --git a/src/components/tabs/tabs.js b/src/govuk/components/tabs/tabs.js similarity index 100% rename from src/components/tabs/tabs.js rename to src/govuk/components/tabs/tabs.js diff --git a/src/components/tabs/tabs.test.js b/src/govuk/components/tabs/tabs.test.js similarity index 99% rename from src/components/tabs/tabs.test.js rename to src/govuk/components/tabs/tabs.test.js index 2e8cdb40f1..4e17ee4ee1 100644 --- a/src/components/tabs/tabs.test.js +++ b/src/govuk/components/tabs/tabs.test.js @@ -3,7 +3,7 @@ const devices = require('puppeteer/DeviceDescriptors') const iPhone = devices['iPhone 6'] // const iPad = devices['iPad landscape'] -const configPaths = require('../../../config/paths.json') +const configPaths = require('../../../../config/paths.json') const PORT = configPaths.ports.test let baseUrl = 'http://localhost:' + PORT diff --git a/src/components/tabs/tabs.yaml b/src/govuk/components/tabs/tabs.yaml similarity index 100% rename from src/components/tabs/tabs.yaml rename to src/govuk/components/tabs/tabs.yaml diff --git a/src/components/tabs/template.njk b/src/govuk/components/tabs/template.njk similarity index 100% rename from src/components/tabs/template.njk rename to src/govuk/components/tabs/template.njk diff --git a/src/components/tabs/template.test.js b/src/govuk/components/tabs/template.test.js similarity index 98% rename from src/components/tabs/template.test.js rename to src/govuk/components/tabs/template.test.js index a685730b6d..1fdb14eb12 100644 --- a/src/components/tabs/template.test.js +++ b/src/govuk/components/tabs/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('tabs') diff --git a/src/components/tag/README.md b/src/govuk/components/tag/README.md similarity index 100% rename from src/components/tag/README.md rename to src/govuk/components/tag/README.md diff --git a/src/components/tag/_tag.scss b/src/govuk/components/tag/_tag.scss similarity index 100% rename from src/components/tag/_tag.scss rename to src/govuk/components/tag/_tag.scss diff --git a/src/components/tag/macro.njk b/src/govuk/components/tag/macro.njk similarity index 100% rename from src/components/tag/macro.njk rename to src/govuk/components/tag/macro.njk diff --git a/src/components/tag/tag.yaml b/src/govuk/components/tag/tag.yaml similarity index 100% rename from src/components/tag/tag.yaml rename to src/govuk/components/tag/tag.yaml diff --git a/src/components/tag/template.njk b/src/govuk/components/tag/template.njk similarity index 100% rename from src/components/tag/template.njk rename to src/govuk/components/tag/template.njk diff --git a/src/components/tag/template.test.js b/src/govuk/components/tag/template.test.js similarity index 93% rename from src/components/tag/template.test.js rename to src/govuk/components/tag/template.test.js index f1096c70b1..d04e6d06fd 100644 --- a/src/components/tag/template.test.js +++ b/src/govuk/components/tag/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('tag') diff --git a/src/components/textarea/README.md b/src/govuk/components/textarea/README.md similarity index 100% rename from src/components/textarea/README.md rename to src/govuk/components/textarea/README.md diff --git a/src/components/textarea/__snapshots__/template.test.js.snap b/src/govuk/components/textarea/__snapshots__/template.test.js.snap similarity index 100% rename from src/components/textarea/__snapshots__/template.test.js.snap rename to src/govuk/components/textarea/__snapshots__/template.test.js.snap diff --git a/src/components/textarea/_textarea.scss b/src/govuk/components/textarea/_textarea.scss similarity index 100% rename from src/components/textarea/_textarea.scss rename to src/govuk/components/textarea/_textarea.scss diff --git a/src/components/textarea/macro.njk b/src/govuk/components/textarea/macro.njk similarity index 100% rename from src/components/textarea/macro.njk rename to src/govuk/components/textarea/macro.njk diff --git a/src/components/textarea/template.njk b/src/govuk/components/textarea/template.njk similarity index 100% rename from src/components/textarea/template.njk rename to src/govuk/components/textarea/template.njk diff --git a/src/components/textarea/template.test.js b/src/govuk/components/textarea/template.test.js similarity index 99% rename from src/components/textarea/template.test.js rename to src/govuk/components/textarea/template.test.js index 7fe58fd4d5..2fc25b82aa 100644 --- a/src/components/textarea/template.test.js +++ b/src/govuk/components/textarea/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples, htmlWithClassName } = require('../../../lib/jest-helpers') +const { render, getExamples, htmlWithClassName } = require('../../../../lib/jest-helpers') const examples = getExamples('textarea') diff --git a/src/components/textarea/textarea.yaml b/src/govuk/components/textarea/textarea.yaml similarity index 100% rename from src/components/textarea/textarea.yaml rename to src/govuk/components/textarea/textarea.yaml diff --git a/src/components/warning-text/README.md b/src/govuk/components/warning-text/README.md similarity index 100% rename from src/components/warning-text/README.md rename to src/govuk/components/warning-text/README.md diff --git a/src/components/warning-text/_warning-text.scss b/src/govuk/components/warning-text/_warning-text.scss similarity index 100% rename from src/components/warning-text/_warning-text.scss rename to src/govuk/components/warning-text/_warning-text.scss diff --git a/src/components/warning-text/macro.njk b/src/govuk/components/warning-text/macro.njk similarity index 100% rename from src/components/warning-text/macro.njk rename to src/govuk/components/warning-text/macro.njk diff --git a/src/components/warning-text/template.njk b/src/govuk/components/warning-text/template.njk similarity index 100% rename from src/components/warning-text/template.njk rename to src/govuk/components/warning-text/template.njk diff --git a/src/components/warning-text/template.test.js b/src/govuk/components/warning-text/template.test.js similarity index 95% rename from src/components/warning-text/template.test.js rename to src/govuk/components/warning-text/template.test.js index 7801b65824..28e3576406 100644 --- a/src/components/warning-text/template.test.js +++ b/src/govuk/components/warning-text/template.test.js @@ -3,9 +3,9 @@ */ /* eslint-env jest */ -const axe = require('../../../lib/axe-helper') +const axe = require('../../../../lib/axe-helper') -const { render, getExamples } = require('../../../lib/jest-helpers') +const { render, getExamples } = require('../../../../lib/jest-helpers') const examples = getExamples('warning-text') diff --git a/src/components/warning-text/warning-text.yaml b/src/govuk/components/warning-text/warning-text.yaml similarity index 100% rename from src/components/warning-text/warning-text.yaml rename to src/govuk/components/warning-text/warning-text.yaml diff --git a/src/core/_all.scss b/src/govuk/core/_all.scss similarity index 100% rename from src/core/_all.scss rename to src/govuk/core/_all.scss diff --git a/src/core/_global-styles.scss b/src/govuk/core/_global-styles.scss similarity index 100% rename from src/core/_global-styles.scss rename to src/govuk/core/_global-styles.scss diff --git a/src/core/_links.scss b/src/govuk/core/_links.scss similarity index 100% rename from src/core/_links.scss rename to src/govuk/core/_links.scss diff --git a/src/core/_lists.scss b/src/govuk/core/_lists.scss similarity index 100% rename from src/core/_lists.scss rename to src/govuk/core/_lists.scss diff --git a/src/core/_section-break.scss b/src/govuk/core/_section-break.scss similarity index 100% rename from src/core/_section-break.scss rename to src/govuk/core/_section-break.scss diff --git a/src/core/_template.scss b/src/govuk/core/_template.scss similarity index 100% rename from src/core/_template.scss rename to src/govuk/core/_template.scss diff --git a/src/core/_typography.scss b/src/govuk/core/_typography.scss similarity index 100% rename from src/core/_typography.scss rename to src/govuk/core/_typography.scss diff --git a/src/core/core.test.js b/src/govuk/core/core.test.js similarity index 65% rename from src/core/core.test.js rename to src/govuk/core/core.test.js index d762435605..686686ef3e 100644 --- a/src/core/core.test.js +++ b/src/govuk/core/core.test.js @@ -1,8 +1,8 @@ /* eslint-env jest */ const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/core/**/*.scss`) diff --git a/src/helpers/_all.scss b/src/govuk/helpers/_all.scss similarity index 100% rename from src/helpers/_all.scss rename to src/govuk/helpers/_all.scss diff --git a/src/helpers/_clearfix.scss b/src/govuk/helpers/_clearfix.scss similarity index 100% rename from src/helpers/_clearfix.scss rename to src/govuk/helpers/_clearfix.scss diff --git a/src/helpers/_colour.scss b/src/govuk/helpers/_colour.scss similarity index 100% rename from src/helpers/_colour.scss rename to src/govuk/helpers/_colour.scss diff --git a/src/helpers/_device-pixels.scss b/src/govuk/helpers/_device-pixels.scss similarity index 100% rename from src/helpers/_device-pixels.scss rename to src/govuk/helpers/_device-pixels.scss diff --git a/src/helpers/_focused.scss b/src/govuk/helpers/_focused.scss similarity index 100% rename from src/helpers/_focused.scss rename to src/govuk/helpers/_focused.scss diff --git a/src/helpers/_font-faces.scss b/src/govuk/helpers/_font-faces.scss similarity index 100% rename from src/helpers/_font-faces.scss rename to src/govuk/helpers/_font-faces.scss diff --git a/src/helpers/_grid.scss b/src/govuk/helpers/_grid.scss similarity index 100% rename from src/helpers/_grid.scss rename to src/govuk/helpers/_grid.scss diff --git a/src/helpers/_links.scss b/src/govuk/helpers/_links.scss similarity index 100% rename from src/helpers/_links.scss rename to src/govuk/helpers/_links.scss diff --git a/src/helpers/_media-queries.scss b/src/govuk/helpers/_media-queries.scss similarity index 100% rename from src/helpers/_media-queries.scss rename to src/govuk/helpers/_media-queries.scss diff --git a/src/helpers/_shape-arrow.scss b/src/govuk/helpers/_shape-arrow.scss similarity index 100% rename from src/helpers/_shape-arrow.scss rename to src/govuk/helpers/_shape-arrow.scss diff --git a/src/helpers/_spacing.scss b/src/govuk/helpers/_spacing.scss similarity index 100% rename from src/helpers/_spacing.scss rename to src/govuk/helpers/_spacing.scss diff --git a/src/helpers/_typography.scss b/src/govuk/helpers/_typography.scss similarity index 100% rename from src/helpers/_typography.scss rename to src/govuk/helpers/_typography.scss diff --git a/src/helpers/_visually-hidden.scss b/src/govuk/helpers/_visually-hidden.scss similarity index 100% rename from src/helpers/_visually-hidden.scss rename to src/govuk/helpers/_visually-hidden.scss diff --git a/src/helpers/colour.test.js b/src/govuk/helpers/colour.test.js similarity index 99% rename from src/helpers/colour.test.js rename to src/govuk/helpers/colour.test.js index 625233498d..91edb099db 100644 --- a/src/helpers/colour.test.js +++ b/src/govuk/helpers/colour.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compact' diff --git a/src/helpers/grid.test.js b/src/govuk/helpers/grid.test.js similarity index 98% rename from src/helpers/grid.test.js rename to src/govuk/helpers/grid.test.js index 0c9ca4cc8d..2acd410546 100644 --- a/src/helpers/grid.test.js +++ b/src/govuk/helpers/grid.test.js @@ -2,7 +2,7 @@ const outdent = require('outdent') -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'nested' diff --git a/src/helpers/helpers.test.js b/src/govuk/helpers/helpers.test.js similarity index 81% rename from src/helpers/helpers.test.js rename to src/govuk/helpers/helpers.test.js index da105e8a93..f2f9164ee9 100644 --- a/src/helpers/helpers.test.js +++ b/src/govuk/helpers/helpers.test.js @@ -4,8 +4,8 @@ const path = require('path') const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/helpers/**/*.scss`) diff --git a/src/helpers/media-queries.test.js b/src/govuk/helpers/media-queries.test.js similarity index 98% rename from src/helpers/media-queries.test.js rename to src/govuk/helpers/media-queries.test.js index 1b8b7c45a0..3e982d43eb 100644 --- a/src/helpers/media-queries.test.js +++ b/src/govuk/helpers/media-queries.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/helpers/spacing.test.js b/src/govuk/helpers/spacing.test.js similarity index 99% rename from src/helpers/spacing.test.js rename to src/govuk/helpers/spacing.test.js index e4915f4a8d..29eb09404a 100644 --- a/src/helpers/spacing.test.js +++ b/src/govuk/helpers/spacing.test.js @@ -2,7 +2,7 @@ const outdent = require('outdent') -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'nested' diff --git a/src/helpers/typography.test.js b/src/govuk/helpers/typography.test.js similarity index 99% rename from src/helpers/typography.test.js rename to src/govuk/helpers/typography.test.js index 49e0bff0bb..451e55faa4 100644 --- a/src/helpers/typography.test.js +++ b/src/govuk/helpers/typography.test.js @@ -2,7 +2,7 @@ const outdent = require('outdent') -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'nested' diff --git a/src/objects/_all.scss b/src/govuk/objects/_all.scss similarity index 100% rename from src/objects/_all.scss rename to src/govuk/objects/_all.scss diff --git a/src/objects/_form-group.scss b/src/govuk/objects/_form-group.scss similarity index 100% rename from src/objects/_form-group.scss rename to src/govuk/objects/_form-group.scss diff --git a/src/objects/_grid.scss b/src/govuk/objects/_grid.scss similarity index 100% rename from src/objects/_grid.scss rename to src/govuk/objects/_grid.scss diff --git a/src/objects/_main-wrapper.scss b/src/govuk/objects/_main-wrapper.scss similarity index 100% rename from src/objects/_main-wrapper.scss rename to src/govuk/objects/_main-wrapper.scss diff --git a/src/objects/_width-container.scss b/src/govuk/objects/_width-container.scss similarity index 100% rename from src/objects/_width-container.scss rename to src/govuk/objects/_width-container.scss diff --git a/src/objects/objects.test.js b/src/govuk/objects/objects.test.js similarity index 65% rename from src/objects/objects.test.js rename to src/govuk/objects/objects.test.js index 5bcc8246aa..5075da87bc 100644 --- a/src/objects/objects.test.js +++ b/src/govuk/objects/objects.test.js @@ -1,8 +1,8 @@ /* eslint-env jest */ const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/objects/**/*.scss`) diff --git a/src/overrides/_all.scss b/src/govuk/overrides/_all.scss similarity index 100% rename from src/overrides/_all.scss rename to src/govuk/overrides/_all.scss diff --git a/src/overrides/_display.scss b/src/govuk/overrides/_display.scss similarity index 100% rename from src/overrides/_display.scss rename to src/govuk/overrides/_display.scss diff --git a/src/overrides/_spacing.scss b/src/govuk/overrides/_spacing.scss similarity index 100% rename from src/overrides/_spacing.scss rename to src/govuk/overrides/_spacing.scss diff --git a/src/overrides/_typography.scss b/src/govuk/overrides/_typography.scss similarity index 100% rename from src/overrides/_typography.scss rename to src/govuk/overrides/_typography.scss diff --git a/src/overrides/_width.scss b/src/govuk/overrides/_width.scss similarity index 100% rename from src/overrides/_width.scss rename to src/govuk/overrides/_width.scss diff --git a/src/overrides/overrides.test.js b/src/govuk/overrides/overrides.test.js similarity index 66% rename from src/overrides/overrides.test.js rename to src/govuk/overrides/overrides.test.js index 59bed508ee..879f86a386 100644 --- a/src/overrides/overrides.test.js +++ b/src/govuk/overrides/overrides.test.js @@ -1,8 +1,8 @@ /* eslint-env jest */ const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/overrides/**/*.scss`) diff --git a/src/settings/_all.scss b/src/govuk/settings/_all.scss similarity index 100% rename from src/settings/_all.scss rename to src/govuk/settings/_all.scss diff --git a/src/settings/_assets.scss b/src/govuk/settings/_assets.scss similarity index 100% rename from src/settings/_assets.scss rename to src/govuk/settings/_assets.scss diff --git a/src/settings/_colours-applied.scss b/src/govuk/settings/_colours-applied.scss similarity index 100% rename from src/settings/_colours-applied.scss rename to src/govuk/settings/_colours-applied.scss diff --git a/src/settings/_colours-organisations.scss b/src/govuk/settings/_colours-organisations.scss similarity index 100% rename from src/settings/_colours-organisations.scss rename to src/govuk/settings/_colours-organisations.scss diff --git a/src/settings/_colours-palette.scss b/src/govuk/settings/_colours-palette.scss similarity index 100% rename from src/settings/_colours-palette.scss rename to src/govuk/settings/_colours-palette.scss diff --git a/src/settings/_compatibility.scss b/src/govuk/settings/_compatibility.scss similarity index 100% rename from src/settings/_compatibility.scss rename to src/govuk/settings/_compatibility.scss diff --git a/src/settings/_global-styles.scss b/src/govuk/settings/_global-styles.scss similarity index 100% rename from src/settings/_global-styles.scss rename to src/govuk/settings/_global-styles.scss diff --git a/src/settings/_ie8.scss b/src/govuk/settings/_ie8.scss similarity index 100% rename from src/settings/_ie8.scss rename to src/govuk/settings/_ie8.scss diff --git a/src/settings/_measurements.scss b/src/govuk/settings/_measurements.scss similarity index 100% rename from src/settings/_measurements.scss rename to src/govuk/settings/_measurements.scss diff --git a/src/settings/_media-queries.scss b/src/govuk/settings/_media-queries.scss similarity index 100% rename from src/settings/_media-queries.scss rename to src/govuk/settings/_media-queries.scss diff --git a/src/settings/_spacing.scss b/src/govuk/settings/_spacing.scss similarity index 100% rename from src/settings/_spacing.scss rename to src/govuk/settings/_spacing.scss diff --git a/src/settings/_typography-font-families.scss b/src/govuk/settings/_typography-font-families.scss similarity index 100% rename from src/settings/_typography-font-families.scss rename to src/govuk/settings/_typography-font-families.scss diff --git a/src/settings/_typography-font.scss b/src/govuk/settings/_typography-font.scss similarity index 100% rename from src/settings/_typography-font.scss rename to src/govuk/settings/_typography-font.scss diff --git a/src/settings/_typography-responsive.scss b/src/govuk/settings/_typography-responsive.scss similarity index 100% rename from src/settings/_typography-responsive.scss rename to src/govuk/settings/_typography-responsive.scss diff --git a/src/settings/colours.test.js b/src/govuk/settings/colours.test.js similarity index 90% rename from src/settings/colours.test.js rename to src/govuk/settings/colours.test.js index a8f9d31ee2..27b25ff42e 100644 --- a/src/settings/colours.test.js +++ b/src/govuk/settings/colours.test.js @@ -1,8 +1,8 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const configPaths = require('../../../config/paths.json') const sassConfig = { includePaths: [ configPaths.src, 'node_modules/' ], diff --git a/src/settings/settings.test.js b/src/govuk/settings/settings.test.js similarity index 82% rename from src/settings/settings.test.js rename to src/govuk/settings/settings.test.js index 1f1f53706a..761410dd70 100644 --- a/src/settings/settings.test.js +++ b/src/govuk/settings/settings.test.js @@ -4,8 +4,8 @@ const path = require('path') const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/settings/**/*.scss`) diff --git a/src/template.njk b/src/govuk/template.njk similarity index 100% rename from src/template.njk rename to src/govuk/template.njk diff --git a/src/template.test.js b/src/govuk/template.test.js similarity index 92% rename from src/template.test.js rename to src/govuk/template.test.js index e90d5201e1..59a0d29d7d 100644 --- a/src/template.test.js +++ b/src/govuk/template.test.js @@ -1,7 +1,7 @@ /* eslint-env jest */ const nunjucks = require('nunjucks') -const configPaths = require('../config/paths.json') +const configPaths = require('../../config/paths.json') describe('Template', () => { describe('with default nunjucks configuration', () => { diff --git a/src/tools/_all.scss b/src/govuk/tools/_all.scss similarity index 100% rename from src/tools/_all.scss rename to src/govuk/tools/_all.scss diff --git a/src/tools/_compatibility.scss b/src/govuk/tools/_compatibility.scss similarity index 100% rename from src/tools/_compatibility.scss rename to src/govuk/tools/_compatibility.scss diff --git a/src/tools/_exports.scss b/src/govuk/tools/_exports.scss similarity index 100% rename from src/tools/_exports.scss rename to src/govuk/tools/_exports.scss diff --git a/src/tools/_font-url.scss b/src/govuk/tools/_font-url.scss similarity index 100% rename from src/tools/_font-url.scss rename to src/govuk/tools/_font-url.scss diff --git a/src/tools/_ie8.scss b/src/govuk/tools/_ie8.scss similarity index 100% rename from src/tools/_ie8.scss rename to src/govuk/tools/_ie8.scss diff --git a/src/tools/_iff.scss b/src/govuk/tools/_iff.scss similarity index 100% rename from src/tools/_iff.scss rename to src/govuk/tools/_iff.scss diff --git a/src/tools/_image-url.scss b/src/govuk/tools/_image-url.scss similarity index 100% rename from src/tools/_image-url.scss rename to src/govuk/tools/_image-url.scss diff --git a/src/tools/_px-to-em.scss b/src/govuk/tools/_px-to-em.scss similarity index 100% rename from src/tools/_px-to-em.scss rename to src/govuk/tools/_px-to-em.scss diff --git a/src/tools/_px-to-rem.scss b/src/govuk/tools/_px-to-rem.scss similarity index 100% rename from src/tools/_px-to-rem.scss rename to src/govuk/tools/_px-to-rem.scss diff --git a/src/tools/compatibility.test.js b/src/govuk/tools/compatibility.test.js similarity index 95% rename from src/tools/compatibility.test.js rename to src/govuk/tools/compatibility.test.js index d3393e0ef9..d230051be3 100644 --- a/src/tools/compatibility.test.js +++ b/src/govuk/tools/compatibility.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/tools/exports.test.js b/src/govuk/tools/exports.test.js similarity index 94% rename from src/tools/exports.test.js rename to src/govuk/tools/exports.test.js index d62c88cf68..3192cc77ca 100644 --- a/src/tools/exports.test.js +++ b/src/govuk/tools/exports.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/tools/font-url.test.js b/src/govuk/tools/font-url.test.js similarity index 96% rename from src/tools/font-url.test.js rename to src/govuk/tools/font-url.test.js index acffe3ebc4..801048da1b 100644 --- a/src/tools/font-url.test.js +++ b/src/govuk/tools/font-url.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/tools/iff.test.js b/src/govuk/tools/iff.test.js similarity index 92% rename from src/tools/iff.test.js rename to src/govuk/tools/iff.test.js index 3b847fc835..7dc210fbd9 100644 --- a/src/tools/iff.test.js +++ b/src/govuk/tools/iff.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/tools/image-url.test.js b/src/govuk/tools/image-url.test.js similarity index 96% rename from src/tools/image-url.test.js rename to src/govuk/tools/image-url.test.js index 069ca6f5a1..3aceb2d01b 100644 --- a/src/tools/image-url.test.js +++ b/src/govuk/tools/image-url.test.js @@ -1,6 +1,6 @@ /* eslint-env jest */ -const { renderSass } = require('../../lib/jest-helpers') +const { renderSass } = require('../../../lib/jest-helpers') const sassConfig = { outputStyle: 'compressed' diff --git a/src/tools/tools.test.js b/src/govuk/tools/tools.test.js similarity index 81% rename from src/tools/tools.test.js rename to src/govuk/tools/tools.test.js index a6fc4cfdcd..babc79340f 100644 --- a/src/tools/tools.test.js +++ b/src/govuk/tools/tools.test.js @@ -4,8 +4,8 @@ const path = require('path') const glob = require('glob') -const { renderSass } = require('../../lib/jest-helpers') -const configPaths = require('../../config/paths.json') +const { renderSass } = require('../../../lib/jest-helpers') +const configPaths = require('../../../config/paths.json') const sassFiles = glob.sync(`${configPaths.src}/tools/**/*.scss`) diff --git a/src/utilities/_all.scss b/src/govuk/utilities/_all.scss similarity index 100% rename from src/utilities/_all.scss rename to src/govuk/utilities/_all.scss diff --git a/src/utilities/_clearfix.scss b/src/govuk/utilities/_clearfix.scss similarity index 100% rename from src/utilities/_clearfix.scss rename to src/govuk/utilities/_clearfix.scss diff --git a/src/utilities/_visually-hidden.scss b/src/govuk/utilities/_visually-hidden.scss similarity index 100% rename from src/utilities/_visually-hidden.scss rename to src/govuk/utilities/_visually-hidden.scss diff --git a/src/vendor/_sass-mq.scss b/src/govuk/vendor/_sass-mq.scss similarity index 100% rename from src/vendor/_sass-mq.scss rename to src/govuk/vendor/_sass-mq.scss diff --git a/src/vendor/polyfills/DOMTokenList.js b/src/govuk/vendor/polyfills/DOMTokenList.js similarity index 100% rename from src/vendor/polyfills/DOMTokenList.js rename to src/govuk/vendor/polyfills/DOMTokenList.js diff --git a/src/vendor/polyfills/Document.js b/src/govuk/vendor/polyfills/Document.js similarity index 100% rename from src/vendor/polyfills/Document.js rename to src/govuk/vendor/polyfills/Document.js diff --git a/src/vendor/polyfills/Element.js b/src/govuk/vendor/polyfills/Element.js similarity index 100% rename from src/vendor/polyfills/Element.js rename to src/govuk/vendor/polyfills/Element.js diff --git a/src/vendor/polyfills/Element/prototype/classList.js b/src/govuk/vendor/polyfills/Element/prototype/classList.js similarity index 100% rename from src/vendor/polyfills/Element/prototype/classList.js rename to src/govuk/vendor/polyfills/Element/prototype/classList.js diff --git a/src/vendor/polyfills/Element/prototype/closest.js b/src/govuk/vendor/polyfills/Element/prototype/closest.js similarity index 100% rename from src/vendor/polyfills/Element/prototype/closest.js rename to src/govuk/vendor/polyfills/Element/prototype/closest.js diff --git a/src/vendor/polyfills/Element/prototype/matches.js b/src/govuk/vendor/polyfills/Element/prototype/matches.js similarity index 100% rename from src/vendor/polyfills/Element/prototype/matches.js rename to src/govuk/vendor/polyfills/Element/prototype/matches.js diff --git a/src/vendor/polyfills/Element/prototype/nextElementSibling.js b/src/govuk/vendor/polyfills/Element/prototype/nextElementSibling.js similarity index 100% rename from src/vendor/polyfills/Element/prototype/nextElementSibling.js rename to src/govuk/vendor/polyfills/Element/prototype/nextElementSibling.js diff --git a/src/vendor/polyfills/Element/prototype/previousElementSibling.js b/src/govuk/vendor/polyfills/Element/prototype/previousElementSibling.js similarity index 100% rename from src/vendor/polyfills/Element/prototype/previousElementSibling.js rename to src/govuk/vendor/polyfills/Element/prototype/previousElementSibling.js diff --git a/src/vendor/polyfills/Event.js b/src/govuk/vendor/polyfills/Event.js similarity index 100% rename from src/vendor/polyfills/Event.js rename to src/govuk/vendor/polyfills/Event.js diff --git a/src/vendor/polyfills/Function/prototype/bind.js b/src/govuk/vendor/polyfills/Function/prototype/bind.js similarity index 100% rename from src/vendor/polyfills/Function/prototype/bind.js rename to src/govuk/vendor/polyfills/Function/prototype/bind.js diff --git a/src/vendor/polyfills/Object/defineProperty.js b/src/govuk/vendor/polyfills/Object/defineProperty.js similarity index 100% rename from src/vendor/polyfills/Object/defineProperty.js rename to src/govuk/vendor/polyfills/Object/defineProperty.js diff --git a/src/vendor/polyfills/Window.js b/src/govuk/vendor/polyfills/Window.js similarity index 100% rename from src/vendor/polyfills/Window.js rename to src/govuk/vendor/polyfills/Window.js diff --git a/tasks/gulp/__tests__/after-build-dist.test.js b/tasks/gulp/__tests__/after-build-dist.test.js index db6634273f..7a2f3b36fe 100644 --- a/tasks/gulp/__tests__/after-build-dist.test.js +++ b/tasks/gulp/__tests__/after-build-dist.test.js @@ -18,7 +18,7 @@ describe('dist/', () => { files => { return files // Remove /package prefix from filenames - .map(file => file.replace(/^src\/assets\//, '')) + .map(file => file.replace(/^src\/govuk\/assets\//, '')) // Sort to make comparison easier .sort() }, diff --git a/tasks/gulp/__tests__/after-build-package.test.js b/tasks/gulp/__tests__/after-build-package.test.js index 504f9a3660..fc03fc53f1 100644 --- a/tasks/gulp/__tests__/after-build-package.test.js +++ b/tasks/gulp/__tests__/after-build-package.test.js @@ -39,13 +39,15 @@ describe('package/', () => { '.DS_Store', '*.test.js', '*.yaml', - '*.snap' + '*.snap', + '*/govuk/README.md' ] const additionalFilesNotInSrc = [ 'package.json', 'govuk-prototype-kit.config.json', - '**/macro-options.json' + '**/macro-options.json', + 'README.md' ] return recursive(configPaths.src, filesToIgnore).then( @@ -92,7 +94,7 @@ describe('package/', () => { describe('all.scss', () => { it('should compile without throwing an exception', async () => { - const allScssFile = path.join(configPaths.package, 'all.scss') + const allScssFile = path.join(configPaths.package, 'govuk', 'all.scss') await renderSass({ file: allScssFile }) }) }) @@ -101,7 +103,7 @@ describe('package/', () => { const componentNames = lib.allComponents.slice() it.each(componentNames)(`'%s' should have macro-options.json that contains JSON`, (name) => { - const filePath = path.join(configPaths.package, 'components', name, 'macro-options.json') + const filePath = path.join(configPaths.package, 'govuk', 'components', name, 'macro-options.json') return readFile(filePath, 'utf8') .then((data) => { var parsedData = JSON.parse(data) diff --git a/tasks/gulp/compile-assets.js b/tasks/gulp/compile-assets.js index 80118e6453..2ce128686e 100644 --- a/tasks/gulp/compile-assets.js +++ b/tasks/gulp/compile-assets.js @@ -28,6 +28,16 @@ const postcsspseudoclasses = require('postcss-pseudo-classes')({ // check if destination flag is dist const isDist = taskArguments.destination === 'dist' || false +// Set the destination +const destinationPath = function () { + // Public & Dist directories do no need namespaced with `govuk` + if (taskArguments.destination === 'dist' || taskArguments.destination === 'public') { + return taskArguments.destination + } else { + return `${taskArguments.destination}/govuk/` + } +} + const errorHandler = function (error) { // Log the error to the console console.error(error.message) @@ -142,6 +152,7 @@ gulp.task('scss:compile', () => { gulp.task('js:compile', () => { // for dist/ folder we only want compiled 'all.js' file let srcFiles = isDist ? configPaths.src + 'all.js' : configPaths.src + '**/*.js' + return gulp.src([ srcFiles, '!' + configPaths.src + '**/*.test.js' @@ -164,5 +175,5 @@ gulp.task('js:compile', () => { }) )) .pipe(eol()) - .pipe(gulp.dest(taskArguments.destination + '/')) + .pipe(gulp.dest(destinationPath)) }) diff --git a/tasks/gulp/copy-to-destination.js b/tasks/gulp/copy-to-destination.js index 2db0db3329..ec05012eae 100644 --- a/tasks/gulp/copy-to-destination.js +++ b/tasks/gulp/copy-to-destination.js @@ -60,5 +60,5 @@ gulp.task('copy-files', () => { path.extname = '.json' })) .pipe(yamlFiles.restore) - .pipe(gulp.dest(taskArguments.destination + '/')) + .pipe(gulp.dest(taskArguments.destination + '/govuk/')) })