Merge branch 'develop' into intelligentAutoSync

* develop:
  Mermaid 10.7.0
  Add UTM tags
  build: update Browserslist db

package.json

@@ -75,7 +75,7 @@
     "dayjs": "^1.11.7",
     "js-base64": "3.7.5",
     "lodash-es": "^4.17.21",
-    "mermaid": "10.6.1",
+    "mermaid": "10.7.0",
     "monaco-editor": "0.45.0",
     "pako": "2.1.0",
     "plausible-tracker": "^0.3.8",

src/lib/util/promos/Jan2024.svelte

@@ -1,15 +1,25 @@
 <script lang="ts">
-  const taglines = [
-    'Try diagramming with ChatGPT at Mermaid Chart',
-    "Try Mermaid's Visual Editor at Mermaid Chart",
-    'Enjoy live collaboration with teammates at Mermaid Chart'
-  ];
+  const taglines = {
+    announcement_bar_ai_diagramming: 'Try diagramming with ChatGPT at Mermaid Chart',
+    announcement_bar_visual_editor: "Try Mermaid's Visual Editor at Mermaid Chart",
+    announcement_bar_live_collaboration: 'Enjoy live collaboration with teammates at Mermaid Chart'
+  };
+  const taglineKeys = Object.keys(taglines);
+  const taglineKey = taglineKeys[Math.floor(Math.random() * taglineKeys.length)];
+  const tagline = taglines[taglineKey];
+  const url =
+    'https://www.mermaidchart.com/?' +
+    new URLSearchParams({
+      utm_source: 'mermaid_live_editor',
+      utm_medium: taglineKey,
+      utm_campaign: 'promo_2024'
+    }).toString();
 </script>
 
 <a
-  href="https://www.mermaidchart.com/"
+  href={url}
   target="_blank"
   class="flex flex-grow justify-center gap-6 align-middle tracking-wide">
-  {taglines[Math.floor(Math.random() * taglines.length)]}
+  {tagline}
   <button class="rounded bg-gray-800 p-1 px-4 text-sm font-light">Try it now</button>
 </a>

src/lib/util/promos/promo.ts

@@ -14,7 +14,7 @@ const promotions: Promotion[] = [
   {
     id: 'holiday-2023',
     startDate: new Date('2023-11-27'),
-    endDate: new Date('2024-01-9'),
+    endDate: new Date('2024-01-09'),
     component: Holiday2023
   },
   {

yarn.lock

@@ -1220,14 +1220,9 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538:
-  version "1.0.30001572"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001572.tgz"
-  integrity sha512-1Pbh5FLmn5y4+QhNyJE9j3/7dK44dGB83/ZMjv/qJk86TvDbjk0LosiZo0i0WB0Vx607qMX9jYrn1VLHCkN4rw==
-
-caniuse-lite@^1.0.30001565:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001565:
   version "1.0.30001576"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz#893be772cf8ee6056d6c1e2d07df365b9ec0a5c4"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz"
   integrity sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==
 
 caseless@~0.12.0:
@@ -2297,10 +2292,10 @@ electron-to-chromium@^1.4.601:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.628.tgz#97cefa4b2356d981875f19639885e4fc50ce6e82"
   integrity sha512-2k7t5PHvLsufpP6Zwk0nof62yLOsCf032wZx7/q0mv8gwlXjhcxI3lz6f0jBr0GrnWKcm3burXzI3t5IrcdUxw==
 
-elkjs@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e"
-  integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==
+elkjs@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.1.tgz#fd1524b3f0bed72dc65ba107ae91bcf04b5582bd"
+  integrity sha512-JWKDyqAdltuUcyxaECtYG6H4sqysXSLeoXuGUBfRNESMTkj+w+qdb0jya8Z/WI0jVd03WQtCGhS6FOFtlhD5FQ==
 
 emoji-regex@^10.3.0:
   version "10.3.0"
@@ -3946,10 +3941,10 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mermaid@10.6.1:
-  version "10.6.1"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.6.1.tgz#701f4160484137a417770ce757ce1887a98c00fc"
-  integrity sha512-Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A==
+mermaid@10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.7.0.tgz#4fd5bfd60c0c5e5c42016a82905f06c4684ec53b"
+  integrity sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ==
   dependencies:
     "@braintree/sanitize-url" "^6.0.1"
     "@types/d3-scale" "^4.0.3"
@@ -3962,7 +3957,7 @@ mermaid@10.6.1:
     dagre-d3-es "7.0.10"
     dayjs "^1.11.7"
     dompurify "^3.0.5"
-    elkjs "^0.8.2"
+    elkjs "^0.9.0"
     khroma "^2.0.0"
     lodash-es "^4.17.21"
     mdast-util-from-markdown "^1.3.0"