This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry-site.git
The following commit(s) were added to refs/heads/main by this push:
new 7397ff2c Change Google Analytics to Apache Matomo instance
7397ff2c is described below
commit 7397ff2c39154f213bac088f68e70fd683edbaa0
Author: Dianjin Wang <[email protected]>
AuthorDate: Mon Dec 9 11:55:14 2024 +0800
Change Google Analytics to Apache Matomo instance
As the ASF website checks and the privacy policy, we're not encouraged
to use Google Analytics for our website. So change it to Matomo.
Also, delete the unused Google Anlytics-related modules from the pacakge
list.
---
docusaurus.config.ts | 12 +++++---
package-lock.json | 79 ++++++++++------------------------------------------
package.json | 2 +-
3 files changed, 23 insertions(+), 70 deletions(-)
diff --git a/docusaurus.config.ts b/docusaurus.config.ts
index ddfe57a3..8edf7e5a 100644
--- a/docusaurus.config.ts
+++ b/docusaurus.config.ts
@@ -16,6 +16,7 @@ const config: Config = {
plugins: [
"docusaurus-plugin-sass",
+ 'docusaurus-plugin-matomo',
[
"@easyops-cn/docusaurus-search-local",
{ hashed: true, indexPages: true, language: ["en", "zh"] },
@@ -64,10 +65,6 @@ const config: Config = {
"./src/css/design-class.scss",
],
},
- gtag: {
- trackingID: "G-5RF5B25JHD",
- anonymizeIP: true,
- },
} satisfies Preset.Options,
],
],
@@ -277,6 +274,13 @@ const config: Config = {
theme: prismThemes.github,
darkTheme: prismThemes.dracula,
},
+ // Change website analytics from Google Analytics to Matomo
+ matomo: {
+ matomoUrl: 'https://analytics.apache.org/',
+ siteId: '66',
+ phpLoader: 'matomo.php',
+ jsLoader: 'matomo.js',
+ },
} satisfies Preset.ThemeConfig,
};
diff --git a/package-lock.json b/package-lock.json
index a48f4677..9a99e74b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,6 @@
"dependencies": {
"@docusaurus/core": "^3.1.1",
"@docusaurus/plugin-client-redirects": "^3.5.1",
- "@docusaurus/plugin-google-gtag": "^3.1.1",
"@docusaurus/preset-classic": "^3.1.1",
"@easyops-cn/docusaurus-search-local": "^0.40.1",
"@floating-ui/react": "^0.26.6",
@@ -20,6 +19,7 @@
"ahooks": "^3.7.10",
"clsx": "^2.0.0",
"dayjs": "^1.11.10",
+ "docusaurus-plugin-matomo": "^0.0.8",
"docusaurus-plugin-sass": "^0.2.5",
"lodash-es": "^4.17.21",
"prism-react-renderer": "^2.3.0",
@@ -3720,61 +3720,6 @@
"react-dom": "^18.0.0"
}
},
- "node_modules/@docusaurus/plugin-google-analytics": {
- "version": "3.1.1",
- "resolved":
"https://registry.npmmirror.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.1.1.tgz";,
- "integrity":
"sha512-+q2UpWTqVi8GdlLoSlD5bS/YpxW+QMoBwrPrUH/NpvpuOi0Of7MTotsQf9JWd3hymZxl2uu1o3PIrbpxfeDFDQ==",
- "dependencies": {
- "@docusaurus/core": "3.1.1",
- "@docusaurus/types": "3.1.1",
- "@docusaurus/utils-validation": "3.1.1",
- "tslib": "^2.6.0"
- },
- "engines": {
- "node": ">=18.0"
- },
- "peerDependencies": {
- "react": "^18.0.0",
- "react-dom": "^18.0.0"
- }
- },
- "node_modules/@docusaurus/plugin-google-gtag": {
- "version": "3.1.1",
- "resolved":
"https://registry.npmmirror.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.1.1.tgz";,
- "integrity":
"sha512-0mMPiBBlQ5LFHTtjxuvt/6yzh8v7OxLi3CbeEsxXZpUzcKO/GC7UA1VOWUoBeQzQL508J12HTAlR3IBU9OofSw==",
- "dependencies": {
- "@docusaurus/core": "3.1.1",
- "@docusaurus/types": "3.1.1",
- "@docusaurus/utils-validation": "3.1.1",
- "@types/gtag.js": "^0.0.12",
- "tslib": "^2.6.0"
- },
- "engines": {
- "node": ">=18.0"
- },
- "peerDependencies": {
- "react": "^18.0.0",
- "react-dom": "^18.0.0"
- }
- },
- "node_modules/@docusaurus/plugin-google-tag-manager": {
- "version": "3.1.1",
- "resolved":
"https://registry.npmmirror.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.1.1.tgz";,
- "integrity":
"sha512-d07bsrMLdDIryDtY17DgqYUbjkswZQr8cLWl4tzXrt5OR/T/zxC1SYKajzB3fd87zTu5W5klV5GmUwcNSMXQXA==",
- "dependencies": {
- "@docusaurus/core": "3.1.1",
- "@docusaurus/types": "3.1.1",
- "@docusaurus/utils-validation": "3.1.1",
- "tslib": "^2.6.0"
- },
- "engines": {
- "node": ">=18.0"
- },
- "peerDependencies": {
- "react": "^18.0.0",
- "react-dom": "^18.0.0"
- }
- },
"node_modules/@docusaurus/plugin-sitemap": {
"version": "3.1.1",
"resolved":
"https://registry.npmmirror.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.1.1.tgz";,
@@ -3808,9 +3753,6 @@
"@docusaurus/plugin-content-docs": "3.1.1",
"@docusaurus/plugin-content-pages": "3.1.1",
"@docusaurus/plugin-debug": "3.1.1",
- "@docusaurus/plugin-google-analytics": "3.1.1",
- "@docusaurus/plugin-google-gtag": "3.1.1",
- "@docusaurus/plugin-google-tag-manager": "3.1.1",
"@docusaurus/plugin-sitemap": "3.1.1",
"@docusaurus/theme-classic": "3.1.1",
"@docusaurus/theme-common": "3.1.1",
@@ -5004,11 +4946,6 @@
"@types/send": "*"
}
},
- "node_modules/@types/gtag.js": {
- "version": "0.0.12",
- "resolved":
"https://registry.npmmirror.com/@types/gtag.js/-/gtag.js-0.0.12.tgz";,
- "integrity":
"sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg=="
- },
"node_modules/@types/hast": {
"version": "3.0.3",
"resolved":
"https://registry.npmmirror.com/@types/hast/-/hast-3.0.3.tgz";,
@@ -7095,6 +7032,18 @@
"node": ">=6"
}
},
+ "node_modules/docusaurus-plugin-matomo": {
+ "version": "0.0.8",
+ "resolved":
"https://registry.npmjs.org/docusaurus-plugin-matomo/-/docusaurus-plugin-matomo-0.0.8.tgz";,
+ "integrity":
"sha512-YSaDdjxI7uN1FuNLSGrQy4BmDEXwwyL6vac7GfmS7wFBLck/Ias5jHqENPBHXe36m2cYzyesGPQL1EsS9vanwA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.13.0"
+ },
+ "peerDependencies": {
+ "@docusaurus/core": "^2.0.0-alpha.56 || ^3.0.0"
+ }
+ },
"node_modules/docusaurus-plugin-sass": {
"version": "0.2.5",
"resolved":
"https://registry.npmmirror.com/docusaurus-plugin-sass/-/docusaurus-plugin-sass-0.2.5.tgz";,
@@ -14768,4 +14717,4 @@
"integrity":
"sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="
}
}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index e1e24b27..da87c2f9 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
"dependencies": {
"@docusaurus/core": "^3.1.1",
"@docusaurus/plugin-client-redirects": "^3.5.1",
- "@docusaurus/plugin-google-gtag": "^3.1.1",
"@docusaurus/preset-classic": "^3.1.1",
"@easyops-cn/docusaurus-search-local": "^0.40.1",
"@floating-ui/react": "^0.26.6",
@@ -27,6 +26,7 @@
"ahooks": "^3.7.10",
"clsx": "^2.0.0",
"dayjs": "^1.11.10",
+ "docusaurus-plugin-matomo": "^0.0.8",
"docusaurus-plugin-sass": "^0.2.5",
"lodash-es": "^4.17.21",
"prism-react-renderer": "^2.3.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
