allow disabling asar packaging

CynToolkit · Jan 8, 2025 · ac28fb2 · ac28fb2
1 parent 0d00251
commit ac28fb2
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 52 deletions.
diff --git a/assets/electron/template/app/config.cjs b/assets/electron/template/app/config.cjs
@@ -21,6 +21,7 @@
  * @property {string} description
  * @property {string} appCategoryType
  * @property {string} icon
+ * @property {boolean} disableAsarPackaging
  * @property {boolean} enableSteamSupport
  * @property {number} steamGameId
  */
@@ -36,6 +37,7 @@ const config = {
   customMainCode: '',
   description: 'A simple Electron application',
   electronVersion: '',
+  disableAsarPackaging: false,
   enableDisableRendererBackgrounding: false,
   enableInProcessGPU: false,
   frame: true,

diff --git a/assets/electron/template/app/forge.config.cjs b/assets/electron/template/app/forge.config.cjs
@@ -13,9 +13,12 @@ const config = require('./config.cjs')
 module.exports = {
   outDir: './out',
   packagerConfig: {
-    asar: {
-      unpack: "*.{node,dll,so,lib,dylib}"
-    },
+    asar: config.disableAsarPackaging
+      ? false
+      : {
+          // by default, unpack node, and libs files
+          unpack: '*.{node,dll,so,lib,dylib}'
+        },
     name: config.name,
     appBundleId: config.appBundleId,
     appCopyright: config.appCopyright,

diff --git a/src/shared/libs/plugin-core/pipelab.ts b/src/shared/libs/plugin-core/pipelab.ts
@@ -155,10 +155,9 @@ export interface ControlTypeMultiSelect extends ControlTypeBase {
 
 export interface ControlTypeBoolean extends ControlTypeBase {
   type: 'boolean'
-  // options: {
-  //   value: boolean;
-  //   onChange: (value: boolean) => void;
-  // };
+  // options?: {
+  //   allowAuto?: boolean
+  // }
 }
 
 export interface ControlTypeCheckbox extends ControlTypeBase {

diff --git a/src/shared/libs/plugin-electron/configure.ts b/src/shared/libs/plugin-electron/configure.ts
@@ -212,6 +212,15 @@ export const props = createAction({
         label: 'Path to a file containing custom main code'
       }
     },
+    disableAsarPackaging: {
+      required: true,
+      label: 'Disable ASAR packaging',
+      value: false,
+      control: {
+        type: 'boolean'
+      },
+      description: 'Whether to to disable packaging project files in a single binary or not',
+    },
 
     // Flags
 

diff --git a/src/shared/libs/plugin-electron/forge.ts b/src/shared/libs/plugin-electron/forge.ts
@@ -272,6 +272,7 @@ export const forge = async (
       customMainCode: '',
       description: 'A simple Electron application',
       electronVersion: '',
+      disableAsarPackaging: false,
       enableDisableRendererBackgrounding: false,
       enableInProcessGPU: false,
       frame: true,

diff --git a/src/shared/libs/plugin-electron/model.ts b/src/shared/libs/plugin-electron/model.ts
@@ -4,6 +4,7 @@ export type ElectronConfiguration = {
   appCopyright: string
   appVersion: string
   electronVersion: string
+  disableAsarPackaging: boolean
   customMainCode: string
   author: string
   description: string

diff --git a/src/shared/libs/plugin-tauri/forge.ts b/src/shared/libs/plugin-tauri/forge.ts
@@ -252,25 +252,7 @@ export const forge = async (
 
   const completeConfiguration = merge(
     {
-      alwaysOnTop: false,
-      appBundleId: 'com.pipelab.app',
-      appCategoryType: '',
-      appCopyright: 'Copyright © 2024 Pipelab',
-      appVersion: '1.0.0',
-      author: 'Pipelab',
-      customMainCode: '',
-      description: 'A simple tauri application',
-      tauriVersion: '',
-      enableDisableRendererBackgrounding: false,
-      enableInProcessGPU: false,
-      frame: true,
-      fullscreen: false,
-      icon: '',
-      height: 600,
-      name: 'Pipelab',
-      toolbar: true,
-      transparent: false,
-      width: 800
+      name: 'Pipelab'
     } satisfies TauriConfiguration,
     inputs.configuration
   ) as TauriConfiguration
@@ -284,12 +266,12 @@ export const forge = async (
   )
 
   // copy custom main code
-  const destinationFile = join(destinationFolder, 'src', 'custom-main.js')
-  if (completeConfiguration.customMainCode) {
-    await cp(completeConfiguration.customMainCode, destinationFile)
-  } else {
-    await writeFile(destinationFile, 'console.log("No custom main code provided")')
-  }
+  // const destinationFile = join(destinationFolder, 'src', 'custom-main.js')
+  // if (completeConfiguration.customMainCode) {
+  //   await cp(completeConfiguration.customMainCode, destinationFile)
+  // } else {
+  //   await writeFile(destinationFile, 'console.log("No custom main code provided")')
+  // }
 
   const shimsPaths = join(assets, 'shims')
 

diff --git a/src/shared/libs/plugin-tauri/model.ts b/src/shared/libs/plugin-tauri/model.ts
@@ -1,23 +1,3 @@
 export type TauriConfiguration = {
   name: string
-  appBundleId: string
-  appCopyright: string
-  appVersion: string
-  tauriVersion: string
-  customMainCode: string
-  author: string
-  description: string
-  width: number
-  height: number
-  fullscreen: boolean
-  frame: boolean
-  transparent: boolean
-  toolbar: boolean
-  alwaysOnTop: boolean
-  enableInProcessGPU: boolean
-  enableDisableRendererBackgrounding: boolean
-  icon: string
-  appCategoryType: string
-
-  // enableSteamSupport: boolean
 }