{
return meta;
},
}).compile();
@@ -199,7 +199,7 @@ describe('ActivityPub', () => {
rendererService.renderAnnounce(null, {
createdAt: new Date(0),
visibility: 'followers',
- } as Note);
+ } as MiNote);
});
});
diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts
index a419083e7d..036e73fd5e 100644
--- a/packages/backend/test/unit/chart.ts
+++ b/packages/backend/test/unit/chart.ts
@@ -18,7 +18,7 @@ import { entity as TestGroupedChartEntity } from '@/core/chart/charts/entities/t
import { entity as TestUniqueChartEntity } from '@/core/chart/charts/entities/test-unique.js';
import { entity as TestIntersectionChartEntity } from '@/core/chart/charts/entities/test-intersection.js';
import { loadConfig } from '@/config.js';
-import type { AppLockService } from '@/core/AppLockService';
+import type { AppLockService } from '@/core/AppLockService.js';
import Logger from '@/logger.js';
describe('Chart', () => {
diff --git a/packages/backend/test/unit/misc/correct-filename.ts b/packages/backend/test/unit/misc/correct-filename.ts
index 8138b2361f..0c4482e0bf 100644
--- a/packages/backend/test/unit/misc/correct-filename.ts
+++ b/packages/backend/test/unit/misc/correct-filename.ts
@@ -6,42 +6,42 @@
import { correctFilename } from '@/misc/correct-filename.js';
describe(correctFilename, () => {
- it('no ext to null', () => {
- expect(correctFilename('test', null)).toBe('test.unknown');
- });
- it('no ext to jpg', () => {
- expect(correctFilename('test', 'jpg')).toBe('test.jpg');
- });
- it('jpg to webp', () => {
- expect(correctFilename('test.jpg', 'webp')).toBe('test.jpg.webp');
- });
- it('jpg to .webp', () => {
- expect(correctFilename('test.jpg', '.webp')).toBe('test.jpg.webp');
- });
- it('jpeg to jpg', () => {
- expect(correctFilename('test.jpeg', 'jpg')).toBe('test.jpeg');
- });
- it('JPEG to jpg', () => {
- expect(correctFilename('test.JPEG', 'jpg')).toBe('test.JPEG');
- });
- it('jpg to jpg', () => {
- expect(correctFilename('test.jpg', 'jpg')).toBe('test.jpg');
- });
- it('JPG to jpg', () => {
- expect(correctFilename('test.JPG', 'jpg')).toBe('test.JPG');
- });
- it('tiff to tif', () => {
- expect(correctFilename('test.tiff', 'tif')).toBe('test.tiff');
- });
- it('skip gz', () => {
- expect(correctFilename('test.unitypackage', 'gz')).toBe('test.unitypackage');
- });
- it('skip text file', () => {
- expect(correctFilename('test.txt', null)).toBe('test.txt');
- });
- it('unknown', () => {
- expect(correctFilename('test.hoge', null)).toBe('test.hoge');
- });
+ it('no ext to null', () => {
+ expect(correctFilename('test', null)).toBe('test.unknown');
+ });
+ it('no ext to jpg', () => {
+ expect(correctFilename('test', 'jpg')).toBe('test.jpg');
+ });
+ it('jpg to webp', () => {
+ expect(correctFilename('test.jpg', 'webp')).toBe('test.jpg.webp');
+ });
+ it('jpg to .webp', () => {
+ expect(correctFilename('test.jpg', '.webp')).toBe('test.jpg.webp');
+ });
+ it('jpeg to jpg', () => {
+ expect(correctFilename('test.jpeg', 'jpg')).toBe('test.jpeg');
+ });
+ it('JPEG to jpg', () => {
+ expect(correctFilename('test.JPEG', 'jpg')).toBe('test.JPEG');
+ });
+ it('jpg to jpg', () => {
+ expect(correctFilename('test.jpg', 'jpg')).toBe('test.jpg');
+ });
+ it('JPG to jpg', () => {
+ expect(correctFilename('test.JPG', 'jpg')).toBe('test.JPG');
+ });
+ it('tiff to tif', () => {
+ expect(correctFilename('test.tiff', 'tif')).toBe('test.tiff');
+ });
+ it('skip gz', () => {
+ expect(correctFilename('test.unitypackage', 'gz')).toBe('test.unitypackage');
+ });
+ it('skip text file', () => {
+ expect(correctFilename('test.txt', null)).toBe('test.txt');
+ });
+ it('unknown', () => {
+ expect(correctFilename('test.hoge', null)).toBe('test.hoge');
+ });
test('non ascii with space', () => {
expect(correctFilename('ファイル 名前', 'jpg')).toBe('ファイル 名前.jpg');
});
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 0a24a47066..adc532bbe7 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -8,7 +8,7 @@ import { readFile } from 'node:fs/promises';
import { isAbsolute, basename } from 'node:path';
import { inspect } from 'node:util';
import WebSocket, { ClientOptions } from 'ws';
-import fetch, { Blob, File, RequestInit } from 'node-fetch';
+import fetch, { File, RequestInit } from 'node-fetch';
import { DataSource } from 'typeorm';
import { JSDOM } from 'jsdom';
import { DEFAULT_POLICIES } from '@/core/RoleService.js';
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 7b0b3ed99b..ebe4509057 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -110,8 +110,8 @@
"@types/uuid": "9.0.3",
"@types/websocket": "1.0.6",
"@types/ws": "8.5.5",
- "@typescript-eslint/eslint-plugin": "6.5.0",
- "@typescript-eslint/parser": "6.5.0",
+ "@typescript-eslint/eslint-plugin": "6.6.0",
+ "@typescript-eslint/parser": "6.6.0",
"@vitest/coverage-v8": "0.34.3",
"@vue/runtime-core": "3.3.4",
"acorn": "8.10.0",
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 22610b2253..d98a6da0dc 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -161,7 +161,7 @@ import { reactionPicker } from '@/scripts/reaction-picker';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
import { $i } from '@/account';
import { i18n } from '@/i18n';
-import { getNoteClipMenu, getNoteMenu } from '@/scripts/get-note-menu';
+import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu } from '@/scripts/get-note-menu';
import { useNoteCapture } from '@/scripts/use-note-capture';
import { deepClone } from '@/scripts/clone';
import { useTooltip } from '@/scripts/use-tooltip';
@@ -425,21 +425,34 @@ async function clip() {
}
function showRenoteMenu(viaKeyboard = false): void {
- if (!isMyRenote) return;
- pleaseLogin();
- os.popupMenu([{
- text: i18n.ts.unrenote,
- icon: 'ti ti-trash',
- danger: true,
- action: () => {
- os.api('notes/delete', {
- noteId: note.id,
- });
- isDeleted.value = true;
- },
- }], renoteTime.value, {
- viaKeyboard: viaKeyboard,
- });
+ if (isMyRenote) {
+ pleaseLogin();
+ os.popupMenu([
+ getCopyNoteLinkMenu(note, i18n.ts.copyLinkRenote),
+ null,
+ {
+ text: i18n.ts.unrenote,
+ icon: 'ti ti-trash',
+ danger: true,
+ action: () => {
+ os.api('notes/delete', {
+ noteId: note.id,
+ });
+ isDeleted.value = true;
+ },
+ },
+ ], renoteTime.value, {
+ viaKeyboard: viaKeyboard,
+ });
+ } else {
+ os.popupMenu([
+ getCopyNoteLinkMenu(note, i18n.ts.copyLinkRenote),
+ null,
+ getAbuseNoteMenu(note, i18n.ts.reportAbuseRenote),
+ ], renoteTime.value, {
+ viaKeyboard: viaKeyboard,
+ });
+ }
}
function focus() {
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 1783abc51a..c8b1cb8dfc 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -92,6 +92,31 @@ export async function getNoteClipMenu(props: {
}];
}
+export function getAbuseNoteMenu(note: misskey.entities.Note, text: string): MenuItem {
+ return {
+ icon: 'ti ti-exclamation-circle',
+ text,
+ action: (): void => {
+ const u = note.url ?? note.uri ?? `${url}/notes/${note.id}`;
+ os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+ user: note.user,
+ initialComment: `Note: ${u}\n-----\n`,
+ }, {}, 'closed');
+ },
+ };
+}
+
+export function getCopyNoteLinkMenu(note: misskey.entities.Note, text: string): MenuItem {
+ return {
+ icon: 'ti ti-link',
+ text,
+ action: (): void => {
+ copyToClipboard(`${url}/notes/${note.id}`);
+ os.success();
+ },
+ };
+}
+
export function getNoteMenu(props: {
note: Misskey.entities.Note;
menuButton: Ref;
@@ -266,11 +291,8 @@ export function getNoteMenu(props: {
icon: 'ti ti-copy',
text: i18n.ts.copyContent,
action: copyContent,
- }, {
- icon: 'ti ti-link',
- text: i18n.ts.copyLink,
- action: copyLink,
- }, (appearNote.url || appearNote.uri) ? {
+ }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
+ , (appearNote.url || appearNote.uri) ? {
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
@@ -344,17 +366,8 @@ export function getNoteMenu(props: {
),*/
...(appearNote.userId !== $i.id ? [
null,
- {
- icon: 'ti ti-exclamation-circle',
- text: i18n.ts.reportAbuse,
- action: () => {
- const u = appearNote.url ?? appearNote.uri ?? `${url}/notes/${appearNote.id}`;
- os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
- user: appearNote.user,
- initialComment: `Note: ${u}\n-----\n`,
- }, {}, 'closed');
- },
- }]
+ appearNote.userId !== $i.id ? getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse) : undefined,
+ ]
: []
),
...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [
@@ -382,11 +395,8 @@ export function getNoteMenu(props: {
icon: 'ti ti-copy',
text: i18n.ts.copyContent,
action: copyContent,
- }, {
- icon: 'ti ti-link',
- text: i18n.ts.copyLink,
- action: copyLink,
- }, (appearNote.url || appearNote.uri) ? {
+ }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
+ , (appearNote.url || appearNote.uri) ? {
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b97988a5b0..878bf8774a 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -24,8 +24,8 @@
"@swc/jest": "0.2.29",
"@types/jest": "29.5.4",
"@types/node": "20.5.9",
- "@typescript-eslint/eslint-plugin": "6.5.0",
- "@typescript-eslint/parser": "6.5.0",
+ "@typescript-eslint/eslint-plugin": "6.6.0",
+ "@typescript-eslint/parser": "6.6.0",
"eslint": "8.48.0",
"jest": "29.6.4",
"jest-fetch-mock": "3.0.3",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 61680a619c..46cf522576 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -14,7 +14,7 @@
"misskey-js": "workspace:*"
},
"devDependencies": {
- "@typescript-eslint/parser": "6.5.0",
+ "@typescript-eslint/parser": "6.6.0",
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
"eslint": "8.48.0",
"eslint-plugin-import": "2.28.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6d634db23e..950fa3e37b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,11 +48,11 @@ importers:
specifier: 2.0.2
version: 2.0.2
'@typescript-eslint/eslint-plugin':
- specifier: 6.5.0
- version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)(typescript@5.2.2)
'@typescript-eslint/parser':
- specifier: 6.5.0
- version: 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(eslint@8.48.0)(typescript@5.2.2)
cross-env:
specifier: 7.0.3
version: 7.0.3
@@ -78,14 +78,14 @@ importers:
specifier: 3.374.0
version: 3.374.0
'@bull-board/api':
- specifier: 5.8.0
- version: 5.8.0(@bull-board/ui@5.8.0)
+ specifier: 5.8.1
+ version: 5.8.1(@bull-board/ui@5.8.1)
'@bull-board/fastify':
- specifier: 5.8.0
- version: 5.8.0
+ specifier: 5.8.1
+ version: 5.8.1
'@bull-board/ui':
- specifier: 5.8.0
- version: 5.8.0
+ specifier: 5.8.1
+ version: 5.8.1
'@discordapp/twemoji':
specifier: 14.1.2
version: 14.1.2
@@ -141,8 +141,8 @@ importers:
specifier: 8.12.0
version: 8.12.0
archiver:
- specifier: 6.0.0
- version: 6.0.0
+ specifier: 6.0.1
+ version: 6.0.1
async-mutex:
specifier: 0.4.0
version: 0.4.0
@@ -509,11 +509,11 @@ importers:
specifier: 6.0.0
version: 6.0.0
'@types/color-convert':
- specifier: 2.0.0
- version: 2.0.0
+ specifier: 2.0.1
+ version: 2.0.1
'@types/content-disposition':
- specifier: 0.5.5
- version: 0.5.5
+ specifier: 0.5.6
+ version: 0.5.6
'@types/fluent-ffmpeg':
specifier: 2.1.21
version: 2.1.21
@@ -611,11 +611,11 @@ importers:
specifier: 8.5.5
version: 8.5.5
'@typescript-eslint/eslint-plugin':
- specifier: 6.5.0
- version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)(typescript@5.2.2)
'@typescript-eslint/parser':
- specifier: 6.5.0
- version: 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(eslint@8.48.0)(typescript@5.2.2)
aws-sdk-client-mock:
specifier: 3.0.0
version: 3.0.0
@@ -627,7 +627,7 @@ importers:
version: 8.48.0
eslint-plugin-import:
specifier: 2.28.1
- version: 2.28.1(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)
+ version: 2.28.1(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)
execa:
specifier: 8.0.1
version: 8.0.1
@@ -924,11 +924,11 @@ importers:
specifier: 8.5.5
version: 8.5.5
'@typescript-eslint/eslint-plugin':
- specifier: 6.5.0
- version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)(typescript@5.2.2)
'@typescript-eslint/parser':
- specifier: 6.5.0
- version: 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(eslint@8.48.0)(typescript@5.2.2)
'@vitest/coverage-v8':
specifier: 0.34.3
version: 0.34.3(vitest@0.34.3)
@@ -949,7 +949,7 @@ importers:
version: 8.48.0
eslint-plugin-import:
specifier: 2.28.1
- version: 2.28.1(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)
+ version: 2.28.1(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)
eslint-plugin-vue:
specifier: 9.17.0
version: 9.17.0(eslint@8.48.0)
@@ -1036,11 +1036,11 @@ importers:
specifier: 20.5.9
version: 20.5.9
'@typescript-eslint/eslint-plugin':
- specifier: 6.5.0
- version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)(typescript@5.2.2)
'@typescript-eslint/parser':
- specifier: 6.5.0
- version: 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(eslint@8.48.0)(typescript@5.2.2)
eslint:
specifier: 8.48.0
version: 8.48.0
@@ -1076,8 +1076,8 @@ importers:
version: link:../misskey-js
devDependencies:
'@typescript-eslint/parser':
- specifier: 6.5.0
- version: 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ specifier: 6.6.0
+ version: 6.6.0(eslint@8.48.0)(typescript@5.2.2)
'@typescript/lib-webworker':
specifier: npm:@types/serviceworker@0.0.67
version: /@types/serviceworker@0.0.67
@@ -1086,7 +1086,7 @@ importers:
version: 8.48.0
eslint-plugin-import:
specifier: 2.28.1
- version: 2.28.1(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)
+ version: 2.28.1(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)
typescript:
specifier: 5.2.2
version: 5.2.2
@@ -3287,29 +3287,29 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
- /@bull-board/api@5.8.0(@bull-board/ui@5.8.0):
- resolution: {integrity: sha512-jHJ7Mw/CHixNgIsrbUihyYVxIdlM/lzii+ZUo7E8CFEsOCjE+Um5RDr9boYghWVHuJykkLy7b+wPvbnTwmX0SA==}
+ /@bull-board/api@5.8.1(@bull-board/ui@5.8.1):
+ resolution: {integrity: sha512-50cx5+43+EsVzxV0/R4Na71hRCbLennCodFMxr3Fve1m99gjNiIFV4B94FGW001wfm09AU1QruD/SfdkWvdeqA==}
peerDependencies:
- '@bull-board/ui': 5.8.0
+ '@bull-board/ui': 5.8.1
dependencies:
- '@bull-board/ui': 5.8.0
+ '@bull-board/ui': 5.8.1
redis-info: 3.1.0
dev: false
- /@bull-board/fastify@5.8.0:
- resolution: {integrity: sha512-GTLOjmarDBPeQAtXsh3nN/dTd0D1YhmfyDZnB0D90TObzsh+hbzQP742mykUHNOii3sPZNq6MqwcES1dFkGEKg==}
+ /@bull-board/fastify@5.8.1:
+ resolution: {integrity: sha512-Cxi8u40p4XTfThEl5LVOmWmOQXemArziSadVk0vGaO69jLrm3x5AP0pH2Kepa3cfyhc68Z3RM9DHsSMmU/fDcQ==}
dependencies:
- '@bull-board/api': 5.8.0(@bull-board/ui@5.8.0)
- '@bull-board/ui': 5.8.0
+ '@bull-board/api': 5.8.1(@bull-board/ui@5.8.1)
+ '@bull-board/ui': 5.8.1
'@fastify/static': 6.11.0
'@fastify/view': 7.4.1
ejs: 3.1.8
dev: false
- /@bull-board/ui@5.8.0:
- resolution: {integrity: sha512-O2imjnV7KFictoy6FsrG2y5u10Z60BIuX+nghLbhdEkZL/B4B2VUM+655d9wMIpjXocXkr2DN5ELJkUXewl9wQ==}
+ /@bull-board/ui@5.8.1:
+ resolution: {integrity: sha512-SO/TAMLJU4Mbiq0nm5IRHaUfYYYoiVjvfLxLhlw9D+pL2OdIhDte1ZLGR1yXNGNv44Kl4bsQ2uYOe98mQHW5Pw==}
dependencies:
- '@bull-board/api': 5.8.0(@bull-board/ui@5.8.0)
+ '@bull-board/api': 5.8.1(@bull-board/ui@5.8.1)
dev: false
/@canvas/image-data@1.0.0:
@@ -7581,8 +7581,8 @@ packages:
resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==}
dev: true
- /@types/color-convert@2.0.0:
- resolution: {integrity: sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==}
+ /@types/color-convert@2.0.1:
+ resolution: {integrity: sha512-GwXanrvq/tBHJtudbl1lSy9Ybt7KS9+rA+YY3bcuIIM+d6jSHUr+5yjO83gtiRpuaPiBccwFjSnAK2qSrIPA7w==}
dependencies:
'@types/color-name': 1.1.1
dev: true
@@ -7597,8 +7597,8 @@ packages:
'@types/node': 20.5.9
dev: true
- /@types/content-disposition@0.5.5:
- resolution: {integrity: sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==}
+ /@types/content-disposition@0.5.6:
+ resolution: {integrity: sha512-GmShTb4qA9+HMPPaV2+Up8tJafgi38geFi7vL4qAM7k8BwjoelgHZqEUKJZLvughUw22h6vD/wvwN4IUCaWpDA==}
dev: true
/@types/cookie@0.4.1:
@@ -8179,8 +8179,8 @@ packages:
dev: true
optional: true
- /@typescript-eslint/eslint-plugin@6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.48.0)(typescript@5.2.2):
- resolution: {integrity: sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==}
+ /@typescript-eslint/eslint-plugin@6.6.0(@typescript-eslint/parser@6.6.0)(eslint@8.48.0)(typescript@5.2.2):
+ resolution: {integrity: sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==}
engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies:
'@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
@@ -8191,11 +8191,11 @@ packages:
optional: true
dependencies:
'@eslint-community/regexpp': 4.6.2
- '@typescript-eslint/parser': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
- '@typescript-eslint/scope-manager': 6.5.0
- '@typescript-eslint/type-utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
- '@typescript-eslint/utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
- '@typescript-eslint/visitor-keys': 6.5.0
+ '@typescript-eslint/parser': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/scope-manager': 6.6.0
+ '@typescript-eslint/type-utils': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/utils': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/visitor-keys': 6.6.0
debug: 4.3.4(supports-color@8.1.1)
eslint: 8.48.0
graphemer: 1.4.0
@@ -8208,8 +8208,8 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/parser@6.5.0(eslint@8.48.0)(typescript@5.2.2):
- resolution: {integrity: sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==}
+ /@typescript-eslint/parser@6.6.0(eslint@8.48.0)(typescript@5.2.2):
+ resolution: {integrity: sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==}
engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
@@ -8218,10 +8218,10 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/scope-manager': 6.5.0
- '@typescript-eslint/types': 6.5.0
- '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2)
- '@typescript-eslint/visitor-keys': 6.5.0
+ '@typescript-eslint/scope-manager': 6.6.0
+ '@typescript-eslint/types': 6.6.0
+ '@typescript-eslint/typescript-estree': 6.6.0(typescript@5.2.2)
+ '@typescript-eslint/visitor-keys': 6.6.0
debug: 4.3.4(supports-color@8.1.1)
eslint: 8.48.0
typescript: 5.2.2
@@ -8229,16 +8229,16 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/scope-manager@6.5.0:
- resolution: {integrity: sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==}
+ /@typescript-eslint/scope-manager@6.6.0:
+ resolution: {integrity: sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==}
engines: {node: ^16.0.0 || >=18.0.0}
dependencies:
- '@typescript-eslint/types': 6.5.0
- '@typescript-eslint/visitor-keys': 6.5.0
+ '@typescript-eslint/types': 6.6.0
+ '@typescript-eslint/visitor-keys': 6.6.0
dev: true
- /@typescript-eslint/type-utils@6.5.0(eslint@8.48.0)(typescript@5.2.2):
- resolution: {integrity: sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==}
+ /@typescript-eslint/type-utils@6.6.0(eslint@8.48.0)(typescript@5.2.2):
+ resolution: {integrity: sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==}
engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
@@ -8247,8 +8247,8 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2)
- '@typescript-eslint/utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/typescript-estree': 6.6.0(typescript@5.2.2)
+ '@typescript-eslint/utils': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
debug: 4.3.4(supports-color@8.1.1)
eslint: 8.48.0
ts-api-utils: 1.0.1(typescript@5.2.2)
@@ -8257,13 +8257,13 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/types@6.5.0:
- resolution: {integrity: sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==}
+ /@typescript-eslint/types@6.6.0:
+ resolution: {integrity: sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==}
engines: {node: ^16.0.0 || >=18.0.0}
dev: true
- /@typescript-eslint/typescript-estree@6.5.0(typescript@5.2.2):
- resolution: {integrity: sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==}
+ /@typescript-eslint/typescript-estree@6.6.0(typescript@5.2.2):
+ resolution: {integrity: sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==}
engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies:
typescript: '*'
@@ -8271,8 +8271,8 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/types': 6.5.0
- '@typescript-eslint/visitor-keys': 6.5.0
+ '@typescript-eslint/types': 6.6.0
+ '@typescript-eslint/visitor-keys': 6.6.0
debug: 4.3.4(supports-color@8.1.1)
globby: 11.1.0
is-glob: 4.0.3
@@ -8283,8 +8283,8 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/utils@6.5.0(eslint@8.48.0)(typescript@5.2.2):
- resolution: {integrity: sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==}
+ /@typescript-eslint/utils@6.6.0(eslint@8.48.0)(typescript@5.2.2):
+ resolution: {integrity: sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==}
engines: {node: ^16.0.0 || >=18.0.0}
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
@@ -8292,9 +8292,9 @@ packages:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0)
'@types/json-schema': 7.0.12
'@types/semver': 7.5.1
- '@typescript-eslint/scope-manager': 6.5.0
- '@typescript-eslint/types': 6.5.0
- '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2)
+ '@typescript-eslint/scope-manager': 6.6.0
+ '@typescript-eslint/types': 6.6.0
+ '@typescript-eslint/typescript-estree': 6.6.0(typescript@5.2.2)
eslint: 8.48.0
semver: 7.5.4
transitivePeerDependencies:
@@ -8302,11 +8302,11 @@ packages:
- typescript
dev: true
- /@typescript-eslint/visitor-keys@6.5.0:
- resolution: {integrity: sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==}
+ /@typescript-eslint/visitor-keys@6.6.0:
+ resolution: {integrity: sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==}
engines: {node: ^16.0.0 || >=18.0.0}
dependencies:
- '@typescript-eslint/types': 6.5.0
+ '@typescript-eslint/types': 6.6.0
eslint-visitor-keys: 3.4.3
dev: true
@@ -8873,49 +8873,29 @@ packages:
/arch@2.2.0:
resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
- /archiver-utils@2.1.0:
- resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
- engines: {node: '>= 6'}
- dependencies:
- glob: 7.2.3
- graceful-fs: 4.2.11
- lazystream: 1.0.1
- lodash.defaults: 4.2.0
- lodash.difference: 4.5.0
- lodash.flatten: 4.4.0
- lodash.isplainobject: 4.0.6
- lodash.union: 4.6.0
- normalize-path: 3.0.0
- readable-stream: 2.3.7
- dev: false
-
- /archiver-utils@3.0.3:
- resolution: {integrity: sha512-fXzpEZTKgBJMWy0eUT0/332CAQnJ27OJd7sGcvNZzxS2Yzg7iITivMhXOm+zUTO4vT8ZqlPCqiaLPmB8qWhWRA==}
- engines: {node: '>= 10'}
+ /archiver-utils@4.0.1:
+ resolution: {integrity: sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==}
+ engines: {node: '>= 12.0.0'}
dependencies:
- glob: 7.2.3
+ glob: 8.1.0
graceful-fs: 4.2.11
lazystream: 1.0.1
- lodash.defaults: 4.2.0
- lodash.difference: 4.5.0
- lodash.flatten: 4.4.0
- lodash.isplainobject: 4.0.6
- lodash.union: 4.6.0
+ lodash: 4.17.21
normalize-path: 3.0.0
readable-stream: 3.6.0
dev: false
- /archiver@6.0.0:
- resolution: {integrity: sha512-EPGa+bYaxaMiCT8DCbEDqFz8IjeBSExrJzyUOJx2FBkFJ/OZzJuso3lMSk901M50gMqXxTQcumlGajOFlXhVhw==}
+ /archiver@6.0.1:
+ resolution: {integrity: sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==}
engines: {node: '>= 12.0.0'}
dependencies:
- archiver-utils: 3.0.3
+ archiver-utils: 4.0.1
async: 3.2.4
buffer-crc32: 0.2.13
readable-stream: 3.6.0
readdir-glob: 1.1.2
- tar-stream: 2.2.0
- zip-stream: 4.1.0
+ tar-stream: 3.1.6
+ zip-stream: 5.0.1
dev: false
/archy@1.0.0:
@@ -10416,12 +10396,12 @@ packages:
resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
dev: false
- /compress-commons@4.1.1:
- resolution: {integrity: sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==}
- engines: {node: '>= 10'}
+ /compress-commons@5.0.1:
+ resolution: {integrity: sha512-MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag==}
+ engines: {node: '>= 12.0.0'}
dependencies:
- buffer-crc32: 0.2.13
- crc32-stream: 4.0.2
+ crc-32: 1.2.2
+ crc32-stream: 5.0.0
normalize-path: 3.0.0
readable-stream: 3.6.0
dev: false
@@ -10545,9 +10525,9 @@ packages:
hasBin: true
dev: false
- /crc32-stream@4.0.2:
- resolution: {integrity: sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==}
- engines: {node: '>= 10'}
+ /crc32-stream@5.0.0:
+ resolution: {integrity: sha512-B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw==}
+ engines: {node: '>= 12.0.0'}
dependencies:
crc-32: 1.2.2
readable-stream: 3.6.0
@@ -11604,7 +11584,7 @@ packages:
- supports-color
dev: true
- /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.5.0)(eslint-import-resolver-node@0.3.7)(eslint@8.48.0):
+ /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.6.0)(eslint-import-resolver-node@0.3.7)(eslint@8.48.0):
resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
engines: {node: '>=4'}
peerDependencies:
@@ -11625,7 +11605,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
- '@typescript-eslint/parser': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/parser': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
debug: 3.2.7(supports-color@5.5.0)
eslint: 8.48.0
eslint-import-resolver-node: 0.3.7
@@ -11633,7 +11613,7 @@ packages:
- supports-color
dev: true
- /eslint-plugin-import@2.28.1(@typescript-eslint/parser@6.5.0)(eslint@8.48.0):
+ /eslint-plugin-import@2.28.1(@typescript-eslint/parser@6.6.0)(eslint@8.48.0):
resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==}
engines: {node: '>=4'}
peerDependencies:
@@ -11643,7 +11623,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
- '@typescript-eslint/parser': 6.5.0(eslint@8.48.0)(typescript@5.2.2)
+ '@typescript-eslint/parser': 6.6.0(eslint@8.48.0)(typescript@5.2.2)
array-includes: 3.1.6
array.prototype.findlastindex: 1.2.2
array.prototype.flat: 1.3.1
@@ -11652,7 +11632,7 @@ packages:
doctrine: 2.1.0
eslint: 8.48.0
eslint-import-resolver-node: 0.3.7
- eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.5.0)(eslint-import-resolver-node@0.3.7)(eslint@8.48.0)
+ eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.6.0)(eslint-import-resolver-node@0.3.7)(eslint@8.48.0)
has: 1.0.3
is-core-module: 2.13.0
is-glob: 4.0.3
@@ -11768,7 +11748,7 @@ packages:
dependencies:
acorn: 8.10.0
acorn-jsx: 5.3.2(acorn@8.10.0)
- eslint-visitor-keys: 3.4.1
+ eslint-visitor-keys: 3.4.3
dev: true
/espree@9.6.1:
@@ -15367,14 +15347,6 @@ packages:
resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
dev: false
- /lodash.difference@4.5.0:
- resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
- dev: false
-
- /lodash.flatten@4.4.0:
- resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
- dev: false
-
/lodash.get@4.4.2:
resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
dev: true
@@ -15387,10 +15359,6 @@ packages:
resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
dev: true
- /lodash.isplainobject@4.0.6:
- resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
- dev: false
-
/lodash.memoize@4.1.2:
resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
dev: false
@@ -15402,10 +15370,6 @@ packages:
resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
dev: true
- /lodash.union@4.6.0:
- resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
- dev: false
-
/lodash.uniq@4.5.0:
resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
dev: false
@@ -21624,12 +21588,12 @@ packages:
commander: 9.5.0
dev: true
- /zip-stream@4.1.0:
- resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==}
- engines: {node: '>= 10'}
+ /zip-stream@5.0.1:
+ resolution: {integrity: sha512-UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA==}
+ engines: {node: '>= 12.0.0'}
dependencies:
- archiver-utils: 2.1.0
- compress-commons: 4.1.1
+ archiver-utils: 4.0.1
+ compress-commons: 5.0.1
readable-stream: 3.6.0
dev: false