diff --git a/package.json b/package.json index 660861a93..e98e55a72 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "@atlaskit/pragmatic-drag-and-drop": "^2.0.2", "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.0.0", "@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.0.0", - "@choochmeque/tauri-plugin-notifications-api": "0.5.0-rc.11", "@choochmeque/tauri-plugin-sharekit-api": "0.4.0-rc.5", "@fontsource-variable/nunito": "5.3.0", "@fontsource/space-mono": "5.3.0", @@ -56,6 +55,7 @@ "@phosphor-icons/react": "^2.1.10", "@sableclient/matrixrtc": "^0.1.0", "@sableclient/tauri-plugin-livekit-mobile": "^0.2.0", + "@sableclient/tauri-plugin-notifications-api": "^0.5.0", "@sableclient/twemoji-font": "^1.0.4", "@sentry/react": "^10.70.0", "@tanstack/react-query": "^5.101.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2962d11a5..640198c3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,9 +34,6 @@ importers: '@atlaskit/pragmatic-drag-and-drop-hitbox': specifier: ^2.0.0 version: 2.0.0 - '@choochmeque/tauri-plugin-notifications-api': - specifier: 0.5.0-rc.11 - version: 0.5.0-rc.11 '@choochmeque/tauri-plugin-sharekit-api': specifier: 0.4.0-rc.5 version: 0.4.0-rc.5 @@ -67,6 +64,9 @@ importers: '@sableclient/tauri-plugin-livekit-mobile': specifier: ^0.2.0 version: 0.2.0 + '@sableclient/tauri-plugin-notifications-api': + specifier: ^0.5.0 + version: 0.5.0 '@sableclient/twemoji-font': specifier: ^1.0.4 version: 1.0.4 @@ -1005,9 +1005,6 @@ packages: '@bufbuild/protobuf@1.10.1': resolution: {integrity: sha512-wJ8ReQbHxsAfXhrf9ixl0aYbZorRuOWpBNzm8pL8ftmSxQx/wnJD5Eg861NwJU/czy2VXFIebCeZnZrI9rktIQ==} - '@choochmeque/tauri-plugin-notifications-api@0.5.0-rc.11': - resolution: {integrity: sha512-TSuf8HQ4Ayp9IKKB5v2yTdgKMa/I0bqbcACj0IZ46CSpzn/HKner/BKG7rM8tGOarEcyBd/VXnDhK5cJA/YMtw==} - '@choochmeque/tauri-plugin-sharekit-api@0.4.0-rc.5': resolution: {integrity: sha512-VpO3Uw5ZmPa0M0ta/oS5WyiW/jdNAPFh1zXbHA5dJtLMeA4RJqqj4vAlVMYoYRqtrE/1Op/GQ3jXvxgU4WgSVA==} @@ -2697,6 +2694,9 @@ packages: '@sableclient/tauri-plugin-livekit-mobile@0.2.0': resolution: {integrity: sha512-xpv+9qDEIYM1lmbdLpLgD8fwctyT7QNq8R7uwhm7T1Wt95MF7TqgtGUo8kHAUZq4v4ung0jxacbvkp9POMVutw==} + '@sableclient/tauri-plugin-notifications-api@0.5.0': + resolution: {integrity: sha512-Rr8knIgjx2onjAdTS+K17Ex4aDk/Wpj7lqJEHnayimtU8Rt6L1ScvpTMLbJkjheDuLQ0pLAsoV5I7v3SekRJLA==} + '@sableclient/twemoji-font@1.0.4': resolution: {integrity: sha512-LzvQB/VZtv5KEq1VYq2azr7v7cYT8oklOVRGkAN2RNwa3sF0XcnqM3lBHSYRFXQleGLSUgs3gA0slbwkD2+sJw==} @@ -6824,10 +6824,6 @@ snapshots: '@bufbuild/protobuf@1.10.1': {} - '@choochmeque/tauri-plugin-notifications-api@0.5.0-rc.11': - dependencies: - '@tauri-apps/api': 2.11.1 - '@choochmeque/tauri-plugin-sharekit-api@0.4.0-rc.5': dependencies: '@tauri-apps/api': 2.11.1 @@ -7894,6 +7890,10 @@ snapshots: dependencies: '@tauri-apps/api': 2.11.1 + '@sableclient/tauri-plugin-notifications-api@0.5.0': + dependencies: + '@tauri-apps/api': 2.11.1 + '@sableclient/twemoji-font@1.0.4': {} '@sentry/browser-utils@10.70.0': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 01cd10f3b..efe22e106 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -17,6 +17,7 @@ minimumReleaseAgeExclude: - '@sableclient/matrixrtc' - '@sableclient/sable-call-embedded' - '@sableclient/tauri-plugin-livekit-mobile' + - '@sableclient/tauri-plugin-notifications-api' - '@sableclient/twemoji-font' overrides: diff --git a/src/app/features/settings/notifications/NativePushNotificationsApiClient.ts b/src/app/features/settings/notifications/NativePushNotificationsApiClient.ts index 269f72799..c5e2ad38a 100644 --- a/src/app/features/settings/notifications/NativePushNotificationsApiClient.ts +++ b/src/app/features/settings/notifications/NativePushNotificationsApiClient.ts @@ -18,7 +18,7 @@ let nativePushNotificationsApiPromise: Promise | nul export async function getNativePushNotificationsApi(): Promise { if (!nativePushNotificationsApiPromise) { - nativePushNotificationsApiPromise = import('@choochmeque/tauri-plugin-notifications-api').then( + nativePushNotificationsApiPromise = import('@sableclient/tauri-plugin-notifications-api').then( (notificationsApi) => ({ isPermissionGranted: notificationsApi.isPermissionGranted, requestPermission: notificationsApi.requestPermission, diff --git a/src/app/features/settings/notifications/TauriNotificationsApiClient.ts b/src/app/features/settings/notifications/TauriNotificationsApiClient.ts index d5d7face9..46058c1fa 100644 --- a/src/app/features/settings/notifications/TauriNotificationsApiClient.ts +++ b/src/app/features/settings/notifications/TauriNotificationsApiClient.ts @@ -99,7 +99,7 @@ let notificationsApiPromise: Promise | null = null; export async function getTauriNotificationsApi(): Promise { if (!notificationsApiPromise) { - notificationsApiPromise = import('@choochmeque/tauri-plugin-notifications-api').then( + notificationsApiPromise = import('@sableclient/tauri-plugin-notifications-api').then( (api) => ({ ...api, diff --git a/src/app/features/settings/notifications/UnifiedPushTransportApiClient.ts b/src/app/features/settings/notifications/UnifiedPushTransportApiClient.ts index 0b71d16be..d2776bee0 100644 --- a/src/app/features/settings/notifications/UnifiedPushTransportApiClient.ts +++ b/src/app/features/settings/notifications/UnifiedPushTransportApiClient.ts @@ -17,7 +17,7 @@ export type UnifiedPushTransportApi = { }; export async function getUnifiedPushTransportApi(): Promise { - const notificationsApi = await import('@choochmeque/tauri-plugin-notifications-api'); + const notificationsApi = await import('@sableclient/tauri-plugin-notifications-api'); return { isPermissionGranted: notificationsApi.isPermissionGranted, requestPermission: notificationsApi.requestPermission, diff --git a/src/test/choochmeque-notifications-stub.ts b/src/test/notifications-api-stub.ts similarity index 93% rename from src/test/choochmeque-notifications-stub.ts rename to src/test/notifications-api-stub.ts index 8c83fcb24..1d8841c46 100644 --- a/src/test/choochmeque-notifications-stub.ts +++ b/src/test/notifications-api-stub.ts @@ -1,4 +1,4 @@ -// Test stub — the git dep has no built dist-js/ so tests resolve here. +// Test stub — vitest resolves the Tauri notifications plugin here instead of node_modules. export const Importance = { None: 0, Min: 1, Low: 2, Default: 3, High: 4 } as const; export const Visibility = { Secret: -1, Private: 0, Public: 1 } as const; diff --git a/src/types/tauri-plugin-notifications-api.d.ts b/src/types/tauri-plugin-notifications-api.d.ts index 8e4549b95..898e0f14e 100644 --- a/src/types/tauri-plugin-notifications-api.d.ts +++ b/src/types/tauri-plugin-notifications-api.d.ts @@ -1,4 +1,4 @@ -declare module '@choochmeque/tauri-plugin-notifications-api' { +declare module '@sableclient/tauri-plugin-notifications-api' { export type { PermissionState } from '@tauri-apps/api/core'; export const Importance: { diff --git a/vitest.config.ts b/vitest.config.ts index 76637457d..7029815ab 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -25,9 +25,9 @@ export default defineConfig({ $client: path.resolve(__dirname, 'src/client'), $unstable: path.resolve(__dirname, 'src/unstable'), $app: path.resolve(__dirname, 'src/app'), - '@choochmeque/tauri-plugin-notifications-api': path.resolve( + '@sableclient/tauri-plugin-notifications-api': path.resolve( __dirname, - 'src/test/choochmeque-notifications-stub.ts' + 'src/test/notifications-api-stub.ts' ), }, },