diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 9fa6bec8..846dd9f3 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -4,14 +4,21 @@ module.exports = { browser: true, es2021: true, }, - plugins: ["svelte3", "@typescript-eslint"], + plugins: ["@typescript-eslint"], overrides: [ { files: ["*.svelte"], - processor: "svelte3/svelte3", + parser: "svelte-eslint-parser", + parserOptions: { + parser: "@typescript-eslint/parser", + }, }, ], - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"], + extends: [ + "eslint:recommended", + "plugin:svelte/recommended", + "plugin:@typescript-eslint/recommended", + ], parser: "@typescript-eslint/parser", parserOptions: { ecmaVersion: "latest", @@ -32,6 +39,8 @@ module.exports = { "no-extra-semi": "off", "no-async-promise-executor": "off", "prefer-const": ["error", {destructuring: "all"}], + "svelte/valid-compile": "off", + "svelte/no-at-html-tags": "off", "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-extra-semi": "off", "@typescript-eslint/ban-ts-comment": "off", diff --git a/package-lock.json b/package-lock.json index f5743ffa..57cbd126 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index cf349c2c..5dc134dd 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,14 @@ "@tsconfig/svelte": "^5.0.2", "@types/ramda": "^0.29.9", "@types/throttle-debounce": "^5.0.2", - "@typescript-eslint/eslint-plugin": "^6.13.1", - "@typescript-eslint/parser": "^6.13.1", + "@typescript-eslint/eslint-plugin": "^7.4.0", + "@typescript-eslint/parser": "^7.4.0", "@vite-pwa/assets-generator": "^0.2.4", "autoprefixer": "^10.4.16", "cypress": "^13.6.0", "dotenv": "^16.4.5", "eslint": "^8.54.0", - "eslint-plugin-svelte3": "^4.0.0", + "eslint-plugin-svelte": "^2.35.1", "favicons": "^7.1.5", "madge": "^6.1.0", "postcss": "^8.4.31", @@ -49,6 +49,9 @@ }, "dependencies": { "@bugsnag/js": "^7.22.2", + "@coracle.social/lib": "^0.0.1", + "@coracle.social/network": "^0.0.2", + "@coracle.social/util": "^0.0.2", "@event-calendar/core": "^2.4.1", "@event-calendar/day-grid": "^2.4.1", "@event-calendar/interaction": "^2.4.1", @@ -68,12 +71,11 @@ "normalize-url": "^8.0.0", "nostr-tools": "^2.1.5", "npm-run-all": "^4.1.5", - "paravel": "^0.5.7", "qr-scanner": "^1.4.2", "qrcode": "^1.5.3", "ramda": "^0.29.1", "sharp": "^0.33.3", - "svelte": "^4.2.8", + "svelte": "^4.2.12", "svelte-check": "^3.6.2", "svelte-link-preview": "^0.3.3", "svelte-loading-spinners": "^0.3.4", diff --git a/src/app/App.svelte b/src/app/App.svelte index 22b9108a..fea3a5f7 100644 --- a/src/app/App.svelte +++ b/src/app/App.svelte @@ -5,7 +5,8 @@ import {nip19} from "nostr-tools" import {pluck} from "ramda" import {seconds, Fetch} from "hurdak" - import {now, normalizeRelayUrl} from "paravel" + import {now} from "@coracle.social/lib" + import {normalizeRelayUrl} from "@coracle.social/util" import logger from "src/util/logger" import * as misc from "src/util/misc" import * as nostr from "src/util/nostr" diff --git a/src/app/ForegroundButtons.svelte b/src/app/ForegroundButtons.svelte index bb43fd15..530579fd 100644 --- a/src/app/ForegroundButtons.svelte +++ b/src/app/ForegroundButtons.svelte @@ -2,15 +2,10 @@ import {fade} from "src/util/transition" import ForegroundButton from "src/partials/ForegroundButton.svelte" import ForegroundButtons from "src/partials/ForegroundButtons.svelte" - import {router} from "src/app/router" let scrollY = 0 - const {page} = router - const scrollToTop = () => document.body.scrollIntoView({behavior: "smooth"}) - - $: showButtons = !$page?.path.match(/^\/channels|logout|settings/) diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte index 26ecd128..20bfd28b 100644 --- a/src/app/MenuDesktop.svelte +++ b/src/app/MenuDesktop.svelte @@ -21,8 +21,6 @@ displayPubkey, } from "src/engine" - const {page} = router - const closeSubMenu = () => { subMenu = null } @@ -36,17 +34,7 @@ ) } - let subMenu, active - - $: { - if ($page?.path.startsWith("/notes")) { - active = "feed" - } else if ($page?.path.startsWith("/notifications")) { - active = "notifications" - } else if ($page?.path.startsWith("/channels")) { - active = "channels" - } - } + let subMenu
diff --git a/src/app/router.ts b/src/app/router.ts index f6040a8b..7dae4941 100644 --- a/src/app/router.ts +++ b/src/app/router.ts @@ -1,5 +1,11 @@ import {last, fromPairs, identity} from "ramda" -import {encodeAddress, decodeAddress, addressFromNaddr, addressToNaddr, fromNostrURI} from "paravel" +import { + encodeAddress, + decodeAddress, + addressFromNaddr, + addressToNaddr, + fromNostrURI, +} from "@coracle.social/util" import {nip19} from "nostr-tools" import {Router} from "src/util/router" import {tryJson} from "src/util/misc" diff --git a/src/app/shared/Calendar.svelte b/src/app/shared/Calendar.svelte index 85a5e561..0881b0a3 100644 --- a/src/app/shared/Calendar.svelte +++ b/src/app/shared/Calendar.svelte @@ -2,7 +2,7 @@ import {fromPairs} from "ramda" import {batch} from "hurdak" import {onMount} from "svelte" - import {getAddress} from "paravel" + import {getAddress} from "@coracle.social/util" import Calendar from "@event-calendar/core" import DayGrid from "@event-calendar/day-grid" import Interaction from "@event-calendar/interaction" diff --git a/src/app/shared/EventActions.svelte b/src/app/shared/EventActions.svelte index c20ea71c..a88a62ef 100644 --- a/src/app/shared/EventActions.svelte +++ b/src/app/shared/EventActions.svelte @@ -1,5 +1,5 @@ diff --git a/src/app/views/PersonFollows.svelte b/src/app/views/PersonFollows.svelte index f4f04461..0ebc7c03 100644 --- a/src/app/views/PersonFollows.svelte +++ b/src/app/views/PersonFollows.svelte @@ -1,28 +1,14 @@ diff --git a/src/app/views/ReportCreate.svelte b/src/app/views/ReportCreate.svelte index 3a6cc299..ed544700 100644 --- a/src/app/views/ReportCreate.svelte +++ b/src/app/views/ReportCreate.svelte @@ -1,7 +1,7 @@