From 9b6f2ecf42a5b8304930e1ca5e4b25be01840fa7 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 10 Jun 2023 01:20:48 +0530 Subject: [PATCH 1/2] feat: Add plausible --- .../src/docs/.vitepress/theme/index.ts | 7 ++ packages/mermaid/src/docs/package.json | 1 + pnpm-lock.yaml | 82 ++++++++++++++++--- 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/packages/mermaid/src/docs/.vitepress/theme/index.ts b/packages/mermaid/src/docs/.vitepress/theme/index.ts index 7a2b033ea..a9c11fdb9 100644 --- a/packages/mermaid/src/docs/.vitepress/theme/index.ts +++ b/packages/mermaid/src/docs/.vitepress/theme/index.ts @@ -9,6 +9,13 @@ import HomePage from '../components/HomePage.vue'; import { getRedirect } from './redirect.js'; import { h } from 'vue'; +import Plausible from 'plausible-tracker'; +// All tracked stats are public and available at https://p.mermaid.live/mermaid.js.org +const { enableAutoPageviews } = Plausible({ + apiHost: 'https://p.mermaid.live', +}); +enableAutoPageviews(); + import Theme from 'vitepress/theme'; import '../style/main.css'; import 'uno.css'; diff --git a/packages/mermaid/src/docs/package.json b/packages/mermaid/src/docs/package.json index aeb3d24f3..64b7b4823 100644 --- a/packages/mermaid/src/docs/package.json +++ b/packages/mermaid/src/docs/package.json @@ -16,6 +16,7 @@ "dependencies": { "@vueuse/core": "^10.1.0", "jiti": "^1.18.2", + "plausible-tracker": "^0.3.8", "vue": "^3.2.47" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f88fda3ee..91a103ce5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -391,6 +391,9 @@ importers: jiti: specifier: ^1.18.2 version: 1.18.2 + plausible-tracker: + specifier: ^0.3.8 + version: 0.3.8 vue: specifier: ^3.2.47 version: 3.2.47 @@ -435,6 +438,61 @@ importers: specifier: ^6.5.4 version: 6.5.4 + packages/mermaid/src/vitepress: + dependencies: + '@vueuse/core': + specifier: ^10.1.0 + version: 10.1.0(vue@3.2.47) + jiti: + specifier: ^1.18.2 + version: 1.18.2 + vue: + specifier: ^3.2.47 + version: 3.2.47 + vue-plausible: + specifier: ^1.3.2 + version: 1.3.2 + devDependencies: + '@iconify-json/carbon': + specifier: ^1.1.16 + version: 1.1.16 + '@unocss/reset': + specifier: ^0.52.0 + version: 0.52.0 + '@vite-pwa/vitepress': + specifier: ^0.0.5 + version: 0.0.5(vite-plugin-pwa@0.15.0) + '@vitejs/plugin-vue': + specifier: ^4.2.1 + version: 4.2.1(vite@4.3.3)(vue@3.2.47) + fast-glob: + specifier: ^3.2.12 + version: 3.2.12 + https-localhost: + specifier: ^4.7.1 + version: 4.7.1 + pathe: + specifier: ^1.1.0 + version: 1.1.0 + unocss: + specifier: ^0.52.0 + version: 0.52.0(postcss@8.4.23)(rollup@2.79.1)(vite@4.3.3) + unplugin-vue-components: + specifier: ^0.24.1 + version: 0.24.1(rollup@2.79.1)(vue@3.2.47) + vite: + specifier: ^4.3.3 + version: 4.3.3(@types/node@18.16.0) + vite-plugin-pwa: + specifier: ^0.15.0 + version: 0.15.0(vite@4.3.3)(workbox-build@6.5.4)(workbox-window@6.5.4) + vitepress: + specifier: 1.0.0-beta.1 + version: 1.0.0-beta.1(@algolia/client-search@4.14.2)(@types/node@18.16.0) + workbox-window: + specifier: ^6.5.4 + version: 6.5.4 + tests/webpack: dependencies: '@mermaid-js/mermaid-example-diagram': @@ -1209,7 +1267,7 @@ packages: gensync: 1.0.0-beta.2 json5: 2.2.1 lodash: 4.17.21 - resolve: 1.22.1 + resolve: 1.22.2 semver: 5.7.1 source-map: 0.5.7 transitivePeerDependencies: @@ -1465,13 +1523,6 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser@7.21.2: - resolution: {integrity: sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.21.2 - /@babel/parser@7.21.8: resolution: {integrity: sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==} engines: {node: '>=6.0.0'} @@ -4773,7 +4824,7 @@ packages: /@vue/compiler-sfc@3.2.47: resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==} dependencies: - '@babel/parser': 7.21.2 + '@babel/parser': 7.21.8 '@vue/compiler-core': 3.2.47 '@vue/compiler-dom': 3.2.47 '@vue/compiler-ssr': 3.2.47 @@ -12018,6 +12069,11 @@ packages: pathe: 1.1.0 dev: true + /plausible-tracker@0.3.8: + resolution: {integrity: sha512-lmOWYQ7s9KOUJ1R+YTOR3HrjdbxIS2Z4de0P/Jx2dQPteznJl2eX3tXxKClpvbfyGP59B5bbhW8ftN59HbbFSg==} + engines: {node: '>=10'} + dev: false + /plist@3.0.6: resolution: {integrity: sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==} engines: {node: '>=6'} @@ -14277,7 +14333,7 @@ packages: local-pkg: 0.4.3 magic-string: 0.30.0 minimatch: 7.4.6 - resolve: 1.22.1 + resolve: 1.22.2 unplugin: 1.1.0 vue: 3.2.47 transitivePeerDependencies: @@ -14795,6 +14851,12 @@ packages: vue: 3.3.4 dev: true + /vue-plausible@1.3.2: + resolution: {integrity: sha512-7hdLrDjw0+qjdM9hxowOirQSHPCljWwd8scW0tRFHyXAQSE/yBWrJ3EPuEiZlJUoth9ac0KLbHM+wSSkWHttiA==} + dependencies: + plausible-tracker: 0.3.8 + dev: false + /vue@3.2.47: resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==} dependencies: From 88bda42e74ddb6e8debff597e890d4d087eccd24 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 10 Jun 2023 01:37:39 +0530 Subject: [PATCH 2/2] Use script instead of npm package. --- packages/mermaid/src/docs/.vitepress/config.ts | 13 ++++++++++++- .../mermaid/src/docs/.vitepress/theme/index.ts | 6 ------ packages/mermaid/src/docs/package.json | 1 - pnpm-lock.yaml | 15 +++------------ 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/packages/mermaid/src/docs/.vitepress/config.ts b/packages/mermaid/src/docs/.vitepress/config.ts index 8403ff069..286c0c871 100644 --- a/packages/mermaid/src/docs/.vitepress/config.ts +++ b/packages/mermaid/src/docs/.vitepress/config.ts @@ -16,7 +16,18 @@ export default defineConfig({ description: 'Create diagrams and visualizations using text and code.', base: '/', markdown: allMarkdownTransformers, - head: [['link', { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]], + head: [ + ['link', { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }], + [ + 'script', + { + defer: 'true', + 'data-domain': 'mermaid.js.org', + // All tracked stats are public and available at https://p.mermaid.live/mermaid.js.org + src: 'https://p.mermaid.live/js/script.js', + }, + ], + ], themeConfig: { nav: nav(), editLink: { diff --git a/packages/mermaid/src/docs/.vitepress/theme/index.ts b/packages/mermaid/src/docs/.vitepress/theme/index.ts index a9c11fdb9..ba1ac9bdb 100644 --- a/packages/mermaid/src/docs/.vitepress/theme/index.ts +++ b/packages/mermaid/src/docs/.vitepress/theme/index.ts @@ -9,12 +9,6 @@ import HomePage from '../components/HomePage.vue'; import { getRedirect } from './redirect.js'; import { h } from 'vue'; -import Plausible from 'plausible-tracker'; -// All tracked stats are public and available at https://p.mermaid.live/mermaid.js.org -const { enableAutoPageviews } = Plausible({ - apiHost: 'https://p.mermaid.live', -}); -enableAutoPageviews(); import Theme from 'vitepress/theme'; import '../style/main.css'; diff --git a/packages/mermaid/src/docs/package.json b/packages/mermaid/src/docs/package.json index 64b7b4823..aeb3d24f3 100644 --- a/packages/mermaid/src/docs/package.json +++ b/packages/mermaid/src/docs/package.json @@ -16,7 +16,6 @@ "dependencies": { "@vueuse/core": "^10.1.0", "jiti": "^1.18.2", - "plausible-tracker": "^0.3.8", "vue": "^3.2.47" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91a103ce5..633990a3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -391,9 +391,6 @@ importers: jiti: specifier: ^1.18.2 version: 1.18.2 - plausible-tracker: - specifier: ^0.3.8 - version: 0.3.8 vue: specifier: ^3.2.47 version: 3.2.47 @@ -446,12 +443,12 @@ importers: jiti: specifier: ^1.18.2 version: 1.18.2 + plausible-tracker: + specifier: ^0.3.8 + version: 0.3.8 vue: specifier: ^3.2.47 version: 3.2.47 - vue-plausible: - specifier: ^1.3.2 - version: 1.3.2 devDependencies: '@iconify-json/carbon': specifier: ^1.1.16 @@ -14851,12 +14848,6 @@ packages: vue: 3.3.4 dev: true - /vue-plausible@1.3.2: - resolution: {integrity: sha512-7hdLrDjw0+qjdM9hxowOirQSHPCljWwd8scW0tRFHyXAQSE/yBWrJ3EPuEiZlJUoth9ac0KLbHM+wSSkWHttiA==} - dependencies: - plausible-tracker: 0.3.8 - dev: false - /vue@3.2.47: resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==} dependencies: