Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pnpm experiment #420

Merged
merged 12 commits into from
May 16, 2024
Merged

Pnpm experiment #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
30298a2
use pnpm instead of npm
mmv08 May 13, 2024
d0724ae
experementing wip
mmv08 May 14, 2024
96dc288
WIN
mmv08 May 14, 2024
fa9cd69
fix github actions
mmv08 May 14, 2024
3032a7b
remove shameful hosting
mmv08 May 15, 2024
2451464
fix app deps
mmv08 May 15, 2024
6ee0d45
fix type import
mmv08 May 15, 2024
adb13d0
remove .npmrc
mmv08 May 15, 2024
6bf3eea
Fix readme
mmv08 May 15, 2024
c1b45b6
fix upstream bundler run command
mmv08 May 15, 2024
f52ba62
npm -> pnpm fix
mmv08 May 15, 2024
13d7d66
Add Typescript dependency to passkey package (#421)
nlordell May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/certora_4337.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,17 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9

- name: Install python
uses: actions/setup-python@v4
with: { python-version: 3.11 }

- name: Install certora cli
run: pip install -Iv certora-cli==6.1.3
run: pip install -Iv certora-cli==7.3.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Context: Unrelated but opportunistic change (was tested with this during development, and there are no additional Certora related changes because of the version bump).


- name: Install solc
run: |
Expand All @@ -37,7 +42,7 @@ jobs:
sudo mv solc-static-linux /usr/local/bin/solc8.23

- name: Install dependencies
run: npm ci
run: pnpm install

- name: Verify rule ${{ matrix.rule }}
working-directory: ./modules/4337
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
- run: npm ci
- run: npm run fmt:global-check
cache: pnpm
- run: pnpm install
- run: pnpm run fmt:global-check
28 changes: 19 additions & 9 deletions .github/workflows/ci_4337.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
pnpm install
npm run coverage -w modules/4337
- name: Coveralls
uses: coverallsapp/github-action@master
Expand All @@ -26,24 +29,31 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
pnpm install
npm run test:4337 -w modules/4337
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
pnpm install
npm run lint -w modules/4337
npm run fmt:check -w modules/4337
18 changes: 11 additions & 7 deletions .github/workflows/ci_4337_gas_metering.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- name: Install dependencies
run: pnpm install
- run: |
npm ci
npm run fmt:check -w examples/4337-gas-metering
npm run lint -w examples/4337-gas-metering
npm run build -w examples/4337-gas-metering
pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" fmt:check
pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" lint
pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" build
13 changes: 9 additions & 4 deletions .github/workflows/ci_4337_local_bundler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9

- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run lint -w packages/4337-local-bundler
pnpm install
pnpm run --filter "@safe-global/safe-4337-local-bundler" lint
14 changes: 9 additions & 5 deletions .github/workflows/ci_4337_upstream_bundler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9

- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run test:4337:upstream -w modules/4337
npm run test:4337:upstream -w modules/passkey
pnpm install
pnpm run --filter "{modules/4337}" --filter "{modules/passkey}" test:4337:upstream
48 changes: 30 additions & 18 deletions .github/workflows/ci_passkey.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run coverage -w modules/passkey
pnpm install
pnpm run --filter "@safe-global/safe-passkey" coverage
- uses: coverallsapp/github-action@master
with:
path-to-lcov: modules/passkey/coverage/lcov.info
Expand All @@ -25,37 +28,46 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run lint -w modules/passkey
npm run fmt:check -w modules/passkey
npm run build -w modules/passkey
pnpm install
pnpm run --filter "@safe-global/safe-passkey" lint
pnpm run --filter "@safe-global/safe-passkey" fmt:check
pnpm run --filter "@safe-global/safe-passkey" build
e2e:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run test:4337 -w modules/passkey
pnpm install
pnpm run --filter "@safe-global/safe-passkey" test:4337
benchmark:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run bench -w modules/passkey
pnpm install
pnpm run --filter "@safe-global/safe-passkey" bench
13 changes: 8 additions & 5 deletions .github/workflows/ci_passkey_example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: npm
cache-dependency-path: package-lock.json
cache: pnpm
- run: |
npm ci
npm run lint -w examples/4337-passkeys
npm run build -w examples/4337-passkeys
pnpm install
pnpm run -F "{examples/4337-passkeys}" lint
pnpm run -F "{examples/4337-passkeys}" build
env:
VITE_WC_CLOUD_PROJECT_ID: ${{ secrets.VITE_WC_CLOUD_PROJECT_ID }}
VITE_WC_4337_BUNDLER_URL: ${{ secrets.VITE_WC_4337_BUNDLER_URL }}
2 changes: 2 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# They're excluded on the global level because each of them defines its own linting and formatting rules
examples/**
modules/**
packages/**
pnpm-lock.yaml
Loading
Loading