Package updates.

ForstaLabs · Nov 25, 2017 · d2adbc8 · d2adbc8
1 parent 5382bd8
commit d2adbc8
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 56 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,36 @@
+{
+    "parserOptions": {
+        "ecmaVersion": 8
+    },
+    "env": {
+        "es6": true,
+        "browser": true
+    },
+    "globals": {
+      "F": true,
+      "_": true,
+      "$": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "quotes": "off",
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-console": "off",
+        "no-debugger": "off",
+        "no-unused-vars": [
+            "error",
+            {
+                "args": "none"
+            }
+        ],
+        "no-constant-condition": [
+            "error",
+            {
+                "checkLoops": false
+            }
+        ]
+    }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -53,7 +53,7 @@ module.exports = function(grunt) {
           "blueimp-md5/js/md5.min.js",  // Cleaner than !min version
           "emojijs/lib/emoji.js",
           "jquery-oembed-all/jquery.oembed.js",
-          "dompurify/src/purify.js",
+          "dompurify/dist/purify.js",
           "platform.js/platform.js",
           "../lib/forstadown.js",
           "../lib/async_queue.js",

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ $(BOWER): $(PACKAGES) bower.json Makefile
 
 ifneq ($(NODE_ENV),production)
 $(LINT): $(SRC)
-	$(NPATH)/eslint app lib
+	$(NPATH)/eslint app lib worker
 	touch $@
 
 $(TEST): $(SRC) $(shell find tests -type f)

diff --git a/bower.json b/bower.json
@@ -1,25 +1,21 @@
 {
   "name": "relay-web-app",
-  "version": "0.3.0",
-  "homepage": "https://github.com/forstalabs/relay-web-app",
   "license": "GPLv3",
-  "private": true,
   "dependencies": {
     "jquery": "3.2.1",
     "underscore": "1.8.3",
     "backbone": "1.3.3",
     "protobuf": "3.8.0",
-    "mustache": "0.8.2",
     "qrcode": "https://github.com/davidshimjs/qrcodejs.git#1c78ccd71",
-    "moment": "2.14.0",
-    "handlebars": "4.0.10",
-    "blueimp-md5": "2.7.0",
-    "dompurify": "dompurify#0.9.0",
+    "moment": "2.19.2",
+    "handlebars": "4.0.11",
+    "blueimp-md5": "2.10.0",
+    "dompurify": "1.0.2",
     "platform.js": "platform#1.3.4",
-    "raven-js": "3.18.1",
+    "raven-js": "3.20.1",
     "emojijs": "https://github.com/iamcal/js-emoji.git#v3.2.2",
     "emoji-data": "3.0.0",
-    "blueimp-load-image": "2.12.2",
+    "blueimp-load-image": "2.17.1",
     "jquery-oembed-all": "https://github.com/nfl/jquery-oembed-all.git#fbc982e76c",
     "quill": "1.3.1"
   }

diff --git a/package.json b/package.json
@@ -21,62 +21,23 @@
     "url": "https://github.com/forstalabs/relay-web-app/issues"
   },
   "homepage": "https://github.com/forstalabs/relay-web-app",
-  "eslintConfig": {
-    "parserOptions": {
-      "ecmaVersion": 8
-    },
-    "env": {
-      "browser": true,
-      "es6": true
-    },
-    "globals": {
-      "F": true,
-      "_": true,
-      "$": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-      "quotes": "off",
-      "semi": [
-        "error",
-        "always"
-      ],
-      "no-console": "off",
-      "no-debugger": "off",
-      "no-unused-vars": [
-        "error",
-        {
-          "args": "none"
-        }
-      ],
-      "no-constant-condition": [
-        "error",
-        {
-          "checkLoops": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "libsignal-protocol.js"
-  ],
   "dependencies": {
-    "bower": "1.8.0",
-    "express": "4.15.3",
+    "bower": "1.8.2",
+    "express": "4.16.2",
     "grunt": "1.0.1",
     "grunt-cli": "1.2.0",
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-sass": "1.0.0",
-    "grunt-contrib-uglify": "github:gruntjs/grunt-contrib-uglify.git#harmony",
+    "grunt-contrib-uglify": "github:gruntjs/grunt-contrib-uglify#harmony",
     "http-proxy": "1.16.2",
     "librelay-web": "github:ForstaLabs/librelay-web#ffd8bd74be08",
     "libsignal-protocol": "github:ForstaLabs/libsignal-protocol-javascript#ec2b471fb7af",
-    "morgan": "1.8.2",
+    "morgan": "1.9.0",
     "semantic-ui": "2.2.13"
   },
   "devDependencies": {
-    "eslint": "4.2.0",
+    "eslint": "4.11.0",
     "grunt-contrib-watch": "1.0.0"
   }
 }