RE #2: Add support for Node.js 4.x, update copyright and dependencies.

vseventer · Jan 17, 2016 · e96db8e · e96db8e
1 parent 5164bfc
commit e96db8e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.4 (January 18, 2016)
+* Bugfix: add support for Node.js 4.x.
+* Updated copyright to `2016`.
+* Updated dependencies.
+
 ## 0.1.3 (July 31, 2015)
 * Bugfix: uncss now ignores external stylesheets.
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Mark van Seventer
+Copyright (c) 2016 Mark van Seventer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ See the [Changelog](./CHANGELOG.md) for a list of changes.
 ## License
     The MIT License (MIT)
 
-    Copyright (c) 2015 Mark van Seventer
+    Copyright (c) 2016 Mark van Seventer
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Mark van Seventer
+ * Copyright (c) 2016 Mark van Seventer
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/lib/filter.js b/lib/filter.js
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Mark van Seventer
+ * Copyright (c) 2016 Mark van Seventer
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -63,7 +63,12 @@ module.exports = function(str, locals) {
   // Retrieve raw HTML from HTML files.
   var promise = Promise.map(routes, function(path) {
     var stream = route.get(path);
-    return streamToArrayAsync(stream).then(Buffer.concat);
+    return streamToArrayAsync(stream).then(function(arr) {
+      var buffers = arr.map(function(el) {
+        return el instanceof Buffer ? el : new Buffer(el);
+      });
+      return Buffer.concat(buffers).toString();
+   });
   });
 
   // UnCSS the raw HTML with the CSS provided.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name"        : "hexo-uncss",
-  "version"     : "0.1.3",
+  "version"     : "0.1.4",
   "description" : "uncss plugin for Hexo.",
   "keywords"    : [ "hexo", "hexo-plugin", "hexo-filter", "uncss", "css", "html" ],
   "homepage"    : "https://github.com/vseventer/hexo-uncss",
@@ -14,17 +14,17 @@
     "test"    : "./node_modules/.bin/mocha test/"
   },
   "dependencies": {
-    "bluebird"        : "2.9.x",
+    "bluebird"        : "3.1.x",
     "debug"           : "2.2.x",
-    "minimatch"       : "2.0.x",
-    "object-assign"   : "3.0.x",
-    "stream-to-array" : "2.0.x",
+    "minimatch"       : "3.0.x",
+    "object-assign"   : "4.0.x",
+    "stream-to-array" : "2.2.x",
     "uncss"           : "0.12.x"
   },
   "devDependencies": {
-    "jshint"         : "2.8.x",
-    "jshint-stylish" : "2.0.x",
-    "mocha"          : "2.2.x"
+    "jshint"         : "2.9.x",
+    "jshint-stylish" : "2.1.x",
+    "mocha"          : "2.3.x"
   },
   "engines": { "node" : ">=0.10.x" }
 }
diff --git a/test/filter.test.js b/test/filter.test.js
@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Mark van Seventer
+ * Copyright (c) 2016 Mark van Seventer
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal