Merge pull request bytedance#674 from bytedance/xgplayer-2

Xgplayer 2
ZhaoXinlong · Dec 6, 2021 · 31564a4 · 31564a4
2 parents e1ba340 + efa58c5
commit 31564a4
Show file tree

Hide file tree

Showing 18 changed files with 23,130 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -98,4 +98,4 @@ If you have any problem, please let us know.
 
 
 ### Join Us
-We welcome anyone with an interest in web media technology to join! Please contact us at  yinguohui@bytedance.com
+We welcome anyone with an interest in web media technology to join! Please contact us at  infra-fe@bytedance.com
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -102,6 +102,6 @@ $ npm run dev
 
 岗位类型：社招、校招、实习
 
-发送简历：yinguohui@bytedance.com
+发送简历：infra-fe@bytedance.com
 
 邮件标题格式：【简历】+ 姓名 ＋ 前端开发工程师 + 来源：xgplayer github
diff --git a/packages/xgplayer-hls.js/package.json b/packages/xgplayer-hls.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xgplayer-hls.js",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "xgplayer plugin for hls",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/packages/xgplayer/browser/core_player.js b/packages/xgplayer/browser/core_player.js
diff --git a/packages/xgplayer/browser/index.js b/packages/xgplayer/browser/index.js
diff --git a/packages/xgplayer/browser/simple_player.js b/packages/xgplayer/browser/simple_player.js
diff --git a/packages/xgplayer/dist/core_player.js b/packages/xgplayer/dist/core_player.js
diff --git a/packages/xgplayer/dist/core_player.js.map b/packages/xgplayer/dist/core_player.js.map
diff --git a/packages/xgplayer/dist/index.js b/packages/xgplayer/dist/index.js
diff --git a/packages/xgplayer/dist/index.js.map b/packages/xgplayer/dist/index.js.map
diff --git a/packages/xgplayer/dist/simple_player.js b/packages/xgplayer/dist/simple_player.js
diff --git a/packages/xgplayer/dist/simple_player.js.map b/packages/xgplayer/dist/simple_player.js.map
diff --git a/packages/xgplayer/es/core_player.js b/packages/xgplayer/es/core_player.js
diff --git a/packages/xgplayer/es/index.js b/packages/xgplayer/es/index.js
diff --git a/packages/xgplayer/es/simple_player.js b/packages/xgplayer/es/simple_player.js
diff --git a/packages/xgplayer/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.31.2",
+    "version": "2.31.4",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",

diff --git a/packages/xgplayer/version.json b/packages/xgplayer/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "2.31.2"
+  "version": "2.31.4"
 }
diff --git a/packages/xgplayer/webpack.config.js b/packages/xgplayer/webpack.config.js
@@ -63,7 +63,7 @@ const umd = {
   mode: 'production',
   module: babelModuleConfig,
   optimization: {
-    minimize: true
+    minimize: false
   }
 }
 
@@ -160,4 +160,4 @@ const client_controls = controls.map(key => {
   }
 })
 
-module.exports = [umd, umd_es6, client].concat(umd_es6_controls)
+module.exports = [umd, umd_es6, client].concat(umd_es6_controls, umd_controls, client_controls)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,4 @@ If you have any problem, please let us know.


		### Join Us
		We welcome anyone with an interest in web media technology to join! Please contact us at yinguohui@bytedance.com
		We welcome anyone with an interest in web media technology to join! Please contact us at infra-fe@bytedance.com