diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..5b0ec201 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,44 @@ +# Dependencies +**/node_modules +.pnp +.pnp.js + +# Local env files +.env +.env.local +.env.development.local +.env.test.local +.env.production.local + +# Testing +coverage + +# Turbo +.turbo + +# Vercel +.vercel + +# Build Outputs +**/.next/ +**/out/ +**/build +**/dist +**/target + + +# Debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Misc +.DS_Store +*.pem + +# Unnecessary files +**/.git/ +.github/ +flatpak/*.xml +flatpak/*.desktop +flatpak/*.yml diff --git a/.github/workflows/flatpak-bundle.yml b/.github/workflows/flatpak-bundle.yml new file mode 100644 index 00000000..ea5bea22 --- /dev/null +++ b/.github/workflows/flatpak-bundle.yml @@ -0,0 +1,77 @@ +on: + push: + # NOTE: Proposal to make this action available only for tags + #tags: + #- 'v*.*.*' + +name: flatpak build +jobs: + prepare-repo: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + submodules: 'recursive' + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: cache of container + id: cache-container + uses: actions/cache@v3 + with: + path: prepare-dist + key: ${{ runner.os }}-container-${{ hashFiles('prepare-dist') }} + - name: Run latest-tag + id: latest-tag + uses: oprypin/find-latest-tag@v1 + with: + repository: + luminous-devs/lume + #FIXME: luminous-devs after merged fix, now it just won't find tags + # repository: ${{ github.repository }} + + - name: Build container + # if: steps.cache-container.outputs.cache-hit != 'true' + run: | + docker buildx build -t flatpak-prepare-lume --build-arg=${{steps.latest-tag.outputs.tag}} --rm --output=. --target=final -f flatpak/Containerfile . + - name: Copy flatpak files content + run: | + cp -r flatpak/*.xml flatpak/*.desktop flatpak/*.yml prepare-dist + - uses: actions/upload-artifact@v4 + with: + name: repo-dist + path: prepare-dist + + flatpak: + name: flatpak-bundle + needs: prepare-repo + runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:gnome-45 + options: --privileged + steps: + - uses: actions/download-artifact@v4 + with: + name: repo-dist + - uses: actions/checkout@v4 + with: + repository: flathub/shared-modules + path: shared-modules + - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 + with: + bundle: lume.flatpak + manifest-path: nu.lume.Lume.yml + restore-cache: false + # cache-key: flatpak-builder-${{ github.sha }} + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + append_body: true + files: lume.flatpak + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: geekyeggo/delete-artifact@v4 + with: + name: repo-dist + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 96fab4fe..2031331b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,25 +13,23 @@ node_modules .env.production.local # Testing -coverage +coverage/ # Turbo -.turbo +.turbo/ # Vercel -.vercel +.vercel/ # Build Outputs .next/ out/ -build -dist +build/ +dist/ # Debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* +*.log* # Misc .DS_Store diff --git a/apps/desktop/src/routes/depot/components/members.tsx b/apps/desktop/src/routes/depot/components/members.tsx index 4b368150..d09802d8 100644 --- a/apps/desktop/src/routes/depot/components/members.tsx +++ b/apps/desktop/src/routes/depot/components/members.tsx @@ -1,12 +1,13 @@ import { CancelIcon, PlusIcon, UserAddIcon, UserRemoveIcon } from "@lume/icons"; import { User } from "@lume/ui"; import * as Dialog from "@radix-ui/react-dialog"; -import { resolveResource } from "@tauri-apps/api/path"; +import { resolveResource, resolve } from "@tauri-apps/api/path"; import { readTextFile, writeTextFile } from "@tauri-apps/plugin-fs"; import { nip19 } from "nostr-tools"; import { useEffect, useState } from "react"; import { parse, stringify } from "smol-toml"; import { toast } from "sonner"; +import { VITE_FLATPAK_RESOURCE } from "@lume/utils"; export function DepotMembers() { const [members, setMembers] = useState>(null); @@ -32,7 +33,7 @@ export function DepotMembers() { const updateMembers = async () => { setMembers(new Set(tmpMembers)); - const defaultConfig = await resolveResource("resources/config.toml"); + const defaultConfig = VITE_FLATPAK_RESOURCE !== null ? await resolve("/",VITE_FLATPAK_RESOURCE) : await resolveResource("resources/config.toml"); const config = await readTextFile(defaultConfig); const configContent = parse(config); @@ -46,7 +47,7 @@ export function DepotMembers() { useEffect(() => { async function loadConfig() { - const defaultConfig = await resolveResource("resources/config.toml"); + const defaultConfig = VITE_FLATPAK_RESOURCE !== null ? await resolve("/",VITE_FLATPAK_RESOURCE) : await resolveResource("resources/config.toml"); const config = await readTextFile(defaultConfig); const configContent = parse(config); setTmpMembers( diff --git a/apps/desktop/src/routes/depot/onboarding.tsx b/apps/desktop/src/routes/depot/onboarding.tsx index 4a9c09e4..95030d25 100644 --- a/apps/desktop/src/routes/depot/onboarding.tsx +++ b/apps/desktop/src/routes/depot/onboarding.tsx @@ -1,8 +1,8 @@ import { useArk } from "@lume/ark"; import { LoaderIcon } from "@lume/icons"; +import { delay, VITE_FLATPAK_RESOURCE } from "@lume/utils"; +import { resolve, resolveResource } from "@tauri-apps/api/path"; import { useStorage } from "@lume/storage"; -import { delay } from "@lume/utils"; -import { resolveResource } from "@tauri-apps/api/path"; import { readTextFile, writeTextFile } from "@tauri-apps/plugin-fs"; import { useState } from "react"; import { useNavigate } from "react-router-dom"; @@ -21,7 +21,10 @@ export function DepotOnboardingScreen() { setLoading(true); // get default config - const defaultConfig = await resolveResource("resources/config.toml"); + const defaultConfig = + VITE_FLATPAK_RESOURCE !== null + ? await resolve("/", VITE_FLATPAK_RESOURCE) + : await resolveResource("resources/config.toml"); const config = await readTextFile(defaultConfig); const parsedConfig = parse(config); diff --git a/flatpak/0001-disable-tauri-updater.patch b/flatpak/0001-disable-tauri-updater.patch new file mode 100644 index 00000000..b31eba65 --- /dev/null +++ b/flatpak/0001-disable-tauri-updater.patch @@ -0,0 +1,13 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 21f5d9a5..9a46f36d 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -64,7 +64,7 @@ + "shortDescription": "", + "targets": "all", + "updater": { +- "active": true, ++ "active": false, + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK", + "windows": { + "installMode": "quiet" diff --git a/flatpak/0002-depot-remove.patch b/flatpak/0002-depot-remove.patch new file mode 100644 index 00000000..39439e0e --- /dev/null +++ b/flatpak/0002-depot-remove.patch @@ -0,0 +1,13 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 87c23e40..bb84872e 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -50,8 +50,6 @@ + "deb": { + "depends": [] + }, +- "externalBin": ["bin/depot"], +- "resources": ["resources/*"], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", diff --git a/flatpak/Containerfile b/flatpak/Containerfile new file mode 100644 index 00000000..ffb10b24 --- /dev/null +++ b/flatpak/Containerfile @@ -0,0 +1,61 @@ +FROM node:20-slim as prepare + +RUN apt update && apt install -y git + +# Taken from tauri docs https://beta.tauri.app/guides/prerequisites/#rust +RUN apt install libwebkit2gtk-4.1-dev -y \ + build-essential \ + curl \ + wget \ + file \ + libssl-dev \ + libayatana-appindicator3-dev \ + protobuf-compiler \ + librsvg2-dev + +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + + +FROM prepare as build + +ENV PNPM_HOME="/pnpm" +ENV PATH="$PNPM_HOME:$PATH" +ENV PATH="/root/.cargo/bin:${PATH}" + +#RUN corepack prepare pnpm@latest --activate + +RUN corepack enable + +ADD . /lume/. + +WORKDIR /lume + +RUN pnpm install --frozen-lockfile + +# Path for disable updater +#ADD flatpak/0001-disable-tauri-updater.patch . +#RUN patch -p1 -t -i flatpak/0001-disable-tauri-updater.patch +#ADD flatpak/0002-depot-remove.patch . +#RUN patch -p1 -t -i 0002-depot-remove.patch + +# compile depot + +#ADD flatpak/build-depot.sh build-depot.sh +#RUN mv flatpak/build-depot.sh build-depot.sh +#RUN sh build-depot.sh +#RUN pnpm run build:depot + +#ENV VITE_FLATPAK_RESOURCE="/app/lib/lume/resources/config.toml" + +# debian build +RUN pnpm tauri build -b deb + +ARG VERSION=3.0.0 +ARG ARCH=amd64 + +RUN cp -r ./src-tauri/target/release/bundle/deb/lume_${VERSION}_${ARCH}/data lume-package + +FROM scratch as final + +COPY --from=build lume/lume-package prepare-dist +#ADD flatpak/*.xml flatpak/*.desktop flatpak/*.yml prepare-dist diff --git a/flatpak/build-depot.sh b/flatpak/build-depot.sh new file mode 100644 index 00000000..76b82634 --- /dev/null +++ b/flatpak/build-depot.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env sh + +directory_bin="/lume/src-tauri/bin" +target="x86_64-unknown-linux-gnu" + +cd modules/depot + +check_directory_keep=$(ls $directory_bin | grep -vE '.keep$' | wc -l) + +echo $(ls $directory_bin | grep -vE '.keep$') + +if [ $check_directory_keep -eq 0 ]; then + cargo build --release + mv target/release/depot "$directory_bin/depot-$target" +fi diff --git a/flatpak/nu.lume.Lume.appdata.xml b/flatpak/nu.lume.Lume.appdata.xml new file mode 100644 index 00000000..d16a7686 --- /dev/null +++ b/flatpak/nu.lume.Lume.appdata.xml @@ -0,0 +1,50 @@ + + + nu.lume.Lume + nu.lume.Lume.desktop + + Lume + A cross-platform desktop nostr client + Ren Amamiya + + CC0-1.0 + GPL-3.0-only + + https://lume.nu + https://github.com/luminous-devs/lume/issues + https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445 + + + pointing + keyboard + touch + + + +

+ Lume a cross-platform nostr client, supported nsbunker, chats and notifications +

+ + + + workstation + mobile + + + + https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/login-screen.png + + + https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/collumns.png + + + https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/home-screen.png + + + + + + + + + diff --git a/flatpak/nu.lume.Lume.desktop b/flatpak/nu.lume.Lume.desktop new file mode 100644 index 00000000..43ae782a --- /dev/null +++ b/flatpak/nu.lume.Lume.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application + +Name=Lume +Comment=A cross-platform desktop nostr client +Icon=lume +Exec=lume +Terminal=false +Categories=Network;InstantMessaging; +Keywords=nostr;client;chat; +X-Purism-FormFactor=Workstation; diff --git a/flatpak/nu.lume.Lume.yml b/flatpak/nu.lume.Lume.yml new file mode 100644 index 00000000..c2cbb65b --- /dev/null +++ b/flatpak/nu.lume.Lume.yml @@ -0,0 +1,41 @@ +id: nu.lume.Lume +runtime: org.gnome.Platform +runtime-version: '45' +sdk: org.gnome.Sdk +command: lume +rename-icon: lume + +finish-args: + - --socket=wayland + - --socket=fallback-x11 + - --socket=pulseaudio + - --share=ipc + - --share=network + #- --filesystem=home + #- --filesystem=xdg-download + - --talk-name=org.freedesktop.secrets + - --talk-name=org.freedesktop.Notifications + - --talk-name=org.kde.StatusNotifierWatcher + - --filesystem=xdg-run/keyring + - --device=dri + +modules: + - shared-modules/libappindicator/libappindicator-gtk3-12.10.json + - name: lume + sources: + - type: dir + path: usr + - type: file + path: nu.lume.Lume.desktop + - type: file + path: nu.lume.Lume.appdata.xml + buildsystem: simple + build-commands: + - install -Dm755 bin/lume /app/bin/lume + # - install -Dm755 bin/depot /app/bin/depot + # - mkdir -p /app/lib/lume/resources + # - cp -r lib/lume/resources /app/lib/lume/resources + - mkdir -p /app/share/icons/hicolor/ + - cp -r share/icons/hicolor/ /app/share/icons/ + - install -Dm644 nu.lume.Lume.appdata.xml /app/share/metainfo/nu.lume.Lume.appdata.xml + - install -Dm644 nu.lume.Lume.desktop /app/share/applications/nu.lume.Lume.desktop diff --git a/flatpak/screenshoots/collumns.png b/flatpak/screenshoots/collumns.png new file mode 100644 index 00000000..4a9e7591 Binary files /dev/null and b/flatpak/screenshoots/collumns.png differ diff --git a/flatpak/screenshoots/home-screen.png b/flatpak/screenshoots/home-screen.png new file mode 100644 index 00000000..95e22755 Binary files /dev/null and b/flatpak/screenshoots/home-screen.png differ diff --git a/flatpak/screenshoots/login-screen.png b/flatpak/screenshoots/login-screen.png new file mode 100644 index 00000000..cfb5c303 Binary files /dev/null and b/flatpak/screenshoots/login-screen.png differ diff --git a/package.json b/package.json index 37f1b186..5f4b206f 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "version": "3.0.0", "scripts": { + "build:depot": "node --max-old-space-size=4096 scripts/compile-depot.mjs", "build": "turbo build", "dev": "turbo dev", "tauri": "tauri" diff --git a/packages/storage/package.json b/packages/storage/package.json index e03a6c2d..beb3235d 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -14,6 +14,7 @@ "devDependencies": { "@lume/tsconfig": "workspace:*", "@lume/types": "workspace:*", + "@lume/utils": "workspace:^", "@types/react": "^18.2.48", "typescript": "^5.3.3" } diff --git a/packages/storage/src/storage.ts b/packages/storage/src/storage.ts index 720235ca..b31d3565 100644 --- a/packages/storage/src/storage.ts +++ b/packages/storage/src/storage.ts @@ -8,7 +8,8 @@ import { NDKCacheUserProfile, } from "@lume/types"; import { invoke } from "@tauri-apps/api/core"; -import { appConfigDir, resolveResource } from "@tauri-apps/api/path"; +import { resolve, appConfigDir, resolveResource } from "@tauri-apps/api/path"; +import { VITE_FLATPAK_RESOURCE } from "@lume/utils"; import { Platform } from "@tauri-apps/plugin-os"; import { Child, Command } from "@tauri-apps/plugin-shell"; import Database from "@tauri-apps/plugin-sql"; @@ -92,7 +93,10 @@ export class LumeStorage { } public async launchDepot() { - const configPath = await resolveResource("resources/config.toml"); + const configPath = + VITE_FLATPAK_RESOURCE !== null + ? await resolve("/", VITE_FLATPAK_RESOURCE) + : await resolveResource("resources/config.toml"); const dataPath = await appConfigDir(); const command = Command.sidecar("bin/depot", [ diff --git a/packages/utils/src/constants.ts b/packages/utils/src/constants.ts index 520e94ae..5fc22a55 100644 --- a/packages/utils/src/constants.ts +++ b/packages/utils/src/constants.ts @@ -373,3 +373,5 @@ export const QUOTES = [ "You can send secure messages on Nostr with https://0xchat.com/", "Are you a fan of following topics, instead of people? Use https://zapddit.com", ]; + +export const VITE_FLATPAK_RESOURCE = import.meta.env.VITE_FLATPAK_RESOURCE; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f127e1be..e9e20eed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -884,6 +884,9 @@ importers: '@lume/types': specifier: workspace:* version: link:../types + '@lume/utils': + specifier: workspace:^ + version: link:../utils '@types/react': specifier: ^18.2.48 version: 18.2.48 @@ -1087,7 +1090,6 @@ packages: /@astrojs/check@0.4.1(typescript@5.3.3): resolution: {integrity: sha512-XEsuU4TlWkgcsvdeessq5mXLXV1fejtxIioCPv/FfhTzb1bDYe2BtLiSBK+rFTyD9Hl686YOas9AGNMJcpoRsw==} - hasBin: true peerDependencies: typescript: ^5.0.0 dependencies: @@ -1112,7 +1114,6 @@ packages: /@astrojs/language-server@2.6.2(typescript@5.3.3): resolution: {integrity: sha512-RYzPRhS/WBXK5JtfR+0+nGj+N3VbJd5jU/uSNUev9baUx/RLmUwDk1f6Oy8QDEfDDLAr76Ig8YeDD/nxPdBSLw==} - hasBin: true peerDependencies: prettier: ^3.0.0 prettier-plugin-astro: '>=0.11.0' @@ -1364,7 +1365,6 @@ packages: /@babel/parser@7.23.6: resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} engines: {node: '>=6.0.0'} - hasBin: true dependencies: '@babel/types': 7.23.6 dev: false @@ -1466,7 +1466,6 @@ packages: /@biomejs/biome@1.5.3: resolution: {integrity: sha512-yvZCa/g3akwTaAQ7PCwPWDCkZs3Qa5ONg/fgOUT9e6wAWsPftCjLQFPXBeGxPK30yZSSpgEmRCfpGTmVbUjGgg==} engines: {node: '>=14.*'} - hasBin: true requiresBuild: true optionalDependencies: '@biomejs/cli-darwin-arm64': 1.5.3 @@ -3207,7 +3206,6 @@ packages: /@tauri-apps/cli@2.0.0-alpha.21: resolution: {integrity: sha512-s61QfaKV1njrCrnjE/L2Yn1PrnxUs8I2iUI8NULjLYdOyFLCxu9UlW/kWQa9+ODJA8gYLl5txUH2fkkFdyOsCA==} engines: {node: '>= 10'} - hasBin: true optionalDependencies: '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.21 '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.21 @@ -3498,7 +3496,6 @@ packages: /acorn@8.11.3: resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} engines: {node: '>=0.4.0'} - hasBin: true dev: false /ajv@6.10.0: @@ -3656,7 +3653,6 @@ packages: /astro@4.2.4(typescript@5.3.3): resolution: {integrity: sha512-z1f52lXkHf71M5HSLKrd5G1PH5/Zfq4kMp0iUT7Na5VHcPDma/NYFPFPewDxqV6UPmyxupj3xuooFaN3j8zaow==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} - hasBin: true dependencies: '@astrojs/compiler': 2.5.1 '@astrojs/internal-helpers': 0.2.1 @@ -3748,7 +3744,6 @@ packages: /autoprefixer@10.4.17(postcss@8.4.33): resolution: {integrity: sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==} engines: {node: ^10 || ^12 || >=14} - hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: @@ -3885,7 +3880,6 @@ packages: /browserslist@4.22.2: resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true dependencies: caniuse-lite: 1.0.30001579 electron-to-chromium: 1.4.645 @@ -4079,7 +4073,6 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - requiresBuild: true /color-string@1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} @@ -4185,7 +4178,6 @@ packages: /core-js@2.6.12: resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} - deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. requiresBuild: true dev: true @@ -4204,7 +4196,6 @@ packages: /cross-env@7.0.3: resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==} engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'} - hasBin: true dependencies: cross-spawn: 7.0.3 dev: true @@ -4228,7 +4219,6 @@ packages: /cssesc@3.0.0: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} - hasBin: true /csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} @@ -4381,7 +4371,6 @@ packages: /direction@1.0.4: resolution: {integrity: sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==} - hasBin: true dev: false /dlv@1.1.3: @@ -4554,7 +4543,6 @@ packages: /esbuild@0.19.12: resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} engines: {node: '>=12'} - hasBin: true requiresBuild: true optionalDependencies: '@esbuild/aix-ppc64': 0.19.12 @@ -4601,7 +4589,6 @@ packages: /esprima@4.0.1: resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} engines: {node: '>=4'} - hasBin: true dev: false /estree-walker@3.0.3: @@ -4792,7 +4779,6 @@ packages: /flaschenpost@1.1.3: resolution: {integrity: sha512-1VAYPvDsVBGFJyUrOa/6clnJwZYC3qVq9nJLcypy6lvaaNbo1wOQiH8HQ+4Fw/k51pVG7JHzSf5epb8lmIW86g==} - hasBin: true dependencies: '@babel/runtime': 7.2.0 app-root-path: 2.1.0 @@ -4987,7 +4973,6 @@ packages: /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 @@ -5329,7 +5314,6 @@ packages: /is-docker@3.0.0: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - hasBin: true dev: false /is-extendable@0.1.1: @@ -5358,7 +5342,6 @@ packages: /is-inside-container@1.0.0: resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} engines: {node: '>=14.16'} - hasBin: true dependencies: is-docker: 3.0.0 dev: false @@ -5492,7 +5475,6 @@ packages: /jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} - hasBin: true /jotai@2.6.3(@types/react@18.2.48)(react@18.2.0): resolution: {integrity: sha512-0htSJ2d6426ZdSEYHncJHXY6Lkgde1Hc2HE/ADIRi9d2L3hQL+jLKY1LkWBMeCNyOSlKH8+1u/Gc33Ox0uq21Q==} @@ -5516,7 +5498,6 @@ packages: /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} - hasBin: true dependencies: argparse: 1.0.10 esprima: 4.0.1 @@ -5524,7 +5505,6 @@ packages: /js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true dependencies: argparse: 2.0.1 dev: false @@ -5532,7 +5512,6 @@ packages: /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} - hasBin: true dev: false /json-lines@1.0.0: @@ -5548,7 +5527,6 @@ packages: /json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} - hasBin: true dev: false /jsonc-parser@2.3.1: @@ -5728,7 +5706,6 @@ packages: /loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} - hasBin: true dependencies: js-tokens: 4.0.0 dev: false @@ -6194,7 +6171,6 @@ packages: /million@2.6.4: resolution: {integrity: sha512-voUkdd/jHWrG+7NS+mX49Pat+POKdgGW78V7pYMSrTaOjUitR6ySEcAci8hn17Rsx1IMI3+5w41dkADM1J1ZEg==} - hasBin: true dependencies: '@babel/core': 7.23.7 '@babel/generator': 7.23.6 @@ -6222,13 +6198,11 @@ packages: /mime@1.4.1: resolution: {integrity: sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==} - hasBin: true dev: true /mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} - hasBin: true dev: false /mimic-fn@2.1.0: @@ -6250,7 +6224,6 @@ packages: /mini-svg-data-uri@1.4.4: resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} - hasBin: true dev: true /minidenticons@4.2.0: @@ -6320,12 +6293,10 @@ packages: /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true /nanoid@5.0.4: resolution: {integrity: sha512-vAjmBf13gsmhXSgBrtIclinISzFFy22WwCYoyilZlsrRXNIHSwgFQ1bEdjRwMT3aoadeIF6HMuDRlOxzfXV8ig==} engines: {node: ^18 || >=20} - hasBin: true dev: false /napi-build-utils@1.0.2: @@ -6337,7 +6308,6 @@ packages: /needle@2.9.1: resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==} engines: {node: '>= 4.4.x'} - hasBin: true dependencies: debug: 3.2.7 iconv-lite: 0.4.24 @@ -6396,7 +6366,6 @@ packages: /node-gyp-build@4.8.0: resolution: {integrity: sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==} - hasBin: true dev: false /node-releases@2.0.14: @@ -6756,7 +6725,6 @@ packages: /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} engines: {node: '>=10'} - hasBin: true requiresBuild: true dependencies: detect-libc: 2.0.2 @@ -6909,7 +6877,6 @@ packages: /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} - hasBin: true requiresBuild: true dependencies: deep-extend: 0.6.0 @@ -7196,7 +7163,6 @@ packages: /resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} - hasBin: true dependencies: is-core-module: 2.13.1 path-parse: 1.0.7 @@ -7261,7 +7227,6 @@ packages: /rollup@3.29.4: resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true optionalDependencies: fsevents: 2.3.3 dev: false @@ -7269,7 +7234,6 @@ packages: /rollup@4.9.6: resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: @@ -7356,18 +7320,15 @@ packages: /semver@5.7.2: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} - hasBin: true dev: true /semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true dev: false /semver@7.5.4: resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} - hasBin: true dependencies: lru-cache: 6.0.0 dev: false @@ -7775,7 +7736,6 @@ packages: /sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} - hasBin: true dependencies: '@jridgewell/gen-mapping': 0.3.3 commander: 4.1.1 @@ -7857,7 +7817,6 @@ packages: /tailwindcss@3.4.1: resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==} engines: {node: '>=14.0.0'} - hasBin: true dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -7966,7 +7925,6 @@ packages: /tlds@1.249.0: resolution: {integrity: sha512-PfcE+oqaEhs0U3RDNg4uGg37793cGvlK6+aLAetwR0ImFyV3R2ts1KvU2RfJdtoLn7IFnUEftFFz4br5Wr3caA==} - hasBin: true dev: false /to-fast-properties@2.0.0: @@ -7994,7 +7952,6 @@ packages: /tsconfck@3.0.1(typescript@5.3.3): resolution: {integrity: sha512-7ppiBlF3UEddCLeI1JRx5m2Ryq+xk4JrZuq4EuYXykipebaq1dV0Fhgr1hb7CkmHt32QSgOZlcqVLEtHBG4/mg==} engines: {node: ^18 || >=20} - hasBin: true peerDependencies: typescript: ^5.0.0 peerDependenciesMeta: @@ -8078,7 +8035,6 @@ packages: /turbo@1.11.3: resolution: {integrity: sha512-RCJOUFcFMQNIGKSjC9YmA5yVP1qtDiBA0Lv9VIgrXraI5Da1liVvl3VJPsoDNIR9eFMyA/aagx1iyj6UWem5hA==} - hasBin: true optionalDependencies: turbo-darwin-64: 1.11.3 turbo-darwin-arm64: 1.11.3 @@ -8170,7 +8126,6 @@ packages: /typescript@5.3.3: resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} engines: {node: '>=14.17'} - hasBin: true /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} @@ -8306,7 +8261,6 @@ packages: /update-browserslist-db@1.0.13(browserslist@4.22.2): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} - hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: @@ -8425,13 +8379,10 @@ packages: /uuid@3.3.2: resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==} - deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. - hasBin: true dev: true /uuid@9.0.1: resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} - hasBin: true dev: true /uuidv4@2.0.0: @@ -8547,7 +8498,6 @@ packages: /vite@5.0.12(@types/node@20.11.6): resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true peerDependencies: '@types/node': ^18.0.0 || >=20.0.0 less: '*' @@ -8713,7 +8663,6 @@ packages: /vscode-languageserver@9.0.1: resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==} - hasBin: true dependencies: vscode-languageserver-protocol: 3.17.5 dev: false @@ -8816,7 +8765,6 @@ packages: /which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} - hasBin: true dependencies: isexe: 2.0.0 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 84db0b94..e851bc3f 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628a8f9bd1e24b4e0db2b4bc2d000b001e7dd032d54afa60a68836aeec5aa54a" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -548,9 +548,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" [[package]] name = "byteorder" @@ -705,15 +705,15 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -2062,9 +2062,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -2115,9 +2115,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -2696,7 +2696,7 @@ dependencies = [ "tauri-plugin-cli", "tauri-plugin-clipboard-manager", "tauri-plugin-dialog", - "tauri-plugin-fs 2.0.0-alpha.7 (git+https://github.com/tauri-apps/plugins-workspace?branch=v2)", + "tauri-plugin-fs", "tauri-plugin-http", "tauri-plugin-notification", "tauri-plugin-os", @@ -3215,9 +3215,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -3256,9 +3256,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -3588,9 +3588,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plist" @@ -3719,9 +3719,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -3892,13 +3892,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.4", "regex-syntax 0.8.2", ] @@ -3913,9 +3913,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", @@ -4267,9 +4267,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c" dependencies = [ "base64", "chrono", @@ -4284,9 +4284,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298" dependencies = [ "darling", "proc-macro2", @@ -4409,9 +4409,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -5054,7 +5054,8 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f660808f493581eb766e1e37f06777e01f6607631efe2d542e448fb1d89ea34a" dependencies = [ "auto-launch", "log", @@ -5067,7 +5068,8 @@ dependencies = [ [[package]] name = "tauri-plugin-cli" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3ce9173dd3ae43c5c7529cce495e89cc9d8773adcd2a3e0efb5123aa052c64" dependencies = [ "clap", "log", @@ -5080,7 +5082,8 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd33e4675642fc51b5538d42169927e39058e02000baea4651dc47a98bf259b" dependencies = [ "arboard", "log", @@ -5094,7 +5097,8 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0ff9a134afd29589d6154547a04dee18f5999aa63b91fdf7d58e597264633a" dependencies = [ "glib 0.16.9", "log", @@ -5104,29 +5108,15 @@ dependencies = [ "serde_json", "tauri", "tauri-build", - "tauri-plugin-fs 2.0.0-alpha.7 (git+https://github.com/tauri-apps/plugins-workspace?branch=v2)", + "tauri-plugin-fs", "thiserror", ] [[package]] name = "tauri-plugin-fs" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" -dependencies = [ - "anyhow", - "glob", - "serde", - "serde_repr", - "tauri", - "thiserror", - "url", - "uuid", -] - -[[package]] -name = "tauri-plugin-fs" -version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3#ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4930141ae4379cdfdc2270b28bf3d54faf1e757f3f8218f2b5b1366faa2dda79" dependencies = [ "anyhow", "glob", @@ -5141,7 +5131,8 @@ dependencies = [ [[package]] name = "tauri-plugin-http" version = "2.0.0-alpha.9" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3#ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc9eb023046eabd552d7e9e7f5afb6a6b3bd61cc67b79a9267b80029fabee4" dependencies = [ "data-url", "glob", @@ -5150,7 +5141,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-plugin-fs 2.0.0-alpha.7 (git+https://github.com/tauri-apps/plugins-workspace?rev=ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3)", + "tauri-plugin-fs", "thiserror", "url", ] @@ -5158,7 +5149,8 @@ dependencies = [ [[package]] name = "tauri-plugin-notification" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e1cfe331495d0e72b9d48191eec98a54f9e189571b8ec6affb39b90b3df3bc" dependencies = [ "log", "notify-rust", @@ -5176,7 +5168,8 @@ dependencies = [ [[package]] name = "tauri-plugin-os" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7cfaf07f8dcbfd4b2ce6156c4158d9d1419850ffe4e8146b6e890b5381e6906" dependencies = [ "gethostname 0.4.3", "log", @@ -5192,7 +5185,8 @@ dependencies = [ [[package]] name = "tauri-plugin-process" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55c149c1027bc3de752d51ca9227cfa2ce592a4934735f70c6050360e0b60b3" dependencies = [ "tauri", ] @@ -5200,7 +5194,8 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75a85e88ed3da46059825105f604ed57e2151d7718356750c7c6919b7288a828" dependencies = [ "encoding_rs", "log", @@ -5217,7 +5212,8 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9253a4159e2c84532407724bb886e4e9ee0186d0e5fae2046920c4a02a30c50d" dependencies = [ "futures-core", "log", @@ -5233,7 +5229,8 @@ dependencies = [ [[package]] name = "tauri-plugin-store" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96e9f18d08c7ff875178499ca81a977c0fe7a105a6f18a3779f7a1e907e31f62" dependencies = [ "log", "serde", @@ -5261,7 +5258,8 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0473197ceb5b436f8b5be139875c54b59fee756f8c15415ef374495de13747c1" dependencies = [ "base64", "dirs-next", @@ -5287,7 +5285,8 @@ dependencies = [ [[package]] name = "tauri-plugin-upload" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b6b814eb7c66eae2db9b7d76eb571ddc385894cb9aac4c90626d9e93ca1cbe1" dependencies = [ "futures-util", "log", @@ -5304,7 +5303,8 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" version = "2.0.0-alpha.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8a3db790b897765ad933c2f73136cf5fe4d3d65a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9509fae907fd4cbd238ac048003778fe9108cb521a6fb58fb8a5f844e0dbcc93" dependencies = [ "bincode", "bitflags 2.4.2", @@ -5772,9 +5772,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -5841,9 +5841,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom 0.2.12", ] @@ -6113,9 +6113,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "whoami" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 047509d0..d799347c 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,22 +19,22 @@ tauri = { version = "2.0.0-alpha", features = [ "tray-icon", "native-tls-vendored", "protocol-asset", ] } -tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", rev = "ea8eadce85b2e3e8eb7eb1a779fc3aa6c1201fa3" } -tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri-plugin-cli = "2.0.0-alpha" +tauri-plugin-clipboard-manager = "2.0.0-alpha" +tauri-plugin-dialog = "2.0.0-alpha" +tauri-plugin-fs = "2.0.0-alpha" +tauri-plugin-http = "2.0.0-alpha" +tauri-plugin-notification = "2.0.0-alpha" +tauri-plugin-os = "2.0.0-alpha" +tauri-plugin-process = "2.0.0-alpha" +tauri-plugin-shell = "2.0.0-alpha" +tauri-plugin-updater = "2.0.0-alpha" +tauri-plugin-autostart = "2.0.0-alpha" +tauri-plugin-store = "2.0.0-alpha" +tauri-plugin-upload = "2.0.0-alpha" +tauri-plugin-window-state = "2.0.0-alpha" tauri-plugin-theme = { git = "https://github.com/wyhaya/tauri-plugin-theme" } -tauri-plugin-sql = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [ +tauri-plugin-sql = {version="2.0.0-alpha", features = [ "sqlite", ] } sqlx-cli = { version = "0.7.0", default-features = false, features = [ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c9c0e4f2..4d1893dd 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "$schema": "../node_modules/@tauri-apps/cli/schema.json", + "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { "beforeBuildCommand": "pnpm run build", "beforeDevCommand": "pnpm run dev", @@ -60,7 +60,7 @@ "icons/icon.ico" ], "copyright": "", - "identifier": "nu.lume", + "identifier": "nu.lume.Lume", "longDescription": "nostr client for desktop", "shortDescription": "nostr client", "targets": "all",