@pronto-tools-and-more/pronto 4.5.0 → 4.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -13,15 +13,15 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@pronto-tools-and-more/file-watcher": "4.5.0",
-    "@pronto-tools-and-more/files": "4.5.0",
-    "@pronto-tools-and-more/network-process": "4.5.0",
-    "@pronto-tools-and-more/sass-compiler": "4.5.0",
+    "@pronto-tools-and-more/file-watcher": "4.7.0",
+    "@pronto-tools-and-more/files": "4.7.0",
+    "@pronto-tools-and-more/network-process": "4.7.0",
+    "@pronto-tools-and-more/sass-compiler": "4.7.0",
     "@lvce-editor/assert": "^1.2.0",
     "@lvce-editor/ipc": "^9.4.0",
     "@lvce-editor/json-rpc": "^1.4.0",
     "@lvce-editor/verror": "^1.4.0",
-    "execa": "^9.3.0",
+    "execa": "^9.3.1",
     "express": "^4.19.2"
   },
   "devDependencies": {

package/src/parts/App/App.js

@@ -6,10 +6,9 @@ import * as CompileSass from "../CompileSass/CompileSass.js";
 import * as Config from "../Config/Config.js";
 import * as FilesPath from "../FilesPath/FilesPath.js";
 import * as HandleMainJs from "../HandleMainJs/HandleMainJs.js";
+import * as ProxyPath from "../ProxyPath/ProxyPath.js";
 import * as UpdateCss from "../UpdateCss/UpdateCss.js";
-import * as HandleResources from "../ProxyPath/ProxyPath.js";
 import * as UpdateIndexHtml from "../UpdateIndexHtml/UpdateIndexHtml.js";
-import * as ProxyPath from "../ProxyPath/ProxyPath.js";
 
 const handleIndex =
   (storeFrontPath, appId, baseUrl, contentUrl, platform) =>
@@ -60,6 +59,7 @@ export const create = ({
   kioskBaseUrl,
   catalogApiBaseUrl,
   companyUrl,
+  mode,
 }) => {
   const app = express();
   const storeFrontPath = join(root, "src", "default", "storefront");
@@ -78,10 +78,19 @@ export const create = ({
       kioskBaseUrl,
       managerBaseUrl,
       companyUrl,
+      filesPath: FilesPath.filesPath,
+      mode,
     })
   );
   app.use("*", handleCss(storeFrontPath));
   app.use(express.static(FilesPath.filesPath));
+  if (mode === "slim") {
+    app.use(
+      express.static(
+        join(FilesPath.filesPath, "framework", "src", "default", "storefront")
+      )
+    );
+  }
   app.use(express.static(storeFrontPath));
   app.use(express.static(defaultPath));
   app.use(express.static(contentPath));

package/src/parts/Build/Build.js

@@ -1,7 +1,10 @@
 import { VError } from "@lvce-editor/verror";
-import { writeFile } from "fs/promises";
+import { cp, mkdir, writeFile } from "fs/promises";
+import { join } from "path";
 import * as CompileSass from "../CompileSass/CompileSass.js";
 import * as Config from "../Config/Config.js";
+import * as Cwd from "../Cwd/Cwd.js";
+import * as FilesPath from "../FilesPath/FilesPath.js";
 import * as SassProcess from "../SassProcess/SassProcess.js";
 
 const sourceMap = false;
@@ -12,10 +15,25 @@ export const build = async () => {
       updateDynamicResources: false,
       sourceMap,
     });
+    const dist = join(Cwd.cwd, ".tmp", "dist");
     const css = result.css + "\n\n/*# sourceMappingURL=custom.css.map */\n";
     await writeFile(Config.rootCssFile, css);
     const rootCssMapFile = Config.rootCssFile + ".map";
     await writeFile(rootCssMapFile, JSON.stringify(result.sourceMap) + "\n");
+    if (Config.mode === "slim") {
+      await mkdir(join(dist, "src"), { recursive: true });
+      await cp(
+        join(FilesPath.filesPath, "framework", "src"),
+        join(dist, "src"),
+        {
+          recursive: true,
+        }
+      );
+      await cp(join(Cwd.cwd, "src"), join(dist, "src"), {
+        recursive: true,
+        errorOnExist: false,
+      });
+    }
   } catch (error) {
     throw new VError(error, `Failed to build`);
   } finally {

package/src/parts/Config/Config.js

@@ -67,6 +67,8 @@ export const errorColor = config.errorColor || "red";
 const pipelines = Object.values(builderConfig?.postProcessing?.pipelines || {});
 const sassPipeline = pipelines.find((pipeline) => pipeline.type === "sass");
 
+export const mode = config.mode || "fat";
+
 export const rootSassFile = join(
   Cwd.cwd,
   "src",

package/src/parts/CreateServer/CreateServer.js

@@ -20,6 +20,7 @@ export const createServer = async (root, errorColor) => {
     kioskBaseUrl: Config.kioskBaseUrl,
     catalogApiBaseUrl: Config.catalogApiBaseUrl,
     companyUrl: Config.companyUrl,
+    mode: Config.mode,
   });
   const server = http.createServer(app);
   const webSocketServer = new ws.WebSocketServer({

package/src/parts/HandleMainJs/HandleMainJs.js

@@ -3,6 +3,13 @@ import { join } from "node:path";
 import * as GetNewMainJsContent from "../GetNewMainJsContent/GetNewMainJsContent.js";
 import * as GetPdfViewerSnippet from "../GetPdfViewerSnippet/GetPdfViewerSnippet.js";
 
+const getBasePath = (mode, storeFrontPath, filesPath) => {
+  if (mode === "slim") {
+    return join(filesPath, "framework", "src", "default", "storefront");
+  }
+  return storeFrontPath;
+};
+
 export const handleMainJs =
   ({
     storeFrontPath,
@@ -11,10 +18,13 @@ export const handleMainJs =
     kioskBaseUrl,
     managerBaseUrl,
     companyUrl,
+    filesPath,
+    mode,
   }) =>
   async (req, res) => {
+    const basePath = getBasePath(mode, storeFrontPath, filesPath);
     // TODO use etag
-    const mainPath = join(storeFrontPath, "modules", "main.js");
+    const mainPath = join(basePath, "modules", "main.js");
     const content = await readFile(mainPath, "utf8");
     const pdfSnippet = await GetPdfViewerSnippet.getPdfViewerSnippet({
       appId,

package/src/parts/PushCode/PushCode.js

@@ -8,6 +8,13 @@ import * as GetZipUploadMessage from "../GetZipUploadMessage/GetZipUploadMessage
 import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
 import * as UploadZip from "../UploadZip/UploadZip.js";
 
+const getSrc = (mode) => {
+  if (mode === "slim") {
+    return join(Cwd.cwd, ".tmp", "dist", "src");
+  }
+  return join(Cwd.cwd, "src");
+};
+
 export const pushCode = async () => {
   try {
     const {
@@ -18,6 +25,7 @@ export const pushCode = async () => {
       uploadBaseUrl,
       preview,
       uploadTimeout,
+      mode,
     } = Config;
     if (!userEmail) {
       throw new Error(`missing user email`);
@@ -26,7 +34,7 @@ export const pushCode = async () => {
       throw new Error("missing user password");
     }
     const outFile = join(Cwd.cwd, ".tmp", "upload.zip");
-    const src = join(Cwd.cwd, "src");
+    const src = getSrc(mode);
     const sessionId = await GetSessionId.getSessionId({
       loginUrl,
       userEmail,