all deps up to date, tests passing

lib/adapters/buble/index.coffee

@@ -1,2 +1,2 @@
 # the index exports the most recent version of the engine
-module.exports = require('./0.8.x - 0.14.x')
+module.exports = require('./0.8.x - 0.15.x')

lib/adapters/csso/index.coffee

@@ -1,2 +1,2 @@
 # the index exports the most recent version of the engine
-module.exports = require('./2.x')
+module.exports = require('./2.x - 3.x')

lib/adapters/minify-css/index.coffee

@@ -1,2 +1,2 @@
 # the index exports the most recent version of the engine
-module.exports = require('./3.x')
+module.exports = require('./3.x - 4.x')

package.json

@@ -5,7 +5,7 @@
   "author": "Jeff Escalante",
   "bugs": "https://github.com/jescalan/accord",
   "dependencies": {
-    "convert-source-map": "^1.2.0",
+    "convert-source-map": "^1.5.0",
     "glob": "^7.0.5",
     "indx": "^0.2.3",
     "lodash.clone": "^4.3.2",
@@ -15,54 +15,54 @@
     "lodash.partialright": "^4.1.4",
     "lodash.pick": "^4.2.1",
     "lodash.uniq": "^4.3.0",
-    "resolve": "^1.1.7",
+    "resolve": "^1.3.3",
     "semver": "^5.3.0",
-    "uglify-js": "^2.7.0",
-    "when": "^3.7.7"
+    "uglify-js": "^2.8.22",
+    "when": "^3.7.8"
   },
   "devDependencies": {
     "LiveScript": "^1.3.1",
-    "acorn": "^4.0.0",
-    "babel": "^6.5.2",
-    "babel-core": "^6.18.1",
-    "babel-preset-es2015": "^6.18.0",
-    "buble": "^0.14.2",
+    "acorn": "^5.0.3",
+    "babel": "^6.23.0",
+    "babel-core": "^6.24.1",
+    "babel-preset-es2015": "^6.24.1",
+    "buble": "^0.15.2",
     "chai": "^3.5.0",
-    "clean-css": "^3.4.21",
+    "clean-css": "^4.0.12",
     "coco": "^0.9.1",
     "coffee-coverage": "^2.0.1",
     "coffee-react-transform": "^5.0.0",
-    "coffee-script": "^1.11.0",
-    "coveralls": "^2.11.15",
+    "coffee-script": "^1.12.5",
+    "coveralls": "^2.13.0",
     "css-parse": "^2.0.0",
-    "csso": "^2.2.0",
+    "csso": "^3.1.0",
     "dogescript": "^2.3.0",
     "dot": "^1.1.1",
     "eco": "^1.0.3",
-    "ejs": "^2.4.2",
+    "ejs": "^2.5.6",
     "hamljs": "^0.6.2",
     "handlebars": "^4.0.6",
-    "he": "^1.1.0",
+    "he": "^1.1.1",
     "hogan.js": "^3.0.2",
-    "html-minifier": "^3.2.2",
+    "html-minifier": "^3.4.3",
     "istanbul": "^0.4.4",
     "jade": "^1.11.0",
-    "less": "^2.7.1",
+    "less": "^2.7.2",
     "marc": "^0.1.0",
     "marked": "^0.3.5",
-    "mocha": "^3.1.2",
-    "mocha-lcov-reporter": "^1.2.0",
+    "mocha": "^3.3.0",
+    "mocha-lcov-reporter": "^1.3.0",
     "myth": "^1.5.0",
-    "node-sass": "^4.0.0",
-    "parse5": "^3.0.0",
+    "node-sass": "^4.5.2",
+    "parse5": "^3.0.2",
     "polytest": "0.0.1",
-    "postcss": "^5.2.5",
-    "postcss-simple-vars": "^3.0.0",
+    "postcss": "^5.2.17",
+    "postcss-simple-vars": "^3.1.0",
     "pug": "^2.0.0-beta11",
     "react-tools": "^0.13.3",
     "stylus": "^0.54.5",
     "swig": "^1.4.2",
-    "toffee": "^0.1.12",
+    "toffee": "^0.1.13",
     "typescript-compiler": "^1.4.1"
   },
   "homepage": "https://github.com/jescalan/accord",

test/fixtures/minify-css/expected/opts.css

@@ -1,2 +1 @@
-.selector1{wow:such styles}
-.two{ermahgerd:red}
+.selector1{wow:such styles}.two{ermahgerd:red}

test/fixtures/toffee/expected/my_templates-2.html

@@ -1,4 +1,4 @@
-var toffee;"undefined"!=typeof toffee&&null!==toffee||(toffee={}),toffee.templates||(toffee.templates={}),toffee.states={TOFFEE:1,COFFEE:2},toffee.__json=function(e,t){return null==t?"null":""+JSON.stringify(t).replace(/</g,"\\u003C").replace(/>/g,"\\u003E").replace(/&/g,"\\u0026")},toffee.__raw=function(e,t){return t},toffee.__html=function(e,t){return(""+t).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},toffee.__escape=function(e,t){var f;return f=null==e.__toffee.autoEscape||e.__toffee.autoEscape,f?void 0===t?"":null!=t&&"object"==typeof t?e.json(t):e.html(t):t},toffee.__augmentLocals=function(e,t){var f,n;return f=e,n=f.__toffee={out:[]},null==f.print&&(f.print=function(e){return toffee.__print(f,e)}),null==f.json&&(f.json=function(e){return toffee.__json(f,e)}),null==f.raw&&(f.raw=function(e){return toffee.__raw(f,e)}),null==f.html&&(f.html=function(e){return toffee.__html(f,e)}),null==f.escape&&(f.escape=function(e){return toffee.__escape(f,e)}),null==f.partial&&(f.partial=function(e,n){return toffee.__partial(toffee.templates[""+t],f,e,n)}),null==f.snippet&&(f.snippet=function(e,n){return toffee.__snippet(toffee.templates[""+t],f,e,n)}),null==f.load&&(f.load=function(e,n){return toffee.__load(toffee.templates[""+t],f,e,n)}),n.print=f.print,n.json=f.json,n.raw=f.raw,n.html=f.html,n.escape=f.escape,n.partial=f.partial,n.snippet=f.snippet,n.load=f.load},toffee.__print=function(e,t){return e.__toffee.state===toffee.states.COFFEE?(e.__toffee.out.push(t),""):""+t},toffee.__normalize=function(e){var t,f,n,o,l;if(null==e||"/"===e)return e;for(l=e.split("/"),n=[],l[0]&&n.push(""),t=0,f=l.length;t<f;t++)o=l[t],".."===o?n.length>1?n.pop():n.push(o):"."!==o&&n.push(o);return e=n.join("/"),e||(e="/"),e},toffee.__partial=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),toffee.__inlineInclude(f,n,t)},toffee.__snippet=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.noInheritance=!0,toffee.__inlineInclude(f,n,t)},toffee.__load=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.repress=!0,toffee.__inlineInclude(f,n,t)},toffee.__inlineInclude=function(e,t,f){var n,o,l,r,u,_,a,i,p;for(r=t||{},r.passback={},r.__toffee=r.__toffee||{},i={},u=["passback","load","print","partial","snippet","layout","__toffee","postProcess"],n=0,l=u.length;n<l;n++)o=u[n],i[o]=!0;if(!r.__toffee.noInheritance)for(o in f)p=f[o],null==(null!=t?t[o]:void 0)&&null==i[o]&&(r[o]=p);if(toffee.templates[e]){a=toffee.templates[e].pub(r),_=r.passback;for(o in _)p=_[o],f[o]=p;return a}return"Inline toffee include: Could not find "+e};
+var toffee;void 0!==toffee&&null!==toffee||(toffee={}),toffee.templates||(toffee.templates={}),toffee.states={TOFFEE:1,COFFEE:2},toffee.__json=function(e,t){return null==t?"null":""+JSON.stringify(t).replace(/</g,"\\u003C").replace(/>/g,"\\u003E").replace(/&/g,"\\u0026").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")},toffee.__raw=function(e,t){return t},toffee.__html=function(e,t){return(""+t).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},toffee.__escape=function(e,t){var f;return f=null==e.__toffee.autoEscape||e.__toffee.autoEscape,f?void 0===t?"":null!=t&&"object"==typeof t?e.json(t):e.html(t):t},toffee.__augmentLocals=function(e,t){var f,n;return f=e,n=f.__toffee={out:[]},null==f.print&&(f.print=function(e){return toffee.__print(f,e)}),null==f.json&&(f.json=function(e){return toffee.__json(f,e)}),null==f.raw&&(f.raw=function(e){return toffee.__raw(f,e)}),null==f.html&&(f.html=function(e){return toffee.__html(f,e)}),null==f.escape&&(f.escape=function(e){return toffee.__escape(f,e)}),null==f.partial&&(f.partial=function(e,n){return toffee.__partial(toffee.templates[""+t],f,e,n)}),null==f.snippet&&(f.snippet=function(e,n){return toffee.__snippet(toffee.templates[""+t],f,e,n)}),null==f.load&&(f.load=function(e,n){return toffee.__load(toffee.templates[""+t],f,e,n)}),n.print=f.print,n.json=f.json,n.raw=f.raw,n.html=f.html,n.escape=f.escape,n.partial=f.partial,n.snippet=f.snippet,n.load=f.load},toffee.__print=function(e,t){return e.__toffee.state===toffee.states.COFFEE?(e.__toffee.out.push(t),""):""+t},toffee.__normalize=function(e){var t,f,n,o,l;if(null==e||"/"===e)return e;for(l=e.split("/"),n=[],l[0]&&n.push(""),t=0,f=l.length;t<f;t++)o=l[t],".."===o?n.length>1?n.pop():n.push(o):"."!==o&&n.push(o);return e=n.join("/"),e||(e="/"),e},toffee.__partial=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),toffee.__inlineInclude(f,n,t)},toffee.__snippet=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.noInheritance=!0,toffee.__inlineInclude(f,n,t)},toffee.__load=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.repress=!0,toffee.__inlineInclude(f,n,t)},toffee.__inlineInclude=function(e,t,f){var n,o,l,r,u,a,_,i,p;for(r=t||{},r.passback={},r.__toffee=r.__toffee||{},i={},u=["passback","load","print","partial","snippet","layout","__toffee","postProcess"],n=0,l=u.length;n<l;n++)o=u[n],i[o]=!0;if(!r.__toffee.noInheritance)for(o in f)p=f[o],null==(null!=t?t[o]:void 0)&&null==i[o]&&(r[o]=p);if(toffee.templates[e]){_=toffee.templates[e].pub(r),a=r.passback;for(o in a)p=a[o],f[o]=p;return _}return"Inline toffee include: Could not find "+e};
 ;
 (function() {
   var tmpl;
@@ -57,4 +57,4 @@
     return tmpl.pub(__toffee_run_input);
   }
 
-}).call(this);
+}).call(this);

test/fixtures/toffee/expected/my_templates.html

@@ -1,4 +1,4 @@
-var toffee;"undefined"!=typeof toffee&&null!==toffee||(toffee={}),toffee.templates||(toffee.templates={}),toffee.states={TOFFEE:1,COFFEE:2},toffee.__json=function(e,t){return null==t?"null":""+JSON.stringify(t).replace(/</g,"\\u003C").replace(/>/g,"\\u003E").replace(/&/g,"\\u0026")},toffee.__raw=function(e,t){return t},toffee.__html=function(e,t){return(""+t).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},toffee.__escape=function(e,t){var f;return f=null==e.__toffee.autoEscape||e.__toffee.autoEscape,f?void 0===t?"":null!=t&&"object"==typeof t?e.json(t):e.html(t):t},toffee.__augmentLocals=function(e,t){var f,n;return f=e,n=f.__toffee={out:[]},null==f.print&&(f.print=function(e){return toffee.__print(f,e)}),null==f.json&&(f.json=function(e){return toffee.__json(f,e)}),null==f.raw&&(f.raw=function(e){return toffee.__raw(f,e)}),null==f.html&&(f.html=function(e){return toffee.__html(f,e)}),null==f.escape&&(f.escape=function(e){return toffee.__escape(f,e)}),null==f.partial&&(f.partial=function(e,n){return toffee.__partial(toffee.templates[""+t],f,e,n)}),null==f.snippet&&(f.snippet=function(e,n){return toffee.__snippet(toffee.templates[""+t],f,e,n)}),null==f.load&&(f.load=function(e,n){return toffee.__load(toffee.templates[""+t],f,e,n)}),n.print=f.print,n.json=f.json,n.raw=f.raw,n.html=f.html,n.escape=f.escape,n.partial=f.partial,n.snippet=f.snippet,n.load=f.load},toffee.__print=function(e,t){return e.__toffee.state===toffee.states.COFFEE?(e.__toffee.out.push(t),""):""+t},toffee.__normalize=function(e){var t,f,n,o,l;if(null==e||"/"===e)return e;for(l=e.split("/"),n=[],l[0]&&n.push(""),t=0,f=l.length;t<f;t++)o=l[t],".."===o?n.length>1?n.pop():n.push(o):"."!==o&&n.push(o);return e=n.join("/"),e||(e="/"),e},toffee.__partial=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),toffee.__inlineInclude(f,n,t)},toffee.__snippet=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.noInheritance=!0,toffee.__inlineInclude(f,n,t)},toffee.__load=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.repress=!0,toffee.__inlineInclude(f,n,t)},toffee.__inlineInclude=function(e,t,f){var n,o,l,r,u,_,a,i,p;for(r=t||{},r.passback={},r.__toffee=r.__toffee||{},i={},u=["passback","load","print","partial","snippet","layout","__toffee","postProcess"],n=0,l=u.length;n<l;n++)o=u[n],i[o]=!0;if(!r.__toffee.noInheritance)for(o in f)p=f[o],null==(null!=t?t[o]:void 0)&&null==i[o]&&(r[o]=p);if(toffee.templates[e]){a=toffee.templates[e].pub(r),_=r.passback;for(o in _)p=_[o],f[o]=p;return a}return"Inline toffee include: Could not find "+e};
+var toffee;void 0!==toffee&&null!==toffee||(toffee={}),toffee.templates||(toffee.templates={}),toffee.states={TOFFEE:1,COFFEE:2},toffee.__json=function(e,t){return null==t?"null":""+JSON.stringify(t).replace(/</g,"\\u003C").replace(/>/g,"\\u003E").replace(/&/g,"\\u0026").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")},toffee.__raw=function(e,t){return t},toffee.__html=function(e,t){return(""+t).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},toffee.__escape=function(e,t){var f;return f=null==e.__toffee.autoEscape||e.__toffee.autoEscape,f?void 0===t?"":null!=t&&"object"==typeof t?e.json(t):e.html(t):t},toffee.__augmentLocals=function(e,t){var f,n;return f=e,n=f.__toffee={out:[]},null==f.print&&(f.print=function(e){return toffee.__print(f,e)}),null==f.json&&(f.json=function(e){return toffee.__json(f,e)}),null==f.raw&&(f.raw=function(e){return toffee.__raw(f,e)}),null==f.html&&(f.html=function(e){return toffee.__html(f,e)}),null==f.escape&&(f.escape=function(e){return toffee.__escape(f,e)}),null==f.partial&&(f.partial=function(e,n){return toffee.__partial(toffee.templates[""+t],f,e,n)}),null==f.snippet&&(f.snippet=function(e,n){return toffee.__snippet(toffee.templates[""+t],f,e,n)}),null==f.load&&(f.load=function(e,n){return toffee.__load(toffee.templates[""+t],f,e,n)}),n.print=f.print,n.json=f.json,n.raw=f.raw,n.html=f.html,n.escape=f.escape,n.partial=f.partial,n.snippet=f.snippet,n.load=f.load},toffee.__print=function(e,t){return e.__toffee.state===toffee.states.COFFEE?(e.__toffee.out.push(t),""):""+t},toffee.__normalize=function(e){var t,f,n,o,l;if(null==e||"/"===e)return e;for(l=e.split("/"),n=[],l[0]&&n.push(""),t=0,f=l.length;t<f;t++)o=l[t],".."===o?n.length>1?n.pop():n.push(o):"."!==o&&n.push(o);return e=n.join("/"),e||(e="/"),e},toffee.__partial=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),toffee.__inlineInclude(f,n,t)},toffee.__snippet=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.noInheritance=!0,toffee.__inlineInclude(f,n,t)},toffee.__load=function(e,t,f,n){return f=toffee.__normalize(e.bundlePath+"/../"+f),n=null!=n?n:{},n.__toffee=n.__toffee||{},n.__toffee.repress=!0,toffee.__inlineInclude(f,n,t)},toffee.__inlineInclude=function(e,t,f){var n,o,l,r,u,a,_,i,p;for(r=t||{},r.passback={},r.__toffee=r.__toffee||{},i={},u=["passback","load","print","partial","snippet","layout","__toffee","postProcess"],n=0,l=u.length;n<l;n++)o=u[n],i[o]=!0;if(!r.__toffee.noInheritance)for(o in f)p=f[o],null==(null!=t?t[o]:void 0)&&null==i[o]&&(r[o]=p);if(toffee.templates[e]){_=toffee.templates[e].pub(r),a=r.passback;for(o in a)p=a[o],f[o]=p;return _}return"Inline toffee include: Could not find "+e};
 ;
 (function() {
   var tmpl;
@@ -52,4 +52,4 @@
     return tmpl.pub(__toffee_run_input);
   }
 
-}).call(this);
+}).call(this);

test/support/all.js

@@ -2,7 +2,6 @@ var chai = require('chai')
 var W = require('when')
 var path = require('path')
 var fs = require('fs')
-var util = require('util')
 var accord = require('../..')
 
 global.should = chai.should()