Merge branch 'master' into develop

# Conflicts:
#	changelog.md
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js.map
#	package.json
This commit is contained in:
Sam Potts
2018-07-18 21:44:39 +10:00
16 changed files with 460 additions and 46 deletions

View File

@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "3.3.17",
"version": "3.3.22",
"description":
"A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "https://plyr.io",
@ -31,7 +31,8 @@
},
"scripts": {
"build": "gulp build",
"lint": "eslint src/js",
"lint": "eslint src/js && npm run-script remark",
"remark": "remark -f --use 'validate-links=repository:\"sampotts/plyr\"' '{,!(node_modules),.?**/}*.md'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"devDependencies": {
@ -67,6 +68,8 @@
"postcss-custom-properties": "^7.0.0",
"prettier-eslint": "^8.8.2",
"prettier-stylelint": "^0.4.2",
"remark-cli": "^5.0.0",
"remark-validate-links": "^7.0.0",
"rollup-plugin-babel": "^3.0.7",
"rollup-plugin-commonjs": "^9.1.3",
"rollup-plugin-node-resolve": "^3.3.0",