Merge pull request #856 from nervosnetwork/develop

Merge v2.47.0 into master

Author: RetricSu

website/docusaurus.config.js

@@ -19,6 +19,19 @@ const config = {
   organizationName: "nervosnetwork",
   projectName: "docs-new",
   headTags: [
+    ...(enableGtag
+      ? [
+          {
+            tagName: "script",
+            attributes: {
+              defer: "true",
+              src: "https://umami.retric.uk/script.js",
+              "data-website-id": "f5709da4-2855-4563-9d49-b0cbbf1fb615",
+              "data-domains": "docs.nervos.org",
+            },
+          },
+        ]
+      : []),
     {
       tagName: "meta",
       attributes: {
@@ -172,6 +185,26 @@ const config = {
             from: "/docs/basics/concepts/economics",
             to: "/docs/assets-token-standards/economics",
           },
+          {
+            from: "/docs/basics/concepts/cell-model",
+            to: "/docs/ckb-fundamentals/cell-model",
+          },
+          {
+            from: "/docs/basics/concepts/ckb-vm",
+            to: "/docs/ckb-fundamentals/ckb-vm",
+          },
+          {
+            from: "/docs/basics/concepts/consensus",
+            to: "/docs/ckb-fundamentals/consensus",
+          },
+          {
+            from: "/docs/basics/concepts/cryptowallet",
+            to: "/docs/integrate-wallets/intro-to-wallets",
+          },
+          {
+            from: "/docs/basics/concepts/nervos-blockchain",
+            to: "/docs/ckb-fundamentals/nervos-blockchain",
+          },
           {
             from: "/docs/basics/glossary/",
             to: "/docs/tech-explanation/glossary",

website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs.nervos.org",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "Official docs website for Nervos CKB",
   "license": "MIT",
   "scripts": {

website/src/components/AnalyticsTracking/utils.ts

@@ -112,21 +112,21 @@ export function sendAnalyticsEvent(
   eventName: string,
   params: AnalyticsEventParams
 ): void {
-  if (
-    typeof window === "undefined" ||
-    typeof window.gtag !== "function" ||
-    isLocalAnalyticsHost()
-  ) {
+  if (typeof window === "undefined" || isLocalAnalyticsHost()) {
     return;
   }
 
-  window.gtag(
-    "event",
-    eventName,
-    Object.fromEntries(
-      Object.entries(params).filter(([, value]) => value !== undefined)
-    )
+  const eventParams = Object.fromEntries(
+    Object.entries(params).filter(([, value]) => value !== undefined)
   );
+
+  if (typeof window.gtag === "function") {
+    window.gtag("event", eventName, eventParams);
+  }
+
+  if (typeof window.umami?.track === "function") {
+    window.umami.track(eventName, eventParams);
+  }
 }
 
 export function getLlmsFileName(value: string): string | undefined {

website/src/global.d.ts

@@ -1,3 +1,6 @@
 declare interface Window {
   gtag?: (...args: any[]) => void;
+  umami?: {
+    track: (eventName: string, data?: Record<string, unknown>) => void;
+  };
 }