Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit c817ecb

Browse files
joncinquejoncinque
authored
js: Move everything to pnpm (#5775)
* Add workspace file and lockfile after install * Update tlv library to pnpm * Update memo to newer jest / pnpm * name-service: Update to pnpm, fix old deps * stake-pool: Update to pnpm * token: Update to pnpm * token-lending: Update to pnpm and some new packages * token-swap: Update to pnpm * token-metadata: Update to pnpm * single-pool: Add to same workspace * CI: Use pnpm everywhere * Use workspace versions of internal packages * Build dependent packages in CI * Update lockfile, remove some unused packages * Move token-swap tests to mocha * Move tests into test file, maybe that'll do it? * Update token-swap js build * Use updated eslint in token-swap * Fixup token ci build to include memo * ci: Trigger on changes to pnpm-lock.yaml * Refresh pnpm lock file
1 parent 8c20de5 commit c817ecb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+8907
-56559
lines changed

‎.github/workflows/pull-request-libraries.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
paths:
66
- 'libraries/**'
77
- 'ci/*-version.sh'
8+
- 'pnpm-lock.yaml'
89
push:
910
branches: [master]
1011
paths:
1112
- 'libraries/**'
1213
- 'ci/*-version.sh'
14+
- 'pnpm-lock.yaml'
1315

1416
jobs:
1517
cargo-test-sbf:
@@ -64,13 +66,16 @@ jobs:
6466
steps:
6567
- uses: actions/checkout@v2
6668
- name: Use Node.js ${{ env.NODE_VERSION }}
67-
uses: actions/setup-node@v1
69+
uses: actions/setup-node@v3
6870
with:
6971
node-version: ${{ env.NODE_VERSION }}
72+
- uses: pnpm/action-setup@v2
73+
with:
74+
version: 8
7075
- uses: actions/cache@v2
7176
with:
7277
path: ~/.npm
73-
key: node-${{ hashFiles('libraries/type-length-value/js/package-lock.json') }}
78+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
7479
restore-keys: |
7580
node-
7681
- run: ./ci/js-test-tlv.sh

‎.github/workflows/pull-request-memo.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
paths:
66
- 'memo/**'
77
- 'ci/*-version.sh'
8+
- 'pnpm-lock.yaml'
89
push:
910
branches: [master]
1011
paths:
1112
- 'memo/**'
1213
- 'ci/*-version.sh'
14+
- 'pnpm-lock.yaml'
1315

1416
jobs:
1517
cargo-test-sbf:
@@ -64,13 +66,16 @@ jobs:
6466
steps:
6567
- uses: actions/checkout@v2
6668
- name: Use Node.js ${{ env.NODE_VERSION }}
67-
uses: actions/setup-node@v1
69+
uses: actions/setup-node@v3
6870
with:
6971
node-version: ${{ env.NODE_VERSION }}
72+
- uses: pnpm/action-setup@v2
73+
with:
74+
version: 8
7075
- uses: actions/cache@v2
7176
with:
7277
path: ~/.npm
73-
key: node-${{ hashFiles('memo/js/package-lock.json') }}
78+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
7479
restore-keys: |
7580
node-
7681
- run: ./ci/js-test-memo.sh

‎.github/workflows/pull-request-name-service.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
paths:
66
- 'name-service/**'
77
- 'ci/*-version.sh'
8+
- 'pnpm-lock.yaml'
89
push:
910
branches: [master]
1011
paths:
1112
- 'name-service/**'
1213
- 'ci/*-version.sh'
14+
- 'pnpm-lock.yaml'
1315

1416
jobs:
1517
cargo-test-sbf:
@@ -72,13 +74,16 @@ jobs:
7274
steps:
7375
- uses: actions/checkout@v2
7476
- name: Use Node.js ${{ env.NODE_VERSION }}
75-
uses: actions/setup-node@v1
77+
uses: actions/setup-node@v3
7678
with:
7779
node-version: ${{ env.NODE_VERSION }}
80+
- uses: pnpm/action-setup@v2
81+
with:
82+
version: 8
7883
- uses: actions/cache@v2
7984
with:
80-
path: ~/.cache/yarn
81-
key: node-${{ hashFiles('name-service/js/yarn.lock') }}
85+
path: ~/.npm
86+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
8287
restore-keys: |
8388
node-
8489
- name: Download programs

‎.github/workflows/pull-request-single-pool.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- 'associated-token-account/**'
99
- 'ci/*-version.sh'
1010
- '.github/workflows/pull-request-single-pool.yml'
11+
- 'pnpm-lock.yaml'
1112
push:
1213
branches: [master]
1314
paths:
@@ -16,6 +17,7 @@ on:
1617
- 'associated-token-account/**'
1718
- 'ci/*-version.sh'
1819
- '.github/workflows/pull-request-single-pool.yml'
20+
- 'pnpm-lock.yaml'
1921

2022
jobs:
2123
cargo-test-sbf:
@@ -129,6 +131,12 @@ jobs:
129131
- uses: pnpm/action-setup@v2
130132
with:
131133
version: 8
134+
- uses: actions/cache@v2
135+
with:
136+
path: ~/.npm
137+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
138+
restore-keys: |
139+
node-
132140
- name: Download programs
133141
uses: actions/download-artifact@v2
134142
with:

‎.github/workflows/pull-request-stake-pool.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- 'ci/*-version.sh'
99
- 'ci/warning/purge-ubuntu-runner.sh'
1010
- '.github/workflows/pull-request-stake-pool.yml'
11+
- 'pnpm-lock.yaml'
1112
push:
1213
branches: [master]
1314
paths:
@@ -16,6 +17,7 @@ on:
1617
- 'ci/*-version.sh'
1718
- 'ci/warning/purge-ubuntu-runner.sh'
1819
- '.github/workflows/pull-request-stake-pool.yml'
20+
- 'pnpm-lock.yaml'
1921

2022
jobs:
2123
cargo-test-sbf:
@@ -83,24 +85,21 @@ jobs:
8385
runs-on: ubuntu-latest
8486
env:
8587
NODE_VERSION: 16.x
86-
needs: cargo-test-sbf
8788
steps:
8889
- uses: actions/checkout@v2
8990
- name: Use Node.js ${{ env.NODE_VERSION }}
90-
uses: actions/setup-node@v1
91+
uses: actions/setup-node@v3
9192
with:
9293
node-version: ${{ env.NODE_VERSION }}
94+
- uses: pnpm/action-setup@v2
95+
with:
96+
version: 8
9397
- uses: actions/cache@v2
9498
with:
9599
path: ~/.npm
96-
key: node-${{ hashFiles('stake-pool/js/package-lock.json') }}
100+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
97101
restore-keys: |
98102
node-
99-
- name: Download programs
100-
uses: actions/download-artifact@v2
101-
with:
102-
name: stake-pool-programs
103-
path: target/deploy
104103
- run: ./ci/js-test-stake-pool.sh
105104

106105
py-test:

‎.github/workflows/pull-request-token-lending.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ on:
66
- 'token-lending/**'
77
- 'token/**'
88
- 'ci/*-version.sh'
9+
- 'pnpm-lock.yaml'
910
push:
1011
branches: [master]
1112
paths:
1213
- 'token-lending/**'
1314
- 'token/**'
1415
- 'ci/*-version.sh'
16+
- 'pnpm-lock.yaml'
1517

1618
jobs:
1719
cargo-test-sbf:
@@ -70,22 +72,19 @@ jobs:
7072
runs-on: ubuntu-latest
7173
env:
7274
NODE_VERSION: 18.x
73-
needs: cargo-test-sbf
7475
steps:
7576
- uses: actions/checkout@v2
7677
- name: Use Node.js ${{ env.NODE_VERSION }}
77-
uses: actions/setup-node@v1
78+
uses: actions/setup-node@v3
7879
with:
7980
node-version: ${{ env.NODE_VERSION }}
81+
- uses: pnpm/action-setup@v2
82+
with:
83+
version: 8
8084
- uses: actions/cache@v2
8185
with:
8286
path: ~/.npm
83-
key: node-${{ hashFiles('token-lending/js/package-lock.json') }}
87+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
8488
restore-keys: |
8589
node-
86-
- name: Download programs
87-
uses: actions/download-artifact@v2
88-
with:
89-
name: token-lending-programs
90-
path: target/deploy
9190
- run: ./ci/js-test-token-lending.sh

‎.github/workflows/pull-request-token-metadata.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- 'token/program-2022/**'
88
- 'ci/*-version.sh'
99
- '.github/workflows/pull-request-token-metadata.yml'
10+
- 'pnpm-lock.yaml'
1011
push:
1112
branches: [master]
1213
paths:
1314
- 'token-metadata/**'
1415
- 'token/program-2022/**'
1516
- 'ci/*-version.sh'
1617
- '.github/workflows/pull-request-token-metadata.yml'
18+
- 'pnpm-lock.yaml'
1719

1820
jobs:
1921
cargo-test-sbf:
@@ -75,13 +77,16 @@ jobs:
7577
steps:
7678
- uses: actions/checkout@v2
7779
- name: Use Node.js ${{ env.NODE_VERSION }}
78-
uses: actions/setup-node@v1
80+
uses: actions/setup-node@v3
7981
with:
8082
node-version: ${{ env.NODE_VERSION }}
83+
- uses: pnpm/action-setup@v2
84+
with:
85+
version: 8
8186
- uses: actions/cache@v2
8287
with:
8388
path: ~/.npm
84-
key: node-${{ hashFiles('token-metadata/js/package-lock.json') }}
89+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
8590
restore-keys: |
8691
node-
8792
- run: ./ci/js-test-token-metadata.sh

‎.github/workflows/pull-request-token-swap.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- 'token/**'
88
- 'libraries/math/**'
99
- 'ci/*-version.sh'
10+
- 'pnpm-lock.yaml'
1011
push:
1112
branches: [master]
1213
paths:
1314
- 'token-swap/**'
1415
- 'token/**'
1516
- 'libraries/math/**'
1617
- 'ci/*-version.sh'
18+
- 'pnpm-lock.yaml'
1719

1820
jobs:
1921
cargo-test-sbf:
@@ -89,13 +91,16 @@ jobs:
8991
steps:
9092
- uses: actions/checkout@v2
9193
- name: Use Node.js ${{ env.NODE_VERSION }}
92-
uses: actions/setup-node@v1
94+
uses: actions/setup-node@v3
9395
with:
9496
node-version: ${{ env.NODE_VERSION }}
97+
- uses: pnpm/action-setup@v2
98+
with:
99+
version: 8
95100
- uses: actions/cache@v2
96101
with:
97102
path: ~/.npm
98-
key: node-${{ hashFiles('token-swap/js/package-lock.json') }}
103+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
99104
restore-keys: |
100105
node-
101106
- name: Download programs

‎.github/workflows/pull-request-token.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- 'token/**'
88
- 'ci/*-version.sh'
99
- '.github/workflows/pull-request-token.yml'
10+
- 'pnpm-lock.yaml'
1011
push:
1112
branches: [master]
1213
paths:
1314
- 'associated-token-account/**'
1415
- 'token/**'
1516
- 'ci/*-version.sh'
1617
- '.github/workflows/pull-request-token.yml'
18+
- 'pnpm-lock.yaml'
1719

1820
jobs:
1921
cargo-test-sbf:
@@ -257,13 +259,16 @@ jobs:
257259
steps:
258260
- uses: actions/checkout@v2
259261
- name: Use Node.js ${{ env.NODE_VERSION }}
260-
uses: actions/setup-node@v1
262+
uses: actions/setup-node@v3
261263
with:
262264
node-version: ${{ env.NODE_VERSION }}
265+
- uses: pnpm/action-setup@v2
266+
with:
267+
version: 8
263268
- uses: actions/cache@v2
264269
with:
265270
path: ~/.npm
266-
key: node-${{ hashFiles('token/js/package-lock.json') }}
271+
key: node-${{ hashFiles('pnpm-lock.yaml') }}
267272
restore-keys: |
268273
node-
269274
- name: Download programs

‎ci/js-test-memo.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source ./ci/solana-version.sh install
77
set -x
88
cd memo/js
99

10-
npm install
11-
npm run lint
12-
npm run build
13-
npm test
10+
pnpm install
11+
pnpm lint
12+
pnpm build
13+
pnpm test

0 commit comments

Comments
 (0)