diff --git a/__tests__/index.js b/__tests__/index.js index f025ac20..f398fef5 100644 --- a/__tests__/index.js +++ b/__tests__/index.js @@ -197,8 +197,11 @@ describe('Chimee', () => { }); test('kernel method', () => { - expect(player.play()).resolves.toBe(); + expect(() => player.play()).not.toThrow(); + expect(() => player.pause()).not.toThrow(); expect(() => player.seek(1)).not.toThrow(); + expect(() => player.stopLoad()).not.toThrow(); + expect(() => player.startLoad()).not.toThrow(); }); describe('video attr', () => { diff --git a/build/rollup.config.base.js b/build/rollup.config.base.js index de17a820..13afd8e8 100644 --- a/build/rollup.config.base.js +++ b/build/rollup.config.base.js @@ -127,11 +127,6 @@ export default function(mode) { plugins: [ babel(babelConfig[mode]), flow(), - resolve({ - customResolveOptions: { - moduleDirectory: [ 'src', 'node_modules' ], - }, - }), commonjs(), replace({ 'process.env.PLAYER_VERSION': `'${version}'`, @@ -139,6 +134,15 @@ export default function(mode) { visualizer({ filename: `bundle-size/${mode}.html`, }), - ], + ].concat(/min|umd|iife/.test(mode) + ? [ + resolve({ + customResolveOptions: { + moduleDirectory: [ 'src', 'node_modules' ], + }, + }), + ] + : [] + ), }; } diff --git a/package.json b/package.json index 7765caac..d463fbee 100644 --- a/package.json +++ b/package.json @@ -46,12 +46,13 @@ "dependencies": { "babel-runtime": "^6.26.0", "chimee-helper": "^0.2.10", - "es-fullscreen": "^0.2.4", + "chimee-kernel": "^1.4.0", + "es-fullscreen": "^0.2.5", "toxic-decorators": "^0.3.8" }, "devDependencies": { "babel-eslint": "^8.2.1", - "babel-jest": "^22.0.4", + "babel-jest": "^22.1.0", "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-runtime": "^6.23.0", @@ -60,27 +61,26 @@ "babel-preset-es2015-rollup": "^3.0.0", "babel-preset-flow": "^6.23.0", "babel-preset-stage-0": "^6.24.1", - "chimee-kernel": "^1.3.2", - "chimee-kernel-flv": "^1.3.0", - "chimee-kernel-hls": "^1.0.7", + "chimee-kernel-flv": "^1.4.7", + "chimee-kernel-hls": "^1.2.0", "chimee-plugin-center-state": "0.0.8", "chimee-plugin-controlbar": "^0.4.0", "chimee-plugin-danmu": "0.0.9", - "eslint": "^4.15.0", + "eslint": "^4.16.0", "eslint-config-egg": "^6.0.0", "eslint-plugin-flowtype": "^2.41.0", - "eslint-plugin-jest": "^21.6.1", + "eslint-plugin-jest": "^21.7.0", "flow-bin": "^0.63.1", "husky": "^0.14.3", - "jest": "^22.0.5", + "jest": "^22.1.4", "npm-check-updates": "^2.13.0", "pkg-ok": "^1.1.0", - "rollup": "^0.53.2", + "rollup": "^0.54.1", "rollup-plugin-babel": "^3.0.2", "rollup-plugin-commonjs": "^8.2.6", "rollup-plugin-flow-no-whitespace": "^1.0.0", "rollup-plugin-livereload": "^0.6.0", - "rollup-plugin-node-resolve": "^3.0.0", + "rollup-plugin-node-resolve": "^3.0.2", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-serve": "^0.4.2", "rollup-plugin-uglify": "^2.0.1", diff --git a/src/config/video.js b/src/config/video.js index 801b074c..608a5e91 100644 --- a/src/config/video.js +++ b/src/config/video.js @@ -41,6 +41,7 @@ function accessorVideoAttribute(attribute: string | {set: string, get: string, i ? value ? '' : undefined + /* istanbul ignore next */ : value === null ? undefined : value; diff --git a/src/helper/const.js b/src/helper/const.js index 86306f37..fa5d67c8 100644 --- a/src/helper/const.js +++ b/src/helper/const.js @@ -93,6 +93,8 @@ export const kernelMethods = [ 'play', 'pause', 'seek', + 'startLoad', + 'stopLoad', ]; export const dispatcherMethods = [ 'load',