Merge branch 'release/4.2.0.2' into main

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - develop
       - v3
-      - 4.2
   pull_request:
 concurrency:
   group: ci-${{ github.ref }}

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release Notes for Craft CMS 4
 
+## 4.2.0.2 - 2022-07-27
+
+### Fixed
+- Fixed a bug where `Garnish.uiShortcutManager` was getting double-instantiated, causing some keyboard shortcuts to be triggered multiple times.
+- Fixed a JavaScript error that occurred when switching sites in the control panel. ([#11709](https://github.com/craftcms/cms/issues/11709))
+- Fixed a bug where some config settings set via fluent setters weren’t getting normalized.
+- Fixed a bug where the database connection DSN string wasn’t getting built properly when the connection settings were set via fluent setters.
+
 ## 4.2.0.1 - 2022-07-26
 
 ### Fixed

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "prebuild": "npm run fix-prettier",
     "build": "webpack --node-env=production --progress",
+    "dev": "webpack --node-env=production --progress",
     "serve": "webpack-dev-server --node-env=development",
     "check-prettier": "prettier --check .",
     "fix-prettier": "prettier --write ."
@@ -55,7 +56,7 @@
     "typescript": "^4.7.4",
     "v-tooltip": "^2.0.3",
     "velocity-animate": "^1.5.0",
-    "vue": "^2.7.2",
+    "vue": "^2.6.14",
     "vue-autosuggest": "^2.2.0",
     "vue-awesome-swiper": "^4.1.1",
     "vue-cleave": "^1.2.2",