Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
ScriptV2: snippet structure change (#5662)
Karl-Aksel Puulmannb36a92fb459c
diff --git a/lib/plausible_web/live/installationv2/instructions.ex b/lib/plausible_web/live/installationv2/instructions.exindex 298963bcb3..a79cf701bb 100644--- a/lib/plausible_web/live/installationv2/instructions.ex+++ b/lib/plausible_web/live/installationv2/instructions.ex@@ -261,9 +261,10 @@ defmodule PlausibleWeb.Live.InstallationV2.Instructions dodefp render_snippet(tracker_script_configuration) do"""<!-- Privacy-friendly analytics by Plausible -->+ <script defer src="#{tracker_url(tracker_script_configuration)}"></script><script>- window.plausible=window.plausible||function(){(window.plausible.q=window.plausible.q||[]).push(arguments)},window.plausible.init=function(i){window.plausible.o=i||{}};var script=document.createElement("script");script.type="text/javascript",script.defer=!0,script.src="#{tracker_url(tracker_script_configuration)}";var r=document.getElementsByTagName("script")[0];r.parentNode.insertBefore(script,r);- plausible.init()+ window.plausible=window.plausible||function(){(plausible.q=plausible.q||[]).push(arguments)},plausible.init=plausible.init||function(i){plausible.o=i||{}};+ plausible.init()</script>"""enddiff --git a/lib/plausible_web/views/site_view.ex b/lib/plausible_web/views/site_view.exindex 5e4883c116..6aafbfb2b3 100644--- a/lib/plausible_web/views/site_view.ex+++ b/lib/plausible_web/views/site_view.ex@@ -10,14 +10,6 @@ defmodule PlausibleWeb.SiteView doPlausible.Sites.shared_link_url(site, link)end- def render_snippet(site) do- tracker = "#{plausible_url()}/js/script.js"-- """- <script defer data-domain="#{site.domain}" src="#{tracker}"></script>- """- end-def with_indefinite_article(word) doif String.starts_with?(word, ["a", "e", "i", "o", "u"]) do"an " <> worddiff --git a/test/plausible_web/live/installationv2_test.exs b/test/plausible_web/live/installationv2_test.exsindex eeb0c1dcb8..2b8b821e4a 100644--- a/test/plausible_web/live/installationv2_test.exs+++ b/test/plausible_web/live/installationv2_test.exs@@ -134,7 +134,7 @@ defmodule PlausibleWeb.Live.InstallationV2Test doconfig = Plausible.Repo.get_by!(TrackerScriptConfiguration, site_id: site.id)assert html =~ "Privacy-friendly analytics by Plausible"assert html =~ "/js/#{config.id}.js"- assert html =~ "defer=!0"+ assert html =~ "defer"endtest "manual installation shows optional measurements", %{conn: conn, site: site} dodiff --git a/tracker/package.json b/tracker/package.jsonindex 58094e0f30..ce52e51287 100644--- a/tracker/package.json+++ b/tracker/package.json@@ -1,5 +1,5 @@{- "tracker_script_version": 28,+ "tracker_script_version": 29,"type": "module","scripts": {"deploy": "node compile.js",diff --git a/tracker/src/web-snippet.js b/tracker/src/web-snippet.jsindex 24a272e70d..28a804c3f1 100644--- a/tracker/src/web-snippet.js+++ b/tracker/src/web-snippet.js@@ -2,18 +2,11 @@//<script>window.plausible = window.plausible || function() {- (window.plausible.q = window.plausible.q || []).push(arguments)+ (plausible.q = plausible.q || []).push(arguments)}-window.plausible.init = function(overrides) {- window.plausible.o = overrides || {}+plausible.init = plausible.init || function(overrides) {+ plausible.o = overrides || {}}-var script = document.createElement("script")-script.type="text/javascript"-script.defer=true-script.src="<%= plausible_script_url %>"-var r = document.getElementsByTagName("script")[0]-r.parentNode.insertBefore(script, r);-// plausible.init()//</script>diff --git a/tracker/test/installation_support/verifier-v2.spec.ts b/tracker/test/installation_support/verifier-v2.spec.tsindex 6dfe826c62..a81fe75878 100644--- a/tracker/test/installation_support/verifier-v2.spec.ts+++ b/tracker/test/installation_support/verifier-v2.spec.ts@@ -397,7 +397,7 @@ test.describe('installed plausible web variant', () => {attempts: 1,completed: true,disallowedByCsp: true,- plausibleIsOnWindow: false,+ plausibleIsOnWindow: true,plausibleIsInitialized: undefined,plausibleVersion: undefined,plausibleVariant: undefined,@@ -458,7 +458,7 @@ test.describe('installed plausible web variant', () => {attempts: 1,completed: true,disallowedByCsp: false, // scripts from our domain are allowed, but the inline sourceless snippet can't run because 'unsafe-inline' is not present in the CSP- plausibleIsOnWindow: false,+ plausibleIsOnWindow: true,plausibleIsInitialized: undefined,plausibleVersion: undefined,plausibleVariant: undefined,diff --git a/tracker/test/support/initialize-page-dynamically.ts b/tracker/test/support/initialize-page-dynamically.tsindex 6a2f7fa655..2588ad5881 100644--- a/tracker/test/support/initialize-page-dynamically.ts+++ b/tracker/test/support/initialize-page-dynamically.ts@@ -1,6 +1,5 @@import { Page } from '@playwright/test'import { ScriptConfig } from './types'-import { compileWebSnippet } from '../../compiler'interface SharedOptions {/** unique ID that becomes part of the dynamic page URL */@@ -41,7 +40,13 @@ const RESPONSE_BODY_TEMPLATE = `</html>`-const PLAUSIBLE_WEB_SNIPPET = compileWebSnippet()+const PLAUSIBLE_WEB_SNIPPET = `+<script defer src="<%= plausible_script_url %>"></script>+<script>+ window.plausible=window.plausible||function(){(plausible.q=plausible.q||[]).push(arguments)},plausible.init=plausible.init||function(i){plausible.o=i||{}};+ plausible.init()+</script>+`export function serializeWithFunctions(obj: Record<string, any>): string {const functions: Record<string, string> = {}