diff --git a/svelte-app/package.json b/svelte-app/package.json index b0effea20..badc61704 100644 --- a/svelte-app/package.json +++ b/svelte-app/package.json @@ -10,7 +10,6 @@ "package": "svelte-kit package", "preview": "vite preview", "test:vitest": "MODE=testing vitest --run", - "test:vitest:dev": "MODE=testing vitest --ui", "test:cypress": "MODE=testing cypress run", "test:cypress:dev": "CYPRESS_MODE=dev cypress open", "test": "test:vitest; test:cypress", @@ -22,7 +21,6 @@ "lint": "pnpm format && pnpm eslint --fix \"./src/**/*.{ts,svelte}\"" }, "devDependencies": { - "@iconify/svelte": "^3.1.4", "@poppanator/sveltekit-svg": "^4.1.3", "@portabletext/svelte": "^2.1.4", "@portabletext/types": "^2.0.8", @@ -35,7 +33,6 @@ "@testing-library/svelte": "^4.0.3", "@typescript-eslint/eslint-plugin": "^6.7.4", "@typescript-eslint/parser": "^6.8.0", - "@vitest/ui": "^0.34.6", "autoprefixer": "^10.4.16", "cypress": "^13.3.2", "dotenv": "^16.3.1", @@ -55,7 +52,6 @@ "prettier": "^3.0.3", "prettier-plugin-svelte": "^3.0.3", "prettier-plugin-tailwindcss": "^0.5.6", - "rimraf": "^5.0.5", "sass": "^1.69.0", "svelte": "^4.2.2", "svelte-body": "^1.4.0", @@ -69,7 +65,6 @@ "typescript": "^5.2.2", "vite": "^4.4.11", "vite-plugin-inspect": "^0.7.40", - "vite-plugin-restart": "^0.3.1", "vite-plugin-test-selectors": "0.0.2", "vitest": "^0.32.0" }, diff --git a/svelte-app/pnpm-lock.yaml b/svelte-app/pnpm-lock.yaml index 50853f321..7323307d4 100644 --- a/svelte-app/pnpm-lock.yaml +++ b/svelte-app/pnpm-lock.yaml @@ -5,9 +5,6 @@ settings: excludeLinksFromLockfile: false devDependencies: - '@iconify/svelte': - specifier: ^3.1.4 - version: 3.1.4(svelte@4.2.2) '@poppanator/sveltekit-svg': specifier: ^4.1.3 version: 4.1.3(svelte@4.2.2)(svgo@3.0.2)(vite@4.4.11) @@ -44,9 +41,6 @@ devDependencies: '@typescript-eslint/parser': specifier: ^6.8.0 version: 6.8.0(eslint@8.53.0)(typescript@5.2.2) - '@vitest/ui': - specifier: ^0.34.6 - version: 0.34.6(vitest@0.32.0) autoprefixer: specifier: ^10.4.16 version: 10.4.16(postcss@8.4.31) @@ -104,9 +98,6 @@ devDependencies: prettier-plugin-tailwindcss: specifier: ^0.5.6 version: 0.5.6(prettier-plugin-svelte@3.0.3)(prettier@3.0.3) - rimraf: - specifier: ^5.0.5 - version: 5.0.5 sass: specifier: ^1.69.0 version: 1.69.0 @@ -146,15 +137,12 @@ devDependencies: vite-plugin-inspect: specifier: ^0.7.40 version: 0.7.40(vite@4.4.11) - vite-plugin-restart: - specifier: ^0.3.1 - version: 0.3.1(vite@4.4.11) vite-plugin-test-selectors: specifier: 0.0.2 version: 0.0.2(vite@4.4.11) vitest: specifier: ^0.32.0 - version: 0.32.0(@vitest/ui@0.34.6)(jsdom@22.1.0)(sass@1.69.0) + version: 0.32.0(jsdom@22.1.0)(sass@1.69.0) packages: @@ -696,42 +684,10 @@ packages: resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} dev: true - /@iconify/svelte@3.1.4(svelte@4.2.2): - resolution: {integrity: sha512-YDwQlN46ka8KPRayDb7TivmkAPizfTXi6BSRNqa1IV0+byA907n8JcgQafA7FD//pW5XCuuAhVx6uRbKTo+CfA==} - peerDependencies: - svelte: '*' - dependencies: - '@iconify/types': 2.0.0 - svelte: 4.2.2 - dev: true - - /@iconify/types@2.0.0: - resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} - dev: true - /@import-maps/resolve@1.0.1: resolution: {integrity: sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA==} dev: true - /@isaacs/cliui@8.0.2: - resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} - engines: {node: '>=12'} - dependencies: - string-width: 5.1.2 - string-width-cjs: /string-width@4.2.3 - strip-ansi: 7.0.1 - strip-ansi-cjs: /strip-ansi@6.0.1 - wrap-ansi: 8.1.0 - wrap-ansi-cjs: /wrap-ansi@7.0.0 - dev: true - - /@jest/schemas@29.6.3: - resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@sinclair/typebox': 0.27.8 - dev: true - /@jest/types@27.5.1: resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -1899,13 +1855,6 @@ packages: engines: {node: '>=14'} dev: true - /@pkgjs/parseargs@0.11.0: - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} - requiresBuild: true - dev: true - optional: true - /@pkgr/utils@2.4.2: resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} @@ -2132,10 +2081,6 @@ packages: engines: {node: '>=10.0.0'} dev: true - /@sinclair/typebox@0.27.8: - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - dev: true - /@sindresorhus/is@5.3.0: resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==} engines: {node: '>=14.16'} @@ -2704,21 +2649,6 @@ packages: tinyspy: 2.1.1 dev: true - /@vitest/ui@0.34.6(vitest@0.32.0): - resolution: {integrity: sha512-/fxnCwGC0Txmr3tF3BwAbo3v6U2SkBTGR9UB8zo0Ztlx0BTOXHucE0gDHY7SjwEktCOHatiGmli9kZD6gYSoWQ==} - peerDependencies: - vitest: '>=0.30.1 <1' - dependencies: - '@vitest/utils': 0.34.6 - fast-glob: 3.3.1 - fflate: 0.8.1 - flatted: 3.2.7 - pathe: 1.1.1 - picocolors: 1.0.0 - sirv: 2.0.3 - vitest: 0.32.0(@vitest/ui@0.34.6)(jsdom@22.1.0)(sass@1.69.0) - dev: true - /@vitest/utils@0.32.0: resolution: {integrity: sha512-53yXunzx47MmbuvcOPpLaVljHaeSu1G2dHdmy7+9ngMnQIkBQcvwOcoclWFnxDMxFbnq8exAfh3aKSZaK71J5A==} dependencies: @@ -2727,14 +2657,6 @@ packages: pretty-format: 27.5.1 dev: true - /@vitest/utils@0.34.6: - resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==} - dependencies: - diff-sequences: 29.4.3 - loupe: 2.3.6 - pretty-format: 29.7.0 - dev: true - /@xhmikosr/archive-type@6.0.1: resolution: {integrity: sha512-PB3NeJL8xARZt52yDBupK0dNPn8uIVQDe15qNehUpoeeLWCZyAOam4vGXnoZGz2N9D1VXtjievJuCsXam2TmbQ==} engines: {node: ^14.14.0 || >=16.0.0} @@ -4696,11 +4618,6 @@ packages: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} dev: true - /diff-sequences@29.4.3: - resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dev: true - /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} @@ -5739,10 +5656,6 @@ packages: is-plain-obj: 4.1.0 dev: true - /fflate@0.8.1: - resolution: {integrity: sha512-/exOvEuc+/iaUm105QIiOt4LpBdMTWsXxqR0HDF35vx3fmaKzw7354gTilCh5rkzEt8WYyG//ku3h3nRmd7CHQ==} - dev: true - /figures@1.7.0: resolution: {integrity: sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==} engines: {node: '>=0.10.0'} @@ -5935,14 +5848,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /foreground-child@3.1.1: - resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} - engines: {node: '>=14'} - dependencies: - cross-spawn: 7.0.3 - signal-exit: 4.0.2 - dev: true - /forever-agent@0.6.1: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} dev: true @@ -6215,18 +6120,6 @@ packages: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true - /glob@10.3.10: - resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} - engines: {node: '>=16 || 14 >=14.17'} - hasBin: true - dependencies: - foreground-child: 3.1.1 - jackspeak: 2.3.6 - minimatch: 9.0.3 - minipass: 5.0.0 - path-scurry: 1.10.1 - dev: true - /glob@7.1.6: resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} dependencies: @@ -7252,15 +7145,6 @@ packages: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} dev: true - /jackspeak@2.3.6: - resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} - engines: {node: '>=14'} - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - dev: true - /jaeger-client@3.19.0: resolution: {integrity: sha512-M0c7cKHmdyEUtjemnJyx/y9uX16XHocL46yQvyqDlPdvAcwPDbHrIbKjQdBqtiE4apQ/9dmr+ZLJYYPGnurgpw==} engines: {node: '>=10'} @@ -7828,11 +7712,6 @@ packages: yallist: 4.0.0 dev: true - /lru-cache@9.1.1: - resolution: {integrity: sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==} - engines: {node: 14 || >=16.14} - dev: true - /luxon@3.3.0: resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==} engines: {node: '>=12'} @@ -8093,11 +7972,6 @@ packages: engines: {node: '>=8'} dev: true - /minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - dev: true - /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -9015,14 +8889,6 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true - /path-scurry@1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 9.1.1 - minipass: 5.0.0 - dev: true - /path-to-regexp@0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} dev: true @@ -9383,15 +9249,6 @@ packages: react-is: 17.0.2 dev: true - /pretty-format@29.7.0: - resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/schemas': 29.6.3 - ansi-styles: 5.2.0 - react-is: 18.2.0 - dev: true - /pretty-ms@8.0.0: resolution: {integrity: sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==} engines: {node: '>=14.16'} @@ -9589,10 +9446,6 @@ packages: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} dev: true - /react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - dev: true - /read-cache@1.0.0: resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==} dependencies: @@ -9889,14 +9742,6 @@ packages: glob: 7.2.3 dev: true - /rimraf@5.0.5: - resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} - engines: {node: '>=14'} - hasBin: true - dependencies: - glob: 10.3.10 - dev: true - /rollup@3.28.0: resolution: {integrity: sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -11633,15 +11478,6 @@ packages: - supports-color dev: true - /vite-plugin-restart@0.3.1(vite@4.4.11): - resolution: {integrity: sha512-LVe74MLUwaOzXVUgRGiphYbAYNgdGF6mP5vxj5BKcKkdmzvuuw79qcNgn9kHKKaIlCCjmOUiY3qlJ8jBSBUCoA==} - peerDependencies: - vite: ^2.9.0 || ^3.0.0 || ^4.0.0 - dependencies: - micromatch: 4.0.5 - vite: 4.4.11(@types/node@20.2.1)(sass@1.69.0) - dev: true - /vite-plugin-test-selectors@0.0.2(vite@4.4.11): resolution: {integrity: sha512-L+clewbVKX4AYVuX0PG9rFSjlNGR01qUjm0dl5Z0pNf4hPblGSowahnJO+z4TpsM/zNUJqTuWMOPqt1moBL42Q==} peerDependencies: @@ -11698,7 +11534,7 @@ packages: vite: 4.4.11(@types/node@20.2.1)(sass@1.69.0) dev: true - /vitest@0.32.0(@vitest/ui@0.34.6)(jsdom@22.1.0)(sass@1.69.0): + /vitest@0.32.0(jsdom@22.1.0)(sass@1.69.0): resolution: {integrity: sha512-SW83o629gCqnV3BqBnTxhB10DAwzwEx3z+rqYZESehUB+eWsJxwcBQx7CKy0otuGMJTYh7qCVuUX23HkftGl/Q==} engines: {node: '>=v14.18.0'} hasBin: true @@ -11736,7 +11572,6 @@ packages: '@vitest/runner': 0.32.0 '@vitest/snapshot': 0.32.0 '@vitest/spy': 0.32.0 - '@vitest/ui': 0.34.6(vitest@0.32.0) '@vitest/utils': 0.32.0 acorn: 8.10.0 acorn-walk: 8.2.0 diff --git a/svelte-app/src/components/nav/nav-social.svelte b/svelte-app/src/components/nav/nav-social.svelte deleted file mode 100644 index 2485352d1..000000000 --- a/svelte-app/src/components/nav/nav-social.svelte +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - { - if (e.code === 'Enter' || e.code === 'Space') { - e.preventDefault(); - goto(social.attrs.href).catch(() => undefined); - } - }} - > - - - - diff --git a/svelte-app/src/components/portable-text/portable-text.svelte b/svelte-app/src/components/portable-text/portable-text.svelte index 882047dc9..4816075f0 100644 --- a/svelte-app/src/components/portable-text/portable-text.svelte +++ b/svelte-app/src/components/portable-text/portable-text.svelte @@ -21,6 +21,7 @@ import Divider from './serializers/divider.svelte'; import Image from './serializers/image.svelte'; import ListItem from './serializers/list-item.svelte'; + import NullMark from './serializers/null-mark.svelte'; import OlWrapper from './serializers/ol-wrapper.svelte'; import UlWrapper from './serializers/ul-wrapper.svelte'; @@ -87,7 +88,8 @@ marks: { link: CustomLink, code: CustomCode, - highlight: CustomHighlight + highlight: CustomHighlight, + notranslate: NullMark } }} /> @@ -104,7 +106,8 @@ link: CustomLink, code: CustomCode, highlight: CustomHighlight, - footnote: Footnote + footnote: Footnote, + notranslate: NullMark }, block: { h1: CustomHeading, diff --git a/svelte-app/src/components/portable-text/serializers/image.svelte b/svelte-app/src/components/portable-text/serializers/image.svelte index de8a26271..a70a296c4 100644 --- a/svelte-app/src/components/portable-text/serializers/image.svelte +++ b/svelte-app/src/components/portable-text/serializers/image.svelte @@ -1,7 +1,7 @@