diff --git a/CHANGELOG.md b/CHANGELOG.md index fb3c495a2..0c44ad594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Unreleased +### Bug Fixes + +- Corrected HTML generation for projects using Google Analytics, #1786. +- Ensured that the `` appears within the first 1024 bytes of generated pages, #1783. + +### Thanks! + +- @RunDevelopment + ## v0.22.8 (2021-11-07) ### Features diff --git a/src/lib/output/themes/default/partials/analytics.tsx b/src/lib/output/themes/default/partials/analytics.tsx index 3ab6abc27..bdb8b928a 100644 --- a/src/lib/output/themes/default/partials/analytics.tsx +++ b/src/lib/output/themes/default/partials/analytics.tsx @@ -6,15 +6,18 @@ export function analytics(context: DefaultThemeRenderContext) { const gaSite = context.options.getValue("gaSite"); if (!gaID) return; + const script = ` +(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) +})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); +ga('create', '${gaID}', '${gaSite}'); +ga('send', 'pageview'); +`.trim(); + return ( ); } diff --git a/src/lib/utils/jsx.elements.ts b/src/lib/utils/jsx.elements.ts index bc2a1751f..3c49a01fd 100644 --- a/src/lib/utils/jsx.elements.ts +++ b/src/lib/utils/jsx.elements.ts @@ -729,7 +729,6 @@ export interface JsxScriptElementProps extends JsxHtmlGlobalProps { | "strict-origin-when-cross-origin" | "unsafe-url"; src?: string; - text?: string; type?: "module" | (string & {}); }