diff --git a/karma.conf.js b/karma.conf.js index 0e1107e..7367213 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -64,6 +64,7 @@ module.exports = function(config) { }, webpack: { devtool: "inline-source-map", + mode: "development", resolve: { extensions: ['.ts', '.js'], }, diff --git a/package.json b/package.json index 877c8da..0ecdcee 100644 --- a/package.json +++ b/package.json @@ -4,38 +4,38 @@ "description": "Password generator for BIOS", "main": "decrypt_bios.js", "dependencies": { - "@types/long": "^3.0.32", "@types/jasmine": "^2.8.3", - "gulp-jasmine": "^3.0.0", - "typescript": "^2.6.2", - "long": "dcodeIO/long.js" + "@types/long": "^3.0.32", + "gulp-jasmine": "^4.0.0", + "long": "github:dcodeIO/long.js" }, "devDependencies": { - "clean-webpack-plugin": "^0.1.18", - "copy-webpack-plugin": "^4.3.1", + "clean-webpack-plugin": "^0.1.19", + "copy-webpack-plugin": "^4.5.1", "coveralls": "^3.0.0", "del": "^3.0.0", "gulp": "^3.9.1", "gulp-istanbul": "^1.1.3", "gulp-sourcemaps": "^2.6.4", - "gulp-tslint": "^8.1.2", - "gulp-typescript": "^3.2.3", - "html-webpack-plugin": "^2.30.1", + "gulp-tslint": "^8.1.3", + "gulp-typescript": "^4.0.2", + "html-webpack-plugin": "^3.2.0", "istanbul": "^0.4.5", - "karma": "^2.0.0", + "karma": "^2.0.2", "karma-chrome-launcher": "^2.2.0", "karma-firefox-launcher": "^1.1.0", "karma-jasmine": "^1.1.1", "karma-sauce-launcher": "^1.2.0", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.9", - "remap-istanbul": "^0.10.1", - "ts-loader": "^3.3.1", - "tslint": "^5.8.0", - "typescript": "^2.6.2", - "webpack": "^3.10.0", + "karma-webpack": "^3.0.0", + "remap-istanbul": "^0.11.0", + "ts-loader": "^4.2.0", + "tslint": "^5.9.1", + "typescript": "^2.8.3", + "webpack": "^4.6.0", + "webpack-cli": "^2.0.15", "webpack-closure-compiler": "^2.1.6", - "webpack-dev-server": "^2.11.1" + "webpack-dev-server": "^3.1.3" }, "scripts": { "test": "gulp test", diff --git a/webpack.config.js b/webpack.config.js index d1505eb..96f9753 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -5,6 +5,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const webpack = require('webpack'); +var webpackMode; function makeClosureCompiler() { const externDir = path.join(__dirname, "externs"); @@ -54,6 +55,9 @@ var plugins = [ if (process.env.PRODUCTION) { plugins.push(makeClosureCompiler()); + webpackMode = "production"; +} else { + webpackMode = "development"; } @@ -72,6 +76,7 @@ module.exports = { resolve: { extensions: ['.ts', '.tsx', '.js'] }, + mode: webpackMode, module: { rules: [ {