electrobun 0.0.19-beta.20 → 0.0.19-beta.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.0.19-beta.20",
+  "version": "0.0.19-beta.29",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",
@@ -44,12 +44,14 @@
     "push:beta": "bun npm:version:beta && git push origin main --tags",
     "push:patch": "npm version patch && git push origin main --tags",
     "push:minor": "npm version minor && git push origin main --tags",
-    "push:major": "npm version major && git push origin main --tags"
+    "push:major": "npm version major && git push origin main --tags",
+    "build:push:artifacts": "bun scripts/build-and-upload-artifacts.js"
+  },
+  "devDependencies": {
+    "@types/bun": "1.1.9"
   },
   "dependencies": {
     "@oneidentity/zstd-js": "^1.0.3",
-    "@types/bun": "1.1.9",
-    "bun": "1.1.9",
     "rpc-anywhere": "1.5.0",
     "tar": "^6.2.1"
   }

package/src/cli/index.ts

@@ -75,6 +75,7 @@ const PATHS = {
   ),
   NATIVE_WRAPPER_WIN: join(ELECTROBUN_DEP_PATH, "dist", "libNativeWrapper.dll"),
   NATIVE_WRAPPER_LINUX: join(ELECTROBUN_DEP_PATH, "dist", "libNativeWrapper.so"),
+  NATIVE_WRAPPER_LINUX_CEF: join(ELECTROBUN_DEP_PATH, "dist", "libNativeWrapper_cef.so"),
   WEBVIEW2LOADER_WIN: join(ELECTROBUN_DEP_PATH, "dist", "WebView2Loader.dll"),
   BSPATCH: join(ELECTROBUN_DEP_PATH, "dist", "bspatch") + binExt,
   EXTRACTOR: join(ELECTROBUN_DEP_PATH, "dist", "extractor") + binExt,
@@ -575,15 +576,21 @@ if (commandArg === "init") {
   cpSync(webview2LibSource, webview2LibDestination);
   
 } else if (OS === 'linux') {
-  const nativeWrapperLinuxSource = PATHS.NATIVE_WRAPPER_LINUX;
+  // Choose the appropriate native wrapper based on bundleCEF setting
+  const useCEF = config.build.linux?.bundleCEF;
+  const nativeWrapperLinuxSource = useCEF ? PATHS.NATIVE_WRAPPER_LINUX_CEF : PATHS.NATIVE_WRAPPER_LINUX;
   const nativeWrapperLinuxDestination = join(
     appBundleMacOSPath,
     "libNativeWrapper.so"
   );
+  
   if (existsSync(nativeWrapperLinuxSource)) {
     cpSync(nativeWrapperLinuxSource, nativeWrapperLinuxDestination, {
       dereference: true,
     });
+    console.log(`Using ${useCEF ? 'CEF' : 'GTK'} native wrapper for Linux`);
+  } else {
+    throw new Error(`Native wrapper not found: ${nativeWrapperLinuxSource}`);
   }
 }
   
@@ -1355,6 +1362,14 @@ function getConfig() {
           ...(loadedConfig?.build?.mac?.entitlements || {}),
         },
       },
+      win: {
+        ...defaultConfig.build.win,
+        ...(loadedConfig?.build?.win || {}),
+      },
+      linux: {
+        ...defaultConfig.build.linux,
+        ...(loadedConfig?.build?.linux || {}),
+      },
       bun: {
         ...defaultConfig.build.bun,
         ...(loadedConfig?.build?.bun || {}),