Merge branch 'master' into indev-prism

This commit is contained in:
Schuyler Cebulskie
2017-02-01 15:29:45 -05:00
28 changed files with 275 additions and 109 deletions

View File

@@ -5,11 +5,12 @@
"main": "./src/index",
"types": "./typings/index.d.ts",
"scripts": {
"test": "eslint src && docgen --source src --custom docs/index.yml",
"test": "npm run lint && npm run docs:test",
"docs": "docgen --source src --custom docs/index.yml --output docs/docs.json",
"test-docs": "docgen --source src --custom docs/index.yml",
"docs:test": "docgen --source src --custom docs/index.yml",
"lint": "eslint src",
"web-dist": "node ./node_modules/parallel-webpack/bin/run.js"
"lint:fix": "eslint --fix src",
"webpack": "parallel-webpack"
},
"repository": {
"type": "git",
@@ -37,12 +38,13 @@
"prism-media": "hydrabolt/prism-media#master",
"superagent": "^3.3.0",
"tweetnacl": "^0.14.0",
"ws": "^1.1.1"
"ws": "^2.0.0"
},
"peerDependencies": {
"bufferutil": "^1.3.0",
"erlpack": "hammerandchisel/erlpack",
"node-opus": "^0.2.0",
"opusscript": "^0.0.1",
"opusscript": "^0.0.2",
"uws": "^0.12.0"
},
"devDependencies": {
@@ -50,7 +52,7 @@
"eslint": "^3.13.0",
"parallel-webpack": "^1.6.0",
"uglify-js": "mishoo/UglifyJS2#harmony",
"webpack": "2.2.0-rc.4"
"webpack": "^2.2.0"
},
"engines": {
"node": ">=6.0.0"