Merge branch 'master' into greenkeeper/@types/redis-2.8.1
This commit is contained in:
		
						commit
						0877f5ce0a
					
				
					 107 changed files with 2507 additions and 763 deletions
				
			
		
							
								
								
									
										15
									
								
								package.json
									
										
									
									
									
								
							
							
						
						
									
										15
									
								
								package.json
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
{
 | 
			
		||||
  "name": "misskey",
 | 
			
		||||
  "author": "syuilo <i@syuilo.com>",
 | 
			
		||||
  "version": "0.0.2747",
 | 
			
		||||
  "version": "0.0.2807",
 | 
			
		||||
  "license": "MIT",
 | 
			
		||||
  "description": "A miniblog-based SNS",
 | 
			
		||||
  "bugs": "https://github.com/syuilo/misskey/issues",
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
    "clean": "gulp clean",
 | 
			
		||||
    "cleanall": "gulp cleanall",
 | 
			
		||||
    "lint": "gulp lint",
 | 
			
		||||
    "test": "gulp test"
 | 
			
		||||
		"test": "gulp test"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@types/bcryptjs": "2.4.0",
 | 
			
		||||
| 
						 | 
				
			
			@ -53,10 +53,10 @@
 | 
			
		|||
    "@types/morgan": "1.7.33",
 | 
			
		||||
    "@types/ms": "0.7.30",
 | 
			
		||||
    "@types/multer": "1.3.2",
 | 
			
		||||
    "@types/node": "8.0.33",
 | 
			
		||||
    "@types/node": "8.0.47",
 | 
			
		||||
    "@types/ratelimiter": "2.1.28",
 | 
			
		||||
    "@types/redis": "2.8.1",
 | 
			
		||||
    "@types/request": "2.0.4",
 | 
			
		||||
    "@types/request": "2.0.7",
 | 
			
		||||
    "@types/rimraf": "2.0.0",
 | 
			
		||||
    "@types/riot": "3.6.0",
 | 
			
		||||
    "@types/serve-favicon": "2.2.28",
 | 
			
		||||
| 
						 | 
				
			
			@ -91,10 +91,11 @@
 | 
			
		|||
    "tslint": "5.7.0",
 | 
			
		||||
    "uglify-es": "3.0.27",
 | 
			
		||||
    "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
 | 
			
		||||
    "uglifyjs-webpack-plugin": "1.0.0-beta.2",
 | 
			
		||||
    "uglifyjs-webpack-plugin": "1.0.1",
 | 
			
		||||
    "webpack": "3.8.1"
 | 
			
		||||
  },
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@prezzemolo/rap": "0.1.2",
 | 
			
		||||
    "accesses": "2.5.0",
 | 
			
		||||
    "animejs": "2.2.0",
 | 
			
		||||
    "autwh": "0.0.1",
 | 
			
		||||
| 
						 | 
				
			
			@ -114,7 +115,7 @@
 | 
			
		|||
    "elasticsearch": "13.3.1",
 | 
			
		||||
    "escape-regexp": "0.0.1",
 | 
			
		||||
    "express": "4.15.4",
 | 
			
		||||
    "file-type": "6.2.0",
 | 
			
		||||
    "file-type": "7.2.0",
 | 
			
		||||
    "fuckadblock": "3.2.1",
 | 
			
		||||
    "gm": "1.23.0",
 | 
			
		||||
    "inquirer": "3.3.0",
 | 
			
		||||
| 
						 | 
				
			
			@ -140,7 +141,7 @@
 | 
			
		|||
    "redis": "2.8.0",
 | 
			
		||||
    "request": "2.83.0",
 | 
			
		||||
    "rimraf": "2.6.2",
 | 
			
		||||
    "riot": "3.7.3",
 | 
			
		||||
    "riot": "3.7.4",
 | 
			
		||||
    "rndstr": "1.0.0",
 | 
			
		||||
    "s-age": "1.1.0",
 | 
			
		||||
    "serve-favicon": "2.4.5",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue