remove useless dependecies and use cli instead of package

This commit is contained in:
Niccolo Borgioli 2024-09-02 10:20:03 +02:00
parent 7b919f2a53
commit 4b1f939281
10 changed files with 59 additions and 95 deletions

View File

@ -17,7 +17,6 @@
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.2",
"@sveltejs/vite-plugin-svelte": "^3.0.2",
"@types/file-saver": "^2.0.7",
"@zerodevx/svelte-toast": "^0.9.5",
"adm-zip": "^0.5.10",
"dotenv": "^16.4.5",
@ -29,11 +28,9 @@
"vite": "^5.1.7"
},
"dependencies": {
"@cryptgeon/shared": "workspace:*",
"cryptgeon": "workspace:*",
"@fontsource/fira-mono": "^5.0.8",
"copy-to-clipboard": "^3.3.3",
"file-saver": "^2.0.5",
"occulto": "^2.0.3",
"occulto": "^2.0.6",
"pretty-bytes": "^6.1.1",
"qrious": "^4.0.2"
}

View File

@ -1,8 +1,8 @@
import { status as getStatus, type Status } from '@cryptgeon/shared'
import { API, type Status } from 'cryptgeon/shared'
import { writable } from 'svelte/store'
export const status = writable<null | Status>(null)
export async function init() {
status.set(await getStatus())
status.set(await API.status())
}

View File

@ -1,11 +1,11 @@
import { toast, type SvelteToastOptions } from '@zerodevx/svelte-toast'
import { toast } from '@zerodevx/svelte-toast'
export enum NotifyType {
Success = 'success',
Error = 'error',
}
const themeMapping: Record<NotifyType, SvelteToastOptions['theme']> = {
const themeMapping: Record<NotifyType, Record<string, string>> = {
[NotifyType.Success]: {
'--toastBackground': 'var(--ui-clr-primary)',
'--toastBarBackground': 'var(--ui-clr-primary-alt)',
@ -17,7 +17,7 @@ const themeMapping: Record<NotifyType, SvelteToastOptions['theme']> = {
}
function notifyFN(message: string, type: NotifyType = NotifyType.Success) {
const options: SvelteToastOptions = {
const options = {
duration: 5_000,
theme: {
...themeMapping[type],

View File

@ -4,7 +4,7 @@
import { status } from '$lib/stores/status'
import Switch from '$lib/ui/Switch.svelte'
import TextInput from '$lib/ui/TextInput.svelte'
import type { Note } from '@cryptgeon/shared'
import type { Note } from 'cryptgeon/shared'
export let note: Note
export let timeExpiration = false

View File

@ -3,7 +3,7 @@
import Button from '$lib/ui/Button.svelte'
import MaxSize from '$lib/ui/MaxSize.svelte'
import type { FileDTO } from '@cryptgeon/shared'
import type { FileDTO } from 'cryptgeon/shared'
export let label: string = ''
export let files: FileDTO[] = []

View File

@ -1,16 +1,26 @@
<script lang="ts" context="module">
export type DecryptedNote = Omit<NotePublic, 'contents'> & { contents: any }
function saveAs(file: File) {
const url = window.URL.createObjectURL(file)
const a = document.createElement('a')
a.style.display = 'none'
a.href = url
a.download = file.name
document.body.appendChild(a)
a.click()
window.URL.revokeObjectURL(url)
a.remove()
}
</script>
<script lang="ts">
import pkg from 'file-saver'
const { saveAs } = pkg
import prettyBytes from 'pretty-bytes'
import { t } from 'svelte-intl-precompile'
import Button from '$lib/ui/Button.svelte'
import { copy } from '$lib/utils'
import type { FileDTO, NotePublic } from '@cryptgeon/shared'
import type { FileDTO, NotePublic } from 'cryptgeon/shared'
export let note: DecryptedNote

View File

@ -1,11 +1,10 @@
import copyToClipboard from 'copy-to-clipboard'
import { t } from 'svelte-intl-precompile'
import { get } from 'svelte/store'
import { notify } from './toast'
export function copy(value: string) {
copyToClipboard(value)
window.navigator.clipboard.writeText(value)
const msg = get(t)('common.copied_to_clipboard')
notify.success(msg)
}

View File

@ -13,8 +13,7 @@
import Result, { type NoteResult } from '$lib/ui/NoteResult.svelte'
import Switch from '$lib/ui/Switch.svelte'
import TextArea from '$lib/ui/TextArea.svelte'
import type { FileDTO, Note } from '@cryptgeon/shared'
import { Adapters, PayloadToLargeError, create } from '@cryptgeon/shared'
import { Adapters, API, PayloadToLargeError, type FileDTO, type Note } from 'cryptgeon/shared'
let note: Note = {
contents: '',
@ -77,7 +76,7 @@
else data.views = parseInt(note.views as any)
loading = $t('common.uploading')
const response = await create(data)
const response = await API.create(data)
result = {
id: response.id,
password: customPassword ? undefined : Hex.encode(key),

View File

@ -7,7 +7,7 @@
import Loader from '$lib/ui/Loader.svelte'
import ShowNote, { type DecryptedNote } from '$lib/ui/ShowNote.svelte'
import TextInput from '$lib/ui/TextInput.svelte'
import { Adapters, get, info, type NoteMeta } from '@cryptgeon/shared'
import { Adapters, API, type NoteMeta } from 'cryptgeon/shared'
import type { PageData } from './$types'
export let data: PageData
@ -28,7 +28,7 @@
try {
loading = $t('common.loading')
password = window.location.hash.slice(1)
const note = await info(id)
const note = await API.info(id)
meta = note.meta
exists = true
} catch {
@ -51,7 +51,7 @@
// Load note
error = null
loading = $t('common.downloading')
const data = await get(id)
const data = await API.get(id)
loading = $t('common.decrypting')
const derived = meta?.derivation && (await AES.derive(password!, meta.derivation))
const key = derived ? derived[0] : Hex.decode(password!)

103
pnpm-lock.yaml generated
View File

@ -26,23 +26,20 @@ importers:
packages/cli:
devDependencies:
'@commander-js/extra-typings':
specifier: ^12.0.1
version: 12.0.1(commander@12.0.0)
'@cryptgeon/shared':
specifier: workspace:*
version: link:../shared
specifier: ^12.1.0
version: 12.1.0(commander@12.1.0)
'@types/inquirer':
specifier: ^9.0.7
version: 9.0.7
'@types/mime':
specifier: ^3.0.4
version: 3.0.4
specifier: ^4.0.0
version: 4.0.0
'@types/node':
specifier: ^20.11.24
version: 20.11.24
commander:
specifier: ^12.0.0
version: 12.0.0
specifier: ^12.1.0
version: 12.1.0
inquirer:
specifier: ^9.2.15
version: 9.2.15
@ -50,8 +47,8 @@ importers:
specifier: ^4.0.1
version: 4.0.1
occulto:
specifier: ^2.0.3
version: 2.0.3
specifier: ^2.0.6
version: 2.0.6
pretty-bytes:
specifier: ^6.1.1
version: 6.1.1
@ -64,21 +61,15 @@ importers:
packages/frontend:
dependencies:
'@cryptgeon/shared':
specifier: workspace:*
version: link:../shared
'@fontsource/fira-mono':
specifier: ^5.0.8
version: 5.0.8
copy-to-clipboard:
specifier: ^3.3.3
version: 3.3.3
file-saver:
specifier: ^2.0.5
version: 2.0.5
cryptgeon:
specifier: workspace:*
version: link:../cli
occulto:
specifier: ^2.0.3
version: 2.0.3
specifier: ^2.0.6
version: 2.0.6
pretty-bytes:
specifier: ^6.1.1
version: 6.1.1
@ -98,9 +89,6 @@ importers:
'@sveltejs/vite-plugin-svelte':
specifier: ^3.0.2
version: 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))
'@types/file-saver':
specifier: ^2.0.7
version: 2.0.7
'@zerodevx/svelte-toast':
specifier: ^0.9.5
version: 0.9.5(svelte@4.2.12)
@ -135,16 +123,6 @@ importers:
specifier: ^1.18.1
version: 1.18.1
packages/shared:
dependencies:
occulto:
specifier: ^2.0.3
version: 2.0.3
devDependencies:
typescript:
specifier: ^5.3.3
version: 5.3.3
packages:
'@ampproject/remapping@2.3.0':
@ -242,10 +220,10 @@ packages:
resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
engines: {node: '>=6.9.0'}
'@commander-js/extra-typings@12.0.1':
resolution: {integrity: sha512-OvkMobb1eMqOCuJdbuSin/KJkkZr7n24/UNV+Lcz/0Dhepf3r2p9PaGwpRpAWej7A+gQnny4h8mGhpFl4giKkg==}
'@commander-js/extra-typings@12.1.0':
resolution: {integrity: sha512-wf/lwQvWAA0goIghcb91dQYpkLBcyhOhQNqG/VgWhnKzgt+UOMvra7EX/2fv70arm5RW+PUHoQHHDa6/p77Eqg==}
peerDependencies:
commander: ~12.0.0
commander: ~12.1.0
'@esbuild/aix-ppc64@0.19.12':
resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
@ -778,14 +756,12 @@ packages:
'@types/estree@1.0.5':
resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
'@types/file-saver@2.0.7':
resolution: {integrity: sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==}
'@types/inquirer@9.0.7':
resolution: {integrity: sha512-Q0zyBupO6NxGRZut/JdmqYKOnN95Eg5V8Csg3PGKkP+FnvsUZx1jAyK7fztIszxxMuoBA6E3KXWvdZVXIpx60g==}
'@types/mime@3.0.4':
resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}
'@types/mime@4.0.0':
resolution: {integrity: sha512-5eEkJZ/BLvTE3vXGKkWlyTSUVZuzj23Wj8PoyOq2lt5I3CYbiLBOPb3XmCW6QcuOibIUE6emHXHt9E/F/rCa6w==}
deprecated: This is a stub types definition. mime provides its own type definitions, so you do not need this installed.
'@types/node@20.11.24':
resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==}
@ -980,8 +956,8 @@ packages:
color-name@1.1.4:
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
commander@12.0.0:
resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==}
commander@12.1.0:
resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
engines: {node: '>=18'}
commander@4.1.1:
@ -1002,9 +978,6 @@ packages:
resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
engines: {node: '>= 0.6'}
copy-to-clipboard@3.3.3:
resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
cross-spawn@6.0.5:
resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
engines: {node: '>=4.8'}
@ -1153,9 +1126,6 @@ packages:
resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
engines: {node: '>=8'}
file-saver@2.0.5:
resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
fill-range@7.0.1:
resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
engines: {node: '>=8'}
@ -1618,9 +1588,9 @@ packages:
resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
engines: {node: '>= 0.4'}
occulto@2.0.3:
resolution: {integrity: sha512-rLXDNqsxM3Gusp4cn8QsveeKsmX36SbnIUcUc3mSeM88pGsNY5Tn6VnWItw/7zST01z9gtaZWQFk0F1L53jMCQ==}
engines: {node: '>=16', npm: please-use-pnpm, pnpm: '>=8', yarn: please-use-pnpm}
occulto@2.0.6:
resolution: {integrity: sha512-oaCwtnQjr+fTfFVfSPEDC5rh+L13OcEJ6uQzhmG8PlLxxYn2MxTDPmoCUVHKD7rUxwxCpH7/N4hbTu5U4mqZag==}
engines: {node: '>=18'}
once@1.4.0:
resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
@ -2079,9 +2049,6 @@ packages:
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
engines: {node: '>=8.0'}
toggle-selection@1.0.6:
resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
totalist@3.0.1:
resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
engines: {node: '>=6'}
@ -2377,9 +2344,9 @@ snapshots:
'@babel/helper-validator-identifier': 7.22.20
to-fast-properties: 2.0.0
'@commander-js/extra-typings@12.0.1(commander@12.0.0)':
'@commander-js/extra-typings@12.1.0(commander@12.1.0)':
dependencies:
commander: 12.0.0
commander: 12.1.0
'@esbuild/aix-ppc64@0.19.12':
optional: true
@ -2733,14 +2700,14 @@ snapshots:
'@types/estree@1.0.5': {}
'@types/file-saver@2.0.7': {}
'@types/inquirer@9.0.7':
dependencies:
'@types/through': 0.0.33
rxjs: 7.8.1
'@types/mime@3.0.4': {}
'@types/mime@4.0.0':
dependencies:
mime: 4.0.1
'@types/node@20.11.24':
dependencies:
@ -2942,7 +2909,7 @@ snapshots:
color-name@1.1.4: {}
commander@12.0.0: {}
commander@12.1.0: {}
commander@4.1.1: {}
@ -2954,10 +2921,6 @@ snapshots:
cookie@0.6.0: {}
copy-to-clipboard@3.3.3:
dependencies:
toggle-selection: 1.0.6
cross-spawn@6.0.5:
dependencies:
nice-try: 1.0.5
@ -3190,8 +3153,6 @@ snapshots:
dependencies:
escape-string-regexp: 1.0.5
file-saver@2.0.5: {}
fill-range@7.0.1:
dependencies:
to-regex-range: 5.0.1
@ -3623,7 +3584,7 @@ snapshots:
has-symbols: 1.0.3
object-keys: 1.1.1
occulto@2.0.3: {}
occulto@2.0.6: {}
once@1.4.0:
dependencies:
@ -4117,8 +4078,6 @@ snapshots:
dependencies:
is-number: 7.0.0
toggle-selection@1.0.6: {}
totalist@3.0.1: {}
tr46@1.0.1: