@pronto-tools-and-more/pronto 10.12.0 → 10.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "10.12.0",
+  "version": "10.14.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,15 +17,16 @@
     "@lvce-editor/ipc": "^11.3.0",
     "@lvce-editor/json-rpc": "^5.2.0",
     "@lvce-editor/verror": "^1.6.0",
-    "@pronto-tools-and-more/file-watcher": "10.12.0",
-    "@pronto-tools-and-more/files": "10.12.0",
-    "@pronto-tools-and-more/network-process": "10.12.0",
-    "@pronto-tools-and-more/sass-compiler": "10.12.0",
-    "@pronto-tools-and-more/components-renderer": "10.12.0",
-    "@pronto-tools-and-more/components": "10.12.0",
-    "@pronto-tools-and-more/schema-process": "10.12.0",
-    "@pronto-tools-and-more/diff-process": "10.12.0",
-    "@pronto-tools-and-more/type-checker": "10.12.0",
+    "@pronto-tools-and-more/file-watcher": "10.14.0",
+    "@pronto-tools-and-more/files": "10.14.0",
+    "@pronto-tools-and-more/network-process": "10.14.0",
+    "@pronto-tools-and-more/sass-compiler": "10.14.0",
+    "@pronto-tools-and-more/components-renderer": "10.14.0",
+    "@pronto-tools-and-more/components": "10.14.0",
+    "@pronto-tools-and-more/schema-process": "10.14.0",
+    "@pronto-tools-and-more/diff-process": "10.14.0",
+    "@pronto-tools-and-more/type-checker": "10.14.0",
+    "@pronto-tools-and-more/custom-js-functions": "10.14.0",
     "execa": "^9.5.1",
     "express": "^4.21.1"
   },

package/src/parts/App/App.js

@@ -6,6 +6,7 @@ import * as HandleFeaturesJson from "../HandleFeaturesJson/HandleFeaturesJson.js
 import * as HandleIndex from "../HandleIndex/HandleIndex.js";
 import * as HandleMainJs from "../HandleMainJs/HandleMainJs.js";
 import * as HandleViews from "../HandleViews/HandleViews.js";
+import * as HandleCustomServer from "../HandleCustomServer/HandleCustomServer.js";
 import * as ProxyPath from "../ProxyPath/ProxyPath.js";
 
 export const create = ({
@@ -23,6 +24,7 @@ export const create = ({
   reactComponents,
   managerWebUrl,
   resourceDynamicUrlsInViewsJson,
+  injectCustomJs,
 }) => {
   const app = express();
   const storeFrontPath = join(root, "src", "default", "storefront");
@@ -69,6 +71,14 @@ export const create = ({
       filesPath: FilesPath.filesPath,
     })
   );
+  app.get(
+    "/assets/scripts/custom.server.js",
+    HandleCustomServer.handleCustomServerJs({
+      storeFrontPath,
+      filesPath: FilesPath.filesPath,
+      injectCustomJs,
+    })
+  );
   app.use("*", HandleCss.handleCss(storeFrontPath));
   app.use(express.static(FilesPath.filesPath));
   if (mode === "slim") {

package/src/parts/Build/Build.js

@@ -9,6 +9,7 @@ import * as FilesPath from "../FilesPath/FilesPath.js";
 import * as GetViewsResponse from "../GetViewsResponse/GetViewsResponse.js";
 import * as SassProcess from "../SassProcess/SassProcess.js";
 import * as ValidateAllSchemas from "../ValidateAllSchemas/ValidateAllSchemas.js";
+import * as GetCustomServerJsContent from "../GetCustomServerJsContent/GetCustomServerJsContent.js";
 
 const sourceMap = false;
 
@@ -64,6 +65,30 @@ export const build = async () => {
       await mkdir(dirname(viewsPath), { recursive: true });
       await writeFile(viewsPath, viewsResponse);
     }
+    if (Config.injectCustomJs) {
+      const newContent =
+        await GetCustomServerJsContent.getCustomServerJsContent({
+          customServerJsPath: join(
+            Cwd.cwd,
+            "src",
+            "default",
+            "storefront",
+            "assets",
+            "scripts",
+            "custom.server.js"
+          ),
+        });
+      const customServrJsPathDist = join(
+        dist,
+        "src",
+        "default",
+        "storefront",
+        "assets",
+        "scripts",
+        "custom.server.js"
+      );
+      await writeFile(customServrJsPathDist, newContent);
+    }
     if (Config.validateSchema) {
       await ValidateAllSchemas.validateAllSchemas();
     }

package/src/parts/Config/Config.js

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

package/src/parts/CreateServer/CreateServer.js

@@ -25,6 +25,7 @@ export const createServer = async (root, errorColor) => {
     reactComponents: Config.reactComponents,
     splitViews: Config.splitViews,
     resourceDynamicUrlsInViewsJson: Config.resourceDynamicUrlsInViewsJson,
+    injectCustomJs: Config.injectCustomJs,
   });
   const server = http.createServer(app);
   const webSocketServer = new ws.WebSocketServer({

package/src/parts/CustomJsFunctionsPath/CustomJsFunctionsPath.js

@@ -0,0 +1,13 @@
+import * as Path from "node:path";
+import * as ResolveBin from "../ResolveBin/ResolveBin.js";
+import * as Root from "../Root/Root.js";
+
+export const customJsFunctionsPath =
+  ResolveBin.resolveBin("@pronto-tools-and-more/custom-js-functions") ||
+  Path.join(
+    Root.root,
+    "packages",
+    "pronto-custom-js-functions",
+    "dist",
+    "main.js"
+  );

package/src/parts/GetCustomServerJsContent/GetCustomServerJsContent.js

@@ -0,0 +1,13 @@
+import { readFile } from "fs/promises";
+import * as CustomJsFunctionsPath from "../CustomJsFunctionsPath/CustomJsFunctionsPath.js";
+
+export const getCustomServerJsContent = async ({ customServerJsPath }) => {
+  const baseContent = await readFile(customServerJsPath, "utf8");
+  const injectedContent = await readFile(
+    CustomJsFunctionsPath.customJsFunctionsPath,
+    "utf8"
+  );
+  const merged =
+    baseContent + `\n\n\n// pronto injected code\n\n\n` + injectedContent;
+  return merged;
+};

package/src/parts/HandleCustomServer/HandleCustomServer.js

@@ -0,0 +1,28 @@
+import { createReadStream } from "fs";
+import { join } from "path";
+import { pipeline } from "stream/promises";
+import * as GetCustomServerJsContent from "../GetCustomServerJsContent/GetCustomServerJsContent.js";
+
+export const handleCustomServerJs =
+  ({ storeFrontPath, filesPath, injectCustomJs }) =>
+  async (req, res) => {
+    try {
+      const customServerJsPath = join(
+        storeFrontPath,
+        "assets",
+        "scripts",
+        "custom.server.js"
+      );
+      if (injectCustomJs) {
+        const content = await GetCustomServerJsContent.getCustomServerJsContent(
+          { customServerJsPath }
+        );
+        res.end(content);
+      } else {
+        await pipeline(createReadStream(customServerJsPath), res);
+      }
+    } catch (error) {
+      console.error(`[server] ${error}`);
+      res.status(500).end("internal server error when generating server js");
+    }
+  };

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '10.12.0'
+export const version = '10.14.0'