diff --git a/.gitignore b/.gitignore index 96acae7..e74e37f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules examples/**/public/* npm-debug.log +package-lock.json \ No newline at end of file diff --git a/index.js b/index.js index fa5f284..d5d4f34 100644 --- a/index.js +++ b/index.js @@ -4,6 +4,7 @@ var rimraf = require('rimraf') var webpack = require('webpack') var defaults = require('lodash.defaults') var ExtractTextPlugin = require('extract-text-webpack-plugin') +var UglifyJsPlugin = require('uglifyjs-webpack-plugin') var containsPath = require('contains-path') var getBaseConfig = require('./lib/base-config') var getPackage = require('./lib/get-package') @@ -41,11 +42,7 @@ module.exports = function (opts) { clearBeforeBuild: false, serveCustomHtmlInDev: true, devServer: {}, - uglify: defaults(opts.uglify || {}, { - output: { - comments: false - } - }) + uglify: opts.uglify }) spec.package = getPackage(spec.package) @@ -146,7 +143,7 @@ module.exports = function (opts) { // minify in production config.plugins.push( - new webpack.optimize.UglifyJsPlugin(spec.uglify), + new UglifyJsPlugin(spec.uglify), new ExtractTextPlugin({ filename: spec.output.cssFilename, allChunks: true diff --git a/package.json b/package.json index d0ec969..a2e9788 100644 --- a/package.json +++ b/package.json @@ -10,24 +10,25 @@ "url": "https://github.com/henrikjoreteg/hjs-webpack/issues" }, "dependencies": { - "compression": "^1.6.2", - "connect-history-api-fallback": "^1.2.0", - "contains-path": "^0.1.0", - "express": "^4.14.0", - "extract-text-webpack-plugin": "^2.1.0", - "find-root": "^1.0.0", - "http-proxy-middleware": "^0.17.0", - "lodash.assign": "^4.0.6", - "lodash.defaults": "^4.0.1", - "lodash.pick": "^4.1.0", - "rimraf": "^2.5.2", - "webpack": "^2.2.1", - "webpack-dev-middleware": "^1.10.0", - "webpack-hot-middleware": "^2.16.1" + "compression": "^1.7.1", + "connect-history-api-fallback": "^1.5.0", + "contains-path": "^1.0.0", + "express": "^4.16.2", + "extract-text-webpack-plugin": "^3.0.2", + "find-root": "^1.1.0", + "http-proxy-middleware": "^0.17.4", + "lodash.assign": "^4.2.0", + "lodash.defaults": "^4.2.0", + "lodash.pick": "^4.4.0", + "rimraf": "^2.6.2", + "uglifyjs-webpack-plugin": "^1.1.0", + "webpack": "^3.8.1", + "webpack-dev-middleware": "^1.12.0", + "webpack-hot-middleware": "^2.20.0" }, "devDependencies": { - "git-validate": "^2.2.0", - "standard": "^10.0.0" + "git-validate": "^2.2.2", + "standard": "^10.0.3" }, "homepage": "https://github.com/henrikjoreteg/hjs-webpack", "keywords": [