underpost 2.8.43 → 2.8.44

package/.vscode/settings.json

@@ -113,5 +113,8 @@
     "editor.defaultFormatter": "foxundermoon.shell-format"
   },
   "docwriter.progress.trackTypes": true,
-  "docwriter.hotkey.mac": "⌘ + ."
+  "docwriter.hotkey.mac": "⌘ + .",
+  "[dotenv]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  }
 }

package/bin/index.js

@@ -68,8 +68,8 @@ program
 
 program
   .command('root')
-  .description('Set environment variables files and conf related to <deploy-id>')
-  .action(getNpmRootPath);
+  .description('Get npm root path')
+  .action(() => console.log(getNpmRootPath()));
 
 program.command('test').description('Run tests').action(Underpost.runTest);
 

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.43'
+      engine.version: '2.8.44'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.43",
+    "version": "2.8.44",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/client/ssr/body/CacheControl.js

@@ -106,10 +106,10 @@ SrrComponent = ({ ttiLoadTimeLimit }) => {
     </style>
     ${borderChar(1, 'black', ['.clean-cache-container'])}
     <script>
-      window._VERSION = '${process.env.npm_package_version}';
+      window._VERSION = '${npm_package_version}';
       const CacheControl = ${CacheControl};
       CacheControl({ ttiLoadTimeLimit: ${ttiLoadTimeLimit ? ttiLoadTimeLimit : 1000 * 70 * 1} });
     </script>
-    <div class="clean-cache-container">${process.env.npm_package_version}</div>
+    <div class="clean-cache-container">${npm_package_version}</div>
   `;
 };

package/src/index.js

@@ -21,7 +21,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.43';
+  static version = 'v2.8.44';
 
   constructor() {}
 

package/src/server/client-build.js

@@ -191,8 +191,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
 
       if (redirect || disabledRebuild) continue;
 
-      if (fullBuildEnabled) {
-        //  !(confServer[host]['/'] && confServer[host]['/'].liteBuild)
+      if (fullBuildEnabled)
         await fullBuild({
           path,
           logger,
@@ -205,14 +204,6 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
           iconsBuild,
           metadata,
         });
-        if (apis && false)
-          for (const apiBuildScript of apis) {
-            const scriptPath = `src/api/${apiBuildScript}/${apiBuildScript}.build.js`;
-            if (fs.existsSync(`./${scriptPath}`)) {
-              shellExec(`node ${scriptPath}`);
-            }
-          }
-      }
 
       if (components)
         for (const module of Object.keys(components)) {

package/src/server/client-formatted.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import fs from 'fs-extra';
+import vm from 'node:vm';
 
 const srcFormatted = (src) =>
   src
@@ -48,9 +49,10 @@ const viewFormatted = (src, dists, proxyPath, baseHost = '') => {
 };
 
 const ssrFactory = async (componentPath = `./src/client/ssr/Render.js`) => {
-  let SrrComponent = () => {};
-  eval(await srcFormatted(fs.readFileSync(componentPath, 'utf8')));
-  return SrrComponent;
+  const context = { SrrComponent: () => {}, npm_package_version: process.env.npm_package_version };
+  vm.createContext(context);
+  vm.runInContext(await srcFormatted(fs.readFileSync(componentPath, 'utf8')), context);
+  return context.SrrComponent;
 };
 
 export { srcFormatted, JSONweb, componentFormatted, viewFormatted, ssrFactory };

package/src/server/logger.js

@@ -112,10 +112,10 @@ const loggerFactory = (meta = { url: '' }) => {
     // Allow the use the terminal to print the messages
     new winston.transports.Console(),
     // Allow to print all the error level messages inside the error.log file
-    new winston.transports.File({
-      filename: `logs/${meta}/error.log`,
-      level: 'error',
-    }),
+    // new winston.transports.File({
+    //   filename: `logs/${meta}/error.log`,
+    //   level: 'error',
+    // }),
     // Allow to print all the error message inside the all.log file
     // (also the error log that are also printed inside the error.log(
     new winston.transports.File({ filename: `logs/${meta}/all.log` }),