diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22efb5c0..76ccb118 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,18 +33,21 @@ jobs: run: | sudo apt-get update sudo apt-get install -y build-essential libssl-dev libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - - name: Install bun - uses: oven-sh/setup-bun@v1 + - name: Install pnpm + uses: pnpm/action-setup@v2 with: - bun-version: latest + version: 8.x.x + run_install: false - name: Setup node and cache for package data uses: actions/setup-node@v3 with: node-version: 'lts/*' + cache: 'pnpm' + cache-dependency-path: pnpm-lock.yaml - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true - - run: bun install + - run: pnpm install - uses: tauri-apps/tauri-action@dev env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.husky/pre-commit b/.husky/pre-commit index 375d2a1d..8c86c46d 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -bun run lint-staged +pnpm run lint-staged diff --git a/bun.lockb b/bun.lockb deleted file mode 100755 index 65bba3bb..00000000 Binary files a/bun.lockb and /dev/null differ diff --git a/package.json b/package.json index 7005050e..f24f2b15 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "private": true, "version": "1.2.5", "scripts": { - "dev": "bunx --bun vite", - "build": "bunx --bun vite build", + "dev": "vite", + "build": "vite build", "tauri": "tauri", "add-migrate": "cd src-tauri/ && sqlx migrate add", "prepare": "husky install", "lint": "eslint ./src --fix", "format": "prettier ./src --write", - "dep-update": "bun update && cd src-tauri/ && cargo update" + "dep-update": "pnpm update && cd src-tauri/ && cargo update" }, "lint-staged": { "**/*.{ts, tsx}": "eslint --fix",