diff --git a/gulpfile.js b/gulpfile.js index 377879593..95922832d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -74,16 +74,15 @@ gulp.task('scripts', ['clean'], function() { gulp.task('styles', ['clean'], function() { - return gulp.src('src/common.css') + return gulp.src(['src/common.css'], {base: 'src'}) + .pipe($.sourcemaps.init()) .pipe($.header(config.banner, { timestamp: (new Date()).toISOString(), pkg: config.pkg })) .pipe($.concat('select.css')) - .pipe(gulp.dest('dist')) - .pipe($.sourcemaps.init()) .pipe($.minifyCss()) .pipe($.concat('select.min.css')) - .pipe($.sourcemaps.write('./', {debug: true})) + .pipe($.sourcemaps.write('../dist', {debug: true})) .pipe(gulp.dest('dist')); }); diff --git a/package.json b/package.json index 9bab4c186..7a50d9245 100644 --- a/package.json +++ b/package.json @@ -17,24 +17,25 @@ "conventional-recommended-bump": "0.0.3", "del": "~0.1.1", "event-stream": "~3.1.0", - "gulp": "~3.8.5", - "gulp-angular-templatecache": "~1.2.1", + "gulp": "^3.9.1", + "gulp-angular-templatecache": "^1.8.0", "gulp-bump": "^1.0.0", "gulp-conventional-changelog": "^0.7.0", "gulp-concat": "^2.6.0", "gulp-git": "^1.4.0", - "gulp-header": "~1.0.2", - "gulp-footer": "~1.0.5", - "gulp-jshint": "1.6.4", + "gulp-header": "^1.7.1", + "gulp-footer": "^1.0.5", + "gulp-jshint": "^2.0.0", "gulp-load-plugins": "^1.1.0", - "gulp-minify-css": "~0.3.6", - "gulp-minify-html": "~0.1.0", + "gulp-minify-css": "^1.2.4", + "gulp-minify-html": "^1.0.6", "gulp-plumber": "^0.6.3", "gulp-sourcemaps": "^1.6.0", "gulp-tag-version": "^1.3.0", - "gulp-uglify": "~0.3.1", + "gulp-uglify": "^1.5.3", "gulp-util": "^2.2.19", "jquery": "~1.11", + "jshint": "^2.9.1", "jshint-stylish": "~0.3.0", "karma": "^0.12.16", "karma-chrome-launcher": "^0.1.3",