Merge branch 'master' into refactor/webpacks

This commit is contained in:
Gus Caplan
2017-12-02 15:11:44 -06:00
committed by GitHub
68 changed files with 1038 additions and 659 deletions

View File

@@ -34,12 +34,11 @@
"runkitExampleFilename": "./docs/examples/ping.js",
"unpkg": "./webpack/discord.min.js",
"dependencies": {
"long": "^3.0.0",
"pako": "^1.0.0",
"prism-media": "^0.0.2",
"snekfetch": "^3.0.0",
"snekfetch": "^3.5.0",
"tweetnacl": "^1.0.0",
"ws": "^3.0.0"
"ws": "^3.3.1"
},
"peerDependencies": {
"bufferutil": "^3.0.0",
@@ -54,11 +53,11 @@
"devDependencies": {
"@types/node": "^8.0.0",
"discord.js-docgen": "hydrabolt/discord.js-docgen",
"eslint": "^4.0.0",
"eslint": "^4.11.0",
"jsdoc-strip-async-await": "^0.1.0",
"json-filter-loader": "^1.0.0",
"uglifyjs-webpack-plugin": "^1.0.0-beta.2",
"webpack": "^3.0.0"
"webpack": "^3.8.0"
},
"engines": {
"node": ">=8.0.0"