From 92b9ef8c69985c632e19a48e13cfb9d2bbded43b Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 10:40:53 +0100 Subject: [PATCH 1/9] Install GOV.UK Frontend 3.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 091e450db6..15b5ab9bbf 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "express-writer": "0.0.4", "fancy-log": "^1.3.3", "govuk-elements-sass": "^3.1.3", - "govuk-frontend": "^2.12.0", + "govuk-frontend": "github:alphagov/govuk-frontend#f8599ba8", "govuk_frontend_toolkit": "^7.5.0", "govuk_template_jinja": "^0.24.1", "gulp": "^4.0.0", From f3b93630bcf81d9049ba2ab1176c71bf7edd486f Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 10:46:03 +0100 Subject: [PATCH 2/9] Update GOV.UK Frontend sass file path add subdir --- app/assets/sass/unbranded.scss | 6 +++--- docs/assets/sass/docs.scss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/sass/unbranded.scss b/app/assets/sass/unbranded.scss index d5c4c6103c..d32172817f 100644 --- a/app/assets/sass/unbranded.scss +++ b/app/assets/sass/unbranded.scss @@ -8,8 +8,8 @@ // // If you need to enable compatibility mode or the legacy palette, do that // *before* these imports. -@import "node_modules/govuk-frontend/settings/colours-palette"; -@import "node_modules/govuk-frontend/settings/colours-applied"; +@import "node_modules/govuk-frontend/govuk/settings/colours-palette"; +@import "node_modules/govuk-frontend/govuk/settings/colours-applied"; // Style links and paragraphs by default $govuk-global-styles: true; @@ -21,4 +21,4 @@ $govuk-font-family: "HelveticaNeue", "Helvetica Neue", "Arial", "Helvetica", san // the GOV.UK footer. $govuk-canvas-background-colour: $govuk-body-background-colour; -@import "node_modules/govuk-frontend/all"; +@import "node_modules/govuk-frontend/govuk/all"; diff --git a/docs/assets/sass/docs.scss b/docs/assets/sass/docs.scss index 138d7f9ab0..2d398ad8d1 100644 --- a/docs/assets/sass/docs.scss +++ b/docs/assets/sass/docs.scss @@ -1,4 +1,4 @@ -@import "node_modules/govuk-frontend/all"; +@import "node_modules/govuk-frontend/govuk/all"; img{ max-width: 100%; From d296013e8c8602e6535cba9e4873a2fcd06115ec Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 10:48:37 +0100 Subject: [PATCH 3/9] Update GOV.UK Frontend JS file paths for subdir --- __tests__/spec/sanity-checks.js | 8 ++++---- docs/views/includes/scripts.html | 2 +- lib/extensions/extensions.test.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/__tests__/spec/sanity-checks.js b/__tests__/spec/sanity-checks.js index 8e21222427..2eeeeefbbf 100644 --- a/__tests__/spec/sanity-checks.js +++ b/__tests__/spec/sanity-checks.js @@ -55,14 +55,14 @@ describe('The Prototype Kit', () => { describe('extensions', () => { it('should allow known assets to be loaded from node_modules', (done) => { request(app) - .get('/extension-assets/govuk-frontend/all.js') + .get('/extension-assets/govuk-frontend/govuk/all.js') .expect('Content-Type', /application\/javascript; charset=UTF-8/) .expect(200) .end(function (err, res) { if (err) { done(err) } else { - assert.strictEqual('' + res.text, readFile('node_modules/govuk-frontend/all.js')) + assert.strictEqual('' + res.text, readFile('node_modules/govuk-frontend/govuk/all.js')) done() } }) @@ -99,14 +99,14 @@ describe('The Prototype Kit', () => { describe('misconfigured prototype kit - while upgrading kit developer did not copy over changes in /app folder', () => { it('should still allow known assets to be loaded from node_modules', (done) => { request(app) - .get('/node_modules/govuk-frontend/all.js') + .get('/node_modules/govuk-frontend/govuk/all.js') .expect('Content-Type', /application\/javascript; charset=UTF-8/) .expect(200) .end(function (err, res) { if (err) { done(err) } else { - assert.strictEqual('' + res.text, readFile('node_modules/govuk-frontend/all.js')) + assert.strictEqual('' + res.text, readFile('node_modules/govuk-frontend/govuk/all.js')) done() } }) diff --git a/docs/views/includes/scripts.html b/docs/views/includes/scripts.html index 65f5c79369..7edfa3afd7 100644 --- a/docs/views/includes/scripts.html +++ b/docs/views/includes/scripts.html @@ -1,6 +1,6 @@ - + {% if useAutoStoreData %} diff --git a/lib/extensions/extensions.test.js b/lib/extensions/extensions.test.js index 7a443dc233..726bb4ee07 100644 --- a/lib/extensions/extensions.test.js +++ b/lib/extensions/extensions.test.js @@ -105,7 +105,7 @@ describe('extensions', () => { }) it('should lookup scripts paths as file system paths', () => { expect(extensions.getFileSystemPaths('scripts')).toEqual(joinPaths([ - 'node_modules/govuk-frontend/all.js' + 'node_modules/govuk-frontend/govuk/all.js' ])) }) it('should not break when asking for an extension key which isn\'t used', function () { @@ -343,7 +343,7 @@ describe('extensions', () => { it('should return a list of public urls for the scripts', () => { expect(extensions.getAppConfig().scripts).toEqual([ - '/extension-assets/govuk-frontend/all.js' + '/extension-assets/govuk-frontend/govuk/all.js' ]) }) @@ -354,7 +354,7 @@ describe('extensions', () => { it('should include installed extensions', () => { mockExtensionConfig('my-extension', { scripts: ['/abc/def/ghi.js'] }) expect(extensions.getAppConfig().scripts).toEqual([ - '/extension-assets/govuk-frontend/all.js', + '/extension-assets/govuk-frontend/govuk/all.js', '/extension-assets/my-extension/abc/def/ghi.js' ]) }) From a4af88a1192484a6fb31bd414c53a5f5cfbca36f Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 10:52:56 +0100 Subject: [PATCH 4/9] Add govuk- prefix for GOV.UK Frontend data-modules --- docs/documentation/using-notify.md | 2 +- docs/views/examples/branching/index.html | 2 +- docs/views/examples/pass-data/vehicle-features.html | 2 +- docs/views/examples/pass-data/vehicle-registration.html | 2 +- docs/views/examples/pass-data/vehicle-type.html | 2 +- docs/views/templates/check-your-answers.html | 2 +- docs/views/templates/question.html | 2 +- docs/views/templates/start-with-step-by-step.html | 2 +- docs/views/templates/start.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/documentation/using-notify.md b/docs/documentation/using-notify.md index 07021e0489..7b91bc5e05 100644 --- a/docs/documentation/using-notify.md +++ b/docs/documentation/using-notify.md @@ -90,7 +90,7 @@ example: - + diff --git a/docs/views/examples/branching/index.html b/docs/views/examples/branching/index.html index 04547dd144..5f8d3c5935 100644 --- a/docs/views/examples/branching/index.html +++ b/docs/views/examples/branching/index.html @@ -54,7 +54,7 @@

- + diff --git a/docs/views/examples/pass-data/vehicle-features.html b/docs/views/examples/pass-data/vehicle-features.html index 4329ec0052..75bc85c57e 100644 --- a/docs/views/examples/pass-data/vehicle-features.html +++ b/docs/views/examples/pass-data/vehicle-features.html @@ -48,7 +48,7 @@

- + diff --git a/docs/views/examples/pass-data/vehicle-registration.html b/docs/views/examples/pass-data/vehicle-registration.html index a290553599..3f981b0a37 100644 --- a/docs/views/examples/pass-data/vehicle-registration.html +++ b/docs/views/examples/pass-data/vehicle-registration.html @@ -24,7 +24,7 @@

- + diff --git a/docs/views/examples/pass-data/vehicle-type.html b/docs/views/examples/pass-data/vehicle-type.html index a30f2cefc5..4923d1cfd1 100644 --- a/docs/views/examples/pass-data/vehicle-type.html +++ b/docs/views/examples/pass-data/vehicle-type.html @@ -45,7 +45,7 @@

- + diff --git a/docs/views/templates/check-your-answers.html b/docs/views/templates/check-your-answers.html index 08899ef5ec..d8886f9435 100644 --- a/docs/views/templates/check-your-answers.html +++ b/docs/views/templates/check-your-answers.html @@ -149,7 +149,7 @@

Now send your application

- diff --git a/docs/views/templates/question.html b/docs/views/templates/question.html index 430d848b08..8676d22f3e 100644 --- a/docs/views/templates/question.html +++ b/docs/views/templates/question.html @@ -21,7 +21,7 @@

Heading or question goes here

[See the GOV.UK Design System for examples]

- + diff --git a/docs/views/templates/start-with-step-by-step.html b/docs/views/templates/start-with-step-by-step.html index d19dce6ab8..ba342ba1e9 100644 --- a/docs/views/templates/start-with-step-by-step.html +++ b/docs/views/templates/start-with-step-by-step.html @@ -30,7 +30,7 @@

  • do something else
    • - Start now + Start now diff --git a/docs/views/templates/start.html b/docs/views/templates/start.html index fa30e99bef..8efa2ccb3b 100644 --- a/docs/views/templates/start.html +++ b/docs/views/templates/start.html @@ -43,7 +43,7 @@

    Registering takes around 5 minutes.

    - Start now + Start now

    Before you start

    From de6d132e791124c2ebc6474a78b33698f9112e84 Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 10:56:09 +0100 Subject: [PATCH 5/9] Update GOV.UK Frontend Nunjucks file paths subdir --- app/views/layout.html | 52 +++++++++++++-------------- app/views/layout_unbranded.html | 2 +- docs/documentation/tips-and-tricks.md | 6 ++-- docs/views/layout.html | 46 ++++++++++++------------ docs/views/layout_unbranded.html | 2 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/app/views/layout.html b/app/views/layout.html index e93b0df763..7aea637df0 100644 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -1,30 +1,30 @@ -{% extends "template.njk" %} +{% extends "govuk/template.njk" %} -{% from "accordion/macro.njk" import govukAccordion %} -{% from "back-link/macro.njk" import govukBackLink %} -{% from "breadcrumbs/macro.njk" import govukBreadcrumbs %} -{% from "button/macro.njk" import govukButton %} -{% from "character-count/macro.njk" import govukCharacterCount %} -{% from "checkboxes/macro.njk" import govukCheckboxes %} -{% from "date-input/macro.njk" import govukDateInput %} -{% from "details/macro.njk" import govukDetails %} -{% from "error-message/macro.njk" import govukErrorMessage %} -{% from "error-summary/macro.njk" import govukErrorSummary %} -{% from "fieldset/macro.njk" import govukFieldset %} -{% from "file-upload/macro.njk" import govukFileUpload %} -{% from "input/macro.njk" import govukInput %} -{% from "inset-text/macro.njk" import govukInsetText %} -{% from "panel/macro.njk" import govukPanel %} -{% from "phase-banner/macro.njk" import govukPhaseBanner %} -{% from "radios/macro.njk" import govukRadios %} -{% from "select/macro.njk" import govukSelect %} -{% from "skip-link/macro.njk" import govukSkipLink %} -{% from "summary-list/macro.njk" import govukSummaryList %} -{% from "table/macro.njk" import govukTable %} -{% from "tabs/macro.njk" import govukTabs %} -{% from "tag/macro.njk" import govukTag %} -{% from "textarea/macro.njk" import govukTextarea %} -{% from "warning-text/macro.njk" import govukWarningText %} +{% from "govuk/components/accordion/macro.njk" import govukAccordion %} +{% from "govuk/components/back-link/macro.njk" import govukBackLink %} +{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %} +{% from "govuk/components/button/macro.njk" import govukButton %} +{% from "govuk/components/character-count/macro.njk" import govukCharacterCount %} +{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %} +{% from "govuk/components/date-input/macro.njk" import govukDateInput %} +{% from "govuk/components/details/macro.njk" import govukDetails %} +{% from "govuk/components/error-message/macro.njk" import govukErrorMessage %} +{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %} +{% from "govuk/components/fieldset/macro.njk" import govukFieldset %} +{% from "govuk/components/file-upload/macro.njk" import govukFileUpload %} +{% from "govuk/components/input/macro.njk" import govukInput %} +{% from "govuk/components/inset-text/macro.njk" import govukInsetText %} +{% from "govuk/components/panel/macro.njk" import govukPanel %} +{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %} +{% from "govuk/components/radios/macro.njk" import govukRadios %} +{% from "govuk/components/select/macro.njk" import govukSelect %} +{% from "govuk/components/skip-link/macro.njk" import govukSkipLink %} +{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %} +{% from "govuk/components/table/macro.njk" import govukTable %} +{% from "govuk/components/tabs/macro.njk" import govukTabs %} +{% from "govuk/components/tag/macro.njk" import govukTag %} +{% from "govuk/components/textarea/macro.njk" import govukTextarea %} +{% from "govuk/components/warning-text/macro.njk" import govukWarningText %} {% block head %} {% include "includes/head.html" %} diff --git a/app/views/layout_unbranded.html b/app/views/layout_unbranded.html index 77387dc65f..f7dc85bcf7 100644 --- a/app/views/layout_unbranded.html +++ b/app/views/layout_unbranded.html @@ -1,4 +1,4 @@ -{% extends "template.njk" %} +{% extends "govuk/template.njk" %} {% block headIcons %} diff --git a/docs/documentation/tips-and-tricks.md b/docs/documentation/tips-and-tricks.md index 262713ae89..b7bfe83938 100644 --- a/docs/documentation/tips-and-tricks.md +++ b/docs/documentation/tips-and-tricks.md @@ -17,7 +17,7 @@ You can change the service name by editing the file '/app/config.js'. Import the header component macro place it in the `{% block header %}`and provide `navigation` items as shown below. - {% from 'header/macro.njk' import govukHeader %} + {% from 'govuk/components/header/macro.njk' import govukHeader %} {% block header %} {{ govukHeader({ @@ -47,7 +47,7 @@ Import the phase-banner component and supply tag and feedback text. The phase ba ### How to include an Alpha banner - {% from 'phase-banner/macro.njk' import govukPhaseBanner %} + {% from 'govuk/components/phase-banner/macro.njk' import govukPhaseBanner %} {{ govukPhaseBanner({ tag: { @@ -58,7 +58,7 @@ Import the phase-banner component and supply tag and feedback text. The phase ba ### How to include a Beta banner - {% from 'phase-banner/macro.njk' import govukPhaseBanner %} + {% from 'govuk/components/phase-banner/macro.njk' import govukPhaseBanner %} {{ govukPhaseBanner({ tag: { diff --git a/docs/views/layout.html b/docs/views/layout.html index bd59d0656b..fa4c4b8b7f 100644 --- a/docs/views/layout.html +++ b/docs/views/layout.html @@ -1,27 +1,27 @@ -{% extends "template.njk" %} +{% extends "govuk/template.njk" %} -{% from "back-link/macro.njk" import govukBackLink %} -{% from "breadcrumbs/macro.njk" import govukBreadcrumbs %} -{% from "button/macro.njk" import govukButton %} -{% from "checkboxes/macro.njk" import govukCheckboxes %} -{% from "date-input/macro.njk" import govukDateInput %} -{% from "details/macro.njk" import govukDetails %} -{% from "error-message/macro.njk" import govukErrorMessage %} -{% from "error-summary/macro.njk" import govukErrorSummary %} -{% from "fieldset/macro.njk" import govukFieldset %} -{% from "file-upload/macro.njk" import govukFileUpload %} -{% from "input/macro.njk" import govukInput %} -{% from "inset-text/macro.njk" import govukInsetText %} -{% from "panel/macro.njk" import govukPanel %} -{% from "phase-banner/macro.njk" import govukPhaseBanner %} -{% from "radios/macro.njk" import govukRadios %} -{% from "select/macro.njk" import govukSelect %} -{% from "skip-link/macro.njk" import govukSkipLink %} -{% from "table/macro.njk" import govukTable %} -{% from "tabs/macro.njk" import govukTabs %} -{% from "tag/macro.njk" import govukTag %} -{% from "textarea/macro.njk" import govukTextarea %} -{% from "warning-text/macro.njk" import govukWarningText %} +{% from "govuk/components/back-link/macro.njk" import govukBackLink %} +{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %} +{% from "govuk/components/button/macro.njk" import govukButton %} +{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %} +{% from "govuk/components/date-input/macro.njk" import govukDateInput %} +{% from "govuk/components/details/macro.njk" import govukDetails %} +{% from "govuk/components/error-message/macro.njk" import govukErrorMessage %} +{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %} +{% from "govuk/components/fieldset/macro.njk" import govukFieldset %} +{% from "govuk/components/file-upload/macro.njk" import govukFileUpload %} +{% from "govuk/components/input/macro.njk" import govukInput %} +{% from "govuk/components/inset-text/macro.njk" import govukInsetText %} +{% from "govuk/components/panel/macro.njk" import govukPanel %} +{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %} +{% from "govuk/components/radios/macro.njk" import govukRadios %} +{% from "govuk/components/select/macro.njk" import govukSelect %} +{% from "govuk/components/skip-link/macro.njk" import govukSkipLink %} +{% from "govuk/components/table/macro.njk" import govukTable %} +{% from "govuk/components/tabs/macro.njk" import govukTabs %} +{% from "govuk/components/tag/macro.njk" import govukTag %} +{% from "govuk/components/textarea/macro.njk" import govukTextarea %} +{% from "govuk/components/warning-text/macro.njk" import govukWarningText %} {% block head %} {% include "includes/head.html" %} diff --git a/docs/views/layout_unbranded.html b/docs/views/layout_unbranded.html index 77387dc65f..f7dc85bcf7 100644 --- a/docs/views/layout_unbranded.html +++ b/docs/views/layout_unbranded.html @@ -1,4 +1,4 @@ -{% extends "template.njk" %} +{% extends "govuk/template.njk" %} {% block headIcons %} From 4644b0828916e05b1ee0fda289d0705b7e022b88 Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 11:01:47 +0100 Subject: [PATCH 6/9] Update GOV.UK Frontend assets file path for subdir --- __tests__/spec/sanity-checks.js | 6 +++--- app/assets/sass/application.scss | 3 +++ app/views/layout.html | 3 +++ app/views/layout_unbranded.html | 3 +++ docs/assets/sass/docs.scss | 3 +++ docs/views/layout.html | 3 +++ docs/views/layout_unbranded.html | 3 +++ lib/extensions/extensions.js | 4 ++-- 8 files changed, 23 insertions(+), 5 deletions(-) diff --git a/__tests__/spec/sanity-checks.js b/__tests__/spec/sanity-checks.js index 2eeeeefbbf..f7a50684c6 100644 --- a/__tests__/spec/sanity-checks.js +++ b/__tests__/spec/sanity-checks.js @@ -70,14 +70,14 @@ describe('The Prototype Kit', () => { it('should allow known assets to be loaded from node_modules', (done) => { request(app) - .get('/assets/images/favicon.ico') + .get('/govuk/assets/images/favicon.ico') .expect('Content-Type', /image\/x-icon/) .expect(200) .end(function (err, res) { if (err) { done(err) } else { - assert.strictEqual('' + res.body, readFile('node_modules/govuk-frontend/assets/images/favicon.ico')) + assert.strictEqual('' + res.body, readFile('node_modules/govuk-frontend/govuk/assets/images/favicon.ico')) done() } }) @@ -85,7 +85,7 @@ describe('The Prototype Kit', () => { it('should not expose everything', function (done) { request(app) - .get('/assets/common.js') + .get('/common.js') .expect(404) .end(function (err, res) { if (err) { diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss index 242336389c..2ba443477a 100644 --- a/app/assets/sass/application.scss +++ b/app/assets/sass/application.scss @@ -1,6 +1,9 @@ // global styles for and

    tags $govuk-global-styles: true; +// We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. +$govuk-assets-path: '/govuk/assets/'; + // Import GOV.UK Frontend and any extension styles if extensions have been configured @import "lib/extensions/extensions"; diff --git a/app/views/layout.html b/app/views/layout.html index 7aea637df0..cf54899eea 100644 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -1,3 +1,6 @@ +{#- We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. -#} +{%- set assetPath = '/govuk/assets' -%} + {% extends "govuk/template.njk" %} {% from "govuk/components/accordion/macro.njk" import govukAccordion %} diff --git a/app/views/layout_unbranded.html b/app/views/layout_unbranded.html index f7dc85bcf7..489b4cb546 100644 --- a/app/views/layout_unbranded.html +++ b/app/views/layout_unbranded.html @@ -1,3 +1,6 @@ +{#- We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. -#} +{%- set assetPath = '/govuk/assets' -%} + {% extends "govuk/template.njk" %} {% block headIcons %} diff --git a/docs/assets/sass/docs.scss b/docs/assets/sass/docs.scss index 2d398ad8d1..ce12f22d3d 100644 --- a/docs/assets/sass/docs.scss +++ b/docs/assets/sass/docs.scss @@ -1,3 +1,6 @@ +// We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. +$govuk-assets-path: '/govuk/assets/'; + @import "node_modules/govuk-frontend/govuk/all"; img{ diff --git a/docs/views/layout.html b/docs/views/layout.html index fa4c4b8b7f..489c67d568 100644 --- a/docs/views/layout.html +++ b/docs/views/layout.html @@ -1,3 +1,6 @@ +{#- We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. -#} +{%- set assetPath = '/govuk/assets' -%} + {% extends "govuk/template.njk" %} {% from "govuk/components/back-link/macro.njk" import govukBackLink %} diff --git a/docs/views/layout_unbranded.html b/docs/views/layout_unbranded.html index f7dc85bcf7..489b4cb546 100644 --- a/docs/views/layout_unbranded.html +++ b/docs/views/layout_unbranded.html @@ -1,3 +1,6 @@ +{#- We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework. -#} +{%- set assetPath = '/govuk/assets' -%} + {% extends "govuk/template.njk" %} {% block headIcons %} diff --git a/lib/extensions/extensions.js b/lib/extensions/extensions.js index 0d18746945..517601db42 100644 --- a/lib/extensions/extensions.js +++ b/lib/extensions/extensions.js @@ -132,8 +132,8 @@ setExtensionsByType() // The hard-coded reference to govuk-frontend allows us to soft launch without a breaking change. After a hard launch // govuk-frontend assets will be served on /extension-assets/govuk-frontend const getPublicUrl = config => { - if (config.item === '/assets' && config.packageName === 'govuk-frontend') { - return '/assets' + if (config.item.endsWith('assets') && config.packageName === 'govuk-frontend') { + return '/govuk/assets' } else { return ['', 'extension-assets', config.packageName] .concat(config.item.split('/').filter(filterOutParentAndEmpty)) From 7a027ecc0c97530823c0fb59036fc8230a8ebb08 Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 13:49:27 +0100 Subject: [PATCH 7/9] Update GOV.UK Frontend removed colours Include legacy colours if a user turns on the legacy palette --- app/assets/sass/patterns/_step-by-step-navigation.scss | 8 ++++---- docs/assets/sass/docs.scss | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/sass/patterns/_step-by-step-navigation.scss b/app/assets/sass/patterns/_step-by-step-navigation.scss index e167ee82d3..564fc7798c 100644 --- a/app/assets/sass/patterns/_step-by-step-navigation.scss +++ b/app/assets/sass/patterns/_step-by-step-navigation.scss @@ -5,7 +5,7 @@ .app-step-nav-header { position: relative; padding: 10px; - background: govuk-colour("grey-4"); + background: govuk-colour("light-grey", $legacy: "grey-4"); border-top: solid 1px $govuk-border-colour; border-bottom: solid 1px $govuk-border-colour; @include govuk-media-query($from: tablet) { @@ -297,7 +297,7 @@ .app-step-nav__header { padding: 15px 0; - border-top: solid 2px govuk-colour("grey-3"); + border-top: solid 2px govuk-colour("light-grey", $legacy: "grey-3"); } .app-step-nav--active .app-step-nav__header { @@ -491,7 +491,7 @@ .app-step-nav__help { position: relative; padding: 15px 0; - border-top: solid 2px govuk-colour("grey-3"); + border-top: solid 2px govuk-colour("light-grey", $legacy: "grey-3"); } .app-step-nav__help:after { @@ -532,7 +532,7 @@ .app-step-nav__substep { position: relative; padding-top: 15px; - border-top: solid 2px govuk-colour("grey-3"); + border-top: solid 2px govuk-colour("light-grey", $legacy: "grey-3"); } .app-step-nav__substep:after { diff --git a/docs/assets/sass/docs.scss b/docs/assets/sass/docs.scss index ce12f22d3d..2a18fd35f6 100644 --- a/docs/assets/sass/docs.scss +++ b/docs/assets/sass/docs.scss @@ -36,7 +36,7 @@ img{ padding: govuk-spacing(3); overflow: auto; border: 1px solid $govuk-border-colour; - background-color: govuk-colour("grey-4"); + background-color: govuk-colour("light-grey", $legacy: "grey-4"); max-width: 38em; @include govuk-responsive-margin(5, "bottom"); } @@ -97,7 +97,7 @@ img{ p code { border: 1px solid $govuk-border-colour; - background-color: govuk-colour("grey-4"); + background-color: govuk-colour("light-grey", $legacy: "grey-4"); padding: 0 govuk-spacing(2); } From 909d962bbde8348435a15fecb998eadc18e32ccd Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 11:45:50 +0100 Subject: [PATCH 8/9] Update extensions tests --- __tests__/spec/sanity-checks.js | 2 +- lib/extensions/extensions.test.js | 34 ++++++++++++++----------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/__tests__/spec/sanity-checks.js b/__tests__/spec/sanity-checks.js index f7a50684c6..edc3083543 100644 --- a/__tests__/spec/sanity-checks.js +++ b/__tests__/spec/sanity-checks.js @@ -85,7 +85,7 @@ describe('The Prototype Kit', () => { it('should not expose everything', function (done) { request(app) - .get('/common.js') + .get('/govuk/assets/common.js') .expect(404) .end(function (err, res) { if (err) { diff --git a/lib/extensions/extensions.test.js b/lib/extensions/extensions.test.js index 726bb4ee07..6caf5b28f8 100644 --- a/lib/extensions/extensions.test.js +++ b/lib/extensions/extensions.test.js @@ -24,7 +24,7 @@ describe('extensions', () => { fileSystem: {} } addFileToMockFileSystem(['package.json'], fs.readFileSync('package.json', 'utf8')) - addFileToMockFileSystem(['node_modules', 'govuk-frontend', 'govuk-prototype-kit.config.json'], '{"nunjucksPaths": ["/","/components"],"scripts": ["/all.js"],"assets": ["/assets"],"sass": ["/all.scss"]}') + addFileToMockFileSystem(['node_modules', 'govuk-frontend', 'govuk-prototype-kit.config.json'], '{"nunjucksPaths": ["/"],"scripts": ["/govuk/all.js"],"assets": ["/govuk/assets"],"sass": ["/govuk/all.scss"]}') setupFakeFilesystem() extensions.setExtensionsByType() }) @@ -36,7 +36,7 @@ describe('extensions', () => { describe('Lookup file system paths', () => { it('should lookup asset paths as file system paths', () => { expect(extensions.getFileSystemPaths('assets')).toEqual(joinPaths([ - ['node_modules', 'govuk-frontend', 'assets'] + ['node_modules', 'govuk-frontend', 'govuk', 'assets'] ])) }) it('should not allow traversing the file system', () => { @@ -54,7 +54,7 @@ describe('extensions', () => { assets: ['/ghi', '/jkl'] }) expect(extensions.getFileSystemPaths('assets')).toEqual(joinPaths([ - ['node_modules', 'govuk-frontend', 'assets'], + ['node_modules', 'govuk-frontend', 'govuk', 'assets'], ['node_modules', 'another-frontend', 'abc'], ['node_modules', 'another-frontend', 'def'], ['node_modules', 'hmrc-frontend', 'ghi'], @@ -72,7 +72,7 @@ describe('extensions', () => { expect(extensions.getFileSystemPaths('assets')).toEqual(joinPaths([ ['node_modules', 'another-frontend', 'abc'], ['node_modules', 'another-frontend', 'def'], - ['node_modules', 'govuk-frontend', 'assets'], + ['node_modules', 'govuk-frontend', 'govuk', 'assets'], ['node_modules', 'hmrc-frontend', 'ghi'], ['node_modules', 'hmrc-frontend', 'jkl'] ])) @@ -88,7 +88,7 @@ describe('extensions', () => { expect(extensions.getFileSystemPaths('assets')).toEqual(joinPaths([ ['node_modules', 'hmrc-frontend', 'ghi'], ['node_modules', 'hmrc-frontend', 'jkl'], - ['node_modules', 'govuk-frontend', 'assets'], + ['node_modules', 'govuk-frontend', 'govuk', 'assets'], ['node_modules', 'another-frontend', 'abc'], ['node_modules', 'another-frontend', 'def'] ])) @@ -98,7 +98,7 @@ describe('extensions', () => { assets: ['/abc', '/def'] }) expect(extensions.getFileSystemPaths('assets')).toEqual(joinPaths([ - ['node_modules', 'govuk-frontend', 'assets'], + ['node_modules', 'govuk-frontend', 'govuk', 'assets'], ['node_modules', 'hmrc-frontend', 'abc'], ['node_modules', 'hmrc-frontend', 'def'] ])) @@ -123,7 +123,7 @@ describe('extensions', () => { assets: ['/ghi', '/jkl'] }) expect(extensions.getPublicUrls('assets')).toEqual([ - '/assets', + '/govuk/assets', '/extension-assets/another-frontend/abc', '/extension-assets/another-frontend/def', '/extension-assets/hmrc-frontend/ghi', @@ -141,7 +141,7 @@ describe('extensions', () => { expect(extensions.getPublicUrls('assets')).toEqual([ '/extension-assets/another-frontend/abc', '/extension-assets/another-frontend/def', - '/assets', + '/govuk/assets', '/extension-assets/hmrc-frontend/ghi', '/extension-assets/hmrc-frontend/jkl' ]) @@ -157,7 +157,7 @@ describe('extensions', () => { expect(extensions.getPublicUrls('assets')).toEqual([ '/extension-assets/hmrc-frontend/ghi', '/extension-assets/hmrc-frontend/jkl', - '/assets', + '/govuk/assets', '/extension-assets/another-frontend/abc', '/extension-assets/another-frontend/def' ]) @@ -181,8 +181,8 @@ describe('extensions', () => { }) expect(extensions.getPublicUrlAndFileSystemPaths('assets')).toEqual([ { - publicUrl: '/assets', - fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'assets') + publicUrl: '/govuk/assets', + fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'govuk', 'assets') }, { publicUrl: '/extension-assets/another-frontend/abc', @@ -220,8 +220,8 @@ describe('extensions', () => { fileSystemPath: path.join(rootPath, 'node_modules', 'another-frontend', 'def') }, { - publicUrl: '/assets', - fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'assets') + publicUrl: '/govuk/assets', + fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'govuk', 'assets') }, { publicUrl: '/extension-assets/hmrc-frontend/ghi', @@ -251,8 +251,8 @@ describe('extensions', () => { fileSystemPath: path.join(rootPath, 'node_modules', 'hmrc-frontend', 'jkl') }, { - publicUrl: '/assets', - fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'assets') + publicUrl: '/govuk/assets', + fileSystemPath: path.join(rootPath, 'node_modules', 'govuk-frontend', 'govuk', 'assets') }, { publicUrl: '/extension-assets/another-frontend/abc', @@ -282,7 +282,6 @@ describe('extensions', () => { it('should output govuk-frontend nunjucks paths as an array', () => { expect(extensions.getAppViews()).toEqual(joinPaths([ - 'node_modules/govuk-frontend/components', 'node_modules/govuk-frontend' ])) }) @@ -298,7 +297,6 @@ describe('extensions', () => { expect(extensions.getAppViews()).toEqual(joinPaths([ 'node_modules/hmcts-frontend/my-layouts', 'node_modules/hmcts-frontend/my-components', - 'node_modules/govuk-frontend/components', 'node_modules/govuk-frontend' ])) }) @@ -314,7 +312,6 @@ describe('extensions', () => { '/app/views', '/lib' ]))).toEqual(joinPaths([ - 'node_modules/govuk-frontend/components', 'node_modules/govuk-frontend', '/app/views', '/lib' @@ -325,7 +322,6 @@ describe('extensions', () => { expect(extensions.getAppViews([ '/my-new-views-directory' ])).toEqual([ - path.join(rootPath, 'node_modules/govuk-frontend/components'), path.join(rootPath, 'node_modules/govuk-frontend'), '/my-new-views-directory' ]) From 92726f1870111ecf1768749e0dc4021a23f1e8e7 Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Fri, 19 Jul 2019 12:04:40 +0100 Subject: [PATCH 9/9] Update GOV.UK Frontend start now buttons Icon is now an inline SVG --- docs/views/templates/start-with-step-by-step.html | 7 ++++++- docs/views/templates/start.html | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/views/templates/start-with-step-by-step.html b/docs/views/templates/start-with-step-by-step.html index ba342ba1e9..d35f5dac50 100644 --- a/docs/views/templates/start-with-step-by-step.html +++ b/docs/views/templates/start-with-step-by-step.html @@ -30,7 +30,12 @@

  • do something else
    • -     Start now + + Start now + + + + diff --git a/docs/views/templates/start.html b/docs/views/templates/start.html index 8efa2ccb3b..d8c502bcef 100644 --- a/docs/views/templates/start.html +++ b/docs/views/templates/start.html @@ -43,7 +43,12 @@

    Registering takes around 5 minutes.

    - Start now + + Start now + + + +

    Before you start