feat(series): node update

jwplayer · May 6, 2023 · cbbfde5 · cbbfde5
1 parent 4dcff53
commit cbbfde5
Show file tree

Hide file tree

Showing 10 changed files with 211 additions and 510 deletions.
diff --git a/.github/workflows/codeceptjs.yml b/.github/workflows/codeceptjs.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
         config: [desktop, mobile]
 
     steps:

diff --git a/.github/workflows/lhci.yml b/.github/workflows/lhci.yml
@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: yarn install, build
         run: |
           yarn install

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v1

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "author": "JW Player",
   "private": true,
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "prepare": "husky install",
@@ -86,7 +86,7 @@
     "@vitejs/plugin-react": "^1.0.7",
     "@vitest/coverage-c8": "^0.25.7",
     "allure-commandline": "^2.17.2",
-    "codeceptjs": "3.3.0",
+    "codeceptjs": "3.4.1",
     "confusing-browser-globals": "^1.0.10",
     "depcheck": "^1.4.3",
     "eslint": "^7.31.0",

diff --git a/src/pages/ScreenRouting/mediaScreens/MediaSeriesEpisode/MediaSeriesEpisode.tsx b/src/pages/ScreenRouting/mediaScreens/MediaSeriesEpisode/MediaSeriesEpisode.tsx
@@ -161,7 +161,7 @@ const MediaSeriesEpisode: ScreenComponent<PlaylistItem> = ({ data: episode, isLo
           <meta property="og:video:tag" content={tag} key={tag} />
         ))}
         {seriesPlaylist && enrichedEpisode ? (
-          <script type="application/ld+json">{generateEpisodeJSONLD(seriesPlaylist, series, enrichedEpisode, seriesId, feedId)}</script>
+          <script type="application/ld+json">{generateEpisodeJSONLD(seriesPlaylist, series, enrichedEpisode, seriesId)}</script>
         ) : null}
       </Helmet>
       <VideoLayout

diff --git a/src/utils/structuredData.ts b/src/utils/structuredData.ts
@@ -22,14 +22,8 @@ export const generateSeriesMetadata = (series: Series | undefined, seriesPlaylis
   };
 };
 
-export const generateEpisodeJSONLD = (
-  seriesPlaylist: Playlist,
-  series: Series | undefined,
-  episode: PlaylistItem,
-  seriesId: string | undefined,
-  feedId: string | undefined,
-) => {
-  const episodeCanonical = `${window.location.origin}${episodeURL({ episode, playlistId: feedId, seriesId })}`;
+export const generateEpisodeJSONLD = (seriesPlaylist: Playlist, series: Series | undefined, episode: PlaylistItem, seriesId: string | undefined) => {
+  const episodeCanonical = `${window.location.origin}${episodeURL({ episode, seriesId })}`;
   const seriesMetadata = generateSeriesMetadata(series, seriesPlaylist, seriesId);
 
   return JSON.stringify({

diff --git a/test-e2e/codecept.desktop.js b/test-e2e/codecept.desktop.js
@@ -16,7 +16,7 @@ exports.config = {
     Playwright: {
       url: 'http://localhost:8080',
       show: !!process.env.SHOW,
-      channel: 'chrome',
+      browser: 'chromium',
       locale: 'en-US',
     },
   },

diff --git a/test-e2e/tests/seo_test.ts b/test-e2e/tests/seo_test.ts
@@ -44,7 +44,7 @@ Scenario('It renders the correct meta tags for the movie screen', async ({ I })
 Scenario('It renders the correct structured metadata for the movie screen', async ({ I }) => {
   await I.openVideoCard(constants.agent327Title);
 
-  const url = await I.grabCurrentUrl();
+  const url = removeQueryParam(await I.grabCurrentUrl(), 'r');
 
   I.seeTextEquals(
     JSON.stringify({