Skip to content

Commit d6910ff

Browse files
committed
Correct Google Analytics generation code
See #1786
1 parent 5957675 commit d6910ff

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Unreleased
22

3+
### Bug Fixes
4+
5+
- Corrected HTML generation for projects using Google Analytics, #1786.
6+
- Ensured that the `<meta charset="utf-8" />` appears within the first 1024 bytes of generated pages, #1783.
7+
8+
### Thanks!
9+
10+
- @RunDevelopment
11+
312
## v0.22.8 (2021-11-07)
413

514
### Features

src/lib/output/themes/default/partials/analytics.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ export function analytics(context: DefaultThemeRenderContext) {
66
const gaSite = context.options.getValue("gaSite");
77
if (!gaID) return;
88

9+
const script = `
10+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
11+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
12+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
13+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
14+
ga('create', '${gaID}', '${gaSite}');
15+
ga('send', 'pageview');
16+
`.trim();
17+
918
return (
1019
<script>
11-
(function(i,s,o,g,r,a,m){"{"}
12-
i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){"{"}
13-
(i[r].q=i[r].q||[]).push(arguments){"}"},i[r].l=1*new Date();a=s.createElement(o),
14-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
15-
{"}"}
16-
)(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{gaID}', '{gaSite}
17-
'); ga('send', 'pageview');
20+
<JSX.Raw html={script} />
1821
</script>
1922
);
2023
}

src/lib/utils/jsx.elements.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,6 @@ export interface JsxScriptElementProps extends JsxHtmlGlobalProps {
729729
| "strict-origin-when-cross-origin"
730730
| "unsafe-url";
731731
src?: string;
732-
text?: string;
733732
type?: "module" | (string & {});
734733
}
735734

0 commit comments

Comments
 (0)