@cley_faye/boilerplate 3.13.0 → 3.15.0

package/README.md

@@ -29,8 +29,6 @@ required, and for what. It's up to the calling project to have the proper depend
 
 For webapp building:
 
-- resolve-typescript-plugin (due to the way webpack plugins are handled, this is mandatory for dev
-  install)
 - babel-loader
 - eslint-webpack-plugin
 - @babel/core
@@ -333,6 +331,9 @@ It supports the following properties:
   property.
 - logger: an instance of a winston logger.
 - timestamp: set to true to prepend a timestamp to each log line
+- ignoredRoutes: array of path to not log
+
+Note that if `route` is a full object, some of the other proprties might be ignored.
 
 The middleware options allow enabling/disabling common middlewares.
 Currently only support a few builtin middlewares from express:

package/lib/express/logger.js

@@ -81,7 +81,7 @@ const defaultRouteLoggerConfig = (authFromReq) => ({
 });
 exports.defaultRouteLoggerConfig = defaultRouteLoggerConfig;
 const registerRouteLogger = (app, logOptions) => {
-    const { route, timestamp, userFromReq, authFromReq } = logOptions ?? {};
+    const { route, timestamp, userFromReq, authFromReq, ignoredRoutes } = logOptions ?? {};
     let extraConfig;
     if (typeof route === "boolean") {
         extraConfig = (0, exports.defaultRouteLoggerConfig)(authFromReq ?? userFromReq);
@@ -100,6 +100,7 @@ const registerRouteLogger = (app, logOptions) => {
         expressFormat: false,
         format: customRouteFormat(timestamp),
         msg: "{{req.method}} {{req.url}} {{res.statusCode}} {{res.responseTime}}ms",
+        ignoredRoutes,
     };
     app.use(express_winston_1.default.logger({
         transports: winston_js_1.transports,

package/lib/express/pipelinebuilder.d.ts

@@ -31,6 +31,7 @@ export interface LogOptions {
     logger?: winston.Logger;
     timestamp?: boolean;
     extraStacktraceFilter?: Array<RegExp> | RegExp;
+    ignoredRoutes?: Array<string>;
     /** @deprecated Use `authFromReq` instead */
     userFromReq?: UserFromReqFunc;
     authFromReq?: UserFromReqFunc;

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

@@ -1,3 +1,4 @@
+import { ResolveOptions } from "webpack";
 import { BaseOptions } from "../util.js";
 import { HandlerFunctionResult } from "../reactapp.js";
 import { GruntConfig } from "./util.js";
@@ -27,7 +28,8 @@ export interface WebpackLoadersOptions {
  * Version of core-js to use (default to 3)
  *
  * @param [options.babel.targets]
- * Browser targets (default to " > 1%, last 1 safari version")
+ * Browser targets (default to "> 2% and not dead, last 2 safari version, last 2 firefox version,
+ * last 2 chrome version, last 2 edge version, Firefox ESR")
  *
  * @param [options.babel.plugins]
  * Plugins to add to babel
@@ -49,7 +51,7 @@ export interface WebpackOptions extends BaseOptions {
     plugins?: Array<Record<string, unknown>>;
     babelPlugins?: Array<Record<string, unknown>>;
     defines?: Record<string, string>;
-    resolve?: Record<string, unknown>;
+    resolve?: ResolveOptions;
     typescript?: boolean;
 }
 /** Add a webpack task for the reactApp recipe

package/lib/grunt/reactapp/webpack.js

@@ -33,7 +33,6 @@ 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");
 const defaultCoreJS = 3;
 const eslintPlugin = () => new eslint_webpack_plugin_1.default({ cache: true });
@@ -50,7 +49,7 @@ const defaultLoadersDefine = (options) => [
 const defaultLoadersPresetEnv = (options) => [
     "@babel/preset-env",
     {
-        targets: (options.babel?.targets) ?? "> 1%, last 1 safari version",
+        targets: (options.babel?.targets) ?? "> 2% and not dead, last 2 safari version, last 2 firefox version, last 2 chrome version, last 2 edge version, Firefox ESR",
         useBuiltIns: "usage",
         corejs: (options.babel?.corejs) ?? defaultCoreJS,
         modules: false,
@@ -76,7 +75,8 @@ const defaultLoadersReact = (options) => [
  * Version of core-js to use (default to 3)
  *
  * @param [options.babel.targets]
- * Browser targets (default to " > 1%, last 1 safari version")
+ * Browser targets (default to "> 2% and not dead, last 2 safari version, last 2 firefox version,
+ * last 2 chrome version, last 2 edge version, Firefox ESR")
  *
  * @param [options.babel.plugins]
  * Plugins to add to babel
@@ -170,10 +170,11 @@ const registerTasks = (gruntConfig, targetName, webpackConfig) => {
 const computeWebpackResolve = (webpackOptions) => {
     const res = { ...webpackOptions.resolve };
     if (webpackOptions.typescript) {
-        if (res.plugins === undefined) {
-            res.plugins = [];
+        if (res.extensionAlias === undefined) {
+            res.extensionAlias = {};
         }
-        res.plugins.push(new resolve_typescript_plugin_1.default());
+        res.extensionAlias[".js"] = [".ts", ".tsx", ".js", ".jsx"];
+        res.extensionAlias[".mjs"] = [".mts", ".mtsx", ".mjs", ".mjsx"];
     }
     return res;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",
@@ -18,14 +18,14 @@
   },
   "homepage": "https://github.com/CleyFaye/boilerplate#readme",
   "devDependencies": {
-    "@keeex/eslint-config": "^1.9.2",
+    "@keeex/eslint-config": "^1.9.3",
     "@types/express": "^4.17.17",
     "@types/grunt": "^0.4.27",
     "@types/http-errors": "^2.0.1",
-    "@types/node": "^18.11.19",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    "eslint": "^8.33.0",
+    "@types/node": "^18.14.2",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "eslint": "^8.35.0",
     "eslint-plugin-deprecation": "^1.3.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-promise": "^6.1.1",
@@ -36,8 +36,9 @@
     "grunt-contrib-clean": "^2.0.1",
     "grunt-run": "^0.8.1",
     "load-grunt-tasks": "^5.1.0",
-    "logform": "^2.4.2",
+    "logform": "^2.5.1",
     "typescript": "^4.9.5",
+    "webpack": "^5.75.0",
     "winston": "^3.8.2"
   },
   "peerDependencies": {
@@ -57,7 +58,6 @@
     "grunt-contrib-watch": "1.x",
     "grunt-sass": "3.x",
     "grunt-webpack": "5.x",
-    "resolve-typescript-plugin": "^2.0.0",
     "sass": "1.x",
     "ts-loader": "^9.4.1",
     "winston": "3.x"
@@ -111,9 +111,6 @@
     "grunt-webpack": {
       "optional": true
     },
-    "resolve-typescript-plugin": {
-      "optional": false
-    },
     "sass": {
       "optional": true
     },