Namespace nunjucks and components (#1458)

Namespace nunjucks and components

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";

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";

app/views/macros/loadComponentTemplate.njk

@@ -1,3 +1,3 @@
 {% macro loadComponentTemplate(componentName, params) %}
-  {%- include "../../../src/components/" + componentName + "/template.njk" -%}
+  {%- include componentName + "/template.njk" -%}
 {% endmacro %}

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

package.json

@@ -102,7 +102,7 @@
     "ignore": [
       "/dist/**/*.js",
       "/package/**/*.js",
-      "/src/vendor/polyfills/**/*.js"
+      "/src/govuk/vendor/polyfills/**/*.js"
     ]
   },
   "jest": {

src/all.test.js → 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
 

src/components/accordion/accordion.test.js → 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

src/components/accordion/template.test.js → 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')
 

src/components/all.test.js → 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.

src/components/back-link/template.test.js → 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')
 

src/components/breadcrumbs/template.test.js → 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')
 

src/components/button/button.test.js → 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

src/components/button/template.test.js → 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')
 

src/components/character-count/character-count.test.js → 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}`
 

src/components/character-count/template.test.js → 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')
 

src/components/checkboxes/checkboxes.test.js → 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

src/components/checkboxes/template.test.js → 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')
 

src/components/date-input/template.test.js → 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')
 

src/components/details/details.test.js → 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

src/components/details/template.test.js → 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')
 

src/components/error-message/template.test.js → 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')
 

src/components/error-summary/error-summary.test.js → 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

src/components/error-summary/template.test.js → 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')
 

src/components/fieldset/template.test.js → 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')
 

src/components/file-upload/template.test.js → 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')
 

src/components/footer/template.test.js → 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')
 

src/components/header/header.test.js → 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

src/components/header/template.test.js → 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')
 

src/components/hint/template.test.js → 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')
 

src/components/input/template.test.js → 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')
 

src/components/inset-text/template.test.js → 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')
 

src/components/label/template.test.js → 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')
 

src/components/panel/template.test.js → 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')
 

src/components/phase-banner/template.test.js → 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')
 

src/components/radios/radios.test.js → 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

src/components/radios/template.test.js → 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')
 

src/components/select/template.test.js → 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')
 

src/components/skip-link/template.test.js → 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')