Merge branch 'master' into develop

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [3.6.1] - 2023-08-06
+
+### Fixed
+
+- Pin prettier dependency to v2.x for now to avoid build errors
+
+### How to update existing projects
+
+```sh
+$ cd your-project
+$ rm -rf node_modules # Or remove the node_modules folder by hand
+$ rm package-lock.json # Or remove the package-lock.json file by hand
+$ npm install [email protected]
+```
+
 ## [3.6.0] - 2023-06-01
 
 ### New

package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-base",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Provides base components for magpie frontend projects",
   "author": "magpie project",
   "scripts": {
@@ -32,7 +32,6 @@
   },
   "peerDependencies": {
     "@vue/cli-service": "5.x",
-    "babel-eslint": "^10.1.0",
     "csv-loader": "^3.0.5",
     "konva": "^7.2.5",
     "lodash": "^4.17.20",
@@ -48,7 +47,8 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.13.0",
-    "@vue/cli-plugin-eslint": "5.x"
+    "@vue/cli-plugin-eslint": "5.x",
+    "prettier": "2.x"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.6.4",