feat: fix merge conflicts

jwplayer · Jul 5, 2023 · 3895565 · 3895565
2 parents 898f94a + 9e9357e
commit 3895565
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/firebase-live.yml b/.github/workflows/firebase-live.yml
@@ -12,6 +12,7 @@ jobs:
       - name: Build
         env:
           APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }}
+          APP_GOOGLE_SITE_VERIFICATION_ID: ${{ vars.GOOGLE_SITE_VERIFICATION_ID }}
         run: yarn &&  MODE=demo yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [4.20.0](https://github.com/jwplayer/ott-web-app/compare/v4.19.1...v4.20.0) (2023-07-04)
+
+
+### Features
+
+* **project:** add variable for GA ([fa0e0d7](https://github.com/jwplayer/ott-web-app/commit/fa0e0d75e20ea506bb2ebde92f9744e1645cab16))
+
+
+
 ## [4.19.1](https://github.com/jwplayer/ott-web-app/compare/v4.19.0...v4.19.1) (2023-06-20)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jw-ott-webapp",
-  "version": "4.19.1",
+  "version": "4.20.0",
   "main": "index.js",
   "repository": "https://github.com/jwplayer/ott-web-app.git",
   "author": "JW Player",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { BrowserRouter, HashRouter } from 'react-router-dom';
+import { Helmet } from 'react-helmet';
 
 import QueryProvider from '#src/containers/QueryProvider/QueryProvider';
 import '#src/screenMapping';
@@ -41,10 +42,17 @@ export default function App() {
   const Router = import.meta.env.APP_PUBLIC_GITHUB_PAGES ? HashRouter : BrowserRouter;
 
   return (
-    <QueryProvider>
-      <Router>
-        <Root />
-      </Router>
-    </QueryProvider>
+    <>
+      {import.meta.env.APP_GOOGLE_SITE_VERIFICATION_ID && (
+        <Helmet>
+          <meta name="google-site-verification" content={import.meta.env.APP_GOOGLE_SITE_VERIFICATION_ID} />
+        </Helmet>
+      )}
+      <QueryProvider>
+        <Router>
+          <Root />
+        </Router>
+      </QueryProvider>
+    </>
   );
 }
diff --git a/types/env.d.ts b/types/env.d.ts
@@ -8,6 +8,7 @@ interface ImportMetaEnv {
   readonly APP_DEFAULT_LANGUAGE: string | undefined;
   readonly APP_ENABLED_LANGUAGES: string | undefined;
   readonly APP_VERSION: string | undefined;
+  readonly APP_GOOGLE_SITE_VERIFICATION_ID: string | undefined;
 }
 
 interface ImportMeta {