Merge branch 'release/v4.0.0-beta.2' into next-v4

canalplus · Jun 27, 2023 · ab78c0f · ab78c0f
2 parents cd56ce0 + f2b037d
commit ab78c0f
Show file tree

Hide file tree

Showing 10 changed files with 1,448 additions and 1,325 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,13 @@
 
 ### Changes
 
-  - If all Representations from the current track become undecipherable, automatically switch to another track (also send a `trackUpdate` event) instead of stopping on error [#1240]
-  - Only send `MediaError` errors with the `NO_PLAYABLE_REPRESENTATION` error code when no Representation from all tracks of a given type can be played [#1240]
+  - If all Representations from the current track become undecipherable, automatically switch to another track (also send a `trackUpdate` event) instead of stopping on error [#1234]
+  - Only send `MediaError` errors with the `NO_PLAYABLE_REPRESENTATION` error code when no Representation from all tracks of a given type can be played [#1234]
 
 ### Features
 
-  - Add `representationListUpdate` event for when the list of available Representation for a current track changes [#877]
-  - Add `"no-playable-representation"` as a `reason` for `trackUpdate` events when the track switch is due to encrypted Representations [#1240]
+  - Add `representationListUpdate` event for when the list of available Representation for a current track changes [#1240]
+  - Add `"no-playable-representation"` as a `reason` for `trackUpdate` events when the track switch is due to encrypted Representations [#1234]
 
 ### Other improvements
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.31.0
+4.0.0-beta.2
diff --git a/dist/rx-player.js b/dist/rx-player.js
diff --git a/dist/rx-player.min.js b/dist/rx-player.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rx-player",
   "author": "Canal+",
-  "version": "3.31.0",
+  "version": "4.0.0-beta.2",
   "description": "Canal+ HTML5 Video Player",
   "main": "./dist/rx-player.js",
   "keywords": [

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.projectKey=rx-player
 sonar.organization=rx-player
 sonar.projectName=rx-player
-sonar.projectVersion=3.31.0
+sonar.projectVersion=4.0.0-beta.2
 sonar.sources=./src,./demo,./tests
 sonar.exclusions=demo/full/bundle.js,demo/standalone/lib.js,demo/bundle.js
 sonar.host.url=https://sonarcloud.io
diff --git a/src/core/api/public_api.ts b/src/core/api/public_api.ts
@@ -336,7 +336,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */"3.31.0";
+    this.version = /* PLAYER_VERSION */"4.0.0-beta.2";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -2756,7 +2756,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
   }
 }
-Player.version = /* PLAYER_VERSION */"3.31.0";
+Player.version = /* PLAYER_VERSION */"4.0.0-beta.2";
 
 /** Every events sent by the RxPlayer's public API. */
 interface IPublicAPIEvent {

diff --git a/tests/integration/scenarios/dash_forced-subtitles.js b/tests/integration/scenarios/dash_forced-subtitles.js
@@ -85,7 +85,7 @@ describe("DASH forced-subtitles content (SegmentTimeline)", function () {
           reject(err);
         }
       });
-      loadContent();
+      loadContent().catch(reject);
     });
   });
 });
diff --git a/tests/performance/src/main.js b/tests/performance/src/main.js
@@ -43,6 +43,9 @@ function sendLog(log) {
     headers: { "Content-Type": "application/json" },
     method: "POST",
     body: JSON.stringify({ type: "log", data: log }),
+  }).catch(err => {
+    // eslint-disable-next-line no-console
+    console.error("Error: Cannot send log due to a request error.", err);
   });
 }