Skip to content

Commit

Permalink
Merge pull request #663 from alphagov/update-standard
Browse files Browse the repository at this point in the history
update Standard to 12.0.1
  • Loading branch information
joelanman authored Jan 2, 2019
2 parents 1dd4dea + 6ffc0b7 commit 2542c17
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Fixes:

Internal:

- [#663 update Standard to 12.0.1](https://github.com/alphagov/govuk-prototype-kit/pull/663)
- [#640 Replace Mocha with Jest](https://github.com/alphagov/govuk-prototype-kit/pull/640)
- [#659 Upgrade kit to use Gulp 4](https://github.com/alphagov/govuk-prototype-kit/pull/659)

Expand Down
2 changes: 1 addition & 1 deletion docs/documentation_routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ router.get('/install/:page', function (req, res) {
redirectMarkdown(req.params.page, res)
var doc = fs.readFileSync(path.join(__dirname, '/documentation/install/', req.params.page + '.md'), 'utf8')
var html = marked(doc)
res.render('install_template', {'document': html})
res.render('install_template', { 'document': html })
})

// Redirect to the zip of the latest release of the Prototype Kit on GitHub
Expand Down
4 changes: 2 additions & 2 deletions gulp/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ const config = require('./config.json')
gulp.task('sass', function () {
return gulp.src(config.paths.assets + '/sass/*.scss')
.pipe(sourcemaps.init())
.pipe(sass({outputStyle: 'expanded'}).on('error', sass.logError))
.pipe(sass({ outputStyle: 'expanded' }).on('error', sass.logError))
.pipe(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
})

gulp.task('sass-documentation', function () {
return gulp.src(config.paths.docsAssets + '/sass/*.scss')
.pipe(sourcemaps.init())
.pipe(sass({outputStyle: 'expanded'}).on('error', sass.logError))
.pipe(sass({ outputStyle: 'expanded' }).on('error', sass.logError))
.pipe(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
})
Expand Down
4 changes: 2 additions & 2 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ exports.getLatestRelease = function () {
'GET',
'https://api.github.com/repos/alphagov/govuk-prototype-kit/releases/latest',
{
headers: {'user-agent': 'node.js'}
headers: { 'user-agent': 'node.js' }
}
)
var data = JSON.parse(res.getBody('utf8'))
Expand Down Expand Up @@ -213,7 +213,7 @@ exports.matchMdRoutes = function (req, res) {
if (fs.existsSync(path.join(__dirname, docsPath, req.params[0] + '.md'), 'utf8')) {
var doc = fs.readFileSync(path.join(__dirname, docsPath, req.params[0] + '.md'), 'utf8')
var html = marked(doc)
res.render('documentation_template', {'document': html})
res.render('documentation_template', { 'document': html })
return true
}
return false
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"jest": "^23.6.0",
"standard": "^11.0.1",
"standard": "^12.0.1",
"supertest": "^3.0.0"
}
}

0 comments on commit 2542c17

Please sign in to comment.