Merge pull request #266 from tjallingt/canary

chore: release

Author: tjallingt

.github/workflows/commitlint.yml

@@ -11,6 +11,4 @@ jobs:
         with:
           fetch-depth: 0
       - name: Lint commit messages
-        uses: wagoid/commitlint-github-action@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: wagoid/commitlint-github-action@v2

.github/workflows/deploy.yml

@@ -21,7 +21,7 @@ jobs:
         run: yarn example:build
       - name: Deploy to GitHub pages
         if: success()
-        uses: crazy-max/ghaction-github-pages@v1
+        uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-pages
           build_dir: build

index.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { YouTubePlayer } from 'youtube-player/dist/types';
 
 export interface PlayerVars {
   autoplay?: 0 | 1;
@@ -37,14 +38,14 @@ export interface YouTubeProps {
   className?: string;
   containerClassName?: string;
   opts?: Options;
-  onReady?(event: { target: YT.Player }): void;
-  onError?(event: { target: YT.Player; data: number }): void;
-  onPlay?(event: { target: YT.Player; data: number }): void;
-  onPause?(event: { target: YT.Player; data: number }): void;
-  onEnd?(event: { target: YT.Player; data: number }): void;
-  onStateChange?(event: { target: YT.Player; data: number }): void;
-  onPlaybackRateChange?(event: { target: YT.Player; data: number }): void;
-  onPlaybackQualityChange?(event: { target: YT.Player; data: string }): void;
+  onReady?(event: { target: YouTubePlayer }): void;
+  onError?(event: { target: YouTubePlayer; data: number }): void;
+  onPlay?(event: { target: YouTubePlayer; data: number }): void;
+  onPause?(event: { target: YouTubePlayer; data: number }): void;
+  onEnd?(event: { target: YouTubePlayer; data: number }): void;
+  onStateChange?(event: { target: YouTubePlayer; data: number }): void;
+  onPlaybackRateChange?(event: { target: YouTubePlayer; data: number }): void;
+  onPlaybackQualityChange?(event: { target: YouTubePlayer; data: string }): void;
 }
 
 export default class YouTube extends React.Component<YouTubeProps> {
@@ -56,5 +57,5 @@ export default class YouTube extends React.Component<YouTubeProps> {
     BUFFERING: number;
     CUED: number;
   };
-  getInternalPlayer(): YT.Player;
+  getInternalPlayer(): YouTubePlayer;
 }

package.json

@@ -31,40 +31,41 @@
     "youtube-player": "5.5.2"
   },
   "devDependencies": {
-    "@babel/cli": "7.10.5",
-    "@babel/core": "7.11.4",
-    "@babel/plugin-proposal-class-properties": "7.10.1",
-    "@babel/preset-env": "7.11.0",
-    "@babel/preset-react": "7.10.4",
+    "@babel/cli": "7.12.1",
+    "@babel/core": "7.12.3",
+    "@babel/plugin-proposal-class-properties": "7.12.1",
+    "@babel/preset-env": "7.12.1",
+    "@babel/preset-react": "7.12.1",
     "@commitlint/cli": "9.1.2",
     "@commitlint/config-conventional": "9.1.2",
     "@testing-library/jest-dom": "5.11.4",
-    "@testing-library/react": "10.4.9",
+    "@testing-library/react": "11.1.0",
     "@types/youtube": "0.0.39",
+    "@types/youtube-player": "5.5.3",
     "babel-eslint": "10.1.0",
-    "babel-jest": "26.3.0",
+    "babel-jest": "26.5.2",
     "babel-loader": "8.1.0",
-    "commitizen": "4.1.5",
+    "commitizen": "4.2.1",
     "cross-env": "7.0.2",
-    "cz-conventional-changelog": "3.2.0",
+    "cz-conventional-changelog": "3.3.0",
     "eslint": "6.8.0",
-    "eslint-config-prettier": "6.11.0",
+    "eslint-config-prettier": "6.13.0",
     "eslint-config-react-app": "5.2.1",
     "eslint-plugin-flowtype": "4.7.0",
-    "eslint-plugin-import": "2.22.0",
+    "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.3.1",
     "eslint-plugin-prettier": "3.1.4",
-    "eslint-plugin-react": "7.20.6",
+    "eslint-plugin-react": "7.21.4",
     "eslint-plugin-react-hooks": "2.5.1",
-    "husky": "4.2.5",
-    "jest": "26.4.2",
-    "lint-staged": "10.2.11",
+    "husky": "4.3.0",
+    "jest": "26.5.3",
+    "lint-staged": "10.4.2",
     "npm-run-all": "4.1.5",
     "parcel-bundler": "1.12.4",
-    "prettier": "2.0.5",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "semantic-release": "17.1.1"
+    "prettier": "2.1.2",
+    "react": "16.14.0",
+    "react-dom": "16.14.0",
+    "semantic-release": "17.2.1"
   },
   "peerDependencies": {
     "@types/youtube": "^0.0.38",

src/YouTube.js

@@ -34,10 +34,10 @@ function filterResetOptions(opts) {
   return {
     ...opts,
     playerVars: {
-      ...opts.playerVars,
       autoplay: 0,
       start: 0,
       end: 0,
+      ...opts.playerVars,
     },
   };
 }

src/Youtube.test.js

@@ -94,7 +94,7 @@ describe('YouTube', () => {
     expect(playerMock.destroy).toHaveBeenCalled();
   });
 
-  it('should NOT create and bind a new YouTube player when props.videoId, playerVars.autoplay, playerVars.start, or playerVars.end change', () => {
+  it('should create and bind a new YouTube player when props.videoId, playerVars.autoplay, playerVars.start, or playerVars.end change', () => {
     const { rerender } = render(
       <YouTube
         videoId="XxVg_s8xAms"
@@ -125,8 +125,8 @@ describe('YouTube', () => {
       />,
     );
 
-    // player is NOT destroyed & rebound, despite the changes
-    expect(playerMock.destroy).not.toHaveBeenCalled();
+    // player is destroyed & rebound, despite the changes
+    expect(playerMock.destroy).toHaveBeenCalled();
     // instead only the video is updated
     expect(playerMock.loadVideoById).toHaveBeenCalled();
   });