mirror of https://github.com/Chocobozzz/PeerTube
Fix client peer dependencies
parent
ec8d8440a8
commit
f9b2d2cedd
|
@ -27,7 +27,8 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, {
|
|||
*
|
||||
* See: http://webpack.github.io/docs/configuration.html#cli
|
||||
*/
|
||||
module.exports = webpackMerge(commonConfig({env: ENV}), {
|
||||
module.exports = function (env) {
|
||||
return webpackMerge(commonConfig({env: ENV}), {
|
||||
/**
|
||||
* Merged metadata from webpack.common.js for index.html
|
||||
*
|
||||
|
@ -157,5 +158,5 @@ module.exports = webpackMerge(commonConfig({env: ENV}), {
|
|||
clearImmediate: false,
|
||||
setImmediate: false
|
||||
}
|
||||
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
@ -37,16 +37,17 @@
|
|||
"angular2-template-loader": "^0.5.0",
|
||||
"assets-webpack-plugin": "^3.4.0",
|
||||
"awesome-typescript-loader": "^2.2.1",
|
||||
"bootstrap-loader": "^1.0.8",
|
||||
"bootstrap-loader": "^2.0.0-beta.11",
|
||||
"bootstrap-sass": "^3.3.6",
|
||||
"compression-webpack-plugin": "^0.3.1",
|
||||
"copy-webpack-plugin": "^3.0.1",
|
||||
"core-js": "^2.4.1",
|
||||
"css-loader": "^0.25.0",
|
||||
"css-to-string-loader": "^0.1.1",
|
||||
"css-to-string-loader": "https://github.com/Chocobozzz/css-to-string-loader#patch-1",
|
||||
"es6-promise": "^3.0.2",
|
||||
"es6-promise-loader": "^1.0.1",
|
||||
"es6-shim": "^0.35.0",
|
||||
"extract-text-webpack-plugin": "^2.0.0-beta.4",
|
||||
"file-loader": "^0.9.0",
|
||||
"html-webpack-plugin": "^2.19.0",
|
||||
"ie-shim": "^0.1.0",
|
||||
|
@ -69,7 +70,7 @@
|
|||
"tslint-loader": "^2.1.4",
|
||||
"typescript": "^2.0.0",
|
||||
"url-loader": "^0.5.7",
|
||||
"webpack": "^2.1.0-beta.21",
|
||||
"webpack": "2.1.0-beta.22",
|
||||
"webpack-md5-hash": "0.0.5",
|
||||
"webpack-merge": "^0.14.1",
|
||||
"webpack-notifier": "^1.3.0",
|
||||
|
|
|
@ -23,7 +23,7 @@ function authenticate (req, res, next) {
|
|||
return res.sendStatus(500)
|
||||
}
|
||||
|
||||
if (res.statusCode === 401 || res.statusCode === 400) return res.end()
|
||||
if (res.statusCode === 401 || res.statusCode === 400 || res.statusCode === 503) return res.end()
|
||||
|
||||
return next()
|
||||
})
|
||||
|
|
|
@ -697,13 +697,6 @@ describe('Test parameters validator', function () {
|
|||
.set('Authorization', 'Bearer ' + server.accessToken)
|
||||
.expect(404, done)
|
||||
})
|
||||
|
||||
it('Should success with the correct parameters', function (done) {
|
||||
request(server.url)
|
||||
.delete(path + userId)
|
||||
.set('Authorization', 'Bearer ' + server.accessToken)
|
||||
.expect(204, done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in New Issue