apple silicon as primary download

Author: Stefterv

i18n/react-intl/en.json

@@ -83,7 +83,7 @@
   "raspberryPi32AssetTooltip": "Latest version of Raspberry Pi OS is recommended.",
   "raspberryPi64AssetTooltip": "Latest version of Raspberry Pi OS is recommended. The 64-bit release Raspberry Pi OS is newer, so if you have issues, try the 32-bit version.",
   "publishedOn": "Published on",
-  "macOsIntelWarning": "Got an M1 or above? Download the <a href='{0}'>Apple Silicon</a> version instead.",
+  "macOsIntelWarning": "Got a mac with an Intel Processor? Download the <a href='{0}'>Intel version</a> instead.",
   "otherVersions": "Need another version?",
   "olderVersions": "Looking for older versions?",
   "githubEarlierReleases": "Head over to GitHub for <a href='https://github.com/processing/processing4/releases'>earlier releases of Processing 4</a>.",

src/hooks/download.js

@@ -95,8 +95,8 @@ export const usePreparedReleases = (releases) => {
       for (let os in item.assetsByOs) {
         item.assetsByOs[os].sort((a, b) => {
           if (a.bit === b.bit) return 0;
-          if (a.bit != null && a.bit.includes('Intel')) return -1;
-          if (b.bit != null && b.bit.includes('Intel')) return 1;
+          if (a.bit != null && a.bit.includes('Intel')) return 1;
+          if (b.bit != null && b.bit.includes('Intel')) return -1;
           return 0;
         });
       }

src/templates/download.js

@@ -190,12 +190,7 @@ const MainDownloadSection = memo(({ release, onAfterDownload }) => {
   const intl = useIntl();
   const detectedAsset = useMachineOS(release.assetsByOs, release.publishedAt);
 
-  const appleSiliconAsset = useMemo(() => {
-    for (let asset of release.assets) {
-      if (asset.bit === 'Apple Silicon') return asset;
-    }
-    return null;
-  }, [release]);
+  const appleSiliconAsset = useMemo(() => release.assets.find(asset => asset.os === "macOS" && asset.bit === "Intel 64-bit"), [release]);
 
   return (
     <div className={classnames(grid.container, grid.grid)}>
@@ -234,20 +229,18 @@ const MainDownloadSection = memo(({ release, onAfterDownload }) => {
             />
           </div>
         )}
-        {detectedAsset.asset &&
-          detectedAsset.asset.name.includes('macos-x64') &&
-          appleSiliconAsset && (
-            <div>
-              <p
-                className={css.appleSiliconWarning}
-                dangerouslySetInnerHTML={{
-                  __html: intl
-                    .formatMessage({ id: 'macOsIntelWarning' })
-                    .replace('{0}', appleSiliconAsset.url)
-                }}
-              />
-            </div>
-          )}
+        {appleSiliconAsset && (
+          <div>
+            <p
+              className={css.appleSiliconWarning}
+              dangerouslySetInnerHTML={{
+                __html: intl
+                  .formatMessage({ id: 'macOsIntelWarning' })
+                  .replace('{0}', appleSiliconAsset.url)
+              }}
+            />
+          </div>
+        )}
       </div>
     </div>
   );