Merge pull request #448 from getsentry/deps

mattrobenolt · mattrobenolt · commit 5d0db9532be7 · 2016-01-04T18:37:58.000-08:00
Bump all build deps to latest
diff --git a/.jshintrc b/.jshintrc
@@ -5,6 +5,7 @@
     "predef": [
         "console",
         "module",
-        "require"
+        "require",
+        "JSON"
     ]
 }
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,4 @@ language: node_js
 node_js:
     - "0.12"
 script:
-    - ./node_modules/.bin/grunt test
+    - node_modules/.bin/grunt test
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,12 +1,11 @@
-var proxyquire = require('proxyquireify');
-var versionify = require('browserify-versionify');
-
 module.exports = function(grunt) {
     "use strict";
 
     var _ = require('lodash');
     var path = require('path');
     var through = require('through2');
+    var proxyquire = require('proxyquireify');
+    var versionify = require('browserify-versionify');
 
     var excludedPlugins = [
         'react-native'
@@ -132,7 +131,8 @@ module.exports = function(grunt) {
                 sourceMappingURL: function (dest) {
                     return path.basename(dest, '.js') + '.map';
                 },
-                preserveComments: 'some',
+                // Only preserve comments that start with (!)
+                preserveComments: /^!/,
                 compress: {
                     dead_code: true,
                     global_defs: {
diff --git a/package.json b/package.json
@@ -17,21 +17,22 @@
     "chai": "2.3.0",
     "grunt": "^0.4.5",
     "grunt-browserify": "^4.0.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "~0.5.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-jshint": "~0.6.3",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-gitinfo": "~0.1.1",
-    "grunt-mocha": "~0.4.1",
-    "grunt-release": "~0.6.0",
-    "grunt-s3": "~0.2.0-alpha.3",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-clean": "^0.7.0",
+    "grunt-contrib-concat": "^0.5.1",
+    "grunt-contrib-connect": "^0.11.2",
+    "grunt-contrib-copy": "^0.8.2",
+    "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "^0.11.0",
+    "grunt-gitinfo": "^0.1.7",
+    "grunt-mocha": "^0.4.15",
+    "grunt-release": "^0.13.0",
+    "grunt-s3": "0.2.0-alpha.3",
     "grunt-sri": "mattrobenolt/grunt-sri#pretty",
-    "lodash": "~2.4.0",
-    "proxyquireify": "^3.0.0",
-    "sinon": "~1.7.3",
+    "lodash": "^3.10.1",
+    "mocha": "^1.21.5",
+    "proxyquireify": "^3.0.1",
+    "sinon": "1.7.3",
     "through2": "^2.0.0"
   },
   "keywords": [
diff --git a/test/index.html b/test/index.html
@@ -3,12 +3,12 @@
   <head>
     <title>Raven.js Test Suite</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="stylesheet" href="../node_modules/grunt-mocha/node_modules/mocha/mocha.css" />
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
   </head>
   <body>
     <div id="mocha"></div>
     <!-- Mocha -->
-    <script src="../node_modules/grunt-mocha/node_modules/mocha/mocha.js"></script>
+    <script src="../node_modules/mocha/mocha.js"></script>
     <script src="../node_modules/chai/chai.js"></script>
     <script>
         mocha.ui('bdd');
diff --git a/test/integration/index.html b/test/integration/index.html
@@ -3,12 +3,12 @@
   <head>
     <title>Raven.js Test Suite</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="stylesheet" href="../../node_modules/grunt-mocha/node_modules/mocha/mocha.css" />
+    <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
   </head>
   <body>
     <div id="mocha"></div>
     <!-- Mocha -->
-    <script src="../../node_modules/grunt-mocha/node_modules/mocha/mocha.js"></script>
+    <script src="../../node_modules/mocha/mocha.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script>
         mocha.ui('bdd');

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`"predef": [`
`6`	`6`	`"console",`
`7`	`7`	`"module",`
`8`		`- "require"`
	`8`	`+ "require",`
	`9`	`+ "JSON"`
`9`	`10`	`]`
`10`	`11`	`}`