@pronto-tools-and-more/pronto 4.2.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "4.2.0",
+  "version": "4.4.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -13,13 +13,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@pronto-tools-and-more/file-watcher": "4.2.0",
-    "@pronto-tools-and-more/files": "4.2.0",
-    "@pronto-tools-and-more/network-process": "4.2.0",
-    "@pronto-tools-and-more/sass-compiler": "4.2.0",
+    "@pronto-tools-and-more/file-watcher": "4.4.0",
+    "@pronto-tools-and-more/files": "4.4.0",
+    "@pronto-tools-and-more/network-process": "4.4.0",
+    "@pronto-tools-and-more/sass-compiler": "4.4.0",
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/ipc": "^9.3.0",
-    "@lvce-editor/json-rpc": "^1.3.0",
+    "@lvce-editor/ipc": "^9.4.0",
+    "@lvce-editor/json-rpc": "^1.4.0",
     "@lvce-editor/verror": "^1.3.0",
     "execa": "^9.3.0",
     "express": "^4.19.2"
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/node": "^20.14.10",
-    "@types/ws": "^8.5.11",
+    "@types/ws": "^8.5.12",
     "jest": "^29.7.0"
   },
   "jest": {

package/src/parts/App/App.js

@@ -90,6 +90,22 @@ export const create = ({
     ProxyPath.create({
       prefix: "/resources/web",
       to: Config.managerWebUrl,
+      customIf: [
+        {
+          match: "purpleshared/custom.css",
+          file: join(defaultPath, "readmode", "custom.css"),
+          postfix: "",
+        },
+        {
+          match: "purpleshared/custom.js",
+          file: join(defaultPath, "readmode", "custom.js"),
+          postfix: `
+const script = document.createElement('script')
+script.src='/assets/live-reload-readmode.js'
+document.head.append(script)
+          `,
+        },
+      ],
     })
   );
   return app;

package/src/parts/CommitMessage/CommitMessage.js

@@ -4,7 +4,7 @@ import * as Exec from "../Exec/Exec.js";
 export const getCommitMessage = async () => {
   try {
     if (process.env.CI_COMMIT_MESSAGE) {
-      return process.env.CI_COMMIT_MESSAGE;
+      return process.env.CI_COMMIT_MESSAGE.trim();
     }
     const { stdout } = await Exec.exec("git", ["log", "-1", "--pretty=%B"]);
     return stdout.trim();

package/src/parts/HandleFileChange/HandleFileChange.js

@@ -1,10 +1,25 @@
+import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import * as SendFullUpdates from "../SendFullUpdates/SendFullUpdates.js";
 import * as SendSassUpdates from "../SendSassUpdates/SendSassUpdates.js";
+import * as SendUpdates from "../SendUpdates/SendUpdates.js";
 
-export const handleFileChange = (clients, event, root, errorColor) => {
-  if (event.filename.endsWith(".scss")) {
-    const absolutePath = join(root, event.filename);
+export const handleFileChange = async (clients, event, root, errorColor) => {
+  const absolutePath = join(root, event.filename);
+  if (event.filename === "default/readmode/custom.css") {
+    const css = await readFile(absolutePath, "utf8");
+    const changes = [
+      {
+        fileName: event.filename,
+        css,
+      },
+    ];
+    SendUpdates.sendUpdates(clients, {
+      jsonrpc: "2.0",
+      method: "updateCss",
+      params: [changes],
+    });
+  } else if (event.filename.endsWith(".scss")) {
     SendSassUpdates.sendSassUpdates(
       clients,
       absolutePath,

package/src/parts/ProxyPath/ProxyPath.js

@@ -1,4 +1,5 @@
 import { VError } from "@lvce-editor/verror";
+import { readFile } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 
 const getProxyResponse = async (prefix, to, sourceUrl) => {
@@ -16,8 +17,17 @@ const getProxyResponse = async (prefix, to, sourceUrl) => {
   }
 };
 
-export const create = ({ prefix, to }) => {
+export const create = ({ prefix, to, customIf }) => {
   const proxyFn = async (req, res) => {
+    for (const item of customIf) {
+      if (req.url.includes(item.match)) {
+        const absolutePath = item.file;
+        const content = await readFile(absolutePath, "utf8");
+        const fullContent = content + "\n" + item.postfix;
+        res.end(fullContent);
+        return;
+      }
+    }
     const proxyResponse = await getProxyResponse(prefix, to, req.url);
     await pipeline(proxyResponse, res);
   };

package/src/parts/Upgrade/Upgrade.js

@@ -25,12 +25,11 @@ export const upgrade = async () => {
       pullWorkingCopyUrl,
     } = Config;
     const src = join(Cwd.cwd, "src");
-    const sessionInfo = await GetSessionId.getSessionId({
+    const sessionId = await GetSessionId.getSessionId({
       loginUrl,
       userEmail,
       userPassword,
     });
-    const sessionId = sessionInfo.sessionID;
     await PullWorkingCopy.pullWorkingCopy({
       appId,
       sessionId,