@pronto-tools-and-more/pronto 11.4.0 → 11.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "11.4.0",
+  "version": "11.6.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,16 +17,16 @@
     "@lvce-editor/ipc": "^11.7.0",
     "@lvce-editor/json-rpc": "^5.3.0",
     "@lvce-editor/verror": "^1.6.0",
-    "@pronto-tools-and-more/file-watcher": "11.4.0",
-    "@pronto-tools-and-more/files": "11.4.0",
-    "@pronto-tools-and-more/network-process": "11.4.0",
-    "@pronto-tools-and-more/sass-compiler": "11.4.0",
-    "@pronto-tools-and-more/components-renderer": "11.4.0",
-    "@pronto-tools-and-more/components": "11.4.0",
-    "@pronto-tools-and-more/schema-process": "11.4.0",
-    "@pronto-tools-and-more/diff-process": "11.4.0",
-    "@pronto-tools-and-more/type-checker": "11.4.0",
-    "@pronto-tools-and-more/custom-js-functions": "11.4.0",
+    "@pronto-tools-and-more/file-watcher": "11.6.0",
+    "@pronto-tools-and-more/files": "11.6.0",
+    "@pronto-tools-and-more/network-process": "11.6.0",
+    "@pronto-tools-and-more/sass-compiler": "11.6.0",
+    "@pronto-tools-and-more/components-renderer": "11.6.0",
+    "@pronto-tools-and-more/components": "11.6.0",
+    "@pronto-tools-and-more/schema-process": "11.6.0",
+    "@pronto-tools-and-more/diff-process": "11.6.0",
+    "@pronto-tools-and-more/type-checker": "11.6.0",
+    "@pronto-tools-and-more/custom-js-functions": "11.6.0",
     "execa": "^9.5.2",
     "express": "^4.21.2"
   },

package/src/parts/App/App.js

@@ -14,6 +14,7 @@ export const create = ({
   root,
   appId,
   baseUrl,
+  rootSassFile,
   contentUrl,
   platform,
   managerBaseUrl,
@@ -26,6 +27,7 @@ export const create = ({
   managerWebUrl,
   resourceDynamicUrlsInViewsJson,
   injectCustomJs,
+  shimConfigLoader,
 }) => {
   const app = express();
   const storeFrontPath = join(root, "src", "default", "storefront");
@@ -43,10 +45,13 @@ export const create = ({
       filesPath: FilesPath.filesPath,
     })
   );
-  app.get(
-    "/assets/scripts/configLoader.js",
-    HandleConfigLoader.handleConfigLoader
-  );
+
+  if (shimConfigLoader) {
+    app.get(
+      "/assets/scripts/configLoader.js",
+      HandleConfigLoader.handleConfigLoader
+    );
+  }
   app.get(
     "/modules/main.js",
     HandleMainJs.handleMainJs({
@@ -84,7 +89,7 @@ export const create = ({
       injectCustomJs,
     })
   );
-  app.use("*", HandleCss.handleCss(storeFrontPath));
+  app.use("*", HandleCss.handleCss(storeFrontPath, rootSassFile));
   app.use(express.static(FilesPath.filesPath));
   if (mode === "slim") {
     app.use(

package/src/parts/Config/Config.js

@@ -115,3 +115,5 @@ export const resourceDynamicUrlsInViewsJson =
   config.resourceDynamicUrlsInViewsJson || false;
 
 export const injectCustomJs = config.injectCustomJs || false;
+
+export const shimConfigLoader = config.shimConfigLoader || false;

package/src/parts/CreateServer/CreateServer.js

@@ -12,6 +12,7 @@ export const createServer = async (root, errorColor) => {
   Assert.string(root);
   const app = App.create({
     root,
+    rootSassFile: Config.rootSassFile,
     appId: Config.appId,
     baseUrl: Config.baseUrl,
     contentUrl: Config.contentUrl,
@@ -26,6 +27,7 @@ export const createServer = async (root, errorColor) => {
     splitViews: Config.splitViews,
     resourceDynamicUrlsInViewsJson: Config.resourceDynamicUrlsInViewsJson,
     injectCustomJs: Config.injectCustomJs,
+    shimConfigLoader: Config.shimConfigLoader,
   });
   const server = http.createServer(app);
   const webSocketServer = new ws.WebSocketServer({

package/src/parts/GetCssEtag/GetCssEtag.js

@@ -1,10 +1,10 @@
 import { readdir, stat } from "fs/promises";
-import { join } from "path";
+import { dirname, join } from "path";
 import * as Etag from "../Etag/Etag.js";
 
-export const getCssEtag = async (storefrontPath) => {
+export const getCssEtag = async (storefrontPath, rootSassFile) => {
   try {
-    const scssPath = join(storefrontPath, "assets", "scss");
+    const scssPath = dirname(rootSassFile);
     const dirents = await readdir(scssPath, {
       recursive: true,
     });
@@ -21,7 +21,7 @@ export const getCssEtag = async (storefrontPath) => {
     );
     return Etag.fromStats(stats);
   } catch (error) {
-    console.warn(`Failed to compute css etag ${error}`);
+    console.warn(`[server] Failed to compute css etag ${error}`);
     return `css-${Math.random()}`;
   }
 };

package/src/parts/HandleCss/HandleCss.js

@@ -6,35 +6,39 @@ import * as Config from "../Config/Config.js";
 import * as GetCssEtag from "../GetCssEtag/GetCssEtag.js";
 import * as UpdateCss from "../UpdateCss/UpdateCss.js";
 
-export const handleCss = (storeFrontPath) => async (req, res, next) => {
-  const pathName = req._parsedUrl.pathname;
-  if (!pathName.endsWith(".css")) {
-    return next();
-  }
-  res.setHeader("content-type", "text/css");
-  if (pathName === "/assets/custom.css") {
-    try {
-      const ifNoneMatch = req.headers["if-none-match"];
-      const cssEtag = await GetCssEtag.getCssEtag(storeFrontPath);
-      if (ifNoneMatch && ifNoneMatch === cssEtag) {
-        res.statusCode = 304;
-        res.end();
-        return;
+export const handleCss =
+  (storeFrontPath, rootSassFile) => async (req, res, next) => {
+    const pathName = req._parsedUrl.pathname;
+    if (!pathName.endsWith(".css")) {
+      return next();
+    }
+    res.setHeader("content-type", "text/css");
+    if (pathName === "/assets/custom.css") {
+      try {
+        const ifNoneMatch = req.headers["if-none-match"];
+        const cssEtag = await GetCssEtag.getCssEtag(
+          storeFrontPath,
+          rootSassFile
+        );
+        if (ifNoneMatch && ifNoneMatch === cssEtag) {
+          res.statusCode = 304;
+          res.end();
+          return;
+        }
+        const result = await CompileSass.compileSass(Config.rootSassFile);
+        res.setHeader("Etag", cssEtag);
+        res.end(result.css);
+      } catch (error) {
+        console.warn(error);
+        res.end(`css error: ${error}`);
       }
-      const result = await CompileSass.compileSass(Config.rootSassFile);
-      res.setHeader("Etag", cssEtag);
-      res.end(result.css);
-    } catch (error) {
-      console.warn(error);
-      res.end(`css error: ${error}`);
+      return;
+    }
+    const cssPath = join(storeFrontPath, pathName);
+    if (!existsSync(cssPath)) {
+      return next();
     }
-    return;
-  }
-  const cssPath = join(storeFrontPath, pathName);
-  if (!existsSync(cssPath)) {
-    return next();
-  }
-  const cssContent = await readFile(cssPath, "utf8");
-  const newCss = UpdateCss.updateCss(cssContent);
-  res.end(newCss);
-};
+    const cssContent = await readFile(cssPath, "utf8");
+    const newCss = UpdateCss.updateCss(cssContent);
+    res.end(newCss);
+  };

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '11.4.0'
+export const version = '11.6.0'