fix: merge develop

jwplayer · Jul 18, 2023 · df414f8 · df414f8
2 parents 967073e + 4591980
commit df414f8
Show file tree

Hide file tree

Showing 38 changed files with 725 additions and 355 deletions.
diff --git a/.env b/.env
@@ -5,4 +5,4 @@ APP_PLAYER_ID=M4qoGvUk
 APP_DEFAULT_LANGUAGE=en
 
 # a comma separated list of languages that are enabled (this only works for languages that are enabled in the app)
-APP_ENABLED_LANGUAGES=en,es
+APP_ENABLED_LANGUAGES=en,es
diff --git a/.github/workflows/create-release-candidate-branch.yml b/.github/workflows/create-release-candidate-branch.yml
@@ -0,0 +1,47 @@
+name: Create Release Candidate Branch
+
+# Triggered manually
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+jobs:
+  create-release-branch:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.ACTION_TOKEN }}
+          ref: release
+      # It would be easier to create the branch from develop,
+      # but unfortunately the script that creates the PR's only considers commits added during the action run 
+      - name: Merge latest from develop
+        run: |
+          git config --global user.name 'Release Script'
+          git config --global user.email '[email protected]'
+          git fetch origin develop
+          git merge origin/develop
+        env:
+          GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}
+
+      - name: Generate changelog
+        id: changelog
+        uses: TriPSs/conventional-changelog-action@v3
+        with:
+          github-token: ${{ secrets.ACTION_TOKEN }}
+          release-count: 0
+          skip-tag: true
+          git-push: false
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.ACTION_TOKEN }}
+          title: ${{ steps.changelog.outputs.tag }} Release Candidate
+          base: release
+          branch: release-candidate
+          body: ${{ steps.changelog.outputs.clean_changelog }}
+          labels: release-candidate
diff --git a/.github/workflows/firebase-live.yml b/.github/workflows/firebase-live.yml
@@ -2,7 +2,7 @@ name: 'Firebase Live'
 
 on:
   push:
-    branches: ['develop']
+    branches: ['release']
 
 jobs:
   deploy_live_website:
@@ -16,6 +16,6 @@ jobs:
         run: yarn &&  MODE=demo yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT }}"
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}'
           channelId: live
diff --git a/.github/workflows/firebase-preview.yml b/.github/workflows/firebase-preview.yml
@@ -1,20 +1,35 @@
-name: 'Firebase Preview'
+name: Preview and Lighthouse
 
 on:
   pull_request:
-    branches: [ 'develop', 'feat/*', 'feature/*' ]
+    branches: ['develop', 'feat/*', 'feature/*', 'release']
 
 jobs:
   build_and_preview:
+    name: Build and preview
     runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.firebase_hosting_preview.outputs.details_url }}
     steps:
       - uses: actions/checkout@v2
-      - name: Build
+      - name: Build Preview Link
         env:
           APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }}
         run: yarn && MODE=preview yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
+        id: firebase_hosting_preview
         with:
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT }}"
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}'
           expires: 30d
+
+  lhci:
+    name: Lighthouse
+    runs-on: ubuntu-latest
+    needs: build_and_preview
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Lighthouse CI
+        run: sudo yarn global add @lhci/[email protected]
+      - name: Run Lighthouse CI
+        run: lhci autorun --collect.url=${{ needs.build_and_preview.outputs.output1 }}?app-config=gnnuzabk --config=./lighthouserc.js
diff --git a/.github/workflows/lhci.yml b/.github/workflows/lhci.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ name: Release
 on:
   # Triggers the workflow on push or pull request events but only for the "develop" branch
   push:
-    branches: ['develop']
+    branches: ['release']
 
 jobs:
   create-new-release-version:

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ yarn-error.log
 .firebase
 firebase-debug.log
 .stylelintcache
+.lighthouseci
 
 # os or editor
 .idea

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## [4.23.2](https://github.com/jwplayer/ott-web-app/compare/v4.23.1...v4.23.2) (2023-07-06)
+
+
+### Bug Fixes
+
+* **deps:** bump @sideway/formula from 3.0.0 to 3.0.1 ([#309](https://github.com/jwplayer/ott-web-app/issues/309)) ([8dbb314](https://github.com/jwplayer/ott-web-app/commit/8dbb3145a866237b9cb07e2e61caf69bac2a1d55))
+
+
+
+## [4.23.1](https://github.com/jwplayer/ott-web-app/compare/v4.23.0...v4.23.1) (2023-07-06)
+
+
+### Bug Fixes
+
+* **project:** add meta tag for GA ([#330](https://github.com/jwplayer/ott-web-app/issues/330)) ([87db5f9](https://github.com/jwplayer/ott-web-app/commit/87db5f9a5dc2ab42117267933b5a914825a756bb))
+
+
+
+# [4.23.0](https://github.com/jwplayer/ott-web-app/compare/v4.22.0...v4.23.0) (2023-07-06)
+
+
+### Features
+
+* av ([743af3e](https://github.com/jwplayer/ott-web-app/commit/743af3e4b855fed61178f2b8f52757edeb944e6f))
+* code cleanup ([13a1e21](https://github.com/jwplayer/ott-web-app/commit/13a1e2120adf9486fb4e34b8544726811331c4c3))
+* comment fix ([6ab4dcb](https://github.com/jwplayer/ott-web-app/commit/6ab4dcbff33f95539cbf8c20fc18b67976463f07))
+* fix vite config definition ([2d772ed](https://github.com/jwplayer/ott-web-app/commit/2d772ed52ae835485fe48ffc4a0b3352ab9edcb5))
+* oiid for analytics ([898f94a](https://github.com/jwplayer/ott-web-app/commit/898f94a6683dfcc18020deef90fc8a1bc987b6b3))
+* update docs ([1fa1bcf](https://github.com/jwplayer/ott-web-app/commit/1fa1bcf093ff24514ead4e2a4ae943badf6f0871))
+
+
+
 # [4.22.0](https://github.com/jwplayer/ott-web-app/compare/v4.21.0...v4.22.0) (2023-07-05)
 
 

diff --git a/docs/features/video-analytics.md b/docs/features/video-analytics.md
@@ -79,12 +79,12 @@ These metrics are described below.
 
 ### App Metrics
 
-| Name                    | Key  | Rqd | Values              | Example                                  | Description                                         |
-| ----------------------- | ---- | --- | ------------------- | ---------------------------------------- | --------------------------------------------------- |
-| App Version             | av   | Yes | A string            | 1.0.0                                    | Version of the App                                  |
-| App Bundle ID           | bun  | Yes | Reverse domain name | com.apple.calculator                     | Unique ID to the App; persists through uninstalls.  |
-| App User ID             | oaid | Yes | \[0-9a-z\]{40}      | 51f8cf1797aac87ede45c2883797f124fed0258d | Hash of the app user account login ID. <sup>1</sub> |
-| App Install Instance ID | oiid | No  | \[0-9a-z\]{40}      | 51f8cf1797aac87ede45c2883797f124fed0258d | App install instance ID. Resets with reinstalls     |
+| Name          | Key  | Rqd | Values              | Example                                  | Description                                         |
+| ------------- | ---- | --- | ------------------- | ---------------------------------------- | --------------------------------------------------- |
+| App Version   | av   | Yes | A string            | 1.0.0                                    | Version of the App                                  |
+| App Bundle ID | bun  | Yes | Reverse domain name | com.apple.calculator                     | Unique ID to the App; persists through uninstalls.  |
+| App User ID   | oaid | Yes | \[0-9a-z\]{40}      | 51f8cf1797aac87ede45c2883797f124fed0258d | Hash of the app user account login ID. <sup>1</sub> |
+| App Config ID | oiid | No  | \[0-9a-z\]{8}       | dGSUzs9o                                 | Unique ID of app config.                            |
 
 <sup>1</sup> For Cleeng `oaid` maps to the `subscriberId`
 

diff --git a/lighthouserc.js b/lighthouserc.js
@@ -1,16 +1,19 @@
 module.exports = {
   ci: {
     collect: {
-      url: ['http://127.0.0.1:4000'],
-      startServerCommand: 'http-server ./build -p 4000 -g',
-      startServerReadyPattern: 'Available on',
-      numberOfRuns: 1,
+      numberOfRuns: 3,
     },
     upload: {
       target: 'temporary-public-storage',
     },
     assert: {
-      preset: 'lighthouse:no-pwa',
+      assertions: {
+        'categories:performance': ['warn', { minScore: 0.9 }],
+        'categories:seo': ['error', { minScore: 0.9 }],
+        'categories:accessibility': ['warn', { minScore: 0.9 }],
+        'categories:best-practices': ['warn', { minScore: 0.9 }],
+        'categories:pwa': ['warn', { minScore: 0.9 }],
+      },
     },
   },
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jw-ott-webapp",
-  "version": "4.22.0",
+  "version": "4.23.2",
   "main": "index.js",
   "repository": "https://github.com/jwplayer/ott-web-app.git",
   "author": "JW Player",
@@ -87,7 +87,7 @@
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
     "@vitejs/plugin-react": "^1.0.7",
-    "@vitest/coverage-c8": "^0.25.7",
+    "@vitest/coverage-c8": "^0.32.4",
     "allure-commandline": "^2.17.2",
     "codeceptjs": "3.4.1",
     "confusing-browser-globals": "^1.0.10",
@@ -122,13 +122,13 @@
     "tsconfig-paths": "^4.1.0",
     "typescript": "^4.3.4",
     "vi-fetch": "^0.8.0",
-    "vite": "^4.0.0",
+    "vite": "^4.4.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-pwa": "^0.14.0",
     "vite-plugin-static-copy": "^0.13.0",
     "vite-plugin-stylelint": "^4.0.1",
-    "vitest": "^0.25.7",
+    "vitest": "^0.32.3",
     "workbox-build": "^6.5.4",
     "workbox-window": "^6.5.4"
   },

diff --git a/public/jwpltx.js b/public/jwpltx.js
@@ -90,13 +90,15 @@ window.jwpltx = window.jwpltx || {};
   }
 
   // Process a player ready event
-  o.ready = function (aid, bun, fed, id, t, oaid) {
+  o.ready = function (aid, bun, fed, id, t, oaid, oiid, av) {
     uri = JSON.parse(JSON.stringify(URI));
     uri.aid = aid;
     uri.bun = bun;
     uri.fed = fed;
     uri.id = id;
     uri.t = t;
+    uri.oiid = oiid;
+    uri.av = av;
 
     // Send oaid only for logged in users
     if (oaid) {

diff --git a/public/locales/en/account.json b/public/locales/en/account.json
@@ -64,6 +64,7 @@
     "field_required": "This field is required",
     "monthly": "Monthly",
     "monthly_subscription": "Monthly subscription",
+    "no_pricing_available": "There are no pricing options available at the moment.",
     "offer_not_found": "Offer not found, please try reloading the page",
     "one_time_only": "This video",
     "subscription": "Subscription",

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -12,6 +12,7 @@
     "confirm": "Yes"
   },
   "default_site_name": "My OTT Application",
+  "default_description": "JW OTT Webapp is an open-source, dynamically generated video website.",
   "filter_videos_by": "Filter videos by {{name}}",
   "filter_videos_by_genre": "Filter videos by genre",
   "home": "Home",

diff --git a/public/locales/en/demo.json b/public/locales/en/demo.json
@@ -1,5 +1,6 @@
 {
   "app_config_not_found": "Invalid or Missing App Config",
+  "app_config_learn_more": "Learn more about App Configs",
   "cancel_config_id": "Cancel",
   "click_to_unselect_config": "(click here to unselect this config)",
   "currently_previewing_config": "You are currently previewing config: '{{configSource}}'",

diff --git a/public/locales/en/user.json b/public/locales/en/user.json
@@ -67,6 +67,7 @@
     "access_granted": "access granted",
     "add_card_details": "Add card details",
     "annual_subscription": "Annual subscription",
+    "billing_history": "Billing history",
     "cancel_subscription": "Cancel subscription",
     "card_number": "Card number",
     "change_subscription": "Change subscription",
@@ -85,15 +86,14 @@
     "other": "other",
     "payment_method": "Payment method",
     "pending_offer_switch": "Will update to a \"{{title}}\" after the next billing date",
-    "price_payed_with": "{{price}} payed with {{method}}",
-    "price_payed_with_card": "Price payed with card",
+    "price_paid_with": "{{price}} paid with {{method}}",
+    "price_paid_with_card": "Price paid with card",
     "renew_subscription": "Renew subscription",
     "security_code": "Security code",
     "show_all": "Show all",
     "show_receipt": "Show receipt",
     "subscription_details": "Subscription details",
     "subscription_expires_on": "This plan will expire on {{date}}",
-    "transactions": "Transactions",
     "update_payment_details": "Update payment details",
     "weekly_subscription": "Weekly subscription"
   }

diff --git a/public/locales/es/account.json b/public/locales/es/account.json
@@ -69,6 +69,7 @@
     "field_required": "Este campo es obligatorio",
     "monthly": "Mensual",
     "monthly_subscription": "Suscripción mensual",
+    "no_pricing_available": "No hay opciones de precios disponibles en este momento.",
     "offer_not_found": "Oferta no encontrada, por favor intenta volver a cargar la página",
     "one_time_only": "Este video",
     "subscription": "Suscripción",

diff --git a/public/locales/es/common.json b/public/locales/es/common.json
@@ -12,6 +12,7 @@
     "confirm": "Sí"
   },
   "default_site_name": "Mi aplicación OTT",
+  "default_description": "",
   "filter_videos_by": "Filtrar videos por {{name}}",
   "filter_videos_by_genre": "Filtrar videos por género",
   "home": "Inicio",

diff --git a/public/locales/es/demo.json b/public/locales/es/demo.json
@@ -1,5 +1,6 @@
 {
   "app_config_not_found": "Configuración de aplicación inválida o no encontrada",
+  "app_config_learn_more": "",
   "cancel_config_id": "Cancelar",
   "click_to_unselect_config": "(haz clic aquí para deseleccionar esta configuración)",
   "currently_previewing_config": "Actualmente estás previsualizando la configuración: '{{configSource}}'",

diff --git a/public/locales/es/user.json b/public/locales/es/user.json
@@ -67,6 +67,7 @@
     "access_granted": "acceso concedido",
     "add_card_details": "Agregar detalles de la tarjeta",
     "annual_subscription": "Suscripción anual",
+    "billing_history": "Historial de facturación",
     "cancel_subscription": "Cancelar suscripción",
     "card_number": "Número de tarjeta",
     "change_subscription": "Cambiar suscripción",
@@ -86,15 +87,14 @@
     "other": "otro",
     "payment_method": "Método de pago",
     "pending_offer_switch": "Se actualizará a \"{{title}}\" después de la próxima fecha de facturación",
-    "price_payed_with": "{{price}} pagado con {{method}}",
-    "price_payed_with_card": "Precio pagado con tarjeta",
+    "price_paid_with": "{{price}} pagado con {{method}}",
+    "price_paid_with_card": "Precio pagado con tarjeta",
     "renew_subscription": "Renovar suscripción",
     "security_code": "Código de seguridad",
     "show_all": "Mostrar todo",
     "show_receipt": "Mostrar recibo",
     "subscription_details": "Detalles de la suscripción",
     "subscription_expires_on": "Este plan expirará el {{date}}",
-    "transactions": "Transacciones",
     "update_payment_details": "Actualizar detalles de pago",
     "weekly_subscription": "Suscripción semanal"
   }