diff --git a/config/webpack.config.main.base.ts b/config/webpack.config.main.base.ts index 7bff5e9f3..f4f0a1143 100644 --- a/config/webpack.config.main.base.ts +++ b/config/webpack.config.main.base.ts @@ -11,7 +11,7 @@ const configuration: webpack.Configuration = { target: 'electron-main', - entry: [path.join(webpackPaths.srcMainPath, 'main.ts')], + entry: [path.join(webpackPaths.srcMainPath, 'index.ts')], output: { path: webpackPaths.buildPath, diff --git a/package.json b/package.json index 7c49b90ee..d9d130219 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "menubar": "9.5.1", "react": "19.1.0", "react-dom": "19.1.0", - "react-router-dom": "7.6.1", + "react-router-dom": "7.6.2", "update-electron-app": "3.1.1" }, "devDependencies": { @@ -83,14 +83,14 @@ "@primer/octicons-react": "19.15.2", "@primer/primitives": "10.7.0", "@primer/react": "36.27.0", - "@tailwindcss/postcss": "4.1.7", + "@tailwindcss/postcss": "4.1.8", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.3.0", "@testing-library/user-event": "14.6.1", "@types/jest": "29.5.14", - "@types/node": "22.15.21", + "@types/node": "22.15.30", "@types/react": "19.1.6", - "@types/react-dom": "19.1.5", + "@types/react-dom": "19.1.6", "@types/react-router-dom": "5.3.3", "@types/semver": "7.7.0", "axios": "1.9.0", @@ -100,7 +100,7 @@ "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.2", "date-fns": "4.1.0", - "electron": "36.3.1", + "electron": "36.4.0", "electron-builder": "25.1.8", "final-form": "4.20.10", "graphql-tag": "2.12.6", @@ -110,13 +110,13 @@ "jest-environment-jsdom": "29.7.0", "mini-css-extract-plugin": "2.9.2", "nock": "13.5.6", - "postcss": "8.5.3", + "postcss": "8.5.4", "postcss-loader": "8.1.1", "rimraf": "6.0.1", "semver": "7.7.2", "styled-components": "6.1.18", "tailwind-merge": "3.3.0", - "tailwindcss": "4.1.7", + "tailwindcss": "4.1.8", "terser-webpack-plugin": "5.3.14", "ts-jest": "29.3.4", "ts-loader": "9.5.2", @@ -126,7 +126,7 @@ "webpack-cli": "6.0.1", "webpack-merge": "6.0.1" }, - "packageManager": "pnpm@10.11.0", + "packageManager": "pnpm@10.12.1", "pnpm": { "onlyBuiltDependencies": [ "@biomejs/biome", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 701a53236..4203a123b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@36.3.1) + version: 2.1.2(electron@36.4.0) electron-log: specifier: 5.4.0 version: 5.4.0 @@ -19,7 +19,7 @@ importers: version: 6.6.2 menubar: specifier: 9.5.1 - version: 9.5.1(electron@36.3.1) + version: 9.5.1(electron@36.4.0) react: specifier: 19.1.0 version: 19.1.0 @@ -27,8 +27,8 @@ importers: specifier: 19.1.0 version: 19.1.0(react@19.1.0) react-router-dom: - specifier: 7.6.1 - version: 7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + specifier: 7.6.2 + version: 7.6.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0) update-electron-app: specifier: 3.1.1 version: 3.1.1 @@ -50,16 +50,16 @@ importers: version: 10.7.0 '@primer/react': specifier: 36.27.0 - version: 36.27.0(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(styled-components@6.1.18(react-dom@19.1.0(react@19.1.0))(react@19.1.0)) + version: 36.27.0(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(styled-components@6.1.18(react-dom@19.1.0(react@19.1.0))(react@19.1.0)) '@tailwindcss/postcss': - specifier: 4.1.7 - version: 4.1.7 + specifier: 4.1.8 + version: 4.1.8 '@testing-library/jest-dom': specifier: 6.6.3 version: 6.6.3 '@testing-library/react': specifier: 16.3.0 - version: 16.3.0(@testing-library/dom@10.0.0)(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + version: 16.3.0(@testing-library/dom@10.0.0)(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@testing-library/user-event': specifier: 14.6.1 version: 14.6.1(@testing-library/dom@10.0.0) @@ -67,14 +67,14 @@ importers: specifier: 29.5.14 version: 29.5.14 '@types/node': - specifier: 22.15.21 - version: 22.15.21 + specifier: 22.15.30 + version: 22.15.30 '@types/react': specifier: 19.1.6 version: 19.1.6 '@types/react-dom': - specifier: 19.1.5 - version: 19.1.5(@types/react@19.1.6) + specifier: 19.1.6 + version: 19.1.6(@types/react@19.1.6) '@types/react-router-dom': specifier: 5.3.3 version: 5.3.3 @@ -103,8 +103,8 @@ importers: specifier: 4.1.0 version: 4.1.0 electron: - specifier: 36.3.1 - version: 36.3.1 + specifier: 36.4.0 + version: 36.4.0 electron-builder: specifier: 25.1.8 version: 25.1.8(electron-builder-squirrel-windows@24.13.3) @@ -122,7 +122,7 @@ importers: version: 9.1.7 jest: specifier: 29.7.0 - version: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + version: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) jest-environment-jsdom: specifier: 29.7.0 version: 29.7.0 @@ -133,11 +133,11 @@ importers: specifier: 13.5.6 version: 13.5.6 postcss: - specifier: 8.5.3 - version: 8.5.3 + specifier: 8.5.4 + version: 8.5.4 postcss-loader: specifier: 8.1.1 - version: 8.1.1(postcss@8.5.3)(typescript@5.8.3)(webpack@5.99.9) + version: 8.1.1(postcss@8.5.4)(typescript@5.8.3)(webpack@5.99.9) rimraf: specifier: 6.0.1 version: 6.0.1 @@ -151,20 +151,20 @@ importers: specifier: 3.3.0 version: 3.3.0 tailwindcss: - specifier: 4.1.7 - version: 4.1.7 + specifier: 4.1.8 + version: 4.1.8 terser-webpack-plugin: specifier: 5.3.14 version: 5.3.14(webpack@5.99.9) ts-jest: specifier: 29.3.4 - version: 29.3.4(@babel/core@7.24.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(typescript@5.8.3) + version: 29.3.4(@babel/core@7.24.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3) ts-loader: specifier: 9.5.2 version: 9.5.2(typescript@5.8.3)(webpack@5.99.9) ts-node: specifier: 10.9.2 - version: 10.9.2(@types/node@22.15.21)(typescript@5.8.3) + version: 10.9.2(@types/node@22.15.30)(typescript@5.8.3) typescript: specifier: 5.8.3 version: 5.8.3 @@ -750,65 +750,65 @@ packages: resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} engines: {node: '>=10'} - '@tailwindcss/node@4.1.7': - resolution: {integrity: sha512-9rsOpdY9idRI2NH6CL4wORFY0+Q6fnx9XP9Ju+iq/0wJwGD5IByIgFmwVbyy4ymuyprj8Qh4ErxMKTUL4uNh3g==} + '@tailwindcss/node@4.1.8': + resolution: {integrity: sha512-OWwBsbC9BFAJelmnNcrKuf+bka2ZxCE2A4Ft53Tkg4uoiE67r/PMEYwCsourC26E+kmxfwE0hVzMdxqeW+xu7Q==} - '@tailwindcss/oxide-android-arm64@4.1.7': - resolution: {integrity: sha512-IWA410JZ8fF7kACus6BrUwY2Z1t1hm0+ZWNEzykKmMNM09wQooOcN/VXr0p/WJdtHZ90PvJf2AIBS/Ceqx1emg==} + '@tailwindcss/oxide-android-arm64@4.1.8': + resolution: {integrity: sha512-Fbz7qni62uKYceWYvUjRqhGfZKwhZDQhlrJKGtnZfuNtHFqa8wmr+Wn74CTWERiW2hn3mN5gTpOoxWKk0jRxjg==} engines: {node: '>= 10'} cpu: [arm64] os: [android] - '@tailwindcss/oxide-darwin-arm64@4.1.7': - resolution: {integrity: sha512-81jUw9To7fimGGkuJ2W5h3/oGonTOZKZ8C2ghm/TTxbwvfSiFSDPd6/A/KE2N7Jp4mv3Ps9OFqg2fEKgZFfsvg==} + '@tailwindcss/oxide-darwin-arm64@4.1.8': + resolution: {integrity: sha512-RdRvedGsT0vwVVDztvyXhKpsU2ark/BjgG0huo4+2BluxdXo8NDgzl77qh0T1nUxmM11eXwR8jA39ibvSTbi7A==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.1.7': - resolution: {integrity: sha512-q77rWjEyGHV4PdDBtrzO0tgBBPlQWKY7wZK0cUok/HaGgbNKecegNxCGikuPJn5wFAlIywC3v+WMBt0PEBtwGw==} + '@tailwindcss/oxide-darwin-x64@4.1.8': + resolution: {integrity: sha512-t6PgxjEMLp5Ovf7uMb2OFmb3kqzVTPPakWpBIFzppk4JE4ix0yEtbtSjPbU8+PZETpaYMtXvss2Sdkx8Vs4XRw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tailwindcss/oxide-freebsd-x64@4.1.7': - resolution: {integrity: sha512-RfmdbbK6G6ptgF4qqbzoxmH+PKfP4KSVs7SRlTwcbRgBwezJkAO3Qta/7gDy10Q2DcUVkKxFLXUQO6J3CRvBGw==} + '@tailwindcss/oxide-freebsd-x64@4.1.8': + resolution: {integrity: sha512-g8C8eGEyhHTqwPStSwZNSrOlyx0bhK/V/+zX0Y+n7DoRUzyS8eMbVshVOLJTDDC+Qn9IJnilYbIKzpB9n4aBsg==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.7': - resolution: {integrity: sha512-OZqsGvpwOa13lVd1z6JVwQXadEobmesxQ4AxhrwRiPuE04quvZHWn/LnihMg7/XkN+dTioXp/VMu/p6A5eZP3g==} + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.8': + resolution: {integrity: sha512-Jmzr3FA4S2tHhaC6yCjac3rGf7hG9R6Gf2z9i9JFcuyy0u79HfQsh/thifbYTF2ic82KJovKKkIB6Z9TdNhCXQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.1.7': - resolution: {integrity: sha512-voMvBTnJSfKecJxGkoeAyW/2XRToLZ227LxswLAwKY7YslG/Xkw9/tJNH+3IVh5bdYzYE7DfiaPbRkSHFxY1xA==} + '@tailwindcss/oxide-linux-arm64-gnu@4.1.8': + resolution: {integrity: sha512-qq7jXtO1+UEtCmCeBBIRDrPFIVI4ilEQ97qgBGdwXAARrUqSn/L9fUrkb1XP/mvVtoVeR2bt/0L77xx53bPZ/Q==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.1.7': - resolution: {integrity: sha512-PjGuNNmJeKHnP58M7XyjJyla8LPo+RmwHQpBI+W/OxqrwojyuCQ+GUtygu7jUqTEexejZHr/z3nBc/gTiXBj4A==} + '@tailwindcss/oxide-linux-arm64-musl@4.1.8': + resolution: {integrity: sha512-O6b8QesPbJCRshsNApsOIpzKt3ztG35gfX9tEf4arD7mwNinsoCKxkj8TgEE0YRjmjtO3r9FlJnT/ENd9EVefQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.1.7': - resolution: {integrity: sha512-HMs+Va+ZR3gC3mLZE00gXxtBo3JoSQxtu9lobbZd+DmfkIxR54NO7Z+UQNPsa0P/ITn1TevtFxXTpsRU7qEvWg==} + '@tailwindcss/oxide-linux-x64-gnu@4.1.8': + resolution: {integrity: sha512-32iEXX/pXwikshNOGnERAFwFSfiltmijMIAbUhnNyjFr3tmWmMJWQKU2vNcFX0DACSXJ3ZWcSkzNbaKTdngH6g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.1.7': - resolution: {integrity: sha512-MHZ6jyNlutdHH8rd+YTdr3QbXrHXqwIhHw9e7yXEBcQdluGwhpQY2Eku8UZK6ReLaWtQ4gijIv5QoM5eE+qlsA==} + '@tailwindcss/oxide-linux-x64-musl@4.1.8': + resolution: {integrity: sha512-s+VSSD+TfZeMEsCaFaHTaY5YNj3Dri8rST09gMvYQKwPphacRG7wbuQ5ZJMIJXN/puxPcg/nU+ucvWguPpvBDg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-wasm32-wasi@4.1.7': - resolution: {integrity: sha512-ANaSKt74ZRzE2TvJmUcbFQ8zS201cIPxUDm5qez5rLEwWkie2SkGtA4P+GPTj+u8N6JbPrC8MtY8RmJA35Oo+A==} + '@tailwindcss/oxide-wasm32-wasi@4.1.8': + resolution: {integrity: sha512-CXBPVFkpDjM67sS1psWohZ6g/2/cd+cq56vPxK4JeawelxwK4YECgl9Y9TjkE2qfF+9/s1tHHJqrC4SS6cVvSg==} engines: {node: '>=14.0.0'} cpu: [wasm32] bundledDependencies: @@ -819,24 +819,24 @@ packages: - '@emnapi/wasi-threads' - tslib - '@tailwindcss/oxide-win32-arm64-msvc@4.1.7': - resolution: {integrity: sha512-HUiSiXQ9gLJBAPCMVRk2RT1ZrBjto7WvqsPBwUrNK2BcdSxMnk19h4pjZjI7zgPhDxlAbJSumTC4ljeA9y0tEw==} + '@tailwindcss/oxide-win32-arm64-msvc@4.1.8': + resolution: {integrity: sha512-7GmYk1n28teDHUjPlIx4Z6Z4hHEgvP5ZW2QS9ygnDAdI/myh3HTHjDqtSqgu1BpRoI4OiLx+fThAyA1JePoENA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.1.7': - resolution: {integrity: sha512-rYHGmvoHiLJ8hWucSfSOEmdCBIGZIq7SpkPRSqLsH2Ab2YUNgKeAPT1Fi2cx3+hnYOrAb0jp9cRyode3bBW4mQ==} + '@tailwindcss/oxide-win32-x64-msvc@4.1.8': + resolution: {integrity: sha512-fou+U20j+Jl0EHwK92spoWISON2OBnCazIc038Xj2TdweYV33ZRkS9nwqiUi2d/Wba5xg5UoHfvynnb/UB49cQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tailwindcss/oxide@4.1.7': - resolution: {integrity: sha512-5SF95Ctm9DFiUyjUPnDGkoKItPX/k+xifcQhcqX5RA85m50jw1pT/KzjdvlqxRja45Y52nR4MR9fD1JYd7f8NQ==} + '@tailwindcss/oxide@4.1.8': + resolution: {integrity: sha512-d7qvv9PsM5N3VNKhwVUhpK6r4h9wtLkJ6lz9ZY9aeZgrUWk1Z8VPyqyDT9MZlem7GTGseRQHkeB1j3tC7W1P+A==} engines: {node: '>= 10'} - '@tailwindcss/postcss@4.1.7': - resolution: {integrity: sha512-88g3qmNZn7jDgrrcp3ZXEQfp9CVox7xjP1HN2TFKI03CltPVd/c61ydn5qJJL8FYunn0OqBaW5HNUga0kmPVvw==} + '@tailwindcss/postcss@4.1.8': + resolution: {integrity: sha512-vB/vlf7rIky+w94aWMw34bWW1ka6g6C3xIOdICKX2GC0VcLtL6fhlLiafF0DVIwa9V6EHz8kbWMkS2s2QvvNlw==} '@testing-library/dom@10.0.0': resolution: {integrity: sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g==} @@ -965,8 +965,8 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} - '@types/node@22.15.21': - resolution: {integrity: sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==} + '@types/node@22.15.30': + resolution: {integrity: sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==} '@types/plist@3.0.5': resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==} @@ -974,8 +974,8 @@ packages: '@types/prop-types@15.7.14': resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} - '@types/react-dom@19.1.5': - resolution: {integrity: sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==} + '@types/react-dom@19.1.6': + resolution: {integrity: sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==} peerDependencies: '@types/react': ^19.0.0 @@ -1958,8 +1958,8 @@ packages: electron-updater@6.6.2: resolution: {integrity: sha512-Cr4GDOkbAUqRHP5/oeOmH/L2Bn6+FQPxVLZtPbcmKZC63a1F3uu5EefYOssgZXG3u/zBlubbJ5PJdITdMVggbw==} - electron@36.3.1: - resolution: {integrity: sha512-LeOZ+tVahmctHaAssLCGRRUa2SAO09GXua3pKdG+WzkbSDMh+3iOPONNVPTqGp8HlWnzGj4r6mhsIbM2RgH+eQ==} + electron@36.4.0: + resolution: {integrity: sha512-LLOOZEuW5oqvnjC7HBQhIqjIIJAZCIFjQxltQGLfEC7XFsBoZgQ3u3iFj+Kzw68Xj97u1n57Jdt7P98qLvUibQ==} engines: {node: '>= 12.20.55'} hasBin: true @@ -3181,6 +3181,11 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + nanoid@3.3.11: + resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + nanoid@3.3.8: resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -3582,8 +3587,8 @@ packages: resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} engines: {node: ^10 || ^12 || >=14} - postcss@8.5.3: - resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} + postcss@8.5.4: + resolution: {integrity: sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==} engines: {node: ^10 || ^12 || >=14} pretty-error@4.0.0: @@ -3685,15 +3690,15 @@ packages: '@types/react': '>=16' react: '>=16' - react-router-dom@7.6.1: - resolution: {integrity: sha512-vxU7ei//UfPYQ3iZvHuO1D/5fX3/JOqhNTbRR+WjSBWxf9bIvpWK+ftjmdfJHzPOuMQKe2fiEdG+dZX6E8uUpA==} + react-router-dom@7.6.2: + resolution: {integrity: sha512-Q8zb6VlTbdYKK5JJBLQEN06oTUa/RAbG/oQS1auK1I0TbJOXktqm+QENEVJU6QvWynlXPRBXI3fiOQcSEA78rA==} engines: {node: '>=20.0.0'} peerDependencies: react: '>=18' react-dom: '>=18' - react-router@7.6.1: - resolution: {integrity: sha512-hPJXXxHJZEsPFNVbtATH7+MMX43UDeOauz+EAU4cgqTn7ojdI9qQORqS8Z0qmDlL1TclO/6jLRYUEtbWidtdHQ==} + react-router@7.6.2: + resolution: {integrity: sha512-U7Nv3y+bMimgWjhlT5CRdzHPu2/KVmqPwKUCChW8en5P3znxUqwlYFlbmyj8Rgp1SF6zs5X4+77kBVknkg6a0w==} engines: {node: '>=20.0.0'} peerDependencies: react: '>=18' @@ -4063,8 +4068,8 @@ packages: tailwind-merge@3.3.0: resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==} - tailwindcss@4.1.7: - resolution: {integrity: sha512-kr1o/ErIdNhTz8uzAYL7TpaUuzKIE6QPQ4qmSdxnoX/lo+5wmUHQA6h3L5yIqEImSRnAAURDirLu/BgiXGPAhg==} + tailwindcss@4.1.8: + resolution: {integrity: sha512-kjeW8gjdxasbmFKpVGrGd5T4i40mV5J2Rasw48QARfYeQ8YS9x02ON9SFWax3Qf616rt4Cp3nVNIj6Hd1mP3og==} tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} @@ -4823,9 +4828,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.2(electron@36.3.1)': + '@electron/remote@2.1.2(electron@36.4.0)': dependencies: - electron: 36.3.1 + electron: 36.4.0 '@electron/universal@1.5.1': dependencies: @@ -4897,27 +4902,27 @@ snapshots: '@jest/console@29.7.0': dependencies: '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 slash: 3.0.0 - '@jest/core@29.7.0(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3))': + '@jest/core@29.7.0(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3))': dependencies: '@jest/console': 29.7.0 '@jest/reporters': 29.7.0 '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -4942,7 +4947,7 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-mock: 29.7.0 '@jest/expect-utils@29.7.0': @@ -4960,7 +4965,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -4982,7 +4987,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -5052,7 +5057,7 @@ snapshots: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/yargs': 17.0.32 chalk: 4.1.2 @@ -5135,7 +5140,7 @@ snapshots: '@primer/primitives@7.17.1': {} - '@primer/react@36.27.0(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(styled-components@6.1.18(react-dom@19.1.0(react@19.1.0))(react@19.1.0))': + '@primer/react@36.27.0(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(styled-components@6.1.18(react-dom@19.1.0(react@19.1.0))(react@19.1.0))': dependencies: '@github/combobox-nav': 2.3.1 '@github/markdown-toolbar-element': 2.2.3 @@ -5172,7 +5177,7 @@ snapshots: styled-system: 5.1.5 optionalDependencies: '@types/react': 19.1.6 - '@types/react-dom': 19.1.5(@types/react@19.1.6) + '@types/react-dom': 19.1.6(@types/react@19.1.6) transitivePeerDependencies: - supports-color @@ -5251,7 +5256,7 @@ snapshots: dependencies: defer-to-connect: 2.0.1 - '@tailwindcss/node@4.1.7': + '@tailwindcss/node@4.1.8': dependencies: '@ampproject/remapping': 2.3.0 enhanced-resolve: 5.18.1 @@ -5259,69 +5264,69 @@ snapshots: lightningcss: 1.30.1 magic-string: 0.30.17 source-map-js: 1.2.1 - tailwindcss: 4.1.7 + tailwindcss: 4.1.8 - '@tailwindcss/oxide-android-arm64@4.1.7': + '@tailwindcss/oxide-android-arm64@4.1.8': optional: true - '@tailwindcss/oxide-darwin-arm64@4.1.7': + '@tailwindcss/oxide-darwin-arm64@4.1.8': optional: true - '@tailwindcss/oxide-darwin-x64@4.1.7': + '@tailwindcss/oxide-darwin-x64@4.1.8': optional: true - '@tailwindcss/oxide-freebsd-x64@4.1.7': + '@tailwindcss/oxide-freebsd-x64@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.7': + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.1.7': + '@tailwindcss/oxide-linux-arm64-gnu@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.1.7': + '@tailwindcss/oxide-linux-arm64-musl@4.1.8': optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.1.7': + '@tailwindcss/oxide-linux-x64-gnu@4.1.8': optional: true - '@tailwindcss/oxide-linux-x64-musl@4.1.7': + '@tailwindcss/oxide-linux-x64-musl@4.1.8': optional: true - '@tailwindcss/oxide-wasm32-wasi@4.1.7': + '@tailwindcss/oxide-wasm32-wasi@4.1.8': optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.1.7': + '@tailwindcss/oxide-win32-arm64-msvc@4.1.8': optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.1.7': + '@tailwindcss/oxide-win32-x64-msvc@4.1.8': optional: true - '@tailwindcss/oxide@4.1.7': + '@tailwindcss/oxide@4.1.8': dependencies: detect-libc: 2.0.4 tar: 7.4.3 optionalDependencies: - '@tailwindcss/oxide-android-arm64': 4.1.7 - '@tailwindcss/oxide-darwin-arm64': 4.1.7 - '@tailwindcss/oxide-darwin-x64': 4.1.7 - '@tailwindcss/oxide-freebsd-x64': 4.1.7 - '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.7 - '@tailwindcss/oxide-linux-arm64-gnu': 4.1.7 - '@tailwindcss/oxide-linux-arm64-musl': 4.1.7 - '@tailwindcss/oxide-linux-x64-gnu': 4.1.7 - '@tailwindcss/oxide-linux-x64-musl': 4.1.7 - '@tailwindcss/oxide-wasm32-wasi': 4.1.7 - '@tailwindcss/oxide-win32-arm64-msvc': 4.1.7 - '@tailwindcss/oxide-win32-x64-msvc': 4.1.7 - - '@tailwindcss/postcss@4.1.7': + '@tailwindcss/oxide-android-arm64': 4.1.8 + '@tailwindcss/oxide-darwin-arm64': 4.1.8 + '@tailwindcss/oxide-darwin-x64': 4.1.8 + '@tailwindcss/oxide-freebsd-x64': 4.1.8 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.8 + '@tailwindcss/oxide-linux-arm64-gnu': 4.1.8 + '@tailwindcss/oxide-linux-arm64-musl': 4.1.8 + '@tailwindcss/oxide-linux-x64-gnu': 4.1.8 + '@tailwindcss/oxide-linux-x64-musl': 4.1.8 + '@tailwindcss/oxide-wasm32-wasi': 4.1.8 + '@tailwindcss/oxide-win32-arm64-msvc': 4.1.8 + '@tailwindcss/oxide-win32-x64-msvc': 4.1.8 + + '@tailwindcss/postcss@4.1.8': dependencies: '@alloc/quick-lru': 5.2.0 - '@tailwindcss/node': 4.1.7 - '@tailwindcss/oxide': 4.1.7 - postcss: 8.5.3 - tailwindcss: 4.1.7 + '@tailwindcss/node': 4.1.8 + '@tailwindcss/oxide': 4.1.8 + postcss: 8.5.4 + tailwindcss: 4.1.8 '@testing-library/dom@10.0.0': dependencies: @@ -5344,7 +5349,7 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 - '@testing-library/react@16.3.0(@testing-library/dom@10.0.0)(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': + '@testing-library/react@16.3.0(@testing-library/dom@10.0.0)(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': dependencies: '@babel/runtime': 7.24.1 '@testing-library/dom': 10.0.0 @@ -5352,7 +5357,7 @@ snapshots: react-dom: 19.1.0(react@19.1.0) optionalDependencies: '@types/react': 19.1.6 - '@types/react-dom': 19.1.5(@types/react@19.1.6) + '@types/react-dom': 19.1.6(@types/react@19.1.6) '@testing-library/user-event@14.6.1(@testing-library/dom@10.0.0)': dependencies: @@ -5399,7 +5404,7 @@ snapshots: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/responselike': 1.0.3 '@types/debug@4.1.12': @@ -5420,11 +5425,11 @@ snapshots: '@types/fs-extra@9.0.13': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/graceful-fs@4.1.9': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/hast@2.3.10': dependencies: @@ -5453,7 +5458,7 @@ snapshots: '@types/jsdom@20.0.1': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/tough-cookie': 4.0.5 parse5: 7.1.2 @@ -5461,7 +5466,7 @@ snapshots: '@types/keyv@3.1.4': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/mdast@3.0.15': dependencies: @@ -5469,19 +5474,19 @@ snapshots: '@types/ms@0.7.34': {} - '@types/node@22.15.21': + '@types/node@22.15.30': dependencies: undici-types: 6.21.0 '@types/plist@3.0.5': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 xmlbuilder: 15.1.1 optional: true '@types/prop-types@15.7.14': {} - '@types/react-dom@19.1.5(@types/react@19.1.6)': + '@types/react-dom@19.1.6(@types/react@19.1.6)': dependencies: '@types/react': 19.1.6 @@ -5506,7 +5511,7 @@ snapshots: '@types/responselike@1.0.3': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 '@types/semver@7.7.0': {} @@ -5539,7 +5544,7 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 optional: true '@webassemblyjs/ast@1.14.1': @@ -6300,13 +6305,13 @@ snapshots: buffer: 5.7.1 optional: true - create-jest@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)): + create-jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -6325,18 +6330,18 @@ snapshots: css-color-keywords@1.0.0: {} - css-declaration-sorter@7.2.0(postcss@8.5.3): + css-declaration-sorter@7.2.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 css-loader@7.1.2(webpack@5.99.9): dependencies: - icss-utils: 5.1.0(postcss@8.5.3) - postcss: 8.5.3 - postcss-modules-extract-imports: 3.1.0(postcss@8.5.3) - postcss-modules-local-by-default: 4.0.5(postcss@8.5.3) - postcss-modules-scope: 3.2.0(postcss@8.5.3) - postcss-modules-values: 4.0.0(postcss@8.5.3) + icss-utils: 5.1.0(postcss@8.5.4) + postcss: 8.5.4 + postcss-modules-extract-imports: 3.1.0(postcss@8.5.4) + postcss-modules-local-by-default: 4.0.5(postcss@8.5.4) + postcss-modules-scope: 3.2.0(postcss@8.5.4) + postcss-modules-values: 4.0.0(postcss@8.5.4) postcss-value-parser: 4.2.0 semver: 7.7.2 optionalDependencies: @@ -6345,9 +6350,9 @@ snapshots: css-minimizer-webpack-plugin@7.0.2(webpack@5.99.9): dependencies: '@jridgewell/trace-mapping': 0.3.25 - cssnano: 7.0.6(postcss@8.5.3) + cssnano: 7.0.6(postcss@8.5.4) jest-worker: 29.7.0 - postcss: 8.5.3 + postcss: 8.5.4 schema-utils: 4.3.0 serialize-javascript: 6.0.2 webpack: 5.99.9(webpack-cli@6.0.1) @@ -6390,49 +6395,49 @@ snapshots: cssesc@3.0.0: {} - cssnano-preset-default@7.0.6(postcss@8.5.3): + cssnano-preset-default@7.0.6(postcss@8.5.4): dependencies: browserslist: 4.24.2 - css-declaration-sorter: 7.2.0(postcss@8.5.3) - cssnano-utils: 5.0.0(postcss@8.5.3) - postcss: 8.5.3 - postcss-calc: 10.0.2(postcss@8.5.3) - postcss-colormin: 7.0.2(postcss@8.5.3) - postcss-convert-values: 7.0.4(postcss@8.5.3) - postcss-discard-comments: 7.0.3(postcss@8.5.3) - postcss-discard-duplicates: 7.0.1(postcss@8.5.3) - postcss-discard-empty: 7.0.0(postcss@8.5.3) - postcss-discard-overridden: 7.0.0(postcss@8.5.3) - postcss-merge-longhand: 7.0.4(postcss@8.5.3) - postcss-merge-rules: 7.0.4(postcss@8.5.3) - postcss-minify-font-values: 7.0.0(postcss@8.5.3) - postcss-minify-gradients: 7.0.0(postcss@8.5.3) - postcss-minify-params: 7.0.2(postcss@8.5.3) - postcss-minify-selectors: 7.0.4(postcss@8.5.3) - postcss-normalize-charset: 7.0.0(postcss@8.5.3) - postcss-normalize-display-values: 7.0.0(postcss@8.5.3) - postcss-normalize-positions: 7.0.0(postcss@8.5.3) - postcss-normalize-repeat-style: 7.0.0(postcss@8.5.3) - postcss-normalize-string: 7.0.0(postcss@8.5.3) - postcss-normalize-timing-functions: 7.0.0(postcss@8.5.3) - postcss-normalize-unicode: 7.0.2(postcss@8.5.3) - postcss-normalize-url: 7.0.0(postcss@8.5.3) - postcss-normalize-whitespace: 7.0.0(postcss@8.5.3) - postcss-ordered-values: 7.0.1(postcss@8.5.3) - postcss-reduce-initial: 7.0.2(postcss@8.5.3) - postcss-reduce-transforms: 7.0.0(postcss@8.5.3) - postcss-svgo: 7.0.1(postcss@8.5.3) - postcss-unique-selectors: 7.0.3(postcss@8.5.3) - - cssnano-utils@5.0.0(postcss@8.5.3): - dependencies: - postcss: 8.5.3 - - cssnano@7.0.6(postcss@8.5.3): - dependencies: - cssnano-preset-default: 7.0.6(postcss@8.5.3) + css-declaration-sorter: 7.2.0(postcss@8.5.4) + cssnano-utils: 5.0.0(postcss@8.5.4) + postcss: 8.5.4 + postcss-calc: 10.0.2(postcss@8.5.4) + postcss-colormin: 7.0.2(postcss@8.5.4) + postcss-convert-values: 7.0.4(postcss@8.5.4) + postcss-discard-comments: 7.0.3(postcss@8.5.4) + postcss-discard-duplicates: 7.0.1(postcss@8.5.4) + postcss-discard-empty: 7.0.0(postcss@8.5.4) + postcss-discard-overridden: 7.0.0(postcss@8.5.4) + postcss-merge-longhand: 7.0.4(postcss@8.5.4) + postcss-merge-rules: 7.0.4(postcss@8.5.4) + postcss-minify-font-values: 7.0.0(postcss@8.5.4) + postcss-minify-gradients: 7.0.0(postcss@8.5.4) + postcss-minify-params: 7.0.2(postcss@8.5.4) + postcss-minify-selectors: 7.0.4(postcss@8.5.4) + postcss-normalize-charset: 7.0.0(postcss@8.5.4) + postcss-normalize-display-values: 7.0.0(postcss@8.5.4) + postcss-normalize-positions: 7.0.0(postcss@8.5.4) + postcss-normalize-repeat-style: 7.0.0(postcss@8.5.4) + postcss-normalize-string: 7.0.0(postcss@8.5.4) + postcss-normalize-timing-functions: 7.0.0(postcss@8.5.4) + postcss-normalize-unicode: 7.0.2(postcss@8.5.4) + postcss-normalize-url: 7.0.0(postcss@8.5.4) + postcss-normalize-whitespace: 7.0.0(postcss@8.5.4) + postcss-ordered-values: 7.0.1(postcss@8.5.4) + postcss-reduce-initial: 7.0.2(postcss@8.5.4) + postcss-reduce-transforms: 7.0.0(postcss@8.5.4) + postcss-svgo: 7.0.1(postcss@8.5.4) + postcss-unique-selectors: 7.0.3(postcss@8.5.4) + + cssnano-utils@5.0.0(postcss@8.5.4): + dependencies: + postcss: 8.5.4 + + cssnano@7.0.6(postcss@8.5.4): + dependencies: + cssnano-preset-default: 7.0.6(postcss@8.5.4) lilconfig: 3.1.2 - postcss: 8.5.3 + postcss: 8.5.4 csso@5.0.5: dependencies: @@ -6693,10 +6698,10 @@ snapshots: transitivePeerDependencies: - supports-color - electron@36.3.1: + electron@36.4.0: dependencies: '@electron/get': 2.0.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -7164,9 +7169,9 @@ snapshots: dependencies: safer-buffer: 2.1.2 - icss-utils@5.1.0(postcss@8.5.3): + icss-utils@5.1.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 ieee754@1.2.1: {} @@ -7326,7 +7331,7 @@ snapshots: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -7346,16 +7351,16 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)): + jest-cli@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + create-jest: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -7365,7 +7370,7 @@ snapshots: - supports-color - ts-node - jest-config@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)): + jest-config@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)): dependencies: '@babel/core': 7.24.3 '@jest/test-sequencer': 29.7.0 @@ -7390,8 +7395,8 @@ snapshots: slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: - '@types/node': 22.15.21 - ts-node: 10.9.2(@types/node@22.15.21)(typescript@5.8.3) + '@types/node': 22.15.30 + ts-node: 10.9.2(@types/node@22.15.30)(typescript@5.8.3) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -7421,7 +7426,7 @@ snapshots: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 '@types/jsdom': 20.0.1 - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-mock: 29.7.0 jest-util: 29.7.0 jsdom: 20.0.3 @@ -7435,7 +7440,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -7445,7 +7450,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 22.15.21 + '@types/node': 22.15.30 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -7484,7 +7489,7 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-util: 29.7.0 jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -7519,7 +7524,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -7547,7 +7552,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -7593,7 +7598,7 @@ snapshots: jest-util@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -7612,7 +7617,7 @@ snapshots: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.15.21 + '@types/node': 22.15.30 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -7621,23 +7626,23 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 merge-stream: 2.0.0 supports-color: 8.1.1 jest-worker@29.7.0: dependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.30 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 - jest@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)): + jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + jest-cli: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -7935,9 +7940,9 @@ snapshots: mdn-data@2.0.30: {} - menubar@9.5.1(electron@36.3.1): + menubar@9.5.1(electron@36.4.0): dependencies: - electron: 36.3.1 + electron: 36.4.0 electron-positioner: 4.1.0 merge-stream@2.0.0: {} @@ -8171,6 +8176,8 @@ snapshots: ms@2.1.3: {} + nanoid@3.3.11: {} + nanoid@3.3.8: {} natural-compare@1.4.0: {} @@ -8361,174 +8368,174 @@ snapshots: base64-js: 1.5.1 xmlbuilder: 15.1.1 - postcss-calc@10.0.2(postcss@8.5.3): + postcss-calc@10.0.2(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.1.2 postcss-value-parser: 4.2.0 - postcss-colormin@7.0.2(postcss@8.5.3): + postcss-colormin@7.0.2(postcss@8.5.4): dependencies: browserslist: 4.24.2 caniuse-api: 3.0.0 colord: 2.9.3 - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-convert-values@7.0.4(postcss@8.5.3): + postcss-convert-values@7.0.4(postcss@8.5.4): dependencies: browserslist: 4.24.2 - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-discard-comments@7.0.3(postcss@8.5.3): + postcss-discard-comments@7.0.3(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.1.2 - postcss-discard-duplicates@7.0.1(postcss@8.5.3): + postcss-discard-duplicates@7.0.1(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 - postcss-discard-empty@7.0.0(postcss@8.5.3): + postcss-discard-empty@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 - postcss-discard-overridden@7.0.0(postcss@8.5.3): + postcss-discard-overridden@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 - postcss-loader@8.1.1(postcss@8.5.3)(typescript@5.8.3)(webpack@5.99.9): + postcss-loader@8.1.1(postcss@8.5.4)(typescript@5.8.3)(webpack@5.99.9): dependencies: cosmiconfig: 9.0.0(typescript@5.8.3) jiti: 1.21.0 - postcss: 8.5.3 + postcss: 8.5.4 semver: 7.7.2 optionalDependencies: webpack: 5.99.9(webpack-cli@6.0.1) transitivePeerDependencies: - typescript - postcss-merge-longhand@7.0.4(postcss@8.5.3): + postcss-merge-longhand@7.0.4(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - stylehacks: 7.0.4(postcss@8.5.3) + stylehacks: 7.0.4(postcss@8.5.4) - postcss-merge-rules@7.0.4(postcss@8.5.3): + postcss-merge-rules@7.0.4(postcss@8.5.4): dependencies: browserslist: 4.24.2 caniuse-api: 3.0.0 - cssnano-utils: 5.0.0(postcss@8.5.3) - postcss: 8.5.3 + cssnano-utils: 5.0.0(postcss@8.5.4) + postcss: 8.5.4 postcss-selector-parser: 6.1.2 - postcss-minify-font-values@7.0.0(postcss@8.5.3): + postcss-minify-font-values@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-minify-gradients@7.0.0(postcss@8.5.3): + postcss-minify-gradients@7.0.0(postcss@8.5.4): dependencies: colord: 2.9.3 - cssnano-utils: 5.0.0(postcss@8.5.3) - postcss: 8.5.3 + cssnano-utils: 5.0.0(postcss@8.5.4) + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-minify-params@7.0.2(postcss@8.5.3): + postcss-minify-params@7.0.2(postcss@8.5.4): dependencies: browserslist: 4.24.2 - cssnano-utils: 5.0.0(postcss@8.5.3) - postcss: 8.5.3 + cssnano-utils: 5.0.0(postcss@8.5.4) + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-minify-selectors@7.0.4(postcss@8.5.3): + postcss-minify-selectors@7.0.4(postcss@8.5.4): dependencies: cssesc: 3.0.0 - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.1.2 - postcss-modules-extract-imports@3.1.0(postcss@8.5.3): + postcss-modules-extract-imports@3.1.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 - postcss-modules-local-by-default@4.0.5(postcss@8.5.3): + postcss-modules-local-by-default@4.0.5(postcss@8.5.4): dependencies: - icss-utils: 5.1.0(postcss@8.5.3) - postcss: 8.5.3 + icss-utils: 5.1.0(postcss@8.5.4) + postcss: 8.5.4 postcss-selector-parser: 6.0.16 postcss-value-parser: 4.2.0 - postcss-modules-scope@3.2.0(postcss@8.5.3): + postcss-modules-scope@3.2.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.0.16 - postcss-modules-values@4.0.0(postcss@8.5.3): + postcss-modules-values@4.0.0(postcss@8.5.4): dependencies: - icss-utils: 5.1.0(postcss@8.5.3) - postcss: 8.5.3 + icss-utils: 5.1.0(postcss@8.5.4) + postcss: 8.5.4 - postcss-normalize-charset@7.0.0(postcss@8.5.3): + postcss-normalize-charset@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 - postcss-normalize-display-values@7.0.0(postcss@8.5.3): + postcss-normalize-display-values@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-positions@7.0.0(postcss@8.5.3): + postcss-normalize-positions@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-repeat-style@7.0.0(postcss@8.5.3): + postcss-normalize-repeat-style@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-string@7.0.0(postcss@8.5.3): + postcss-normalize-string@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-timing-functions@7.0.0(postcss@8.5.3): + postcss-normalize-timing-functions@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-unicode@7.0.2(postcss@8.5.3): + postcss-normalize-unicode@7.0.2(postcss@8.5.4): dependencies: browserslist: 4.24.2 - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-url@7.0.0(postcss@8.5.3): + postcss-normalize-url@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-normalize-whitespace@7.0.0(postcss@8.5.3): + postcss-normalize-whitespace@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-ordered-values@7.0.1(postcss@8.5.3): + postcss-ordered-values@7.0.1(postcss@8.5.4): dependencies: - cssnano-utils: 5.0.0(postcss@8.5.3) - postcss: 8.5.3 + cssnano-utils: 5.0.0(postcss@8.5.4) + postcss: 8.5.4 postcss-value-parser: 4.2.0 - postcss-reduce-initial@7.0.2(postcss@8.5.3): + postcss-reduce-initial@7.0.2(postcss@8.5.4): dependencies: browserslist: 4.24.2 caniuse-api: 3.0.0 - postcss: 8.5.3 + postcss: 8.5.4 - postcss-reduce-transforms@7.0.0(postcss@8.5.3): + postcss-reduce-transforms@7.0.0(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 postcss-selector-parser@6.0.16: @@ -8541,15 +8548,15 @@ snapshots: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-svgo@7.0.1(postcss@8.5.3): + postcss-svgo@7.0.1(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-value-parser: 4.2.0 svgo: 3.3.2 - postcss-unique-selectors@7.0.3(postcss@8.5.3): + postcss-unique-selectors@7.0.3(postcss@8.5.4): dependencies: - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.1.2 postcss-value-parser@4.2.0: {} @@ -8560,9 +8567,9 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - postcss@8.5.3: + postcss@8.5.4: dependencies: - nanoid: 3.3.8 + nanoid: 3.3.11 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -8669,13 +8676,13 @@ snapshots: transitivePeerDependencies: - supports-color - react-router-dom@7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + react-router-dom@7.6.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) - react-router: 7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + react-router: 7.6.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0) - react-router@7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + react-router@7.6.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: cookie: 1.0.2 react: 19.1.0 @@ -9038,10 +9045,10 @@ snapshots: '@styled-system/variant': 5.1.5 object-assign: 4.1.1 - stylehacks@7.0.4(postcss@8.5.3): + stylehacks@7.0.4(postcss@8.5.4): dependencies: browserslist: 4.24.2 - postcss: 8.5.3 + postcss: 8.5.4 postcss-selector-parser: 6.1.2 stylis@4.3.2: {} @@ -9080,7 +9087,7 @@ snapshots: tailwind-merge@3.3.0: {} - tailwindcss@4.1.7: {} + tailwindcss@4.1.8: {} tapable@2.2.1: {} @@ -9186,12 +9193,12 @@ snapshots: dependencies: utf8-byte-length: 1.0.4 - ts-jest@29.3.4(@babel/core@7.24.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(typescript@5.8.3): + ts-jest@29.3.4(@babel/core@7.24.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@22.15.21)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)) + jest: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3)) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -9216,14 +9223,14 @@ snapshots: typescript: 5.8.3 webpack: 5.99.9(webpack-cli@6.0.1) - ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3): + ts-node@10.9.2(@types/node@22.15.30)(typescript@5.8.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 22.15.21 + '@types/node': 22.15.30 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 diff --git a/src/main/main.ts b/src/main/index.ts similarity index 100% rename from src/main/main.ts rename to src/main/index.ts diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx index e4d669b6d..0a9d7d7d6 100644 --- a/src/renderer/components/settings/SystemSettings.test.tsx +++ b/src/renderer/components/settings/SystemSettings.test.tsx @@ -149,7 +149,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { expect(screen.getByTestId('settings-volume-group')).not.toBeVisible(); }); - it('should increase playSound volume', async () => { + it('should increase notification volume', async () => { render( { expect(updateSetting).toHaveBeenCalledWith('notificationVolume', 30); }); - it('should decrease playSound volume', async () => { + it('should decrease notification volume', async () => { render( { expect(updateSetting).toHaveBeenCalledWith('notificationVolume', 10); }); - it('should reset playSound volume', async () => { + it('should reset notification volume', async () => { render( { onClick={() => { const newVolume = Math.max( settings.notificationVolume - 10, - 0, + 10, ); updateSetting('notificationVolume', newVolume); }} diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts index 06486b268..3bc6dfd78 100644 --- a/src/renderer/utils/notifications/filters/filter.test.ts +++ b/src/renderer/utils/notifications/filters/filter.test.ts @@ -123,50 +123,50 @@ describe('renderer/utils/notifications/filters/filter.ts', () => { }); it('non-default user type filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterUserTypes: ['Bot'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); it('non-default user handle includes filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterIncludeHandles: ['gitify'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); it('non-default user handle excludes filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterExcludeHandles: ['gitify'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); it('non-default subject type filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterSubjectTypes: ['Issue'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); it('non-default state filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterStates: ['draft', 'merged'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); it('non-default reason filters', () => { - const settings = { + const settings: SettingsState = { ...defaultSettings, filterReasons: ['subscribed', 'manual'], - } as SettingsState; + }; expect(hasAnyFiltersSet(settings)).toBe(true); }); }); diff --git a/src/renderer/utils/notifications/native.test.ts b/src/renderer/utils/notifications/native.test.ts index 6e33703aa..3edebd3e7 100644 --- a/src/renderer/utils/notifications/native.test.ts +++ b/src/renderer/utils/notifications/native.test.ts @@ -10,91 +10,102 @@ import * as comms from '../comms'; import * as links from '../links'; import * as native from './native'; +const raiseNativeNotificationMock = jest.spyOn( + native, + 'raiseNativeNotification', +); +const raiseSoundNotificationMock = jest.spyOn(native, 'raiseSoundNotification'); + describe('renderer/utils/notifications/native.ts', () => { afterEach(() => { jest.clearAllMocks(); }); describe('triggerNativeNotifications', () => { - it('should raise a native notification (settings - on)', () => { + it('should raise a native notification and play sound for a single new notification', () => { const settings: SettingsState = { ...defaultSettings, playSound: true, showNotifications: true, }; - jest.spyOn(native, 'raiseNativeNotification'); - jest.spyOn(native, 'raiseSoundNotification'); - - native.triggerNativeNotifications([], mockAccountNotifications, { + native.triggerNativeNotifications([], mockSingleAccountNotifications, { auth: mockAuth, settings, }); - expect(native.raiseNativeNotification).toHaveBeenCalledTimes(1); - expect(native.raiseSoundNotification).toHaveBeenCalledTimes(1); + expect(raiseNativeNotificationMock).toHaveBeenCalledTimes(1); + + expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1); + expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2); }); - it('should not raise a native notification (settings - off)', () => { - const settings = { + it('should raise a native notification and play sound for multiple new notifications', () => { + const settings: SettingsState = { ...defaultSettings, - playSound: false, - showNotifications: false, + playSound: true, + showNotifications: true, }; - jest.spyOn(native, 'raiseNativeNotification'); - jest.spyOn(native, 'raiseSoundNotification'); - native.triggerNativeNotifications([], mockAccountNotifications, { auth: mockAuth, settings, }); - expect(native.raiseNativeNotification).not.toHaveBeenCalled(); - expect(native.raiseSoundNotification).not.toHaveBeenCalled(); + expect(raiseNativeNotificationMock).toHaveBeenCalledTimes(1); + + expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1); + expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2); }); - it('should not raise a native notification or play a sound (no new notifications)', () => { - const settings = { + it('should not raise a native notification or play a sound when there are no new notifications', () => { + const settings: SettingsState = { ...defaultSettings, playSound: true, showNotifications: true, }; - jest.spyOn(native, 'raiseNativeNotification'); - jest.spyOn(native, 'raiseSoundNotification'); - native.triggerNativeNotifications( mockSingleAccountNotifications, mockSingleAccountNotifications, - { auth: mockAuth, settings }, + { + auth: mockAuth, + settings, + }, ); - expect(native.raiseNativeNotification).not.toHaveBeenCalled(); - expect(native.raiseSoundNotification).not.toHaveBeenCalled(); + expect(raiseNativeNotificationMock).not.toHaveBeenCalled(); + expect(raiseSoundNotificationMock).not.toHaveBeenCalled(); }); - it('should not raise a native notification (because of 0(zero) notifications)', () => { - const settings = { + it('should not raise a native notification or play a sound when there are zero notifications', () => { + const settings: SettingsState = { ...defaultSettings, playSound: true, showNotifications: true, }; - jest.spyOn(native, 'raiseNativeNotification'); - jest.spyOn(native, 'raiseSoundNotification'); - native.triggerNativeNotifications([], [], { auth: mockAuth, settings, }); - native.triggerNativeNotifications([], [], { + + expect(raiseNativeNotificationMock).not.toHaveBeenCalled(); + expect(raiseSoundNotificationMock).not.toHaveBeenCalled(); + }); + + it('should not raise a native notification when setting disabled', () => { + const settings: SettingsState = { + ...defaultSettings, + showNotifications: false, + }; + + native.triggerNativeNotifications([], mockAccountNotifications, { auth: mockAuth, settings, }); - expect(native.raiseNativeNotification).not.toHaveBeenCalled(); - expect(native.raiseSoundNotification).not.toHaveBeenCalled(); + expect(raiseNativeNotificationMock).not.toHaveBeenCalled(); }); }); @@ -126,41 +137,4 @@ describe('renderer/utils/notifications/native.ts', () => { expect(showWindowMock).toHaveBeenCalledTimes(1); }); }); - - describe('raiseSoundNotification', () => { - it('should play a sound', () => { - jest.spyOn(window.Audio.prototype, 'play'); - native.raiseSoundNotification(); - expect(window.Audio.prototype.play).toHaveBeenCalledTimes(1); - }); - }); - - describe('triggerNativeNotifications', () => { - afterEach(() => { - jest.clearAllMocks(); - }); - - it('should raise only sound notification with correct volume', () => { - const settings: SettingsState = { - ...defaultSettings, - playSound: true, - showNotifications: false, - notificationVolume: 80, - }; - - const raiseSoundNotificationMock = jest.spyOn( - native, - 'raiseSoundNotification', - ); - jest.spyOn(native, 'raiseNativeNotification'); - - native.triggerNativeNotifications([], mockAccountNotifications, { - auth: mockAuth, - settings, - }); - - expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.8); - expect(native.raiseNativeNotification).not.toHaveBeenCalled(); - }); - }); }); diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts index cce0f4614..b456e8b3a 100644 --- a/src/renderer/utils/notifications/native.ts +++ b/src/renderer/utils/notifications/native.ts @@ -2,7 +2,6 @@ import path from 'node:path'; import { APPLICATION } from '../../../shared/constants'; import { isWindows } from '../../../shared/platform'; -import { defaultSettings } from '../../context/App'; import type { AccountNotifications, GitifyState } from '../../types'; import { Notification } from '../../typesGitHub'; import { getAccountUUID } from '../auth/utils'; @@ -87,9 +86,7 @@ export const raiseNativeNotification = (notifications: Notification[]) => { return nativeNotification; }; -export const raiseSoundNotification = ( - volume = defaultSettings.notificationVolume / 100, -) => { +export const raiseSoundNotification = (volume: number) => { const audio = new Audio( path.join( __dirname,