Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		
						commit
						c9ce150fe8
					
				
					 2 changed files with 11 additions and 24 deletions
				
			
		|  | @ -45,7 +45,7 @@ | |||
| 		"@redocly/openapi-core": "1.0.0-beta.54", | ||||
| 		"@types/fluent-ffmpeg": "2.1.17", | ||||
| 		"cross-env": "7.0.3", | ||||
| 		"cypress": "8.5.0", | ||||
| 		"cypress": "9.0.0", | ||||
| 		"start-server-and-test": "1.14.0" | ||||
| 	} | ||||
| } | ||||
|  |  | |||
							
								
								
									
										33
									
								
								yarn.lock
									
										
									
									
									
								
							
							
						
						
									
										33
									
								
								yarn.lock
									
										
									
									
									
								
							|  | @ -2,10 +2,10 @@ | |||
| # yarn lockfile v1 | ||||
| 
 | ||||
| 
 | ||||
| "@cypress/request@^2.88.6": | ||||
|   version "2.88.6" | ||||
|   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9" | ||||
|   integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ== | ||||
| "@cypress/request@^2.88.7": | ||||
|   version "2.88.7" | ||||
|   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.7.tgz#386d960ab845a96953723348088525d5a75aaac4" | ||||
|   integrity sha512-FTULIP2rnDJvZDT9t6B4nSfYR40ue19tVmv3wUcY05R9/FPCoMl1nAPJkzWzBCo7ltVn5ThQTbxiMoGBN7k0ig== | ||||
|   dependencies: | ||||
|     aws-sign2 "~0.7.0" | ||||
|     aws4 "^1.8.0" | ||||
|  | @ -1045,12 +1045,12 @@ csso@~2.3.1: | |||
|     clap "^1.0.9" | ||||
|     source-map "^0.5.3" | ||||
| 
 | ||||
| cypress@8.5.0: | ||||
|   version "8.5.0" | ||||
|   resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.5.0.tgz#5712ca170913f8344bf167301205c4217c1eb9bd" | ||||
|   integrity sha512-MMkXIS+Ro2KETn4gAlG3tIc/7FiljuuCZP0zpd9QsRG6MZSyZW/l1J3D4iQM6WHsVxuX4rFChn5jPFlC2tNSvQ== | ||||
| cypress@9.0.0: | ||||
|   version "9.0.0" | ||||
|   resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.0.0.tgz#8c496f7f350e611604cc2f77b663fb81d0c235d2" | ||||
|   integrity sha512-/93SWBZTw7BjFZ+I9S8SqkFYZx7VhedDjTtRBmXO0VzTeDbmxgK/snMJm/VFjrqk/caWbI+XY4Qr80myDMQvYg== | ||||
|   dependencies: | ||||
|     "@cypress/request" "^2.88.6" | ||||
|     "@cypress/request" "^2.88.7" | ||||
|     "@cypress/xvfb" "^1.2.4" | ||||
|     "@types/node" "^14.14.31" | ||||
|     "@types/sinonjs__fake-timers" "^6.0.2" | ||||
|  | @ -1085,7 +1085,6 @@ cypress@8.5.0: | |||
|     ospath "^1.2.2" | ||||
|     pretty-bytes "^5.6.0" | ||||
|     proxy-from-env "1.0.0" | ||||
|     ramda "~0.27.1" | ||||
|     request-progress "^3.0.0" | ||||
|     supports-color "^8.1.1" | ||||
|     tmp "~0.2.1" | ||||
|  | @ -1113,7 +1112,7 @@ dayjs@^1.10.4: | |||
|   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" | ||||
|   integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== | ||||
| 
 | ||||
| debug@4.3.2, debug@^4.3.2: | ||||
| debug@4.3.2, debug@^4.1.1, debug@^4.3.2: | ||||
|   version "4.3.2" | ||||
|   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" | ||||
|   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== | ||||
|  | @ -1134,13 +1133,6 @@ debug@^3.1.0: | |||
|   dependencies: | ||||
|     ms "^2.1.1" | ||||
| 
 | ||||
| debug@^4.1.1: | ||||
|   version "4.3.1" | ||||
|   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" | ||||
|   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== | ||||
|   dependencies: | ||||
|     ms "2.1.2" | ||||
| 
 | ||||
| decamelize@^1.1.1, decamelize@^1.1.2: | ||||
|   version "1.2.0" | ||||
|   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" | ||||
|  | @ -3335,11 +3327,6 @@ querystring@0.2.0: | |||
|   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" | ||||
|   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= | ||||
| 
 | ||||
| ramda@~0.27.1: | ||||
|   version "0.27.1" | ||||
|   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" | ||||
|   integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== | ||||
| 
 | ||||
| read-pkg-up@^1.0.1: | ||||
|   version "1.0.1" | ||||
|   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue