Update deps and fix webpack

This commit is contained in:
Crawl
2017-07-16 14:34:23 +02:00
parent ed84d76a42
commit 26e5ef3205
9 changed files with 20 additions and 22 deletions

View File

@@ -34,9 +34,9 @@
"dependencies": { "dependencies": {
"long": "^3.2.0", "long": "^3.2.0",
"prism-media": "^0.0.1", "prism-media": "^0.0.1",
"snekfetch": "^3.1.0", "snekfetch": "^3.2.0",
"tweetnacl": "^0.14.0", "tweetnacl": "^1.0.0",
"ws": "^2.0.0" "ws": "^3.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"bufferutil": "^3.0.0", "bufferutil": "^3.0.0",
@@ -50,11 +50,10 @@
"devDependencies": { "devDependencies": {
"@types/node": "^7.0.0", "@types/node": "^7.0.0",
"discord.js-docgen": "hydrabolt/discord.js-docgen", "discord.js-docgen": "hydrabolt/discord.js-docgen",
"eslint": "^3.19.0", "eslint": "^4.2.0",
"parallel-webpack": "^1.6.0", "parallel-webpack": "^2.0.0",
"uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22", "uglifyjs-webpack-plugin": "^1.0.0-beta.1",
"uglifyjs-webpack-plugin": "^0.4.3", "webpack": "^3.0.0"
"webpack": "^2.2.0"
}, },
"engines": { "engines": {
"node": ">=6.0.0" "node": ">=6.0.0"

View File

@@ -12,7 +12,6 @@ const util = require('util');
* @extends {Collector} * @extends {Collector}
*/ */
class MessageCollector extends Collector { class MessageCollector extends Collector {
/** /**
* @param {TextChannel|DMChannel|GroupDMChannel} channel The channel * @param {TextChannel|DMChannel|GroupDMChannel} channel The channel
* @param {CollectorFilter} filter The filter to be applied to this collector * @param {CollectorFilter} filter The filter to be applied to this collector

View File

@@ -13,7 +13,6 @@ const Collection = require('../util/Collection');
* @extends {Collector} * @extends {Collector}
*/ */
class ReactionCollector extends Collector { class ReactionCollector extends Collector {
/** /**
* @param {Message} message The message upon which to collect reactions * @param {Message} message The message upon which to collect reactions
* @param {CollectorFilter} filter The filter to apply to this collector * @param {CollectorFilter} filter The filter to apply to this collector

View File

@@ -11,9 +11,10 @@ const version = require('./package.json').version;
const createConfig = options => { const createConfig = options => {
const plugins = [ const plugins = [
new webpack.DefinePlugin({ 'global.GENTLY': false }), new webpack.DefinePlugin({ 'global.GENTLY': false }),
new webpack.optimize.ModuleConcatenationPlugin(),
]; ];
if (options.minify) plugins.push(new UglifyJSPlugin({ minimize: true })); if (options.minify) plugins.push(new UglifyJSPlugin({ uglifyOptions: { output: { comments: false } } }));
const filename = `./webpack/discord${process.env.VERSIONED === 'false' ? '' : '.' + version}${options.minify ? '.min' : ''}.js`; // eslint-disable-line const filename = `./webpack/discord${process.env.VERSIONED === 'false' ? '' : '.' + version}${options.minify ? '.min' : ''}.js`; // eslint-disable-line