diff --git a/.github/issue_template.md b/.github/issue_template.md index f503b944..60ea8df2 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,6 +1,4 @@ - +*Please _use this issue template_ as it makes replicating and fixing the issue easier for us. If you decide not to use it or you are vague your issue may be close instantly.* ### Expected behaviour @@ -14,4 +12,4 @@ Please use this issue template as it makes replicating and fixing the issue easi - Version: ### Steps to reproduce -- \ No newline at end of file +- diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 670d8a5b..f67d769f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -4,5 +4,5 @@ ### Checklist - [ ] Use `develop` as the base branch -- [ ] Exclude the gulp build from the PR +- [ ] Exclude the gulp build (`/dist` changes) from the PR - [ ] Test on [supported browsers](https://github.com/sampotts/plyr#browser-support) diff --git a/.gitignore b/.gitignore index 3089a163..878292b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ node_modules .DS_Store -aws.json +credentials.json *.mp4 !dist/blank.mp4 index-*.html diff --git a/.npmignore b/.npmignore index 6f9b5aae..32ff635b 100644 --- a/.npmignore +++ b/.npmignore @@ -2,7 +2,7 @@ demo .github .vscode *.code-workspace -aws.json +credentials.json bundles.json yarn.lock package-lock.json diff --git a/.stickler.yml b/.stickler.yml new file mode 100644 index 00000000..717ba28c --- /dev/null +++ b/.stickler.yml @@ -0,0 +1,5 @@ +linters: + eslint: +files: + ignore: + - 'node_modules/*' diff --git a/.travis.yml b/.travis.yml index d2722414..3203fb95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js -node_js: - - 'lts/*' +node_js: lts/* script: - - npm run lint - - npm run build +- bash .travis/prevent-base-master.sh +- bash .travis/omit-dist.sh +- npm run lint +- npm run build diff --git a/.travis/omit-dist.sh b/.travis/omit-dist.sh new file mode 100755 index 00000000..f107a6b9 --- /dev/null +++ b/.travis/omit-dist.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then + echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2 + exit 1 +fi diff --git a/.travis/prevent-base-master.sh b/.travis/prevent-base-master.sh new file mode 100755 index 00000000..54536a66 --- /dev/null +++ b/.travis/prevent-base-master.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then + echo 'The base branch for pull requests must be "develop"' >&2 + exit 1 +fi diff --git a/changelog.md b/changelog.md index 650fd0f5..a4a97934 100644 --- a/changelog.md +++ b/changelog.md @@ -1,12 +1,37 @@ -# v3.3.16 +# v3.3.22 + +- Travis & CI improvements (thanks @friday) +- Add navigator.languages fallback for iOS 9 (thanks @friday) + +# v3.3.21 - Hide currentTime and progress for streams (thanks @mimse) - Fixed condition check (thanks @mimse) - Handle undefined this.player.elements.buttons.play (thanks @klassicd) - Fix captions.toggle() if there is no toggle button (thanks @friday) -- Minor increaseVolume and decreaseVolume changes (thanks @friday) -- Fix YouTube muting after seeking with the progress slider (thanks @friday) -- Respect preload="none" when setting quality if the media hasn't been loaded some other way (thanks @friday) + +# v3.3.20 + +- Fix for bug where controls wouldn't show on hover over YouTube video + +# v3.3.19 + +- Remove `pointer-events: none` on embed `