Skip to content

Commit c855baf

Browse files
committed
ci: fix pnpm workspace setup and missing dependencies
- Add typescript/package.json as workspace root with packageManager field - Add typescript/pnpm-workspace.yaml for monorepo resolution - Remove stale root pnpm-lock.yaml, commit typescript/pnpm-lock.yaml - Declare missing peer/dev deps (@solana/keys, kit-plugin-*, rpc-subscriptions-*) - Update CI workflows to install from typescript/ workspace root
1 parent 569f6c3 commit c855baf

File tree

8 files changed

+7306
-9
lines changed

8 files changed

+7306
-9
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111
defaults:
1212
run:
13-
working-directory: ./typescript/packages/solana-pay/core
13+
working-directory: ./typescript
1414
steps:
1515
- uses: actions/checkout@v4
16+
- uses: pnpm/action-setup@v4
1617
- uses: actions/setup-node@v4
1718
with:
1819
node-version: lts/*
19-
- run: npm install
20-
- run: npm test
20+
- run: pnpm install
21+
- run: pnpm --filter @solana/pay test
2122

2223
# ── Rust CLI (rust/) ──
2324
cli-check:

.github/workflows/pull-requests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
defaults:
1111
run:
12-
working-directory: ./typescript/packages/solana-pay/core
12+
working-directory: ./typescript
1313

1414
name: Lint, format, and typecheck
1515

@@ -29,16 +29,16 @@ jobs:
2929
run: pnpm install
3030

3131
- name: Lint
32-
run: pnpm lint
32+
run: pnpm --filter @solana/pay lint
3333

3434
- name: Typecheck
35-
run: pnpm typecheck
35+
run: pnpm --filter @solana/pay typecheck
3636

3737
unit-test:
3838
runs-on: ubuntu-latest
3939
defaults:
4040
run:
41-
working-directory: ./typescript/packages/solana-pay/core
41+
working-directory: ./typescript
4242

4343
strategy:
4444
matrix:
@@ -64,7 +64,7 @@ jobs:
6464
run: pnpm install
6565

6666
- name: Run unit tests
67-
run: pnpm test
67+
run: pnpm --filter @solana/pay test
6868

6969
# ── Rust CLI (rust/) ──
7070
cli-check:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build
1010
package-lock.json
1111
yarn.lock
1212
pnpm-lock.yaml
13+
!typescript/pnpm-lock.yaml
1314
bun.lock
1415
bun.lockb
1516
tsconfig.tsbuildinfo

typescript/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"private": true,
3+
"packageManager": "pnpm@10.29.2"
4+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
dist
12
docs
23
lib
34

typescript/packages/solana-pay/core/package.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,13 @@
5353
"@solana-program/system": "^0.12.0",
5454
"@solana-program/token": "^0.12.0",
5555
"@solana-program/token-2022": "^0.9.0",
56-
"@solana/kit": "^6.5.0"
56+
"@solana/keys": "^6.5.0",
57+
"@solana/kit": "^6.5.0",
58+
"@solana/kit-plugin-instruction-plan": "^0.8.0",
59+
"@solana/kit-plugin-payer": "^0.8.0",
60+
"@solana/kit-plugin-rpc": "^0.8.0",
61+
"@solana/rpc-subscriptions-api": "^6.5.0",
62+
"@solana/rpc-subscriptions-spec": "^6.5.0"
5763
},
5864
"devDependencies": {
5965
"@eslint/js": "^9.39.1",
@@ -62,8 +68,14 @@
6268
"@solana-program/token": "^0.12.0",
6369
"@solana-program/token-2022": "^0.9.0",
6470
"@solana/eslint-config-solana": "^6.0.0",
71+
"@solana/keys": "^6.5.0",
6572
"@solana/kit": "^6.5.0",
6673
"@solana/kit-client-litesvm": "^0.8.0",
74+
"@solana/kit-plugin-instruction-plan": "^0.8.0",
75+
"@solana/kit-plugin-payer": "^0.8.0",
76+
"@solana/kit-plugin-rpc": "^0.8.0",
77+
"@solana/rpc-subscriptions-api": "^6.5.0",
78+
"@solana/rpc-subscriptions-spec": "^6.5.0",
6779
"@solana/prettier-config-solana": "^0.0.6",
6880
"@types/node": "^20.0.0",
6981
"eslint": "^9.39.1",

0 commit comments

Comments
 (0)