Skip to content

Commit 222958d

Browse files
committed
Merge branch 'develop'
2 parents 9350b71 + efef324 commit 222958d

File tree

5 files changed

+389
-325
lines changed

5 files changed

+389
-325
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"bowser": true
88
},
99
"rules": {
10-
"comma-dangle": [2,"always"],
10+
"comma-dangle": 0,
1111
"no-cond-assign": [1,"except-parens"],
1212
"no-console": 1,
1313
"no-constant-condition": 1,

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [4.2.3] - In Progress
6+
# Updated
7+
- npm dependencies
8+
- eslint rule for comma dangle now is silenced 🤫
9+
10+
# Adds
11+
- JS sourcemaps
12+
513
## [4.2.2] - 2018-04-26
614
# Updated
715
- Travis node build

gulpfile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,12 @@ gulp.task('minify-css', ['sass'], function() {
119119
// Concatenate & Minify JavaScript
120120
gulp.task('scripts', ['lint'], function() {
121121
return gulp.src( concatFiles )
122+
.pipe(sourcemaps.init())
122123
.pipe(concat( 'all.js' ))
123124
.pipe(gulp.dest( './assets/js/' ))
124125
.pipe(rename('theme.min.js'))
125126
.pipe(uglify())
127+
.pipe(sourcemaps.write())
126128
.pipe(gulp.dest( './assets/js/' ))
127129
.pipe(browserSync.reload({
128130
stream: true

0 commit comments

Comments
 (0)