Skip to content

Commit

Permalink
chore: update workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
DIYgod committed Sep 23, 2019
1 parent 4ddc860 commit cb95daa
Show file tree
Hide file tree
Showing 16 changed files with 1,412 additions and 823 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
demo
29 changes: 12 additions & 17 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"extends": "eslint:recommended",
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
"plugins": ["prettier"],
"parserOptions": {
"ecmaVersion": 10,
"ecmaVersion": 2018,
"sourceType": "module"
},
"env": {
"browser": true
"es6": true,
"browser": true,
"node": true,
},
"rules": {
"no-console": 0,
"no-extra-parens": 1,
"block-scoped-var": 1,
"curly": 1,
"eqeqeq": 1,
Expand All @@ -20,7 +22,6 @@
"comma-spacing": 1,
"comma-style": 1,
"func-call-spacing": 1,
"indent": 1,
"keyword-spacing": 1,
"linebreak-style": 1,
"lines-around-comment": 1,
Expand All @@ -31,14 +32,12 @@
"prefer-const": 1,
"no-unsafe-negation": 1,
"array-callback-return": 1,
"dot-location": 1,
"dot-notation": 1,
"no-eval": 1,
"no-extend-native": 1,
"no-extra-label": 1,
"semi": 1,
"space-before-blocks": 1,
"space-before-function-paren": 1,
"space-in-parens": 1,
"space-unary-ops": 1,
"spaced-comment": 1,
Expand All @@ -50,14 +49,10 @@
"no-useless-rename": 1,
"rest-spread-spacing": 1,
"no-trailing-spaces": 1,
"quotes": [1, "single"]
},
"globals": {
"require": false,
"module": false,
"Hls": false,
"flvjs": false,
"dashjs": false,
"WebTorrent": false
"no-control-regex": 0,
"prettier/prettier": 0,
"no-await-in-loop": 1,
"require-atomic-updates": 0,
"no-prototype-builtins": 0
}
}
}
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
demo
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"printWidth": 233,
"tabWidth": 4,
"singleQuote": true,
"trailingComma": "es5",
"arrowParens": "always"
}
4 changes: 0 additions & 4 deletions dist/DPlayer.min.css

This file was deleted.

1 change: 0 additions & 1 deletion dist/DPlayer.min.css.map

This file was deleted.

2 changes: 1 addition & 1 deletion dist/DPlayer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/DPlayer.min.js.map

Large diffs are not rendered by default.

149 changes: 80 additions & 69 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,71 +1,82 @@
{
"name": "dplayer",
"version": "1.25.0",
"description": "Wow, such a lovely HTML5 danmaku video player",
"main": "dist/DPlayer.min.js",
"style": "dist/DPlayer.min.css",
"scripts": {
"start": "npm run dev",
"build": "cross-env NODE_ENV=production webpack --config webpack/prod.config.js --progress --display-error-details --colors",
"dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack/dev.config.js --watch --colors",
"test": "eslint src webpack",
"docs:dev": "vuepress dev docs",
"docs:build": "vuepress build docs"
},
"files": [
"dist"
],
"repository": {
"url": "git+https://github.com/DIYgod/DPlayer.git",
"type": "git"
},
"keywords": [
"player",
"danmaku",
"video",
"html5"
],
"author": "DIYgod",
"license": "MIT",
"bugs": {
"url": "https://github.com/DIYgod/DPlayer/issues"
},
"homepage": "https://github.com/DIYgod/DPlayer#readme",
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@vuepress/plugin-back-to-top": "1.0.1",
"@vuepress/plugin-google-analytics": "1.0.1",
"@vuepress/plugin-pwa": "1.0.1",
"art-template": "4.13.2",
"art-template-loader": "1.4.3",
"autoprefixer": "^9.6.0",
"babel-loader": "^8.0.6",
"cross-env": "^5.2.0",
"css-loader": "^2.1.1",
"cssnano": "^4.1.10",
"eslint": "^5.16.0",
"eslint-loader": "^2.1.2",
"exports-loader": "^0.7.0",
"file-loader": "^4.0.0",
"git-revision-webpack-plugin": "^3.0.3",
"mini-css-extract-plugin": "0.7.0",
"node-sass": "^4.12.0",
"postcss-loader": "^3.0.0",
"sass-loader": "^7.1.0",
"strip-loader": "^0.1.2",
"style-loader": "^1.0.0",
"svg-inline-loader": "0.8.0",
"template-string-optimize-loader": "^3.0.0",
"url-loader": "^2.0.0",
"vuepress": "1.0.1",
"webpack": "^4.33.0",
"webpack-cli": "3.3.2",
"webpack-dev-server": "^3.6.0"
},
"dependencies": {
"axios": "0.19.0",
"balloon-css": "^0.5.0",
"promise-polyfill": "8.1.0"
}
"name": "dplayer",
"version": "1.25.0",
"description": "Wow, such a lovely HTML5 danmaku video player",
"main": "dist/DPlayer.min.js",
"scripts": {
"start": "npm run dev",
"build": "cross-env NODE_ENV=production webpack --config webpack/prod.config.js --progress --display-error-details --colors",
"dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack/dev.config.js --watch --colors",
"test": "eslint src webpack",
"format": "eslint \"**/*.js\" --fix && prettier \"**/*.{js,json,md}\" --write",
"format:staged": "eslint \"**/*.js\" --fix && pretty-quick --staged --verbose --pattern \"**/*.{js,json,md}\"",
"format:check": "eslint \"**/*.js\" && prettier-check \"**/*.{js,json,md}\"",
"docs:dev": "vuepress dev docs",
"docs:build": "vuepress build docs"
},
"files": [
"dist"
],
"repository": {
"url": "git+https://github.com/DIYgod/DPlayer.git",
"type": "git"
},
"keywords": [
"player",
"danmaku",
"video",
"html5"
],
"gitHooks": {
"pre-commit": "npm run format:staged"
},
"author": "DIYgod",
"license": "MIT",
"bugs": {
"url": "https://github.com/DIYgod/DPlayer/issues"
},
"homepage": "https://github.com/DIYgod/DPlayer#readme",
"devDependencies": {
"@babel/core": "^7.6.0",
"@babel/preset-env": "^7.4.5",
"@vuepress/plugin-back-to-top": "1.1.0",
"@vuepress/plugin-google-analytics": "1.1.0",
"@vuepress/plugin-pwa": "1.1.0",
"art-template": "4.13.2",
"art-template-loader": "1.4.3",
"autoprefixer": "^9.6.1",
"babel-loader": "^8.0.6",
"cross-env": "^6.0.0",
"css-loader": "^3.2.0",
"cssnano": "^4.1.10",
"eslint": "^6.4.0",
"eslint-config-prettier": "^6.3.0",
"eslint-loader": "^3.0.0",
"eslint-plugin-prettier": "^3.1.1",
"exports-loader": "^0.7.0",
"file-loader": "^4.0.0",
"git-revision-webpack-plugin": "^3.0.3",
"mini-css-extract-plugin": "0.8.0",
"node-sass": "^4.12.0",
"postcss-loader": "^3.0.0",
"prettier": "^1.18.2",
"prettier-check": "^2.0.0",
"pretty-quick": "^1.11.1",
"sass-loader": "^8.0.0",
"strip-loader": "^0.1.2",
"style-loader": "^1.0.0",
"svg-inline-loader": "0.8.0",
"template-string-optimize-loader": "^3.0.0",
"url-loader": "^2.1.0",
"vuepress": "1.1.0",
"webpack": "^4.40.2",
"webpack-cli": "3.3.9",
"webpack-dev-server": "^3.8.1",
"yorkie": "^2.0.0"
},
"dependencies": {
"axios": "0.19.0",
"balloon-css": "^1.0.3",
"promise-polyfill": "8.1.3"
}
}
11 changes: 5 additions & 6 deletions src/js/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import defaultApiBackend from './api.js';

export default (options) => {

// default options
const defaultOption = {
container: options.element || document.getElementsByClassName('dplayer')[0],
Expand All @@ -19,7 +18,7 @@ export default (options) => {
video: {},
contextmenu: [],
mutex: true,
pluginOptions:{hls:{},flvjs:{},dash:{},webtorrent:{}}
pluginOptions: { hls: {}, flvjs: {}, dash: {}, webtorrent: {} },
};
for (const defaultKey in defaultOption) {
if (defaultOption.hasOwnProperty(defaultKey) && !options.hasOwnProperty(defaultKey)) {
Expand Down Expand Up @@ -52,16 +51,16 @@ export default (options) => {
text: 'Video info',
click: (player) => {
player.infoPanel.triggle();
}
},
},
{
text: 'About author',
link: 'https://diygod.me'
link: 'https://diygod.me',
},
{
text: `DPlayer v${DPLAYER_VERSION}`,
link: 'https://github.com/MoePlayer/DPlayer'
}
link: 'https://github.com/MoePlayer/DPlayer',
},
]);

return options;
Expand Down
Loading

0 comments on commit cb95daa

Please sign in to comment.