@cley_faye/boilerplate 3.0.4 → 3.2.0

package/README.md

@@ -27,7 +27,6 @@ For webapp building:
 - babel-plugin-transform-define
 - core-js
 - @babel/plugin-transform-runtime
-- grunt-contrib-imagemin
 - grunt-contrib-pug
 - grunt-contrib-copy
 - grunt-contrib-watch

package/lib/express/autoclose.js

@@ -63,13 +63,13 @@ const setSignalHandler = () => {
     if (process.platform === "win32") {
         process.on("message", msg => {
             if (msg === "shutdown") {
-                exports.closeServer();
+                (0, exports.closeServer)();
             }
         });
     }
     else {
         process.on("SIGINT", () => {
-            exports.closeServer();
+            (0, exports.closeServer)();
         });
     }
 };

package/lib/express/pipelinebuilder.js

@@ -229,7 +229,7 @@ class PipelineBuilder {
         const { route } = logOptions ?? {};
         if (route) {
             this.internalLog("Adding route logger");
-            logger_js_1.registerRouteLogger(router, logOptions);
+            (0, logger_js_1.registerRouteLogger)(router, logOptions);
         }
     }
     /** Register post-route loggers
@@ -244,7 +244,7 @@ class PipelineBuilder {
         const { error } = logOptions ?? {};
         if (error) {
             this.internalLog("Adding error logger");
-            logger_js_1.registerErrorLogger(router, logOptions);
+            (0, logger_js_1.registerErrorLogger)(router, logOptions);
         }
     }
     _setDefaultErrorHandler(router, enableDefaultErrorHandler) {

package/lib/express.js

@@ -176,8 +176,8 @@ const appStart = ({ app, allowNonLocal, port, shutdownFunction, logger, }) => ne
         if (logger) {
             logger.info(`Listening on port ${effectivePort} (PID: ${process.pid})`);
         }
-        autoclose_js_1.setRef(server);
-        autoclose_js_1.setSignalHandler();
+        (0, autoclose_js_1.setRef)(server);
+        (0, autoclose_js_1.setSignalHandler)();
         resolve({
             port: effectivePort,
             server,

package/lib/grunt/args.js

@@ -89,7 +89,7 @@ const handleOptionDef = (optionDef, rawValue) => {
  * Get a value from the command line
  */
 const getFromOptionProvider = (keyName, optionProvider) => {
-    const kebabName = util_js_1.camelToKebab(keyName);
+    const kebabName = (0, util_js_1.camelToKebab)(keyName);
     return optionProvider.option(kebabName);
 };
 // eslint-disable-next-line no-console
@@ -106,7 +106,7 @@ const getTypeInfoString = (optionType, kebabName) => {
  */
 const displayHelpForConfigKey = (keyName, optionDef) => {
     const isMandatory = optionDef.defaultValue === undefined;
-    const kebabName = util_js_1.camelToKebab(keyName);
+    const kebabName = (0, util_js_1.camelToKebab)(keyName);
     const mandatoryString = isMandatory
         ? ""
         : ` (optional, default value:${optionDef.defaultValue})`;
@@ -141,7 +141,7 @@ const getOptionsFromGruntCLI = (optionProvider, configDef) => {
             result[keyName] = handleOptionDef(configDef[keyName], getFromOptionProvider(keyName, optionProvider));
         }
         catch (error) {
-            throw new Error(`CLI Argument "${util_js_1.camelToKebab(keyName)}": ${error}`);
+            throw new Error(`CLI Argument "${(0, util_js_1.camelToKebab)(keyName)}": ${error}`);
         }
     });
     return result;

package/lib/grunt/reactapp/copy.js

@@ -77,13 +77,13 @@ const handle = (gruntConfig, targetName, copyOptions) => {
             {
                 dot: copyOptions.dot,
                 expand: true,
-                cwd: copyOptions.sourcePath ?? path_1.join("webres", targetName),
+                cwd: copyOptions.sourcePath ?? (0, path_1.join)("webres", targetName),
                 src: srcList,
-                dest: copyOptions.outputPath ?? path_1.join("dist", targetName),
+                dest: copyOptions.outputPath ?? (0, path_1.join)("dist", targetName),
             },
         ],
     };
-    const requiredTasks = [util_js_1.insertTask(gruntConfig, "copy", targetName, copyTask)];
+    const requiredTasks = [(0, util_js_1.insertTask)(gruntConfig, "copy", targetName, copyTask)];
     const watchTasks = [
         {
             filesToWatch: srcList,

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

@@ -18,10 +18,10 @@ export interface ImageOptions extends BaseOptions {
  * Options for the image task configuration.
  *
  * @param [imageOptions.options]
- * Options to pass to grunt-contrib-imagemin.
+ * Options to pass to @cley_faye/imagemin-lite.
  *
  * @param [imageOptions.sourcePath]
- * Path where the pug templates can be found. Subdirectories will be searched.
+ * Path where the source images can be found. Subdirectories will be searched.
  * Default to "webres/<targetName>"
  *
  * @param [imageOptions.outputPath]

package/lib/grunt/reactapp/image.js

@@ -47,10 +47,10 @@ const handledExtensions = [
  * Options for the image task configuration.
  *
  * @param [imageOptions.options]
- * Options to pass to grunt-contrib-imagemin.
+ * Options to pass to @cley_faye/imagemin-lite.
  *
  * @param [imageOptions.sourcePath]
- * Path where the pug templates can be found. Subdirectories will be searched.
+ * Path where the source images can be found. Subdirectories will be searched.
  * Default to "webres/<targetName>"
  *
  * @param [imageOptions.outputPath]
@@ -63,19 +63,20 @@ const handledExtensions = [
  */
 const handle = (gruntConfig, targetName, imageOptions) => {
     const handledFiles = handledExtensions.map(ext => `**/*${ext}`);
+    // TODO use @cley_faye/imagemin-lite once it exists
     const newImageTask = {
         options: imageOptions.options,
         files: [
             {
                 expand: true,
-                cwd: imageOptions.sourcePath ?? path_1.join("webres", targetName),
+                cwd: imageOptions.sourcePath ?? (0, path_1.join)("webres", targetName),
                 src: handledFiles,
-                dest: imageOptions.outputPath ?? path_1.join("dist", targetName),
+                dest: imageOptions.outputPath ?? (0, path_1.join)("dist", targetName),
             },
         ],
     };
     const requiredTasks = [
-        util_js_1.insertTask(gruntConfig, "imagemin", targetName, newImageTask),
+        (0, util_js_1.insertTask)(gruntConfig, "copy", `${targetName}_image`, newImageTask),
     ];
     const watchTasks = [
         {

package/lib/grunt/reactapp/pug.js

@@ -35,7 +35,7 @@ const createDynamicTask = (gruntConfig, targetName, pugOptions, pugTask, require
     if (!pugOptions.dynamicData) {
         return;
     }
-    requiredTasks.splice(0, 0, util_js_1.insertDynamicTask(gruntConfig, "pugDynamicData", targetName, () => {
+    requiredTasks.splice(0, 0, (0, util_js_1.insertDynamicTask)(gruntConfig, "pugDynamicData", targetName, () => {
         if (!pugOptions.dynamicData) {
             return Promise.reject(new Error("Missing expected function"));
         }
@@ -91,15 +91,15 @@ const handle = (gruntConfig, targetName, pugOptions) => {
         files: [
             {
                 expand: true,
-                cwd: pugOptions.sourcePath ?? path_1.join("webres", targetName),
+                cwd: pugOptions.sourcePath ?? (0, path_1.join)("webres", targetName),
                 src: handledFiles,
-                dest: pugOptions.outputPath ?? path_1.join("dist", targetName),
+                dest: pugOptions.outputPath ?? (0, path_1.join)("dist", targetName),
                 ext: pugOptions.fileSuffix ?? ".html",
             },
         ],
     };
     const requiredTasks = [
-        util_js_1.insertTask(gruntConfig, "pug", targetName, newPugTask),
+        (0, util_js_1.insertTask)(gruntConfig, "pug", targetName, newPugTask),
     ];
     createDynamicTask(gruntConfig, targetName, pugOptions, newPugTask, requiredTasks);
     const watchTasks = [

package/lib/grunt/reactapp/sass.js

@@ -76,9 +76,9 @@ const handle = (gruntConfig, targetName, sassOptions) => {
         files: [
             {
                 expand: true,
-                cwd: sassOptions.sourcePath ?? path_1.join("webres", targetName),
+                cwd: sassOptions.sourcePath ?? (0, path_1.join)("webres", targetName),
                 src: handledFiles,
-                dest: sassOptions.outputPath ?? path_1.join("dist", targetName),
+                dest: sassOptions.outputPath ?? (0, path_1.join)("dist", targetName),
                 ext: sassOptions.fileSuffix ?? ".css",
             },
         ],
@@ -87,7 +87,7 @@ const handle = (gruntConfig, targetName, sassOptions) => {
         // eslint-disable-next-line @typescript-eslint/no-require-imports, global-require, @typescript-eslint/no-var-requires
         sassTask.options.implementation = require("sass");
     }
-    const requiredTasks = [util_js_1.insertTask(gruntConfig, "sass", targetName, sassTask)];
+    const requiredTasks = [(0, util_js_1.insertTask)(gruntConfig, "sass", targetName, sassTask)];
     const watchTasks = [
         {
             filesToWatch: [...handledExtensions.map(ext => `**/*${ext}`)],

package/lib/grunt/reactapp/webpack.js

@@ -101,7 +101,7 @@ const webpackLoadersDefault = (options) => [
 ];
 exports.webpackLoadersDefault = webpackLoadersDefault;
 const computeWebpackOutput = (webpackOptions, targetName) => webpackOptions.output ?? {
-    path: path_1.resolve("dist", targetName, "js"),
+    path: (0, path_1.resolve)("dist", targetName, "js"),
     filename: "[name].js",
 };
 const lastNamePosition = 2;
@@ -110,7 +110,7 @@ const getHandledFiles = (webpackEntry) => Object.keys(webpackEntry).reduce((acc,
         const split = webpackEntry[cur].split("/");
         acc.push(split.slice(lastNamePosition).join("/"));
     }
-    webpackEntry[cur] = path_1.resolve(webpackEntry[cur]);
+    webpackEntry[cur] = (0, path_1.resolve)(webpackEntry[cur]);
     return acc;
 }, []);
 const getOutputToWatch = (webpackOptions, targetName) => {
@@ -120,7 +120,7 @@ const getOutputToWatch = (webpackOptions, targetName) => {
     const entries = webpackOptions.entry
         ? Object.keys(webpackOptions.entry)
         : [targetName];
-    return entries.map(entryName => path_1.join("dist", targetName, "js", `${entryName}.js`));
+    return entries.map(entryName => (0, path_1.join)("dist", targetName, "js", `${entryName}.js`));
 };
 const getWatchTasks = (webpackOptions, targetName) => {
     const outputToWatch = getOutputToWatch(webpackOptions, targetName);
@@ -135,12 +135,12 @@ const getWatchTasks = (webpackOptions, targetName) => {
     return [];
 };
 const registerTasks = (gruntConfig, targetName, webpackConfig) => {
-    util_js_1.insertTask(gruntConfig, "webpack", `${targetName}_watch`, {
+    (0, util_js_1.insertTask)(gruntConfig, "webpack", `${targetName}_watch`, {
         ...webpackConfig,
         watch: true,
     });
     return [
-        util_js_1.insertTask(gruntConfig, "webpack", targetName, webpackConfig),
+        (0, util_js_1.insertTask)(gruntConfig, "webpack", targetName, webpackConfig),
     ];
 };
 /** Add a webpack task for the reactApp recipe
@@ -201,11 +201,11 @@ const registerTasks = (gruntConfig, targetName, webpackConfig) => {
  */
 const handle = (gruntConfig, targetName, webpackOptions) => {
     const webpackEntry = webpackOptions.entry
-        ?? { [targetName]: path_1.join("webres", targetName, "js", "loader.js") };
+        ?? { [targetName]: (0, path_1.join)("webres", targetName, "js", "loader.js") };
     const handledFiles = getHandledFiles(webpackEntry);
     const webpackOutput = computeWebpackOutput(webpackOptions, targetName);
     const webpackLoaders = webpackOptions.loaders
-        ?? exports.webpackLoadersDefault({
+        ?? (0, exports.webpackLoadersDefault)({
             development: webpackOptions.mode === "development",
             defines: webpackOptions.defines,
             babel: { plugins: webpackOptions.babelPlugins },
@@ -225,7 +225,7 @@ const handle = (gruntConfig, targetName, webpackOptions) => {
     // Special case: I'm not sure I can move options in the task-specific part of
     // the configuration, so I add it at the toplevel of the "webpack" task.
     if (webpackOptions.options) {
-        util_js_1.insertTask(gruntConfig, "webpack", "options", webpackOptions.options);
+        (0, util_js_1.insertTask)(gruntConfig, "webpack", "options", webpackOptions.options);
     }
     const requiredTasks = registerTasks(gruntConfig, targetName, webpackConfig);
     const watchTasks = getWatchTasks(webpackOptions, targetName);

package/lib/grunt/reactapp.js

@@ -65,7 +65,7 @@ const mergeResults = (tasksResults) => tasksResults.reduce((acc, cur) => {
 const createCopyTask = (gruntConfig, targetName, mergedResults, options) => {
     const copyOptions = (options?.[HandlerType.COPY]) ?? {};
     copyOptions.skipFiles = mergedResults.handledFiles;
-    const copyTask = copy_js_1.handle(gruntConfig, targetName, copyOptions);
+    const copyTask = (0, copy_js_1.handle)(gruntConfig, targetName, copyOptions);
     mergedResults.requiredTasks = mergedResults.requiredTasks.concat(copyTask.requiredTasks);
     mergedResults.watchTasks = mergedResults.watchTasks.concat(copyTask.watchTasks);
 };
@@ -104,10 +104,10 @@ const createWatchTasks = (gruntConfig, mergedResults, watchMode) => {
         return;
     }
     if (mergedResults.watchTasks.length > 0) {
-        util_js_2.insertTask(gruntConfig, "watch", "options", getWatcherOptions(watchMode));
+        (0, util_js_2.insertTask)(gruntConfig, "watch", "options", getWatcherOptions(watchMode));
     }
     mergedResults.watchTasks.forEach(watchTask => {
-        util_js_2.insertTask(gruntConfig, "watch", getWatchTaskName(watchTask), {
+        (0, util_js_2.insertTask)(gruntConfig, "watch", getWatchTaskName(watchTask), {
             options: getWatcherOptions(watchMode),
             files: watchTask.filesToWatch.reduce((acc, cur) => {
                 const prefix = watchTask.fromRoot
@@ -215,11 +215,11 @@ exports.reactApp = reactApp;
  * A configuration object for reactApp().
  */
 const reactAppOptionsHelper = (helperOptions, options) => {
-    let result = util_js_1.deepSet(options, "sass.options.outputStyle", helperOptions.production ? "compressed" : "expanded");
-    result = util_js_1.deepSet(result, "sass.options.sourceMap", !helperOptions.production);
-    result = util_js_1.deepSet(result, "pug.options.pretty", !helperOptions.production);
-    result = util_js_1.deepSet(result, "pug.options.data.productionBuild", Boolean(helperOptions.production));
-    result = util_js_1.deepSet(result, "webpack.mode", helperOptions.production ? "production" : "development");
+    let result = (0, util_js_1.deepSet)(options, "sass.options.outputStyle", helperOptions.production ? "compressed" : "expanded");
+    result = (0, util_js_1.deepSet)(result, "sass.options.sourceMap", !helperOptions.production);
+    result = (0, util_js_1.deepSet)(result, "pug.options.pretty", !helperOptions.production);
+    result = (0, util_js_1.deepSet)(result, "pug.options.data.productionBuild", Boolean(helperOptions.production));
+    result = (0, util_js_1.deepSet)(result, "webpack.mode", helperOptions.production ? "production" : "development");
     if (helperOptions.watch !== undefined) {
         result.watch = helperOptions.watch;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "3.0.4",
+  "version": "3.2.0",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "prepack": "npm run grunt -- clean build",
-    "grunt": "npm exec grunt -- --gruntfile Gruntfile.cjs"
+    "grunt": "npx grunt --gruntfile Gruntfile.cjs"
   },
   "author": "Gabriel Paul \"Cley Faye\" Risterucci",
   "license": "MIT",
@@ -17,21 +17,21 @@
   },
   "homepage": "https://github.com/CleyFaye/boilerplate#readme",
   "devDependencies": {
-    "@keeex/eslint-config": "^1.4.3",
+    "@keeex/eslint-config": "^1.5.9",
     "@types/express": "^4.17.11",
     "@types/grunt": "^0.4.25",
     "@types/http-errors": "^1.8.0",
     "@types/node": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.15.0",
-    "@typescript-eslint/parser": "^4.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
     "eslint": "^7.20.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-webpack-plugin": "^2.5.4",
+    "eslint-plugin-promise": "^5.1.1",
+    "eslint-webpack-plugin": "^3.0.1",
     "express-winston": "^4.0.5",
     "grunt": "^1.4.1",
     "grunt-banner": "^0.6.0",
     "grunt-contrib-clean": "^2.0.0",
-    "grunt-ts": "^6.0.0-beta.22",
+    "grunt-run": "^0.8.1",
     "load-grunt-tasks": "^5.1.0",
     "typescript": "^4.1.5",
     "winston": "^3.3.3"
@@ -44,16 +44,15 @@
     "babel-loader": "8.x",
     "babel-plugin-transform-define": "2.x",
     "core-js": "3.x",
-    "eslint-webpack-plugin": "2.x",
+    "eslint-webpack-plugin": "^3.0.1",
     "express": "4.x",
     "express-winston": "4.x",
     "grunt": "1.x",
     "grunt-contrib-copy": "1.x",
-    "grunt-contrib-imagemin": "4.x",
     "grunt-contrib-pug": "3.x",
     "grunt-contrib-watch": "1.x",
     "grunt-sass": "3.x",
-    "grunt-webpack": "4.x",
+    "grunt-webpack": "5.x",
     "sass": "1.x",
     "winston": "3.x"
   },
@@ -79,9 +78,6 @@
     "grunt-contrib-pug": {
       "optional": true
     },
-    "grunt-contrib-imagemin": {
-      "optional": true
-    },
     "@babel/plugin-transform-runtime": {
       "optional": true
     },