Merge branch 'feat/standalone-runtime-foundation' into feat/standalone-preload

Author: PerishCode

apps/desktop/src/main/updater/config.ts

@@ -8,7 +8,7 @@ import {
   type DesktopUpdateMode,
   type SidecarSource,
 } from "@open-design/sidecar-proto";
-import { releaseChannelFromVersion } from "@open-design/release";
+import { isReleaseChannel, releaseChannelFromVersion } from "@open-design/release";
 
 /**
  * @module updater-config
@@ -44,7 +44,6 @@ const STABLE_POLL_INTERVAL_MS = 6 * 60 * 60 * 1000;
 const DEFAULT_POLL_INITIAL_DELAY_MS = 5000;
 const DEFAULT_POLL_BACKOFF_INITIAL_MS = 60 * 1000;
 const DEFAULT_POLL_BACKOFF_MAX_MS = 30 * 60 * 1000;
-const DESKTOP_UPDATE_CHANNEL_VALUES = new Set<string>(Object.values(DESKTOP_UPDATE_CHANNELS));
 
 export type DesktopUpdaterConfigInput = {
   appVersion?: string | null;
@@ -112,7 +111,7 @@ function normalizeChannel(value: string | undefined, fallback: DesktopUpdateChan
 }
 
 export function isDesktopUpdateChannel(value: unknown): value is DesktopUpdateChannel {
-  return typeof value === "string" && DESKTOP_UPDATE_CHANNEL_VALUES.has(value);
+  return isReleaseChannel(value);
 }
 
 function defaultMetadataUrl(channel: DesktopUpdateChannel): string {

apps/desktop/src/main/updater/feed.ts

@@ -111,10 +111,9 @@ export function metadataChannel(metadata: Record<string, unknown>): DesktopUpdat
 
 export function releaseVersionForChannel(metadata: Record<string, unknown>, channel: DesktopUpdateChannel): string | null {
   if (channel === DESKTOP_UPDATE_CHANNELS.BETA) return stringField(metadata, "releaseVersion") ?? stringField(metadata, "betaVersion");
-  if (channel === DESKTOP_UPDATE_CHANNELS.BETAS) return stringField(metadata, "releaseVersion");
   if (channel === DESKTOP_UPDATE_CHANNELS.PRERELEASE) return stringField(metadata, "releaseVersion") ?? stringField(metadata, "prereleaseVersion");
-  if (channel === DESKTOP_UPDATE_CHANNELS.PREVIEW) return stringField(metadata, "releaseVersion") ?? stringField(metadata, "previewVersion");
-  return stringField(metadata, "releaseVersion") ?? stringField(metadata, "stableVersion");
+  if (channel === DESKTOP_UPDATE_CHANNELS.STABLE) return stringField(metadata, "releaseVersion") ?? stringField(metadata, "stableVersion");
+  return stringField(metadata, "releaseVersion");
 }
 
 export function selectedMacPlatformKey(arch: string): string {
@@ -443,4 +442,3 @@ export function checksumMatchesCandidate(checksum: ResolvedChecksumSnapshot, can
   if (candidate.checksum.value != null && checksum.value.toLowerCase() !== candidate.checksum.value.toLowerCase()) return false;
   return true;
 }
-

apps/desktop/tests/main/updater.test.ts

@@ -3106,7 +3106,7 @@ describe("desktop updater", () => {
 
       const checked = await updater.checkForUpdates();
       expect(checked.state).toBe(DESKTOP_UPDATE_STATES.DOWNLOADED);
-      expect(checked.channel).toBe(DESKTOP_UPDATE_CHANNELS.PREVIEW);
+      expect(checked.channel).toBe("preview");
       expect(checked.availableVersion).toBe("1.0.1-preview.2");
     } finally {
       await fixture.close();

apps/desktop/tests/main/updater/config.test.ts

@@ -81,7 +81,7 @@ describe("desktop updater config", () => {
         source: SIDECAR_SOURCES.PACKAGED,
       });
 
-      expect(config.channel).toBe(DESKTOP_UPDATE_CHANNELS.PREVIEW);
+      expect(config.channel).toBe("preview");
       expect(config.metadataUrl).toContain("/preview/latest/metadata.json");
     } finally {
       rmSync(root, { force: true, recursive: true });