@cley_faye/boilerplate 3.11.3 → 3.12.0

package/README.md

@@ -8,6 +8,16 @@ to transpile a webapp so it can work in most browsers.
 These tools allows some level of configuration, but most default options expects a specific
 directory layout for your project.
 
+This is not a "starter project" but an actual dependency to keep in your project.
+
+Install it using
+
+```shell
+npm install @cley_faye/boilerplate
+// alternatively, if you don't run an express server and only build a webapp offline
+npm install -D @cley_faye/boilerplate
+```
+
 Managing dependencies
 ---------------------
 This project does not "really" depend on anything, since all parts are optional.
@@ -160,8 +170,8 @@ The webpack options support a host of properties:
 - resolve: a custom "resolve" object for webpack config
 
 ### SASS
-All `.sass` and `.scss` files in the webapp directory will be processed as `.css` files in the
-output directory, except for files named `.inc.*`.
+All `.sass` and `.scss` files in the `webres` directory will be processed as `.css` files
+in the output directory, except for files named `.inc.*`.
 
 ### Copy task
 It is possible to move other file types into the output directory using the copy task.
@@ -469,6 +479,8 @@ If you reference the output of the TypeScript compiler, you can keep it updated
 
 Using `ts-loader` can be done automatically by setting the `typescript` property in the webpack
 configuration to `true`.
+If a `tsconfig-tsloader.json` file exists at the root of the project, it will be used instead of
+`tsconfig.json`.
 
 For Express app, there is no particular things to take care, except that if you use a facility like
 `nodemon` you have to watch the TypeScript output instead of the actual source files.

package/lib/express/logger.js

@@ -111,19 +111,11 @@ const registerErrorLogger = (app, logOptions) => {
     const config = typeof error === "boolean"
         ? {}
         : error ?? {};
-    if (logger) {
-        app.use(express_winston_1.default.errorLogger({
-            transports: logger.transports,
-            meta: false,
-            msg: "{{req.method}} {{req.url}}",
-        }));
-    }
-    else {
-        app.use(express_winston_1.default.errorLogger({
-            transports: winston_js_1.transports,
-            format: (0, winston_js_1.customFormat)(timestamp, config.collapseStacktrace ?? config.collapseNodeModules, getExtraFilter(config.extraFilter)),
-            meta: false,
-        }));
-    }
+    const activeTransports = logger ? logger.transports : winston_js_1.transports;
+    app.use(express_winston_1.default.errorLogger({
+        transports: activeTransports,
+        format: (0, winston_js_1.customFormat)(timestamp, config.collapseStacktrace ?? config.collapseNodeModules, getExtraFilter(config.extraFilter)),
+        meta: false,
+    }));
 };
 exports.registerErrorLogger = registerErrorLogger;

package/lib/grunt/reactapp/webpack.js

@@ -31,6 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 resolve_typescript_plugin_1 = __importDefault(require("resolve-typescript-plugin"));
 const util_js_1 = require("./util.js");
@@ -108,9 +109,16 @@ const webpackLoadersDefault = (options) => {
         },
     ];
     if (options.typescript) {
+        const alternativeConfig = "tsconfig-tsloader.json";
+        const tsLoader = (0, node_fs_1.existsSync)(alternativeConfig)
+            ? [{
+                    loader: "ts-loader",
+                    options: { configFile: alternativeConfig },
+                }]
+            : "ts-loader";
         res.push({
             test: /.(?:ts|tsx)$/u,
-            use: "ts-loader",
+            use: tsLoader,
             exclude: /node_modules/u,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "3.11.3",
+  "version": "3.12.0",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",