Skip to content

Commit

Permalink
Removed shrinkwrap since it doesn't work properly on Travis. Force th…
Browse files Browse the repository at this point in the history
…e engine to old jade, add `then-jade` dependency temporarily until `template-html-loader` uses new `consolidate.js`.

Update slack-client to @slack/client to latest version.
  • Loading branch information
gunta committed Aug 5, 2016
1 parent dfec901 commit 48d621b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 21 deletions.
2 changes: 1 addition & 1 deletion lib/units/notify/slack.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
18 changes: 0 additions & 18 deletions npm-shrinkwrap.json

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down

0 comments on commit 48d621b

Please sign in to comment.