@studyportals/webpack-helper 8.0.0 → 8.2.0-beta.0

package/README.md

@@ -23,6 +23,7 @@ WebpackHelper is a utility that makes it easy to set up a webpack configuration
   - [common](#common)
   - [development](#development)
   - [production](#production)
+  - [minify](#minify)
 - [Presets](#presets)
   - [javascript](#javascript)
   - [typescript](#typescript)
@@ -359,6 +360,20 @@ Extra Webpack configuration to be used for all production builds can be passed i
 
 **NOTE**: Some default configuration for production builds will be added automatically. Details can be found [here](src/defaults/defaults.md).
 
+### minify
+
+Controls how production builds are minified. Every property is optional.
+
+```javascript
+minify: {
+	minifier: 'terser', // 'terser' (default, smallest output) or 'esbuild' (several times faster, ~8 % larger gzipped JS)
+	passes: 2,          // Terser compress passes (default 2; more passes barely shrink the output but cost a lot of build time)
+	css: 'cssnano'      // 'cssnano' (default) or 'lightningcss' (faster, about the same output size, but it fails on some legacy CSS)
+}
+```
+
+The minifiers use every CPU the build can use. That count respects container CPU limits (cgroups), so a CI container with 4 vCPUs uses 4 workers even if the host has more. Set `WEBPACK_PARALLELISM` to override it. The build logs the minifiers and the CPU count it uses.
+
 ## Presets
 
 In order to make your life as easy as possible, Webpack Helper ships with a set of presets that will take care of putting some essential plugins and loaders in your configuration. The different presets are listed below.

package/dist/defaults/production.config.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProductionConfig = void 0;
+const cpus_1 = require("../utils/cpus");
+const browser_list_to_esbuild_target_factory_1 = require("../factories/browser-list-to-esbuild-target-factory");
+const webpack = require('webpack');
+const cssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+const DllAvailabilityTracker = require('@studyportals/dll-availability-tracker');
+const DEFAULT_TERSER_PASSES = 2;
+const ProductionConfig = (bobConfig, minifyConfig = {}) => {
+    let dllDependencies = ['library'];
+    if (bobConfig && bobConfig.hasOwnProperty('dllPackages')) {
+        bobConfig.dllPackages.forEach((dependency) => dllDependencies.push(dependency.manifest.name));
+    }
+    const parallel = (0, cpus_1.getAvailableCpus)();
+    return {
+        plugins: [
+            new webpack.DefinePlugin({
+                'process.env': {
+                    NODE_ENV: '"production"'
+                }
+            }),
+            minifyConfig.css !== 'lightningcss'
+                ? new cssMinimizerPlugin({
+                    parallel,
+                    minimizerOptions: {
+                        preset: [
+                            'default',
+                            {
+                                discardComments: {
+                                    removeAll: true
+                                }
+                            }
+                        ]
+                    },
+                })
+                : new cssMinimizerPlugin({
+                    parallel,
+                    minify: cssMinimizerPlugin.lightningCssMinify
+                }),
+            new DllAvailabilityTracker({
+                dependencies: dllDependencies || []
+            })
+        ],
+        optimization: {
+            minimize: true,
+            minimizer: [
+                compiler => {
+                    console.log(`webpack-helper: minifying JS with ${minifyConfig.minifier || 'terser'}, CSS with ${minifyConfig.css || 'cssnano'}, on ${parallel} CPU(s)`);
+                    if (minifyConfig.minifier === 'esbuild') {
+                        const { EsbuildPlugin } = require('esbuild-loader');
+                        new EsbuildPlugin({
+                            target: new browser_list_to_esbuild_target_factory_1.BrowserListToEsbuildTargetFactory().createTarget(),
+                            drop: ['console'],
+                            legalComments: 'none'
+                        }).apply(compiler);
+                        return;
+                    }
+                    const TerserPlugin = require('terser-webpack-plugin');
+                    new TerserPlugin({
+                        parallel,
+                        extractComments: false,
+                        terserOptions: {
+                            output: {
+                                comments: false
+                            },
+                            compress: {
+                                drop_console: true,
+                                passes: minifyConfig.passes || DEFAULT_TERSER_PASSES
+                            },
+                            sourceMap: true
+                        }
+                    }).apply(compiler);
+                }
+            ]
+        }
+    };
+};
+exports.ProductionConfig = ProductionConfig;

package/{src → dist}/factories/chunks-retry-plugin-factory.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const mode_1 = require("../enums/mode");
-const path = require('path');
-const process = require('process');
-const { RetryChunkLoadPlugin } = require(path.join(process.cwd(), 'node_modules', '@studyportals/webpack-helper', 'src', 'plugins', 'retry-chunk-load.plugin.js'));
+const retry_chunk_load_plugin_1 = require("../plugins/retry-chunk-load.plugin");
 class ChunksRetryPluginFactory {
     static IsPresetSupported(preset) {
         if (!preset.retryChunksConfig)
@@ -19,7 +17,7 @@ class ChunksRetryPluginFactory {
     }
     static CustomRetryChunksPlugin(preset) {
         const { retryChunksConfig } = preset;
-        return new RetryChunkLoadPlugin({
+        return new retry_chunk_load_plugin_1.RetryChunkLoadPlugin({
             cacheBust: `function() {
 				return Date.now();
 			}`,

package/dist/interfaces/preset.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/{src → dist}/model/configuration.js

@@ -23,6 +23,7 @@ const DEFAULT_CHUNKS_RETRY_CONFIG_THRESHOLD = 6;
 class Configuration {
     constructor(options) {
         this.customElementTags = options.customElementTags || [];
+        this.minifyConfig = options.minify || {};
         this.bob = options.bob || null;
         this.entry = new entry_1.Entry(options.entry);
         this.output = new output_1.Output(options.output);
@@ -36,7 +37,7 @@ class Configuration {
         const configPrd = options[mode_1.Mode.PRODUCTION] ? options[mode_1.Mode.PRODUCTION] : {};
         this.environmentSpecificConfig = {
             [mode_1.Mode.DEVELOPMENT]: merge([configDev, development_config_1.DevelopmentConfig]) || development_config_1.DevelopmentConfig,
-            [mode_1.Mode.PRODUCTION]: merge([configPrd, (0, production_config_1.ProductionConfig)(this.bob)]) || (0, production_config_1.ProductionConfig)(this.bob)
+            [mode_1.Mode.PRODUCTION]: merge([configPrd, (0, production_config_1.ProductionConfig)(this.bob, this.minifyConfig)]) || (0, production_config_1.ProductionConfig)(this.bob, this.minifyConfig)
         };
         this.fileName = options.output.fileName || "[name]";
         this.chunksRetryConfig = options.chunksRetryConfig || {

package/dist/utils/cpus.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAvailableCpus = void 0;
+const os = require('os');
+const fs = require('fs');
+const getCgroupCpuLimit = () => {
+    try {
+        const [quota, period] = fs.readFileSync('/sys/fs/cgroup/cpu.max', 'utf8').trim().split(/\s+/);
+        return quota === 'max' ? null : Math.max(1, Math.floor(Number(quota) / Number(period)));
+    }
+    catch (e) { }
+    try {
+        const quota = Number(fs.readFileSync('/sys/fs/cgroup/cpu/cpu.cfs_quota_us', 'utf8'));
+        const period = Number(fs.readFileSync('/sys/fs/cgroup/cpu/cpu.cfs_period_us', 'utf8'));
+        return quota > 0 && period > 0 ? Math.max(1, Math.floor(quota / period)) : null;
+    }
+    catch (e) { }
+    return null;
+};
+const getAvailableCpus = () => {
+    const override = parseInt(process.env.WEBPACK_PARALLELISM || '', 10);
+    if (override > 0) {
+        return override;
+    }
+    const cpus = typeof os.availableParallelism === 'function' ? os.availableParallelism() : os.cpus().length;
+    const limit = getCgroupCpuLimit();
+    return Math.max(1, limit === null ? cpus : Math.min(cpus, limit));
+};
+exports.getAvailableCpus = getAvailableCpus;

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "@studyportals/webpack-helper",
-  "version": "8.0.0",
+  "version": "8.2.0-beta.0",
   "description": "A collection of standard configurations and helpers for webpack.",
-  "main": "src/main.js",
+  "main": "dist/main.js",
   "scripts": {
     "test": "vitest --watch=false --coverage",
-    "build": "tsc",
-    "prepublish": "npm run build",
-    "postinstall": "cp ./assets/.browserslistrc ../../../ || true",
-    "deploy-beta": "npm version prerelease && npm run build && npm publish --tag beta --access=public  --auth-type=legacy &&  rm -rf node_modules"
+    "build": "rm -rf dist && tsc",
+    "prepublishOnly": "npm run build",
+    "postinstall": "test -d ../../../ && cp ./assets/.browserslistrc ../../../ || true",
+    "version:alpha": "sh ./scripts/version.sh alpha",
+    "version:beta": "sh ./scripts/version.sh beta",
+    "version:latest": "sh ./scripts/version.sh latest",
+    "release": "sh ./scripts/release.sh"
   },
   "files": [
-    "src/**/*.js",
+    "dist",
     "assets/*"
   ],
   "author": {
@@ -21,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@studyportals/bob-manifest-generator": "^5.0.1",
-    "@studyportals/browserslist-config": "^1.2.4",
+    "@studyportals/browserslist-config": "^2.0.0",
     "@studyportals/dll-availability-tracker": "^2.0.0",
     "@studyportals/vue-config": "^5.0.3",
     "css-loader": "^6.10.0",
@@ -30,6 +33,7 @@
     "esbuild-plugin-browserslist": "^0.11.1",
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
+    "lightningcss": "^1.33.0",
     "mini-css-extract-plugin": "^2.8.0",
     "path": "^0.12.7",
     "prettier": "^2.8.8",

package/src/defaults/production.config.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductionConfig = void 0;
-const webpack = require('webpack');
-const cssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const DllAvailabilityTracker = require('@studyportals/dll-availability-tracker');
-const ProductionConfig = (bobConfig) => {
-    let dllDependencies = ['library'];
-    if (bobConfig && bobConfig.hasOwnProperty('dllPackages')) {
-        bobConfig.dllPackages.forEach((dependency) => dllDependencies.push(dependency.manifest.name));
-    }
-    return {
-        plugins: [
-            new webpack.DefinePlugin({
-                'process.env': {
-                    NODE_ENV: '"production"'
-                }
-            }),
-            new cssMinimizerPlugin({
-                minimizerOptions: {
-                    preset: [
-                        'default',
-                        {
-                            discardComments: {
-                                removeAll: true
-                            }
-                        }
-                    ]
-                },
-            }),
-            new DllAvailabilityTracker({
-                dependencies: dllDependencies || []
-            })
-        ],
-        optimization: {
-            minimize: true,
-            minimizer: [
-                compiler => {
-                    const TerserPlugin = require('terser-webpack-plugin');
-                    new TerserPlugin({
-                        parallel: true,
-                        extractComments: false,
-                        terserOptions: {
-                            output: {
-                                comments: false
-                            },
-                            compress: {
-                                drop_console: true,
-                                passes: 5
-                            },
-                            sourceMap: true
-                        }
-                    }).apply(compiler);
-                }
-            ]
-        }
-    };
-};
-exports.ProductionConfig = ProductionConfig;