Skip to content

attempt to use arm as default for mac #8328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 11, 2025
+9 −6
Merged

attempt to use arm as default for mac #8328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c372032
attempt to use arm as default for mac
bmuenzenmeyer Nov 4, 2025
1feba0b
fix: there's no such architecture arm64
ovflowd Nov 5, 2025
d5e7c8f
chore: removed console.log
ovflowd Nov 5, 2025
5147f1a
fix: test
ovflowd Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/site/hooks/react-client/__tests__/useDetectOS.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ describe('useDetectOS', () => {
await waitFor(() => {
assert.deepEqual(result.current, {
os: 'MAC',
bitness: '32',
architecture: 'x86',
bitness: '64',
architecture: 'arm',
});
});
});
Expand Down
11 changes: 7 additions & 4 deletions apps/site/hooks/react-client/useDetectOS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
Bitness,
OperatingSystem,
} from '#site/types/userAgent';
import { getHighEntropyValues, detectOS } from '#site/util/userAgent';
import { detectOS, getHighEntropyValues } from '#site/util/userAgent';

type UserOSState = {
os: OperatingSystem | 'LOADING';
Expand All @@ -28,10 +28,12 @@ const useDetectOS = () => {
navigator.userAgent
);

const os = detectOS();

// We immediately set the OS to LOADING, and then we update it with the detected OS.
// This is due to that initial render set within the state will indicate a mismatch from
// the server-side rendering versus what the initial state is from the client-side
setUserOSState(current => ({ ...current, os: detectOS() }));
setUserOSState(current => ({ ...current, os }));

// We attempt to get the high entropy values from the Browser and set the User OS State
// based from the values we get from the Browser, if it fails we fallback to the User Agent
Expand All @@ -40,8 +42,9 @@ const useDetectOS = () => {
({
// If there is no getHighEntropyValues API on the Browser or it failed to resolve
// we attempt to fallback to what the User Agent indicates
bitness = uaIndicates64 ? '64' : '32',
architecture = 'x86',
bitness = os === 'MAC' || uaIndicates64 ? '64' : '32',
// we assume that MacOS has moved to arm64 by default now
architecture = os === 'MAC' ? 'arm' : 'x86',
}) => {
setUserOSState(current => ({
...current,
Expand Down
Loading