Remove adroll, fix local ga-measurement, and env loading

AudiusProject · Jan 23, 2024 · 97f7df8 · 97f7df8
1 parent 59ce676
commit 97f7df8
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 90 deletions.
diff --git a/.circleci/src/jobs/@web-jobs.yml b/.circleci/src/jobs/@web-jobs.yml
@@ -51,15 +51,15 @@ web-build-demo:
     - run:
         name: build-demo
         no_output_timeout: 30m
-        # Set the branch name as the VITE_PUBLIC_URL so that relative paths work, e.g.
+        # Set the branch name as the VITE_BASENAME so that relative paths work, e.g.
         # demo.audius.co/some-branch/handle/track resolves as /handle/track would at audius.co
         command: |
           cd packages/web
-          cp ./.env/.env.stage ./.env/.env.stage.tmp
-          echo -e "\nVITE_PUBLIC_URL=/${CIRCLE_BRANCH}" >> ./.env/.env.stage
+          cp ./env/.env.stage ./env/.env.stage.tmp
+          echo -e "\nVITE_BASENAME=/${CIRCLE_BRANCH}" >> ./env/.env.stage
           CI=false npm run build:stage -w audius-client
           mv build-staging build-demo
-          cp ./.env/.env.stage.tmp ./.env/.env.stage
+          cp ./env/.env.stage.tmp ./env/.env.stage
     - persist_to_workspace:
         root: ./
         paths:

diff --git a/packages/common/src/services/env.ts b/packages/common/src/services/env.ts
@@ -4,8 +4,6 @@ export type Environment = 'development' | 'staging' | 'production'
 
 export type Env = {
   AAO_ENDPOINT: string
-  ADROLL_AVD_ID: Nullable<string>
-  ADROLL_PIX_ID: Nullable<string>
   AMPLITUDE_API_KEY: Nullable<string>
   AMPLITUDE_PROXY: Nullable<string>
   AMPLITUDE_WRITE_KEY: Nullable<string>
@@ -36,7 +34,7 @@ export type Env = {
   FINGERPRINT_ENDPOINT: Nullable<string>
   FINGERPRINT_PUBLIC_API_KEY: Nullable<string>
   GA_HOSTNAME: string
-  GA_MEASUREMENT_ID: Nullable<string>
+  GA_MEASUREMENT_ID: string
   GENERAL_ADMISSION: string
   HCAPTCHA_BASE_URL: string
   HCAPTCHA_SITE_KEY: string
@@ -73,7 +71,7 @@ export type Env = {
   TRPC_ENDPOINT: string
   USDC_MINT_ADDRESS: string
   USER_NODE: string
-  USE_HASH_ROUTING: Nullable<boolean>
+  USE_HASH_ROUTING: boolean
   WAUDIO_MINT_ADDRESS: string
   WEB3_NETWORK_ID: string
   WEB3_PROVIDER_URL: string

diff --git a/packages/mobile/.env.dev b/packages/mobile/.env.dev
@@ -1 +1,2 @@
-ENVIRONMENT=development
+ENVIRONMENT=development
+TIKTOK_APP_ID=awlrj83t4nx6qc5a
diff --git a/packages/mobile/.env.prod b/packages/mobile/.env.prod
@@ -1 +1,2 @@
-ENVIRONMENT=production
+ENVIRONMENT=production
+TIKTOK_APP_ID=awa9re2w7ec3xrn6
diff --git a/packages/mobile/.env.stage b/packages/mobile/.env.stage
@@ -1 +1,2 @@
-ENVIRONMENT=staging
+ENVIRONMENT=staging
+TIKTOK_APP_ID=awlrj83t4nx6qc5a
diff --git a/packages/mobile/ios/AudiusReactNative.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme b/packages/mobile/ios/AudiusReactNative.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme
@@ -10,7 +10,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.env.dev&quot; &gt; /tmp/envfile&#10;">
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.">
             </ActionContent>
          </ExecutionAction>
       </PreActions>

diff --git a/packages/mobile/ios/AudiusReactNative.xcodeproj/xcshareddata/xcschemes/Staging.xcscheme b/packages/mobile/ios/AudiusReactNative.xcodeproj/xcshareddata/xcschemes/Staging.xcscheme
@@ -10,7 +10,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.env.stage&quot; &gt; /tmp/envfile&#10;">
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.">
             </ActionContent>
          </ExecutionAction>
       </PreActions>

diff --git a/packages/mobile/src/env/env.dev.ts b/packages/mobile/src/env/env.dev.ts
@@ -1,9 +1,8 @@
 import type { Env } from '@audius/common'
+import Config from 'react-native-config'
 
 export const env: Env = {
   AAO_ENDPOINT: 'http://audius-protocol-anti-abuse-oracle-1',
-  ADROLL_AVD_ID: null,
-  ADROLL_PIX_ID: null,
   AMPLITUDE_API_KEY: null,
   AMPLITUDE_PROXY: null,
   AMPLITUDE_WRITE_KEY: null,
@@ -36,7 +35,7 @@ export const env: Env = {
   FINGERPRINT_ENDPOINT: null,
   FINGERPRINT_PUBLIC_API_KEY: null,
   GA_HOSTNAME: 'staging.audius.co',
-  GA_MEASUREMENT_ID: null,
+  GA_MEASUREMENT_ID: 'G-XXXXX',
   GENERAL_ADMISSION: 'http://audius-protocol-general-admission-1',
   HCAPTCHA_BASE_URL: 'https://staging.audius.co',
   HCAPTCHA_SITE_KEY: '2abe61f1-af6e-4707-be19-a9a4146a9bea',
@@ -72,7 +71,7 @@ export const env: Env = {
   SOLANA_WEB3_CLUSTER: 'devnet',
   SUGGESTED_FOLLOW_HANDLES:
     'https://download.staging.audius.co/static-resources/signup-follows.json',
-  TIKTOK_APP_ID: 'awlrj83t4nx6qc5a',
+  TIKTOK_APP_ID: Config.TIKTOK_APP_ID!,
   TRPC_ENDPOINT: 'http://localhost:2022/trpc',
   USDC_MINT_ADDRESS: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
   USER_NODE: 'http://audius-protocol-creator-node-1',

diff --git a/packages/mobile/src/env/env.prod.ts b/packages/mobile/src/env/env.prod.ts
@@ -3,8 +3,6 @@ import Config from 'react-native-config'
 
 export const env: Env = {
   AAO_ENDPOINT: 'https://antiabuseoracle.audius.co',
-  ADROLL_AVD_ID: 'SDJ23TS7DBFPLMXRDF6JQY',
-  ADROLL_PIX_ID: 'JZSZK5GWHBFL3FQ3NRFPNY',
   AMPLITUDE_API_KEY: '86760558b8bb1b3aae61656efd4ddacb',
   AMPLITUDE_PROXY: 'https://gain.audius.co',
   AMPLITUDE_WRITE_KEY: Config.AMPLITUDE_WRITE_KEY as string,
@@ -74,7 +72,7 @@ export const env: Env = {
   SOLANA_WEB3_CLUSTER: 'mainnet-beta',
   SUGGESTED_FOLLOW_HANDLES:
     'https://download.audius.co/static-resources/signup-follows.json',
-  TIKTOK_APP_ID: 'awa9re2w7ec3xrn6',
+  TIKTOK_APP_ID: Config.TIKTOK_APP_ID!,
   TRPC_ENDPOINT: 'https://discoveryprovider3.audius.co/trpc/trpc',
   USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
   USER_NODE: 'https://usermetadata.audius.co',

diff --git a/packages/mobile/src/env/env.stage.ts b/packages/mobile/src/env/env.stage.ts
@@ -3,8 +3,6 @@ import Config from 'react-native-config'
 
 export const env: Env = {
   AAO_ENDPOINT: 'https://antiabuseoracle.staging.audius.co',
-  ADROLL_AVD_ID: null,
-  ADROLL_PIX_ID: null,
   AMPLITUDE_API_KEY: '72a58ce4ad1f9bafcba0b92bedb6c33d',
   AMPLITUDE_PROXY: 'https://gain.audius.co',
   AMPLITUDE_WRITE_KEY: Config.AMPLITUDE_WRITE_KEY as string,
@@ -39,7 +37,7 @@ export const env: Env = {
   FINGERPRINT_ENDPOINT: 'https://fp.staging.audius.co',
   FINGERPRINT_PUBLIC_API_KEY: 'Rz2A3Y5YGSg9K80VgKPi',
   GA_HOSTNAME: 'staging.audius.co',
-  GA_MEASUREMENT_ID: null,
+  GA_MEASUREMENT_ID: 'G-CH6BY2X2WL',
   GENERAL_ADMISSION: 'https://general-admission.staging.audius.co',
   HCAPTCHA_BASE_URL: 'https://staging.audius.co',
   HCAPTCHA_SITE_KEY: '2abe61f1-af6e-4707-be19-a9a4146a9bea',
@@ -74,7 +72,7 @@ export const env: Env = {
   SOLANA_WEB3_CLUSTER: 'mainnet-beta',
   SUGGESTED_FOLLOW_HANDLES:
     'https://download.staging.audius.co/static-resources/signup-follows.json',
-  TIKTOK_APP_ID: 'awlrj83t4nx6qc5a',
+  TIKTOK_APP_ID: Config.TIKTOK_APP_ID!,
   TRPC_ENDPOINT: 'https://discoveryprovider3.staging.audius.co/trpc/trpc',
   USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
   USER_NODE: 'https://usermetadata.staging.audius.co',

diff --git a/packages/web/.gitignore b/packages/web/.gitignore
@@ -8,7 +8,7 @@
 !/public/scripts/sw.js
 
 # env
-.env/.env.dev.local
+env/.env.dev.local
 
 # testing
 /coverage

diff --git a/packages/web/index.html b/packages/web/index.html
@@ -71,7 +71,7 @@
       // Account recovery
       try {
         const urlParams = new URLSearchParams(window.location.search)
-        const useHashRouting = !!'%USE_HASH_ROUTING%'
+        const useHashRouting = '%USE_HASH_ROUTING%'
         const login = urlParams.get('login')
         const warning = urlParams.get('warning')
 
@@ -114,51 +114,13 @@
     ></script>
     <script>
       const measurementId = '%GA_MEASUREMENT_ID%'
-      if (!measurementId.includes('%')) {
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', measurementId);
-      }
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', measurementId);
     </script>
     <!-- end Google Analytics -->
 
-    <!-- start Adroll -->
-    <script async type="text/javascript">
-      const adroll_adv_id = '%ADROLL_AVD_ID%'
-      const adroll_pix_id = '%ADROLL_PIX_ID%'
-      const adroll_version = '2.0'
-      if (
-        !adroll_adv_id.includes('%') &&
-        !adroll_pix_id.includes('%')
-      ) {
-        ;(function (w, d, e, o, a) {
-          w.__adroll_loaded = true
-          w.adroll = w.adroll || []
-          w.adroll.f = ['setProperties', 'identify', 'track']
-          var roundtripUrl =
-            'https://s.adroll.com/j/' + adroll_adv_id + '/roundtrip.js'
-          for (a = 0; a < w.adroll.f.length; a++) {
-            w.adroll[w.adroll.f[a]] =
-              w.adroll[w.adroll.f[a]] ||
-              (function (n) {
-                return function () {
-                  w.adroll.push([n, arguments])
-                }
-              })(w.adroll.f[a])
-          }
-
-          e = d.createElement('script')
-          o = d.getElementsByTagName('script')[0]
-          e.async = 1
-          e.src = roundtripUrl
-          o.parentNode.insertBefore(e, o)
-        })(window, document)
-        adroll.track('pageView')
-      }
-    </script>
-    <!-- end Adroll -->
-
     <!-- start Optimizely -->
     <script
       async

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -8,15 +8,15 @@
   "scripts": {
     "publish-scripts": "./scripts/publishScripts.sh",
     "start": "vite",
-    "start:dev": "npm run write-sha && npm run publish-scripts && env-cmd ./.env/.env.git env-cmd --no-override ./.env/.env.dev turbo run start",
-    "start:stage": "npm run write-sha && npm run publish-scripts && env-cmd ./.env/.env.git env-cmd --no-override ./.env/.env.stage turbo run start",
-    "start:prod": "npm run write-sha && npm run publish-scripts && env-cmd ./.env/.env.git env-cmd --no-override ./.env/.env.prod turbo run start",
+    "start:dev": "npm run write-sha && npm run publish-scripts && env-cmd ./env/.env.git env-cmd --no-override ./env/.env.dev turbo run start",
+    "start:stage": "npm run write-sha && npm run publish-scripts && env-cmd ./env/.env.git env-cmd --no-override ./env/.env.stage turbo run start",
+    "start:prod": "npm run write-sha && npm run publish-scripts && env-cmd ./env/.env.git env-cmd --no-override ./env/.env.prod turbo run start",
     "preview:prod": "npm run build:prod && vite preview --outDir build-production",
     "prebuild": "npm run publish-scripts",
     "build": "vite build && cp package.json build/package.json",
-    "build:dev": "npm run write-sha && env-cmd ./.env/.env.git env-cmd ./.env/.env.dev turbo run build && rm -rf build-development && mv build build-development",
-    "build:stage": "npm run write-sha && env-cmd ./.env/.env.git env-cmd ./.env/.env.stage turbo run build && rm -rf build-staging && mv build build-staging",
-    "build:prod": "npm run write-sha && env-cmd ./.env/.env.git env-cmd ./.env/.env.prod turbo run build && rm -rf build-production && mv build build-production",
+    "build:dev": "npm run write-sha && env-cmd ./env/.env.git env-cmd ./env/.env.dev turbo run build && rm -rf build-development && mv build build-development",
+    "build:stage": "npm run write-sha && env-cmd ./env/.env.git env-cmd ./env/.env.stage turbo run build && rm -rf build-staging && mv build build-staging",
+    "build:prod": "npm run write-sha && env-cmd ./env/.env.git env-cmd ./env/.env.prod turbo run build && rm -rf build-production && mv build build-production",
     "test": "vitest",
     "test:coverage": "vitest --resetMocks=false --coverage --watchAll=false",
     "eject": "react-scripts eject",
@@ -44,7 +44,7 @@
     "dist:linux-publish-production": "npm run dist -- --linux --publish always --env production",
     "dist:win:linux-publish-production": "npm run dist -- --win --linux --publish always --env production",
     "write-sha": "./scripts/writeSHA.sh",
-    "analyze": "env-cmd ./.env/.env.bundle npm run build:prod",
+    "analyze": "env-cmd ./env/.env.bundle npm run build:prod",
     "typecheck": "tsc",
     "typecheck:watch": "tsc --watch",
     "install-dmg-license": "npm add dmg-license -w audius-client",

diff --git a/packages/web/scripts/writeSHA.sh b/packages/web/scripts/writeSHA.sh
@@ -1,3 +1,3 @@
 CURRENT_SHA=$(git rev-parse HEAD)
-rm -rf .env/.env.git
-echo "VITE_CURRENT_GIT_SHA=$CURRENT_SHA" > .env/.env.git
+rm -rf env/.env.git
+echo "VITE_CURRENT_GIT_SHA=$CURRENT_SHA" > env/.env.git
diff --git a/packages/web/src/services/env/env.dev.ts b/packages/web/src/services/env/env.dev.ts
@@ -2,8 +2,6 @@ import { Env } from '@audius/common'
 
 export const env: Env = {
   AAO_ENDPOINT: 'http://audius-protocol-anti-abuse-oracle-1',
-  ADROLL_AVD_ID: null,
-  ADROLL_PIX_ID: null,
   AMPLITUDE_API_KEY: null,
   AMPLITUDE_PROXY: null,
   AMPLITUDE_WRITE_KEY: null,
@@ -36,7 +34,7 @@ export const env: Env = {
   FINGERPRINT_ENDPOINT: null,
   FINGERPRINT_PUBLIC_API_KEY: null,
   GA_HOSTNAME: 'staging.audius.co',
-  GA_MEASUREMENT_ID: null,
+  GA_MEASUREMENT_ID: 'G-XXXXX',
   GENERAL_ADMISSION: 'http://audius-protocol-general-admission-1',
   HCAPTCHA_BASE_URL: 'https://staging.audius.co',
   HCAPTCHA_SITE_KEY: '2abe61f1-af6e-4707-be19-a9a4146a9bea',

diff --git a/packages/web/src/services/env/env.prod.ts b/packages/web/src/services/env/env.prod.ts
@@ -2,8 +2,6 @@ import { Env } from '@audius/common'
 
 export const env: Env = {
   AAO_ENDPOINT: 'https://antiabuseoracle.audius.co',
-  ADROLL_AVD_ID: 'SDJ23TS7DBFPLMXRDF6JQY',
-  ADROLL_PIX_ID: 'JZSZK5GWHBFL3FQ3NRFPNY',
   AMPLITUDE_API_KEY: '86760558b8bb1b3aae61656efd4ddacb',
   AMPLITUDE_PROXY: 'gain.audius.co',
   AMPLITUDE_WRITE_KEY: null,

diff --git a/packages/web/src/services/env/env.stage.ts b/packages/web/src/services/env/env.stage.ts
@@ -2,8 +2,6 @@ import { Env } from '@audius/common'
 
 export const env: Env = {
   AAO_ENDPOINT: 'https://antiabuseoracle.staging.audius.co',
-  ADROLL_AVD_ID: null,
-  ADROLL_PIX_ID: null,
   AMPLITUDE_API_KEY: '72a58ce4ad1f9bafcba0b92bedb6c33d',
   AMPLITUDE_PROXY: 'gain.audius.co',
   AMPLITUDE_WRITE_KEY: null,
@@ -39,7 +37,7 @@ export const env: Env = {
   FINGERPRINT_ENDPOINT: 'https://fp.staging.audius.co',
   FINGERPRINT_PUBLIC_API_KEY: 'Rz2A3Y5YGSg9K80VgKPi',
   GA_HOSTNAME: 'staging.audius.co',
-  GA_MEASUREMENT_ID: null,
+  GA_MEASUREMENT_ID: 'G-CH6BY2X2WL',
   GENERAL_ADMISSION: 'https://general-admission.staging.audius.co',
   HCAPTCHA_BASE_URL: 'https://staging.audius.co',
   HCAPTCHA_SITE_KEY: '2abe61f1-af6e-4707-be19-a9a4146a9bea',

diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts
@@ -84,13 +84,16 @@ export default defineConfig(({ mode }) => {
       {
         transformIndexHtml(html) {
           // Replace HTML env vars with values from the system env
-          Object.keys(APP_ENV).forEach((key) => {
-            const value = APP_ENV[key as keyof typeof APP_ENV]
-            if (value && typeof value === 'string') {
-              html = html.replace(new RegExp(`%${key}%`, 'g'), value)
+          return html.replace(/%(\S+?)%/g, (text: string, key) => {
+            if (key in APP_ENV) {
+              const value = APP_ENV[key as keyof typeof APP_ENV]
+              if (value !== null) {
+                return value as string
+              }
             }
+            console.warn(`Missing environment variable: ${key}`)
+            return text
           })
-          return html
         }
       },
       react({