Merge pull request #4 from kremalicious/feature/gatsby-v2

Updates for Gatsby v2
kremalicious · Jun 19, 2018 · cff8490 · cff8490
2 parents c531e47 + 356e68f
commit cff8490
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -7,16 +7,18 @@
     "url": "https://github.com/kremalicious/gatsby-plugin-matomo/issues"
   },
   "dependencies": {
-    "babel-runtime": "^6.26.0"
+    "babel-runtime": "^6.26.0",
+    "react": "^16.4.1",
+    "react-hot-loader": "^4.3.3"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
-    "cross-env": "^5.1.5",
+    "cross-env": "^5.2.0",
     "eslint": "^4.19.1",
-    "eslint-plugin-react": "^7.8.2",
-    "release-it": "^7.4.3"
+    "eslint-plugin-react": "^7.9.1",
+    "release-it": "^7.4.7"
   },
   "homepage": "https://github.com/kremalicious/gatsby-plugin-matomo",
   "keywords": [
@@ -28,7 +30,7 @@
   "license": "MIT",
   "main": "index.js",
   "peerDependencies": {
-    "gatsby": "^1.9.0"
+    "gatsby": ">=1.9.0"
   },
   "repository": "github:kremalicious/gatsby-plugin-matomo",
   "scripts": {

diff --git a/src/gatsby-ssr.js b/src/gatsby-ssr.js
@@ -1,21 +1,27 @@
 import React from 'react'
 
 function buildTrackingCode(pluginOptions) {
-  const script = pluginOptions.localScript ? pluginOptions.localScript : `${pluginOptions.matomoUrl}/piwik.js`
+  const script = pluginOptions.localScript
+    ? pluginOptions.localScript
+    : `${pluginOptions.matomoUrl}/piwik.js`
 
   const html = `
     window.dev = ${pluginOptions.dev}
     if (window.dev === true || !(navigator.doNotTrack == '1' || window.doNotTrack == '1')) {
       window._paq = window._paq || [];
-      window._paq.push(['setTrackerUrl', '${pluginOptions.matomoUrl}/piwik.php']);
+      window._paq.push(['setTrackerUrl', '${
+        pluginOptions.matomoUrl
+      }/piwik.php']);
       window._paq.push(['setSiteId', '${pluginOptions.siteId}']);
       window._paq.push(['enableLinkTracking']);
       window._paq.push(['trackPageView']);
       window._paq.push(['enableHeartBeatTimer']);
       window.start = new Date();
       if (window.dev === true) {
         console.log('[Matomo] Tracking initialized')
-        console.log('[Matomo] matomoUrl: ${pluginOptions.matomoUrl}, siteId: ${pluginOptions.siteId}')
+        console.log('[Matomo] matomoUrl: ${pluginOptions.matomoUrl}, siteId: ${
+    pluginOptions.siteId
+  }')
       }
       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
       g.defer=true; g.async=true; g.src='${script}'; s.parentNode.insertBefore(g,s);
@@ -31,7 +37,10 @@ function buildTrackingCode(pluginOptions) {
 }
 
 function buildTrackingCodeNoJs(pluginOptions, pathname) {
-  const html = `<img src="${pluginOptions.matomoUrl}/piwik.php?idsite=${pluginOptions.siteId}&rec=1&url=${pluginOptions.siteUrl + pathname}" style="border:0" alt="tracker" />`
+  const html = `<img src="${pluginOptions.matomoUrl}/piwik.php?idsite=${
+    pluginOptions.siteId
+  }&rec=1&url=${pluginOptions.siteUrl +
+    pathname}" style="border:0" alt="tracker" />`
 
   return (
     <noscript