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.

Sign up for GitHub

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

[pull] master from bytedance:master #29

Merged
merged 4 commits into from
Nov 14, 2022
Merged

[pull] master from bytedance:master #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea9777b
chore: 🤖 upgrade sass-loader,use the sass implementation direct
gemxx Nov 14, 2022
57022a2
fix: 🐛 The danmu layer occlusion covers the video element
gemxx Nov 14, 2022
b2fb550
chore: 🤖 (xgplayer) publish version -> 2.32.2
gemxx Nov 14, 2022
287cb35
chore: 🤖 update xgplayer verion -> 2.32.2
gemxx Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/xgplayer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xgplayer",
"version": "2.32.1",
"version": "2.32.2",
"description": "video player",
"main": "./dist/index.js",
"typings": "./types/index.d.ts",
Expand Down Expand Up @@ -57,11 +57,11 @@
"core-js": "^2.5.4",
"css-loader": "^0.28.11",
"json-loader": "^0.5.7",
"node-sass": "^4.8.3",
"postcss-cssnext": "^3.1.0",
"postcss-loader": "^2.1.5",
"raw-loader": "^2.0.0",
"sass-loader": "^6.0.7",
"sass": "^1.56.1",
"sass-loader": "^10.3.1",
"style-loader": "^0.20.3",
"sugarss": "^1.0.1",
"uglifyjs-webpack-plugin": "^2.2.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/xgplayer/src/skin/style/controls/danmu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
overflow: hidden;
z-index: 9;
outline: none;
pointer-events: none;
> * {
position: absolute;
white-space: nowrap;
z-index: 9;
pointer-events: auto;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/xgplayer/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "2.32.1"
"version": "2.32.2"
}
37 changes: 21 additions & 16 deletions packages/xgplayer/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,40 @@ const rules = [{
}
},
'postcss-loader',
'sass-loader'
{
loader: 'sass-loader',
options: {
implementation: require('sass')
}
}
]
}, {
test: /\.svg/,
loader: 'raw-loader'
}];
}]

const umdModuleConfig = {
rules
};
}

const babelModuleConfig = {
rules: rules.concat({
test:/\.(js|jsx)$/,
use:{
loader:'babel-loader',
options:{
presets:[
test: /\.(js|jsx)$/,
use: {
loader: 'babel-loader',
options: {
presets: [
'es2015'
],
plugins: [
"add-module-exports",
"babel-plugin-bulk-import"
'add-module-exports',
'babel-plugin-bulk-import'
]
}
},
exclude:/node_modules/
exclude: /node_modules/
})
};
}

const umd = {
entry: {
Expand Down Expand Up @@ -107,10 +112,10 @@ const client = {
}
}

const controls = ['airplay', 'cssFullscreen', 'danmu', 'definition', 'download', 'enter', 'error', 'errorRetry',
'flex', 'fullscreen', 'i18n', 'keyboard', 'loading', 'localPreview', 'memoryPlay', 'miniplayer', 'mobile', 'pc',
'pip', 'play', 'playbackRate', 'playNext', 'poster', 'progress', 'reload', 'replay', 'rotate', 'screenShot',
'start', 'textTrack', 'nativeTextTrack', 'time', 'volume'];
const controls = ['airplay', 'cssFullscreen', 'danmu', 'definition', 'download', 'enter', 'error', 'errorRetry',
'flex', 'fullscreen', 'i18n', 'keyboard', 'loading', 'localPreview', 'memoryPlay', 'miniplayer', 'mobile', 'pc',
'pip', 'play', 'playbackRate', 'playNext', 'poster', 'progress', 'reload', 'replay', 'rotate', 'screenShot',
'start', 'textTrack', 'nativeTextTrack', 'time', 'volume']

const umd_es6_controls = controls.map(key => {
return {
Expand Down