Skip to content

Commit 3c4f567

Browse files
authored
Merge pull request #262 from DeterminateSystems/fix-vulns-switch-to-npm
Fix vulnerability and switch to npm
2 parents 1229b72 + 1067e46 commit 3c4f567

8 files changed

Lines changed: 18657 additions & 15810 deletions

File tree

.github/workflows/ci.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,46 @@ jobs:
1919
uses: DeterminateSystems/flake-checker-action@main
2020
with:
2121
fail-mode: true
22+
2223
- name: Install Determinate Nix
2324
uses: DeterminateSystems/determinate-nix-action@v3
25+
2426
- name: Enable FlakeHub Cache
2527
uses: DeterminateSystems/flakehub-cache-action@main
26-
- name: Install pnpm dependencies
27-
run: nix develop --command pnpm install
28+
29+
- name: Get npm cache directory
30+
id: npm-cache-directory
31+
run: |
32+
echo "directory=$(nix develop --command npm config get cache | tr -d '\n')" >> $GITHUB_OUTPUT
33+
34+
- name: Set up npm cache
35+
uses: actions/cache@v4
36+
with:
37+
path: ${{ steps.npm-cache-directory.outputs.directory }}
38+
key: update-flake-lock-npm-cache-${{ hashFiles('**/package-lock.json') }}
39+
restore-keys: |
40+
update-flake-lock-npm-cache
41+
42+
- name: Install npm dependencies
43+
run: nix develop --command npm ci
44+
2845
- name: Check formatting
29-
run: nix develop --command pnpm run check-fmt
46+
run: nix develop --command npm run check-fmt
47+
3048
- name: Lint
31-
run: nix develop --command pnpm run lint
49+
run: nix develop --command npm run lint
50+
3251
- name: Build
33-
run: nix develop --command pnpm run build
52+
run: nix develop --command npm run build
53+
3454
- name: Run test suite
35-
run: nix develop --command pnpm run test
55+
run: nix develop --command npm run test
56+
3657
- name: Package
37-
run: nix develop --command pnpm run package
58+
run: nix develop --command npm run package
59+
3860
- name: Check git status
3961
run: git status --porcelain=v1
62+
4063
- name: Ensure no staged changes
4164
run: git diff --exit-code

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dist/
22
lib/
33
node_modules/
4-
pnpm-lock.yaml
4+
package-lock.json
55
README.md

0 commit comments

Comments
 (0)