Merge branch 'master' into fix/cluster-settings-layout

.github/workflows/test.yml

@@ -37,14 +37,24 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - run: make node_modules
+      - uses: nick-invision/retry@v2
         name: Install dependencies
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          retry_on: error
+          command: make node_modules
 
       - run: make build-npm
         name: Generate npm package
 
-      - run: make -j2 build-extensions
+      - uses: nick-invision/retry@v2
         name: Build bundled extensions
+        with:
+          timeout_minutes: 15
+          max_attempts: 3
+          retry_on: error
+          command: make -j2 build-extensions
 
       - run: make test
         name: Run tests

package.json

@@ -217,7 +217,7 @@
     "jsonpath": "^1.0.2",
     "lodash": "^4.17.15",
     "mac-ca": "^1.0.4",
-    "marked": "^1.2.7",
+    "marked": "^2.0.3",
     "md5-file": "^5.0.0",
     "mobx": "^5.15.7",
     "mobx-observable-history": "^1.0.3",

yarn.lock

@@ -9144,10 +9144,10 @@ marked@^0.8.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.8.2.tgz#4faad28d26ede351a7a1aaa5fec67915c869e355"
   integrity sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==
 
-marked@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb"
-  integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==
+marked@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.3.tgz#3551c4958c4da36897bda2a16812ef1399c8d6b0"
+  integrity sha512-5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA==
 
 matcher@^3.0.0:
   version "3.0.0"