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

Bump toolkit and standard / nunjucks, and tidy package.json a bit #330

Merged
merged 3 commits into from
Dec 16, 2016
Merged

Bump toolkit and standard / nunjucks, and tidy package.json a bit #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c0cbe1
Bump standard to current version
Dec 16, 2016
47adf8a
Bump toolkit and nunjucks to latest versions
Dec 16, 2016
6685822
Remove some unused packages
Dec 16, 2016
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
4 changes: 2 additions & 2 deletions gulp/clean.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var clean = require('gulp-clean')

gulp.task('clean', function () {
return gulp.src([config.paths.public + '/*',
config.paths.govukModules + '/*',
'.port.tmp'], {read: false})
config.paths.govukModules + '/*',
'.port.tmp'], {read: false})
.pipe(clean())
})
4 changes: 2 additions & 2 deletions gulp/nodemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ gulp.task('server', function () {
script: 'server.js',
ext: 'js, json',
ignore: [config.paths.public + '*',
config.paths.assets + '*',
config.paths.nodeModules + '*']
config.paths.assets + '*',
config.paths.nodeModules + '*']
}).on('quit', function () {
// remove .port.tmp if it exists
try {
Expand Down
12 changes: 6 additions & 6 deletions gulp/sass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ var config = require('./config.json')
gulp.task('sass', function () {
return gulp.src(config.paths.assets + '/sass/*.scss')
.pipe(sass({outputStyle: 'expanded',
includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets',
'govuk_modules/govuk_template/assets/stylesheets',
'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError))
includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets',
'govuk_modules/govuk_template/assets/stylesheets',
'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError))
.pipe(sourcemaps.init())
.pipe(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
Expand All @@ -25,9 +25,9 @@ gulp.task('sass', function () {
gulp.task('sass-documentation', function () {
return gulp.src(config.paths.docsAssets + '/sass/*.scss')
.pipe(sass({outputStyle: 'expanded',
includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets',
'govuk_modules/govuk_template/assets/stylesheets',
'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError))
includePaths: ['govuk_modules/govuk_frontend_toolkit/stylesheets',
'govuk_modules/govuk_template/assets/stylesheets',
'govuk_modules/govuk-elements-sass/']}).on('error', sass.logError))
.pipe(sourcemaps.init())
.pipe(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
Expand Down
2 changes: 1 addition & 1 deletion gulp/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ gulp.task('watch-sass', function () {

gulp.task('watch-assets', function () {
return gulp.watch([config.paths.assets + 'images/**',
config.paths.assets + 'javascripts/**'], {cwd: './'}, ['copy-assets'])
config.paths.assets + 'javascripts/**'], {cwd: './'}, ['copy-assets'])
})
8 changes: 3 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
"basic-auth-connect": "^1.0.0",
"body-parser": "^1.14.1",
"browser-sync": "^2.11.1",
"consolidate": "0.x",
"cross-spawn": "^5.0.0",
"express": "4.13.3",
"express-session": "^1.13.0",
"express-writer": "0.0.4",
"govuk-elements-sass": "2.2.1",
"govuk_frontend_toolkit": "^5.0.1",
"govuk_frontend_toolkit": "5.0.2",
"govuk_template_jinja": "0.19.2",
"gulp": "^3.9.1",
"gulp-clean": "^0.3.2",
Expand All @@ -31,17 +30,16 @@
"gulp-sass": "^2.3.2",
"gulp-sourcemaps": "^1.6.0",
"gulp-util": "^3.0.7",
"hogan.js": "3.0.2",
"marked": "^0.3.6",
"minimist": "0.0.8",
"nunjucks": "^2.4.2",
"nunjucks": "^2.5.2",
"portscanner": "^1.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't being used to set the port anymore, but looks like it might be useful, if we can keep it in - in case others are using it.

"prompt": "^0.2.14",
"readdir": "0.0.6",
"require-dir": "^0.3.0",
"run-sequence": "^1.2.2",
"serve-favicon": "2.3.0",
"standard": "^7.1.2",
"standard": "^8.6.0",
"supertest": "^2.0.0",
"sync-request": "^3.0.1"
}
Expand Down