group and alphabetise requires in server.js

app/routes.js

@@ -1,5 +1,5 @@
-var express = require('express')
-var router = express.Router()
+const express = require('express')
+const router = express.Router()
 
 // Route index page
 router.get('/', function (req, res) {

docs/documentation_routes.js

@@ -1,9 +1,14 @@
-var express = require('express')
-var fs = require('fs')
-var marked = require('marked')
-var path = require('path')
-var router = express.Router()
-var utils = require('../lib/utils.js')
+// built in modules
+const fs = require('fs')
+const path = require('path')
+
+// other modules
+const express = require('express')
+const marked = require('marked')
+const router = express.Router()
+
+// prototype kit code
+const utils = require('../lib/utils.js')
 
 // Page routes
 

gulp/clean.js

@@ -5,10 +5,11 @@
     - public
     - govuk_modules
 */
-var config = require('./config.json')
 
-var gulp = require('gulp')
-var clean = require('gulp-clean')
+const gulp = require('gulp')
+const clean = require('gulp-clean')
+
+const config = require('./config.json')
 
 gulp.task('clean', function () {
   return gulp.src([config.paths.public + '/*',

gulp/copy-assets.js

@@ -4,8 +4,8 @@
   copies images and javascript folders to public
 */
 
-var gulp = require('gulp')
-var config = require('./config.json')
+const gulp = require('gulp')
+const config = require('./config.json')
 
 gulp.task('copy-assets', function () {
   return gulp.src(['!' + config.paths.assets + 'sass{,/**/*}',

gulp/copy-modules.js

@@ -4,8 +4,8 @@
   copies files for node_modules into govuk_modules
 */
 
-var gulp = require('gulp')
-var config = require('./config.json')
+const gulp = require('gulp')
+const config = require('./config.json')
 
 gulp.task('copy-toolkit', function () {
   return gulp.src(['node_modules/govuk_frontend_toolkit/**'])

gulp/nodemon.js

@@ -4,11 +4,13 @@
   uses nodemon to run a server, watches for javascript and json changes
 */
 
-var fs = require('fs')
-var path = require('path')
-var gulp = require('gulp')
-var nodemon = require('gulp-nodemon')
-var config = require('./config.json')
+const fs = require('fs')
+const path = require('path')
+
+const gulp = require('gulp')
+const nodemon = require('gulp-nodemon')
+
+const config = require('./config.json')
 
 gulp.task('server', function () {
   nodemon({

gulp/sass.js

@@ -5,11 +5,11 @@
   also includes sourcemaps
 */
 
-var gulp = require('gulp')
-var sass = require('gulp-sass')
-var sourcemaps = require('gulp-sourcemaps')
+const gulp = require('gulp')
+const sass = require('gulp-sass')
+const sourcemaps = require('gulp-sourcemaps')
 
-var config = require('./config.json')
+const config = require('./config.json')
 
 gulp.task('sass', function () {
   return gulp.src(config.paths.assets + '/sass/*.scss')

gulp/tasks.js

@@ -4,9 +4,9 @@
   defaults wraps generate-assets, watch and server
 */
 
-var gulp = require('gulp')
-var mocha = require('gulp-mocha')
-var runSequence = require('run-sequence')
+const gulp = require('gulp')
+const mocha = require('gulp-mocha')
+const runSequence = require('run-sequence')
 
 gulp.task('default', function (done) {
   runSequence('generate-assets',

gulp/watch.js

@@ -4,8 +4,8 @@
   watches sass/js/images
 */
 
-var gulp = require('gulp')
-var config = require('./config.json')
+const gulp = require('gulp')
+const config = require('./config.json')
 
 gulp.task('watch-sass', function () {
   return gulp.watch(config.paths.assets + 'sass/**', {cwd: './'}, ['sass'])

gulpfile.js

@@ -10,7 +10,7 @@
   tasks to run when you run `gulp`.
 */
 
-var requireDir = require('require-dir')
+const requireDir = require('require-dir')
 
 // Require all tasks in gulp/tasks, including subfolders
 requireDir('./gulp', {recurse: true})

lib/utils.js

@@ -1,11 +1,16 @@
-var basicAuth = require('basic-auth')
-var config = require('../app/config.js')
-var fs = require('fs')
-var marked = require('marked')
-var path = require('path')
-var portScanner = require('portscanner')
-var prompt = require('prompt')
-var request = require('sync-request')
+// built in modules
+const fs = require('fs')
+
+// other modules
+const basicAuth = require('basic-auth')
+const marked = require('marked')
+const path = require('path')
+const portScanner = require('portscanner')
+const prompt = require('prompt')
+const request = require('sync-request')
+
+// prototype kit code
+const config = require('../app/config.js')
 
 // Variables
 var releaseUrl = null

server.js

@@ -1,19 +1,26 @@
-require('dotenv').config()
-var crypto = require('crypto')
-var path = require('path')
-var express = require('express')
-var session = require('express-session')
-var nunjucks = require('nunjucks')
-var routes = require('./app/routes.js')
-var documentationRoutes = require('./docs/documentation_routes.js')
-var favicon = require('serve-favicon')
-var app = express()
-var documentationApp = express()
-var bodyParser = require('body-parser')
-var browserSync = require('browser-sync')
-var config = require('./app/config.js')
-var utils = require('./lib/utils.js')
-var packageJson = require('./package.json')
+// built in modules
+const crypto = require('crypto')
+const path = require('path')
+
+// other modules
+const bodyParser = require('body-parser')
+const browserSync = require('browser-sync')
+const dotenv = require('dotenv')
+const express = require('express')
+const favicon = require('serve-favicon')
+const nunjucks = require('nunjucks')
+const session = require('express-session')
+
+// prototype kit code
+const config = require('./app/config.js')
+const documentationRoutes = require('./docs/documentation_routes.js')
+const packageJson = require('./package.json')
+const routes = require('./app/routes.js')
+const utils = require('./lib/utils.js')
+
+const app = express()
+const documentationApp = express()
+dotenv.config()
 
 // Grab environment variables specified in Procfile or as Heroku config vars
 var releaseVersion = packageJson.version