electrobun 1.18.4-beta.3 → 1.18.4-beta.6

package/dist/zig-sdk/electrobun.zig

@@ -9,7 +9,7 @@ pub const WindowBlurHandler = *const fn (u32) callconv(.C) void;
 pub const WindowKeyHandler = *const fn (u32, u32, u32, u32, u32) callconv(.C) void;
 pub const DecideNavigationHandler = *const fn (u32, [*:0]const u8) callconv(.C) u32;
 pub const WebviewEventHandler = *const fn (u32, [*:0]const u8, [*:0]const u8) callconv(.C) void;
-pub const WebviewPostMessageHandler = *const fn (u32, [*:0]const u8) callconv(.C) u32;
+pub const WebviewPostMessageHandler = *const fn (u32, [*:0]const u8) callconv(.C) void;
 pub const StatusItemHandler = *const fn (u32, [*:0]const u8) callconv(.C) void;
 pub const GlobalShortcutHandler = *const fn ([*:0]const u8) callconv(.C) void;
 pub const QuitRequestedHandler = *const fn () callconv(.C) void;
@@ -99,6 +99,7 @@ pub const WebviewCallbacks = struct {
     decide_navigation: ?DecideNavigationHandler = null,
     event: ?WebviewEventHandler = null,
     event_bridge: ?WebviewPostMessageHandler = null,
+    host_bridge: ?WebviewPostMessageHandler = null,
     bun_bridge: ?WebviewPostMessageHandler = null,
     internal_bridge: ?WebviewPostMessageHandler = null,
 };
@@ -600,6 +601,7 @@ pub const Core = struct {
     const WebviewFindInPageFn = *const fn (u32, [*:0]const u8, bool, bool) callconv(.C) void;
     const WebviewStopFindFn = *const fn (u32) callconv(.C) void;
     const SendInternalMessageToWebviewFn = *const fn (u32, [*:0]const u8) callconv(.C) bool;
+    const SendHostMessageToWebviewViaTransportFn = *const fn (u32, [*:0]const u8) callconv(.C) bool;
     const WebviewOpenDevToolsFn = *const fn (u32) callconv(.C) void;
     const WebviewCloseDevToolsFn = *const fn (u32) callconv(.C) void;
     const WebviewToggleDevToolsFn = *const fn (u32) callconv(.C) void;
@@ -710,6 +712,7 @@ pub const Core = struct {
         webview_find_in_page: WebviewFindInPageFn,
         webview_stop_find: WebviewStopFindFn,
         send_internal_message_to_webview: SendInternalMessageToWebviewFn,
+        send_host_message_to_webview_via_transport: SendHostMessageToWebviewViaTransportFn,
         webview_open_devtools: WebviewOpenDevToolsFn,
         webview_close_devtools: WebviewCloseDevToolsFn,
         webview_toggle_devtools: WebviewToggleDevToolsFn,
@@ -838,6 +841,7 @@ pub const Core = struct {
                 .webview_find_in_page = lib.lookup(WebviewFindInPageFn, "webviewFindInPage") orelse return error.MissingCoreSymbol,
                 .webview_stop_find = lib.lookup(WebviewStopFindFn, "webviewStopFind") orelse return error.MissingCoreSymbol,
                 .send_internal_message_to_webview = lib.lookup(SendInternalMessageToWebviewFn, "sendInternalMessageToWebview") orelse return error.MissingCoreSymbol,
+                .send_host_message_to_webview_via_transport = lib.lookup(SendHostMessageToWebviewViaTransportFn, "sendHostMessageToWebviewViaTransport") orelse return error.MissingCoreSymbol,
                 .webview_open_devtools = lib.lookup(WebviewOpenDevToolsFn, "webviewOpenDevTools") orelse return error.MissingCoreSymbol,
                 .webview_close_devtools = lib.lookup(WebviewCloseDevToolsFn, "webviewCloseDevTools") orelse return error.MissingCoreSymbol,
                 .webview_toggle_devtools = lib.lookup(WebviewToggleDevToolsFn, "webviewToggleDevTools") orelse return error.MissingCoreSymbol,
@@ -1150,7 +1154,7 @@ pub const Core = struct {
             options.callbacks.decide_navigation,
             options.callbacks.event,
             options.callbacks.event_bridge,
-            options.callbacks.bun_bridge,
+            options.callbacks.host_bridge orelse options.callbacks.bun_bridge,
             options.callbacks.internal_bridge,
             secret_key_z.ptr,
             preload_z.ptr,
@@ -1399,13 +1403,19 @@ pub const Core = struct {
         try self.ensureLastCallSucceeded();
     }
 
-    pub fn sendMessageToWebview(self: *Core, webview_id: u32, message: anytype) !void {
+    pub fn sendHostMessageToWebview(self: *Core, webview_id: u32, message: anytype) !void {
         const message_json = try std.json.stringifyAlloc(self.allocator, message, .{});
         defer self.allocator.free(message_json);
+        const message_json_z = try self.dupeZ(message_json);
+        defer self.allocator.free(message_json_z);
+
+        if (self.symbols.send_host_message_to_webview_via_transport(webview_id, message_json_z.ptr)) {
+            return;
+        }
 
         const js = try std.fmt.allocPrint(
             self.allocator,
-            "window.__electrobun.receiveMessageFromBun({s});",
+            "window.__electrobun.receiveMessageFromHost({s});",
             .{message_json},
         );
         defer self.allocator.free(js);
@@ -1413,6 +1423,10 @@ pub const Core = struct {
         try self.evaluateJavaScriptWithNoCompletion(webview_id, js);
     }
 
+    pub fn sendMessageToWebview(self: *Core, webview_id: u32, message: anytype) !void {
+        try self.sendHostMessageToWebview(webview_id, message);
+    }
+
     pub fn sendInternalMessageToWebview(self: *Core, webview_id: u32, message: anytype) !void {
         const message_json = try std.json.stringifyAlloc(self.allocator, message, .{});
         defer self.allocator.free(message_json);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "electrobun",
-	"version": "1.18.4-beta.3",
+	"version": "1.18.4-beta.6",
 	"description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
 	"license": "MIT",
 	"author": "Blackboard Technologies Inc.",

package/src/cli/index.ts

@@ -1686,6 +1686,24 @@ const defaultConfig = {
 				path?: string;
 				[key: string]: unknown;
 			}>;
+			slateUIs?: Record<string, {
+				name?: string;
+				entrypoint?: string;
+				path?: string;
+				[key: string]: unknown;
+			}>;
+			contributions?: {
+				fileActivators?: Array<{
+					baseName?: string;
+					nodeType?: "file" | "dir" | "any";
+					slate: {
+						type: string;
+						name?: string;
+						icon?: string;
+						config?: Record<string, unknown>;
+					};
+				}>;
+			};
 			carrotOnly?: boolean;
 		} | undefined,
 	},
@@ -2532,7 +2550,7 @@ Categories=Utility;Application;
 
 		// refresh build folder
 		if (existsSync(buildFolder)) {
-			rmSync(buildFolder, { recursive: true });
+			rmSync(buildFolder, { recursive: true, force: true });
 		}
 		mkdirSync(buildFolder, { recursive: true });
 
@@ -3572,6 +3590,55 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 				}
 			}
 
+			// Build slate UIs if configured.
+			// slateUIs mirrors remoteUIs, but points at an ESM module entry file instead of an HTML page.
+			const resolvedSlateUIs: Record<string, { name: string; path: string }> = {};
+			if (carrotConfig.slateUIs) {
+				for (const slateUIName in carrotConfig.slateUIs) {
+					const slateUIConfig = carrotConfig.slateUIs[slateUIName]!;
+					const label = slateUIConfig.name || slateUIName;
+
+					if (slateUIConfig.entrypoint) {
+						const slateUISource = join(projectRoot, slateUIConfig.entrypoint);
+						if (!existsSync(slateUISource)) {
+							console.error(`Slate UI entrypoint not found: ${slateUISource}`);
+							continue;
+						}
+						const slateUIDestFolder = join(carrotBuildDir, "slate-ui", slateUIName);
+						mkdirSync(slateUIDestFolder, { recursive: true });
+
+						const { entrypoint: _entrypoint, name: _name, path: _path, ...slateUIBuildOptions } = slateUIConfig;
+						const slateUIBuildResult = await Bun.build({
+							...slateUIBuildOptions,
+							entrypoints: [slateUISource],
+							outdir: slateUIDestFolder,
+							target: "browser",
+							format: "esm",
+						});
+
+						if (!slateUIBuildResult.success) {
+							console.error(`Failed to build slate UI: ${slateUIName}`);
+							printBuildLogs(slateUIBuildResult.logs);
+							continue;
+						}
+
+						resolvedSlateUIs[slateUIName] = {
+							name: label,
+							path: `slate-ui/${slateUIName}/index.js`,
+						};
+					} else if (slateUIConfig.path) {
+						resolvedSlateUIs[slateUIName] = {
+							name: label,
+							path: slateUIConfig.path,
+						};
+					} else {
+						console.warn(
+							`Slate UI "${slateUIName}" has neither entrypoint nor path; skipping.`,
+						);
+					}
+				}
+			}
+
 			// Write carrot.json manifest
 			const carrotManifest = {
 				id: carrotConfig.id,
@@ -3589,9 +3656,15 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 							: spec,
 					]),
 				),
+				contributions:
+					carrotConfig.contributions &&
+					Object.keys(carrotConfig.contributions).length > 0
+						? carrotConfig.contributions
+						: undefined,
 				worker: { relativePath: "worker.js" },
 				view: existsSync(viewsSrc) ? { relativePath: "views/index.html" } : undefined,
 				remoteUIs: Object.keys(resolvedRemoteUIs).length > 0 ? resolvedRemoteUIs : undefined,
+				slateUIs: Object.keys(resolvedSlateUIs).length > 0 ? resolvedSlateUIs : undefined,
 			};
 			writeFileSync(
 				join(carrotBuildDir, "carrot.json"),
@@ -4703,17 +4776,37 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 		);
 
 		function shouldIgnore(fullPath: string): boolean {
+			const resolvedFullPath = path.resolve(fullPath);
+			const pathSegments = resolvedFullPath.split(path.sep).filter(Boolean);
+			const genericIgnoredSegments = new Set([
+				"node_modules",
+				path.basename(buildDir),
+				path.basename(artifactDir),
+				".electrobun-cache",
+			]);
+			if (pathSegments.some((segment) => genericIgnoredSegments.has(segment))) {
+				return true;
+			}
 			// Check built-in ignore dirs
 			if (
 				ignoreDirs.some(
-					(ignored) =>
-						fullPath.startsWith(ignored + "/") || fullPath === ignored,
+					(ignored) => {
+						const relativeToIgnored = path.relative(ignored, resolvedFullPath);
+						return (
+							relativeToIgnored === "" ||
+							(!relativeToIgnored.startsWith("..") &&
+								!path.isAbsolute(relativeToIgnored))
+						);
+					},
 				)
 			) {
 				return true;
 			}
 			// Check user-configured watchIgnore globs (match against project-relative path)
-			const relativePath = fullPath.replace(projectRoot + "/", "");
+			const relativePath = path
+				.relative(projectRoot, resolvedFullPath)
+				.split(path.sep)
+				.join("/");
 			if (ignoreGlobs.some((glob) => glob.match(relativePath))) {
 				return true;
 			}