#21

scniro · scniro · commit 06c170662673 · 2016-12-14T09:08:17.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 sandbox
 node_modules
 coverage
-test/**/*.generated.*
+test/**/*.generated.*
+test/**/*.min.css
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.3.0 (12/12/2016)
+
+- bug fix #21 => https://github.com/scniro/gulp-clean-css/issues/21
+- adding back vinyl-sourcemaps-apply
+
 # 2.2.2 (12/12/2016)
 
 - clean-css release update, 3.4.21 => 3.4.22
diff --git a/index.js b/index.js
@@ -1,3 +1,4 @@
+const applySourceMap = require('vinyl-sourcemaps-apply');
 const CleanCSS = require('clean-css');
 const objectAssign = require('object-assign');
 const path = require('path');
@@ -53,6 +54,17 @@ module.exports = function gulpCleanCSS(options, callback) {
 
       file.contents = new Buffer(css.styles);
 
+      if (css.sourceMap) {
+
+        var map = JSON.parse(css.sourceMap);
+        map.file = path.relative(file.base, file.path);
+        map.sources = map.sources.map(function (src) {
+          return path.relative(file.base, file.path)
+        });
+
+        applySourceMap(file, map);
+      }
+
       cb(null, file);
     });
   };
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "gulp-clean-css",
   "description": "Minify css with clean-css.",
   "homepage": "https://github.com/scniro/gulp-clean-css#readme",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "author": "scniro",
   "license": "MIT",
   "bugs": {
@@ -32,7 +32,8 @@
     "clean-css": "^3.4.22",
     "gulp-util": "^3.0.7",
     "object-assign": "^4.1.0",
-    "through2": "^2.0.3"
+    "through2": "^2.0.3",
+    "vinyl-sourcemaps-apply": "^0.2.1"
   },
   "devDependencies": {
     "chai": "^3.5.0",
diff --git a/test/fixtures/sourcemaps-load/index.html b/test/fixtures/sourcemaps-load/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>gulp-clean-css: source maps</title>
+
+    <link rel="stylesheet" href="min/test-sass.min.css"/>
+</head>
+<body>
+<p>source maps</p>
+</body>
+</html>
diff --git a/test/fixtures/sourcemaps-load/scss/a/a.scss b/test/fixtures/sourcemaps-load/scss/a/a.scss
@@ -0,0 +1 @@
+$color: red;
diff --git a/test/fixtures/sourcemaps-load/scss/b/b.scss b/test/fixtures/sourcemaps-load/scss/b/b.scss
@@ -0,0 +1,5 @@
+@import '../a/a';
+
+span {
+  color: $color
+}
diff --git a/test/fixtures/sourcemaps-load/scss/test-sass.scss b/test/fixtures/sourcemaps-load/scss/test-sass.scss
@@ -0,0 +1,2 @@
+@import 'a/a';
+@import 'b/b';
diff --git a/test/fixtures/sourcemaps-load/server.js b/test/fixtures/sourcemaps-load/server.js
@@ -0,0 +1,15 @@
+var express = require('express');
+var app = express();
+
+app.set('port', 2000);
+
+app.use('/', express.static(__dirname))
+
+app.get('/', function(req,res) {
+  res.sendfile('index.html');
+});
+
+var server = app.listen(app.get('port'), function() {
+  var port = server.address().port;
+  console.log(`Magic happens on port ${port}`);
+});
diff --git a/test/test.js b/test/test.js
@@ -25,7 +25,7 @@ describe('gulp-clean-css: base functionality', function () {
   it('should play nicely with other plugins: gulp-sass: before', function (done) {
     var i = 0;
 
-    gulp.src(['test/fixtures/**/*.scss', '!test/fixtures/empty/**'])
+    gulp.src(['test/fixtures/**/*.scss', '!test/fixtures/empty/**', '!test/fixtures/sourcemaps-load/**'])
       .pipe(gulpSass())
       .pipe(cleanCSS())
       .pipe(rename({
@@ -188,6 +188,29 @@ describe('gulp-clean-css: base functionality', function () {
       });
   });
 
+  it('should write sourcemaps, worrectly map output', function (done) {
+
+    var i = 0;
+
+    gulp.src('test/fixtures/sourcemaps-load/scss/test-sass.scss')
+      .pipe(sourcemaps.init())
+      .pipe(gulpSass())
+      .pipe(sourcemaps.init({loadMaps: true}))
+      .pipe(cleanCSS({sourceMapInlineSources: true}))
+      .on('data', function (file) {
+        i += 1;
+      })
+      .pipe(rename({
+        suffix: '.min'
+      }))
+      .pipe(sourcemaps.write())
+      .pipe(gulp.dest('test/fixtures/sourcemaps-load/min'))
+      .once('end', function () {
+        i.should.equal(1); // todo inspect mapping here
+        done();
+      });
+  });
+
   it('should return a warning for improper syntax', function (done) {
 
     var i = 0;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +@import '../a/a';
++
 +span {
 +  color: $color
 +}