mirror of
https://github.com/immich-app/immich
synced 2025-11-14 17:36:12 +00:00
chore: update deps (#14755)
This commit is contained in:
parent
a03f4f5610
commit
6a855f6331
38 changed files with 4610 additions and 14215 deletions
|
|
@ -29,7 +29,7 @@
|
|||
// click runs before bind
|
||||
const previouslyEnabled = config.oauth.mobileOverrideEnabled;
|
||||
if (!previouslyEnabled && !config.oauth.mobileRedirectUri) {
|
||||
config.oauth.mobileRedirectUri = window.location.origin + '/api/oauth/mobile-redirect';
|
||||
config.oauth.mobileRedirectUri = globalThis.location.origin + '/api/oauth/mobile-redirect';
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -57,11 +57,11 @@
|
|||
handleError(error, $t('error_loading_image'));
|
||||
});
|
||||
|
||||
window.addEventListener('mousemove', handleMouseMove);
|
||||
globalThis.addEventListener('mousemove', handleMouseMove);
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
window.removeEventListener('mousemove', handleMouseMove);
|
||||
globalThis.removeEventListener('mousemove', handleMouseMove);
|
||||
resetCropStore();
|
||||
resetGlobalCropStore();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ export function handleMouseDown(e: MouseEvent) {
|
|||
}
|
||||
|
||||
document.body.style.userSelect = 'none';
|
||||
window.addEventListener('mouseup', handleMouseUp);
|
||||
globalThis.addEventListener('mouseup', handleMouseUp);
|
||||
}
|
||||
|
||||
export function handleMouseMove(e: MouseEvent) {
|
||||
|
|
@ -80,7 +80,7 @@ export function handleMouseMove(e: MouseEvent) {
|
|||
}
|
||||
|
||||
export function handleMouseUp() {
|
||||
window.removeEventListener('mouseup', handleMouseUp);
|
||||
globalThis.removeEventListener('mouseup', handleMouseUp);
|
||||
document.body.style.userSelect = '';
|
||||
stopInteraction();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@
|
|||
};
|
||||
|
||||
const onCopyShortcut = (event: KeyboardEvent) => {
|
||||
if (window.getSelection()?.type === 'Range') {
|
||||
if (globalThis.getSelection()?.type === 'Range') {
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
let { onSuccess }: Props = $props();
|
||||
|
||||
let errorMessage: string = $state('');
|
||||
let success: string;
|
||||
|
||||
let password = $state('');
|
||||
let passwordConfirm = $state('');
|
||||
|
|
@ -59,9 +58,6 @@
|
|||
<p class="text-sm text-red-400">{errorMessage}</p>
|
||||
{/if}
|
||||
|
||||
{#if success}
|
||||
<p class="text-sm text-immich-primary">{success}</p>
|
||||
{/if}
|
||||
<div class="my-5 flex w-full">
|
||||
<Button type="submit" size="lg" fullwidth>{$t('to_change_password')}</Button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
onEditSuccess,
|
||||
}: Props = $props();
|
||||
|
||||
let error: string;
|
||||
let success: string;
|
||||
let quotaSize = $state(user.quotaSizeInBytes ? convertFromBytes(user.quotaSizeInBytes, ByteUnit.GiB) : null);
|
||||
|
||||
const previousQutoa = user.quotaSizeInBytes;
|
||||
|
|
@ -149,14 +147,6 @@
|
|||
</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{#if error}
|
||||
<p class="ml-4 text-sm text-red-400">{error}</p>
|
||||
{/if}
|
||||
|
||||
{#if success}
|
||||
<p class="ml-4 text-sm text-immich-primary">{success}</p>
|
||||
{/if}
|
||||
</form>
|
||||
|
||||
{#snippet stickyBottom()}
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
return;
|
||||
}
|
||||
|
||||
if (oauth.isCallback(window.location)) {
|
||||
if (oauth.isCallback(globalThis.location)) {
|
||||
try {
|
||||
await oauth.login(window.location);
|
||||
await oauth.login(globalThis.location);
|
||||
await onSuccess();
|
||||
return;
|
||||
} catch (error) {
|
||||
|
|
@ -46,9 +46,9 @@
|
|||
}
|
||||
|
||||
try {
|
||||
if ($featureFlags.oauthAutoLaunch && !oauth.isAutoLaunchDisabled(window.location)) {
|
||||
if ($featureFlags.oauthAutoLaunch && !oauth.isAutoLaunchDisabled(globalThis.location)) {
|
||||
await goto(`${AppRoute.AUTH_LOGIN}?autoLaunch=0`, { replaceState: true });
|
||||
await oauth.authorize(window.location);
|
||||
await oauth.authorize(globalThis.location);
|
||||
return;
|
||||
}
|
||||
} catch (error) {
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
const handleOAuthLogin = async () => {
|
||||
oauthLoading = true;
|
||||
oauthError = '';
|
||||
const success = await oauth.authorize(window.location);
|
||||
const success = await oauth.authorize(globalThis.location);
|
||||
if (!success) {
|
||||
oauthLoading = false;
|
||||
oauthError = $t('errors.unable_to_login_with_oauth');
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script lang="ts">
|
||||
import type { InterpolationValues } from '$lib/components/i18n/format-message';
|
||||
import FormatMessage from '$lib/components/i18n/format-message.svelte';
|
||||
import type { InterpolationValues } from '$lib/components/i18n/format-message.svelte';
|
||||
import type { Translations } from 'svelte-i18n';
|
||||
|
||||
interface Props {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
<script lang="ts" module>
|
||||
import type { FormatXMLElementFn, PrimitiveType } from 'intl-messageformat';
|
||||
export type InterpolationValues = Record<string, PrimitiveType | FormatXMLElementFn<unknown>>;
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import { IntlMessageFormat } from 'intl-messageformat';
|
||||
import { IntlMessageFormat, type FormatXMLElementFn } from 'intl-messageformat';
|
||||
import {
|
||||
TYPE,
|
||||
type MessageFormatElement,
|
||||
|
|
@ -12,6 +7,7 @@
|
|||
type SelectElement,
|
||||
} from '@formatjs/icu-messageformat-parser';
|
||||
import { locale as i18nLocale, json, type Translations } from 'svelte-i18n';
|
||||
import type { InterpolationValues } from '$lib/components/i18n/format-message';
|
||||
|
||||
type MessagePart = {
|
||||
message: string;
|
||||
|
|
|
|||
2
web/src/lib/components/i18n/format-message.ts
Normal file
2
web/src/lib/components/i18n/format-message.ts
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
import type { FormatXMLElementFn, PrimitiveType } from 'intl-messageformat';
|
||||
export type InterpolationValues = Record<string, PrimitiveType | FormatXMLElementFn<unknown>>;
|
||||
|
|
@ -69,6 +69,7 @@
|
|||
}
|
||||
showLoadingSpinner = true;
|
||||
|
||||
// eslint-disable-next-line unicorn/prefer-global-this
|
||||
const searchTimeout = window.setTimeout(() => {
|
||||
if (searchWord === '') {
|
||||
places = [];
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
const contextMenuEvent = new MouseEvent('contextmenu', {
|
||||
bubbles: true,
|
||||
cancelable: true,
|
||||
// eslint-disable-next-line unicorn/prefer-global-this
|
||||
view: window,
|
||||
clientX: event.x,
|
||||
clientY: event.y,
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ import { NotificationType } from '../notification';
|
|||
import NotificationCard from '../notification-card.svelte';
|
||||
|
||||
describe('NotificationCard component', () => {
|
||||
let sut: RenderResult<NotificationCard>;
|
||||
let sut: RenderResult<typeof NotificationCard>;
|
||||
|
||||
it('disposes timeout if already removed from the DOM', () => {
|
||||
vi.spyOn(window, 'clearTimeout');
|
||||
vi.spyOn(globalThis, 'clearTimeout');
|
||||
|
||||
sut = render(NotificationCard, {
|
||||
notification: {
|
||||
|
|
@ -21,7 +21,7 @@ describe('NotificationCard component', () => {
|
|||
});
|
||||
|
||||
cleanup();
|
||||
expect(window.clearTimeout).toHaveBeenCalledTimes(1);
|
||||
expect(globalThis.clearTimeout).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('shows message and title', () => {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
let loading = $state(true);
|
||||
|
||||
onMount(async () => {
|
||||
if (oauth.isCallback(window.location)) {
|
||||
if (oauth.isCallback(globalThis.location)) {
|
||||
try {
|
||||
loading = true;
|
||||
|
||||
user = await oauth.link(window.location);
|
||||
user = await oauth.link(globalThis.location);
|
||||
|
||||
notificationController.show({
|
||||
message: $t('linked_oauth_account'),
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
{#if user.oauthId}
|
||||
<Button size="sm" onclick={() => handleUnlink()}>{$t('unlink_oauth')}</Button>
|
||||
{:else}
|
||||
<Button size="sm" onclick={() => oauth.authorize(window.location)}>{$t('link_to_oauth')}</Button>
|
||||
<Button size="sm" onclick={() => oauth.authorize(globalThis.location)}>{$t('link_to_oauth')}</Button>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -64,10 +64,7 @@
|
|||
for (const candidate of sharedWith) {
|
||||
const existIndex = partners.findIndex((p) => candidate.id === p.user.id);
|
||||
|
||||
if (existIndex >= 0) {
|
||||
partners[existIndex].sharedWithMe = true;
|
||||
partners[existIndex].inTimeline = candidate.inTimeline ?? false;
|
||||
} else {
|
||||
if (existIndex === -1) {
|
||||
partners = [
|
||||
...partners,
|
||||
{
|
||||
|
|
@ -77,6 +74,9 @@
|
|||
inTimeline: candidate.inTimeline ?? false,
|
||||
},
|
||||
];
|
||||
} else {
|
||||
partners[existIndex].sharedWithMe = true;
|
||||
partners[existIndex].inTimeline = candidate.inTimeline ?? false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
let { keys = $bindable([]), sessions = $bindable([]) }: Props = $props();
|
||||
|
||||
let oauthOpen =
|
||||
oauth.isCallback(window.location) ||
|
||||
oauth.isCallback(globalThis.location) ||
|
||||
$page.url.searchParams.get(QueryParameter.OPEN_SETTING) === OpenSettingQueryParameterValue.OAUTH;
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export const handleToggleTheme = () => {
|
|||
};
|
||||
|
||||
const initTheme = (): ThemeSetting => {
|
||||
if (browser && window.matchMedia && !window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||
if (browser && globalThis.matchMedia && !globalThis.matchMedia('(prefers-color-scheme: dark)').matches) {
|
||||
return { value: Theme.LIGHT, system: false };
|
||||
}
|
||||
return { value: Theme.DARK, system: false };
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ export const copyToClipboard = async (secret: string) => {
|
|||
};
|
||||
|
||||
export const makeSharedLinkUrl = (externalDomain: string, key: string) => {
|
||||
return new URL(`share/${key}`, externalDomain || window.location.origin).href;
|
||||
return new URL(`share/${key}`, externalDomain || globalThis.location.origin).href;
|
||||
};
|
||||
|
||||
export const oauth = {
|
||||
|
|
@ -283,7 +283,7 @@ export const oauth = {
|
|||
try {
|
||||
const redirectUri = location.href.split('?')[0];
|
||||
const { url } = await startOAuth({ oAuthConfigDto: { redirectUri } });
|
||||
window.location.href = url;
|
||||
globalThis.location.href = url;
|
||||
return true;
|
||||
} catch (error) {
|
||||
handleError(error, $t('errors.unable_to_login_with_oauth'));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { goto } from '$app/navigation';
|
||||
import FormatBoldMessage from '$lib/components/i18n/format-bold-message.svelte';
|
||||
import type { InterpolationValues } from '$lib/components/i18n/format-message';
|
||||
import { NotificationType, notificationController } from '$lib/components/shared-components/notification/notification';
|
||||
import { AppRoute } from '$lib/constants';
|
||||
import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||
|
|
@ -33,7 +34,7 @@ import {
|
|||
type UserResponseDto,
|
||||
} from '@immich/sdk';
|
||||
import { DateTime } from 'luxon';
|
||||
import { t } from 'svelte-i18n';
|
||||
import { t, type Translations } from 'svelte-i18n';
|
||||
import { get } from 'svelte/store';
|
||||
import { handleError } from './handle-error';
|
||||
|
||||
|
|
@ -120,7 +121,8 @@ export const addAssetsToNewAlbum = async (albumName: string, assetIds: string[])
|
|||
return;
|
||||
}
|
||||
const $t = get(t);
|
||||
notificationController.show({
|
||||
// for reasons beyond me <ComponentProps<typeof FormatBoldMessage>> doesn't work, even though it's (afaik) exactly this object
|
||||
notificationController.show<{ key: Translations; values: InterpolationValues }>({
|
||||
type: NotificationType.Info,
|
||||
timeout: 5000,
|
||||
component: {
|
||||
|
|
@ -549,7 +551,7 @@ export const delay = async (ms: number) => {
|
|||
};
|
||||
|
||||
export const canCopyImageToClipboard = (): boolean => {
|
||||
return !!(navigator.clipboard && window.ClipboardItem);
|
||||
return !!(navigator.clipboard && globalThis.ClipboardItem);
|
||||
};
|
||||
|
||||
const imgToBlob = async (imageElement: HTMLImageElement) => {
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ export const handleLogout = async (redirectUri: string) => {
|
|||
if (redirectUri.startsWith('/')) {
|
||||
await goto(redirectUri);
|
||||
} else {
|
||||
window.location.href = redirectUri;
|
||||
globalThis.location.href = redirectUri;
|
||||
}
|
||||
} finally {
|
||||
resetSavedUser();
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ function fake_cancelIdleCallback(id: number) {
|
|||
return clearTimeout(id);
|
||||
}
|
||||
|
||||
export const idleCB = window.requestIdleCallback || fake_requestIdleCallback;
|
||||
export const cancelIdleCB = window.cancelIdleCallback || fake_cancelIdleCallback;
|
||||
export const idleCB = globalThis.requestIdleCallback || fake_requestIdleCallback;
|
||||
export const cancelIdleCB = globalThis.cancelIdleCallback || fake_cancelIdleCallback;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ export class KeyedPriorityQueue<K, T> {
|
|||
const removed = this.set.delete(key);
|
||||
if (removed) {
|
||||
const idx = this.items.findIndex((i) => i.key === key);
|
||||
if (idx >= 0) {
|
||||
if (idx !== -1) {
|
||||
this.items.splice(idx, 1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ export const getActivationKey = async (licenseKey: string): Promise<string> => {
|
|||
export const getLicenseLink = (license: ImmichProduct) => {
|
||||
const url = new URL('/', PUBLIC_IMMICH_BUY_HOST);
|
||||
url.searchParams.append('productId', license);
|
||||
url.searchParams.append('instanceUrl', get(serverConfig).externalDomain || window.origin);
|
||||
url.searchParams.append('instanceUrl', get(serverConfig).externalDomain || globalThis.origin);
|
||||
return url.href;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export type AssetGridRouteSearchParams = {
|
|||
at: string | null | undefined;
|
||||
};
|
||||
export const isExternalUrl = (url: string): boolean => {
|
||||
return new URL(url, window.location.href).origin !== window.location.origin;
|
||||
return new URL(url, globalThis.location.href).origin !== globalThis.location.origin;
|
||||
};
|
||||
|
||||
export const isPhotosRoute = (route?: string | null) => !!route?.startsWith('/(user)/photos/[[assetId=id]]');
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
};
|
||||
|
||||
const getLink = (path: string) => {
|
||||
const url = new URL(AppRoute.FOLDERS, window.location.href);
|
||||
const url = new URL(AppRoute.FOLDERS, globalThis.location.href);
|
||||
if (path) {
|
||||
url.searchParams.set(QueryParameter.PATH, path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
};
|
||||
|
||||
const getLink = (path: string) => {
|
||||
const url = new URL(AppRoute.TAGS, window.location.href);
|
||||
const url = new URL(AppRoute.TAGS, globalThis.location.href);
|
||||
if (path) {
|
||||
url.searchParams.set(QueryParameter.PATH, path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
const changeTheme = (theme: ThemeSetting) => {
|
||||
if (theme.system) {
|
||||
theme.value = window.matchMedia('(prefers-color-scheme: dark)').matches ? Theme.DARK : Theme.LIGHT;
|
||||
theme.value = globalThis.matchMedia('(prefers-color-scheme: dark)').matches ? Theme.DARK : Theme.LIGHT;
|
||||
}
|
||||
|
||||
if (theme.value === Theme.LIGHT) {
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
const element = document.querySelector('#stencil');
|
||||
element?.remove();
|
||||
// if the browser theme changes, changes the Immich theme too
|
||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', handleChangeTheme);
|
||||
globalThis.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', handleChangeTheme);
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
{#if $page.data.meta.imageUrl}
|
||||
<meta
|
||||
property="og:image"
|
||||
content={new URL($page.data.meta.imageUrl, $serverConfig.externalDomain || window.location.origin).href}
|
||||
content={new URL($page.data.meta.imageUrl, $serverConfig.externalDomain || globalThis.location.origin).href}
|
||||
/>
|
||||
{/if}
|
||||
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
{#if $page.data.meta.imageUrl}
|
||||
<meta
|
||||
name="twitter:image"
|
||||
content={new URL($page.data.meta.imageUrl, $serverConfig.externalDomain || window.location.origin).href}
|
||||
content={new URL($page.data.meta.imageUrl, $serverConfig.externalDomain || globalThis.location.origin).href}
|
||||
/>
|
||||
{/if}
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
run(() => {
|
||||
const stepState = $page.url.searchParams.get('step');
|
||||
const temporaryIndex = onboardingSteps.findIndex((step) => step.name === stepState);
|
||||
index = temporaryIndex >= 0 ? temporaryIndex : 0;
|
||||
index = temporaryIndex === -1 ? 0 : temporaryIndex;
|
||||
});
|
||||
|
||||
const handleDoneClicked = async () => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue