merge from 2.7

CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Change Log
 
+### v2.7.5 (2016/12/09 13:49 +00:00)
+- [#756](https://github.com/linkedin/dustjs/pull/756) Decrease security vulnerabilities by upgrading cli dependency (#754 #748) (@danactive)
+
+### v2.7.4 (2016/09/13 02:52 +00:00)
+- [#744](https://github.com/linkedin/dustjs/pull/744) Don't use instanceof to determine if a Context is a Context. Instead use a flag on the instance itself so it can survive object merges. (@sethkinast)
+
+### v2.6.3 (2016/07/26 18:03 +00:00)
+- [#736](https://github.com/linkedin/dustjs/pull/736) Prioritize resolution of .then (@brianmhunt)
+- [#734](https://github.com/linkedin/dustjs/pull/734) Bump deps (@sethkinast)
+- [#703](https://github.com/linkedin/dustjs/pull/703) Upgrade to peg.js 0.9 (@sethkinast)
+- [#705](https://github.com/linkedin/dustjs/pull/705) When rendering with a Context object, use the templateName provided by the template (@sethkinast)
+- [#701](https://github.com/linkedin/dustjs/pull/701) Fix stacktrace logging for IE8 (@sethkinast)
+- [#700](https://github.com/linkedin/dustjs/pull/700) At `DEBUG` loglevel, log the full stack trace on errors (@r1b)
+- [#690](https://github.com/linkedin/dustjs/pull/690) Update deps (@sethkinast)
+- [#689](https://github.com/linkedin/dustjs/pull/689) Make the AMD loader pass the template directly rather than communicating via the cache (@aredridel)
+
 ### v2.7.2 (2015/06/08 20:41 +00:00)
 - [#673](https://github.com/linkedin/dustjs/pull/673) Pass the current context to filters (@sethkinast)
 - [#676](https://github.com/linkedin/dustjs/pull/676) If a Promise is resolved with an array, iterate over it instead of rendering the whole array at once.  Closes #674 (@sethkinast)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "dustjs-linkedin",
-  "version": "2.7.2",
+  "version": "2.7.5",
   "homepage": "https://github.com/linkedin/dustjs",
   "authors": [
     "Veena Basavaraj <[email protected]>",

dist/dust-core.js

@@ -1,4 +1,4 @@
-/*! dustjs-linkedin - v2.7.2
+/*! dustjs-linkedin - v2.7.5
 * http://dustjs.com/
 * Copyright (c) 2021 Aleksander Williams; Released under the MIT License */
 (function (root, factory) {
@@ -11,7 +11,7 @@
   }
 }(this, function() {
   var dust = {
-        "version": "2.7.2"
+        "version": "2.7.5"
       },
       NONE = 'NONE', ERROR = 'ERROR', WARN = 'WARN', INFO = 'INFO', DEBUG = 'DEBUG',
       EMPTY_FUNC = function() {};
@@ -750,7 +750,7 @@
 
   /**
    * Like Chunk#map but additionally resolves a thenable.  If the thenable succeeds the callback is invoked with
-   * a new chunk that can be used to asynchronously render or write to it, otherwise if the thenable is rejected 
+   * a new chunk that can be used to asynchronously render or write to it, otherwise if the thenable is rejected
    * then the error body is rendered if available, an error is logged, and the callback is never invoked.
    * @param {Chunk} The current chunk to insert a new chunk
    * @param thenable {Thenable} the target thenable to await
@@ -765,8 +765,8 @@
         try {
           callback(asyncChunk, data);
         } catch (err) {
-          // handle errors the same way Chunk#map would.  This logic is only here since the thenable defers 
-          // logic such that the try / catch in Chunk#map would not capture it. 
+          // handle errors the same way Chunk#map would.  This logic is only here since the thenable defers
+          // logic such that the try / catch in Chunk#map would not capture it.
           dust.log(err, ERROR);
           asyncChunk.setError(err);
         }

dist/dust-full.js

@@ -1,4 +1,4 @@
-/*! dustjs-linkedin - v2.7.2
+/*! dustjs-linkedin - v2.7.5
 * http://dustjs.com/
 * Copyright (c) 2021 Aleksander Williams; Released under the MIT License */
 (function (root, factory) {
@@ -11,7 +11,7 @@
   }
 }(this, function() {
   var dust = {
-        "version": "2.7.2"
+        "version": "2.7.5"
       },
       NONE = 'NONE', ERROR = 'ERROR', WARN = 'WARN', INFO = 'INFO', DEBUG = 'DEBUG',
       EMPTY_FUNC = function() {};

lib/dust.js

@@ -8,7 +8,7 @@
   }
 }(this, function() {
   var dust = {
-        "version": "2.7.2"
+        "version": "2.7.5"
       },
       NONE = 'NONE', ERROR = 'ERROR', WARN = 'WARN', INFO = 'INFO', DEBUG = 'DEBUG',
       EMPTY_FUNC = function() {};
@@ -747,7 +747,7 @@
 
   /**
    * Like Chunk#map but additionally resolves a thenable.  If the thenable succeeds the callback is invoked with
-   * a new chunk that can be used to asynchronously render or write to it, otherwise if the thenable is rejected 
+   * a new chunk that can be used to asynchronously render or write to it, otherwise if the thenable is rejected
    * then the error body is rendered if available, an error is logged, and the callback is never invoked.
    * @param {Chunk} The current chunk to insert a new chunk
    * @param thenable {Thenable} the target thenable to await
@@ -762,8 +762,8 @@
         try {
           callback(asyncChunk, data);
         } catch (err) {
-          // handle errors the same way Chunk#map would.  This logic is only here since the thenable defers 
-          // logic such that the try / catch in Chunk#map would not capture it. 
+          // handle errors the same way Chunk#map would.  This logic is only here since the thenable defers
+          // logic such that the try / catch in Chunk#map would not capture it.
           dust.log(err, ERROR);
           asyncChunk.setError(err);
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dustjs-linkedin",
-  "version": "2.7.2",
+  "version": "2.7.5",
   "author": {
     "name": "Aleksander Williams",
     "url": "http://akdubya.github.com/dustjs"