From 0c0acf56fe69cbca2237d54f80b170316e64b77a Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Thu, 11 Nov 2021 08:36:12 +0100 Subject: [PATCH] add @kichiyaki/gatsby-plugin-plausible --- .github/workflows/publish.yml | 2 +- gatsby-browser.js | 11 ----------- gatsby-config.js | 10 ++++++++-- gatsby-ssr.js | 34 ---------------------------------- package.json | 1 + yarn.lock | 11 ++++++++++- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2ebafe5..0c3edb4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,7 +41,7 @@ jobs: context: . build-args: | PLAUSIBLE_CUSTOM_DOMAIN=${{ secrets.PLAUSIBLE_CUSTOM_DOMAIN }} - VERSION=v${{ steps.get_version.outputs.VERSION }} + VERSION=${{ steps.get_version.outputs.VERSION }} tags: | ${{ secrets.REGISTRY_NAME }}/dwysokinski.me:latest ${{ secrets.REGISTRY_NAME }}/dwysokinski.me:${{ steps.get_version.outputs.VERSION }} diff --git a/gatsby-browser.js b/gatsby-browser.js index 7f9387a..01e21b7 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,12 +1 @@ import '@kichiyaki/roboto'; - -export const onRouteUpdate = ({ location }) => { - if ( - process.env.NODE_ENV !== `production` || - typeof window.plausible !== `object` - ) { - return; - } - - window.plausible('pageview'); -}; diff --git a/gatsby-config.js b/gatsby-config.js index a2a5e20..63c73c0 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,4 +1,4 @@ -const DOMAIN = process.env.DOMAIN; +const DOMAIN = 'dwysokinski.me'; const SITE_URL = 'https://' + DOMAIN; module.exports = { @@ -12,7 +12,6 @@ module.exports = { github: 'https://github.com/Kichiyaki', facebook: 'https://www.facebook.com/dawidwysokinski00', domain: DOMAIN, - plausibleCustomDomain: process.env.PLAUSIBLE_CUSTOM_DOMAIN, }, plugins: [ `gatsby-plugin-react-helmet`, @@ -68,5 +67,12 @@ module.exports = { }, }, }, + { + resolve: `@kichiyaki/gatsby-plugin-plausible`, + options: { + domain: DOMAIN, + customDomain: process.env.PLAUSIBLE_CUSTOM_DOMAIN, + }, + }, ], }; diff --git a/gatsby-ssr.js b/gatsby-ssr.js index 31df84e..e69de29 100644 --- a/gatsby-ssr.js +++ b/gatsby-ssr.js @@ -1,34 +0,0 @@ -import React from 'react'; - -export const onRenderBody = ({ setHeadComponents, ...rest }) => { - if (process.env.NODE_ENV !== 'production') { - return null; - } - - const plausibleDomain = process.env.PLAUSIBLE_CUSTOM_DOMAIN ?? 'plausible.io'; - const domain = process.env.DOMAIN ?? 'localhost'; - - const scriptProps = { - async: true, - defer: true, - 'data-domain': domain, - src: `https://${plausibleDomain}/js/plausible.js`, - }; - - return setHeadComponents([ - // , -