Merge branch 'main' into feature-oidc-authenticate

package.json

@@ -52,7 +52,10 @@
     "cryptiles": "~4.1.2",
     "prismjs": "~1.21.0",
     "npm-user-validate": "^1.0.1",
-    "caniuse-lite": "^1.0.30001157"
+    "caniuse-lite": "^1.0.30001157",
+    "immer": "^8.0.1",
+    "node-notifier": "^8.0.1",
+    "highlight.js": "^10.4.1"
   },
   "config": {
     "commitizen": {

ui/desktop/electron-app/config/forge.config.js

@@ -45,7 +45,7 @@ module.exports = {
       config: {
         title: "Boundary",
         name: "boundary-desktop",
-        icon: "./config/macos/icon.icns",
+        icon: "./config/macos/disk.icns",
         background: "./config/macos/background.png"
       }
     }

ui/desktop/electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktop",
-  "productName": "desktop",
+  "productName": "Boundary Desktop",
   "version": "0.0.0",
   "private": true,
   "description": "Electron UI for client for Boundary.",
@@ -34,5 +34,8 @@
     "decompress": "^4.2.1",
     "devtron": "^1.4.0",
     "electron": "10.2.0"
+  },
+  "resolutions": {
+    "highlight.js": "^10.4.1"
   }
 }

ui/desktop/electron-app/yarn.lock

@@ -1656,10 +1656,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-highlight.js@^9.3.0:
-  version "9.18.5"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
-  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
+highlight.js@^10.4.1, highlight.js@^9.3.0:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz#0073aa71d566906965ba6e1b7be7b2682f5e18b6"
+  integrity sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"