Merge branch 'GoodBoyNinja-master'

Author: justintaylor-dev

vite-cep-plugin/src/index.ts

@@ -129,8 +129,8 @@ interface CepOptions {
   debugReact: boolean;
   isServe: boolean;
   cepDist: string;
-  zxpDir: string;
-  zipDir: string;
+  zxpOutput: string;
+  zipOutput: string;
   packages: string[];
 }
 export const cep = (opts: CepOptions) => {
@@ -143,8 +143,8 @@ export const cep = (opts: CepOptions) => {
     isServe,
     debugReact,
     cepDist,
-    zxpDir,
-    zipDir,
+    zxpOutput,
+    zipOutput,
     packages,
   } = opts;
 
@@ -333,11 +333,13 @@ export const cep = (opts: CepOptions) => {
       const input = path.join(dir, cepDist);
       await removeZeroByteFiles(input);
       if (isPackage) {
-        const zxpPath = await signZXP(cepConfig, input, zxpDir, tmpDir);
+        const zxpPath = await signZXP(cepConfig, input, zxpOutput, tmpDir);
         if (isMetaPackage) {
-          const name = `${cepConfig.displayName}_${cepConfig.version}`;
+          const zipName = path.basename(opts.zipOutput)
+          const zipDir = path.dirname(opts.zipOutput)
+          const zxpDir = path.dirname(zxpPath);
           await zipPackage(
-            name,
+            zipName,
             zipDir,
             zxpDir,
             cepConfig.copyZipAssets,
@@ -613,7 +615,7 @@ export const runAction = (opts: CepOptions, action: string) => {
     isServe,
     debugReact,
     cepDist,
-    zxpDir,
+    zxpOutput,
     packages,
   } = opts;
 

vite-cep-plugin/src/lib/zxp.ts

@@ -11,10 +11,11 @@ import { existsSync, readdirSync } from "fs";
 export const signZXP = async (
   config: CEP_Config,
   input: string,
-  zxpDir: string,
+  zxpFile: string,
   tmpDir: string,
 ) => {
   const zxpCmd = os.platform() == "win32" ? `ZXPSignCmd` : `./ZXPSignCmd`;
+  zxpFile = zxpFile + ".zxp";
 
   if (os.platform() === "darwin") {
     const zxpsignCmdPath = path.join(__dirname, "..", "bin", "ZXPSignCmd");
@@ -29,13 +30,13 @@ export const signZXP = async (
 
   const name = config.id;
   const data = config.zxp;
-  const output = path.join(zxpDir, `${name}.zxp`);
+  const zxpDir = path.dirname(zxpFile);
   const certPath = path.join(tmpDir, `${name}-cert.p12`);
   const signPrepStr = `${zxpCmd} -selfSignedCert ${data.country} ${data.province} ${data.org} ${name} ${data.password} "${certPath}"`;
   const cwdDir = path.join(__dirname, "..", "bin");
 
   removeIfExists(certPath);
-  removeIfExists(output);
+  removeIfExists(zxpFile);
   safeCreate(zxpDir);
   console.log({ signPrepStr });
   execSync(signPrepStr, { cwd: cwdDir, encoding: "utf-8" });
@@ -47,7 +48,7 @@ export const signZXP = async (
     await pause(100);
   }
 
-  let signStr = `${zxpCmd} -sign "${input}" "${output}" "${certPath}" ${data.password}`;
+  let signStr = `${zxpCmd} -sign "${input}" "${zxpFile}" "${certPath}" ${data.password}`;
 
   let numTSAs = 0;
   if (data.tsa) {
@@ -95,6 +96,6 @@ export const signZXP = async (
     }
   }
 
-  log("built zxp", true, output);
-  return output;
+  log("built zxp", true, zxpFile);
+  return zxpFile;
 };

vite.config.ts

@@ -5,7 +5,7 @@ import vue from "@vitejs/plugin-vue"; // BOLT_VUE_ONLY
 import { svelte } from "@sveltejs/vite-plugin-svelte"; // BOLT_SVELTE_ONLY
 // import sveltePreprocess from "svelte-preprocess"; // BOLT_SVELTE_ONLY
 
-import { cep, runAction } from "vite-cep-plugin";
+import { cep, CepOptions, runAction } from "vite-cep-plugin";
 import cepConfig from "./cep.config";
 import path from "path";
 import { extendscriptConfig } from "./vite.es.config";
@@ -26,12 +26,12 @@ const isPackage = process.env.ZXP_PACKAGE === "true" || isMetaPackage;
 const isServe = process.env.SERVE_PANEL === "true";
 const action = process.env.BOLT_ACTION;
 
-let input = {};
+let input: { [key: string]: string } = {};
 cepConfig.panels.map((panel) => {
   input[panel.name] = path.resolve(root, panel.mainPath);
 });
 
-const config = {
+const config: CepOptions = {
   cepConfig,
   isProduction,
   isPackage,
@@ -40,8 +40,8 @@ const config = {
   debugReact,
   dir: `${__dirname}/${devDist}`,
   cepDist: cepDist,
-  zxpDir: `${__dirname}/${devDist}/zxp`,
-  zipDir: `${__dirname}/${devDist}/zip`,
+  zxpOutput: `${__dirname}/${devDist}/zxp/${cepConfig.id}`,
+  zipOutput: `${__dirname}/${devDist}/zip/${cepConfig.displayName}_${cepConfig.version}`,
   packages: cepConfig.installModules || [],
 };