Merge branch 'master' into greenkeeper/typescript-2.4.2
This commit is contained in:
		
						commit
						89f466df04
					
				
							
								
								
									
										22
									
								
								package.json
								
								
								
								
							
							
						
						
									
										22
									
								
								package.json
								
								
								
								
							|  | @ -24,7 +24,7 @@ | |||
|     "@types/bcryptjs": "2.4.0", | ||||
|     "@types/body-parser": "1.16.4", | ||||
|     "@types/chai": "4.0.1", | ||||
|     "@types/chai-http": "0.0.30", | ||||
|     "@types/chai-http": "3.0.0", | ||||
|     "@types/chalk": "0.4.31", | ||||
|     "@types/compression": "0.0.33", | ||||
|     "@types/cors": "2.8.1", | ||||
|  | @ -45,7 +45,7 @@ | |||
|     "@types/inquirer": "0.0.34", | ||||
|     "@types/is-root": "1.0.0", | ||||
|     "@types/is-url": "1.2.28", | ||||
|     "@types/js-yaml": "3.5.30", | ||||
|     "@types/js-yaml": "3.9.0", | ||||
|     "@types/mocha": "2.2.41", | ||||
|     "@types/mongodb": "2.2.7", | ||||
|     "@types/monk": "1.0.5", | ||||
|  | @ -55,15 +55,15 @@ | |||
|     "@types/node": "8.0.9", | ||||
|     "@types/ratelimiter": "2.1.28", | ||||
|     "@types/redis": "2.6.0", | ||||
|     "@types/request": "0.0.45", | ||||
|     "@types/request": "2.0.0", | ||||
|     "@types/rimraf": "0.0.28", | ||||
|     "@types/riot": "2.6.2", | ||||
|     "@types/serve-favicon": "2.2.28", | ||||
|     "@types/uuid": "3.0.0", | ||||
|     "@types/uuid": "3.4.0", | ||||
|     "@types/webpack": "3.0.2", | ||||
|     "@types/webpack-stream": "3.2.7", | ||||
|     "@types/websocket": "0.0.34", | ||||
|     "chai": "4.0.2", | ||||
|     "chai": "4.1.0", | ||||
|     "chai-http": "3.0.0", | ||||
|     "css-loader": "0.28.4", | ||||
|     "event-stream": "3.3.4", | ||||
|  | @ -75,7 +75,7 @@ | |||
|     "gulp-rename": "1.2.2", | ||||
|     "gulp-replace": "0.6.1", | ||||
|     "gulp-tslint": "8.1.1", | ||||
|     "gulp-typescript": "3.2.0", | ||||
|     "gulp-typescript": "3.2.1", | ||||
|     "gulp-uglify": "3.0.0", | ||||
|     "gulp-util": "3.0.8", | ||||
|     "mocha": "3.4.2", | ||||
|  | @ -84,12 +84,12 @@ | |||
|     "style-loader": "0.18.2", | ||||
|     "stylus": "0.54.5", | ||||
|     "stylus-loader": "3.0.1", | ||||
|     "swagger-jsdoc": "1.9.5", | ||||
|     "swagger-jsdoc": "1.9.6", | ||||
|     "tslint": "5.5.0", | ||||
|     "uglify-es": "3.0.24", | ||||
|     "uglify-es-webpack-plugin": "0.0.2", | ||||
|     "uglify-es-webpack-plugin": "0.0.3", | ||||
|     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony", | ||||
|     "webpack": "3.1.0" | ||||
|     "webpack": "3.3.0" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "accesses": "2.5.0", | ||||
|  | @ -100,7 +100,7 @@ | |||
|     "cafy": "2.4.0", | ||||
|     "chalk": "2.0.1", | ||||
|     "compression": "1.6.2", | ||||
|     "cors": "2.8.3", | ||||
|     "cors": "2.8.4", | ||||
|     "cropperjs": "1.0.0-rc.3", | ||||
|     "crypto": "0.0.3", | ||||
|     "debug": "2.6.8", | ||||
|  | @ -143,7 +143,7 @@ | |||
|     "syuilo-password-strength": "0.0.1", | ||||
|     "tcp-port-used": "0.1.2", | ||||
|     "textarea-caret": "3.0.2", | ||||
|     "ts-node": "3.2.0", | ||||
|     "ts-node": "3.2.1", | ||||
|     "typescript": "2.4.2", | ||||
|     "uuid": "3.1.0", | ||||
|     "vhost": "3.0.2", | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue