Skip to content

Commit 28d7a74

Browse files
committed
Move to pnpm to fix builds
1 parent 490a689 commit 28d7a74

File tree

16 files changed

+13867
-13546
lines changed

16 files changed

+13867
-13546
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,29 @@ jobs:
3636
submodules: true
3737
token: ${{ secrets.GITHUB_TOKEN }}
3838

39+
- name: setup pnpm
40+
uses: pnpm/action-setup@v4
41+
with:
42+
version: 10
43+
run_install: false
44+
3945
- name: setup node
4046
uses: actions/setup-node@v4
4147
with:
4248
node-version: lts/*
49+
cache: pnpm
50+
4351

4452
- name: install Rust nightly
4553
uses: dtolnay/rust-toolchain@nightly
4654
with:
4755
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
48-
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
56+
targets: ${{ matrix.platform == 'macos-14' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
57+
58+
- name: Rust cache
59+
uses: swatinem/rust-cache@v2
60+
with:
61+
workspaces: './src-tauri -> target'
4962

5063
- name: install dependencies (ubuntu only)
5164
if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above.
@@ -97,7 +110,7 @@ jobs:
97110
echo "Certificate imported. Using identity: $CERT_ID"
98111
99112
- name: install frontend dependencies
100-
run: yarn install # change this to npm, pnpm or bun depending on which one you use.
113+
run: pnpm install # change this to npm, pnpm or bun depending on which one you use.
101114

102115
- uses: tauri-apps/tauri-action@v0
103116
env:

build.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ for (const view of views) {
4040
process.chdir(`./${view}`);
4141

4242
loggerChild.info(`Install deps for "${view}"`);
43-
await spawn("yarn");
43+
await spawn("pnpm install");
4444

4545
loggerChild.info(`Building "${view}"`);
46-
await spawn("yarn build", {
46+
await spawn("pnpm run build", {
4747
env: { ...process.env, NUXT_APP_BASE_URL: `/${view}/` },
4848
});
4949

main/nuxt.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default defineNuxtConfig({
1212
css: ["~/assets/main.scss"],
1313

1414
ssr: false,
15+
devtools: false,
1516

1617
extends: [["../libs/drop-base"]],
1718

main/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"@heroicons/vue": "^2.1.5",
1515
"@nuxtjs/tailwindcss": "^6.12.2",
1616
"@tauri-apps/api": "^2.7.0",
17+
"@tauri-apps/plugin-os": "^2.3.2",
18+
"@tauri-apps/plugin-shell": "^2.3.3",
1719
"koa": "^2.16.1",
1820
"markdown-it": "^14.1.0",
1921
"micromark": "^4.0.1",
@@ -32,6 +34,5 @@
3234
"tailwindcss": "^3.4.13",
3335
"typescript": "^5.8.3",
3436
"vue-tsc": "^2.2.10"
35-
},
36-
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
37+
}
3738
}

0 commit comments

Comments
 (0)