@cley_faye/boilerplate 3.19.0 → 3.21.0

package/README.md

@@ -166,6 +166,7 @@ The webpack options support a host of properties:
 - mode: The build mode. "development", "production" or "none"
 - defines: a record of value to define using Babel transform-define
 - resolve: a custom "resolve" object for webpack config
+- generateReport: a boolean, set to true to generate a bundle size report HTML file
 
 ### SASS
 All `.sass` and `.scss` files in the `webres` directory will be processed as `.css` files

package/lib/bin/serve_spa.js

@@ -53,16 +53,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("node:path"));
+const node_fs_1 = require("node:fs");
 const express_1 = __importDefault(require("express"));
 const minimist_1 = __importDefault(require("minimist"));
 const singlepageapp_js_1 = require("../express/middlewares/singlepageapp.js");
 const express_js_1 = require("../express.js");
 const winston_js_1 = require("../winston.js");
 const ARGV_START_OFFSET = 2;
-const { port, root, index, help, static: staticDirs } = (0, minimist_1.default)(process.argv.slice(ARGV_START_OFFSET));
+const { port, root, index, help, staticlist, static: staticDirs } = (0, minimist_1.default)(process.argv.slice(ARGV_START_OFFSET));
 const DEFAULT_PORT = 3000;
 const DEFAULT_PATH = path.join("dist", "webapp");
 const DEFAULT_INDEX = "index.html";
+const DEFAULT_STATICFILE = "spa_static.config";
 const DEFAULT_STATIC = ["js", "css", "img"];
 if (help) {
     winston_js_1.consoleLogger.info(`
@@ -72,20 +74,34 @@ serve_spa \\
   [--port=${DEFAULT_PORT}] \\
   [--root=${DEFAULT_PATH}] \\
   [--index=${DEFAULT_INDEX}] \\
+  [--staticlist=${DEFAULT_STATICFILE}] \\
   [--static=js…] \\
   [--help]
 
 The --static argument can be repeated to add more directories to it.
 It defaults to ${JSON.stringify(DEFAULT_STATIC)}.
+
+The staticfile value is a text file with one static directory line.
+If present, they are merged with the CLI arguments.
 `.trim());
     // eslint-disable-next-line no-process-exit
     process.exit(0);
 }
 const getPort = () => port ?? DEFAULT_PORT;
 const getStatic = () => {
-    if (!staticDirs)
-        return;
-    return Array.isArray(staticDirs) ? staticDirs : [staticDirs];
+    const result = [];
+    if (staticDirs)
+        result.push(...(Array.isArray(staticDirs) ? staticDirs : [staticDirs]));
+    if (staticlist) {
+        for (const staticsrc of (Array.isArray(staticlist) ? staticlist : [staticlist])) {
+            if (!(0, node_fs_1.existsSync)(staticsrc))
+                continue;
+            result.push(...(0, node_fs_1.readFileSync)(staticsrc, "utf8")
+                .split("\n")
+                .filter(c => c));
+        }
+    }
+    return result.length > 0 ? result : undefined;
 };
 const app = (0, express_1.default)();
 app.use((0, express_js_1.createPipeline)({

package/lib/grunt/reactapp/webpack.d.ts

@@ -52,6 +52,7 @@ export interface WebpackOptions extends BaseOptions {
     babelPlugins?: Array<Record<string, unknown>>;
     defines?: Record<string, string>;
     resolve?: ResolveOptions;
+    generateReport?: boolean;
     typescript?: boolean;
 }
 /** Add a webpack task for the reactApp recipe
@@ -106,6 +107,9 @@ export interface WebpackOptions extends BaseOptions {
  * Build mode. "development", "production" or "none".
  * Defaults to "development"
  *
+ * @param [webpackOptions.generateReport]
+ * Generate a bundle report HTML file.
+ *
  * @param [webpackOptions.typescript]
  * Allow loading typescript source for webpack/babel.
  *

package/lib/grunt/reactapp/webpack.js

@@ -33,6 +33,7 @@ exports.handle = exports.webpackLoadersDefault = void 0;
 const path_1 = require("path");
 const node_fs_1 = require("node:fs");
 const eslint_webpack_plugin_1 = __importDefault(require("eslint-webpack-plugin"));
+const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const util_js_1 = require("./util.js");
 const defaultCoreJS = 3;
 const eslintPlugin = () => new eslint_webpack_plugin_1.default({ cache: true });
@@ -178,6 +179,20 @@ const computeWebpackResolve = (webpackOptions) => {
     }
     return res;
 };
+const getWebpackPlugins = (webpackOptions) => {
+    const plugins = [
+        eslintPlugin(),
+        ...webpackOptions.plugins ?? [],
+    ];
+    if (webpackOptions.generateReport) {
+        plugins.push(new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
+            analyzerMode: "static",
+            reportFilename: (0, path_1.join)(process.cwd(), "bundle_report.html"),
+            openAnalyzer: false,
+        }));
+    }
+    return plugins;
+};
 /** Add a webpack task for the reactApp recipe
  *
  * @param gruntConfig
@@ -230,6 +245,9 @@ const computeWebpackResolve = (webpackOptions) => {
  * Build mode. "development", "production" or "none".
  * Defaults to "development"
  *
+ * @param [webpackOptions.generateReport]
+ * Generate a bundle report HTML file.
+ *
  * @param [webpackOptions.typescript]
  * Allow loading typescript source for webpack/babel.
  *
@@ -257,10 +275,7 @@ const handle = (gruntConfig, targetName, webpackOptions) => {
         output: webpackOutput,
         externals: webpackOptions.externals,
         module: { rules: webpackLoaders },
-        plugins: [
-            eslintPlugin(),
-            ...webpackOptions.plugins ?? [],
-        ],
+        plugins: getWebpackPlugins(webpackOptions),
         resolve: webpackResolve,
     };
     // Special case: I'm not sure I can move options in the task-specific part of

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "3.19.0",
+  "version": "3.21.0",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",
@@ -22,14 +22,15 @@
   "homepage": "https://github.com/CleyFaye/boilerplate#readme",
   "devDependencies": {
     "@keeex/eslint-config": "^1.11.5",
-    "@types/express": "^4.17.18",
+    "@types/express": "^4.17.19",
     "@types/grunt": "^0.4.28",
     "@types/http-errors": "^2.0.2",
     "@types/minimist": "^1.2.3",
-    "@types/node": "^18.18.3",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "eslint": "^8.50.0",
+    "@types/node": "^18.18.4",
+    "@types/webpack-bundle-analyzer": "^4.6.1",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
+    "eslint": "^8.51.0",
     "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-promise": "^6.1.1",
@@ -43,7 +44,7 @@
     "logform": "^2.5.1",
     "typescript": "^5.2.2",
     "webpack": "^5.88.2",
-    "winston": "^3.10.0"
+    "winston": "^3.11.0"
   },
   "peerDependencies": {
     "@babel/core": "7.x",
@@ -61,10 +62,11 @@
     "grunt-contrib-pug": "3.x",
     "grunt-contrib-watch": "1.x",
     "grunt-sass": "3.x",
-    "grunt-webpack": "5.x",
+    "grunt-webpack": "5.x||6.x",
     "minimist": "^1.2.8",
     "sass": "1.x",
     "ts-loader": "^9.4.1",
+    "webpack-bundle-analyzer": "^4.9.1",
     "winston": "3.x"
   },
   "peerDependenciesMeta": {