Skip to content

Commit

Permalink
Update standard from 10.0.2 to 11.0.1 and fix violations
Browse files Browse the repository at this point in the history
  • Loading branch information
36degrees committed Jul 19, 2018
1 parent 1d0bf10 commit 1205fc5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion gulp/clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ const config = require('./config.json')
gulp.task('clean', function () {
return gulp.src([config.paths.public + '/*',
'.port.tmp'], {read: false})
.pipe(clean())
.pipe(clean())
})
4 changes: 2 additions & 2 deletions gulp/copy-assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ const config = require('./config.json')
gulp.task('copy-assets', function () {
return gulp.src(['!' + config.paths.assets + 'sass{,/**/*}',
config.paths.assets + '/**'])
.pipe(gulp.dest(config.paths.public))
.pipe(gulp.dest(config.paths.public))
})

gulp.task('copy-documentation-assets', function () {
return gulp.src(['!' + config.paths.docsAssets + 'sass{,/**/*}',
config.paths.docsAssets + '/**'])
.pipe(gulp.dest(config.paths.public))
.pipe(gulp.dest(config.paths.public))
})
16 changes: 8 additions & 8 deletions gulp/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ 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(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
.pipe(sourcemaps.init())
.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(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
.pipe(sourcemaps.init())
.pipe(sass({outputStyle: 'expanded'}).on('error', sass.logError))
.pipe(sourcemaps.write())
.pipe(gulp.dest(config.paths.public + '/stylesheets/'))
})
20 changes: 10 additions & 10 deletions gulp/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ const runSequence = require('run-sequence')

gulp.task('default', function (done) {
runSequence('generate-assets',
'watch',
'server', done)
'watch',
'server', done)
})

gulp.task('generate-assets', function (done) {
runSequence('clean',
'sass',
'sass-documentation',
'copy-assets',
'copy-documentation-assets', done)
'sass',
'sass-documentation',
'copy-assets',
'copy-documentation-assets', done)
})

gulp.task('watch', function (done) {
runSequence('watch-sass',
'watch-assets', done)
'watch-assets', done)
})

gulp.task('test', function () {
runSequence('generate-assets',
'mocha')
'mocha')
})

gulp.task('mocha', function () {
return gulp.src(['test/**/*.js'], { read: false })
.pipe(mocha({ reporter: 'spec', exit: true }))
.on('error', console.error)
.pipe(mocha({ reporter: 'spec', exit: true }))
.on('error', console.error)
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"prompt": "^1.0.0",
"require-dir": "^1.0.0",
"run-sequence": "^2.2.1",
"standard": "^10.0.2",
"standard": "^11.0.1",
"supertest": "^3.0.0",
"sync-request": "^4.0.3",
"universal-analytics": "^0.4.16",
Expand Down
4 changes: 2 additions & 2 deletions start.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function checkFiles () {
const envExists = fs.existsSync(path.join(__dirname, '/.env'))
if (!envExists) {
fs.createReadStream(path.join(__dirname, '/lib/template.env'))
.pipe(fs.createWriteStream(path.join(__dirname, '/.env')))
.pipe(fs.createWriteStream(path.join(__dirname, '/.env')))
}
}

Expand All @@ -63,7 +63,7 @@ if (!sessionDataDefaultsFileExists) {
}

fs.createReadStream(path.join(__dirname, '/lib/template.session-data-defaults.js'))
.pipe(fs.createWriteStream(sessionDataDefaultsFile))
.pipe(fs.createWriteStream(sessionDataDefaultsFile))
}

// Run gulp
Expand Down

0 comments on commit 1205fc5

Please sign in to comment.