Bump deps

linkedin · Jun 2, 2016 · 57cc554 · 57cc554
1 parent 7bc3b77
commit 57cc554
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 6,245 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
   - "0.12"
-  - "iojs"
+  - "5"
+  - "6"
 matrix:
   include:
     - node_js: "0.10"
@@ -11,10 +12,18 @@ notifications:
     - jchan@linkedin.com
     - skinast@linkedin.com
 before_install:
-  - npm install -g npm@2
+  - npm install -g npm@3
 before_script:
   - npm update
 sudo: false
 cache:
   directories:
     - node_modules
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -138,7 +138,7 @@ module.exports = function(grunt) {
         outfile: 'index.html',
         display: 'short',
         specs: ['test/templates/all.js', 'test/helpers/template.helper.js', 'test/templates.spec.js'],
-        vendor: ['node_modules/ayepromise/ayepromise.js', 'test/lib/highland.js', 'test/lib/jsreporter.js']
+        vendor: ['node_modules/ayepromise/ayepromise.js', 'node_modules/highland/dist/highland.js', 'test/lib/jsreporter.js']
       },
       /*tests production (minified) code*/
       testProd: {

diff --git a/lib/compiler.js b/lib/compiler.js
@@ -14,6 +14,9 @@
   var compiler = {},
       isArray = dust.isArray;
 
+  var escape = (typeof JSON === 'undefined') ?
+                  function(str) { return '"' + escapeToJsSafeString(str) + '"';} :
+                  JSON.stringify;
 
   compiler.compile = function(source, name) {
     // the name parameter is optional.
@@ -430,10 +433,6 @@
               .replace(TB, '\\t');
   }
 
-  var escape = (typeof JSON === 'undefined') ?
-                  function(str) { return '"' + escapeToJsSafeString(str) + '"';} :
-                  JSON.stringify;
-
   function renderSource(source, context, callback) {
     var tmpl = dust.loadSource(dust.compile(source));
     return loaderFor(tmpl)(context, callback);

diff --git a/package.json b/package.json
@@ -39,30 +39,30 @@
     "linkedin"
   ],
   "dependencies": {
-    "chokidar": "~1.0.1",
-    "cli": "~0.9.0"
+    "chokidar": "~1.5.1",
+    "cli": "~0.11.2"
   },
   "devDependencies": {
     "ayepromise": "~1.1.1",
-    "grunt": "~0.4.2",
-    "grunt-bump": "~0.3.1",
-    "grunt-cli": "~0.1.13",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-concat": "~0.5.1",
-    "grunt-contrib-connect": "~0.11.2",
-    "grunt-contrib-copy": "~0.8.0",
-    "grunt-contrib-jasmine": "~0.9.1",
-    "grunt-contrib-jshint": "~0.11.1",
-    "grunt-contrib-uglify": "~0.9.1",
-    "grunt-contrib-watch": "~0.6.1",
+    "grunt": "~1.0.1",
+    "grunt-bump": "~0.8.0",
+    "grunt-cli": "~1.2.0",
+    "grunt-contrib-clean": "~1.0.0",
+    "grunt-contrib-concat": "~1.0.1",
+    "grunt-contrib-connect": "~1.0.2",
+    "grunt-contrib-copy": "~1.0.0",
+    "grunt-contrib-jasmine": "~1.0.3",
+    "grunt-contrib-jshint": "~1.0.0",
+    "grunt-contrib-uglify": "~1.0.1",
+    "grunt-contrib-watch": "~1.0.0",
     "grunt-execute": "~0.2.2",
-    "grunt-github-changes": "~0.0.6",
-    "grunt-jasmine-nodejs": "~1.4.0",
+    "grunt-github-changes": "~0.1.0",
+    "grunt-jasmine-nodejs": "~1.5.3",
     "grunt-peg": "~2.0.0",
     "grunt-saucelabs": "~8.6.1",
-    "grunt-shell": "~1.1.2",
-    "grunt-template-jasmine-istanbul": "~0.3.3",
-    "highland": "2.4.0",
+    "grunt-shell": "~1.3.0",
+    "grunt-template-jasmine-istanbul": "~0.4.0",
+    "highland": "2.8.1",
     "pegjs": "0.9.0",
     "rhino-1_7r3-bin": "~1.0.1",
     "rhino-1_7r5-bin": "~1.0.1",