feat: publish intel mac builds

src/utils/releaseDownloadPage.test.ts

@@ -11,7 +11,10 @@ describe('extractStableDownloadTargets', () => {
       extractStableDownloadTargets({
         platforms: {
           'darwin-aarch64': {
-            download_url: 'https://example.com/Tolaria.dmg',
+            download_url: 'https://example.com/Tolaria-aarch64.dmg',
+          },
+          'darwin-x86_64': {
+            download_url: 'https://example.com/Tolaria-x64.dmg',
           },
           'linux-x86_64': {
             download_url: 'https://example.com/Tolaria.AppImage',
@@ -23,8 +26,12 @@ describe('extractStableDownloadTargets', () => {
       }),
     ).toMatchObject({
       'darwin-aarch64': {
-        label: 'macOS',
-        url: 'https://example.com/Tolaria.dmg',
+        label: 'macOS Apple Silicon',
+        url: 'https://example.com/Tolaria-aarch64.dmg',
+      },
+      'darwin-x86_64': {
+        label: 'macOS Intel',
+        url: 'https://example.com/Tolaria-x64.dmg',
       },
       'linux-x86_64': {
         label: 'Linux',
@@ -42,9 +49,14 @@ describe('buildStableDownloadRedirectPage', () => {
   it('builds a redirect page with platform-specific download links', () => {
     const html = buildStableDownloadRedirectPage({
       'darwin-aarch64': {
-        buttonLabel: 'Download Tolaria for macOS',
-        label: 'macOS',
-        url: 'https://example.com/Tolaria.dmg',
+        buttonLabel: 'Download Tolaria for macOS Apple Silicon',
+        label: 'macOS Apple Silicon',
+        url: 'https://example.com/Tolaria-aarch64.dmg',
+      },
+      'darwin-x86_64': {
+        buttonLabel: 'Download Tolaria for Intel Mac',
+        label: 'macOS Intel',
+        url: 'https://example.com/Tolaria-x64.dmg',
       },
       'windows-x86_64': {
         buttonLabel: 'Download Tolaria for Windows',
@@ -56,7 +68,10 @@ describe('buildStableDownloadRedirectPage', () => {
     expect(html).toContain('Tolaria Stable Download')
     expect(html).toContain('DOWNLOAD_TARGETS')
     expect(html).toContain('Download Tolaria for Windows')
-    expect(html).toContain('Download Tolaria for macOS')
+    expect(html).toContain('Download Tolaria for macOS Apple Silicon')
+    expect(html).toContain('Download Tolaria for Intel Mac')
+    expect(html).toContain('hasMultipleMacDownloads')
+    expect(html).toContain('Choose the Apple Silicon or Intel Mac download below.')
     expect(html).toContain('window.location.replace')
     expect(html).toContain('color-scheme: light dark')
     expect(html).toContain('@media (prefers-color-scheme: dark)')
@@ -78,7 +93,7 @@ describe('resolveStableDownloadTargets', () => {
     const latestPayload = {
       platforms: {
         'darwin-aarch64': {
-          download_url: 'https://example.com/Tolaria.dmg',
+          download_url: 'https://example.com/Tolaria-aarch64.dmg',
         },
       },
     }
@@ -86,6 +101,10 @@ describe('resolveStableDownloadTargets', () => {
       {
         prerelease: false,
         assets: [
+          {
+            name: 'Tolaria_x64.dmg',
+            browser_download_url: 'https://example.com/Tolaria-x64.dmg',
+          },
           {
             name: 'Tolaria-setup.exe',
             browser_download_url: 'https://example.com/Tolaria-setup.exe',
@@ -99,6 +118,9 @@ describe('resolveStableDownloadTargets', () => {
     ]
 
     expect(extractStableDownloadTargetsFromReleases(releasesPayload)).toMatchObject({
+      'darwin-x86_64': {
+        url: 'https://example.com/Tolaria-x64.dmg',
+      },
       'linux-x86_64': {
         url: 'https://example.com/Tolaria.AppImage',
       },
@@ -108,7 +130,10 @@ describe('resolveStableDownloadTargets', () => {
     })
     expect(resolveStableDownloadTargets(latestPayload, releasesPayload)).toMatchObject({
       'darwin-aarch64': {
-        url: 'https://example.com/Tolaria.dmg',
+        url: 'https://example.com/Tolaria-aarch64.dmg',
+      },
+      'darwin-x86_64': {
+        url: 'https://example.com/Tolaria-x64.dmg',
       },
       'linux-x86_64': {
         url: 'https://example.com/Tolaria.AppImage',

src/utils/releaseDownloadPage.ts

@@ -1,6 +1,10 @@
 const RELEASE_HISTORY_URL = 'https://refactoringhq.github.io/tolaria/'
 
-type StablePlatformKey = 'darwin-aarch64' | 'linux-x86_64' | 'windows-x86_64'
+type StablePlatformKey =
+  | 'darwin-aarch64'
+  | 'darwin-x86_64'
+  | 'linux-x86_64'
+  | 'windows-x86_64'
 
 type PlatformPayload = {
   dmg_url?: unknown
@@ -41,8 +45,12 @@ type DownloadPageContent = {
 
 const PLATFORM_METADATA: Record<StablePlatformKey, { buttonLabel: string; label: string }> = {
   'darwin-aarch64': {
-    buttonLabel: 'Download Tolaria for macOS',
-    label: 'macOS',
+    buttonLabel: 'Download Tolaria for macOS Apple Silicon',
+    label: 'macOS Apple Silicon',
+  },
+  'darwin-x86_64': {
+    buttonLabel: 'Download Tolaria for Intel Mac',
+    label: 'macOS Intel',
   },
   'linux-x86_64': {
     buttonLabel: 'Download Tolaria for Linux',
@@ -56,6 +64,7 @@ const PLATFORM_METADATA: Record<StablePlatformKey, { buttonLabel: string; label:
 
 const PLATFORM_ORDER: StablePlatformKey[] = [
   'darwin-aarch64',
+  'darwin-x86_64',
   'windows-x86_64',
   'linux-x86_64',
 ]
@@ -196,6 +205,7 @@ function extractPlatformDownloadUrl(
 
   switch (platform) {
     case 'darwin-aarch64':
+    case 'darwin-x86_64':
       return (
         normalizeUrl(payload.download_url)
         ?? normalizeUrl(payload.dmg_url)
@@ -231,16 +241,30 @@ function isPublicStableRelease(release: GitHubReleasePayload): boolean {
   return release.draft !== true && release.prerelease !== true
 }
 
+function classifyMacReleaseAsset(name: string): {
+  platform: StablePlatformKey
+  preference: number
+} | null {
+  const normalized = name.toLowerCase()
+  const isDmg = normalized.endsWith('.dmg')
+  const isUpdaterTarball = normalized.endsWith('.app.tar.gz')
+  if (!isDmg && !isUpdaterTarball) return null
+
+  const preference = isDmg ? 2 : 1
+  if (/(?:^|[-_.])(x64|x86_64|intel)(?:[-_.]|$)/.test(normalized)) {
+    return { platform: 'darwin-x86_64', preference }
+  }
+
+  return { platform: 'darwin-aarch64', preference }
+}
+
 function classifyReleaseAsset(name: string): {
   platform: StablePlatformKey
   preference: number
 } | null {
-  if (name.endsWith('.dmg')) {
-    return { platform: 'darwin-aarch64', preference: 2 }
-  }
-  if (name.endsWith('.app.tar.gz')) {
-    return { platform: 'darwin-aarch64', preference: 1 }
-  }
+  const macAsset = classifyMacReleaseAsset(name)
+  if (macAsset) return macAsset
+
   if (name.endsWith('-setup.exe')) {
     return { platform: 'windows-x86_64', preference: 2 }
   }
@@ -398,6 +422,9 @@ function buildRedirectMarkup(downloads: StableDownloadTargets): string {
     <script>
       const DOWNLOAD_TARGETS = ${serializedTargets};
       const PLATFORM_ORDER = ${JSON.stringify(PLATFORM_ORDER)};
+      const hasMultipleMacDownloads = Boolean(
+        DOWNLOAD_TARGETS['darwin-aarch64'] && DOWNLOAD_TARGETS['darwin-x86_64']
+      );
 
       function detectPlatform(userAgent) {
         if (/Windows/i.test(userAgent)) return 'windows-x86_64';
@@ -410,6 +437,7 @@ function buildRedirectMarkup(downloads: StableDownloadTargets): string {
       const resolvedTarget = (
         detectedPlatform && DOWNLOAD_TARGETS[detectedPlatform]
       ) || DOWNLOAD_TARGETS[PLATFORM_ORDER.find((platform) => DOWNLOAD_TARGETS[platform])] || null;
+      const requiresMacChoice = hasMultipleMacDownloads && /Mac OS X|Macintosh/i.test(navigator.userAgent);
 
       if (resolvedTarget) {
         const link = document.getElementById('download-link');
@@ -419,9 +447,13 @@ function buildRedirectMarkup(downloads: StableDownloadTargets): string {
           link.textContent = resolvedTarget.buttonLabel;
         }
         if (message) {
-          message.textContent = 'Redirecting to the latest stable Tolaria download for ' + resolvedTarget.label + '.';
+          message.textContent = requiresMacChoice
+            ? 'Choose the Apple Silicon or Intel Mac download below.'
+            : 'Redirecting to the latest stable Tolaria download for ' + resolvedTarget.label + '.';
+        }
+        if (!requiresMacChoice) {
+          window.location.replace(resolvedTarget.url);
         }
-        window.location.replace(resolvedTarget.url);
       }
     </script>`
 }