-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2851 from alphagov/ncarey-prototype-kit-v13
Supporting v13 of the Prototype Kit
- Loading branch information
Showing
9 changed files
with
415 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { join, relative } from 'path' | ||
| import slash from 'slash' | ||
|
|
||
| import { filterPath, getDirectories, getListing } from '../../lib/file-helper.js' | ||
| import { componentNameToMacroName } from '../../lib/helper-functions.js' | ||
| import configPaths from '../../config/paths.js' | ||
|
|
||
| /** | ||
| * GOV.UK Prototype Kit config builder | ||
| */ | ||
| export default async () => { | ||
| const componentsFiles = await getListing(configPaths.components) | ||
| const componentNames = await getDirectories(configPaths.components) | ||
|
|
||
| // Build array of macros | ||
| const nunjucksMacros = componentNames | ||
| .map((componentName) => { | ||
| const [macroPath] = componentsFiles | ||
| .filter(filterPath([`${componentName}/macro.njk`])) | ||
|
|
||
| // Relative path to src without 'govuk' | ||
| const rootPath = join(configPaths.src, '../') | ||
|
|
||
| return { | ||
| importFrom: slash(relative(rootPath, join(configPaths.components, macroPath))), | ||
| macroName: componentNameToMacroName(componentName) | ||
| } | ||
| }) | ||
|
|
||
| return { | ||
| assets: [ | ||
| '/govuk/assets' | ||
| ], | ||
| sass: [ | ||
| '/govuk-prototype-kit/init.scss' | ||
| ], | ||
| scripts: [ | ||
| '/govuk/all.js', | ||
| '/govuk-prototype-kit/init.js' | ||
| ], | ||
| nunjucksMacros, | ||
| nunjucksPaths: ['/'] | ||
| } | ||
| } |
163 changes: 163 additions & 0 deletions
163
src/govuk-prototype-kit/govuk-prototype-kit.config.unit.test.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| import configFn from './govuk-prototype-kit.config.mjs' | ||
|
|
||
| describe('GOV.UK Prototype Kit config', () => { | ||
| let config | ||
|
|
||
| beforeAll(async () => { | ||
| config = await configFn() | ||
| }) | ||
|
|
||
| it('includes paths for assets, scripts, sass', () => { | ||
| expect(config.assets).toEqual([ | ||
| '/govuk/assets' | ||
| ]) | ||
|
|
||
| expect(config.sass).toEqual([ | ||
| '/govuk-prototype-kit/init.scss' | ||
| ]) | ||
|
|
||
| expect(config.scripts).toEqual([ | ||
| '/govuk/all.js', | ||
| '/govuk-prototype-kit/init.js' | ||
| ]) | ||
| }) | ||
|
|
||
| describe('Nunjucks', () => { | ||
| it('includes macros list', () => { | ||
| expect(config.nunjucksMacros).toEqual([ | ||
| { | ||
| importFrom: 'govuk/components/accordion/macro.njk', | ||
| macroName: 'govukAccordion' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/back-link/macro.njk', | ||
| macroName: 'govukBackLink' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/breadcrumbs/macro.njk', | ||
| macroName: 'govukBreadcrumbs' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/button/macro.njk', | ||
| macroName: 'govukButton' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/character-count/macro.njk', | ||
| macroName: 'govukCharacterCount' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/checkboxes/macro.njk', | ||
| macroName: 'govukCheckboxes' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/cookie-banner/macro.njk', | ||
| macroName: 'govukCookieBanner' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/date-input/macro.njk', | ||
| macroName: 'govukDateInput' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/details/macro.njk', | ||
| macroName: 'govukDetails' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/error-message/macro.njk', | ||
| macroName: 'govukErrorMessage' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/error-summary/macro.njk', | ||
| macroName: 'govukErrorSummary' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/fieldset/macro.njk', | ||
| macroName: 'govukFieldset' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/file-upload/macro.njk', | ||
| macroName: 'govukFileUpload' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/footer/macro.njk', | ||
| macroName: 'govukFooter' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/header/macro.njk', | ||
| macroName: 'govukHeader' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/hint/macro.njk', | ||
| macroName: 'govukHint' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/input/macro.njk', | ||
| macroName: 'govukInput' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/inset-text/macro.njk', | ||
| macroName: 'govukInsetText' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/label/macro.njk', | ||
| macroName: 'govukLabel' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/notification-banner/macro.njk', | ||
| macroName: 'govukNotificationBanner' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/pagination/macro.njk', | ||
| macroName: 'govukPagination' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/panel/macro.njk', | ||
| macroName: 'govukPanel' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/phase-banner/macro.njk', | ||
| macroName: 'govukPhaseBanner' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/radios/macro.njk', | ||
| macroName: 'govukRadios' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/select/macro.njk', | ||
| macroName: 'govukSelect' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/skip-link/macro.njk', | ||
| macroName: 'govukSkipLink' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/summary-list/macro.njk', | ||
| macroName: 'govukSummaryList' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/table/macro.njk', | ||
| macroName: 'govukTable' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/tabs/macro.njk', | ||
| macroName: 'govukTabs' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/tag/macro.njk', | ||
| macroName: 'govukTag' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/textarea/macro.njk', | ||
| macroName: 'govukTextarea' | ||
| }, | ||
| { | ||
| importFrom: 'govuk/components/warning-text/macro.njk', | ||
| macroName: 'govukWarningText' | ||
| } | ||
| ]) | ||
| }) | ||
|
|
||
| it('includes paths', () => { | ||
| expect(config.nunjucksPaths).toEqual(['/']) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| if (window.GOVUKPrototypeKit && | ||
| window.GOVUKPrototypeKit.documentReady && | ||
| window.GOVUKPrototypeKit.majorVersion >= 13) { | ||
| window.GOVUKPrototypeKit.documentReady(function () { | ||
| window.GOVUKFrontend.initAll() | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| $govuk-prototype-kit-major-version: 0 !default; | ||
|
|
||
| $govuk-assets-path: if( | ||
| $govuk-prototype-kit-major-version > 12, | ||
| $govuk-extensions-url-context + "/govuk-frontend/govuk/assets/", | ||
| "/govuk/assets/" | ||
| ) !default; | ||
|
|
||
| $govuk-global-styles: true !default; | ||
| $govuk-new-link-styles: true !default; | ||
|
|
||
| @import "../govuk/all"; |
Oops, something went wrong.