Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update tests and pages for video.js 7 #102

Merged
merged 2 commits into from
Jun 6, 2018
Merged

Conversation

forbesjo
Copy link
Contributor

@forbesjo forbesjo commented May 31, 2018

Description

This PR updates all references to the video.js script to video.core.js so that VHS doesn't double up. This isn't totally necessary since VHS should be prepended to the source handler list but it's better to be safe. The package-lock is also updated to install video.js 7.0.3.

This PR requires videojs/video.js#5220

Requirements Checklist

  • If necessary, more likely in a feature request than a bug fix
    • Unit Tests updated or fixed
    • Docs/guides updated
  • Reviewed by Two Core Contributors

Copy link
Contributor

@OshinKaramian OshinKaramian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved when the changes are consumed in the noted PR and tests have passed.

package.json Outdated
@@ -65,7 +65,7 @@
"mpd-parser": "0.6.1",
"mux.js": "4.4.1",
"url-toolkit": "^2.1.3",
"video.js": "^6.8.0 || ^7.0.0"
"video.js": "^6.8.0 || ^7.0.3"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just need to update this to 7.0.4 (or whatever version the changes in video.core.js are in) when the time comes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well this really indicates what versions of video.js are compatible with VHS, I should actually bump this down to ^7.0.0 and update the lock file to 7.0.4 when that's out

@forbesjo forbesjo merged commit d6f5005 into videojs:master Jun 6, 2018
@forbesjo forbesjo deleted the 7 branch June 6, 2018 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants