Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namespace nunjucks and components #1458

Merged
merged 6 commits into from
Jun 21, 2019
Merged

Namespace nunjucks and components #1458

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5af731
Move src > src/govuk. USE GIT BLAME FOR HISTORY!
aliuk2012 Jun 17, 2019
6cfc923
update Standard ignore to exclude src/govuk/vendor
aliuk2012 Jun 17, 2019
d8d9160
Fix tests by updating requires relative directory path
aliuk2012 Jun 17, 2019
862c20a
Ensure package contents is namespaced to use govuk
aliuk2012 Jun 18, 2019
42d2ffc
Ensure dist contents are not included in govuk directory
aliuk2012 Jun 18, 2019
a1eec4d
Fixes public directory structure
aliuk2012 Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure dist contents are not included in govuk directory 
This commit fixes the issues identified while trying to run
`npm run build:dist`.

Current and desired directory structure:

dist
├── assets
│   ├── fonts
│   └── images
├── VERSION.txt
├── govuk-frontend-2.13.0.min.css
├── govuk-frontend-2.13.0.min.js
└── govuk-frontend-ie8-2.13.0.min.css

See proposal for more detail
https://github.com/alphagov/govuk-design-system-architecture/blob/master/proposals/005-namespace-govuk-frontend-nunjucks-sass-using-a-nested-folder-structure.md
  • Loading branch information
@aliuk2012
aliuk2012 committed Jun 19, 2019
commit 42d2ffc06e836357ba07c8142ff9fc746c0096e3
2 changes: 1 addition & 1 deletion tasks/gulp/__tests__/after-build-dist.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
},
Expand Down