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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "6.4.0",
+  "version": "6.6.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -14,16 +14,16 @@
   "license": "MIT",
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/ipc": "^10.2.1",
-    "@lvce-editor/json-rpc": "^3.0.0",
+    "@lvce-editor/ipc": "^11.0.1",
+    "@lvce-editor/json-rpc": "^4.0.0",
     "@lvce-editor/verror": "^1.4.0",
-    "@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",
+    "@pronto-tools-and-more/file-watcher": "6.6.0",
+    "@pronto-tools-and-more/files": "6.6.0",
+    "@pronto-tools-and-more/network-process": "6.6.0",
+    "@pronto-tools-and-more/sass-compiler": "6.6.0",
+    "@pronto-tools-and-more/components-renderer": "6.6.0",
+    "@pronto-tools-and-more/components": "6.6.0",
+    "@pronto-tools-and-more/schema-process": "6.6.0",
     "execa": "^9.3.1",
     "express": "^4.21.0"
   },

package/src/parts/Format/Format.js

@@ -0,0 +1,22 @@
+import { VError } from "@lvce-editor/verror";
+import { join } from "path";
+import * as Cwd from "../Cwd/Cwd.js";
+import * as Exec from "../Exec/Exec.js";
+
+export const format = async () => {
+  try {
+    const viewsJsonFolder = join(
+      Cwd.cwd,
+      "src",
+      "default",
+      "storefront",
+      "assets",
+      "views"
+    );
+    await Exec.exec("npx", ["prettier", "--write", "."], {
+      cwd: viewsJsonFolder,
+    });
+  } catch (error) {
+    throw new VError(error, `Failed to format code`);
+  }
+};

package/src/parts/PullCode/PullCode.js

@@ -5,9 +5,11 @@ import * as Config from "../Config/Config.js";
 import * as Cwd from "../Cwd/Cwd.js";
 import * as DownloadZipFile from "../DownloadZipFile/DownloadZipFile.js";
 import * as ExtractZip from "../ExtractZip/ExtractZip.js";
+import * as Format from "../Format/Format.js";
 import * as GetSessionId from "../GetSessionId/GetSessionId.js";
 import * as ListContentZipFiles from "../ListContentZipFiles/ListContentZipFiles.js";
 import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
+import * as Split from "../Split/Split.js";
 
 export const pullCode = async () => {
   try {
@@ -18,6 +20,7 @@ export const pullCode = async () => {
       appId,
       downloadBaseUrl,
       listResourcesUrl,
+      splitViews,
     } = Config;
     const outFile = join(Cwd.cwd, ".tmp", "update.zip");
     const outDir = join(Cwd.cwd, ".tmp", "update");
@@ -46,6 +49,19 @@ export const pullCode = async () => {
     await rm(oldSrc, { recursive: true, force: true });
     await rename(src, oldSrc);
     await rename(outDir, src);
+    if (splitViews) {
+      const viewsFolderPath = join(
+        Cwd.cwd,
+        "src",
+        "default",
+        "storefront",
+        "assets",
+        "views"
+      );
+      await rm(viewsFolderPath, { recursive: true, force: true });
+      await Split.split();
+      await Format.format();
+    }
   } catch (error) {
     throw new VError(error, `Failed to pull code`);
   } finally {

package/src/parts/PushCode/PushCode.js

@@ -1,14 +1,14 @@
 import * as Config from "../Config/Config.js";
-import * as PushCodeTo from "../PushCodeTo/PushCodeTo.js";
 import * as GetTag from "../GetTag/GetTag.js";
+import * as PushCodeTo from "../PushCodeTo/PushCodeTo.js";
 
 export const pushCode = async () => {
-  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 });
+    if (Config.pushToReleaseOnGitTag) {
+      await PushCodeTo.pushCodeTo({ preview: false });
+    }
+  } else {
+    await PushCodeTo.pushCodeTo({ preview: true });
   }
 };