Merge branch 'develop' into pr/12113

package.json

@@ -55,7 +55,7 @@
 		"@typescript-eslint/parser": "6.8.0",
 		"cross-env": "7.0.3",
 		"cypress": "13.3.2",
-		"eslint": "8.51.0",
+		"eslint": "8.52.0",
 		"start-server-and-test": "2.0.1"
 	},
 	"optionalDependencies": {

packages/backend/package.json

@@ -76,9 +76,9 @@
 		"@nestjs/testing": "10.2.7",
 		"@peertube/http-signature": "1.7.0",
 		"@simplewebauthn/server": "8.3.2",
-		"@sinonjs/fake-timers": "11.2.1",
+		"@sinonjs/fake-timers": "11.2.2",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.93",
+		"@swc/core": "1.3.94",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
@@ -124,7 +124,7 @@
 		"nanoid": "5.0.2",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.6",
+		"nodemailer": "6.9.7",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
@@ -142,7 +142,7 @@
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.20.3",
+		"re2": "1.20.4",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
@@ -155,7 +155,7 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.21.12",
+		"systeminformation": "5.21.13",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
@@ -216,7 +216,7 @@
 		"@typescript-eslint/parser": "6.8.0",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.51.0",
+		"eslint": "8.52.0",
 		"eslint-plugin-import": "2.28.1",
 		"execa": "8.0.1",
 		"jest": "29.7.0",

packages/backend/src/core/entities/SigninEntityService.ts

@@ -7,10 +7,12 @@ import { Injectable } from '@nestjs/common';
 import type { } from '@/models/Blocking.js';
 import type { MiSignin } from '@/models/Signin.js';
 import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
 
 @Injectable()
 export class SigninEntityService {
 	constructor(
+		private idService: IdService,
 	) {
 	}
 
@@ -18,7 +20,13 @@ export class SigninEntityService {
 	public async pack(
 		src: MiSignin,
 	) {
-		return src;
+		return {
+			id: src.id,
+			createdAt: this.idService.parse(src.id).date.toISOString(),
+			ip: src.ip,
+			headers: src.headers,
+			success: src.success,
+		};
 	}
 }
 

packages/frontend/package.json

@@ -26,7 +26,7 @@
 		"@tabler/icons-webfont": "2.37.0",
 		"@vitejs/plugin-vue": "4.4.0",
 		"@vue-macros/reactivity-transform": "0.3.23",
-		"@vue/compiler-sfc": "3.3.5",
+		"@vue/compiler-sfc": "3.3.6",
 		"astring": "1.8.6",
 		"autosize": "6.0.1",
 		"broadcast-channel": "5.5.0",
@@ -73,7 +73,7 @@
 		"v-code-diff": "1.7.1",
 		"vanilla-tilt": "1.8.1",
 		"vite": "4.5.0",
-		"vue": "3.3.5",
+		"vue": "3.3.6",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "next"
 	},
@@ -112,11 +112,11 @@
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
 		"@vitest/coverage-v8": "0.34.6",
-		"@vue/runtime-core": "3.3.5",
+		"@vue/runtime-core": "3.3.6",
 		"acorn": "8.10.0",
 		"cross-env": "7.0.3",
 		"cypress": "13.3.2",
-		"eslint": "8.51.0",
+		"eslint": "8.52.0",
 		"eslint-plugin-import": "2.28.1",
 		"eslint-plugin-vue": "9.17.0",
 		"fast-glob": "3.3.1",

packages/frontend/src/pages/install-extentions.vue

@@ -94,7 +94,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, nextTick } from 'vue';
+import { ref, computed, onActivated, onDeactivated, nextTick } from 'vue';
 import MkLoading from '@/components/global/MkLoading.vue';
 import MkButton from '@/components/MkButton.vue';
 import FormSection from '@/components/form/section.vue';
@@ -120,9 +120,8 @@ const errorKV = ref<{
 	description: '',
 });
 
-const urlParams = new URLSearchParams(window.location.search);
-const url = urlParams.get('url');
-const hash = urlParams.get('hash');
+const url = ref<string | null>(null);
+const hash = ref<string | null>(null);
 
 const data = ref<{
 	type: 'plugin' | 'theme';
@@ -152,7 +151,7 @@ function goToMisskey(): void {
 }
 
 async function fetch() {
-	if (!url || !hash) {
+	if (!url.value || !hash.value) {
 		errorKV.value = {
 			title: i18n.ts._externalResourceInstaller._errors._invalidParams.title,
 			description: i18n.ts._externalResourceInstaller._errors._invalidParams.description,
@@ -161,8 +160,8 @@ async function fetch() {
 		return;
 	}
 	const res = await os.api('fetch-external-resources', {
-		url,
-		hash,
+		url: url.value,
+		hash: hash.value,
 	}).catch((err) => {
 		switch (err.id) {
 			case 'bb774091-7a15-4a70-9dc5-6ac8cf125856':
@@ -240,7 +239,7 @@ async function fetch() {
 							description: i18n.ts._theme.alreadyInstalled,
 						};
 						break;
-					
+
 					default:
 						errorKV.value = {
 							title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title,
@@ -297,10 +296,17 @@ async function install() {
 	}
 }
 
-onMounted(() => {
+onActivated(() => {
+	const urlParams = new URLSearchParams(window.location.search);
+	url.value = urlParams.get('url');
+	hash.value = urlParams.get('hash');
 	fetch();
 });
 
+onDeactivated(() => {
+	uiPhase.value = 'fetching';
+});
+
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);

packages/misskey-js/package.json

@@ -26,7 +26,7 @@
 		"@types/node": "20.8.7",
 		"@typescript-eslint/eslint-plugin": "6.8.0",
 		"@typescript-eslint/parser": "6.8.0",
-		"eslint": "8.51.0",
+		"eslint": "8.52.0",
 		"jest": "29.7.0",
 		"jest-fetch-mock": "3.0.3",
 		"jest-websocket-mock": "2.5.0",
@@ -39,7 +39,7 @@
 	],
 	"dependencies": {
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.93",
+		"@swc/core": "1.3.94",
 		"eventemitter3": "5.0.1",
 		"reconnecting-websocket": "4.4.0"
 	}

packages/sw/package.json

@@ -16,7 +16,7 @@
 	"devDependencies": {
 		"@typescript-eslint/parser": "6.8.0",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
-		"eslint": "8.51.0",
+		"eslint": "8.52.0",
 		"eslint-plugin-import": "2.28.1",
 		"typescript": "5.2.2"
 	},