sparkbun 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sparkbun",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"description": "Build fast, lightweight, cross-platform desktop apps with TypeScript and Bun.",
 	"license": "MIT",
 	"author": "SparkBun Contributors",

package/src/cli/index.ts

@@ -2548,7 +2548,8 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 		// libasar is still loaded by SparkBunCore at runtime — needed until
 		// native wrappers are recompiled without ASAR support
 		const libExt = targetOS === "win" ? ".dll" : targetOS === "macos" ? ".dylib" : ".so";
-		const asarLibSource = join(dirname(targetPaths.BSPATCH), "libasar" + libExt);
+		const platformDistDir = join(SPARKBUN_DEP_PATH, `dist-${targetOS}-${targetARCH}`);
+		const asarLibSource = join(platformDistDir, "libasar" + libExt);
 		if (existsSync(asarLibSource)) {
 			cpSync(asarLibSource, join(appBundleMacOSPath, "libasar" + libExt), {
 				dereference: true,
@@ -2813,9 +2814,12 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 				artifactsToUpload.push(debPath);
 			}
 
-			// This branch only runs for non-dev release packaging, so the temp app bundle
-			// can always be removed after the tarball is produced.
-			rmSync(appBundleFolderPath, { recursive: true });
+			// For Windows/Linux, the app bundle is deleted after tarring since
+			// createCompiledInstaller builds a standalone installer binary.
+			// For macOS, keep the app bundle — it goes directly into the DMG.
+			if (targetOS !== "macos") {
+				rmSync(appBundleFolderPath, { recursive: true });
+			}
 
 			// generate bsdiff
 			// https://storage.googleapis.com/eggbun-static/sparkbun-playground/canary/SparkBunPlayground-canary.app.tar.gz
@@ -2973,84 +2977,52 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 				unlinkSync(tarPath);
 			}
 
-			const selfExtractingBundle = createAppBundle(
-				bundleName,
-				buildFolder,
-				targetOS,
-			);
-			const compressedTarballInExtractingBundlePath = join(
-				selfExtractingBundle.appBundleFolderResourcesPath,
-				`${hash}.tar.gz`,
-			);
-
-			// copy the gzip tarball to the self-extracting app bundle
-			cpSync(compressedTarPath, compressedTarballInExtractingBundlePath, {
-				dereference: true,
-			});
-
-			// macOS uses the Zig extractor in the self-extracting .app bundle.
-			// Windows/Linux use createCompiledInstaller instead.
-			if (targetOS === "macos") {
-				const selfExtractorBinSourcePath = targetPaths.EXTRACTOR;
-				const selfExtractorBinDestinationPath = join(
-					selfExtractingBundle.appBundleMacOSPath,
-					config.app.name.replace(/ /g, ""),
+			// For Windows/Linux, create a self-extracting installer bundle
+			if (targetOS !== "macos") {
+				const selfExtractingBundle = createAppBundle(
+					bundleName,
+					buildFolder,
+					targetOS,
+				);
+				const compressedTarballInExtractingBundlePath = join(
+					selfExtractingBundle.appBundleFolderResourcesPath,
+					`${hash}.tar.gz`,
 				);
 
-				cpSync(selfExtractorBinSourcePath, selfExtractorBinDestinationPath, {
+				cpSync(compressedTarPath, compressedTarballInExtractingBundlePath, {
 					dereference: true,
 				});
-			}
 
-			buildIcons(
-				selfExtractingBundle.appBundleFolderResourcesPath,
-				selfExtractingBundle.appBundleFolderPath,
-			);
-			await Bun.write(
-				join(selfExtractingBundle.appBundleFolderContentsPath, "Info.plist"),
-				InfoPlistContents,
-			);
-
-			// Write metadata.json to outer bundle (consistent with Windows/Linux)
-			const extractorMetadata = {
-				identifier: config.app.identifier,
-				name: config.app.name,
-				channel: buildEnvironment,
-				hash: hash,
-			};
-			await Bun.write(
-				join(
+				buildIcons(
 					selfExtractingBundle.appBundleFolderResourcesPath,
-					"metadata.json",
-				),
-				JSON.stringify(extractorMetadata, null, 2),
-			);
-
-			// Run postWrap hook after self-extracting bundle is created, before code signing
-			// This is where you can add files to the wrapper (e.g., for liquid glass support)
-			runHook("postWrap", {
-				SPARKBUN_WRAPPER_BUNDLE_PATH:
 					selfExtractingBundle.appBundleFolderPath,
-			});
+				);
+				await Bun.write(
+					join(selfExtractingBundle.appBundleFolderContentsPath, "Info.plist"),
+					InfoPlistContents,
+				);
 
-			if (shouldCodesign) {
-				codesignAppBundle(
-					selfExtractingBundle.appBundleFolderPath,
-					join(buildFolder, "entitlements.plist"),
-					config,
+				const extractorMetadata = {
+					identifier: config.app.identifier,
+					name: config.app.name,
+					channel: buildEnvironment,
+					hash: hash,
+				};
+				await Bun.write(
+					join(
+						selfExtractingBundle.appBundleFolderResourcesPath,
+						"metadata.json",
+					),
+					JSON.stringify(extractorMetadata, null, 2),
 				);
-			} else {
-				console.log("skipping codesign");
-			}
 
-			// Note: we need to notarize the original app bundle, the self-extracting app bundle, and the dmg
-			if (shouldNotarize) {
-				notarizeAndStaple(selfExtractingBundle.appBundleFolderPath, config);
-			} else {
-				console.log("skipping notarization");
+				runHook("postWrap", {
+					SPARKBUN_WRAPPER_BUNDLE_PATH:
+						selfExtractingBundle.appBundleFolderPath,
+				});
 			}
 
-			// DMG creation for macOS only
+			// DMG creation for macOS — uses the real app bundle directly
 			if (targetOS === "macos" && config.build.mac?.createDmg !== false) {
 				console.log("creating dmg...");
 				const finalDmgPath = join(buildFolder, `${appFileName}.dmg`);
@@ -3078,10 +3050,10 @@ usageDescriptions : ""}${urlTypes ? "\n" + urlTypes : ""}${documentTypes ?
 					// Copy the app bundle to the staging directory
 					const stagedAppPath = join(
 						dmgStagingDir,
-						basename(selfExtractingBundle.appBundleFolderPath),
+						basename(appBundleFolderPath),
 					);
 					execSync(
-						`cp -R ${escapePathForTerminal(selfExtractingBundle.appBundleFolderPath)} ${escapePathForTerminal(stagedAppPath)}`,
+						`cp -R ${escapePathForTerminal(appBundleFolderPath)} ${escapePathForTerminal(stagedAppPath)}`,
 					);
 
 					// Create a symlink to /Applications for easy drag-and-drop installation