@pronto-tools-and-more/pronto 6.2.1 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "6.2.1",
+  "version": "6.4.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,15 +17,15 @@
     "@lvce-editor/ipc": "^10.2.1",
     "@lvce-editor/json-rpc": "^3.0.0",
     "@lvce-editor/verror": "^1.4.0",
-    "@pronto-tools-and-more/file-watcher": "6.2.1",
-    "@pronto-tools-and-more/files": "6.2.1",
-    "@pronto-tools-and-more/network-process": "6.2.1",
-    "@pronto-tools-and-more/sass-compiler": "6.2.1",
-    "@pronto-tools-and-more/components-renderer": "6.2.1",
-    "@pronto-tools-and-more/components": "6.2.1",
-    "@pronto-tools-and-more/schema-process": "6.2.1",
+    "@pronto-tools-and-more/file-watcher": "6.4.0",
+    "@pronto-tools-and-more/files": "6.4.0",
+    "@pronto-tools-and-more/network-process": "6.4.0",
+    "@pronto-tools-and-more/sass-compiler": "6.4.0",
+    "@pronto-tools-and-more/components-renderer": "6.4.0",
+    "@pronto-tools-and-more/components": "6.4.0",
+    "@pronto-tools-and-more/schema-process": "6.4.0",
     "execa": "^9.3.1",
-    "express": "^4.20.0"
+    "express": "^4.21.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

package/src/parts/Config/Config.js

@@ -102,3 +102,5 @@ export const companyUrl = config.companyUrl || "https://sprylab.com";
 export const splitViews = config.splitViews || false;
 
 export const reactComponents = config.reactComponents || false;
+
+export const pushToReleaseOnGitTag = config.pushToReleaseOnGitTag || false;

package/src/parts/GetTag/GetTag.js

@@ -0,0 +1,12 @@
+import { VError } from "@lvce-editor/verror";
+
+export const getTag = async () => {
+  try {
+    if (process.env.CI_COMMIT_TAG) {
+      return process.env.CI_COMMIT_TAG.trim();
+    }
+    return "";
+  } catch (error) {
+    throw new VError(error, "Failed to get git tag");
+  }
+};

package/src/parts/NetworkProcess/NetworkProcess.js

@@ -23,4 +23,5 @@ export const invoke = async (method, ...params) => {
 export const dispose = async () => {
   const ipc = await getOrCreate();
   ipc.dispose();
+  state.ipc = undefined;
 };

package/src/parts/PushCode/PushCode.js

@@ -1,68 +1,14 @@
-import { VError } from "@lvce-editor/verror";
-import { join } from "node:path";
 import * as Config from "../Config/Config.js";
-import * as CreateZip from "../CreateZip/CreateZip.js";
-import * as Cwd from "../Cwd/Cwd.js";
-import * as GetSessionId from "../GetSessionId/GetSessionId.js";
-import * as GetZipUploadMessage from "../GetZipUploadMessage/GetZipUploadMessage.js";
-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");
-};
+import * as PushCodeTo from "../PushCodeTo/PushCodeTo.js";
+import * as GetTag from "../GetTag/GetTag.js";
 
 export const pushCode = async () => {
-  try {
-    const {
-      userEmail,
-      userPassword,
-      loginUrl,
-      appId,
-      uploadBaseUrl,
-      preview,
-      uploadTimeout,
-      mode,
-    } = Config;
-    if (!userEmail) {
-      throw new Error(`missing user email`);
-    }
-    if (!userPassword) {
-      throw new Error("missing user password");
-    }
-    const outFile = join(Cwd.cwd, ".tmp", "upload.zip");
-    const src = getSrc(mode);
-    const sessionId = await GetSessionId.getSessionId({
-      loginUrl,
-      userEmail,
-      userPassword,
-    });
-    const message = await GetZipUploadMessage.getZipUploadMessage();
-
-    await CreateZip.createZip({
-      inDir: src,
-      outFile,
-    });
-
-    const response = await UploadZip.uploadZip({
-      file: outFile,
-      uploadBaseUrl,
-      preview,
-      appId,
-      sessionId,
-      uploadTimeout,
-      message,
-      maxRetries: 10,
-      waitBetweenRetries: 60_000,
-    });
-
-    console.log({ response });
-  } catch (error) {
-    throw new VError(error, `Failed to push code`);
-  } finally {
-    NetworkProcess.dispose();
+  const { preview } = Config;
+  await PushCodeTo.pushCodeTo({ preview });
+  const tag = await GetTag.getTag();
+  console.log("tag is", tag);
+  console.log("config is", Config.pushToReleaseOnGitTag);
+  if (tag && Config.pushToReleaseOnGitTag) {
+    await PushCodeTo.pushCodeTo({ preview: false });
   }
 };

package/src/parts/PushCodeTo/PushCodeTo.js

@@ -0,0 +1,67 @@
+import { VError } from "@lvce-editor/verror";
+import { join } from "node:path";
+import * as Config from "../Config/Config.js";
+import * as CreateZip from "../CreateZip/CreateZip.js";
+import * as Cwd from "../Cwd/Cwd.js";
+import * as GetSessionId from "../GetSessionId/GetSessionId.js";
+import * as GetZipUploadMessage from "../GetZipUploadMessage/GetZipUploadMessage.js";
+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 pushCodeTo = async ({ preview }) => {
+  try {
+    const {
+      userEmail,
+      userPassword,
+      loginUrl,
+      appId,
+      uploadBaseUrl,
+      uploadTimeout,
+      mode,
+    } = Config;
+    if (!userEmail) {
+      throw new Error(`missing user email`);
+    }
+    if (!userPassword) {
+      throw new Error("missing user password");
+    }
+    const outFile = join(Cwd.cwd, ".tmp", "upload.zip");
+    const src = getSrc(mode);
+    const sessionId = await GetSessionId.getSessionId({
+      loginUrl,
+      userEmail,
+      userPassword,
+    });
+    const message = await GetZipUploadMessage.getZipUploadMessage();
+
+    await CreateZip.createZip({
+      inDir: src,
+      outFile,
+    });
+
+    const response = await UploadZip.uploadZip({
+      file: outFile,
+      uploadBaseUrl,
+      preview,
+      appId,
+      sessionId,
+      uploadTimeout,
+      message,
+      maxRetries: 10,
+      waitBetweenRetries: 60_000,
+    });
+
+    console.log({ response });
+  } catch (error) {
+    throw new VError(error, `Failed to push code`);
+  } finally {
+    NetworkProcess.dispose();
+  }
+};