From 53001293573be330784598b7873f201f05c7d1e6 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 13 Apr 2023 11:58:42 +0900 Subject: [PATCH 01/78] Change boost button labels --- packages/client/src/components/MkRenoteButton.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index e2968f796..77f597e83 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -104,7 +104,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { if (["public", "home"].includes(props.note.visibility)) { buttonActions.push({ - text: i18n.ts.renoteAsUnlisted, + text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`, icons: ["ph-repeat ph-bold ph-lg", "ph-house ph-bold ph-lg"], danger: false, action: () => { @@ -130,7 +130,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { if (props.note.visibility === "specified") { buttonActions.push({ - text: i18n.ts.renoteToRecipients, + text: `${i18n.ts.renote} (${i18n.ts.recipient})`, icons: [ "ph-repeat ph-bold ph-lg", "ph-envelope-simple-open ph-bold ph-lg", @@ -158,7 +158,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { }); } else { buttonActions.push({ - text: i18n.ts.renoteToFollowers, + text: `${i18n.ts.renote} (${i18n.ts._visibility.followers})`, icons: [ "ph-repeat ph-bold ph-lg", "ph-lock-simple-open ph-bold ph-lg", From 6523d597b273161025c34fff827d8acff9a69ac5 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 13 Apr 2023 11:58:57 +0900 Subject: [PATCH 02/78] Update locale --- locales/en-US.yml | 3 --- locales/ja-JP.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index fcc8ad081..d67e3b362 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -97,9 +97,6 @@ unfollow: "Unfollow" followRequestPending: "Follow request pending" enterEmoji: "Enter an emoji" renote: "Boost" -renoteAsUnlisted: "Boost (Unlisted)" -renoteToFollowers: "Boost (Followers)" -renoteToRecipients: "Boost (Recipients)" unrenote: "Take back boost" renoted: "Boosted." cantRenote: "This post can't be boosted." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0f1c700fd..2e6795a78 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -97,9 +97,6 @@ unfollow: "フォロー解除" followRequestPending: "フォロー許可待ち" enterEmoji: "絵文字を入力" renote: "ブースト" -renoteAsUnlisted: "未収載でブースト" -renoteToFollowers: "フォロワー限定でブースト" -renoteToRecipients: "宛先のユーザーにブースト" unrenote: "ブースト解除" renoted: "ブーストしました。" cantRenote: "この投稿はブーストできません。" From 224fdf4dc592e89e6960a5a40e78f185a1857088 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 13 Apr 2023 09:43:13 -0700 Subject: [PATCH 03/78] chore: up swc --- packages/backend/package.json | 4 +- packages/sw/package.json | 4 +- pnpm-lock.yaml | 727 ++++++---------------------------- 3 files changed, 133 insertions(+), 602 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index 9139d24ee..a03d6d35b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -133,8 +133,8 @@ "xev": "3.0.2" }, "devDependencies": { - "@swc/cli": "^0.1.59", - "@swc/core": "^1.3.26", + "@swc/cli": "^0.1.62", + "@swc/core": "^1.3.50", "@types/bcryptjs": "2.4.2", "@types/bull": "3.15.9", "@types/cbor": "6.0.0", diff --git a/packages/sw/package.json b/packages/sw/package.json index 2c41a95b5..112005ba7 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -10,8 +10,8 @@ }, "devDependencies": { - "@swc/cli": "^0.1.59", - "@swc/core": "^1.3.26", + "@swc/cli": "^0.1.62", + "@swc/core": "^1.3.50", "@swc/core-android-arm64": "1.3.11", "calckey-js": "workspace:*", "idb-keyval": "^6.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97412f122..410801dde 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -404,11 +404,11 @@ importers: version: 3.21.1(seedrandom@3.0.5) devDependencies: '@swc/cli': - specifier: ^0.1.59 - version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3) + specifier: ^0.1.62 + version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3) '@swc/core': - specifier: ^1.3.26 - version: 1.3.26 + specifier: ^1.3.50 + version: 1.3.50 '@types/bcryptjs': specifier: 2.4.2 version: 2.4.2 @@ -567,13 +567,13 @@ importers: version: 2.0.0 swc-loader: specifier: ^0.2.3 - version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0) + version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0) ts-loader: specifier: 9.4.2 version: 9.4.2(typescript@4.9.4)(webpack@5.75.0) ts-node: specifier: 10.9.1 - version: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4) + version: 10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4) tsconfig-paths: specifier: 4.1.2 version: 4.1.2 @@ -582,7 +582,7 @@ importers: version: 4.9.4 webpack: specifier: ^5.75.0 - version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) ws: specifier: 8.11.0 version: 8.11.0 @@ -888,11 +888,11 @@ importers: packages/sw: devDependencies: '@swc/cli': - specifier: ^0.1.59 - version: 0.1.59(@swc/core@1.3.26)(chokidar@3.5.3) + specifier: ^0.1.62 + version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3) '@swc/core': - specifier: ^1.3.26 - version: 1.3.26 + specifier: ^1.3.50 + version: 1.3.50 '@swc/core-android-arm64': specifier: 1.3.11 version: 1.3.11 @@ -904,10 +904,10 @@ importers: version: 6.2.0 swc-loader: specifier: ^0.2.3 - version: 0.2.3(@swc/core@1.3.26)(webpack@5.75.0) + version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0) webpack: specifier: ^5.75.0 - version: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) webpack-cli: specifier: ^5.0.1 version: 5.0.1(webpack@5.75.0) @@ -2221,6 +2221,20 @@ packages: resolution: {integrity: sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==} dev: true + /@mole-inc/bin-wrapper@8.0.1: + resolution: {integrity: sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + bin-check: 4.1.0 + bin-version-check: 5.0.0 + content-disposition: 0.5.4 + ext-name: 5.0.0 + file-type: 17.1.6 + filenamify: 5.1.1 + got: 11.8.5 + os-filter-obj: 2.0.0 + dev: true + /@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0: resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==} cpu: [arm64] @@ -2553,15 +2567,9 @@ packages: resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==} dev: true - /@sindresorhus/is@0.7.0: - resolution: {integrity: sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==} - engines: {node: '>=4'} - dev: true - /@sindresorhus/is@4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} - dev: false /@sindresorhus/is@5.3.0: resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==} @@ -2589,8 +2597,8 @@ packages: resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==} dev: false - /@swc/cli@0.1.59(@swc/core@1.3.26)(chokidar@3.5.3): - resolution: {integrity: sha512-BlX3wIxYTwdtR22dIqZ3FEIOJPqnlByAp4JY46OMZi2UXMB3ZbOzefawD2ZlLafRUWyy5NtiZZty5waKzaYRnA==} + /@swc/cli@0.1.62(@swc/core@1.3.50)(chokidar@3.5.3): + resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==} engines: {node: '>= 12.13'} hasBin: true peerDependencies: @@ -2600,8 +2608,8 @@ packages: chokidar: optional: true dependencies: - '@swc/core': 1.3.26 - bin-wrapper: 4.1.0 + '@mole-inc/bin-wrapper': 8.0.1 + '@swc/core': 1.3.50 chokidar: 3.5.3 commander: 7.2.0 fast-glob: 3.2.12 @@ -2619,101 +2627,106 @@ packages: dependencies: '@swc/wasm': 1.2.130 - /@swc/core-darwin-arm64@1.3.26: - resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==} + /@swc/core-darwin-arm64@1.3.50: + resolution: {integrity: sha512-riJGLORCFOMeUccEV0hzua0iyJFks7kef+5GfcmC93SLno+LHFDnaJ4mKVXcCAmQ7GYhVTPJs9gSHIW2fO5anQ==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.3.26: - resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==} + /@swc/core-darwin-x64@1.3.50: + resolution: {integrity: sha512-XaAhpeUoAK8tOUYSXH/v35yEjIoSP6ClGV/EaqBmDuCzAPue6uJMlIAW+nTmdtqVm5ZNZy2cKtP4ZHhVlfl7xw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.26: - resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==} + /@swc/core-linux-arm-gnueabihf@1.3.50: + resolution: {integrity: sha512-8hDtXs0T5biMtA3I21JQG1uxL+Hb/D2t0NZENuajVK5Vky3GXmf+ICVeQzwGzSXiyftaDgyNAvBidbKPBlNEtw==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.3.26: - resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==} + /@swc/core-linux-arm64-gnu@1.3.50: + resolution: {integrity: sha512-iS908P5cNTHWus4QefSg2jn4lDYcl15sN1Fvx8fQgqYQra2O9CsR8lXBJYkvllykkzoKvWfcOLRCTquz3vsnVQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.3.26: - resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==} + /@swc/core-linux-arm64-musl@1.3.50: + resolution: {integrity: sha512-ysh8MeaWjGqVwIPCDUhUOr4oczIx5qb8vFBoegI+SOUfcpWik22/+hG25LWzZY6PwAtqUGkhsJt/+5dY4IMhEA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.3.26: - resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==} + /@swc/core-linux-x64-gnu@1.3.50: + resolution: {integrity: sha512-Ci4LQaGIPweWNVWgR2f47nrYEfq7002Pj6WWKGrnO6g+k5cwR3izxHMOnZhcKyAD3cWOS904i/GbfgXs2wBCDQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.26: - resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==} + /@swc/core-linux-x64-musl@1.3.50: + resolution: {integrity: sha512-SEXOhGjmC4rdBeucCvNmtO2vflUEhkmWLfqvkalHYDbPMA/gwLSoYu3D85u5XqB8DatDi4TOCUx80IR1b/vDBQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.26: - resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==} + /@swc/core-win32-arm64-msvc@1.3.50: + resolution: {integrity: sha512-DPsJ2r9mYU8VzF9vhK323psyE8modj5be9M9diOsqF58Fu9ARtOfuulY+eiS5e41ya2XM/H2N/qOfsA+h2KRcg==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.26: - resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==} + /@swc/core-win32-ia32-msvc@1.3.50: + resolution: {integrity: sha512-2iyzHLat0C93S3XLp7QJ6RTA9Md+EcPl2fq1S/m2EZqofcq7wu5SuywaXoF89xOibOJBnWe6KwOnOFWFaXrPjQ==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.26: - resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==} + /@swc/core-win32-x64-msvc@1.3.50: + resolution: {integrity: sha512-iFRU2Y5DVIEdjaWnlLij8QQBM5Q91UJotNNgzuevPSIOhOyhF6V2AQS1QC4mfkPCy3Bw0GrZDChu3GcuBj9Rzw==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.26: - resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==} + /@swc/core@1.3.50: + resolution: {integrity: sha512-soTAHlwkI8zukR9KftWZ0gZ7HKU99B/C3CtBxzSI3N23QG+EfSSOgrYARfuZk5g4yLWpsU0rEkojd78vixqkwg==} engines: {node: '>=10'} requiresBuild: true + peerDependencies: + '@swc/helpers': ^0.5.0 + peerDependenciesMeta: + '@swc/helpers': + optional: true optionalDependencies: - '@swc/core-darwin-arm64': 1.3.26 - '@swc/core-darwin-x64': 1.3.26 - '@swc/core-linux-arm-gnueabihf': 1.3.26 - '@swc/core-linux-arm64-gnu': 1.3.26 - '@swc/core-linux-arm64-musl': 1.3.26 - '@swc/core-linux-x64-gnu': 1.3.26 - '@swc/core-linux-x64-musl': 1.3.26 - '@swc/core-win32-arm64-msvc': 1.3.26 - '@swc/core-win32-ia32-msvc': 1.3.26 - '@swc/core-win32-x64-msvc': 1.3.26 + '@swc/core-darwin-arm64': 1.3.50 + '@swc/core-darwin-x64': 1.3.50 + '@swc/core-linux-arm-gnueabihf': 1.3.50 + '@swc/core-linux-arm64-gnu': 1.3.50 + '@swc/core-linux-arm64-musl': 1.3.50 + '@swc/core-linux-x64-gnu': 1.3.50 + '@swc/core-linux-x64-musl': 1.3.50 + '@swc/core-win32-arm64-msvc': 1.3.50 + '@swc/core-win32-ia32-msvc': 1.3.50 + '@swc/core-win32-x64-msvc': 1.3.50 /@swc/wasm@1.2.130: resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==} @@ -2733,7 +2746,6 @@ packages: engines: {node: '>=10'} dependencies: defer-to-connect: 2.0.1 - dev: false /@szmarczak/http-timer@5.0.1: resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} @@ -2949,7 +2961,6 @@ packages: /@tokenizer/token@0.3.0: resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==} - dev: false /@tootallnate/once@1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} @@ -3042,7 +3053,6 @@ packages: '@types/keyv': 3.1.4 '@types/node': 18.11.18 '@types/responselike': 1.0.0 - dev: false /@types/cbor@6.0.0: resolution: {integrity: sha512-mGQ1lbYOwVti5Xlarn1bTeBZqgY0kstsdjnkoEovgohYKdBjGejHyNGXHdMBeqyQazIv32Jjp33+5pBEaSRy2w==} @@ -3182,7 +3192,6 @@ packages: /@types/http-cache-semantics@4.0.1: resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==} - dev: false /@types/http-errors@2.0.1: resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==} @@ -3999,7 +4008,7 @@ packages: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack@5.75.0) dev: true @@ -4010,7 +4019,7 @@ packages: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack@5.75.0) dev: true @@ -4025,7 +4034,7 @@ packages: webpack-dev-server: optional: true dependencies: - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack@5.75.0) dev: true @@ -4285,13 +4294,6 @@ packages: resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==} dev: true - /archive-type@4.0.0: - resolution: {integrity: sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==} - engines: {node: '>=4'} - dependencies: - file-type: 4.4.0 - dev: true - /archiver-utils@2.1.0: resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} engines: {node: '>= 6'} @@ -4774,33 +4776,21 @@ packages: executable: 4.1.1 dev: true - /bin-version-check@4.0.0: - resolution: {integrity: sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==} - engines: {node: '>=6'} + /bin-version-check@5.0.0: + resolution: {integrity: sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==} + engines: {node: '>=12'} dependencies: - bin-version: 3.1.0 - semver: 5.7.1 - semver-truncate: 1.1.2 + bin-version: 6.0.0 + semver: 7.3.8 + semver-truncate: 2.0.0 dev: true - /bin-version@3.1.0: - resolution: {integrity: sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==} - engines: {node: '>=6'} + /bin-version@6.0.0: + resolution: {integrity: sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==} + engines: {node: '>=12'} dependencies: - execa: 1.0.0 - find-versions: 3.2.0 - dev: true - - /bin-wrapper@4.1.0: - resolution: {integrity: sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==} - engines: {node: '>=6'} - dependencies: - bin-check: 4.1.0 - bin-version-check: 4.0.0 - download: 7.1.0 - import-lazy: 3.1.0 - os-filter-obj: 2.0.0 - pify: 4.0.1 + execa: 5.1.1 + find-versions: 5.1.0 dev: true /binary-extensions@2.2.0: @@ -4819,13 +4809,6 @@ packages: engines: {node: '>=0.8'} dev: true - /bl@1.2.3: - resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} - dependencies: - readable-stream: 2.3.7 - safe-buffer: 5.2.1 - dev: true - /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} dependencies: @@ -4946,17 +4929,6 @@ packages: node-int64: 0.4.0 dev: true - /buffer-alloc-unsafe@1.1.0: - resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==} - dev: true - - /buffer-alloc@1.2.0: - resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==} - dependencies: - buffer-alloc-unsafe: 1.1.0 - buffer-fill: 1.0.0 - dev: true - /buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} @@ -4969,10 +4941,6 @@ packages: engines: {node: '>=0.4'} dev: true - /buffer-fill@1.0.0: - resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==} - dev: true - /buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -5101,7 +5069,6 @@ packages: /cacheable-lookup@5.0.4: resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==} engines: {node: '>=10.6.0'} - dev: false /cacheable-lookup@7.0.0: resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==} @@ -5121,18 +5088,6 @@ packages: responselike: 3.0.0 dev: false - /cacheable-request@2.1.4: - resolution: {integrity: sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==} - dependencies: - clone-response: 1.0.2 - get-stream: 3.0.0 - http-cache-semantics: 3.8.1 - keyv: 3.0.0 - lowercase-keys: 1.0.0 - normalize-url: 2.0.1 - responselike: 1.0.2 - dev: true - /cacheable-request@7.0.2: resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==} engines: {node: '>=8'} @@ -5144,7 +5099,6 @@ packages: lowercase-keys: 2.0.0 normalize-url: 6.1.0 responselike: 2.0.1 - dev: false /cachedir@2.3.0: resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==} @@ -5208,16 +5162,6 @@ packages: /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} - /caw@2.0.1: - resolution: {integrity: sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==} - engines: {node: '>=4'} - dependencies: - get-proxy: 2.1.0 - isurl: 1.0.0 - tunnel-agent: 0.6.0 - url-to-options: 1.0.1 - dev: true - /cbor@8.1.0: resolution: {integrity: sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==} engines: {node: '>=12.19'} @@ -5502,17 +5446,10 @@ packages: shallow-clone: 3.0.1 dev: true - /clone-response@1.0.2: - resolution: {integrity: sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==} - dependencies: - mimic-response: 1.0.1 - dev: true - /clone-response@1.0.3: resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==} dependencies: mimic-response: 1.0.1 - dev: false /clone-stats@1.0.0: resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==} @@ -6043,17 +5980,6 @@ packages: which: 1.3.1 dev: true - /cross-spawn@6.0.5: - resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} - engines: {node: '>=4.8'} - dependencies: - nice-try: 1.0.5 - path-key: 2.0.1 - semver: 5.7.1 - shebang-command: 1.2.0 - which: 1.3.1 - dev: true - /cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} @@ -6333,72 +6259,11 @@ packages: engines: {node: '>=0.10'} dev: true - /decompress-response@3.3.0: - resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==} - engines: {node: '>=4'} - dependencies: - mimic-response: 1.0.1 - dev: true - /decompress-response@6.0.0: resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} engines: {node: '>=10'} dependencies: mimic-response: 3.1.0 - dev: false - - /decompress-tar@4.1.1: - resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==} - engines: {node: '>=4'} - dependencies: - file-type: 5.2.0 - is-stream: 1.1.0 - tar-stream: 1.6.2 - dev: true - - /decompress-tarbz2@4.1.1: - resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==} - engines: {node: '>=4'} - dependencies: - decompress-tar: 4.1.1 - file-type: 6.2.0 - is-stream: 1.1.0 - seek-bzip: 1.0.6 - unbzip2-stream: 1.4.3 - dev: true - - /decompress-targz@4.1.1: - resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==} - engines: {node: '>=4'} - dependencies: - decompress-tar: 4.1.1 - file-type: 5.2.0 - is-stream: 1.1.0 - dev: true - - /decompress-unzip@4.0.1: - resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==} - engines: {node: '>=4'} - dependencies: - file-type: 3.9.0 - get-stream: 2.3.1 - pify: 2.3.0 - yauzl: 2.10.0 - dev: true - - /decompress@4.2.1: - resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==} - engines: {node: '>=4'} - dependencies: - decompress-tar: 4.1.1 - decompress-tarbz2: 4.1.1 - decompress-targz: 4.1.1 - decompress-unzip: 4.0.1 - graceful-fs: 4.2.11 - make-dir: 1.3.0 - pify: 2.3.0 - strip-dirs: 2.1.0 - dev: true /dedent@0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} @@ -6446,7 +6311,6 @@ packages: /defer-to-connect@2.0.1: resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==} engines: {node: '>=10'} - dev: false /define-properties@1.1.4: resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==} @@ -6647,34 +6511,12 @@ packages: engines: {node: '>=12'} dev: false - /download@7.1.0: - resolution: {integrity: sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==} - engines: {node: '>=6'} - dependencies: - archive-type: 4.0.0 - caw: 2.0.1 - content-disposition: 0.5.4 - decompress: 4.2.1 - ext-name: 5.0.0 - file-type: 8.1.0 - filenamify: 2.1.0 - get-stream: 3.0.0 - got: 8.3.2 - make-dir: 1.3.0 - p-event: 2.3.1 - pify: 3.0.0 - dev: true - /duplexer2@0.1.4: resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==} dependencies: readable-stream: 2.3.7 dev: false - /duplexer3@0.1.5: - resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==} - dev: true - /duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} dev: true @@ -6915,6 +6757,11 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} + /escape-string-regexp@5.0.0: + resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} + engines: {node: '>=12'} + dev: true + /escodegen@2.0.0: resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} engines: {node: '>=6.0'} @@ -7185,19 +7032,6 @@ packages: strip-eof: 1.0.0 dev: true - /execa@1.0.0: - resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==} - engines: {node: '>=6'} - dependencies: - cross-spawn: 6.0.5 - get-stream: 4.1.0 - is-stream: 1.1.0 - npm-run-path: 2.0.2 - p-finally: 1.0.0 - signal-exit: 3.0.7 - strip-eof: 1.0.0 - dev: true - /execa@4.1.0: resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==} engines: {node: '>=10'} @@ -7471,50 +7305,24 @@ packages: readable-web-to-node-stream: 3.0.2 strtok3: 7.0.0 token-types: 5.0.1 - dev: false - - /file-type@3.9.0: - resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==} - engines: {node: '>=0.10.0'} - dev: true - - /file-type@4.4.0: - resolution: {integrity: sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==} - engines: {node: '>=4'} - dev: true - - /file-type@5.2.0: - resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==} - engines: {node: '>=4'} - dev: true - - /file-type@6.2.0: - resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==} - engines: {node: '>=4'} - dev: true - - /file-type@8.1.0: - resolution: {integrity: sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==} - engines: {node: '>=6'} - dev: true /filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} dependencies: minimatch: 5.1.2 - /filename-reserved-regex@2.0.0: - resolution: {integrity: sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==} - engines: {node: '>=4'} + /filename-reserved-regex@3.0.0: + resolution: {integrity: sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true - /filenamify@2.1.0: - resolution: {integrity: sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==} - engines: {node: '>=4'} + /filenamify@5.1.1: + resolution: {integrity: sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==} + engines: {node: '>=12.20'} dependencies: - filename-reserved-regex: 2.0.0 - strip-outer: 1.0.1 - trim-repeated: 1.0.0 + filename-reserved-regex: 3.0.0 + strip-outer: 2.0.0 + trim-repeated: 2.0.0 dev: true /fill-range@4.0.0: @@ -7555,11 +7363,11 @@ packages: locate-path: 6.0.0 path-exists: 4.0.0 - /find-versions@3.2.0: - resolution: {integrity: sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==} - engines: {node: '>=6'} + /find-versions@5.1.0: + resolution: {integrity: sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==} + engines: {node: '>=12'} dependencies: - semver-regex: 2.0.0 + semver-regex: 4.0.5 dev: true /findup-sync@2.0.0: @@ -7726,19 +7534,13 @@ packages: engines: {node: '>= 0.6'} dev: false - /from2@2.3.0: - resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==} - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: true - /from@0.1.7: resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==} dev: true /fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} + dev: false /fs-extra@10.1.0: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} @@ -7916,33 +7718,11 @@ packages: engines: {node: '>=8'} dev: false - /get-proxy@2.1.0: - resolution: {integrity: sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==} - engines: {node: '>=4'} - dependencies: - npm-conf: 1.1.3 - dev: true - - /get-stream@2.3.1: - resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==} - engines: {node: '>=0.10.0'} - dependencies: - object-assign: 4.1.1 - pinkie-promise: 2.0.1 - dev: true - /get-stream@3.0.0: resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==} engines: {node: '>=4'} dev: true - /get-stream@4.1.0: - resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==} - engines: {node: '>=6'} - dependencies: - pump: 3.0.0 - dev: true - /get-stream@5.2.0: resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} engines: {node: '>=8'} @@ -8147,7 +7927,6 @@ packages: lowercase-keys: 2.0.0 p-cancelable: 2.1.1 responselike: 2.0.1 - dev: false /got@12.5.3: resolution: {integrity: sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==} @@ -8166,31 +7945,6 @@ packages: responselike: 3.0.0 dev: false - /got@8.3.2: - resolution: {integrity: sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==} - engines: {node: '>=4'} - dependencies: - '@sindresorhus/is': 0.7.0 - '@types/keyv': 3.1.4 - '@types/responselike': 1.0.0 - cacheable-request: 2.1.4 - decompress-response: 3.3.0 - duplexer3: 0.1.5 - get-stream: 3.0.0 - into-stream: 3.1.0 - is-retry-allowed: 1.2.0 - isurl: 1.0.0 - lowercase-keys: 1.0.1 - mimic-response: 1.0.1 - p-cancelable: 0.4.1 - p-timeout: 2.0.1 - pify: 3.0.0 - safe-buffer: 5.2.1 - timed-out: 4.0.1 - url-parse-lax: 3.0.0 - url-to-options: 1.0.1 - dev: true - /graceful-fs@4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} @@ -8337,20 +8091,10 @@ packages: get-intrinsic: 1.1.3 dev: true - /has-symbol-support-x@1.4.2: - resolution: {integrity: sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==} - dev: true - /has-symbols@1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} - /has-to-string-tag-x@1.4.1: - resolution: {integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==} - dependencies: - has-symbol-support-x: 1.4.2 - dev: true - /has-tostringtag@1.0.0: resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} engines: {node: '>= 0.4'} @@ -8487,13 +8231,8 @@ packages: http-errors: 1.8.1 dev: false - /http-cache-semantics@3.8.1: - resolution: {integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==} - dev: true - /http-cache-semantics@4.1.0: resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} - dev: false /http-errors@1.6.3: resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==} @@ -8571,7 +8310,6 @@ packages: dependencies: quick-lru: 5.1.1 resolve-alpn: 1.2.1 - dev: false /http2-wrapper@2.2.0: resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==} @@ -8683,11 +8421,6 @@ packages: parent-module: 1.0.1 resolve-from: 4.0.0 - /import-lazy@3.1.0: - resolution: {integrity: sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==} - engines: {node: '>=6'} - dev: true - /import-lazy@4.0.0: resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} engines: {node: '>=8'} @@ -8769,14 +8502,6 @@ packages: engines: {node: '>=10.13.0'} dev: true - /into-stream@3.1.0: - resolution: {integrity: sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==} - engines: {node: '>=4'} - dependencies: - from2: 2.3.0 - p-is-promise: 1.1.0 - dev: true - /invert-kv@1.0.0: resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==} engines: {node: '>=0.10.0'} @@ -9018,10 +8743,6 @@ packages: resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} dev: false - /is-natural-number@4.0.1: - resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==} - dev: true - /is-negated-glob@1.0.0: resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==} engines: {node: '>=0.10.0'} @@ -9043,10 +8764,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - /is-object@1.0.2: - resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==} - dev: true - /is-path-inside@3.0.3: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} @@ -9092,11 +8809,6 @@ packages: is-unc-path: 1.0.0 dev: true - /is-retry-allowed@1.2.0: - resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==} - engines: {node: '>=0.10.0'} - dev: true - /is-stream@1.1.0: resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} engines: {node: '>=0.10.0'} @@ -9253,14 +8965,6 @@ packages: textextensions: 3.3.0 dev: true - /isurl@1.0.0: - resolution: {integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==} - engines: {node: '>= 4'} - dependencies: - has-to-string-tag-x: 1.4.1 - is-object: 1.0.2 - dev: true - /jake@10.8.5: resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==} engines: {node: '>=10'} @@ -9933,13 +9637,8 @@ packages: engines: {node: '>=4'} hasBin: true - /json-buffer@3.0.0: - resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==} - dev: true - /json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - dev: false /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} @@ -9970,7 +9669,7 @@ packages: json5: 2.2.3 loader-utils: 2.0.4 schema-utils: 3.1.1 - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) dev: true /json5@2.2.3: @@ -10074,17 +9773,10 @@ packages: tsscmp: 1.0.6 dev: false - /keyv@3.0.0: - resolution: {integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==} - dependencies: - json-buffer: 3.0.0 - dev: true - /keyv@4.5.2: resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==} dependencies: json-buffer: 3.0.1 - dev: false /kind-of@3.2.2: resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==} @@ -10613,20 +10305,9 @@ packages: resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==} dev: false - /lowercase-keys@1.0.0: - resolution: {integrity: sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==} - engines: {node: '>=0.10.0'} - dev: true - - /lowercase-keys@1.0.1: - resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==} - engines: {node: '>=0.10.0'} - dev: true - /lowercase-keys@2.0.0: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} engines: {node: '>=8'} - dev: false /lowercase-keys@3.0.0: resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==} @@ -10671,13 +10352,6 @@ packages: resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==} dev: false - /make-dir@1.3.0: - resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==} - engines: {node: '>=4'} - dependencies: - pify: 3.0.0 - dev: true - /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -10876,7 +10550,6 @@ packages: /mimic-response@3.1.0: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} - dev: false /mimic-response@4.0.0: resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==} @@ -11232,10 +10905,6 @@ packages: /next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - /nice-try@1.0.5: - resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} - dev: true - /node-abi@3.31.0: resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==} engines: {node: '>=10'} @@ -11396,19 +11065,9 @@ packages: sort-keys: 1.1.2 dev: true - /normalize-url@2.0.1: - resolution: {integrity: sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==} - engines: {node: '>=4'} - dependencies: - prepend-http: 2.0.0 - query-string: 5.1.1 - sort-keys: 2.0.0 - dev: true - /normalize-url@6.1.0: resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==} engines: {node: '>=10'} - dev: false /normalize-url@8.0.0: resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==} @@ -11422,14 +11081,6 @@ packages: once: 1.4.0 dev: true - /npm-conf@1.1.3: - resolution: {integrity: sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==} - engines: {node: '>=4'} - dependencies: - config-chain: 1.1.13 - pify: 3.0.0 - dev: true - /npm-run-path@2.0.2: resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==} engines: {node: '>=4'} @@ -11683,37 +11334,19 @@ packages: resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==} dev: true - /p-cancelable@0.4.1: - resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==} - engines: {node: '>=4'} - dev: true - /p-cancelable@2.1.1: resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==} engines: {node: '>=8'} - dev: false /p-cancelable@3.0.0: resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==} engines: {node: '>=12.20'} dev: false - /p-event@2.3.1: - resolution: {integrity: sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==} - engines: {node: '>=6'} - dependencies: - p-timeout: 2.0.1 - dev: true - /p-finally@1.0.0: resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==} engines: {node: '>=4'} - /p-is-promise@1.1.0: - resolution: {integrity: sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==} - engines: {node: '>=4'} - dev: true - /p-limit@2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} @@ -11752,13 +11385,6 @@ packages: p-timeout: 3.2.0 dev: true - /p-timeout@2.0.1: - resolution: {integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==} - engines: {node: '>=4'} - dependencies: - p-finally: 1.0.0 - dev: true - /p-timeout@3.2.0: resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==} engines: {node: '>=8'} @@ -11938,7 +11564,6 @@ packages: /peek-readable@5.0.0: resolution: {integrity: sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==} engines: {node: '>=14.16'} - dev: false /pend@1.2.0: resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} @@ -12020,11 +11645,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /pify@3.0.0: - resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==} - engines: {node: '>=4'} - dev: true - /pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} @@ -12374,11 +11994,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /prepend-http@2.0.0: - resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==} - engines: {node: '>=4'} - dev: true - /prettier-plugin-vue@1.1.6: resolution: {integrity: sha512-trQ/oY+6hSsGe2zPIFThXMIM0TbxMEbk2VOrKjwHWuSz7OEo0rnumbz9a47OxVPCaAnGY9vZG8qDTiTmk9bq0A==} dependencies: @@ -12695,15 +12310,6 @@ packages: strict-uri-encode: 1.1.0 dev: true - /query-string@5.1.1: - resolution: {integrity: sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==} - engines: {node: '>=0.10.0'} - dependencies: - decode-uri-component: 0.2.2 - object-assign: 4.1.1 - strict-uri-encode: 1.1.0 - dev: true - /querystring@0.2.0: resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==} engines: {node: '>=0.4.x'} @@ -12734,7 +12340,6 @@ packages: /quick-lru@5.1.1: resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==} engines: {node: '>=10'} - dev: false /random-seed@0.3.0: resolution: {integrity: sha512-y13xtn3kcTlLub3HKWXxJNeC2qK4mB59evwZ5EkeRlolx+Bp2ztF7LbcZmyCnOqlHQrLnfuNbi1sVmm9lPDlDA==} @@ -12872,7 +12477,6 @@ packages: engines: {node: '>=8'} dependencies: readable-stream: 3.6.0 - dev: false /readdir-glob@1.1.2: resolution: {integrity: sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==} @@ -13098,7 +12702,6 @@ packages: /resolve-alpn@1.2.1: resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==} - dev: false /resolve-cwd@3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} @@ -13168,17 +12771,10 @@ packages: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - /responselike@1.0.2: - resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==} - dependencies: - lowercase-keys: 1.0.1 - dev: true - /responselike@2.0.1: resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==} dependencies: lowercase-keys: 2.0.0 - dev: false /responselike@3.0.0: resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==} @@ -13364,13 +12960,6 @@ packages: /seedrandom@3.0.5: resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==} - /seek-bzip@1.0.6: - resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==} - hasBin: true - dependencies: - commander: 2.20.3 - dev: true - /semver-greatest-satisfied-range@1.1.0: resolution: {integrity: sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==} engines: {node: '>= 0.10'} @@ -13378,16 +12967,16 @@ packages: sver-compat: 1.5.0 dev: true - /semver-regex@2.0.0: - resolution: {integrity: sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==} - engines: {node: '>=6'} + /semver-regex@4.0.5: + resolution: {integrity: sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==} + engines: {node: '>=12'} dev: true - /semver-truncate@1.1.2: - resolution: {integrity: sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==} - engines: {node: '>=0.10.0'} + /semver-truncate@2.0.0: + resolution: {integrity: sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==} + engines: {node: '>=8'} dependencies: - semver: 5.7.1 + semver: 6.3.0 dev: true /semver@5.7.1: @@ -13626,13 +13215,6 @@ packages: is-plain-obj: 1.1.0 dev: true - /sort-keys@2.0.0: - resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==} - engines: {node: '>=4'} - dependencies: - is-plain-obj: 1.1.0 - dev: true - /sortablejs@1.14.0: resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==} dev: true @@ -13931,12 +13513,6 @@ packages: engines: {node: '>=8'} dev: true - /strip-dirs@2.1.0: - resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==} - dependencies: - is-natural-number: 4.0.1 - dev: true - /strip-eof@1.0.0: resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==} engines: {node: '>=0.10.0'} @@ -13968,11 +13544,9 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - /strip-outer@1.0.1: - resolution: {integrity: sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==} - engines: {node: '>=0.10.0'} - dependencies: - escape-string-regexp: 1.0.5 + /strip-outer@2.0.0: + resolution: {integrity: sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true /strnum@1.0.5: @@ -13985,7 +13559,6 @@ packages: dependencies: '@tokenizer/token': 0.3.0 peek-readable: 5.0.0 - dev: false /summaly@2.7.0: resolution: {integrity: sha512-pEz9LL8Gp0oPIQfn6TrnBCcv/HkFE14hxhH3W6LPGdopXlPXjRcMlDMJaO+VupUNMOGaMjCsjq7+0rWnu8sp7w==} @@ -14069,14 +13642,14 @@ packages: whet.extend: 0.9.9 dev: true - /swc-loader@0.2.3(@swc/core@1.3.26)(webpack@5.75.0): + /swc-loader@0.2.3(@swc/core@1.3.50)(webpack@5.75.0): resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==} peerDependencies: '@swc/core': ^1.2.147 webpack: '>=2' dependencies: - '@swc/core': 1.3.26 - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + '@swc/core': 1.3.50 + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) dev: true /swiper@8.4.5: @@ -14123,19 +13696,6 @@ packages: tar-stream: 2.2.0 dev: false - /tar-stream@1.6.2: - resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} - engines: {node: '>= 0.8.0'} - dependencies: - bl: 1.2.3 - buffer-alloc: 1.2.0 - end-of-stream: 1.4.4 - fs-constants: 1.0.0 - readable-stream: 2.3.7 - to-buffer: 1.1.1 - xtend: 4.0.2 - dev: true - /tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} engines: {node: '>=6'} @@ -14181,7 +13741,7 @@ packages: supports-hyperlinks: 2.3.0 dev: true - /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0): + /terser-webpack-plugin@5.3.6(@swc/core@1.3.50)(webpack@5.75.0): resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -14198,12 +13758,12 @@ packages: optional: true dependencies: '@jridgewell/trace-mapping': 0.3.17 - '@swc/core': 1.3.26 + '@swc/core': 1.3.50 jest-worker: 27.5.1 schema-utils: 3.1.1 serialize-javascript: 6.0.0 terser: 5.16.1 - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) dev: true /terser@5.16.1: @@ -14325,11 +13885,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /timed-out@4.0.1: - resolution: {integrity: sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==} - engines: {node: '>=0.10.0'} - dev: true - /timsort@0.3.0: resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==} dev: true @@ -14355,10 +13910,6 @@ packages: is-negated-glob: 1.0.0 dev: true - /to-buffer@1.1.1: - resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==} - dev: true - /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -14414,7 +13965,6 @@ packages: dependencies: '@tokenizer/token': 0.3.0 ieee754: 1.2.1 - dev: false /tough-cookie@2.5.0: resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==} @@ -14462,11 +14012,11 @@ packages: engines: {node: '>=8'} dev: true - /trim-repeated@1.0.0: - resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==} - engines: {node: '>=0.10.0'} + /trim-repeated@2.0.0: + resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==} + engines: {node: '>=12'} dependencies: - escape-string-regexp: 1.0.5 + escape-string-regexp: 5.0.0 dev: true /ts-jest@27.1.2(@babel/core@7.21.4)(@types/jest@27.4.0)(jest@27.4.5)(typescript@4.5.4): @@ -14516,7 +14066,7 @@ packages: micromatch: 4.0.5 semver: 7.3.8 typescript: 4.9.4 - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) dev: true /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4): @@ -14549,7 +14099,7 @@ packages: yn: 3.1.1 dev: true - /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4): + /ts-node@10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -14564,7 +14114,7 @@ packages: optional: true dependencies: '@cspotcode/source-map-support': 0.8.1 - '@swc/core': 1.3.26 + '@swc/core': 1.3.50 '@tsconfig/node10': 1.0.9 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 @@ -14782,7 +14332,7 @@ packages: pg: 8.8.0 reflect-metadata: 0.1.13 sha.js: 2.4.11 - ts-node: 10.9.1(@swc/core@1.3.26)(@types/node@18.11.18)(typescript@4.9.4) + ts-node: 10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4) tslib: 2.4.1 uuid: 8.3.2 xml2js: 0.4.23 @@ -14807,13 +14357,6 @@ packages: hasBin: true dev: false - /unbzip2-stream@1.4.3: - resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} - dependencies: - buffer: 5.7.1 - through: 2.3.8 - dev: true - /unc-path-regex@0.1.2: resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==} engines: {node: '>=0.10.0'} @@ -14956,13 +14499,6 @@ packages: deprecated: Please see https://github.com/lydell/urix#deprecated dev: true - /url-parse-lax@3.0.0: - resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==} - engines: {node: '>=4'} - dependencies: - prepend-http: 2.0.0 - dev: true - /url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} dependencies: @@ -14973,11 +14509,6 @@ packages: resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==} dev: true - /url-to-options@1.0.1: - resolution: {integrity: sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==} - engines: {node: '>= 4'} - dev: true - /url@0.10.3: resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==} dependencies: @@ -15371,7 +14902,7 @@ packages: import-local: 3.1.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1) + webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1) webpack-merge: 5.8.0 dev: true @@ -15388,7 +14919,7 @@ packages: engines: {node: '>=10.13.0'} dev: true - /webpack@5.75.0(@swc/core@1.3.26)(webpack-cli@5.0.1): + /webpack@5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1): resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -15419,7 +14950,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.1 tapable: 2.2.1 - terser-webpack-plugin: 5.3.6(@swc/core@1.3.26)(webpack@5.75.0) + terser-webpack-plugin: 5.3.6(@swc/core@1.3.50)(webpack@5.75.0) watchpack: 2.4.0 webpack-cli: 5.0.1(webpack@5.75.0) webpack-sources: 3.2.3 From 3d569217276eeb3475e4bb2911efa6c06930a138 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 13 Apr 2023 19:46:52 -0700 Subject: [PATCH 04/78] fix: :lock: don't show notes with CW on welcome screen Closes #9849 --- packages/client/src/pages/welcome.entrance.a.vue | 1 + packages/client/src/pages/welcome.timeline.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index f40e2a82b..286ecdda1 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -38,6 +38,7 @@ class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl" + alt="logo" /> {{ instanceName }} diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue index f90976bf2..26f5fa4b0 100644 --- a/packages/client/src/pages/welcome.timeline.vue +++ b/packages/client/src/pages/welcome.timeline.vue @@ -6,7 +6,7 @@ v-bind:class="{ scroll: isScrolling }" >
-
+
Date: Thu, 13 Apr 2023 20:11:39 -0700 Subject: [PATCH 05/78] only show index posts action if admin --- packages/client/src/pages/admin/index.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 77c90aeee..34d0404fc 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -161,12 +161,16 @@ const menuDef = $computed(() => [ }, ] : []), - { - type: "button", - icon: "ph-list-magnifying-glass ph-bold ph-lg", - text: i18n.ts.indexPosts, - action: indexPosts, - }, + ...($i.isAdmin + ? [ + { + type: "button", + icon: "ph-list-magnifying-glass ph-bold ph-lg", + text: i18n.ts.indexPosts, + action: indexPosts, + }, + ] + : []), ], }, { From 818bdcbd18406b9dd7ea68f2ad0a3e589b064d70 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 00:40:13 +0900 Subject: [PATCH 06/78] improve city search --- packages/client/src/pages/user/home.vue | 34 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 3fa01d9c0..ef5a6544d 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -353,18 +353,28 @@ const age = $computed(() => { }); const timeForThem = $computed(() => { - const tzInfo = cityTimezones.lookupViaCity( - props.user.location!.replace(/\s.*/, "") - ); - if (tzInfo.length == 0) return ""; - const tz = tzInfo[0].timezone; - const theirTime = new Date().toLocaleString("en-US", { - timeZone: tz, - hour12: false, - }); - return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime - .split(" ")[1] - .slice(-5, -3)})`; + const maybeCityNames = [ + props.user.location!, + props.user.location!.replace(/[^A-Za-z].*/, ""), + props.user.location!.replace(/[^A-Za-z\-\'\.].*/, ""), + props.user.location!.replace(/[^A-Za-z0-9\-\'\.\s].*/, ""), + ]; + + for (const city of maybeCityNames) { + let tzInfo = cityTimezones.lookupViaCity(city); + if (tzInfo.length == 0) continue; + + const tz = tzInfo[0].timezone; + const theirTime = new Date().toLocaleString("en-US", { + timeZone: tz, + hour12: false, + }); + return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime + .split(" ")[1] + .slice(-5, -3)})`; + } + + return ""; }); function menu(ev) { From 4fc833c84cfbb6e3e08c30efc6ad4d1437eefef7 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 01:00:43 +0900 Subject: [PATCH 07/78] allow acute accent --- packages/client/src/pages/user/home.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index ef5a6544d..84ee4b0a3 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -355,9 +355,18 @@ const age = $computed(() => { const timeForThem = $computed(() => { const maybeCityNames = [ props.user.location!, - props.user.location!.replace(/[^A-Za-z].*/, ""), - props.user.location!.replace(/[^A-Za-z\-\'\.].*/, ""), - props.user.location!.replace(/[^A-Za-z0-9\-\'\.\s].*/, ""), + props.user.location!.replace( + /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/, + "" + ), + props.user.location!.replace( + /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/, + "" + ), + props.user.location!.replace( + /[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/, + "" + ), ]; for (const city of maybeCityNames) { From d73a87b1b9eae4616077e7e530465c7b7d227e6c Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 01:01:36 +0900 Subject: [PATCH 08/78] prevent crashes due to timezone === null --- packages/client/src/pages/user/home.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 84ee4b0a3..8c1c82d06 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -374,6 +374,8 @@ const timeForThem = $computed(() => { if (tzInfo.length == 0) continue; const tz = tzInfo[0].timezone; + if (!tz) continue; + const theirTime = new Date().toLocaleString("en-US", { timeZone: tz, hour12: false, From 81a8550d8fbf5697766cb2036260d9f1d9c8caa3 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 01:10:59 +0900 Subject: [PATCH 09/78] update locale --- locales/en-US.yml | 2 +- locales/ja-JP.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index d67e3b362..d0a152599 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1426,7 +1426,7 @@ _profile: metadataContent: "Content" changeAvatar: "Change avatar" changeBanner: "Change banner" - locationDescription: "If you enter your city, it will display your local time to other users." + locationDescription: "If you enter your city first, it will display your local time to other users." _exportOrImport: allNotes: "All posts" followingList: "Followed users" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 2e6795a78..b5c102a65 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1423,7 +1423,7 @@ _profile: metadataContent: "内容" changeAvatar: "アバター画像を変更" changeBanner: "バナー画像を変更" - locationDescription: "正しく入力すると、あなたの現地時間が他のユーザーに表示されます。" + locationDescription: "英語表記の都市名から始まる内容を入力すると、現地時間がユーザーページに表示されます。" _exportOrImport: allNotes: "全ての投稿" followingList: "フォロー" From 74a43b7478f6572cbeaa5378386dbd805674948a Mon Sep 17 00:00:00 2001 From: daikei Date: Fri, 14 Apr 2023 16:18:50 +0000 Subject: [PATCH 10/78] replace koa-favicon with a small patch of code This should remove a needless dependency and replace it with a tiny, simple koa router --- packages/backend/src/server/web/index.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts index 642a17d57..52b49c2a4 100644 --- a/packages/backend/src/server/web/index.ts +++ b/packages/backend/src/server/web/index.ts @@ -8,13 +8,11 @@ import { readFileSync } from "node:fs"; import Koa from "koa"; import Router from "@koa/router"; import send from "koa-send"; -import favicon from "koa-favicon"; import views from "koa-views"; import sharp from "sharp"; import { createBullBoard } from "@bull-board/api"; import { BullAdapter } from "@bull-board/api/bullAdapter.js"; import { KoaAdapter } from "@bull-board/koa"; - import { In, IsNull } from "typeorm"; import { fetchMeta } from "@/misc/fetch-meta.js"; import config from "@/config/index.js"; @@ -98,8 +96,13 @@ app.use( }), ); -// Serve favicon -app.use(favicon(`${_dirname}/../../../assets/favicon.ico`)); +// Favicon Router +app.use(async (ctx, next) => { + if (ctx.path != '/favicon.ico') return next() + const meta = await fetchMeta(); + if (meta.iconUrl === "") ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`); + else ctx.redirect(meta.iconUrl) +}) // Common request handler app.use(async (ctx, next) => { From 2aa0fa37cfdc976e8cca7785404305e75bacf671 Mon Sep 17 00:00:00 2001 From: daikei Date: Fri, 14 Apr 2023 16:20:27 +0000 Subject: [PATCH 11/78] remove koa-favicon --- packages/backend/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index a03d6d35b..b02af2c03 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -75,7 +75,6 @@ "koa": "2.13.4", "koa-body": "^6.0.1", "koa-bodyparser": "4.3.0", - "koa-favicon": "2.1.0", "koa-json-body": "5.3.0", "koa-logger": "3.2.1", "koa-mount": "4.0.0", From 3ecd3cf6a16137f00120c428afab1995021b20f2 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 01:37:53 +0900 Subject: [PATCH 12/78] fix a bug --- packages/client/src/pages/user/home.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 8c1c82d06..c3d73b573 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -363,10 +363,12 @@ const timeForThem = $computed(() => { /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/, "" ), - props.user.location!.replace( - /[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/, - "" - ), + props.user + .location!.replace( + /[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/, + "" + ) + .trim(), ]; for (const city of maybeCityNames) { From ec96805ddc8b2423466a5f4edd4f8c1556360ab9 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 15 Apr 2023 01:41:49 +0900 Subject: [PATCH 13/78] change regex priority --- packages/client/src/pages/user/home.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index c3d73b573..af3a38431 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -355,20 +355,20 @@ const age = $computed(() => { const timeForThem = $computed(() => { const maybeCityNames = [ props.user.location!, - props.user.location!.replace( - /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/, - "" - ), - props.user.location!.replace( - /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/, - "" - ), props.user .location!.replace( /[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/, "" ) .trim(), + props.user.location!.replace( + /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/, + "" + ), + props.user.location!.replace( + /[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/, + "" + ), ]; for (const city of maybeCityNames) { From 24c23c647433bcaa85ca3d04050dcc3780d04e98 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 14 Apr 2023 15:35:18 -0700 Subject: [PATCH 14/78] chore: formatting --- packages/backend/src/server/web/index.ts | 11 ++++++----- pnpm-lock.yaml | 9 --------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts index 52b49c2a4..028170cd7 100644 --- a/packages/backend/src/server/web/index.ts +++ b/packages/backend/src/server/web/index.ts @@ -98,11 +98,12 @@ app.use( // Favicon Router app.use(async (ctx, next) => { - if (ctx.path != '/favicon.ico') return next() - const meta = await fetchMeta(); - if (meta.iconUrl === "") ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`); - else ctx.redirect(meta.iconUrl) -}) + if (ctx.path != "/favicon.ico") return next(); + const meta = await fetchMeta(); + if (meta.iconUrl === "") + ctx.body = readFileSync(`${_dirname}/../../../assets/favicon.ico`); + else ctx.redirect(meta.iconUrl); +}); // Common request handler app.use(async (ctx, next) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 410801dde..7e62b9ef3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -227,9 +227,6 @@ importers: koa-bodyparser: specifier: 4.3.0 version: 4.3.0 - koa-favicon: - specifier: 2.1.0 - version: 2.1.0 koa-json-body: specifier: 5.3.0 version: 5.3.0 @@ -9837,12 +9834,6 @@ packages: koa-compose: 4.1.0 dev: false - /koa-favicon@2.1.0: - resolution: {integrity: sha512-LvukcooYjxKtnZq0RXdBup+JDhaHwLgnLlDHB/xvjwQEjbc4rbp/0WkmOzpOvaHujc+fIwPear0dpKX1V+dHVg==} - dependencies: - mz: 2.7.0 - dev: false - /koa-json-body@5.3.0: resolution: {integrity: sha512-M2P3zLOs2XiYCpJLGSTXOKij4u5vJ8pbAMXXarXQnwsx4DwDav9qn081tYI2RdZ79B159Pdk4bRfvwl/sazL8A==} engines: {node: '>= 4.0.0'} From 569f754d850a12917ae53d0f7eff1825e882e327 Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 16 Apr 2023 01:05:18 +0900 Subject: [PATCH 15/78] feat: rename workspaces --- locales/en-US.yml | 2 ++ locales/ja-JP.yml | 2 ++ locales/zh-CN.yml | 2 ++ locales/zh-TW.yml | 2 ++ packages/client/src/ui/deck.vue | 26 +++++++++++++++++++++++ packages/client/src/ui/deck/deck-store.ts | 14 ++++++++++++ 6 files changed, 48 insertions(+) diff --git a/locales/en-US.yml b/locales/en-US.yml index d0a152599..99b0a7c86 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1806,7 +1806,9 @@ _deck: popRight: "Pop column to the right" profile: "Workspace" newProfile: "New workspace" + renameProfile: "Rename workspace" deleteProfile: "Delete workspace" + nameAlreadyExists: "This workspace name already exists." introduction: "Create the perfect interface for you by arranging columns freely!" introduction2: "Click on the + on the right of the screen to add new colums whenever you want." widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b5c102a65..5bd06f23e 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1803,7 +1803,9 @@ _deck: popRight: "右に出す" profile: "ワークスペース" newProfile: "新規ワークスペース" + renameProfile: "ワークスペース名を変更" deleteProfile: "ワークスペースを削除" + nameAlreadyExists: "この名前のワークスペースは既に存在します。" introduction: "カラムを組み合わせて自分だけのインターフェイスを作りましょう!" introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。" widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index e891e3d88..2784da81d 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1731,7 +1731,9 @@ _deck: popRight: "向右弹出" profile: "配置文件" newProfile: "新建配置文件" + renameProfile: "重命名配置文件" deleteProfile: "删除配置文件" + nameAlreadyExists: "该配置文件名已存在。" introduction: "将各列进行组合以创建您自己的界面!" introduction2: "您可以随时通过屏幕右侧的 + 来添加列" widgetsIntroduction: "从列菜单中,选择“小工具编辑”来添加小工具" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 4471444e9..3e8485adb 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1731,7 +1731,9 @@ _deck: popRight: "向右彈出" profile: "個人檔案" newProfile: "新建個人檔案" + renameProfile: "重新命名個人檔案" deleteProfile: "刪除個人檔案" + nameAlreadyExists: "該個人檔案名已經存在。" introduction: "組合欄位來製作屬於自己的介面吧!" introduction2: "您可以隨時透過按畫面右方的 + 來添加欄位。" widgetsIntroduction: "請從欄位的選單中,選擇「編輯小工具」來添加小工具" diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue index debf5d0e4..9de91fe56 100644 --- a/packages/client/src/ui/deck.vue +++ b/packages/client/src/ui/deck.vue @@ -70,6 +70,14 @@ > +
- {{ i18n.ts._aboutCalckey.source }} + {{ i18n.ts._aboutMisskey.source }} - {{ i18n.ts._aboutCalckey.donate }} + {{ i18n.ts._aboutMisskey.donate }} - {{ i18n.ts._aboutCalckey.translation }} + {{ i18n.ts._aboutMisskey.translation }}
@@ -272,6 +283,8 @@ import { i18n } from "@/i18n"; import * as os from "@/os"; import { stream } from "@/stream"; import { useTooltip } from "@/scripts/use-tooltip"; +import { defaultStore } from "@/store"; +import { instance } from "@/instance"; const props = withDefaults( defineProps<{ @@ -288,6 +301,10 @@ const props = withDefaults( const elRef = ref(null); const reactionRef = ref(null); +const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReaction) + ? instance.defaultReaction + : "⭐"; + let readObserver: IntersectionObserver | undefined; let connection; diff --git a/packages/client/src/components/MkReactedUsersDialog.vue b/packages/client/src/components/MkReactedUsersDialog.vue index 7012ea3fa..784d306b6 100644 --- a/packages/client/src/components/MkReactedUsersDialog.vue +++ b/packages/client/src/components/MkReactedUsersDialog.vue @@ -6,7 +6,7 @@ @close="dialog.close()" @closed="emit('closed')" > - +
diff --git a/packages/client/src/components/MkStarButtonNoEmoji.vue b/packages/client/src/components/MkStarButtonNoEmoji.vue new file mode 100644 index 000000000..3ca0b9261 --- /dev/null +++ b/packages/client/src/components/MkStarButtonNoEmoji.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue index b58a42597..3b45fa796 100644 --- a/packages/client/src/pages/settings/preferences-backups.vue +++ b/packages/client/src/pages/settings/preferences-backups.vue @@ -114,6 +114,7 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [ "swipeOnDesktop", "showAdminUpdates", "enableCustomKaTeXMacro", + "enableEmojiReactions", ]; const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [ "lightTheme", diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue index 22c6f289b..dbe909e98 100644 --- a/packages/client/src/pages/settings/reaction.vue +++ b/packages/client/src/pages/settings/reaction.vue @@ -1,81 +1,92 @@ @@ -108,6 +119,9 @@ const reactionPickerHeight = $computed( const reactionPickerUseDrawerForMobile = $computed( defaultStore.makeGetterSetter("reactionPickerUseDrawerForMobile") ); +const enableEmojiReactions = $computed( + defaultStore.makeGetterSetter("enableEmojiReactions") +); function save() { defaultStore.set("reactions", reactions); diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index 44c442a4a..4cb28b000 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -294,6 +294,10 @@ export const defaultStore = markRaw( where: "device", default: false, }, + enableEmojiReactions: { + where: "account", + default: true, + }, }), ); From 206aa845f93238ae32913369bc1f9eb4c6c440d9 Mon Sep 17 00:00:00 2001 From: D David Date: Wed, 19 Apr 2023 00:07:55 +0000 Subject: [PATCH 51/78] chore: Translated using Weblate (Spanish) Currently translated at 92.5% (1595 of 1724 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/ --- locales/es-ES.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 7f0c4b879..3a4f0a219 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1162,6 +1162,7 @@ _serverDisconnectedBehavior: reload: "Recargar automáticamente" dialog: "Mostrar diálogo de advertencia" quiet: "Advertencia discreta" + nothing: Hacer nada _channel: create: "Crear canal" edit: "Editar canal" @@ -1418,6 +1419,8 @@ _widgets: aiscript: "Consola de AiScript" aichan: "indigo" userList: Lista Usuarios + _userList: + chooseList: Seleccione una lista _cw: hide: "Ocultar" show: "Ver más" @@ -1479,6 +1482,8 @@ _profile: metadataContent: "Contenido" changeAvatar: "Cambiar avatar" changeBanner: "Cambiar banner" + locationDescription: Si ingresas tu ciudad primero, el tiempo local tuyo será visible + para otros usuarios. _exportOrImport: allNotes: "Todas las notas" followingList: "Siguiendo" @@ -1919,3 +1924,7 @@ enterSendsMessage: Presione "RETORNO" en los mensajes para enviar el mensaje (pa recommendedInstances: Instancias Recomendadas instanceSecurity: Seguridad de la instancia seperateRenoteQuote: Separar impulsados y Citar botones +_messaging: + groups: Grupos + dms: Privado +pushNotification: Notificaciones From 3b62da3d79dda3408ac8722b15d3cf1e52c9a341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D1=87=D0=B8=D0=BA?= Date: Wed, 19 Apr 2023 04:44:38 +0000 Subject: [PATCH 52/78] chore: Translated using Weblate (Russian) Currently translated at 93.6% (1615 of 1724 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/ --- locales/ru-RU.yml | 77 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 40b7c54e0..a77695929 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -754,7 +754,7 @@ nUsers: "Пользователей: {n}" nNotes: "Заметок: {n}" sendErrorReports: "Посылать отчёты о сбоях" sendErrorReportsDescription: "Если включено, когда возникнет какая-нибудь техническая\ - \ проблема, подробные сведения об этом будут отправлены разработчикам Misskey. Это\ + \ проблема, подробные сведения об этом будут отправлены разработчикам Calckey. Это\ \ очень помогает делать программу лучше. В отчёты попадают тип и версия ОС, браузера,\ \ журнал действий (что привело к сбою) и тому подобное." myTheme: "Личная тема" @@ -1789,3 +1789,78 @@ renoteUnmute: Разглушить репосты hiddenTags: Скрытые хештеги noInstances: Нет инстансов secureModeInfo: При запросах с других инстансов не отправлять ответ без подтверждения. +instanceDefaultThemeDescription: Введите код темы в формате объекта. +tenMinutes: 10 минут +oneHour: Один час +thereIsUnresolvedAbuseReportWarning: Есть не рассмотренные жалобы. +cropImage: Обрезать изображение +requireAdminForView: Вы должны войти с аккаунта администратора что просмотреть это. +refreshInterval: 'Интервал обновления ' +slow: Медленно +fast: Быстро +sensitiveMediaDetection: Обнаружение NSFW медиа +remoteOnly: Только другие сайты +navbar: Панель навигации +customMOTD: Своё MOTD (сообщения на заставке) +customMOTDDescription: Пользовательские сообщения для MOTD (заставки), разделенные + разрывами строк, будут отображаться случайным образом каждый раз, когда пользователь + загружает / перезагружает страницу. +recommendedInstancesDescription: Рекомендуемые инстансы, разделенные разрывами строк, + должны отображаться на рекомендуемой ленте. НЕ добавляйте `https://`, ТОЛЬКО домен. +caption: Автоматическая подпись +splash: Заставка +updateAvailable: Возможно, доступно обновление! +move: Переместить +swipeOnDesktop: Разрешить свайпы в мобильном стиле на десктопе +showAds: Показывать рекламу +noEmailServerWarning: Почтовый сервер не настроен. +type: Тип +numberOfPageCacheDescription: Увеличение этого числа повысит удобство для пользователей, + но приведет к увеличению нагрузки на сервер, а также к использованию большего объема + памяти. +statusbar: Панель статуса +speed: Скорость +oneDay: Один день +oneWeek: Одна неделя +failedToFetchAccountInformation: Не удалось получить информацию о аккаунте +cropImageAsk: Желаете ли вы обрезать это изображение? +recentNHours: Последние {n} часов +recentNDays: Последние {n} дней +typeToConfirm: Введите {x} чтобы подтвердить +document: Документация +logoutConfirm: Действительно выйти? +failedToUpload: Не удалось загрузить +pushNotification: Пуш уведомления +subscribePushNotification: Включить пуш уведомления +unsubscribePushNotification: Отключить пуш уведомления +pushNotificationAlreadySubscribed: Пуш уведомления уже включены +sendPushNotificationReadMessage: Удалять пуш уведомления после того как соответствующие + уведомления или сообщения были прочитаны +customSplashIcons: Свои иконки для заставки (URL) +customSplashIconsDescription: URL-адреса для пользовательских значков заставки, разделенных + разрывами строк, будут отображаться случайным образом каждый раз, когда пользователь + загружает / перезагружает страницу. Пожалуйста, убедитесь, что изображения находятся + на статическом URL-адресе, предпочтительно все с размером 192x192. +logoImageUrl: URL изображения логотипа +showAdminUpdates: Указать, что доступна новая версия Calckey (только для администратора) +replayTutorial: Перезапустить туториал +migration: Миграция +showLocalPosts: 'Показать локальные посты в:' +homeTimeline: Домашняя лента +socialTimeline: Социальная лента +driveCapOverrideCaption: Сбросить до настроек по умолчанию введя значение 0 или меньше. +deleteAccount: Удалить аккаунт +numberOfPageCache: Число кэшируемых страниц +pushNotificationNotSupported: Ваш браузер или инстанс не поддерживает пуш уведомления +sendPushNotificationReadMessageCaption: Уведомление содержащее текст "{emptyPushNotificationMessage}" + будет показано на короткое время. Это может увеличить расход батареи вашего устройства, + если это применимо. +cannotUploadBecauseNoFreeSpace: Загрузка не удалась из-за нехватки места на Диске. +cannotUploadBecauseInappropriate: Этот файл не может быть загружен потому что его + части были обнаружены как потенциальное NSFW. +adminCustomCssWarn: Этот параметр следует использовать только в том случае, если вы + знаете, что он делает. Ввод неправильных значений может привести к тому, что ВСЕ + клиенты перестанут нормально функционировать. Пожалуйста, убедитесь, что ваш CSS + работает должным образом, протестировав его в настройках вашего пользователя. +showUpdates: Показывать всплывающее окно при обновлении Calckey +recommendedInstances: Рекомендованные инстансы From b8e157060b64518a2573fbfa8cf315c694e69c8e Mon Sep 17 00:00:00 2001 From: Panagiotis Damelos Date: Wed, 19 Apr 2023 15:01:11 +0000 Subject: [PATCH 53/78] chore: Translated using Weblate (Greek) Currently translated at 43.2% (745 of 1724 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/el/ --- locales/el-GR.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/el-GR.yml b/locales/el-GR.yml index f9b8e6992..9b234f5eb 100644 --- a/locales/el-GR.yml +++ b/locales/el-GR.yml @@ -412,10 +412,10 @@ _notification: reply: "Απάντηση" renote: "Κοινοποίηση σημειώματος" _deck: - widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία μαραφετίων\" στο μενού\ - \ και προσθέστε μαραφέτι." + widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία πρόσθετων\" στο μενού και\ + \ προσθέστε μαραφέτι." _columns: - widgets: "Μαραφέτια" + widgets: "Πρόσθετα" notifications: "Ειδοποιήσεις" tl: "Χρονολόγιο" antenna: "Αντένες" From 386b93ddfd7f1ca72a7be228db565ebd4388f705 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 19 Apr 2023 20:41:57 -0700 Subject: [PATCH 54/78] Revert "docs: rm yunohost" This reverts commit 9ef11deb9934a4aecf601441f9d20f465e02ca04. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28c6d6bba..af117ac4a 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ - 📖 JoinFediverse Wiki: - 🐋 Docker Hub: - ✍️ Weblate: - +- 📦 Yunohost: # 🌠 Getting started @@ -65,8 +65,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis If you have access to a server that supports one of the sources below, I recommend you use it! Note that these methods *won't* allow you to migrate from Misskey without manual intervention. -[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)  [![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey) - +[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)  [![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)  [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) ### 🐋 Docker From 45b3e5635dd6a78ff8ad2f4147ef80e41937c63f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 19 Apr 2023 20:46:37 -0700 Subject: [PATCH 55/78] reaction settings auto reload --- packages/backend/src/server/index.ts | 7 ++++--- packages/client/src/pages/settings/reaction.vue | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts index 191556c40..7d274f7d2 100644 --- a/packages/backend/src/server/index.ts +++ b/packages/backend/src/server/index.ts @@ -37,10 +37,11 @@ export const serverLogger = new Logger("server", "gray", false); const app = new Koa(); app.proxy = true; -// Replace trailing slashes +// Replace trailing slashes app.use(async (ctx, next) => { - if (ctx.request.path !== "/" && ctx.request.path.endsWith('/')) return ctx.redirect(ctx.request.path.replace(/\/$/, "")) - else await next() + if (ctx.request.path !== "/" && ctx.request.path.endsWith("/")) + return ctx.redirect(ctx.request.path.replace(/\/$/, "")); + else await next(); }); if (!["production", "test"].includes(process.env.NODE_ENV || "")) { diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue index dbe909e98..e32f6516e 100644 --- a/packages/client/src/pages/settings/reaction.vue +++ b/packages/client/src/pages/settings/reaction.vue @@ -2,7 +2,6 @@
{{ i18n.ts.enableEmojiReactions }} -
@@ -104,6 +103,17 @@ import { defaultStore } from "@/store"; import { i18n } from "@/i18n"; import { definePageMetadata } from "@/scripts/page-metadata"; import { deepClone } from "@/scripts/clone"; +import { unisonReload } from "@/scripts/unison-reload"; + +async function reloadAsk() { + const { canceled } = await os.confirm({ + type: "info", + text: i18n.ts.reloadToApplySetting, + }); + if (canceled) return; + + unisonReload(); +} let reactions = $ref(deepClone(defaultStore.state.reactions)); @@ -185,6 +195,10 @@ watch( } ); +watch(enableEmojiReactions, async () => { + await reloadAsk(); +}); + const headerActions = $computed(() => []); const headerTabs = $computed(() => []); From 98d4765615eed83d896390a5c0dda5fddc7f405f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 19 Apr 2023 21:00:01 -0700 Subject: [PATCH 56/78] fix tag on explore --- packages/client/src/components/mfm.ts | 6 +- packages/client/src/pages/explore.users.vue | 4 +- packages/client/src/pages/explore.vue | 14 ---- packages/client/src/pages/tag.vue | 75 +++++++++++++++++++-- 4 files changed, 74 insertions(+), 25 deletions(-) diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index 6f1b4256d..3ded57e1a 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -367,11 +367,7 @@ export default defineComponent({ MkA, { key: Math.random(), - to: this.isNote - ? `/tags/${encodeURIComponent(token.props.hashtag)}` - : `/explore/tags/${encodeURIComponent( - token.props.hashtag, - )}`, + to: `/tags/${encodeURIComponent(token.props.hashtag)}`, style: "color:var(--hashtag);", }, `#${token.props.hashtag}`, diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue index 378801532..73caf4b98 100644 --- a/packages/client/src/pages/explore.users.vue +++ b/packages/client/src/pages/explore.users.vue @@ -80,14 +80,14 @@ {{ tag.tag }} {{ tag.tag }}
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue index 0915d6ac8..e3c6774ac 100644 --- a/packages/client/src/pages/explore.vue +++ b/packages/client/src/pages/explore.vue @@ -39,7 +39,6 @@ import { Virtual } from "swiper"; import { Swiper, SwiperSlide } from "swiper/vue"; import XFeatured from "./explore.featured.vue"; import XUsers from "./explore.users.vue"; -import type MkFolder from "@/components/MkFolder.vue"; import { definePageMetadata } from "@/scripts/page-metadata"; import { deviceKind } from "@/scripts/device-kind"; import { i18n } from "@/i18n"; @@ -47,23 +46,10 @@ import { defaultStore } from "@/store"; import "swiper/scss"; import "swiper/scss/virtual"; -const props = defineProps<{ - tag?: string; -}>(); - const tabs = ["featured", "users"]; let tab = $ref(tabs[0]); watch($$(tab), () => syncSlide(tabs.indexOf(tab))); -let tagsEl = $ref>(); - -watch( - () => props.tag, - () => { - if (tagsEl) tagsEl.toggleContent(props.tag == null); - } -); - const headerActions = $computed(() => []); const headerTabs = $computed(() => [ diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue index 390b6a0ba..38ba1e106 100644 --- a/packages/client/src/pages/tag.vue +++ b/packages/client/src/pages/tag.vue @@ -1,24 +1,58 @@ diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 311a80fa0..3d0464bf2 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -10,11 +10,11 @@ :class="{ renote: isRenote }" > -
+
@@ -77,93 +77,34 @@ />
-

- -
- -

+
-
+ +
+ {{ + i18n.t("translatedFrom", { + x: translation.sourceLang, + }) + }}: + - -
- -
- {{ - i18n.t("translatedFrom", { - x: translation.sourceLang, - }) - }}: - - -
-
-
- -
- - -
- -
- -
+
+ + + +