Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

[C-2940] Update google analytics tags and fix embed build #3856

Merged
merged 2 commits into from
Aug 7, 2023
Merged

[C-2940] Update google analytics tags and fix embed build #3856

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6666d9f
[C-2940] Update google analytics tags and fix embed build
raymondjacobson Aug 7, 2023
94d4575
Put back nodeEnv
raymondjacobson Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions packages/embed/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/embed/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"webpack-cli": "4.5.0"
},
"dependencies": {
"@audius/sdk": "3.0.3-beta.109",
"@audius/sdk": "3.0.3",
"@audius/stems": "1.5.36",
"amplitude-js": "8.11.1",
"axios": "0.19.2",
Expand Down
8 changes: 7 additions & 1 deletion packages/embed/preact.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { resolve } from 'path'
import preactSVGLoader from 'preact-cli-svg-loader'

import envVars from 'preact-cli-plugin-env-vars'
import preactSVGLoader from 'preact-cli-svg-loader'

const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')

export default function (config, env, helpers) {
Expand All @@ -12,6 +14,10 @@ export default function (config, env, helpers) {
'src',
'index'
)
config.resolve.alias = {
...config.resolve.alias,
fs: resolve(__dirname, './src/util/empty.js')
}

// Inject env vars
envVars(config, env, helpers)
Expand Down
4 changes: 2 additions & 2 deletions packages/embed/src/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- start Google Analytics -->
<script
async
src="/embed/assets/scripts/gtag.js?id=UA-120325397-2"
src="/embed/assets/scripts/gtag.js?id=G-V6N1ZTVGS5"
></script>
<script>
try {
Expand All @@ -20,7 +20,7 @@
dataLayer.push(arguments)
}
gtag('js', new Date())
gtag('config', 'UA-120325397-2')
gtag('config', 'G-V6N1ZTVGS5')
} catch (e) {}
</script>
<!-- end Google Analytics -->
Expand Down
Empty file added packages/embed/src/util/empty.js
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion packages/web/.env/.env.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ REACT_APP_SOL_TOKEN_BRIDGE_ADDRESS=wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb

REACT_APP_METADATA_PROGRAM_ID=metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s

REACT_APP_GA_MEASUREMENT_ID=UA-120325397-2
REACT_APP_GA_MEASUREMENT_ID=G-V6N1ZTVGS5

REACT_APP_PUBLIC_PROTOCOL=https:
REACT_APP_PUBLIC_HOSTNAME=audius.co
Expand Down
22 changes: 7 additions & 15 deletions packages/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,14 @@
console.error(e)
}
</script>

<!-- start Google Analytics -->
<script async src="%PUBLIC_URL%/analytics/gtag.js?id=%REACT_APP_GA_MEASUREMENT_ID%"></script>
<script async>
const nodeEnv = '%NODE_ENV%'
const reactEnv = '%REACT_APP_ENVIRONMENT%'
if (nodeEnv === 'production' && reactEnv === 'production') {
try {
window.dataLayer = window.dataLayer || [];
// Stolen from https://github.com/gatsbyjs/gatsby/issues/11431
function gtag(){window.dataLayer && window.dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '%REACT_APP_GA_MEASUREMENT_ID%');
} catch (e) {
console.error(e)
}
}
<script async src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GA_MEASUREMENT_ID%"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '%REACT_APP_GA_MEASUREMENT_ID%');
</script>
<!-- end Google Analytics -->

Expand Down