remove yarn from contract folder (#877)

* remove yarn from contract folder

* update image to use pnpm instead of yarn

* update /ts and hello-world to use pnpm

.github/workflows/rust.yml

@@ -33,7 +33,7 @@ jobs:
  uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
  with:
  path: contracts/docker-build.tar
- key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+ key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
  - name: build & save image
  if: steps.cache-image.outputs.cache-hit != 'true'
  run: |
@@ -61,7 +61,7 @@ jobs:
  uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
  with:
  path: contracts/docker-build.tar
- key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+ key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
  - name: load cached image
  run: |
  docker load --input docker-build.tar
@@ -74,14 +74,14 @@ jobs:
  cd /repo/contracts &&\
  solana-keygen new -o id.json --no-bip39-passphrase &&\
  cd /repo/ts &&\
- yarn install --frozen-lockfile &&\
- yarn build &&\
+ pnpm install --frozen-lockfile &&\
+ pnpm build &&\
  cd /repo/contracts &&\
- yarn install --frozen-lockfile &&\
+ pnpm install --frozen-lockfile &&\
  anchor test &&\
  chmod -R 755 ./target &&\
  cd /repo/contracts/examples/hello-world &&\
- yarn install --frozen-lockfile &&\
+ pnpm install --frozen-lockfile &&\
  anchor test &&\
  chmod -R 755 ./target"
 
@@ -101,13 +101,14 @@ jobs:
  uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
  with:
  path: contracts/docker-build.tar
- key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+ key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
  - name: load cached image
  run: |
  docker load --input docker-build.tar
  - name: format contracts + artifacts
  run: |
- yarn install --frozen-lockfile
+ npm install -g pnpm
+ pnpm install --frozen-lockfile
  cd ../ # back to root
  make format-contracts
  echo "run 'make format-contracts' if this fails"

Makefile

@@ -130,4 +130,4 @@ upgrade-e2e-core-deps:
 
 .PHONY: format-contracts
 format-contracts:
- cd ./contracts && cargo fmt && go fmt ./... && yarn format 
+ cd ./contracts && cargo fmt && go fmt ./... && pnpm format 

contracts/.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

contracts/Anchor.toml

@@ -9,7 +9,7 @@ cluster = "localnet"
 wallet = "id.json"
 
 [scripts]
-test = "yarn run test"
+test = "pnpm run test"
 
 # [programs.mainnet]
 # TODO: add pubkeys

contracts/Dockerfile

@@ -8,3 +8,7 @@ RUN cd /contracts && anchor build
 
 # only keep downloaded artifacts in /root/.cargo cached
 RUN rm -rf /contracts
+
+# remove yarn dependency, use pnpm
+RUN npm uninstall -g yarn
+RUN npm install -g pnpm

contracts/README.md

@@ -29,7 +29,7 @@ Available networks with declared IDs:
 
 ## Test
 
-Make sure to run `yarn install` to fetch mocha and other test dependencies.
+Make sure to run `pnpm i` to fetch mocha and other test dependencies.
 
 Start a dockerized shell that contains Solana and Anchor:
 

contracts/examples/hello-world/Anchor.toml

@@ -10,7 +10,7 @@ cluster = "localnet"
 wallet = "../../id.json"
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+test = "pnpm run test"
 
 # TODO: clone from devnet once available
 [[test.genesis]]

contracts/examples/hello-world/package.json

@@ -8,5 +8,8 @@
  "mocha": "^9.0.3",
  "ts-mocha": "^10.0.0",
  "typescript": "^4.3.5"
+ },
+ "scripts": {
+ "test": "ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
  }
 }