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

chore: update pnpm 8 #618

Merged
merged 5 commits into from
Apr 16, 2023
Merged

chore: update pnpm 8 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73b7e02
chore: update to pnpm@8
dominikg Apr 13, 2023
f643aab
fix: use correct matrix vars and simplify call
dominikg Apr 13, 2023
1e9a15f
fix: remove engine restrictions for package managers
dominikg Apr 13, 2023
3a6c987
fix: cleanup included files of internal packages to ensure pnpm@8 add…
dominikg Apr 15, 2023
93e4d80
fix: add back engines.pnpm
dominikg Apr 15, 2023
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
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,17 @@ jobs:
with:
node-version: ${{ matrix.node }}
- name: install pnpm
if: matrix.node != 14
shell: bash
run: |
PNPM_VER=$(jq -r '.packageManager | if .[0:5] == "pnpm@" then .[5:] else "packageManager in package.json does not start with pnpm@\n" | halt_error(1) end' package.json)
echo installing pnpm version $PNPM_VER
npm i -g pnpm@$PNPM_VER
- name: install legacy pnpm for node14
dominikg marked this conversation as resolved.
Show resolved Hide resolved
if: matrix.node == 14
run: |
npm i -g pnpm@^7.32.0
tmppkg="$(jq '.engines.pnpm = "^7.32.0"' package.json)" && echo -E "${tmppkg}" > package.json && tmppkg=""
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
Expand Down
6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,9 @@
"prettier --write"
]
},
"packageManager": "pnpm@7.30.0",
"packageManager": "pnpm@8.2.0",
"engines": {
"pnpm": "^7.13.0",
"yarn": "forbidden, use pnpm",
"npm": "forbidden, use pnpm",
Comment on lines -60 to -62
Copy link
Member

Choose a reason for hiding this comment

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

you can leave this in place if you'd like. you just need to switch ^ to >= which I believe is the thing that's currently stopping me from using this repo

Copy link
Member Author

Choose a reason for hiding this comment

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

you can enable corepack locally to ease working with different package manager versions, or switch manually. until the issue with 8 is resolved, 7 must be used.

Copy link
Member Author

Choose a reason for hiding this comment

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

added back engines.pnpm and rewriting it for node14 tests. left the other two removed as neither npm nor yarn check it anymore i think.

"pnpm": "^8.2.0",
"node": "^14.18.0 || >= 16"
},
"pnpm": {
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/_test_dependencies/cjs-and-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.cjs",
"module": "index.mjs",
"files": [
"package.json",
"index.mjs",
"index.cjs"
],
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/_test_dependencies/cjs-only/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"name": "e2e-test-dep-cjs-only",
"main": "index.js",
"files": [
"package.json",
"index.js"
],
"type": "commonjs"
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/_test_dependencies/esm-only/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"name": "e2e-test-dep-esm-only",
"module": "esm.js",
"files": [
"package.json",
"esm.js"
],
"exports":{
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/_test_dependencies/scss-only/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"name": "e2e-test-dep-scss-only",
"main": "main.scss",
"files": [
"package.json",
"main.scss"
],
"type": "commonjs"
Expand Down
1 change: 0 additions & 1 deletion packages/e2e-tests/_test_dependencies/svelte-api-only/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "index.js",
"module": "index.js",
"files": [
"package.json",
"index.js"
],
"exports": {
Expand Down
4 changes: 4 additions & 0 deletions packages/e2e-tests/_test_dependencies/svelte-exports-simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"e2e-test-dep-cjs-only": "file:../cjs-only"
},
"type": "module",
"files": [
"src",
"index.js"
],
"exports": {
"./*": {
"svelte": "./src/components/*"
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"main": "index.js",
"svelte": "index.js",
"files": [
"src",
"index.js",
"cli.js",
"package.json"
"cli.js"
],
"dependencies": {
"@types/node": "^18.15.11",
Expand Down
3 changes: 1 addition & 2 deletions packages/e2e-tests/_test_dependencies/svelte-nested/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"svelte": "src/index.js",
"main": "src/index.js",
"files": [
"src",
"package.json"
"src"
],
"exports": {
"./package.json": "./package.json"
Expand Down
4 changes: 4 additions & 0 deletions packages/e2e-tests/_test_dependencies/svelte-simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"name": "e2e-test-dep-svelte-simple",
"main": "index.js",
"svelte": "index.js",
"files": [
"src",
"index.js"
],
"dependencies": {
"e2e-test-dep-cjs-only": "file:../cjs-only"
},
Expand Down
Loading