🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor script snippets in NoData and ScriptBuilder components
Bill Yangdaddcb1ce83a
diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsxindex 875839ec0..243243141 100644--- a/client/src/app/[site]/components/Header/NoData.tsx+++ b/client/src/app/[site]/components/Header/NoData.tsx@@ -137,7 +137,15 @@ export function NoData() {const htmlSnippet = `<script\n src="${scriptUrl}"\n data-site-id="${siteId}"\n defer\n></script>`;- const jsSnippet = `(function () {\n var el = document.createElement("script");\n el.src = "${scriptUrl}";\n el.setAttribute("data-site-id", "${siteId}");\n document.head.appendChild(el);\n})();`;+ const jsSnippet = `<script>+ (function() {+ var el = document.createElement("script");+ el.src = "${scriptUrl}";+ el.defer = true;+ el.setAttribute("data-site-id", "${siteId}");+ document.head.appendChild(el);+ })();+</script>`;const aiPrompt = `Install Rybbit analytics on this website.\n\nAdd this script tag to the <head> of every page, using the root layout or base template if there is one:\n\n<script src="${scriptUrl}" data-site-id="${siteId}" defer></script>\n`;@@ -219,9 +227,9 @@ await rybbit.init({{showJsFallback && (<div className="mt-2 flex flex-col gap-2"><p className="text-xs text-neutral-600 dark:text-neutral-400">- {t("Run this in any JavaScript that loads on every page:")}+ {t("Paste this into the {headTag} of your website:", { headTag: "<head>" })}</p>- <CodeSnippet language="javascript" code={jsSnippet} className="text-xs" />+ <CodeSnippet language="HTML" code={jsSnippet} className="text-xs" /></div>)}</div>diff --git a/client/src/components/SiteSettings/ScriptBuilder.tsx b/client/src/components/SiteSettings/ScriptBuilder.tsxindex b3abb02f2..2ccd59ed4 100644--- a/client/src/components/SiteSettings/ScriptBuilder.tsx+++ b/client/src/components/SiteSettings/ScriptBuilder.tsx@@ -108,13 +108,13 @@ ${dataAttributes.map(attr => ` ${formatAttr(attr)}`).join("\n")}></script>`;const jsSnippet = `<script>-(function () {- var el = document.createElement("script");- el.src = "${scriptUrl}";-${dataAttributes.map(([key, value]) => ` el.setAttribute("${key}", ${JSON.stringify(value)});`).join("\n")}- el.defer = true;- document.head.appendChild(el);-})();+ (function() {+ var el = document.createElement("script");+ el.src = "${scriptUrl}";+ el.defer = true;+${dataAttributes.map(([key, value]) => ` el.setAttribute("${key}", ${JSON.stringify(value)});`).join("\n")}+ document.head.appendChild(el);+ })();</script>`;const inlineScript = `<script src="${scriptUrl}" ${dataAttributes.map(formatAttr).join(" ")} defer></script>`;@@ -176,9 +176,9 @@ await rybbit.event("signup_started", { plan: "pro" });`;{showJsFallback && (<div className="mt-2 flex flex-col gap-2"><p className="text-xs text-muted-foreground">- {t("Run this in any JavaScript that loads on every page:")}+ {t("Paste this into the {headTag} of your website:", { headTag: "<head>" })}</p>- <CodeSnippet language="javascript" code={jsSnippet} />+ <CodeSnippet language="HTML" code={jsSnippet} /></div>)}</div>