Merge branch 'develop' into update-deps

update node
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
2023-09-03 16:56:31 +09:00 · 2023-09-03 16:56:24 +09:00 · 2023-09-03 16:55:30 +09:00 · 2023-09-03 16:42:32 +09:00 · 2023-09-02 13:16:05 +09:00
5 changed files with 5 additions and 4 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -6,7 +6,7 @@
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.5.0"
+			"version": "20.5.1"
 		}
 	},
 	"forwardPorts": [3000],
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-20.5.0
+20.5.1
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4

-ARG NODE_VERSION=20.5.0-bullseye
+ARG NODE_VERSION=20.5.1-bullseye

 # build assets & compile TypeScript

--- a/packages/backend/src/server/WellKnownServerService.ts
+++ b/packages/backend/src/server/WellKnownServerService.ts
@ -73,7 +73,7 @@ export class WellKnownServerService {
 		});

 		fastify.get('/.well-known/host-meta.json', async (request, reply) => {
-			reply.header('Content-Type', jrd);
+			reply.header('Content-Type', 'application/json');
 			return {
 				links: [{
 					rel: 'lrdd',
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@ -285,6 +285,7 @@ const patrons = [
 	'越貝鯛丸',
 	'Nick / pprmint.',
 	'kino3277',
+	'美少女JKぐーちゃん',
 ];

 let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
Author	SHA1	Message	Date
syuilo	011ad30f54	Merge branch 'develop' into update-deps	2023-09-03 16:56:31 +09:00
syuilo	a34405bf06	update node	2023-09-03 16:56:24 +09:00
syuilo	2db63d1a55	Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop	2023-09-03 16:55:30 +09:00
xtex	a53727f1a5	Respond .well-known/host-meta.json with application/json (#11777 ) According to RFC 6415 appendix-A. The server MUST include the HTTP "Content-Type" response header field with a value of "application/json". Any other "Content-Type" value (or lack thereof) indicates that the server does not support the JRD format. "application/jrd+json" is only used by WebFinger (RFC 7033)	2023-09-03 16:42:32 +09:00
syuilo	db2f49cda4	Update about-misskey.vue	2023-09-02 13:16:05 +09:00
 @ -1 +1 @@
 .5.0
 .5.1