merge devel

Author: usu

.ops/aws-setup/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - AWS_DEFAULT_REGION=eu-west-3
 
   aws-cli:
-    image: amazon/aws-cli:2.16.9
+    image: amazon/aws-cli:2.16.10
     container_name: 'ecamp3-aws-cli'
     volumes:
       - ./.aws:/root/.aws:delegated

.ops/aws-setup/package-lock.json

@@ -12,11 +12,11 @@
     "dependencies": {
         "@pulumi/pulumi": "3.120.0",
         "@pulumi/aws": "6.40.0",
-        "@pulumi/awsx": "2.12.0"
+        "@pulumi/awsx": "2.12.1"
     },
     "devDependencies": {
         "@babel/eslint-parser": "7.24.7",
-        "@types/node": "20.14.2",
+        "@types/node": "20.14.4",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",

.ops/aws-setup/package.json

@@ -1,15 +1,15 @@
 dependencies:
 - name: oauth2-proxy
   repository: https://oauth2-proxy.github.io/manifests
-  version: 7.7.3
+  version: 7.7.4
 - name: kubernetes-dashboard
   repository: https://kubernetes.github.io/dashboard/
   version: 7.5.0
 - name: oauth2-proxy
   repository: https://oauth2-proxy.github.io/manifests
-  version: 7.7.3
+  version: 7.7.4
 - name: oauth2-proxy
   repository: https://oauth2-proxy.github.io/manifests
-  version: 7.7.3
-digest: sha256:1b68a6f629fcc53136c241850e648530e0388b2cfbe438fbdf83362f04e5fcfd
-generated: "2024-06-15T12:45:27.838231313Z"
+  version: 7.7.4
+digest: sha256:2ee0b02c03a2eecbb479ff1784b4a0a9303b310c9c7c4ff07dbf67e3c98499ed
+generated: "2024-06-16T14:15:29.84758032Z"

.ops/ops-dashboard/Chart.lock

@@ -26,16 +26,16 @@ appVersion: 0.1.0
 dependencies:
   - name: oauth2-proxy
     alias: grafana-proxy
-    version: 7.7.3
+    version: 7.7.4
     repository: https://oauth2-proxy.github.io/manifests
   - name: kubernetes-dashboard
     version: 7.5.0
     repository: https://kubernetes.github.io/dashboard/
   - name: oauth2-proxy
     alias: kubernetes-dashboard-proxy
-    version: 7.7.3
+    version: 7.7.4
     repository: https://oauth2-proxy.github.io/manifests
   - name: oauth2-proxy
     alias: logging-proxy
-    version: 7.7.3
+    version: 7.7.4
     repository: https://oauth2-proxy.github.io/manifests

.ops/ops-dashboard/Chart.yaml

@@ -48,15 +48,15 @@
         "symfony/yaml": "7.1.1",
         "twig/cssinliner-extra": "^3.4",
         "twig/extra-bundle": "^3.4",
-        "webonyx/graphql-php": "15.12.1"
+        "webonyx/graphql-php": "15.12.3"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "3.58.1",
         "hautelook/alice-bundle": "2.13.0",
         "justinrainbow/json-schema": "5.2.13",
         "php-coveralls/php-coveralls": "2.7.0",
         "phpspec/prophecy-phpunit": "2.2",
-        "phpstan/phpstan": "1.11.4",
+        "phpstan/phpstan": "1.11.5",
         "phpunit/phpunit": "10.5.21",
         "rector/rector": "1.1.0",
         "spatie/phpunit-snapshot-assertions": "5.1.6",
@@ -156,4 +156,4 @@
             }
         }
     }
-}
+}

api/composer.json

@@ -68,7 +68,7 @@
     "slugify": "1.6.6",
     "url-template": "3.1.1",
     "util": "0.12.5",
-    "uuid": "9.0.1",
+    "uuid": "10.0.0",
     "v-resize-observer": "2.1.0",
     "vee-validate": "3.4.15",
     "vue": "2.7.15",

api/composer.lock

@@ -1,5 +1,11 @@
 <template>
-  <div class="editor" :class="{ 'editor--editable': editable }">
+  <div
+    class="editor"
+    :class="{
+      'editor--editable': editable,
+      'editor--link-cursor': hoverCursor,
+    }"
+  >
     <bubble-menu
       v-if="withExtensions"
       ref="bubbleMenu"
@@ -185,6 +191,7 @@ export default {
     }
 
     return {
+      hoverCursor: false,
       editor: new Editor({
         extensions: extensions,
         content: this.value,
@@ -259,13 +266,29 @@ export default {
       })
     },
   },
+  mounted() {
+    document.addEventListener('keydown', this.specialKeyListeners, { passive: true })
+    document.addEventListener('keyup', this.specialKeyListeners, { passive: true })
+    document.addEventListener('contextmenu', this.specialMenuListeners, { passive: true })
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.specialKeyListeners)
+    document.removeEventListener('keyup', this.specialKeyListeners)
+    document.removeEventListener('contextmenu', this.specialMenuListeners)
+  },
   methods: {
     focus() {
       this.editor.commands.focus()
     },
     onUpdate() {
       this.$emit('input', this.html)
     },
+    specialKeyListeners(event) {
+      this.hoverCursor = event.metaKey || event.ctrlKey
+    },
+    specialMenuListeners() {
+      this.hoverCursor = false
+    },
   },
 }
 </script>
@@ -364,4 +387,7 @@ div.editor:deep(.editor__content .ProseMirror li p:not(:last-child)) {
 .editor.editor--editable:deep(.autolink) {
   cursor: text;
 }
+.editor.editor--link-cursor:deep(.autolink) {
+  cursor: pointer;
+}
 </style>