yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00
Code Issues Releases Wiki Activity

Removed shrinkwrap since it doesn't work properly on Travis. Force the engine to old jade, add then-jade dependency temporarily until template-html-loader uses new consolidate.js.

Browse source 
Update slack-client to @slack/client to latest version.
This commit is contained in:
Gunther Brunner 2016-08-05 18:56:38 +09:00
parent dfec901ba3
commit 48d621b194
4 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/units/notify/slack.js
View file

@ -1,6 +1,6 @@
var util = require('util') var util = require('util')
var WebClient = require('slack-client').WebClient var WebClient = require('@slack/client').WebClient
var Promise = require('bluebird') var Promise = require('bluebird')
var logger = require('../../util/logger') var logger = require('../../util/logger')

18
npm-shrinkwrap.json generated
View file

@ -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"
}
}
}
}
}

3
package.json
View file

@ -30,6 +30,7 @@
"prepublish": "bower install && not-in-install && gulp build || in-install" "prepublish": "bower install && not-in-install && gulp build || in-install"
}, },
"dependencies": { "dependencies": {
"@slack/client": "^3.5.4",
"adbkit": "^2.4.1", "adbkit": "^2.4.1",
"adbkit-apkreader": "^1.0.0", "adbkit-apkreader": "^1.0.0",
"adbkit-monkey": "^1.0.1", "adbkit-monkey": "^1.0.1",
@ -74,7 +75,6 @@
"semver": "^5.0.1", "semver": "^5.0.1",
"serve-favicon": "^2.2.0", "serve-favicon": "^2.2.0",
"serve-static": "^1.9.2", "serve-static": "^1.9.2",
"slack-client": "^2.0.0-beta.3",
"socket.io": "1.4.8", "socket.io": "1.4.8",
"split": "^1.0.0", "split": "^1.0.0",
"stf-appstore-db": "^1.0.0", "stf-appstore-db": "^1.0.0",
@ -140,6 +140,7 @@
"socket.io-client": "1.4.8", "socket.io-client": "1.4.8",
"style-loader": "^0.13.0", "style-loader": "^0.13.0",
"template-html-loader": "^0.0.3", "template-html-loader": "^0.0.3",
"then-jade": "^2.4.1",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"webpack": "^1.12.11", "webpack": "^1.12.11",
"webpack-dev-server": "^1.14.1" "webpack-dev-server": "^1.14.1"

2
webpack.config.js
View file

@ -56,7 +56,7 @@ module.exports = {
, {test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff'} , {test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff'}
, {test: /\.ttf/, 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: /\.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: /\.html$/, loader: 'html-loader'}
, {test: /angular\.js$/, loader: 'exports?angular'} , {test: /angular\.js$/, loader: 'exports?angular'}
, {test: /angular-cookies\.js$/, loader: 'imports?angular=angular'} , {test: /angular-cookies\.js$/, loader: 'imports?angular=angular'}