Skip to content

Commit 89ea5e8

Browse files
authored
chore: update pnpm 8 (#618)
* chore: update to pnpm@8 * fix: use correct matrix vars and simplify call * fix: remove engine restrictions for package managers * fix: cleanup included files of internal packages to ensure pnpm@8 adds all files needed by tests * fix: add back engines.pnpm
1 parent 568341e commit 89ea5e8

File tree

12 files changed

+1478
-1565
lines changed

12 files changed

+1478
-1565
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,17 @@ jobs:
8787
with:
8888
node-version: ${{ matrix.node }}
8989
- name: install pnpm
90+
if: matrix.node != 14
9091
shell: bash
9192
run: |
9293
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)
9394
echo installing pnpm version $PNPM_VER
9495
npm i -g pnpm@$PNPM_VER
96+
- name: install legacy pnpm for node14
97+
if: matrix.node == 14
98+
run: |
99+
npm i -g pnpm@^7.32.0
100+
tmppkg="$(jq '.engines.pnpm = "^7.32.0"' package.json)" && echo -E "${tmppkg}" > package.json && tmppkg=""
95101
- uses: actions/setup-node@v3
96102
with:
97103
node-version: ${{ matrix.node }}

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,9 @@
5555
"prettier --write"
5656
]
5757
},
58-
"packageManager": "pnpm@7.30.0",
58+
"packageManager": "pnpm@8.2.0",
5959
"engines": {
60-
"pnpm": "^7.13.0",
61-
"yarn": "forbidden, use pnpm",
62-
"npm": "forbidden, use pnpm",
60+
"pnpm": "^8.2.0",
6361
"node": "^14.18.0 || >= 16"
6462
},
6563
"pnpm": {

packages/e2e-tests/_test_dependencies/cjs-and-esm/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"main": "index.cjs",
66
"module": "index.mjs",
77
"files": [
8-
"package.json",
98
"index.mjs",
109
"index.cjs"
1110
],

packages/e2e-tests/_test_dependencies/cjs-only/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"name": "e2e-test-dep-cjs-only",
55
"main": "index.js",
66
"files": [
7-
"package.json",
87
"index.js"
98
],
109
"type": "commonjs"

packages/e2e-tests/_test_dependencies/esm-only/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"name": "e2e-test-dep-esm-only",
55
"module": "esm.js",
66
"files": [
7-
"package.json",
87
"esm.js"
98
],
109
"exports":{

packages/e2e-tests/_test_dependencies/scss-only/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"name": "e2e-test-dep-scss-only",
55
"main": "main.scss",
66
"files": [
7-
"package.json",
87
"main.scss"
98
],
109
"type": "commonjs"

packages/e2e-tests/_test_dependencies/svelte-api-only/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"main": "index.js",
66
"module": "index.js",
77
"files": [
8-
"package.json",
98
"index.js"
109
],
1110
"exports": {

packages/e2e-tests/_test_dependencies/svelte-exports-simple/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"e2e-test-dep-cjs-only": "file:../cjs-only"
77
},
88
"type": "module",
9+
"files": [
10+
"src",
11+
"index.js"
12+
],
913
"exports": {
1014
"./*": {
1115
"svelte": "./src/components/*"

packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"main": "index.js",
77
"svelte": "index.js",
88
"files": [
9+
"src",
910
"index.js",
10-
"cli.js",
11-
"package.json"
11+
"cli.js"
1212
],
1313
"dependencies": {
1414
"@types/node": "^18.15.11",

packages/e2e-tests/_test_dependencies/svelte-nested/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"svelte": "src/index.js",
66
"main": "src/index.js",
77
"files": [
8-
"src",
9-
"package.json"
8+
"src"
109
],
1110
"exports": {
1211
"./package.json": "./package.json"

packages/e2e-tests/_test_dependencies/svelte-simple/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"name": "e2e-test-dep-svelte-simple",
55
"main": "index.js",
66
"svelte": "index.js",
7+
"files": [
8+
"src",
9+
"index.js"
10+
],
711
"dependencies": {
812
"e2e-test-dep-cjs-only": "file:../cjs-only"
913
},

0 commit comments

Comments
 (0)