diff options
| -rw-r--r-- | package.json | 34 | ||||
| -rw-r--r-- | webpack.config.js | 103 |
2 files changed, 57 insertions, 80 deletions
diff --git a/package.json b/package.json index a864ba5..f2c82b0 100644 --- a/package.json +++ b/package.json @@ -18,25 +18,23 @@ "automotivegradelinux" ], "devDependencies": { - "@fortawesome/fontawesome-free": "^5.11.2", - "clean-webpack-plugin": "^1.0.1", - "copy-webpack-plugin": "^4.6.0", - "css-loader": "^2.1.0", - "file-loader": "^4.0.0", - "html-webpack-plugin": "^3.2.0", - "image-webpack-loader": "^5.0.0", - "mini-css-extract-plugin": "^0.5.0", - "node-sass": "^4.12.0", - "sass-loader": "^7.1.0", - "style-loader": "^0.23.1", - "uglifyjs-webpack-plugin": "^2.1.1", - "webpack": "^4.29.5", - "webpack-cli": "^3.2.3", - "webpack-dev-server": "^3.7.2", - "zip-webpack-plugin": "^3.0.0" + "@fortawesome/fontawesome-free": "^6.1.1", + "clean-webpack-plugin": "^4.0.0", + "copy-webpack-plugin": "^10.2.4", + "css-loader": "^6.7.1", + "file-loader": "^6.2.0", + "html-webpack-plugin": "^5.5.0", + "mini-css-extract-plugin": "^2.6.0", + "node-sass": "^7.0.1", + "sass-loader": "^12.6.0", + "style-loader": "^3.3.1", + "uglify-js": "^3.15.4", + "webpack": "^5.72.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "^4.8.1" }, "dependencies": { - "bootstrap": "4.4.1", - "mustache": "^3.0.1" + "bootstrap": "5.1.3", + "mustache": "^4.2.0" } } diff --git a/webpack.config.js b/webpack.config.js index b4cbf0a..773cc7d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,11 +1,9 @@ const path = require('path'); -const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); -const CleanWebpackPlugin = require('clean-webpack-plugin'); +const TerserPlugin = require('terser-webpack-plugin'); +const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const MiniCSSExtractPlugin = require('mini-css-extract-plugin'); const CopyPlugin = require('copy-webpack-plugin'); -const ZipPlugin = require('zip-webpack-plugin'); - module.exports = { mode: 'production', @@ -15,40 +13,42 @@ module.exports = { path: __dirname + '/dist' }, optimization: { - minimizer: [new UglifyJsPlugin()], + minimize: true, + minimizer: [ + new TerserPlugin({ + minify: TerserPlugin.uglifyJsMinify, + terserOptions: {} + }) + ], }, plugins: [ - new CleanWebpackPlugin(['dist']), - new CopyPlugin([ - { - from: 'src/icon.*', - flatten: true - }, - { - from: 'src/appinfo.json', - flatten: true - }, - { - from: 'src/mockups/*', - to: 'mockups/', - flatten: true - }, - { - from: 'src/images/*', - to: 'images/', - flatten: true - }, - { - from: 'src/images/icons/*', - to: 'images/icons/', - flatten: true - }, - { - from: 'src/templates/*', - to: 'templates/', - flatten: true - } - ]), + new CleanWebpackPlugin({ + cleanAfterEveryBuildPatterns: ['dist'] + }), + new CopyPlugin({ + patterns: [ + { + from: 'src/icon.*', + to: '[name][ext]' + }, + { + from: 'src/appinfo.json', + to: "appinfo.json" + }, + { + from: 'src/images/*', + to: 'images/[name][ext]' + }, + { + from: 'src/images/icons/*', + to: 'images/icons/[name][ext]' + }, + { + from: 'src/templates/*', + to: 'templates/[name][ext]' + } + ] + }), new HtmlWebpackPlugin({ template: 'src/index.html', filename: 'index.html', @@ -56,13 +56,6 @@ module.exports = { }), new MiniCSSExtractPlugin({ filename: 'app.css', - path: __dirname + '/dist' - }), - new ZipPlugin({ - path: __dirname + '/package', - filename: 'html5-launcher', - extension: 'wgt', - exclude: [] }) ], module: { @@ -84,28 +77,14 @@ module.exports = { }, { test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, - use: [ - { - loader: 'file-loader', - options: { - name: '[name].[ext]', - outputPath: 'fonts/' - } - } - ] + type: 'asset/resource', + generator: { + filename: 'fonts/[name][ext]' + } }, { test: /\.(gif|png|jpe?g|svg)$/i, - use: [ - 'file-loader', - { - loader: "image-webpack-loader", - options: { - bypassOnDebug: true, // webpack@1.x - disable: true, // webpack@2.x and newer - }, - } - ] + type: 'asset/resource' } ] }, |