Merge pull request #343 from JeroenNoten/master

Use gulp-concat-css to bubble up @import statements

Author: JeffreyWay

package.json

@@ -31,6 +31,7 @@
     "gulp-batch": "^1.0.5",
     "gulp-coffee": "^2.3.1",
     "gulp-concat": "^2.6.0",
+    "gulp-concat-css": "^2.2.0",
     "gulp-if": "^1.2.5",
     "gulp-less": "^3.0.3",
     "gulp-load-plugins": "^1.0.0-rc.1",

tasks/shared/Css.js

@@ -21,7 +21,7 @@ module.exports = function(options) {
             this.emit('end');
         })
         .pipe($.if(config.css.autoprefix.enabled, $.autoprefixer(config.css.autoprefix.options)))
-        .pipe($.concat(options.output.name))
+        .pipe($.concatCss(options.output.name, {rebaseUrls: false, inlineImports: false}))
         .pipe($.if(config.production, $.minifyCss(config.css.minifyCss.pluginOptions)))
         .pipe($.if(config.sourcemaps, $.sourcemaps.write('.')))
         .pipe(gulp.dest(options.output.baseDir))

tasks/styles.js

@@ -50,7 +50,7 @@ var gulpTask = function(paths) {
         gulp
         .src(paths.src.path)
         .pipe($.if(config.sourcemaps, $.sourcemaps.init()))
-        .pipe($.concat(paths.output.name))
+        .pipe($.concatCss(paths.output.name, {rebaseUrls: false, inlineImports: false}))
         .pipe($.if(config.production, $.minifyCss(config.css.minifyCss.pluginOptions)))
         .pipe($.if(config.sourcemaps, $.sourcemaps.write('.')))
         .pipe(gulp.dest(paths.output.baseDir))