Skip to content
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.

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

fix(deps): update dependency ua-parser-js to v2 #14301

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
109 changes: 89 additions & 20 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"tailwindcss-preset-email": "^1.3.2",
"thumbhash": "^0.1.1",
"typeorm": "^0.3.17",
"ua-parser-js": "^1.0.35",
"ua-parser-js": "^2.0.0",
"validator": "^13.12.0"
},
"devDependencies": {
Expand Down Expand Up @@ -115,7 +115,6 @@
"@types/react": "^18.3.4",
"@types/semver": "^7.5.8",
"@types/supertest": "^6.0.0",
"@types/ua-parser-js": "^0.7.36",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@vitest/coverage-v8": "^2.0.5",
Expand Down
4 changes: 2 additions & 2 deletions web/src/lib/components/user-settings-page/device-card.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="hidden items-center justify-center pr-2 text-immich-primary dark:text-immich-dark-primary sm:flex">
{#if device.deviceOS === 'Android'}
<Icon path={mdiAndroid} size="40" />
{:else if device.deviceOS === 'iOS' || device.deviceOS === 'Mac OS'}
{:else if ['iOS', 'Mac OS', 'macOS'].includes(device.deviceOS)}
<Icon path={mdiApple} size="40" />
{:else if device.deviceOS.includes('Safari')}
<Icon path={mdiAppleSafari} size="40" />
Expand All @@ -44,7 +44,7 @@
<Icon path={mdiLinux} size="40" />
{:else if device.deviceOS === 'Ubuntu'}
<Icon path={mdiUbuntu} size="40" />
{:else if device.deviceOS === 'Chromium OS' || device.deviceType === 'Chrome' || device.deviceType === 'Chromium'}
{:else if ['Chromium OS', 'Chrome OS'].includes(device.deviceOS) || ['Chrome', 'Chromium'].includes(device.deviceType)}
<Icon path={mdiGoogleChrome} size="40" />
{:else}
<Icon path={mdiHelp} size="40" />
Expand Down
Loading