Merge branch 'develop' into mkjs-n

2023-05-29 13:05:52 +00:00 · 2023-05-29 13:05:52 +00:00 · 9ce6f99cad
parent d647df7f63 3c07d3fc08
commit 9ce6f99cad
2 changed files with 6 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.5.1",
+	"packageManager": "pnpm@8.6.0",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

 overrides:
  chokidar: 3.5.3