chore: upgrade to pnpm 7 (#325)

* chore: upgrade to pnpm 7

- change pnpm engines version to v7
- remove outdated pnpm overrides
- update GitHub Actions to run with pnpm v7
- update pre-commit hook to use locally installed lint-staged rather than pnpx one
- change occurrences of "pnpm run" to shorter "pnpm"
- install missing svelte peer dependency for ts-type-import package

* fix .editorconfig configuration to include nested package.json

* fix: heal lockfile with changes to package.json after rebase; update svelte version to match others

* fix: update editorconfig to always use space ident in all READMEs

* fix: remove extra -- from test server start scripts

* fix: remove preferLocal, it somehow selected pnpm6 for me locally

* fix: remove use of pnpx --no

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

Co-authored-by: dominikg <dominik.goepel@gmx.de>
Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

Author: 3 people

.editorconfig

@@ -8,6 +8,5 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 
-[{package.json, README.md, docs/**/*.md}]
+[{**/package.json, **/README.md, docs/**/*.md}]
 indent_style = space
-

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm i -g pnpm@6
+      - run: npm i -g pnpm@7
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
@@ -37,10 +37,10 @@ jobs:
         run: pnpm install --frozen-lockfile --prefer-offline --ignore-scripts
       - name: build
         id: build
-        run: pnpm run build
+        run: pnpm build
       - name: lint
         if: (${{ success() }} || ${{ failure() }})
-        run: pnpm run lint
+        run: pnpm lint
       - name: audit
         if: (${{ success() }} || ${{ failure() }})
         run: pnpm audit
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm i -g pnpm@6
+      - run: npm i -g pnpm@7
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
@@ -74,7 +74,7 @@ jobs:
       - name: install
         run: pnpm install --frozen-lockfile --prefer-offline --ignore-scripts
       - name: build
-        run: pnpm run build:ci
+        run: pnpm build:ci
       - name: run tests
         run: pnpm test:ci
       - name: archive tests temp directory

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm i -g pnpm@6
+      - run: npm i -g pnpm@7
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpx --no-install lint-staged --concurrent false
+pnpm lint-staged --concurrent false

CONTRIBUTING.md

@@ -77,8 +77,8 @@ Please make sure the following is done when submitting a pull request:
 
 1. Fork [the repository](https://github.com/sveltejs/vite-plugin-svelte) and create your branch from `main`.
 1. Describe your **test plan** in your pull request description. Make sure to test your changes.
-1. Make sure your code lints (`pnpm run lint`).
-1. Make sure your tests pass (`pnpm run test`).
+1. Make sure your code lints (`pnpm lint`).
+1. Make sure your tests pass (`pnpm test`).
 
 All pull requests should be opened against the `main` branch.
 
@@ -109,7 +109,7 @@ The core Svelte team will be monitoring for pull requests. Do help us by making
 
 ## Style guide
 
-[Eslint](https://eslint.org) will catch most styling issues that may exist in your code. You can check the status of your code styling by simply running `pnpm run lint`.
+[Eslint](https://eslint.org) will catch most styling issues that may exist in your code. You can check the status of your code styling by simply running `pnpm lint`.
 
 ## License
 

package.json

@@ -14,11 +14,11 @@
     "test:ci:serve": "cross-env VITE_PRESERVE_BUILD_ARTIFACTS=1 jest --verbose --no-cache --runInBand --force-exit --ci --json --outputFile=\"temp/serve/jest-results.json\"",
     "test:ci:build": "cross-env VITE_TEST_BUILD=1 VITE_PRESERVE_BUILD_ARTIFACTS=1 jest --verbose --no-cache --runInBand --force-exit --ci --json --outputFile=\"temp/build/jest-results.json\"",
     "lint": "eslint --ignore-path .gitignore '**/*.{js,ts,svelte,html,svx,md}'",
-    "lint:fix": "pnpm run lint -- --fix",
+    "lint:fix": "pnpm lint --fix",
     "format": "prettier --ignore-path .gitignore '**/*.{css,scss,svelte,html,js,ts,svx,md}' --check",
-    "format:fix": "pnpm run format -- --write",
+    "format:fix": "pnpm format --write",
     "fixup": "run-s lint:fix format:fix",
-    "release": "pnpm run build && pnpx --no changeset publish",
+    "release": "pnpm build && pnpm changeset publish",
     "prepare": "husky install"
   },
   "devDependencies": {
@@ -65,16 +65,14 @@
     ]
   },
   "engines": {
-    "pnpm": "^6.32.0",
+    "pnpm": "^7.0.0",
     "yarn": "forbidden, use pnpm",
     "npm": "forbidden, use pnpm",
     "node": "^14.13.1 || >= 16"
   },
   "pnpm": {
     "overrides": {
-      "@sveltejs/vite-plugin-svelte": "workspace:*",
-      "ansi-regex@>2.1.1 <5.0.1": "^5.0.1",
-      "node-fetch@2": "^2.6.7"
+      "@sveltejs/vite-plugin-svelte": "workspace:*"
     }
   }
 }

packages/e2e-tests/e2e-server.js

@@ -80,7 +80,6 @@ exports.serve = async function serve(root, isBuild, port) {
 
 		try {
 			const buildProcess = execa('pnpm', ['build'], {
-				preferLocal: true,
 				cwd: root,
 				stdio: 'pipe'
 			});
@@ -103,8 +102,7 @@ exports.serve = async function serve(root, isBuild, port) {
 		}
 	}
 
-	const serverProcess = execa('pnpm', [isBuild ? 'preview' : 'dev', '--', '--port', port], {
-		preferLocal: true,
+	const serverProcess = execa('pnpm', [isBuild ? 'preview' : 'dev', '--port', port], {
 		cwd: root,
 		stdio: 'pipe'
 	});

packages/e2e-tests/ts-type-import/package.json

@@ -11,6 +11,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "@tsconfig/svelte": "^3.0.0",
     "@types/node": "^17.0.21",
+    "svelte": "^3.48.0",
     "svelte-preprocess": "^4.10.6",
     "vite": "^2.9.8"
   }

packages/vite-plugin-svelte/package.json

@@ -23,9 +23,9 @@
     "./src/ui/*": "./src/ui/*"
   },
   "scripts": {
-    "dev": "pnpm run build:ci -- --sourcemap --watch src",
+    "dev": "pnpm build:ci --sourcemap --watch src",
     "build:ci": "rimraf dist && tsup-node src/index.ts --format esm,cjs --no-splitting --target node14",
-    "build": "pnpm run build:ci -- --dts --sourcemap"
+    "build": "pnpm build:ci --dts --sourcemap"
   },
   "engines": {
     "node": "^14.13.1 || >= 16"