From 145abd2cf97770e8f736c2fe821625e9b2339b2a Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 19:55:29 +0200 Subject: [PATCH 1/9] fix: nodejs namespace not found error --- apps/desktop/package.json | 1 + pnpm-lock.yaml | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index ad076f3..e143357 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -22,6 +22,7 @@ "@tauri-apps/cli": "^1.5.9", "@types/eslint": "8.56.0", "@types/markdown-it": "^14.1.1", + "@types/node": "^22.0.0", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", "autoprefixer": "^10.4.17", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4985cf6..5a27b3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,6 +126,9 @@ importers: '@types/markdown-it': specifier: ^14.1.1 version: 14.1.1 + '@types/node': + specifier: ^22.0.0 + version: 22.0.0 '@typescript-eslint/eslint-plugin': specifier: ^6.0.0 version: 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3) @@ -173,7 +176,7 @@ importers: version: 5.3.3 vite: specifier: ^5.0.3 - version: 5.0.10 + version: 5.0.10(@types/node@22.0.0) packages/config-eslint: dependencies: @@ -852,7 +855,7 @@ packages: sirv: 2.0.4 svelte: 4.2.8 tiny-glob: 0.2.9 - vite: 5.0.10 + vite: 5.0.10(@types/node@22.0.0) dev: true /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.10): @@ -866,7 +869,7 @@ packages: '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.10) debug: 4.3.4 svelte: 4.2.8 - vite: 5.0.10 + vite: 5.0.10(@types/node@22.0.0) transitivePeerDependencies: - supports-color dev: true @@ -885,7 +888,7 @@ packages: magic-string: 0.30.5 svelte: 4.2.8 svelte-hmr: 0.15.3(svelte@4.2.8) - vite: 5.0.10 + vite: 5.0.10(@types/node@22.0.0) vitefu: 0.2.5(vite@5.0.10) transitivePeerDependencies: - supports-color @@ -1331,6 +1334,12 @@ packages: resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==} dev: true + /@types/node@22.0.0: + resolution: {integrity: sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==} + dependencies: + undici-types: 6.11.1 + dev: true + /@types/object.omit@3.0.3: resolution: {integrity: sha512-xrq4bQTBGYY2cw+gV4PzoG2Lv3L0pjZ1uXStRRDQoATOYW1lCsFQHhQ+OkPhIcQoqLjAq7gYif7D14Qaa6Zbew==} dev: false @@ -4199,6 +4208,10 @@ packages: resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} dev: false + /undici-types@6.11.1: + resolution: {integrity: sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==} + dev: true + /update-browserslist-db@1.0.13(browserslist@4.22.3): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true @@ -4218,7 +4231,7 @@ packages: /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - /vite@5.0.10: + /vite@5.0.10(@types/node@22.0.0): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4246,6 +4259,7 @@ packages: terser: optional: true dependencies: + '@types/node': 22.0.0 esbuild: 0.19.7 postcss: 8.4.33 rollup: 4.5.2 @@ -4261,7 +4275,7 @@ packages: vite: optional: true dependencies: - vite: 5.0.10 + vite: 5.0.10(@types/node@22.0.0) dev: true /w3c-keyname@2.2.8: From c09da198286e5a292851cfc9ef4acc60b3a36ad4 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:00:46 +0200 Subject: [PATCH 2/9] ci: fix pnpm not found --- .github/workflows/publish-on-release.yml | 3 +++ .github/workflows/test-build-only.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index 7b4fc63..0728794 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -29,6 +29,9 @@ jobs: with: node-version: lts/* + - name: install pnpm + run: npm install -g pnpm + - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index ed6c0bf..a5a81c1 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -23,6 +23,9 @@ jobs: with: node-version: lts/* + - name: install pnpm + run: npm install -g pnpm + - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: From 8562580e47d1f976dd8a97048c12c61ed1e20d48 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:04:55 +0200 Subject: [PATCH 3/9] ci: fix add tauri script --- apps/desktop/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index e143357..ee907fe 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -5,6 +5,7 @@ "scripts": { "dev": "vite dev", "dev:tauri": "tauri dev", + "tauri": "tauri", "build": "vite build", "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", From a821380302dd668b2c7e8b1cacecd62497121cb8 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:10:04 +0200 Subject: [PATCH 4/9] wip --- .github/workflows/publish-on-release.yml | 3 +-- .github/workflows/test-build-only.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index 0728794..bde7508 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -35,8 +35,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - # Those targets are only used on macos runners so it's in an if to slightly speed up windows and linux builds. - targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} + toolchain: 1.60.0 - name: install frontend dependencies run: cd apps/desktop && pnpm install diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index a5a81c1..9978420 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -29,8 +29,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. - targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} + toolchain: 1.60.0 - name: install frontend dependencies run: cd apps/desktop && pnpm install From ac39320616ef44ba6e2d6a62ef07da595e7d7065 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:15:23 +0200 Subject: [PATCH 5/9] wip --- .github/workflows/publish-on-release.yml | 5 +++++ .github/workflows/test-build-only.yml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index bde7508..239c0ee 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -16,8 +16,10 @@ jobs: include: - platform: 'macos-latest' # for Arm based macs (M1 and above). args: '--target aarch64-apple-darwin' + rust_targets: 'aarch64-apple-darwin' - platform: 'macos-latest' # for Intel based macs. args: '--target x86_64-apple-darwin' + rust_targets: 'x86_64-apple-darwin' runs-on: ${{ matrix.platform }} @@ -37,6 +39,9 @@ jobs: with: toolchain: 1.60.0 + - name: add Rust targets + run: rustup target add ${{ matrix.rust_targets }} + - name: install frontend dependencies run: cd apps/desktop && pnpm install diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index 9978420..7e27f34 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -11,8 +11,10 @@ jobs: include: - platform: 'macos-latest' # for Arm based macs (M1 and above). args: '--target aarch64-apple-darwin' + rust_targets: 'aarch64-apple-darwin' - platform: 'macos-latest' # for Intel based macs. args: '--target x86_64-apple-darwin' + rust_targets: 'x86_64-apple-darwin' runs-on: ${{ matrix.platform }} steps: @@ -31,10 +33,12 @@ jobs: with: toolchain: 1.60.0 + - name: add Rust targets + run: rustup target add ${{ matrix.rust_targets }} + - name: install frontend dependencies run: cd apps/desktop && pnpm install - # If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any assets. - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b6087abaaa85f230f49e9344c1f5cd5e0e7713c5 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:21:42 +0200 Subject: [PATCH 6/9] wip --- .github/workflows/publish-on-release.yml | 2 +- .github/workflows/test-build-only.yml | 2 +- apps/desktop/src-tauri/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index 239c0ee..d7a60d2 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -37,7 +37,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.60.0 + toolchain: 1.64.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index 7e27f34..9783a1c 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -31,7 +31,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.60.0 + toolchain: 1.64.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml index a36b78b..62daebb 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/src-tauri/Cargo.toml @@ -7,7 +7,7 @@ license = "" repository = "" default-run = "app" edition = "2021" -rust-version = "1.60" +rust-version = "1.64" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 9ce5083d823d3fb90d3805b70ff9a4936fa83d10 Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:27:33 +0200 Subject: [PATCH 7/9] wip --- .github/workflows/publish-on-release.yml | 2 +- .github/workflows/test-build-only.yml | 2 +- apps/desktop/src-tauri/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index d7a60d2..7480ad0 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -37,7 +37,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.64.0 + toolchain: 1.67.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index 9783a1c..a49bf53 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -31,7 +31,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.64.0 + toolchain: 1.67.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml index 62daebb..983c0a4 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/src-tauri/Cargo.toml @@ -7,7 +7,7 @@ license = "" repository = "" default-run = "app" edition = "2021" -rust-version = "1.64" +rust-version = "1.67" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 6937452470d1e67b81953a8eb690cabf7512417a Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:32:28 +0200 Subject: [PATCH 8/9] wip --- .github/workflows/publish-on-release.yml | 2 -- .github/workflows/test-build-only.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index 7480ad0..939c62c 100644 --- a/.github/workflows/publish-on-release.yml +++ b/.github/workflows/publish-on-release.yml @@ -36,8 +36,6 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.67.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} diff --git a/.github/workflows/test-build-only.yml b/.github/workflows/test-build-only.yml index a49bf53..101df75 100644 --- a/.github/workflows/test-build-only.yml +++ b/.github/workflows/test-build-only.yml @@ -30,8 +30,6 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable - with: - toolchain: 1.67.0 - name: add Rust targets run: rustup target add ${{ matrix.rust_targets }} From 22146cdcc622337b24d5899475af62cca212cd2d Mon Sep 17 00:00:00 2001 From: chroxify Date: Tue, 30 Jul 2024 20:38:53 +0200 Subject: [PATCH 9/9] wip --- apps/desktop/src-tauri/Cargo.lock | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock index 920e4e1..9b53350 100644 --- a/apps/desktop/src-tauri/Cargo.lock +++ b/apps/desktop/src-tauri/Cargo.lock @@ -2307,6 +2307,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" version = "0.2.17" @@ -4013,12 +4019,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa 1.0.10", + "num-conv", "powerfmt", "serde", "time-core", @@ -4033,10 +4040,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ]