From 8bb7affa91075a92d8d4cc5757c1de0957d831fb Mon Sep 17 00:00:00 2001 From: Jai A Date: Mon, 9 Sep 2024 18:33:25 -0700 Subject: [PATCH] (temp) Use cargo version of tauri CLI --- .github/workflows/app-release.yml | 3 + .github/workflows/ci.yml | 3 + apps/app-frontend/package.json | 1 - apps/app-frontend/src/pages/Settings.vue | 2 +- apps/app/README.md | 1 + apps/app/package.json | 9 +- pnpm-lock.yaml | 115 ----------------------- 7 files changed, 11 insertions(+), 123 deletions(-) diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml index 9954a0d59..15d85eada 100644 --- a/.github/workflows/app-release.yml +++ b/.github/workflows/app-release.yml @@ -41,6 +41,9 @@ jobs: with: components: rustfmt, clippy + - name: Install Tauri CLI + run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38 + - name: Setup rust cache uses: actions/cache@v4 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cea7e1593..def3365b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,9 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf + - name: Install Tauri CLI + run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38 + - name: Setup Node.JS environment uses: actions/setup-node@v4 with: diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json index 3758cbecb..5b6b46398 100644 --- a/apps/app-frontend/package.json +++ b/apps/app-frontend/package.json @@ -36,7 +36,6 @@ "devDependencies": { "@eslint/compat": "^1.1.1", "@nuxt/eslint-config": "^0.5.6", - "@tauri-apps/cli": "^2.0.0-rc", "@vitejs/plugin-vue": "^5.0.4", "autoprefixer": "^10.4.19", "eslint": "^9.9.1", diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue index 9d717e08b..e38163135 100644 --- a/apps/app-frontend/src/pages/Settings.vue +++ b/apps/app-frontend/src/pages/Settings.vue @@ -17,7 +17,7 @@ import { hide_ads_window } from '@/helpers/ads.js' import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue' onMounted(() => { - hide_ads_window() + hide_ads_window(true) }) const pageOptions = ['Home', 'Library'] diff --git a/apps/app/README.md b/apps/app/README.md index 298a7dced..ecd8d9c12 100644 --- a/apps/app/README.md +++ b/apps/app/README.md @@ -22,6 +22,7 @@ Before you begin, ensure you have the following installed on your machine: Follow these steps to set up your development environment: ```bash +cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38 pnpm install pnpm app:dev ``` diff --git a/apps/app/package.json b/apps/app/package.json index a14080253..8442bcd09 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -1,16 +1,13 @@ { "name": "@modrinth/app", "scripts": { - "build": "tauri build", - "tauri": "tauri", - "dev": "tauri dev", + "build": "cargo tauri build", + "tauri": "cargo tauri", + "dev": "cargo tauri dev", "test": "cargo test", "lint": "cargo fmt --check && cargo clippy -- -D warnings", "fix": "cargo fmt && cargo clippy --fix" }, - "devDependencies": { - "@tauri-apps/cli": "^2.0.0-rc" - }, "dependencies": { "@modrinth/app-frontend": "workspace:*", "@modrinth/app-lib": "workspace:*" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 056db95ad..6d93616bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,10 +31,6 @@ importers: '@modrinth/app-lib': specifier: workspace:* version: link:../../packages/app-lib - devDependencies: - '@tauri-apps/cli': - specifier: ^2.0.0-rc - version: 2.0.0-rc.12 apps/app-frontend: dependencies: @@ -108,9 +104,6 @@ importers: '@nuxt/eslint-config': specifier: ^0.5.6 version: 0.5.6(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4) - '@tauri-apps/cli': - specifier: ^2.0.0-rc - version: 2.0.0-rc.12 '@vitejs/plugin-vue': specifier: ^5.0.4 version: 5.0.5(vite@5.3.3(@types/node@22.4.1)(sass@1.77.6)(terser@5.31.6))(vue@3.4.31(typescript@5.5.4)) @@ -2009,71 +2002,6 @@ packages: '@tauri-apps/api@2.0.0-rc.4': resolution: {integrity: sha512-UNiIhhKG08j4ooss2oEEVexffmWkgkYlC2M3GcX3VPtNsqFgVNL8Mcw/4Y7rO9M9S+ffAMnLOF5ypzyuyb8tyg==} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.12': - resolution: {integrity: sha512-zYxcAH4reyqKkqCAybggszFWkBvC+ZyZPTWFKXXVQ20MZc1q+e/0UJYC8UKsaumrbi1uptgamvnM8yql56x5QQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@tauri-apps/cli-darwin-x64@2.0.0-rc.12': - resolution: {integrity: sha512-eme7pQzEzeGCk13V3uxUNRnkVZJukqwHotqEb2RdovXqJWSyESrighBy4PBG5Xn6wNYTOyoquY9+In4TOfJAzw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.12': - resolution: {integrity: sha512-113T2NsLeoy6GXsqc0yjMoozt+KXzkAtUB7DL9Kcvx9IMfA87cUVaTNjnb2GFsoQqpCWGfHei3nr9n1PGEbwMg==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.12': - resolution: {integrity: sha512-9TrUyNg0vmsYF7IbG+/sybEeiz6ikA1Kjd6JjC4iwfXjRff8fuTR7CIOb06imabxbLzGP79qSAnGAeTXz8E7qA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.12': - resolution: {integrity: sha512-YvE40+wdkNcXhwUAJNPyhNzJ8YS3saJoxGj7mtNQeNeNrKhxyj6hA5T6gw9KtMkwBOp+HGtqn+eDXiu0X7BBHQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.12': - resolution: {integrity: sha512-q+MJp/lSA5WINs78dCFMlU0/jQeUkGr9GHbKeppcVcpkcY/1vog70b4KhneyvbuklKBn/V8kd0FtIKCn8VP+KQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.12': - resolution: {integrity: sha512-5zodtleH2GFsB9lszDYrzPTLcr+MMqtpQpJWHATC1K03bLEA8ia8zSdBqRwm7u8NraMLl8TE7hc7hwq0uxGEcg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.12': - resolution: {integrity: sha512-nSu6VHpuq61DYM2YowLDLDwkK8im7dzYxIHXs+h8/rhkmadTujGhbyUhHPI1STA6hNyITUtSFpo6P2mEbfpAIg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.12': - resolution: {integrity: sha512-d/4y57OisMuB+MUkTpZsryQRi9ZQXQ8SsMhrvEgu8sbX8/WRm0iZyGuIZ01RlZZHLIasXbKTkPX+hPQC5Juk8Q==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.12': - resolution: {integrity: sha512-RsPUvsbFza03ysh0nU2nM3P2CVWz9cu7CRHwOEdtXjWWNREHUYCaVpqQKz0tn2sG19yXiNIB40iqrIBUmb/IoA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - - '@tauri-apps/cli@2.0.0-rc.12': - resolution: {integrity: sha512-rNcVSyGHGz8vNk542isYKPk5fEMAsgmzER+1s9YYbGZCH7m4e0rH89p/P9W40I/Z4AZk4ZqjpEeajeS5izDI4g==} - engines: {node: '>= 10'} - hasBin: true - '@tauri-apps/plugin-dialog@2.0.0-rc.0': resolution: {integrity: sha512-DPOXYe8SQ6Radk/67EOdaomlxL7oF99JO/ZUaPp1IBEs3Wro7lhlz63CfdKIBfKIZTLJLzP1R7/EiPL/GTA3Bg==} @@ -8113,49 +8041,6 @@ snapshots: '@tauri-apps/api@2.0.0-rc.4': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-darwin-x64@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.12': - optional: true - - '@tauri-apps/cli@2.0.0-rc.12': - optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.12 - '@tauri-apps/cli-darwin-x64': 2.0.0-rc.12 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.12 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.12 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.12 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.12 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.12 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.12 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.12 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.12 - '@tauri-apps/plugin-dialog@2.0.0-rc.0': dependencies: '@tauri-apps/api': 2.0.0-rc.3