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
sveltejs · Apr 16, 2023 · 89ea5e8 · 89ea5e8
1 parent 568341e
commit 89ea5e8
Show file tree

Hide file tree

Showing 12 changed files with 1,478 additions and 1,565 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
+        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 }}

diff --git a/package.json b/package.json
@@ -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",
+    "pnpm": "^8.2.0",
     "node": "^14.18.0 || >= 16"
   },
   "pnpm": {

diff --git a/packages/e2e-tests/_test_dependencies/cjs-and-esm/package.json b/packages/e2e-tests/_test_dependencies/cjs-and-esm/package.json
@@ -5,7 +5,6 @@
   "main": "index.cjs",
   "module": "index.mjs",
   "files": [
-    "package.json",
     "index.mjs",
     "index.cjs"
   ],

diff --git a/packages/e2e-tests/_test_dependencies/cjs-only/package.json b/packages/e2e-tests/_test_dependencies/cjs-only/package.json
@@ -4,7 +4,6 @@
   "name": "e2e-test-dep-cjs-only",
   "main": "index.js",
   "files": [
-    "package.json",
     "index.js"
   ],
   "type": "commonjs"

diff --git a/packages/e2e-tests/_test_dependencies/esm-only/package.json b/packages/e2e-tests/_test_dependencies/esm-only/package.json
@@ -4,7 +4,6 @@
   "name": "e2e-test-dep-esm-only",
   "module": "esm.js",
   "files": [
-    "package.json",
     "esm.js"
   ],
   "exports":{

diff --git a/packages/e2e-tests/_test_dependencies/scss-only/package.json b/packages/e2e-tests/_test_dependencies/scss-only/package.json
@@ -4,7 +4,6 @@
   "name": "e2e-test-dep-scss-only",
   "main": "main.scss",
   "files": [
-    "package.json",
     "main.scss"
   ],
   "type": "commonjs"

diff --git a/packages/e2e-tests/_test_dependencies/svelte-api-only/package.json b/packages/e2e-tests/_test_dependencies/svelte-api-only/package.json
@@ -5,7 +5,6 @@
   "main": "index.js",
   "module": "index.js",
   "files": [
-    "package.json",
     "index.js"
   ],
   "exports": {

diff --git a/packages/e2e-tests/_test_dependencies/svelte-exports-simple/package.json b/packages/e2e-tests/_test_dependencies/svelte-exports-simple/package.json
@@ -6,6 +6,10 @@
     "e2e-test-dep-cjs-only": "file:../cjs-only"
   },
   "type": "module",
+  "files": [
+    "src",
+    "index.js"
+  ],
 	"exports": {
 		"./*": {
 			"svelte": "./src/components/*"

diff --git a/packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json b/packages/e2e-tests/_test_dependencies/svelte-hybrid/package.json
@@ -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",

diff --git a/packages/e2e-tests/_test_dependencies/svelte-nested/package.json b/packages/e2e-tests/_test_dependencies/svelte-nested/package.json
@@ -5,8 +5,7 @@
   "svelte": "src/index.js",
   "main": "src/index.js",
   "files": [
-    "src",
-    "package.json"
+    "src"
   ],
   "exports": {
     "./package.json": "./package.json"

diff --git a/packages/e2e-tests/_test_dependencies/svelte-simple/package.json b/packages/e2e-tests/_test_dependencies/svelte-simple/package.json
@@ -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"
   },