diff --git a/build-in-production.sh b/build-in-production.sh index 209770d90..4a6427bef 100755 --- a/build-in-production.sh +++ b/build-in-production.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash +set -e + # Fetch tags and set to env vars -git fetch --prune --unshallow --tags -git describe --tags --abbrev=0 +git fetch --prune --unshallow --tags || true +git describe --tags --abbrev=0 || true export VITE_BUILD_VERSION=$RENDER_GIT_COMMIT export VITE_BUILD_HASH=$RENDER_GIT_COMMIT diff --git a/package.json b/package.json index 2695f0c63..dd44cc7f3 100644 --- a/package.json +++ b/package.json @@ -55,17 +55,17 @@ "@types/qrcode": "^1.5.5", "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", - "@welshman/app": "^0.3.8", - "@welshman/content": "^0.3.8", - "@welshman/editor": "^0.3.8", - "@welshman/feeds": "^0.3.8", - "@welshman/lib": "^0.3.8", - "@welshman/net": "^0.3.8", - "@welshman/relay": "^0.3.8", - "@welshman/router": "^0.3.8", - "@welshman/signer": "^0.3.8", - "@welshman/store": "^0.3.8", - "@welshman/util": "^0.3.8", + "@welshman/app": "^0.3.10", + "@welshman/content": "^0.3.10", + "@welshman/editor": "^0.3.10", + "@welshman/feeds": "^0.3.10", + "@welshman/lib": "^0.3.10", + "@welshman/net": "^0.3.10", + "@welshman/relay": "^0.3.10", + "@welshman/router": "^0.3.10", + "@welshman/signer": "^0.3.10", + "@welshman/store": "^0.3.10", + "@welshman/util": "^0.3.10", "compressorjs": "^1.2.1", "daisyui": "^4.12.10", "date-picker-svelte": "^2.13.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e635e9550..f42538fe8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,38 +60,38 @@ importers: specifier: ^0.6.6 version: 0.6.8(@sveltejs/kit@2.20.5(@sveltejs/vite-plugin-svelte@4.0.4(svelte@5.25.10)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0)))(svelte@5.25.10)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0)))(@vite-pwa/assets-generator@0.2.6)(vite-plugin-pwa@0.21.2(@vite-pwa/assets-generator@0.2.6)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0)) '@welshman/app': - specifier: ^0.3.8 - version: 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + specifier: ^0.3.10 + version: 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) '@welshman/content': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3) '@welshman/editor': - specifier: ^0.3.8 - version: 0.3.9(@tiptap/extension-image@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(@tiptap/extension-image@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3) '@welshman/feeds': - specifier: ^0.3.8 - version: 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + specifier: ^0.3.10 + version: 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) '@welshman/lib': - specifier: ^0.3.8 - version: 0.3.9 + specifier: ^0.3.10 + version: 0.3.10 '@welshman/net': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3)(ws@8.18.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3)(ws@8.18.3) '@welshman/relay': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3) '@welshman/router': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3) '@welshman/signer': - specifier: ^0.3.8 - version: 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + specifier: ^0.3.10 + version: 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) '@welshman/store': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3) '@welshman/util': - specifier: ^0.3.8 - version: 0.3.9(typescript@5.8.3) + specifier: ^0.3.10 + version: 0.3.10(typescript@5.8.3) compressorjs: specifier: ^1.2.1 version: 1.2.1 @@ -1620,41 +1620,41 @@ packages: '@vite-pwa/assets-generator': optional: true - '@welshman/app@0.3.9': - resolution: {integrity: sha512-Dabw3GZNcsCTMPVWWSeO+xJNEEdkQkKaMN60KNhPQQb3UzR0GfPKPjIQZSnL+vZwyZHGjwBBmcPNRnaLfu2kPA==} + '@welshman/app@0.3.10': + resolution: {integrity: sha512-QP1uboup1Eivwh7xHFxcUztwsyplTJ5Lgw6sIxQ7nWXRau6c3XKwH0L4ZcGYZTrzso9Sed3u1eqILUHv2D+9Xw==} - '@welshman/content@0.3.9': - resolution: {integrity: sha512-MkaagcZKYZEZCyIlrMmq4+dwFWF3a6F5T6TyFmWC6NaJy/GsgWLa2GPeN6xaZ8aYX95KjvnQ40KTF1O2msykyA==} + '@welshman/content@0.3.10': + resolution: {integrity: sha512-n98RBEk7Wgrj/4WcPbC7fiRH+4OTZVksLo4/xS0BEKhjxRtA7d9QLnmJbPQ54+yw/2piy/Ho7aDOpDtIEKuM5Q==} - '@welshman/editor@0.3.9': - resolution: {integrity: sha512-DRU2UQdxfzjZm3UZH4hwnML0MtnFE66W0aLTOY3CHQIEHy0oWMwxoaX8q5WwQ38B/XhH10WFEWgD2flMtwzhAA==} + '@welshman/editor@0.3.10': + resolution: {integrity: sha512-eh2HuP2eoj7a2aAxQyTx0oy8aBFVfE0USZQX6jgaTmlot9UNXIXgZDFKQac8SzMjCtkokUCj11AAztc2MjVD3w==} - '@welshman/feeds@0.3.9': - resolution: {integrity: sha512-+maapgquzBRQdwc7QlTvTBcFxYNVW6es4Da+HC+GKz+HPza0hvrq89UQJQLqoBtAKElCRrpDipVq12Y2y98U4A==} + '@welshman/feeds@0.3.10': + resolution: {integrity: sha512-t3YAUmmmpdyJXoETotiNiiuyLdtKjLs4Tv9kidQz/tD3PpwLfGKxLTbXDNzIcFYFeP88qOz5zT6cNrrY9LCGDg==} - '@welshman/lib@0.3.9': - resolution: {integrity: sha512-bwrimda66m5MxVBmWhsotawDv12nh8YGy+684GlB5SX3PEnGG3LUaquejh9Ml4Bm0Gj9SwoMDPug6uNYdo1w0Q==} + '@welshman/lib@0.3.10': + resolution: {integrity: sha512-ycOZbrm1XFE2CEaELQe9yupb1Dwmvqa9mi/75zbq3QkkxM2c9PDi97SYvNRg6exdooTmbgZvOIkhTS0YKKJI6w==} engines: {node: '>=12.0.0'} - '@welshman/net@0.3.9': - resolution: {integrity: sha512-x63UQ/tzdv6BgjPQaiPdlY9giEqRJWU1uKbH4khWlqO8MTFNdj+j3Di3M7v43xCfNpW4cLk3YIVoN+aVFzrx5A==} + '@welshman/net@0.3.10': + resolution: {integrity: sha512-dXa7SQnIpSKZ2Fp0c+DduedCqZAvyBKko3D21fOqB/kV1k2vc95Gg83RNQ+qM6LOKAhAUro/JczB+WAD0UX1nA==} - '@welshman/relay@0.3.9': - resolution: {integrity: sha512-RFkjgvTjftmW25/QlFPt2v8+2WBtbmaWW/QWkGa5lTnQvL9tkor7KuffU0Ss0NzCb/8cefVzas/leYHmEsrPog==} + '@welshman/relay@0.3.10': + resolution: {integrity: sha512-e27Tt7v69uj2nXacb3PaMbTP8Hes2Spp5gqFCj1eozThepQOdO5XPe5ZKLOzDaag9bgRvHmckryakmSDbeYqew==} - '@welshman/router@0.3.9': - resolution: {integrity: sha512-umV7krvjGOCpaCtbsPilL4rWK7XQhiejge3SiQAC6fOLkqzlfJ4uRBmxJHhtf8yt7w/KkUP1G2ZFTXWtaQd9DA==} + '@welshman/router@0.3.10': + resolution: {integrity: sha512-TuxdE4uMsIhf7EA0sSVddHufJDtt845y+oa3hoq5ZBmBoqvEV3FFKJKRE4aVDKORqE2Cr+Y3/VYxYYvvQ6WyTg==} - '@welshman/signer@0.3.9': - resolution: {integrity: sha512-NLYtZJNvXDwspWK0ISTnvJu89+IGWnASjFTfLdwWbty115OLS/LGz6Jenxqtmzh+Yz7svrpksk+UJW+B8lbKLw==} + '@welshman/signer@0.3.10': + resolution: {integrity: sha512-ob/wiYFZ+yIdY+lNzi9tLWzvX2VOqsmkOUoF5+5I7b8OjKz7q7sLqNxQQ35prm3SIvss+L8IvMT4aUyGZLJopA==} peerDependencies: nostr-signer-capacitor-plugin: ~0.0.4 - '@welshman/store@0.3.9': - resolution: {integrity: sha512-GmgXnC/yEKxPi4k4kfv3i4ZNqdlsDVIq4QHBSVrj5qQmB9ePy76QH5ty9rVpukQu/rnOiT5OFQREE2qC1u3Qpg==} + '@welshman/store@0.3.10': + resolution: {integrity: sha512-hrs/9wa7py4KxeKk9jzrRE0Xp7QZLuqzsUNOLK1wMJqyUPoDnMjBAC12A7MKONjE5CVR3q+to9ZTIVnsgYG6AQ==} - '@welshman/util@0.3.9': - resolution: {integrity: sha512-ew21oiotQxMnaqtuH0awvrG3zViQlG1cSVpTxuRD9a1Z7jh/t3dh6bbQRGcZAEL1f2kd3a4Mc9Gf24SFTAY+Jg==} + '@welshman/util@0.3.10': + resolution: {integrity: sha512-LQ/336LUQTwg+WI540b6jG1vz8b+yO3qgSqOP9sdMis5BhT+iPwM76I/9VbG3jMoy+k8UH6DhOQvKnURMB1svg==} '@xml-tools/parser@1.0.11': resolution: {integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==} @@ -6482,17 +6482,17 @@ snapshots: optionalDependencies: '@vite-pwa/assets-generator': 0.2.6 - '@welshman/app@0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': + '@welshman/app@0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': dependencies: '@types/throttle-debounce': 5.0.2 - '@welshman/feeds': 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) - '@welshman/lib': 0.3.9 - '@welshman/net': 0.3.9(typescript@5.8.3)(ws@8.18.3) - '@welshman/relay': 0.3.9(typescript@5.8.3) - '@welshman/router': 0.3.9(typescript@5.8.3) - '@welshman/signer': 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) - '@welshman/store': 0.3.9(typescript@5.8.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/feeds': 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + '@welshman/lib': 0.3.10 + '@welshman/net': 0.3.10(typescript@5.8.3)(ws@8.18.3) + '@welshman/relay': 0.3.10(typescript@5.8.3) + '@welshman/router': 0.3.10(typescript@5.8.3) + '@welshman/signer': 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + '@welshman/store': 0.3.10(typescript@5.8.3) + '@welshman/util': 0.3.10(typescript@5.8.3) fuse.js: 7.1.0 idb: 8.0.2 svelte: 4.2.20 @@ -6502,14 +6502,14 @@ snapshots: - typescript - ws - '@welshman/content@0.3.9(typescript@5.8.3)': + '@welshman/content@0.3.10(typescript@5.8.3)': dependencies: '@braintree/sanitize-url': 7.1.1 nostr-tools: 2.14.2(typescript@5.8.3) transitivePeerDependencies: - typescript - '@welshman/editor@0.3.9(@tiptap/extension-image@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)': + '@welshman/editor@0.3.10(@tiptap/extension-image@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)': dependencies: '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0) '@tiptap/extension-code': 2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)) @@ -6524,8 +6524,8 @@ snapshots: '@tiptap/extension-text': 2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)) '@tiptap/pm': 2.12.0 '@tiptap/suggestion': 2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0) - '@welshman/lib': 0.3.9 - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/util': 0.3.10(typescript@5.8.3) nostr-editor: 1.0.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/extension-image@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.24.2(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)(linkifyjs@4.3.1)(nostr-tools@2.14.2(typescript@5.8.3))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))) nostr-tools: 2.14.2(typescript@5.8.3) tippy.js: 6.3.7 @@ -6540,78 +6540,78 @@ snapshots: - tiptap-markdown - typescript - '@welshman/feeds@0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': + '@welshman/feeds@0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': dependencies: - '@welshman/lib': 0.3.9 - '@welshman/net': 0.3.9(typescript@5.8.3)(ws@8.18.3) - '@welshman/relay': 0.3.9(typescript@5.8.3) - '@welshman/router': 0.3.9(typescript@5.8.3) - '@welshman/signer': 0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/net': 0.3.10(typescript@5.8.3)(ws@8.18.3) + '@welshman/relay': 0.3.10(typescript@5.8.3) + '@welshman/router': 0.3.10(typescript@5.8.3) + '@welshman/signer': 0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3) + '@welshman/util': 0.3.10(typescript@5.8.3) trava: 1.2.1 transitivePeerDependencies: - nostr-signer-capacitor-plugin - typescript - ws - '@welshman/lib@0.3.9': + '@welshman/lib@0.3.10': dependencies: '@scure/base': 1.2.6 '@types/events': 3.0.3 events: 3.3.0 - '@welshman/net@0.3.9(typescript@5.8.3)(ws@8.18.3)': + '@welshman/net@0.3.10(typescript@5.8.3)(ws@8.18.3)': dependencies: - '@welshman/lib': 0.3.9 - '@welshman/relay': 0.3.9(typescript@5.8.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/relay': 0.3.10(typescript@5.8.3) + '@welshman/util': 0.3.10(typescript@5.8.3) events: 3.3.0 isomorphic-ws: 5.0.0(ws@8.18.3) transitivePeerDependencies: - typescript - ws - '@welshman/relay@0.3.9(typescript@5.8.3)': + '@welshman/relay@0.3.10(typescript@5.8.3)': dependencies: - '@welshman/lib': 0.3.9 - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/util': 0.3.10(typescript@5.8.3) transitivePeerDependencies: - typescript - '@welshman/router@0.3.9(typescript@5.8.3)': + '@welshman/router@0.3.10(typescript@5.8.3)': dependencies: - '@welshman/lib': 0.3.9 - '@welshman/relay': 0.3.9(typescript@5.8.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/relay': 0.3.10(typescript@5.8.3) + '@welshman/util': 0.3.10(typescript@5.8.3) transitivePeerDependencies: - typescript - '@welshman/signer@0.3.9(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': + '@welshman/signer@0.3.10(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)': dependencies: '@noble/curves': 1.9.2 '@noble/hashes': 1.8.0 - '@welshman/lib': 0.3.9 - '@welshman/net': 0.3.9(typescript@5.8.3)(ws@8.18.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/net': 0.3.10(typescript@5.8.3)(ws@8.18.3) + '@welshman/util': 0.3.10(typescript@5.8.3) nostr-signer-capacitor-plugin: 0.0.4(@capacitor/core@7.2.0) nostr-tools: 2.14.2(typescript@5.8.3) transitivePeerDependencies: - typescript - ws - '@welshman/store@0.3.9(typescript@5.8.3)': + '@welshman/store@0.3.10(typescript@5.8.3)': dependencies: - '@welshman/lib': 0.3.9 - '@welshman/relay': 0.3.9(typescript@5.8.3) - '@welshman/util': 0.3.9(typescript@5.8.3) + '@welshman/lib': 0.3.10 + '@welshman/relay': 0.3.10(typescript@5.8.3) + '@welshman/util': 0.3.10(typescript@5.8.3) svelte: 4.2.20 transitivePeerDependencies: - typescript - '@welshman/util@0.3.9(typescript@5.8.3)': + '@welshman/util@0.3.10(typescript@5.8.3)': dependencies: '@types/ws': 8.18.1 - '@welshman/lib': 0.3.9 + '@welshman/lib': 0.3.10 js-base64: 3.7.7 nostr-tools: 2.14.2(typescript@5.8.3) nostr-wasm: 0.1.0 diff --git a/src/app/push.ts b/src/app/push.ts index 87a2e9b1d..92c89d38e 100644 --- a/src/app/push.ts +++ b/src/app/push.ts @@ -34,7 +34,7 @@ export const getWebPushInfo = async () => { } if (!("PushManager" in window)) { - throw new Error("Push messaging not supported") + throw new Error("Push notifications are not supported") } if (Notification.permission === "denied") {