Skip to content

Commit

Permalink
Merge pull request #148 from embroider-build/use-modern-pnpm
Browse files Browse the repository at this point in the history
Use a newer pnpm
  • Loading branch information
NullVoxPopuli authored Jul 14, 2023
2 parents f793715 + 26c6a23 commit c07c3dd
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/actions/pnpm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ runs:
${{ runner.os }}-pnpm-
- uses: pnpm/[email protected]
with:
version: 7
version: 8
run_install: true
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ jobs:
- defaults with pnpm

# TypeScript
- typescript with npm
- typescript with yarn
- typescript with pnpm
# Disabled for now, we are having a conflict between built-in-types from @ember/test-helpers
# and the types from definitely typed
# - typescript with npm
# - typescript with yarn
# - typescript with pnpm

# flags
- addon-location
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# super strict mode
auto-install-peers=false
resolve-peers-from-workspace-root=false
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"typescript": "^4.7.4"
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": "16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -63,9 +63,8 @@
}
},
"volta": {
"node": "14.21.3",
"node": "16.20.1",
"yarn": "1.22.18",
"npm": "8.13.2",
"pnpm": "7.32.5"
"pnpm": "8.6.7"
}
}
36 changes: 19 additions & 17 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c07c3dd

Please sign in to comment.