diff --git a/lib/units/notify/slack.js b/lib/units/notify/slack.js index cef523e1..29c2ed6e 100644 --- a/lib/units/notify/slack.js +++ b/lib/units/notify/slack.js @@ -1,6 +1,6 @@ var util = require('util') -var WebClient = require('slack-client').WebClient +var WebClient = require('@slack/client').WebClient var Promise = require('bluebird') var logger = require('../../util/logger') diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json deleted file mode 100644 index 7cda09f3..00000000 --- a/npm-shrinkwrap.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "stf", - "version": "2.0.1", - "dependencies": { - "template-html-loader": { - "version": "0.0.3", - "from": "template-html-loader@>=0.0.3 <0.0.4", - "resolved": "http://registry.npmjs.org/template-html-loader/-/template-html-loader-0.0.3.tgz", - "dependencies": { - "consolidate": { - "version": "0.14.1", - "from": "consolidate@>=0.14.0 <0.14.1", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.1.tgz" - } - } - } - } -} diff --git a/package.json b/package.json index 40a403cf..f8fda135 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "prepublish": "bower install && not-in-install && gulp build || in-install" }, "dependencies": { + "@slack/client": "^3.5.4", "adbkit": "^2.4.1", "adbkit-apkreader": "^1.0.0", "adbkit-monkey": "^1.0.1", @@ -74,7 +75,6 @@ "semver": "^5.0.1", "serve-favicon": "^2.2.0", "serve-static": "^1.9.2", - "slack-client": "^2.0.0-beta.3", "socket.io": "1.4.8", "split": "^1.0.0", "stf-appstore-db": "^1.0.0", @@ -140,6 +140,7 @@ "socket.io-client": "1.4.8", "style-loader": "^0.13.0", "template-html-loader": "^0.0.3", + "then-jade": "^2.4.1", "url-loader": "^0.5.7", "webpack": "^1.12.11", "webpack-dev-server": "^1.14.1" diff --git a/webpack.config.js b/webpack.config.js index 73f4dc18..bdc6154b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -56,7 +56,7 @@ module.exports = { , {test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff'} , {test: /\.ttf/, loader: 'url?limit=1&mimetype=application/font-woff'} , {test: /\.eot/, loader: 'url?limit=1&mimetype=vnd.ms-fontobject'} - , {test: /\.pug$/, loader: 'template-html-loader'} + , {test: /\.pug$/, loader: 'template-html-loader?engine=jade'} , {test: /\.html$/, loader: 'html-loader'} , {test: /angular\.js$/, loader: 'exports?angular'} , {test: /angular-cookies\.js$/, loader: 'imports?angular=angular'}