chore: Support pnpm v11

chore: upgrade depdencencies (#2133 )
* upgrade depdencencies
2026-07-16 07:30:03 +02:00 · 2026-06-09 22:15:47 -07:00 · 2026-06-09 21:18:47 -07:00 · 2026-06-09 11:22:36 -07:00 · 2026-06-09 11:21:02 -07:00
23 changed files with 2303 additions and 2481 deletions
@@ -44,8 +44,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -129,8 +127,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -19,8 +19,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -123,8 +121,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -16,8 +16,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -16,8 +16,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -38,8 +38,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -16,8 +16,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -16,8 +16,6 @@ jobs:

            - name: Install Node and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -43,6 +43,6 @@ jobs:


                  stale-issue-label: 'stale'
-                  exempt-issue-labels: 'keep,security'
+                  exempt-issue-labels: 'keep,security,enhancement'
                  stale-pr-label: 'stale'
                  exempt-pr-labels: 'keep,security'
@@ -12,8 +12,6 @@ jobs:

            - name: Install Node.js and PNPM
              uses: pnpm/action-setup@v4
-              with:
-                  version: 10

            - name: Install dependencies
              run: pnpm install
@@ -3,10 +3,7 @@ FROM node:23-alpine AS builder
 WORKDIR /app

 # Copy package.json first to cache node_modules
-COPY package.json pnpm-lock.yaml .
-
-# Match CI (pnpm/action-setup version: 10). Latest pnpm 11 fails install without approve-builds.
-RUN corepack enable && corepack prepare pnpm@10 --activate
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .

 RUN pnpm install

@@ -63,7 +63,7 @@ linux:
    artifactName: ${productName}-${os}-${arch}.${ext}

 toolsets:
-    appimage: '1.0.2'
+    appimage: '1.0.3'

 npmRebuild: false

@@ -63,7 +63,7 @@ linux:
    artifactName: ${productName}-${os}-${arch}.${ext}

 toolsets:
-    appimage: '1.0.2'
+    appimage: '1.0.3'

 npmRebuild: false
 publish:
@@ -63,7 +63,7 @@ linux:
    artifactName: ${productName}-${os}-${arch}.${ext}

 toolsets:
-    appimage: '1.0.2'
+    appimage: '1.0.3'

 npmRebuild: false
 afterAllArtifactBuild: scripts/after-all-artifact-build.mjs
@@ -69,79 +69,78 @@
        "postversion": "node ./scripts/update-app-stream.mjs"
    },
    "resolutions": {
-        "react-router": "7.14.0",
        "xml2js": "0.5.0"
    },
    "dependencies": {
        "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
        "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.5",
-        "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
+        "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.2.0",
        "@electron-toolkit/preload": "^3.0.2",
        "@electron-toolkit/utils": "^4.0.0",
-        "@mantine/colors-generator": "^9.1.1",
-        "@mantine/core": "^9.1.1",
-        "@mantine/dates": "^9.1.1",
-        "@mantine/form": "^9.1.1",
-        "@mantine/hooks": "^9.1.1",
-        "@mantine/modals": "^9.1.1",
-        "@mantine/notifications": "^9.1.1",
-        "@radix-ui/react-context-menu": "^2.2.16",
-        "@tanstack/react-query": "^5.96.2",
-        "@tanstack/react-query-devtools": "^5.96.2",
-        "@tanstack/react-query-persist-client": "^5.96.2",
+        "@mantine/colors-generator": "^9.3.0",
+        "@mantine/core": "^9.3.0",
+        "@mantine/dates": "^9.3.0",
+        "@mantine/form": "^9.3.0",
+        "@mantine/hooks": "^9.3.0",
+        "@mantine/modals": "^9.3.0",
+        "@mantine/notifications": "^9.3.0",
+        "@radix-ui/react-context-menu": "^2.3.0",
+        "@tanstack/react-query": "5.96.2",
+        "@tanstack/react-query-devtools": "5.96.2",
+        "@tanstack/react-query-persist-client": "5.96.2",
        "@ts-rest/core": "^3.52.1",
        "@wavesurfer/react": "^1.0.12",
-        "@xhayper/discord-rpc": "^1.3.3",
+        "@xhayper/discord-rpc": "^1.3.4",
        "audiomotion-analyzer": "^4.5.4",
-        "axios": "^1.14.0",
+        "axios": "^1.17.0",
        "butterchurn": "3.0.0-beta.5",
        "butterchurn-presets": "3.0.0-beta.4",
        "cheerio": "^1.2.0",
        "clsx": "^2.1.1",
        "cmdk": "^1.1.1",
-        "dayjs": "^1.11.20",
-        "dompurify": "^3.3.3",
+        "dayjs": "^1.11.21",
+        "dompurify": "^3.4.8",
        "electron-debug": "^3.2.0",
        "electron-localshortcut": "^3.2.1",
-        "electron-log": "^5.4.3",
+        "electron-log": "^5.4.4",
        "electron-store": "^8.2.0",
-        "electron-updater": "^6.8.3",
+        "electron-updater": "^6.8.9",
        "fast-average-color": "9.5.0",
-        "fast-xml-parser": "^5.5.10",
+        "fast-xml-parser": "^5.8.0",
        "format-duration": "^3.0.2",
-        "fuse.js": "^7.2.0",
+        "fuse.js": "^7.4.2",
        "i18next": "^25.10.10",
        "icecast-metadata-stats": "^0.1.12",
-        "idb-keyval": "^6.2.2",
+        "idb-keyval": "^6.2.5",
        "immer": "^10.2.0",
        "is-electron": "^2.2.2",
        "lodash": "^4.18.1",
        "md5": "^2.3.0",
-        "motion": "^12.38.0",
+        "motion": "^12.40.0",
        "mpris-service": "^2.1.2",
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.12",
        "node-mpv": "github:jeffvli/Node-MPV#32b4d64395289ad710c41d481d2707a7acfc228f",
-        "overlayscrollbars": "^2.14.0",
+        "overlayscrollbars": "^2.16.0",
        "overlayscrollbars-react": "^0.5.6",
-        "qs": "^6.15.0",
-        "react": "^19.2.4",
+        "qs": "^6.15.2",
+        "react": "^19.2.7",
        "react-call": "^1.8.2",
-        "react-dom": "^19.2.4",
+        "react-dom": "^19.2.7",
        "react-error-boundary": "^5.0.0",
        "react-i18next": "^16.6.6",
        "react-icons": "^5.6.0",
        "react-player": "^2.16.1",
-        "react-router": "^7.14.0",
+        "react-router": "^7.17.0",
        "react-split-pane": "^3.2.0",
        "react-virtualized-auto-sizer": "^1.0.26",
        "react-window": "1.8.11",
        "react-window-v2": "npm:react-window@^2.2.7",
-        "semver": "^7.7.4",
+        "semver": "^7.8.2",
        "string-to-color": "^2.2.2",
-        "wavesurfer.js": "^7.12.5",
-        "ws": "^8.20.0",
+        "wavesurfer.js": "^7.12.7",
+        "ws": "^8.21.0",
        "zod": "^3.25.76",
-        "zustand": "^5.0.12"
+        "zustand": "^5.0.14"
    },
    "devDependencies": {
        "@electron-toolkit/eslint-config-prettier": "^3.0.0",
@@ -150,8 +149,8 @@
        "@types/electron-localshortcut": "^3.1.3",
        "@types/lodash": "^4.17.24",
        "@types/md5": "^2.3.6",
-        "@types/node": "^24.12.2",
-        "@types/react": "^19.2.14",
+        "@types/node": "^24.13.1",
+        "@types/react": "^19.2.17",
        "@types/react-dom": "^19.2.3",
        "@types/react-window": "^1.8.8",
        "@types/source-map-support": "^0.5.10",
@@ -160,32 +159,33 @@
        "babel-plugin-react-compiler": "^1.0.0",
        "concurrently": "^9.2.1",
        "cross-env": "^10.1.0",
-        "electron": "^41.7.0",
-        "electron-builder": "^26.8.2",
+        "electron": "^41.7.1",
+        "electron-builder": "^26.15.0",
        "electron-devtools-installer": "^4.0.0",
        "electron-vite": "^4.0.1",
        "eslint": "^9.39.4",
        "eslint-plugin-perfectionist": "^4.15.1",
-        "eslint-plugin-prettier": "^5.5.5",
+        "eslint-plugin-prettier": "^5.5.6",
        "eslint-plugin-react": "^7.37.5",
-        "eslint-plugin-react-hooks": "^7.0.1",
+        "eslint-plugin-react-hooks": "^7.1.1",
        "eslint-plugin-react-refresh": "^0.4.26",
        "i18next-parser": "^9.4.0",
        "postcss-preset-mantine": "^1.18.0",
        "postcss-simple-vars": "^7.0.1",
-        "prettier": "^3.8.1",
+        "prettier": "^3.8.3",
        "prettier-plugin-packagejson": "^2.5.22",
        "stylelint": "^16.26.1",
        "stylelint-config-css-modules": "^4.6.0",
        "stylelint-config-recess-order": "^7.7.0",
        "stylelint-config-standard": "^39.0.1",
        "typescript": "^5.9.3",
-        "vite": "^7.3.1",
+        "vite": "^7.3.5",
        "vite-plugin-conditional-import": "^0.1.7",
        "vite-plugin-dynamic-import": "^1.6.0",
        "vite-plugin-ejs": "^1.7.0",
-        "vite-plugin-pwa": "^1.2.0"
+        "vite-plugin-pwa": "^1.3.0"
    },
+    "packageManager": "pnpm@11.5.2",
    "pnpm": {
        "onlyBuiltDependencies": [
            "electron",
@@ -0,0 +1,9 @@
+allowBuilds:
+  abstract-socket: true
+  electron: true
+  electron-winstaller: true
+  esbuild: true
+
+overrides:
+  "xml2js": "0.5.0"
+  "react-router": "7.14.0"
@@ -72,7 +72,7 @@ export const orderSearchResults = (args: {

        searchResults = Array.from(combinedResults.values());
    } else {
-        searchResults = fuse.search<InternetProviderLyricSearchResponse>({
+        searchResults = fuse.search({
            ...(params.artist && { artist: params.artist }),
            ...(params.name && { name: params.name }),
        });
@@ -13,7 +13,7 @@ import { useListContext } from '/@/renderer/context/list-context';
 import { eventEmitter } from '/@/renderer/events/event-emitter';
 import { UserFavoriteEventPayload, UserRatingEventPayload } from '/@/renderer/events/events';
 import { getListRefreshMutationKey } from '/@/renderer/features/shared/components/list-refresh-button';
-import { LibraryItem } from '/@/shared/types/domain-types';
+import { LibraryItem, SortKeyRandom } from '/@/shared/types/domain-types';

 export const getListQueryKeyName = (itemType: LibraryItem): string => {
    switch (itemType) {
@@ -108,8 +108,19 @@ export const useItemListInfiniteLoader = ({
        [serverId, itemType, query],
    );

+    const isRandomSort = query?.sortBy === SortKeyRandom;
+
    const fetchPage = useCallback(
        async (pageNumber: number) => {
+            if (isRandomSort) {
+                const existingData =
+                    queryClient.getQueryData<InfiniteLoaderCacheData>(dataQueryKey);
+                if (existingData?.pagesLoaded?.[pageNumber]) {
+                    lastFetchedPageRef.current = Math.max(lastFetchedPageRef.current, pageNumber);
+                    return;
+                }
+            }
+
            const startIndex = pageNumber * itemsPerPage;
            const queryParams = {
                limit: itemsPerPage,
@@ -118,6 +129,7 @@ export const useItemListInfiniteLoader = ({
            };

            const result = await queryClient.fetchQuery({
+                gcTime: isRandomSort ? 1000 * 60 * 10 : 1000 * 15,
                queryFn: async ({ signal }) => {
                    const result = await listQueryFn({
                        apiClientProps: { serverId, signal },
@@ -127,6 +139,7 @@ export const useItemListInfiniteLoader = ({
                    return result;
                },
                queryKey: queryKeys[getListQueryKeyName(itemType)].list(serverId, queryParams),
+                staleTime: isRandomSort ? 1000 * 60 * 10 : 1000 * 15,
            });

            // Update the query data with the fetched page
@@ -154,13 +167,32 @@ export const useItemListInfiniteLoader = ({
            // Track the last fetched page
            lastFetchedPageRef.current = Math.max(lastFetchedPageRef.current, pageNumber);
        },
-        [itemsPerPage, query, queryClient, serverId, dataQueryKey, listQueryFn, itemType],
+        [
+            itemsPerPage,
+            query,
+            queryClient,
+            serverId,
+            dataQueryKey,
+            listQueryFn,
+            itemType,
+            isRandomSort,
+        ],
    );

    // Reset the loaded pages and refetch current page when the query changes
    useEffect(() => {
        const currentDataQueryKey = JSON.stringify(dataQueryKey);

+        if (isRandomSort) {
+            const existingData = queryClient.getQueryData<InfiniteLoaderCacheData | undefined>(
+                dataQueryKey,
+            );
+            if (existingData?.dataMap && existingData.dataMap.size > 0) {
+                previousDataQueryKeyRef.current = currentDataQueryKey;
+                return;
+            }
+        }
+
        if (previousDataQueryKeyRef.current === currentDataQueryKey || isRefetchingRef.current) {
            return;
        }
@@ -12,7 +12,7 @@ import { useListContext } from '/@/renderer/context/list-context';
 import { eventEmitter } from '/@/renderer/events/event-emitter';
 import { UserFavoriteEventPayload, UserRatingEventPayload } from '/@/renderer/events/events';
 import { getListRefreshMutationKey } from '/@/renderer/features/shared/components/list-refresh-button';
-import { LibraryItem } from '/@/shared/types/domain-types';
+import { LibraryItem, SortKeyRandom } from '/@/shared/types/domain-types';

 const getQueryKeyName = (itemType: LibraryItem): string => {
    switch (itemType) {
@@ -76,6 +76,8 @@ export const useItemListPaginatedLoader = ({
    const fetchRange = getFetchRange(currentPage, itemsPerPage);
    const startIndex = fetchRange.startIndex;

+    const isRandomSort = query?.sortBy === SortKeyRandom;
+
    const queryParams = useMemo(
        () => ({
            limit: itemsPerPage,
@@ -86,7 +88,7 @@ export const useItemListPaginatedLoader = ({
    );

    const { data } = useQuery({
-        gcTime: 1000 * 15,
+        gcTime: isRandomSort ? 1000 * 60 * 10 : 1000 * 15,
        placeholderData: { items: getInitialData(itemsPerPage) },
        queryFn: async ({ signal }) => {
            const result = await listQueryFn({
@@ -97,7 +99,7 @@ export const useItemListPaginatedLoader = ({
            return result;
        },
        queryKey: queryKeys[getQueryKeyName(itemType)].list(serverId, queryParams),
-        staleTime: 1000 * 15,
+        staleTime: isRandomSort ? 1000 * 60 * 10 : 1000 * 15,
    });

    const refreshMutation = useMutation({
@@ -224,25 +224,26 @@ export const PlaylistQueryEditor = ({
        return detailQuery?.data?.rules?.order || 'asc';
    }, [detailQuery?.data?.rules?.order, detailQuery?.data?.rules?.sort]);

+    const appliedQuery = appliedJsonState?.query;
+    const detailQueryRules = detailQuery?.data?.rules;
    const effectiveQuery = useMemo(
        () =>
-            appliedJsonState?.query ??
-            (detailQuery?.data?.rules?.all
-                ? { all: detailQuery.data.rules.all }
-                : detailQuery?.data?.rules?.any
-                  ? { any: detailQuery.data.rules.any }
-                  : detailQuery?.data?.rules),
-        [appliedJsonState?.query, detailQuery?.data?.rules],
+            appliedQuery ??
+            (detailQueryRules?.all
+                ? { all: detailQueryRules.all }
+                : detailQueryRules?.any
+                  ? { any: detailQueryRules.any }
+                  : detailQueryRules),
+        [appliedQuery, detailQueryRules],
    );
    const effectiveLimit = appliedJsonState?.limit ?? detailQuery?.data?.rules?.limit;
    const effectiveLimitPercent =
        appliedJsonState?.limitPercent ?? detailQuery?.data?.rules?.limitPercent;
+
+    const appliedSort = appliedJsonState?.sort;
    const effectiveSortBy = useMemo(
-        () =>
-            (appliedJsonState?.sort ? [appliedJsonState.sort] : parseSortBy()) as
-                | SongListSort
-                | SongListSort[],
-        [appliedJsonState?.sort, parseSortBy],
+        () => (appliedSort ? [appliedSort] : parseSortBy()) as SongListSort | SongListSort[],
+        [appliedSort, parseSortBy],
    );
    const effectiveSortOrder = appliedJsonState?.sort
        ? appliedJsonState.sort.startsWith('-')
@@ -298,6 +298,7 @@ export const useServerAuthenticated = () => {
                    await new Promise((resolve) => setTimeout(resolve, NETWORK_RETRY_DELAY_MS));

                    // Retry authentication
+                    // eslint-disable-next-line react-hooks/immutability
                    return authenticateServer(serverWithAuth, nextRetry);
                }

@@ -189,7 +189,7 @@ const appRouterModals = {

 export const AppRouter = () => {
    const router = (
-        <HashRouter unstable_useTransitions={false}>
+        <HashRouter>
            <ModalsProvider modals={appRouterModals}>
                <RouterErrorBoundary>
                    <Routes>
@@ -465,6 +465,8 @@ export const tagListSortMap: TagListSortMap = {
    },
 };

+export const SortKeyRandom = 'random';
+
 export enum AlbumListSort {
    ALBUM_ARTIST = 'albumArtist',
    ARTIST = 'artist',
@@ -476,7 +478,7 @@ export enum AlbumListSort {
    ID = 'id',
    NAME = 'name',
    PLAY_COUNT = 'playCount',
-    RANDOM = 'random',
+    RANDOM = SortKeyRandom,
    RATING = 'rating',
    RECENTLY_ADDED = 'recentlyAdded',
    RECENTLY_PLAYED = 'recentlyPlayed',
@@ -598,7 +600,7 @@ export enum SongListSort {
    ID = 'id',
    NAME = 'name',
    PLAY_COUNT = 'playCount',
-    RANDOM = 'random',
+    RANDOM = SortKeyRandom,
    RATING = 'rating',
    RECENTLY_ADDED = 'recentlyAdded',
    RECENTLY_PLAYED = 'recentlyPlayed',
@@ -725,7 +727,7 @@ export enum AlbumArtistListSort {
    FAVORITED = 'favorited',
    NAME = 'name',
    PLAY_COUNT = 'playCount',
-    RANDOM = 'random',
+    RANDOM = SortKeyRandom,
    RATING = 'rating',
    RECENTLY_ADDED = 'recentlyAdded',
    RELEASE_DATE = 'releaseDate',
@@ -814,7 +816,7 @@ export enum ArtistListSort {
    FAVORITED = 'favorited',
    NAME = 'name',
    PLAY_COUNT = 'playCount',
-    RANDOM = 'random',
+    RANDOM = SortKeyRandom,
    RATING = 'rating',
    RECENTLY_ADDED = 'recentlyAdded',
    RELEASE_DATE = 'releaseDate',
Author	SHA1	Message	Date
oHaoDaio	d23f7619ec	chore: Support pnpm v11	2026-06-09 22:15:47 -07:00
Kendall Garner	44de6f2207	chore: upgrade depdencencies (#2133 ) * upgrade depdencencies	2026-06-09 21:18:47 -07:00
BotBlake	f6f25154a1	add "enhancement" to exempt-issue-labels (#2061 )	2026-06-09 11:22:36 -07:00
Pedro Vieira	880516069d	fix: preserve infinite list cache on component remount (fixes random sort reshuffling) (#2097 ) * fix: preserve infinite list cache on component remount When browsing with random sort, navigating to a detail view and coming back would reshuffle the list. This happens because the list component unmounts, losing its internal ref guard, and the reset effect re-fetches all pages — returning a new random order from the server.	2026-06-09 11:21:02 -07:00