diff --git a/Makefile b/Makefile index dfc75c7..1a7c91b 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ dist-gzip: $(TARFILE) # we don't ship node_modules for license and compactness reasons; we ship a # pre-built dist/ (so it's not necessary) and ship packge-lock.json (so that # node_modules/ can be reconstructed if necessary) -$(TARFILE): NODE_ENV=production +$(TARFILE): export NODE_ENV=production $(TARFILE): $(WEBPACK_TEST) cockpit-$(PACKAGE_NAME).spec if type appstream-util >/dev/null 2>&1; then appstream-util validate-relax --nonet *.metainfo.xml; fi mv node_modules node_modules.release diff --git a/cockpit-starter-kit.spec.in b/cockpit-starter-kit.spec.in index f73012f..32520fd 100644 --- a/cockpit-starter-kit.spec.in +++ b/cockpit-starter-kit.spec.in @@ -27,6 +27,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* find %{buildroot}%{_datadir}/cockpit/ -name '*.map' | xargs --no-run-if-empty rm --verbose %files +%doc README.md +%license LICENSE dist/index.js.LICENSE.txt %{_datadir}/cockpit/* %{_datadir}/metainfo/* diff --git a/package.json b/package.json index 04686d9..93c11cd 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "sizzle": "^2.3.3", "stdio": "^2.1.0", "string-replace-loader": "^3.0.0", + "terser-webpack-plugin": "^2.0.1", "webpack": "^5.31.0", "webpack-cli": "^4.6.0" }, diff --git a/webpack.config.js b/webpack.config.js index 46daef5..e2caf5f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,6 +3,7 @@ const childProcess = require('child_process'); const copy = require("copy-webpack-plugin"); const extract = require("mini-css-extract-plugin"); +const TerserJSPlugin = require('terser-webpack-plugin'); const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); const CompressionPlugin = require("compression-webpack-plugin"); const ESLintPlugin = require('eslint-webpack-plugin'); @@ -69,7 +70,7 @@ module.exports = { optimization: { minimize: production, - minimizer: [`...`, new CssMinimizerPlugin()], + minimizer: [new TerserJSPlugin(), new CssMinimizerPlugin()], }, module: {