From c84da578a09dfe6877ad63da19d500a63e40b9bd Mon Sep 17 00:00:00 2001 From: tobinio Date: Thu, 10 Jul 2025 16:28:41 +0200 Subject: [PATCH] move to nuxt-umami module --- app/composables/useTracking.ts | 9 --------- app/pages/charts.vue | 1 - app/pages/index.vue | 1 - bun.lock | 5 +++++ nuxt.config.ts | 10 ++++++++-- package.json | 1 + server/routes/tracking.js.ts | 5 ----- 7 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 app/composables/useTracking.ts delete mode 100644 server/routes/tracking.js.ts diff --git a/app/composables/useTracking.ts b/app/composables/useTracking.ts deleted file mode 100644 index 488713c..0000000 --- a/app/composables/useTracking.ts +++ /dev/null @@ -1,9 +0,0 @@ -export function useTracking() { - const config = useRuntimeConfig(); - useScriptUmamiAnalytics({ - websiteId: config.public.umamiId as string, - scriptInput: { - src: "/tracking.js", - }, - }); -} diff --git a/app/pages/charts.vue b/app/pages/charts.vue index 2b4821c..3ce0758 100644 --- a/app/pages/charts.vue +++ b/app/pages/charts.vue @@ -2,7 +2,6 @@ useHead({ title: "Modrinth Statistics", }); -useTracking(); const projectType = useFilterItem("projectType", "mod"); const stat = useFilterItem("stat", "count"); diff --git a/app/pages/index.vue b/app/pages/index.vue index 564f763..1c25860 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -2,7 +2,6 @@ useHead({ title: "Modrinth Statistics", }); -useTracking(); const { data } = useFetch("/api/stats/global"); diff --git a/bun.lock b/bun.lock index 97da465..86d88b7 100644 --- a/bun.lock +++ b/bun.lock @@ -9,6 +9,7 @@ "consola": "^3.4.2", "mongodb": "^6.17.0", "nuxt": "^3.17.6", + "nuxt-umami": "^3.2.0", "vue": "^3.5.17", "vue-chartjs": "^5.3.2", "vue-router": "^4.5.1", @@ -1228,6 +1229,8 @@ "nuxt-site-config-kit": ["nuxt-site-config-kit@3.2.2", "", { "dependencies": { "@nuxt/kit": "^3.17.5", "pkg-types": "^2.1.0", "site-config-stack": "3.2.2", "std-env": "^3.9.0", "ufo": "^1.6.1" } }, "sha512-SmTBVm6JQd5zHBy04/qn0gWo3rg1HTRGT/H91hxk/o+mDB3ll+TkzpZekD46RUBO/AD02ArLG5n2ndu6zhWsHA=="], + "nuxt-umami": ["nuxt-umami@3.2.0", "", { "dependencies": { "@nuxt/kit": "^3.15.4", "request-ip": "^3.3.0" } }, "sha512-fqX5tX+2P/5J0fES3C7ykJP6H4bcP8fJzYZP7UcIW0ibwuLRbBzTRDdCd7gEkaXB0nABpSfKlCVInhMcIs07GA=="], + "nypm": ["nypm@0.6.0", "", { "dependencies": { "citty": "^0.1.6", "consola": "^3.4.0", "pathe": "^2.0.3", "pkg-types": "^2.0.0", "tinyexec": "^0.3.2" }, "bin": { "nypm": "dist/cli.mjs" } }, "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg=="], "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], @@ -1440,6 +1443,8 @@ "replace-in-file": ["replace-in-file@6.3.5", "", { "dependencies": { "chalk": "^4.1.2", "glob": "^7.2.0", "yargs": "^17.2.1" }, "bin": { "replace-in-file": "bin/cli.js" } }, "sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg=="], + "request-ip": ["request-ip@3.3.0", "", {}, "sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA=="], + "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], "require-package-name": ["require-package-name@2.0.1", "", {}, "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q=="], diff --git a/nuxt.config.ts b/nuxt.config.ts index e905368..3553bad 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,5 +1,3 @@ -// https://nuxt.com/docs/api/configuration/nuxt-config - const simple_types = ["projects", "versions", "authors", "files", "revenue"]; const project_types = [ "mod", @@ -38,6 +36,13 @@ export default defineNuxtConfig({ umamiId: process.env.UMAMI_ID, }, }, + umami: { + id: process.env.UMAMI_ID, + host: "https://cloud.umami.is", + autoTrack: true, + ignoreLocalhost: true, + proxy: "cloak", + }, app: { head: { link: [{ rel: "icon", type: "image/svg+xml", href: "/favicon.svg" }], @@ -108,6 +113,7 @@ export default defineNuxtConfig({ "@vueuse/nuxt", "@nuxtjs/sitemap", "@nuxt/scripts", + "nuxt-umami", ], compatibilityDate: "2024-07-05", }); diff --git a/package.json b/package.json index cd101d2..73d55d1 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "consola": "^3.4.2", "mongodb": "^6.17.0", "nuxt": "^3.17.6", + "nuxt-umami": "^3.2.0", "vue": "^3.5.17", "vue-chartjs": "^5.3.2", "vue-router": "^4.5.1" diff --git a/server/routes/tracking.js.ts b/server/routes/tracking.js.ts deleted file mode 100644 index 7c123a2..0000000 --- a/server/routes/tracking.js.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default defineEventHandler(async (event): Promise => { - const scriptText = await fetch("https://cloud.umami.is/script.js"); - setHeader(event, "Content-Type", "application/javascript"); - return await scriptText.text(); -}); -- 2.54.0