From 5d94a6816ca62e8c4e2698817a41f18244ffd45c Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 23 Mar 2024 07:15:46 +0530 Subject: [PATCH 01/54] Bump up ferdium to 6.7.3-nightly.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7dba461704..0ffe641ede 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.2-nightly.5", + "version": "6.7.3-nightly.0", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 983bfa43b1f8d049c438f28d26d82af89c66b110 Mon Sep 17 00:00:00 2001 From: ferdium-bot <149593933+ferdium-bot@users.noreply.github.com> Date: Sun, 24 Mar 2024 00:24:31 +0100 Subject: [PATCH 02/54] feat(i18n): new Crowdin updates (#1604) feat(i18n): New Crowdin translations (Russian) [skip ci] --- src/i18n/locales/ru.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 317b1eda2a..c19f8c65f1 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -63,6 +63,8 @@ "locked.submit.label": "Разблокировать", "locked.touchId": "Разблокировать с Touch ID", "locked.unlockWithPassword": "Разблокировать паролем", + "login.changeServer": "Изменить здесь!", + "login.changeServerMessage": "Вы используете {serverNameParse} сервер, вы хотите переключиться?", "login.customServerQuestion": "Использовать пользовательский сервер Ferdium?", "login.email.label": "Адрес электронной почты", "login.headline": "Вход", From d6217ff91be9d6c2d8a5bb93ac8bded20e7abee1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 24 Mar 2024 00:48:00 +0000 Subject: [PATCH 03/54] Update browserslist data updates and linter fixes [skip ci] --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd1c51f73c..12f2b21392 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4612,7 +4612,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001599 + caniuse-lite: 1.0.30001600 electron-to-chromium: 1.4.710 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) @@ -4868,8 +4868,8 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001599: - resolution: {integrity: sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==} + /caniuse-lite@1.0.30001600: + resolution: {integrity: sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==} /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} From da74f6aa402f560518869735466487c762658efa Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 24 Mar 2024 00:48:02 +0000 Subject: [PATCH 04/54] 6.7.3-nightly.1 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ffe641ede..3bcbad54a0 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.0", + "version": "6.7.3-nightly.1", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From cd754fcac676ee615ccd313682f2fe7fbdb70a59 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 28 Mar 2024 06:58:37 +0530 Subject: [PATCH 05/54] Upgrade electron to '29.1.6' --- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3bcbad54a0..38edd2afe8 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ "chalk": "5.3.0", "concurrently": "8.2.2", "cross-env": "7.0.3", - "electron": "29.1.5", + "electron": "29.1.6", "electron-builder": "24.13.3", "esbuild": "0.16.17", "esbuild-plugin-copy": "2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 12f2b21392..c3252c82e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ dependencies: version: 5.1.0 '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@29.1.5) + version: 2.1.2(electron@29.1.6) '@emotion/react': specifier: 11.11.4 version: 11.11.4(@types/react@18.2.67)(react@18.2.0) @@ -55,7 +55,7 @@ dependencies: version: 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0) '@krisdages/electron-process-manager': specifier: 3.0.0 - version: 3.0.0(@electron/remote@2.1.2)(electron@29.1.5)(rxjs@7.8.1) + version: 3.0.0(@electron/remote@2.1.2)(electron@29.1.6)(rxjs@7.8.1) '@mdi/js': specifier: 7.4.47 version: 7.4.47 @@ -355,8 +355,8 @@ devDependencies: specifier: 7.0.3 version: 7.0.3 electron: - specifier: 29.1.5 - version: 29.1.5 + specifier: 29.1.6 + version: 29.1.6 electron-builder: specifier: 24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3) @@ -1496,12 +1496,12 @@ packages: - supports-color dev: true - /@electron/remote@2.1.2(electron@29.1.5): + /@electron/remote@2.1.2(electron@29.1.6): resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 29.1.5 + electron: 29.1.6 dev: false /@electron/universal@1.5.1: @@ -2346,15 +2346,15 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.1.5)(rxjs@7.8.1): + /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.1.6)(rxjs@7.8.1): resolution: {integrity: sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==} peerDependencies: '@electron/remote': '>= 1.2.0' electron: '>= 10' rxjs: '>= 7' dependencies: - '@electron/remote': 2.1.2(electron@29.1.5) - electron: 29.1.5 + '@electron/remote': 2.1.2(electron@29.1.6) + electron: 29.1.6 electron-process-reporter: /@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0(rxjs@7.8.1) rxjs: 7.8.1 dev: false @@ -6098,8 +6098,8 @@ packages: mkdirp: 0.5.6 dev: false - /electron@29.1.5: - resolution: {integrity: sha512-1uWGRw/ffA62lcrklxGUgVxVtOHojsg/nwsYr+/F9cVjipZJn8iPv/ABGIIexhmUqWcho8BqfTJ4osCBa29gBg==} + /electron@29.1.6: + resolution: {integrity: sha512-UIYfpHR9gRBFKHyejHuXUVQ7nNzZRnoPVOHlijkvqR+DSLwgJ2ZcVVt0LNduNeO8PhPkY1+6kHonL52OTC1cOw==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true From 53c72ea5ac4f103291fdd347b7cd9cc0dbafa4b5 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Thu, 28 Mar 2024 10:12:05 +0000 Subject: [PATCH 06/54] Bring in missing python (system dependency) (#1639) * Introduce python as a system dependency (needed by node-gyp to compile native modules) * Introduce node-pre-gyp as a dependency * Upgrade sqlite3 to 5.1.7 to test the above Note: Currently this still depends on the availability of prebuilt binaries from the prebuild library. Which means that once a new version is available, only then will we know if this python/node-gyp integration works or whether it will still fallback to the availability of the prebuilt binaries from external sources. Only time will tell if we have solved the issue or not. --- .github/workflows/builds.yml | 9 +++ .python-version | 1 + CONTRIBUTING.md | 11 ++- Dockerfile | 2 +- package.json | 9 ++- pnpm-lock.yaml | 145 +++++++++++++++++++++++++++-------- scripts/build-unix.sh | 19 +++-- scripts/build-windows.ps1 | 2 +- 8 files changed, 152 insertions(+), 46 deletions(-) create mode 100644 .python-version diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 6ad31da9ee..1788e42d90 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -55,6 +55,9 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' + - name: Use python specified in the '.python-version' file + uses: actions/setup-python@v5 + if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} - name: Install node dependencies if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} uses: nick-fields/retry@v3 @@ -177,6 +180,8 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' + - name: Use python specified in the '.python-version' file + uses: actions/setup-python@v5 - name: Install node dependencies uses: nick-fields/retry@v3 with: @@ -256,6 +261,8 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' + - name: Use python specified in the '.python-version' file + uses: actions/setup-python@v5 - name: Install node dependencies uses: nick-fields/retry@v3 with: @@ -356,6 +363,8 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' + - name: Use python specified in the '.python-version' file + uses: actions/setup-python@v5 #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved - name: Tweak pnpm.cjs run: | diff --git a/.python-version b/.python-version new file mode 100644 index 0000000000..b6d8b7612f --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.11.8 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 887a72a5a3..7530684348 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ - [How can I contribute?](#how-can-i-contribute) - [Setting up your development machine](#setting-up-your-development-machine) - [Install system-level dependencies](#install-system-level-dependencies) - - [Node.js, pnpm](#nodejs-pnpm) + - [Node.js, pnpm, python](#nodejs-pnpm-python) - [Git](#git) - [On Debian/Ubuntu](#on-debianubuntu) - [On Fedora](#on-fedora) @@ -52,7 +52,7 @@ If so, engage in the already existing discussion. _Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile). -#### Node.js, pnpm +#### Node.js, pnpm, python Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files. @@ -63,11 +63,14 @@ Currently, these are the combinations of system dependencies that work for MacOS $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json { "node": "20.11.1", - "pnpm": "8.15.5" + "pnpm": "8.15.5", + "python": "3.11.8" } ``` -_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). +Python is only/mainly required to compile any dependencies for which the binary is not found, and we have to resort to compiling from source (for eg sqlite3) + +_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [mise](https://github.com/jdx/mise). #### Git diff --git a/Dockerfile b/Dockerfile index 83baba00bb..ffb309bfb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true # Note: 'fpm' is needed for building on ARM machines RUN apt-get update -y \ - && apt-get install --no-install-recommends -y rpm ruby gem \ + && apt-get install --no-install-recommends -y python3 rpm ruby gem \ && gem install dotenv -v 2.8.1 --no-ri --no-rdoc --no-document \ && gem install fpm --no-ri --no-rdoc --no-document diff --git a/package.json b/package.json index 38edd2afe8..e3e0507b16 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,14 @@ "private": true, "engines": { "node": "20.11.1", - "pnpm": "8.15.5" + "pnpm": "8.15.5", + "python": "3.11.8" }, "engine-strict": true, "volta": { "node": "20.11.1", - "pnpm": "8.15.5" + "pnpm": "8.15.5", + "python": "3.11.8" }, "packageManager": "pnpm@8.15.5", "scripts": { @@ -127,7 +129,7 @@ "route-parser": "0.0.5", "sanitize-filename": "1.6.3", "semver": "7.6.0", - "sqlite3": "5.1.6", + "sqlite3": "5.1.7", "tar": "6.2.0", "tslib": "2.6.2", "useragent-generator": "1.1.1-amkt-22079-finish.0", @@ -141,6 +143,7 @@ "@electron/notarize": "1.2.3", "@formatjs/cli": "6.2.7", "@jest/types": "29.6.3", + "@mapbox/node-pre-gyp": "1.0.11", "@types/auto-launch": "5.0.5", "@types/color": "3.0.6", "@types/fs-extra": "11.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3252c82e4..fc59687eb6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ dependencies: version: 2.0.8 '@adonisjs/lucid': specifier: 6.3.0 - version: 6.3.0(sqlite3@5.1.6) + version: 6.3.0(sqlite3@5.1.7) '@adonisjs/session': specifier: 1.1.0 version: 1.1.0 @@ -237,8 +237,8 @@ dependencies: specifier: 7.6.0 version: 7.6.0 sqlite3: - specifier: 5.1.6 - version: 5.1.6 + specifier: 5.1.7 + version: 5.1.7 tar: specifier: 6.2.0 version: 6.2.0 @@ -282,6 +282,9 @@ devDependencies: '@jest/types': specifier: 29.6.3 version: 29.6.3 + '@mapbox/node-pre-gyp': + specifier: 1.0.11 + version: 1.0.11 '@types/auto-launch': specifier: 5.0.5 version: 5.0.5 @@ -585,13 +588,13 @@ packages: - supports-color dev: false - /@adonisjs/lucid@6.3.0(sqlite3@5.1.6): + /@adonisjs/lucid@6.3.0(sqlite3@5.1.7): resolution: {integrity: sha512-4LNUAh/ruU2I0xIwwugrqbFPDB5xGZYPPWzODt3QAQhDhws76T/+HDuZmCdngzE0QC1Vi9Nd1Uqejgliq1N0Dg==} dependencies: '@adonisjs/generic-exceptions': 2.0.1 chance: 1.1.9 debug: 4.3.4(supports-color@5.5.0) - knex: 0.21.21(sqlite3@5.1.6) + knex: 0.21.21(sqlite3@5.1.7) lodash: 4.17.21 moment: 2.30.1 pluralize: 8.0.0 @@ -2417,7 +2420,7 @@ packages: transitivePeerDependencies: - encoding - supports-color - dev: false + dev: true /@mdi/js@7.4.47: resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==} @@ -3542,7 +3545,6 @@ packages: /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} requiresBuild: true - dev: false /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} @@ -4013,7 +4015,6 @@ packages: /aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} requiresBuild: true - dev: false /archiver-utils@2.1.0: resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} @@ -4066,7 +4067,7 @@ packages: dependencies: delegates: 1.0.0 readable-stream: 3.6.2 - dev: false + dev: true /are-we-there-yet@3.0.1: resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} @@ -4522,7 +4523,6 @@ packages: dependencies: file-uri-to-path: 1.0.0 dev: false - optional: true /bl@1.2.3: resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} @@ -4537,7 +4537,6 @@ packages: buffer: 5.7.1 inherits: 2.0.4 readable-stream: 3.6.2 - dev: true /bluebird-lst@1.0.9: resolution: {integrity: sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==} @@ -4935,6 +4934,10 @@ packages: fsevents: 2.3.3 dev: true + /chownr@1.1.4: + resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} + dev: false + /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -5262,7 +5265,6 @@ packages: /console-control-strings@1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} requiresBuild: true - dev: false /content-disposition@0.5.4: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} @@ -5702,6 +5704,11 @@ packages: optional: true dev: true + /deep-extend@0.6.0: + resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} + engines: {node: '>=4.0.0'} + dev: false + /deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} dev: true @@ -5797,7 +5804,6 @@ packages: /delegates@1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} requiresBuild: true - dev: false /depd@1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} @@ -5835,7 +5841,6 @@ packages: /detect-libc@2.0.1: resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==} engines: {node: '>=8'} - dev: false /detect-newline@3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} @@ -7054,6 +7059,11 @@ packages: - supports-color dev: false + /expand-template@2.0.3: + resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} + engines: {node: '>=6'} + dev: false + /expand-tilde@2.0.2: resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==} engines: {node: '>=0.10.0'} @@ -7291,7 +7301,6 @@ packages: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} requiresBuild: true dev: false - optional: true /filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -7573,7 +7582,7 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wide-align: 1.1.5 - dev: false + dev: true /gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} @@ -7689,6 +7698,10 @@ packages: split2: 4.2.0 dev: true + /github-from-package@0.0.0: + resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==} + dev: false + /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -7931,7 +7944,6 @@ packages: /has-unicode@2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} requiresBuild: true - dev: false /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} @@ -9650,7 +9662,7 @@ packages: engines: {node: '>=6'} dev: false - /knex@0.21.21(sqlite3@5.1.6): + /knex@0.21.21(sqlite3@5.1.7): resolution: {integrity: sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A==} engines: {node: '>=10'} hasBin: true @@ -9681,7 +9693,7 @@ packages: liftoff: 3.1.0 lodash: 4.17.21 pg-connection-string: 2.4.0 - sqlite3: 5.1.6 + sqlite3: 5.1.7 tarn: 3.0.2 tildify: 2.0.0 v8flags: 3.2.0 @@ -10001,6 +10013,7 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.1 + dev: true /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} @@ -10355,6 +10368,10 @@ packages: is-extendable: 0.1.1 dev: false + /mkdirp-classic@0.5.3: + resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} + dev: false + /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -10487,6 +10504,10 @@ packages: - supports-color dev: false + /napi-build-utils@1.0.2: + resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} + dev: false + /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -10504,6 +10525,13 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: false + /node-abi@3.56.0: + resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==} + engines: {node: '>=10'} + dependencies: + semver: 7.6.0 + dev: false + /node-addon-api@1.7.2: resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==} requiresBuild: true @@ -10522,8 +10550,9 @@ packages: dev: false optional: true - /node-addon-api@4.3.0: - resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} + /node-addon-api@7.1.0: + resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==} + engines: {node: ^16 || ^18 || >= 20} dev: false /node-cookie@2.1.2: @@ -10558,6 +10587,7 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 + dev: true /node-guard@1.0.0: resolution: {integrity: sha512-LX911hOl63/YBO3Skl/jQ9QQG+lE++66xaF9/lg7G02bBpdgHMmSdMK5+jgo7p/3i5hn4fGOipX3Ko17Yzfi2w==} @@ -10655,7 +10685,6 @@ packages: requiresBuild: true dependencies: abbrev: 1.1.1 - dev: false /nopt@6.0.0: resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} @@ -10709,7 +10738,7 @@ packages: console-control-strings: 1.1.0 gauge: 3.0.2 set-blocking: 2.0.0 - dev: false + dev: true /npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} @@ -11194,6 +11223,25 @@ packages: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: false + /prebuild-install@7.1.2: + resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} + engines: {node: '>=10'} + hasBin: true + dependencies: + detect-libc: 2.0.1 + expand-template: 2.0.3 + github-from-package: 0.0.0 + minimist: 1.2.8 + mkdirp-classic: 0.5.3 + napi-build-utils: 1.0.2 + node-abi: 3.56.0 + pump: 3.0.0 + rc: 1.2.8 + simple-get: 4.0.1 + tar-fs: 2.1.1 + tunnel-agent: 0.6.0 + dev: false + /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -11618,6 +11666,16 @@ packages: react-is: 16.13.1 dev: false + /rc@1.2.8: + resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} + hasBin: true + dependencies: + deep-extend: 0.6.0 + ini: 1.3.8 + minimist: 1.2.8 + strip-json-comments: 2.0.1 + dev: false + /react-color@2.19.3(react@18.2.0): resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==} peerDependencies: @@ -12643,6 +12701,10 @@ packages: requiresBuild: true dev: true + /simple-concat@1.0.1: + resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} + dev: false + /simple-encryptor@2.0.0: resolution: {integrity: sha512-dqjQbp9RwfMrE+my/7Pgz9viIsHmY3aQtybGJQkv2sL79YuDGmkxUjlmEBFGP6bcUjBRnSvqsBAcv1ro0Y4/5A==} dependencies: @@ -12656,6 +12718,14 @@ packages: scmp: 2.0.0 dev: false + /simple-get@4.0.1: + resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} + dependencies: + decompress-response: 6.0.0 + once: 1.4.0 + simple-concat: 1.0.1 + dev: false + /simple-git@3.23.0: resolution: {integrity: sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==} dependencies: @@ -12885,18 +12955,18 @@ packages: requiresBuild: true optional: true - /sqlite3@5.1.6: - resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==} + /sqlite3@5.1.7: + resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==} requiresBuild: true dependencies: - '@mapbox/node-pre-gyp': 1.0.11 - node-addon-api: 4.3.0 + bindings: 1.5.0 + node-addon-api: 7.1.0 + prebuild-install: 7.1.2 tar: 6.2.0 optionalDependencies: node-gyp: 8.4.1 transitivePeerDependencies: - bluebird - - encoding - supports-color dev: false @@ -13150,6 +13220,11 @@ packages: min-indent: 1.0.1 dev: true + /strip-json-comments@2.0.1: + resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} + engines: {node: '>=0.10.0'} + dev: false + /strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -13244,6 +13319,15 @@ packages: acorn-node: 1.8.2 dev: false + /tar-fs@2.1.1: + resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} + dependencies: + chownr: 1.1.4 + mkdirp-classic: 0.5.3 + pump: 3.0.0 + tar-stream: 2.2.0 + dev: false + /tar-stream@1.6.2: resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} engines: {node: '>= 0.8.0'} @@ -13266,7 +13350,6 @@ packages: fs-constants: 1.0.0 inherits: 2.0.4 readable-stream: 3.6.2 - dev: true /tar@6.2.0: resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} @@ -13482,6 +13565,7 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + dev: true /tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} @@ -14031,6 +14115,7 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + dev: true /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} @@ -14051,6 +14136,7 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 + dev: true /which-boxed-primitive@1.0.2: resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} @@ -14135,7 +14221,6 @@ packages: requiresBuild: true dependencies: string-width: 4.2.3 - dev: false /window-size@1.1.1: resolution: {integrity: sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==} diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index 04aa9e70f2..f485f90874 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh @@ -3,7 +3,7 @@ # INTRO: # This file is used to build ferdium on both x64 and arm-based for macos and linux (not tested on arm for linux). # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) -# It will install the system dependencies except for node (which is still verified) +# It will install the system dependencies except for node and python (which are still verified) # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently # This file can live anywhere in your PATH @@ -32,6 +32,7 @@ command_exists() { # Checking the developer environment # Check for installed programmes command_exists node || fail_with_docs "Node is not installed" +command_exists python || fail_with_docs "python is not installed" # Check node version EXPECTED_NODE_VERSION=$(cat .nvmrc) @@ -42,6 +43,15 @@ if [ "v$EXPECTED_NODE_VERSION" != "$ACTUAL_NODE_VERSION" ]; then actual : [$ACTUAL_NODE_VERSION]" fi +# Check python version +EXPECTED_PYTHON_VERSION=$(node -p 'require("./package.json").engines.python') +ACTUAL_PYTHON_VERSION=$(python --version | sed -e "s/Python //") +if [[ "$ACTUAL_PYTHON_VERSION" != "$EXPECTED_PYTHON_VERSION" ]]; then + fail_with_docs "You are not running the expected version of Python! + expected: [$EXPECTED_PYTHON_VERSION] + actual : [$ACTUAL_PYTHON_VERSION]" +fi + # Check if the 'recipes' folder is present either as a git submodule or a symbolic link if ! [ -f "recipes/package.json" ]; then fail_with_docs "'recipes' folder is missing or submodule has not been checked out" @@ -68,7 +78,7 @@ else fi npm cache clean --force - rm -rf ~/.npm ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/ + rm -rf ~/.npm ~/.electron-gyp git -C recipes clean -fxd # Clean recipes folder/submodule git clean -fxd # Note: This will blast away the 'recipes' folder if you have symlinked it @@ -79,8 +89,6 @@ fi # ----------------------------------------------------------------------------- # Ensure that the system dependencies are at the correct version - recover if not -# If 'asdf' is installed, reshim for new nodejs if necessary -command_exists asdf && asdf reshim nodejs # Ensure that the system dependencies are at the correct version # Check pnpm version @@ -99,9 +107,6 @@ if [[ "$EXPECTED_PNPM_VERSION" != "$EXPECTED_RECIPES_PNPM_VERSION" ]]; then actual : [$EXPECTED_PNPM_VERSION]" fi -# If 'asdf' is installed, reshim for new nodejs if necessary -command_exists asdf && asdf reshim nodejs - # ----------------------------------------------------------------------------- printf "\n*************** Building recipes ***************\n" pushd recipes diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 5da7df5409..02289d172a 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 @@ -1,7 +1,7 @@ # INTRO: # This file is used to build ferdium on windows. # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) -# It will install the system dependencies except for node (which is still verified) +# It will install the system dependencies except for node and python (which are still verified) # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently # This file can live anywhere in your PATH From 04aa0b927212c123f233ebca05462c1b656abd0f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Mar 2024 00:42:56 +0000 Subject: [PATCH 07/54] 6.7.3-nightly.2 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3e0507b16..2240e683a7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.1", + "version": "6.7.3-nightly.2", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 2bf74cc884b0a1bc0c4c1f7a96444ae211d6b84f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 28 Mar 2024 21:09:09 +0530 Subject: [PATCH 08/54] Remove node-pre-gyp since sqlite3 has moved away from it --- package.json | 1 - pnpm-lock.yaml | 68 +++++++++++--------------------------------------- 2 files changed, 15 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 2240e683a7..48453e64db 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,6 @@ "@electron/notarize": "1.2.3", "@formatjs/cli": "6.2.7", "@jest/types": "29.6.3", - "@mapbox/node-pre-gyp": "1.0.11", "@types/auto-launch": "5.0.5", "@types/color": "3.0.6", "@types/fs-extra": "11.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc59687eb6..c900a412a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -282,9 +282,6 @@ devDependencies: '@jest/types': specifier: 29.6.3 version: 29.6.3 - '@mapbox/node-pre-gyp': - specifier: 1.0.11 - version: 1.0.11 '@types/auto-launch': specifier: 5.0.5 version: 5.0.5 @@ -2404,24 +2401,6 @@ packages: - supports-color dev: true - /@mapbox/node-pre-gyp@1.0.11: - resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} - hasBin: true - dependencies: - detect-libc: 2.0.1 - https-proxy-agent: 5.0.1 - make-dir: 3.1.0 - node-fetch: 2.6.11 - nopt: 5.0.0 - npmlog: 5.0.1 - rimraf: 3.0.2 - semver: 7.6.0 - tar: 6.2.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - /@mdi/js@7.4.47: resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==} dev: false @@ -3545,6 +3524,8 @@ packages: /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} requiresBuild: true + dev: false + optional: true /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} @@ -4015,6 +3996,8 @@ packages: /aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} requiresBuild: true + dev: false + optional: true /archiver-utils@2.1.0: resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} @@ -4061,14 +4044,6 @@ packages: zip-stream: 4.1.1 dev: true - /are-we-there-yet@2.0.0: - resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} - engines: {node: '>=10'} - dependencies: - delegates: 1.0.0 - readable-stream: 3.6.2 - dev: true - /are-we-there-yet@3.0.1: resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -5265,6 +5240,8 @@ packages: /console-control-strings@1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} requiresBuild: true + dev: false + optional: true /content-disposition@0.5.4: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} @@ -5804,6 +5781,8 @@ packages: /delegates@1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} requiresBuild: true + dev: false + optional: true /depd@1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} @@ -5841,6 +5820,7 @@ packages: /detect-libc@2.0.1: resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==} engines: {node: '>=8'} + dev: false /detect-newline@3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} @@ -7569,21 +7549,6 @@ packages: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} dev: true - /gauge@3.0.2: - resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} - engines: {node: '>=10'} - dependencies: - aproba: 2.0.0 - color-support: 1.1.3 - console-control-strings: 1.1.0 - has-unicode: 2.0.1 - object-assign: 4.1.1 - signal-exit: 3.0.7 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wide-align: 1.1.5 - dev: true - /gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -7944,6 +7909,8 @@ packages: /has-unicode@2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} requiresBuild: true + dev: false + optional: true /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} @@ -10685,6 +10652,8 @@ packages: requiresBuild: true dependencies: abbrev: 1.1.1 + dev: false + optional: true /nopt@6.0.0: resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} @@ -10731,15 +10700,6 @@ packages: path-key: 4.0.0 dev: true - /npmlog@5.0.1: - resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} - dependencies: - are-we-there-yet: 2.0.0 - console-control-strings: 1.1.0 - gauge: 3.0.2 - set-blocking: 2.0.0 - dev: true - /npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -14221,6 +14181,8 @@ packages: requiresBuild: true dependencies: string-width: 4.2.3 + dev: false + optional: true /window-size@1.1.1: resolution: {integrity: sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==} From 526b6ac2b3977b1fb31f92dea0998620771d8c6a Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 30 Mar 2024 00:42:00 +0000 Subject: [PATCH 09/54] 6.7.3-nightly.3 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48453e64db..eecb12db5c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.2", + "version": "6.7.3-nightly.3", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From b79a648064bc060795a537d742e1c4ca467c8d0e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 31 Mar 2024 00:46:44 +0000 Subject: [PATCH 10/54] Update submodules [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index 7177ac9abd..7ed7a23adf 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 7177ac9abd0383f601cc43591b53e3540620ca91 +Subproject commit 7ed7a23adf1fd72f006b3b724aa8f000938fc684 From e1dcc004e13e683fc3ddd8f2835f06babd26e8a3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 31 Mar 2024 00:48:14 +0000 Subject: [PATCH 11/54] 6.7.3-nightly.4 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eecb12db5c..73297834c1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.3", + "version": "6.7.3-nightly.4", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 684543c22e66af31bcae302e2b586803339034ff Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sun, 31 Mar 2024 07:19:53 +0530 Subject: [PATCH 12/54] Revert "Bring in missing python (system dependency) (#1639)" Since its causing all builds to fail This reverts commit 53c72ea5ac4f103291fdd347b7cd9cc0dbafa4b5. --- .github/workflows/builds.yml | 9 -- .python-version | 1 - CONTRIBUTING.md | 11 +-- Dockerfile | 2 +- package.json | 8 +- pnpm-lock.yaml | 183 +++++++++++++---------------------- scripts/build-unix.sh | 19 ++-- scripts/build-windows.ps1 | 2 +- 8 files changed, 84 insertions(+), 151 deletions(-) delete mode 100644 .python-version diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 1788e42d90..6ad31da9ee 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -55,9 +55,6 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' - - name: Use python specified in the '.python-version' file - uses: actions/setup-python@v5 - if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} - name: Install node dependencies if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} uses: nick-fields/retry@v3 @@ -180,8 +177,6 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' - - name: Use python specified in the '.python-version' file - uses: actions/setup-python@v5 - name: Install node dependencies uses: nick-fields/retry@v3 with: @@ -261,8 +256,6 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' - - name: Use python specified in the '.python-version' file - uses: actions/setup-python@v5 - name: Install node dependencies uses: nick-fields/retry@v3 with: @@ -363,8 +356,6 @@ jobs: with: node-version-file: '.nvmrc' cache: 'pnpm' - - name: Use python specified in the '.python-version' file - uses: actions/setup-python@v5 #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved - name: Tweak pnpm.cjs run: | diff --git a/.python-version b/.python-version deleted file mode 100644 index b6d8b7612f..0000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.11.8 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7530684348..887a72a5a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ - [How can I contribute?](#how-can-i-contribute) - [Setting up your development machine](#setting-up-your-development-machine) - [Install system-level dependencies](#install-system-level-dependencies) - - [Node.js, pnpm, python](#nodejs-pnpm-python) + - [Node.js, pnpm](#nodejs-pnpm) - [Git](#git) - [On Debian/Ubuntu](#on-debianubuntu) - [On Fedora](#on-fedora) @@ -52,7 +52,7 @@ If so, engage in the already existing discussion. _Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile). -#### Node.js, pnpm, python +#### Node.js, pnpm Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files. @@ -63,14 +63,11 @@ Currently, these are the combinations of system dependencies that work for MacOS $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json { "node": "20.11.1", - "pnpm": "8.15.5", - "python": "3.11.8" + "pnpm": "8.15.5" } ``` -Python is only/mainly required to compile any dependencies for which the binary is not found, and we have to resort to compiling from source (for eg sqlite3) - -_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [mise](https://github.com/jdx/mise). +_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). #### Git diff --git a/Dockerfile b/Dockerfile index ffb309bfb8..83baba00bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true # Note: 'fpm' is needed for building on ARM machines RUN apt-get update -y \ - && apt-get install --no-install-recommends -y python3 rpm ruby gem \ + && apt-get install --no-install-recommends -y rpm ruby gem \ && gem install dotenv -v 2.8.1 --no-ri --no-rdoc --no-document \ && gem install fpm --no-ri --no-rdoc --no-document diff --git a/package.json b/package.json index 73297834c1..40842a6bf8 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,12 @@ "private": true, "engines": { "node": "20.11.1", - "pnpm": "8.15.5", - "python": "3.11.8" + "pnpm": "8.15.5" }, "engine-strict": true, "volta": { "node": "20.11.1", - "pnpm": "8.15.5", - "python": "3.11.8" + "pnpm": "8.15.5" }, "packageManager": "pnpm@8.15.5", "scripts": { @@ -129,7 +127,7 @@ "route-parser": "0.0.5", "sanitize-filename": "1.6.3", "semver": "7.6.0", - "sqlite3": "5.1.7", + "sqlite3": "5.1.6", "tar": "6.2.0", "tslib": "2.6.2", "useragent-generator": "1.1.1-amkt-22079-finish.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c900a412a8..c3252c82e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ dependencies: version: 2.0.8 '@adonisjs/lucid': specifier: 6.3.0 - version: 6.3.0(sqlite3@5.1.7) + version: 6.3.0(sqlite3@5.1.6) '@adonisjs/session': specifier: 1.1.0 version: 1.1.0 @@ -237,8 +237,8 @@ dependencies: specifier: 7.6.0 version: 7.6.0 sqlite3: - specifier: 5.1.7 - version: 5.1.7 + specifier: 5.1.6 + version: 5.1.6 tar: specifier: 6.2.0 version: 6.2.0 @@ -585,13 +585,13 @@ packages: - supports-color dev: false - /@adonisjs/lucid@6.3.0(sqlite3@5.1.7): + /@adonisjs/lucid@6.3.0(sqlite3@5.1.6): resolution: {integrity: sha512-4LNUAh/ruU2I0xIwwugrqbFPDB5xGZYPPWzODt3QAQhDhws76T/+HDuZmCdngzE0QC1Vi9Nd1Uqejgliq1N0Dg==} dependencies: '@adonisjs/generic-exceptions': 2.0.1 chance: 1.1.9 debug: 4.3.4(supports-color@5.5.0) - knex: 0.21.21(sqlite3@5.1.7) + knex: 0.21.21(sqlite3@5.1.6) lodash: 4.17.21 moment: 2.30.1 pluralize: 8.0.0 @@ -2401,6 +2401,24 @@ packages: - supports-color dev: true + /@mapbox/node-pre-gyp@1.0.11: + resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} + hasBin: true + dependencies: + detect-libc: 2.0.1 + https-proxy-agent: 5.0.1 + make-dir: 3.1.0 + node-fetch: 2.6.11 + nopt: 5.0.0 + npmlog: 5.0.1 + rimraf: 3.0.2 + semver: 7.6.0 + tar: 6.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@mdi/js@7.4.47: resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==} dev: false @@ -3525,7 +3543,6 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} requiresBuild: true dev: false - optional: true /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} @@ -3997,7 +4014,6 @@ packages: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} requiresBuild: true dev: false - optional: true /archiver-utils@2.1.0: resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} @@ -4044,6 +4060,14 @@ packages: zip-stream: 4.1.1 dev: true + /are-we-there-yet@2.0.0: + resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} + engines: {node: '>=10'} + dependencies: + delegates: 1.0.0 + readable-stream: 3.6.2 + dev: false + /are-we-there-yet@3.0.1: resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -4498,6 +4522,7 @@ packages: dependencies: file-uri-to-path: 1.0.0 dev: false + optional: true /bl@1.2.3: resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} @@ -4512,6 +4537,7 @@ packages: buffer: 5.7.1 inherits: 2.0.4 readable-stream: 3.6.2 + dev: true /bluebird-lst@1.0.9: resolution: {integrity: sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==} @@ -4909,10 +4935,6 @@ packages: fsevents: 2.3.3 dev: true - /chownr@1.1.4: - resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - dev: false - /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -5241,7 +5263,6 @@ packages: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} requiresBuild: true dev: false - optional: true /content-disposition@0.5.4: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} @@ -5681,11 +5702,6 @@ packages: optional: true dev: true - /deep-extend@0.6.0: - resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} - engines: {node: '>=4.0.0'} - dev: false - /deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} dev: true @@ -5782,7 +5798,6 @@ packages: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} requiresBuild: true dev: false - optional: true /depd@1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} @@ -7039,11 +7054,6 @@ packages: - supports-color dev: false - /expand-template@2.0.3: - resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} - engines: {node: '>=6'} - dev: false - /expand-tilde@2.0.2: resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==} engines: {node: '>=0.10.0'} @@ -7281,6 +7291,7 @@ packages: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} requiresBuild: true dev: false + optional: true /filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -7549,6 +7560,21 @@ packages: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} dev: true + /gauge@3.0.2: + resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} + engines: {node: '>=10'} + dependencies: + aproba: 2.0.0 + color-support: 1.1.3 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wide-align: 1.1.5 + dev: false + /gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -7663,10 +7689,6 @@ packages: split2: 4.2.0 dev: true - /github-from-package@0.0.0: - resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==} - dev: false - /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -7910,7 +7932,6 @@ packages: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} requiresBuild: true dev: false - optional: true /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} @@ -9629,7 +9650,7 @@ packages: engines: {node: '>=6'} dev: false - /knex@0.21.21(sqlite3@5.1.7): + /knex@0.21.21(sqlite3@5.1.6): resolution: {integrity: sha512-cjw5qO1EzVKjbywcVa61IQJMLt7PfYBRI/2NwCA/B9beXgbw652wDNLz+JM+UKKNsfwprq0ugYqBYc9q4JN36A==} engines: {node: '>=10'} hasBin: true @@ -9660,7 +9681,7 @@ packages: liftoff: 3.1.0 lodash: 4.17.21 pg-connection-string: 2.4.0 - sqlite3: 5.1.7 + sqlite3: 5.1.6 tarn: 3.0.2 tildify: 2.0.0 v8flags: 3.2.0 @@ -9980,7 +10001,6 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.1 - dev: true /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} @@ -10335,10 +10355,6 @@ packages: is-extendable: 0.1.1 dev: false - /mkdirp-classic@0.5.3: - resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - dev: false - /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -10471,10 +10487,6 @@ packages: - supports-color dev: false - /napi-build-utils@1.0.2: - resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} - dev: false - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -10492,13 +10504,6 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: false - /node-abi@3.56.0: - resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==} - engines: {node: '>=10'} - dependencies: - semver: 7.6.0 - dev: false - /node-addon-api@1.7.2: resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==} requiresBuild: true @@ -10517,9 +10522,8 @@ packages: dev: false optional: true - /node-addon-api@7.1.0: - resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==} - engines: {node: ^16 || ^18 || >= 20} + /node-addon-api@4.3.0: + resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} dev: false /node-cookie@2.1.2: @@ -10554,7 +10558,6 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 - dev: true /node-guard@1.0.0: resolution: {integrity: sha512-LX911hOl63/YBO3Skl/jQ9QQG+lE++66xaF9/lg7G02bBpdgHMmSdMK5+jgo7p/3i5hn4fGOipX3Ko17Yzfi2w==} @@ -10653,7 +10656,6 @@ packages: dependencies: abbrev: 1.1.1 dev: false - optional: true /nopt@6.0.0: resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} @@ -10700,6 +10702,15 @@ packages: path-key: 4.0.0 dev: true + /npmlog@5.0.1: + resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} + dependencies: + are-we-there-yet: 2.0.0 + console-control-strings: 1.1.0 + gauge: 3.0.2 + set-blocking: 2.0.0 + dev: false + /npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -11183,25 +11194,6 @@ packages: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: false - /prebuild-install@7.1.2: - resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} - engines: {node: '>=10'} - hasBin: true - dependencies: - detect-libc: 2.0.1 - expand-template: 2.0.3 - github-from-package: 0.0.0 - minimist: 1.2.8 - mkdirp-classic: 0.5.3 - napi-build-utils: 1.0.2 - node-abi: 3.56.0 - pump: 3.0.0 - rc: 1.2.8 - simple-get: 4.0.1 - tar-fs: 2.1.1 - tunnel-agent: 0.6.0 - dev: false - /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -11626,16 +11618,6 @@ packages: react-is: 16.13.1 dev: false - /rc@1.2.8: - resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} - hasBin: true - dependencies: - deep-extend: 0.6.0 - ini: 1.3.8 - minimist: 1.2.8 - strip-json-comments: 2.0.1 - dev: false - /react-color@2.19.3(react@18.2.0): resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==} peerDependencies: @@ -12661,10 +12643,6 @@ packages: requiresBuild: true dev: true - /simple-concat@1.0.1: - resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} - dev: false - /simple-encryptor@2.0.0: resolution: {integrity: sha512-dqjQbp9RwfMrE+my/7Pgz9viIsHmY3aQtybGJQkv2sL79YuDGmkxUjlmEBFGP6bcUjBRnSvqsBAcv1ro0Y4/5A==} dependencies: @@ -12678,14 +12656,6 @@ packages: scmp: 2.0.0 dev: false - /simple-get@4.0.1: - resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} - dependencies: - decompress-response: 6.0.0 - once: 1.4.0 - simple-concat: 1.0.1 - dev: false - /simple-git@3.23.0: resolution: {integrity: sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==} dependencies: @@ -12915,18 +12885,18 @@ packages: requiresBuild: true optional: true - /sqlite3@5.1.7: - resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==} + /sqlite3@5.1.6: + resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==} requiresBuild: true dependencies: - bindings: 1.5.0 - node-addon-api: 7.1.0 - prebuild-install: 7.1.2 + '@mapbox/node-pre-gyp': 1.0.11 + node-addon-api: 4.3.0 tar: 6.2.0 optionalDependencies: node-gyp: 8.4.1 transitivePeerDependencies: - bluebird + - encoding - supports-color dev: false @@ -13180,11 +13150,6 @@ packages: min-indent: 1.0.1 dev: true - /strip-json-comments@2.0.1: - resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} - engines: {node: '>=0.10.0'} - dev: false - /strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -13279,15 +13244,6 @@ packages: acorn-node: 1.8.2 dev: false - /tar-fs@2.1.1: - resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} - dependencies: - chownr: 1.1.4 - mkdirp-classic: 0.5.3 - pump: 3.0.0 - tar-stream: 2.2.0 - dev: false - /tar-stream@1.6.2: resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} engines: {node: '>= 0.8.0'} @@ -13310,6 +13266,7 @@ packages: fs-constants: 1.0.0 inherits: 2.0.4 readable-stream: 3.6.2 + dev: true /tar@6.2.0: resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} @@ -13525,7 +13482,6 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: true /tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} @@ -14075,7 +14031,6 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: true /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} @@ -14096,7 +14051,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /which-boxed-primitive@1.0.2: resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} @@ -14182,7 +14136,6 @@ packages: dependencies: string-width: 4.2.3 dev: false - optional: true /window-size@1.1.1: resolution: {integrity: sha512-5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA==} diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index f485f90874..04aa9e70f2 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh @@ -3,7 +3,7 @@ # INTRO: # This file is used to build ferdium on both x64 and arm-based for macos and linux (not tested on arm for linux). # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) -# It will install the system dependencies except for node and python (which are still verified) +# It will install the system dependencies except for node (which is still verified) # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently # This file can live anywhere in your PATH @@ -32,7 +32,6 @@ command_exists() { # Checking the developer environment # Check for installed programmes command_exists node || fail_with_docs "Node is not installed" -command_exists python || fail_with_docs "python is not installed" # Check node version EXPECTED_NODE_VERSION=$(cat .nvmrc) @@ -43,15 +42,6 @@ if [ "v$EXPECTED_NODE_VERSION" != "$ACTUAL_NODE_VERSION" ]; then actual : [$ACTUAL_NODE_VERSION]" fi -# Check python version -EXPECTED_PYTHON_VERSION=$(node -p 'require("./package.json").engines.python') -ACTUAL_PYTHON_VERSION=$(python --version | sed -e "s/Python //") -if [[ "$ACTUAL_PYTHON_VERSION" != "$EXPECTED_PYTHON_VERSION" ]]; then - fail_with_docs "You are not running the expected version of Python! - expected: [$EXPECTED_PYTHON_VERSION] - actual : [$ACTUAL_PYTHON_VERSION]" -fi - # Check if the 'recipes' folder is present either as a git submodule or a symbolic link if ! [ -f "recipes/package.json" ]; then fail_with_docs "'recipes' folder is missing or submodule has not been checked out" @@ -78,7 +68,7 @@ else fi npm cache clean --force - rm -rf ~/.npm ~/.electron-gyp + rm -rf ~/.npm ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/ git -C recipes clean -fxd # Clean recipes folder/submodule git clean -fxd # Note: This will blast away the 'recipes' folder if you have symlinked it @@ -89,6 +79,8 @@ fi # ----------------------------------------------------------------------------- # Ensure that the system dependencies are at the correct version - recover if not +# If 'asdf' is installed, reshim for new nodejs if necessary +command_exists asdf && asdf reshim nodejs # Ensure that the system dependencies are at the correct version # Check pnpm version @@ -107,6 +99,9 @@ if [[ "$EXPECTED_PNPM_VERSION" != "$EXPECTED_RECIPES_PNPM_VERSION" ]]; then actual : [$EXPECTED_PNPM_VERSION]" fi +# If 'asdf' is installed, reshim for new nodejs if necessary +command_exists asdf && asdf reshim nodejs + # ----------------------------------------------------------------------------- printf "\n*************** Building recipes ***************\n" pushd recipes diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 02289d172a..5da7df5409 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 @@ -1,7 +1,7 @@ # INTRO: # This file is used to build ferdium on windows. # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning) -# It will install the system dependencies except for node and python (which are still verified) +# It will install the system dependencies except for node (which is still verified) # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently # This file can live anywhere in your PATH From 18e153bc6d3d4e1295e29e499334cebc3dd06faf Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sun, 31 Mar 2024 08:37:23 +0530 Subject: [PATCH 13/54] Upgrade node to latest LTS (20.12.0) and some other modules --- .nvmrc | 2 +- CONTRIBUTING.md | 2 +- Dockerfile | 2 +- package.json | 28 +-- pnpm-lock.yaml | 451 +++++++++++++++++++++++++++--------------------- recipes | 2 +- 6 files changed, 271 insertions(+), 216 deletions(-) diff --git a/.nvmrc b/.nvmrc index 2dbbe00e67..2b9cabc07c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.11.1 +20.12.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 887a72a5a3..6ac0edb861 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ Currently, these are the combinations of system dependencies that work for MacOS # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json { - "node": "20.11.1", + "node": "20.12.0", "pnpm": "8.15.5" } ``` diff --git a/Dockerfile b/Dockerfile index 83baba00bb..b0238e0085 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture -FROM docker.io/library/node:20.11.1-buster AS builder +FROM docker.io/library/node:20.12.0-buster AS builder ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" diff --git a/package.json b/package.json index 40842a6bf8..374369d670 100644 --- a/package.json +++ b/package.json @@ -13,12 +13,12 @@ "repository": "https://github.com/ferdium/ferdium-app.git", "private": true, "engines": { - "node": "20.11.1", + "node": "20.12.0", "pnpm": "8.15.5" }, "engine-strict": true, "volta": { - "node": "20.11.1", + "node": "20.12.0", "pnpm": "8.15.5" }, "packageManager": "pnpm@8.15.5", @@ -65,7 +65,7 @@ "@adonisjs/validator": "5.1.0", "@electron/remote": "2.1.2", "@emotion/react": "11.11.4", - "@emotion/styled": "11.11.0", + "@emotion/styled": "11.11.5", "@krisdages/electron-process-manager": "3.0.0", "@mdi/js": "7.4.47", "@mdi/react": "1.6.1", @@ -96,9 +96,9 @@ "languagedetect": "2.0.0", "lodash": "4.17.21", "macos-version": "5.2.1", - "markdown-to-jsx": "7.4.4", + "markdown-to-jsx": "7.4.5", "minimist": "1.2.8", - "mobx": "6.12.0", + "mobx": "6.12.3", "mobx-localstorage": "1.2.0", "mobx-react": "7.6.0", "mobx-react-form": "6.9.4", @@ -115,7 +115,7 @@ "react-dom": "18.2.0", "react-dropzone": "14.2.3", "react-electron-web-view": "2.0.1", - "react-intl": "6.6.2", + "react-intl": "6.6.4", "react-jss": "10.10.0", "react-loader-spinner": "5.4.5", "react-modal": "3.16.1", @@ -128,7 +128,7 @@ "sanitize-filename": "1.6.3", "semver": "7.6.0", "sqlite3": "5.1.6", - "tar": "6.2.0", + "tar": "6.2.1", "tslib": "2.6.2", "useragent-generator": "1.1.1-amkt-22079-finish.0", "uuid": "9.0.1", @@ -139,7 +139,7 @@ "@commitlint/cli": "19.2.1", "@commitlint/config-conventional": "19.1.0", "@electron/notarize": "1.2.3", - "@formatjs/cli": "6.2.7", + "@formatjs/cli": "6.2.9", "@jest/types": "29.6.3", "@types/auto-launch": "5.0.5", "@types/color": "3.0.6", @@ -148,18 +148,18 @@ "@types/lodash": "4.17.0", "@types/minimist": "1.2.5", "@types/ms": "0.7.34", - "@types/node": "20.11.30", - "@types/prop-types": "15.7.11", - "@types/react": "18.2.67", + "@types/node": "20.12.2", + "@types/prop-types": "15.7.12", + "@types/react": "18.2.73", "@types/react-color": "3.0.12", - "@types/react-dom": "18.2.22", + "@types/react-dom": "18.2.23", "@types/react-transition-group": "4.4.10", "@types/route-parser": "0.1.7", "@types/semver": "7.5.8", "@types/tar": "6.1.11", "@types/uuid": "9.0.8", "@types/validator": "13.11.9", - "@typescript-eslint/eslint-plugin": "7.3.1", + "@typescript-eslint/eslint-plugin": "7.4.0", "@typescript-eslint/parser": "7.3.1", "all-contributors-cli": "6.26.1", "chalk": "5.3.0", @@ -190,7 +190,7 @@ "prettier": "3.2.5", "preval-build-info": "1.0.3", "rimraf": "5.0.5", - "simple-git": "3.23.0", + "simple-git": "3.24.0", "tiny-glob": "0.2.9", "ts-node": "10.9.2", "typescript": "5.4.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3252c82e4..1b79f1d19a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,10 +49,10 @@ dependencies: version: 2.1.2(electron@29.1.6) '@emotion/react': specifier: 11.11.4 - version: 11.11.4(@types/react@18.2.67)(react@18.2.0) + version: 11.11.4(@types/react@18.2.73)(react@18.2.0) '@emotion/styled': - specifier: 11.11.0 - version: 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0) + specifier: 11.11.5 + version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) '@krisdages/electron-process-manager': specifier: 3.0.0 version: 3.0.0(@electron/remote@2.1.2)(electron@29.1.6)(rxjs@7.8.1) @@ -64,10 +64,10 @@ dependencies: version: 1.6.1 '@mui/icons-material': specifier: 5.15.14 - version: 5.15.14(@mui/material@5.15.14)(@types/react@18.2.67)(react@18.2.0) + version: 5.15.14(@mui/material@5.15.14)(@types/react@18.2.73)(react@18.2.0) '@mui/material': specifier: 5.15.14 - version: 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.67)(react-dom@18.2.0)(react@18.2.0) + version: 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) '@octokit/core': specifier: 5.1.0 version: 5.1.0 @@ -76,7 +76,7 @@ dependencies: version: 4.14.0 '@superwf/mobx-react-router': specifier: 7.4.0 - version: 7.4.0(history@5.3.0)(mobx@6.12.0)(path-to-regexp@6.2.1) + version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.1) auto-launch: specifier: 5.0.6 version: 5.0.6 @@ -144,23 +144,23 @@ dependencies: specifier: 5.2.1 version: 5.2.1 markdown-to-jsx: - specifier: 7.4.4 - version: 7.4.4(react@18.2.0) + specifier: 7.4.5 + version: 7.4.5(react@18.2.0) minimist: specifier: 1.2.8 version: 1.2.8 mobx: - specifier: 6.12.0 - version: 6.12.0 + specifier: 6.12.3 + version: 6.12.3 mobx-localstorage: specifier: 1.2.0 - version: 1.2.0(mobx@6.12.0) + version: 1.2.0(mobx@6.12.3) mobx-react: specifier: 7.6.0 - version: 7.6.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0) + version: 7.6.0(mobx@6.12.3)(react-dom@18.2.0)(react@18.2.0) mobx-react-form: specifier: 6.9.4 - version: 6.9.4(mobx@6.12.0) + version: 6.9.4(mobx@6.12.3) moment: specifier: 2.30.1 version: 2.30.1 @@ -201,8 +201,8 @@ dependencies: specifier: 2.0.1 version: 2.0.1(react-dom@18.2.0)(react@18.2.0) react-intl: - specifier: 6.6.2 - version: 6.6.2(react@18.2.0)(typescript@5.4.3) + specifier: 6.6.4 + version: 6.6.4(react@18.2.0)(typescript@5.4.3) react-jss: specifier: 10.10.0 version: 10.10.0(react@18.2.0) @@ -240,8 +240,8 @@ dependencies: specifier: 5.1.6 version: 5.1.6 tar: - specifier: 6.2.0 - version: 6.2.0 + specifier: 6.2.1 + version: 6.2.1 tslib: specifier: 2.6.2 version: 2.6.2 @@ -269,7 +269,7 @@ devDependencies: version: 1.6.1 '@commitlint/cli': specifier: 19.2.1 - version: 19.2.1(@types/node@20.11.30)(typescript@5.4.3) + version: 19.2.1(@types/node@20.12.2)(typescript@5.4.3) '@commitlint/config-conventional': specifier: 19.1.0 version: 19.1.0 @@ -277,8 +277,8 @@ devDependencies: specifier: 1.2.3 version: 1.2.3 '@formatjs/cli': - specifier: 6.2.7 - version: 6.2.7 + specifier: 6.2.9 + version: 6.2.9 '@jest/types': specifier: 29.6.3 version: 29.6.3 @@ -304,20 +304,20 @@ devDependencies: specifier: 0.7.34 version: 0.7.34 '@types/node': - specifier: 20.11.30 - version: 20.11.30 + specifier: 20.12.2 + version: 20.12.2 '@types/prop-types': - specifier: 15.7.11 - version: 15.7.11 + specifier: 15.7.12 + version: 15.7.12 '@types/react': - specifier: 18.2.67 - version: 18.2.67 + specifier: 18.2.73 + version: 18.2.73 '@types/react-color': specifier: 3.0.12 version: 3.0.12 '@types/react-dom': - specifier: 18.2.22 - version: 18.2.22 + specifier: 18.2.23 + version: 18.2.23 '@types/react-transition-group': specifier: 4.4.10 version: 4.4.10 @@ -337,8 +337,8 @@ devDependencies: specifier: 13.11.9 version: 13.11.9 '@typescript-eslint/eslint-plugin': - specifier: 7.3.1 - version: 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + specifier: 7.4.0 + version: 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) '@typescript-eslint/parser': specifier: 7.3.1 version: 7.3.1(eslint@8.57.0)(typescript@5.4.3) @@ -380,7 +380,7 @@ devDependencies: version: 19.0.4(eslint-plugin-import@2.29.1)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.34.1)(eslint@8.57.0) eslint-config-airbnb-typescript: specifier: 18.0.0 - version: 18.0.0(@typescript-eslint/eslint-plugin@7.3.1)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0) + version: 18.0.0(@typescript-eslint/eslint-plugin@7.4.0)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0) eslint-config-prettier: specifier: 9.1.0 version: 9.1.0(eslint@8.57.0) @@ -389,7 +389,7 @@ devDependencies: version: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0) eslint-plugin-jest: specifier: 27.9.0 - version: 27.9.0(@typescript-eslint/eslint-plugin@7.3.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3) + version: 27.9.0(@typescript-eslint/eslint-plugin@7.4.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3) eslint-plugin-jsx-a11y: specifier: 6.8.0 version: 6.8.0(eslint@8.57.0) @@ -419,7 +419,7 @@ devDependencies: version: 3.0.1 jest: specifier: 29.7.0 - version: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) prettier: specifier: 3.2.5 version: 3.2.5 @@ -430,14 +430,14 @@ devDependencies: specifier: 5.0.5 version: 5.0.5 simple-git: - specifier: 3.23.0 - version: 3.23.0 + specifier: 3.24.0 + version: 3.24.0 tiny-glob: specifier: 0.2.9 version: 0.2.9 ts-node: specifier: 10.9.2 - version: 10.9.2(@types/node@20.11.30)(typescript@5.4.3) + version: 10.9.2(@types/node@20.12.2)(typescript@5.4.3) typescript: specifier: 5.4.3 version: 5.4.3 @@ -1248,14 +1248,14 @@ packages: engines: {node: '>=0.1.90'} dev: false - /@commitlint/cli@19.2.1(@types/node@20.11.30)(typescript@5.4.3): + /@commitlint/cli@19.2.1(@types/node@20.12.2)(typescript@5.4.3): resolution: {integrity: sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg==} engines: {node: '>=v18'} hasBin: true dependencies: '@commitlint/format': 19.0.3 '@commitlint/lint': 19.1.0 - '@commitlint/load': 19.2.0(@types/node@20.11.30)(typescript@5.4.3) + '@commitlint/load': 19.2.0(@types/node@20.12.2)(typescript@5.4.3) '@commitlint/read': 19.2.1 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -1324,7 +1324,7 @@ packages: '@commitlint/types': 19.0.3 dev: true - /@commitlint/load@19.2.0(@types/node@20.11.30)(typescript@5.4.3): + /@commitlint/load@19.2.0(@types/node@20.12.2)(typescript@5.4.3): resolution: {integrity: sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ==} engines: {node: '>=v18'} dependencies: @@ -1334,7 +1334,7 @@ packages: '@commitlint/types': 19.0.3 chalk: 5.3.0 cosmiconfig: 9.0.0(typescript@5.4.3) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.3) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.12.2)(cosmiconfig@9.0.0)(typescript@5.4.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -1561,6 +1561,12 @@ packages: '@emotion/memoize': 0.8.1 dev: false + /@emotion/is-prop-valid@1.2.2: + resolution: {integrity: sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==} + dependencies: + '@emotion/memoize': 0.8.1 + dev: false + /@emotion/memoize@0.7.1: resolution: {integrity: sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg==} dev: false @@ -1569,7 +1575,7 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: false - /@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0): + /@emotion/react@11.11.4(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==} peerDependencies: '@types/react': '*' @@ -1585,7 +1591,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 - '@types/react': 18.2.67 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 react: 18.2.0 dev: false @@ -1610,12 +1616,22 @@ packages: csstype: 3.1.3 dev: false + /@emotion/serialize@1.1.4: + resolution: {integrity: sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==} + dependencies: + '@emotion/hash': 0.9.1 + '@emotion/memoize': 0.8.1 + '@emotion/unitless': 0.8.1 + '@emotion/utils': 1.2.1 + csstype: 3.1.3 + dev: false + /@emotion/sheet@1.2.2: resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} dev: false - /@emotion/styled@11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0): - resolution: {integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==} + /@emotion/styled@11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0): + resolution: {integrity: sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==} peerDependencies: '@emotion/react': ^11.0.0-rc.0 '@types/react': '*' @@ -1624,14 +1640,14 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.5 + '@babel/runtime': 7.23.9 '@emotion/babel-plugin': 11.11.0 - '@emotion/is-prop-valid': 1.2.1 - '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0) - '@emotion/serialize': 1.1.2 + '@emotion/is-prop-valid': 1.2.2 + '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) + '@emotion/serialize': 1.1.4 '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 - '@types/react': 18.2.67 + '@types/react': 18.2.73 react: 18.2.0 dev: false @@ -1926,12 +1942,12 @@ packages: resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} dev: false - /@formatjs/cli@6.2.7: - resolution: {integrity: sha512-F8sPvXsrjOXKAXpbZo3HObq3TZWNa91cimRukmy/54GRo83V0q2ybj9YXtBfcGlnFhzRFXq8ukkTtHgYeRMJaQ==} + /@formatjs/cli@6.2.9: + resolution: {integrity: sha512-YH09kY6oufPdNDIwva/rC7wyg/ptJG6hRZ768eJEafiBR5R1VV1pKFmx106FV5WT7nzBm8Xf4Td+8+Mu+DtQsg==} engines: {node: '>= 16'} hasBin: true peerDependencies: - vue: ^3.3.4 + vue: ^3.4.0 peerDependenciesMeta: vue: optional: true @@ -1987,8 +2003,8 @@ packages: tslib: 2.6.2 dev: false - /@formatjs/intl@2.10.0(typescript@5.4.3): - resolution: {integrity: sha512-X3xT9guVkKDS86EKV80lS0KxoazUglkJTGZO66sKY7otgl0VeStPA8B3u8UkKT47PexVV98fUzjpkchYmbe9nw==} + /@formatjs/intl@2.10.1(typescript@5.4.3): + resolution: {integrity: sha512-dsLG15U7xDi8yzKf4hcAWSsCaez3XrjTO2oaRHPyHtXLm1aEzYbDw6bClo/HMHu+iwS5GbDqT3DV+hYP2ylScg==} peerDependencies: typescript: ^4.7 || 5 peerDependenciesMeta: @@ -2083,7 +2099,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -2104,14 +2120,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -2139,7 +2155,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 jest-mock: 29.7.0 dev: true @@ -2166,7 +2182,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.2.0 - '@types/node': 20.11.30 + '@types/node': 20.12.2 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -2199,7 +2215,7 @@ packages: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.20 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -2287,7 +2303,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.30 + '@types/node': 20.12.2 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: true @@ -2413,7 +2429,7 @@ packages: npmlog: 5.0.1 rimraf: 3.0.2 semver: 7.6.0 - tar: 6.2.0 + tar: 6.2.1 transitivePeerDependencies: - encoding - supports-color @@ -2429,7 +2445,7 @@ packages: prop-types: 15.8.1 dev: false - /@mui/base@5.0.0-beta.40(@types/react@18.2.67)(react-dom@18.2.0)(react@18.2.0): + /@mui/base@5.0.0-beta.40(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2442,10 +2458,10 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.67) - '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.73) + '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) '@popperjs/core': 2.11.8 - '@types/react': 18.2.67 + '@types/react': 18.2.73 clsx: 2.1.0 prop-types: 15.8.1 react: 18.2.0 @@ -2456,7 +2472,7 @@ packages: resolution: {integrity: sha512-on75VMd0XqZfaQW+9pGjSNiqW+ghc5E2ZSLRBXwcXl/C4YzjfyjrLPhrEpKnR9Uym9KXBvxrhoHfPcczYHweyA==} dev: false - /@mui/icons-material@5.15.14(@mui/material@5.15.14)(@types/react@18.2.67)(react@18.2.0): + /@mui/icons-material@5.15.14(@mui/material@5.15.14)(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-vj/51k7MdFmt+XVw94sl30SCvGx6+wJLsNYjZRgxhS6y3UtnWnypMOsm3Kmg8TN+P0dqwsjy4/fX7B1HufJIhw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2468,12 +2484,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.67)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.67 + '@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.73 react: 18.2.0 dev: false - /@mui/material@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.67)(react-dom@18.2.0)(react@18.2.0): + /@mui/material@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kEbRw6fASdQ1SQ7LVdWR5OlWV3y7Y54ZxkLzd6LV5tmz+NpO3MJKZXSfgR0LHMP7meKsPiMm4AuzV0pXDpk/BQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2491,14 +2507,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0) - '@mui/base': 5.0.0-beta.40(@types/react@18.2.67)(react-dom@18.2.0)(react@18.2.0) + '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) + '@mui/base': 5.0.0-beta.40(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) '@mui/core-downloads-tracker': 5.15.14 - '@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.67)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.67) - '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0) - '@types/react': 18.2.67 + '@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.73) + '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@types/react': 18.2.73 '@types/react-transition-group': 4.4.10 clsx: 2.1.0 csstype: 3.1.3 @@ -2509,7 +2525,7 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.15.14(@types/react@18.2.67)(react@18.2.0): + /@mui/private-theming@5.15.14(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2520,13 +2536,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0) - '@types/react': 18.2.67 + '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@types/react': 18.2.73 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/styled-engine@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0): + /@mui/styled-engine@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.2.0): resolution: {integrity: sha512-RILkuVD8gY6PvjZjqnWhz8fu68dVkqhM5+jYWfB5yhlSQKg+2rHkmEwm75XIeAqI3qwOndK6zELK5H6Zxn4NHw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2541,14 +2557,14 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@emotion/cache': 11.11.0 - '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0) + '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/system@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.67)(react@18.2.0): + /@mui/system@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-auXLXzUaCSSOLqJXmsAaq7P96VPRXg2Rrz6OHNV7lr+kB8lobUF+/N84Vd9C4G/wvCXYPs5TYuuGBRhcGbiBGg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2565,20 +2581,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0) - '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.67)(react@18.2.0) - '@mui/private-theming': 5.15.14(@types/react@18.2.67)(react@18.2.0) - '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.67) - '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0) - '@types/react': 18.2.67 + '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) + '@mui/private-theming': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.73) + '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@types/react': 18.2.73 clsx: 2.1.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/types@7.2.14(@types/react@18.2.67): + /@mui/types@7.2.14(@types/react@18.2.73): resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -2586,10 +2602,10 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 dev: false - /@mui/utils@5.15.14(@types/react@18.2.67)(react@18.2.0): + /@mui/utils@5.15.14(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2600,8 +2616,8 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@types/prop-types': 15.7.11 - '@types/react': 18.2.67 + '@types/prop-types': 15.7.12 + '@types/react': 18.2.73 prop-types: 15.8.1 react: 18.2.0 react-is: 18.2.0 @@ -2900,7 +2916,7 @@ packages: resetable: 1.0.3 dev: false - /@superwf/mobx-react-router@7.4.0(history@5.3.0)(mobx@6.12.0)(path-to-regexp@6.2.1): + /@superwf/mobx-react-router@7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.1): resolution: {integrity: sha512-3Mq3p1mTJPYpDkYzAzhFLBCPqP528pHyu2V3UFSwcGGPUiFqFFmz31RIRYFHF13anQ2joxwrSllKZj0NiLMFpw==} peerDependencies: history: '>=5' @@ -2908,7 +2924,7 @@ packages: path-to-regexp: '>=6' dependencies: history: 5.3.0 - mobx: 6.12.0 + mobx: 6.12.3 path-to-regexp: 6.2.1 dev: false @@ -2984,7 +3000,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.11.30 + '@types/node': 20.12.2 '@types/responselike': 1.0.3 /@types/color-convert@2.0.3: @@ -3006,7 +3022,7 @@ packages: /@types/conventional-commits-parser@5.0.0: resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 dev: true /@types/debug@4.1.12: @@ -3019,25 +3035,25 @@ packages: resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 20.11.30 + '@types/node': 20.12.2 dev: true /@types/fs-extra@9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 dev: true /@types/graceful-fs@4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 dev: true /@types/hoist-non-react-statics@3.3.5: resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 dev: false @@ -3078,13 +3094,13 @@ packages: /@types/jsonfile@6.1.4: resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 dev: true /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 /@types/lodash@4.17.0: resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} @@ -3098,8 +3114,8 @@ packages: resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} dev: true - /@types/node@20.11.30: - resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} + /@types/node@20.12.2: + resolution: {integrity: sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==} dependencies: undici-types: 5.26.5 @@ -3115,57 +3131,53 @@ packages: resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==} requiresBuild: true dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 xmlbuilder: 15.1.1 dev: true optional: true - /@types/prop-types@15.7.11: - resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} + /@types/prop-types@15.7.12: + resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} /@types/react-color@3.0.12: resolution: {integrity: sha512-pr3uKE3lSvf7GFo1Rn2K3QktiZQFFrSgSGJ/3iMvSOYWt2pPAJ97rVdVfhWxYJZ8prAEXzoP2XX//3qGSQgu7Q==} dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 '@types/reactcss': 1.2.10 dev: true - /@types/react-dom@18.2.22: - resolution: {integrity: sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==} + /@types/react-dom@18.2.23: + resolution: {integrity: sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==} dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 dev: true /@types/react-transition-group@4.4.10: resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 - /@types/react@18.2.67: - resolution: {integrity: sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==} + /@types/react@18.2.73: + resolution: {integrity: sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==} dependencies: - '@types/prop-types': 15.7.11 - '@types/scheduler': 0.16.8 + '@types/prop-types': 15.7.12 csstype: 3.1.3 /@types/reactcss@1.2.10: resolution: {integrity: sha512-gf5qJ1wOYP8N5q9H8/5c3QZHQzu8ltPClhM0vEWuBu9SGg4KSzgpJd2TShEsQDwsYn+mtnJ1xHUdJyzj/r9WrA==} dependencies: - '@types/react': 18.2.67 + '@types/react': 18.2.73 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 /@types/route-parser@0.1.7: resolution: {integrity: sha512-haO+3HVio/4w+yuMJTjqfSo0ivOV8WnXaOReVD6QN729UGBEyizWNGc2Jd0OLsJDucIod4aJSsPLBeLj2uzMCQ==} dev: true - /@types/scheduler@0.16.8: - resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} - /@types/semver@7.5.8: resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true @@ -3181,7 +3193,7 @@ packages: /@types/tar@6.1.11: resolution: {integrity: sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg==} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 minipass: 4.2.8 dev: true @@ -3213,7 +3225,7 @@ packages: resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} requiresBuild: true dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 optional: true /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): @@ -3245,8 +3257,8 @@ packages: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw==} + /@typescript-eslint/eslint-plugin@7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -3258,10 +3270,10 @@ packages: dependencies: '@eslint-community/regexpp': 4.10.0 '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/scope-manager': 7.3.1 - '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/visitor-keys': 7.3.1 + '@typescript-eslint/scope-manager': 7.4.0 + '@typescript-eslint/type-utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/visitor-keys': 7.4.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 graphemer: 1.4.0 @@ -3319,6 +3331,14 @@ packages: '@typescript-eslint/visitor-keys': 7.3.1 dev: true + /@typescript-eslint/scope-manager@7.4.0: + resolution: {integrity: sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.4.0 + '@typescript-eslint/visitor-keys': 7.4.0 + dev: true + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} @@ -3339,8 +3359,8 @@ packages: - supports-color dev: true - /@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw==} + /@typescript-eslint/type-utils@7.4.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3349,8 +3369,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) - '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3) + '@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 ts-api-utils: 1.0.3(typescript@5.4.3) @@ -3374,6 +3394,11 @@ packages: engines: {node: ^18.18.0 || >=20.0.0} dev: true + /@typescript-eslint/types@7.4.0: + resolution: {integrity: sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==} + engines: {node: ^18.18.0 || >=20.0.0} + dev: true + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.3): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3439,6 +3464,28 @@ packages: - supports-color dev: true + /@typescript-eslint/typescript-estree@7.4.0(typescript@5.4.3): + resolution: {integrity: sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 7.4.0 + '@typescript-eslint/visitor-keys': 7.4.0 + debug: 4.3.4(supports-color@5.5.0) + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.3 + semver: 7.6.0 + ts-api-utils: 1.0.3(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3478,8 +3525,8 @@ packages: - typescript dev: true - /@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ==} + /@typescript-eslint/utils@7.4.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3487,9 +3534,9 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 - '@typescript-eslint/scope-manager': 7.3.1 - '@typescript-eslint/types': 7.3.1 - '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) + '@typescript-eslint/scope-manager': 7.4.0 + '@typescript-eslint/types': 7.4.0 + '@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -3521,6 +3568,14 @@ packages: eslint-visitor-keys: 3.4.3 dev: true + /@typescript-eslint/visitor-keys@7.4.0: + resolution: {integrity: sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==} + engines: {node: ^18.18.0 || >=20.0.0} + dependencies: + '@typescript-eslint/types': 7.4.0 + eslint-visitor-keys: 3.4.3 + dev: true + /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true @@ -3995,7 +4050,7 @@ packages: read-config-file: 6.3.2 sanitize-filename: 1.6.3 semver: 7.6.0 - tar: 6.2.0 + tar: 6.2.1 temp-file: 3.4.0 transitivePeerDependencies: - supports-color @@ -4750,7 +4805,7 @@ packages: promise-inflight: 1.0.1 rimraf: 3.0.2 ssri: 8.0.1 - tar: 6.2.0 + tar: 6.2.1 unique-filename: 1.1.1 transitivePeerDependencies: - bluebird @@ -4778,7 +4833,7 @@ packages: promise-inflight: 1.0.1 rimraf: 3.0.2 ssri: 9.0.1 - tar: 6.2.0 + tar: 6.2.1 unique-filename: 2.0.1 transitivePeerDependencies: - bluebird @@ -5338,7 +5393,7 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - /cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.30)(cosmiconfig@9.0.0)(typescript@5.4.3): + /cosmiconfig-typescript-loader@5.0.0(@types/node@20.12.2)(cosmiconfig@9.0.0)(typescript@5.4.3): resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==} engines: {node: '>=v16'} peerDependencies: @@ -5346,7 +5401,7 @@ packages: cosmiconfig: '>=8.2' typescript: '>=4' dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 cosmiconfig: 9.0.0(typescript@5.4.3) jiti: 1.21.0 typescript: 5.4.3 @@ -5401,7 +5456,7 @@ packages: dev: true optional: true - /create-jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2): + /create-jest@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -5410,7 +5465,7 @@ packages: chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -6105,7 +6160,7 @@ packages: requiresBuild: true dependencies: '@electron/get': 2.0.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -6522,14 +6577,14 @@ packages: semver: 6.3.1 dev: true - /eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.3.1)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0): + /eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.4.0)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0): resolution: {integrity: sha512-oc+Lxzgzsu8FQyFVa4QFaVKiitTYiiW3frB9KYW5OWdPrqFc7FzxgB20hP4cHMlr+MBzGcLl3jnCOVOydL9mIg==} peerDependencies: '@typescript-eslint/eslint-plugin': ^7.0.0 '@typescript-eslint/parser': ^7.0.0 eslint: ^8.56.0 dependencies: - '@typescript-eslint/eslint-plugin': 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/eslint-plugin': 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) eslint: 8.57.0 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0) @@ -6640,7 +6695,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.3.1)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3): + /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.4.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3): resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -6653,10 +6708,10 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/eslint-plugin': 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) eslint: 8.57.0 - jest: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + jest: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) transitivePeerDependencies: - supports-color - typescript @@ -8898,7 +8953,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -8919,7 +8974,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@20.11.30)(ts-node@10.9.2): + /jest-cli@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -8933,10 +8988,10 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + create-jest: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -8947,7 +9002,7 @@ packages: - ts-node dev: true - /jest-config@29.7.0(@types/node@20.11.30)(ts-node@10.9.2): + /jest-config@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -8962,7 +9017,7 @@ packages: '@babel/core': 7.23.5 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 babel-jest: 29.7.0(@babel/core@7.23.5) chalk: 4.1.2 ci-info: 3.8.0 @@ -8982,7 +9037,7 @@ packages: pretty-format: 29.7.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@20.11.30)(typescript@5.4.3) + ts-node: 10.9.2(@types/node@20.12.2)(typescript@5.4.3) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -9023,7 +9078,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 jest-mock: 29.7.0 jest-util: 29.7.0 dev: true @@ -9039,7 +9094,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.5 - '@types/node': 20.11.30 + '@types/node': 20.12.2 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -9090,7 +9145,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 jest-util: 29.7.0 dev: true @@ -9145,7 +9200,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -9176,7 +9231,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -9228,7 +9283,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -9253,7 +9308,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 20.12.2 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -9265,13 +9320,13 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.2 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true - /jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2): + /jest@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -9284,7 +9339,7 @@ packages: '@jest/core': 29.7.0(ts-node@10.9.2) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2) + jest-cli: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -10089,8 +10144,8 @@ packages: object-visit: 1.0.1 dev: false - /markdown-to-jsx@7.4.4(react@18.2.0): - resolution: {integrity: sha512-R9SGyfV2zsQx25YIYImACpiQ8dQe617CNyoE1wLst4wFHtiBGG3SEtJDlI1bt9SeotIcbITbVy9+ieQFWfEoQw==} + /markdown-to-jsx@7.4.5(react@18.2.0): + resolution: {integrity: sha512-c8NB0H/ig+FOWssE9be0PKsYbCDhcWEkicxMnpdfUuHbFljnen4LAdgUShOyR/PgO3/qKvt9cwfQ0U/zQvZ44A==} engines: {node: '>= 10'} peerDependencies: react: '>= 0.14.0' @@ -10367,26 +10422,26 @@ packages: engines: {node: '>=10'} hasBin: true - /mobx-localstorage@1.2.0(mobx@6.12.0): + /mobx-localstorage@1.2.0(mobx@6.12.3): resolution: {integrity: sha512-fb03qyQfjnDIOW28qdV+h9AZ8qtJCZnzNgsej0YxCYwAR2ViykKxgHThikgOi+zJzJj5ljxWyvjGrr6CoptcFw==} peerDependencies: mobx: '>=3' dependencies: - mobx: 6.12.0 + mobx: 6.12.3 reactive-localstorage: 0.0.2 dev: false - /mobx-react-form@6.9.4(mobx@6.12.0): + /mobx-react-form@6.9.4(mobx@6.12.3): resolution: {integrity: sha512-Q5V5I+EexsNk3TI6hl1yINqG9V6KTtoEJMrMsArcuLpYA+JWP/41Jq6e8lnmGAInq+GH+MzyNPwgvz3XGUXEaA==} engines: {node: '>=8.0.0'} peerDependencies: mobx: ^6.0.0 dependencies: lodash: 4.17.21 - mobx: 6.12.0 + mobx: 6.12.3 dev: false - /mobx-react-lite@3.4.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0): + /mobx-react-lite@3.4.0(mobx@6.12.3)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==} peerDependencies: mobx: ^6.1.0 @@ -10399,12 +10454,12 @@ packages: react-native: optional: true dependencies: - mobx: 6.12.0 + mobx: 6.12.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /mobx-react@7.6.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0): + /mobx-react@7.6.0(mobx@6.12.3)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA==} peerDependencies: mobx: ^6.1.0 @@ -10417,14 +10472,14 @@ packages: react-native: optional: true dependencies: - mobx: 6.12.0 - mobx-react-lite: 3.4.0(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0) + mobx: 6.12.3 + mobx-react-lite: 3.4.0(mobx@6.12.3)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /mobx@6.12.0: - resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==} + /mobx@6.12.3: + resolution: {integrity: sha512-c8NKkO4R2lShkSXZ2Ongj1ycjugjzFFo/UswHBnS62y07DMcTc9Rvo03/3nRyszIvwPNljlkd4S828zIBv/piw==} dev: false /modify-filename@1.1.0: @@ -10577,7 +10632,7 @@ packages: npmlog: 6.0.2 rimraf: 3.0.2 semver: 7.6.0 - tar: 6.2.0 + tar: 6.2.1 which: 2.0.2 transitivePeerDependencies: - bluebird @@ -10600,7 +10655,7 @@ packages: npmlog: 6.0.2 rimraf: 3.0.2 semver: 7.6.0 - tar: 6.2.0 + tar: 6.2.1 which: 2.0.2 transitivePeerDependencies: - bluebird @@ -11680,8 +11735,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-intl@6.6.2(react@18.2.0)(typescript@5.4.3): - resolution: {integrity: sha512-IpW2IkLtGENSFlX3vfH11rjuCIsW0VyjT0Q1pPKMZPtT2z1FxLt4weFT5Ezti2TScT1xiyb3aQBFth9EB7jzAg==} + /react-intl@6.6.4(react@18.2.0)(typescript@5.4.3): + resolution: {integrity: sha512-bD+7hVTX3zBFI3z/ffIVZrNkCVK0/sQguQ/DqW5uZ6JFWsuiwOieVcLnmtFiUgMQZLdmwNl2Ur5c10RaO7NWBQ==} peerDependencies: react: ^16.6.0 || 17 || 18 typescript: ^4.7 || 5 @@ -11691,11 +11746,11 @@ packages: dependencies: '@formatjs/ecma402-abstract': 1.18.2 '@formatjs/icu-messageformat-parser': 2.7.6 - '@formatjs/intl': 2.10.0(typescript@5.4.3) + '@formatjs/intl': 2.10.1(typescript@5.4.3) '@formatjs/intl-displaynames': 6.6.6 '@formatjs/intl-listformat': 7.5.5 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 18.2.67 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.5.11 react: 18.2.0 @@ -12656,8 +12711,8 @@ packages: scmp: 2.0.0 dev: false - /simple-git@3.23.0: - resolution: {integrity: sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==} + /simple-git@3.24.0: + resolution: {integrity: sha512-QqAKee9Twv+3k8IFOFfPB2hnk6as6Y6ACUpwCtQvRYBAes23Wv3SZlHVobAzqcE8gfsisCvPw3HGW3HYM+VYYw==} dependencies: '@kwsites/file-exists': 1.1.1 '@kwsites/promise-deferred': 1.1.1 @@ -12891,7 +12946,7 @@ packages: dependencies: '@mapbox/node-pre-gyp': 1.0.11 node-addon-api: 4.3.0 - tar: 6.2.0 + tar: 6.2.1 optionalDependencies: node-gyp: 8.4.1 transitivePeerDependencies: @@ -13268,8 +13323,8 @@ packages: readable-stream: 3.6.2 dev: true - /tar@6.2.0: - resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + /tar@6.2.1: + resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 @@ -13506,7 +13561,7 @@ packages: typescript: 5.4.3 dev: true - /ts-node@10.9.2(@types/node@20.11.30)(typescript@5.4.3): + /ts-node@10.9.2(@types/node@20.12.2)(typescript@5.4.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -13525,7 +13580,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.30 + '@types/node': 20.12.2 acorn: 8.11.2 acorn-walk: 8.2.0 arg: 4.1.3 diff --git a/recipes b/recipes index 7ed7a23adf..cf6ff447cf 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 7ed7a23adf1fd72f006b3b724aa8f000938fc684 +Subproject commit cf6ff447cfd89f886b1f079dea5495cd26d83251 From 740a759328b3ea83f3c15e1c5b2b43f6fdfc4162 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 31 Mar 2024 04:19:17 +0000 Subject: [PATCH 14/54] 6.7.3-nightly.5 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 374369d670..4a6e09fe6c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.4", + "version": "6.7.3-nightly.5", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 93f43329e5125ccd3127dc6548c5efd0907e261e Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 4 Apr 2024 07:12:20 +0530 Subject: [PATCH 15/54] Upgrade electron to '29.2.0' --- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 4a6e09fe6c..d40add2ea6 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ "chalk": "5.3.0", "concurrently": "8.2.2", "cross-env": "7.0.3", - "electron": "29.1.6", + "electron": "29.2.0", "electron-builder": "24.13.3", "esbuild": "0.16.17", "esbuild-plugin-copy": "2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b79f1d19a..2ed6f08052 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ dependencies: version: 5.1.0 '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@29.1.6) + version: 2.1.2(electron@29.2.0) '@emotion/react': specifier: 11.11.4 version: 11.11.4(@types/react@18.2.73)(react@18.2.0) @@ -55,7 +55,7 @@ dependencies: version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) '@krisdages/electron-process-manager': specifier: 3.0.0 - version: 3.0.0(@electron/remote@2.1.2)(electron@29.1.6)(rxjs@7.8.1) + version: 3.0.0(@electron/remote@2.1.2)(electron@29.2.0)(rxjs@7.8.1) '@mdi/js': specifier: 7.4.47 version: 7.4.47 @@ -355,8 +355,8 @@ devDependencies: specifier: 7.0.3 version: 7.0.3 electron: - specifier: 29.1.6 - version: 29.1.6 + specifier: 29.2.0 + version: 29.2.0 electron-builder: specifier: 24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3) @@ -1496,12 +1496,12 @@ packages: - supports-color dev: true - /@electron/remote@2.1.2(electron@29.1.6): + /@electron/remote@2.1.2(electron@29.2.0): resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 29.1.6 + electron: 29.2.0 dev: false /@electron/universal@1.5.1: @@ -2362,15 +2362,15 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.1.6)(rxjs@7.8.1): + /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.2.0)(rxjs@7.8.1): resolution: {integrity: sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==} peerDependencies: '@electron/remote': '>= 1.2.0' electron: '>= 10' rxjs: '>= 7' dependencies: - '@electron/remote': 2.1.2(electron@29.1.6) - electron: 29.1.6 + '@electron/remote': 2.1.2(electron@29.2.0) + electron: 29.2.0 electron-process-reporter: /@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0(rxjs@7.8.1) rxjs: 7.8.1 dev: false @@ -6153,8 +6153,8 @@ packages: mkdirp: 0.5.6 dev: false - /electron@29.1.6: - resolution: {integrity: sha512-UIYfpHR9gRBFKHyejHuXUVQ7nNzZRnoPVOHlijkvqR+DSLwgJ2ZcVVt0LNduNeO8PhPkY1+6kHonL52OTC1cOw==} + /electron@29.2.0: + resolution: {integrity: sha512-ALKrCN52RG4g9prx4DriXSPnY5WoiyRUCNp7zEVQuoiNOpHTNqMMpRidQAHzntV4hajF1LMWHVoBkwqIs1jHhg==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true From bcd4a15c28521d33ae666bd088d366d76dcb86c3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Apr 2024 00:42:31 +0000 Subject: [PATCH 16/54] Update submodules [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index cf6ff447cf..6105933653 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit cf6ff447cfd89f886b1f079dea5495cd26d83251 +Subproject commit 6105933653001c80b0567415a5e7042a07ef2069 From f882166c74e22f425b7d132e30529dd53a671dab Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Apr 2024 00:44:06 +0000 Subject: [PATCH 17/54] Update browserslist data updates and linter fixes [skip ci] --- pnpm-lock.yaml | 78 +++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ed6f08052..77f9dfd65a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -208,7 +208,7 @@ dependencies: version: 10.10.0(react@18.2.0) react-loader-spinner: specifier: 5.4.5 - version: 5.4.5(@babel/core@7.24.3)(react-dom@18.2.0)(react@18.2.0) + version: 5.4.5(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0) react-modal: specifier: 3.16.1 version: 3.16.1(react-dom@18.2.0)(react@18.2.0) @@ -404,7 +404,7 @@ devDependencies: version: 4.6.0(eslint@8.57.0) eslint-plugin-sonar: specifier: 0.13.2 - version: 0.13.2(@babel/core@7.24.3)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + version: 0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) eslint-plugin-unicorn: specifier: 51.0.1 version: 51.0.1(eslint@8.57.0) @@ -686,8 +686,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/compat-data@7.24.1: - resolution: {integrity: sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==} + /@babel/compat-data@7.24.4: + resolution: {integrity: sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==} engines: {node: '>=6.9.0'} /@babel/core@7.23.5: @@ -713,17 +713,17 @@ packages: - supports-color dev: true - /@babel/core@7.24.3: - resolution: {integrity: sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==} + /@babel/core@7.24.4: + resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.24.2 - '@babel/generator': 7.24.1 + '@babel/generator': 7.24.4 '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helpers': 7.24.1 - '@babel/parser': 7.24.1 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.4) + '@babel/helpers': 7.24.4 + '@babel/parser': 7.24.4 '@babel/template': 7.24.0 '@babel/traverse': 7.24.1 '@babel/types': 7.24.0 @@ -735,14 +735,14 @@ packages: transitivePeerDependencies: - supports-color - /@babel/eslint-parser@7.23.10(@babel/core@7.24.3)(eslint@8.57.0): + /@babel/eslint-parser@7.23.10(@babel/core@7.24.4)(eslint@8.57.0): resolution: {integrity: sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: '@babel/core': ^7.11.0 eslint: ^7.5.0 || ^8.0.0 dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.24.4 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 eslint: 8.57.0 eslint-visitor-keys: 2.1.0 @@ -758,8 +758,8 @@ packages: '@jridgewell/trace-mapping': 0.3.20 jsesc: 2.5.2 - /@babel/generator@7.24.1: - resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==} + /@babel/generator@7.24.4: + resolution: {integrity: sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.24.0 @@ -789,7 +789,7 @@ packages: resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.24.1 + '@babel/compat-data': 7.24.4 '@babel/helper-validator-option': 7.23.5 browserslist: 4.23.0 lru-cache: 5.1.1 @@ -832,13 +832,13 @@ packages: '@babel/helper-validator-identifier': 7.22.20 dev: true - /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3): + /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.4): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.24.4 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-module-imports': 7.22.15 '@babel/helper-simple-access': 7.22.5 @@ -893,8 +893,8 @@ packages: - supports-color dev: true - /@babel/helpers@7.24.1: - resolution: {integrity: sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==} + /@babel/helpers@7.24.4: + resolution: {integrity: sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.24.0 @@ -927,8 +927,8 @@ packages: dependencies: '@babel/types': 7.23.5 - /@babel/parser@7.24.1: - resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==} + /@babel/parser@7.24.4: + resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -989,13 +989,13 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.3): + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.4): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.24.4 '@babel/helper-plugin-utils': 7.22.5 dev: false @@ -1098,7 +1098,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.24.2 - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.4 '@babel/types': 7.24.0 /@babel/traverse@7.23.5(supports-color@5.5.0): @@ -1123,12 +1123,12 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.24.2 - '@babel/generator': 7.24.1 + '@babel/generator': 7.24.4 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.4 '@babel/types': 7.24.0 debug: 4.3.4(supports-color@5.5.0) globals: 11.12.0 @@ -4473,17 +4473,17 @@ packages: resolve: 1.22.8 dev: false - /babel-plugin-styled-components@2.1.4(@babel/core@7.24.3)(styled-components@5.3.11): + /babel-plugin-styled-components@2.1.4(@babel/core@7.24.4)(styled-components@5.3.11): resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==} peerDependencies: styled-components: '>= 2' dependencies: '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.4) lodash: 4.17.21 picomatch: 2.3.1 - styled-components: 5.3.11(@babel/core@7.24.3)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + styled-components: 5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) transitivePeerDependencies: - '@babel/core' dev: false @@ -4667,7 +4667,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001600 + caniuse-lite: 1.0.30001605 electron-to-chromium: 1.4.710 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) @@ -4923,8 +4923,8 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001600: - resolution: {integrity: sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==} + /caniuse-lite@1.0.30001605: + resolution: {integrity: sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==} /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} @@ -6799,7 +6799,7 @@ packages: string.prototype.matchall: 4.0.11 dev: true - /eslint-plugin-sonar@0.13.2(@babel/core@7.24.3)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): + /eslint-plugin-sonar@0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-7mZkk4/E2tGtIi3OCNCTmEWthweWzoAj9YcsxxIDI38r7q4RDusWDpsdGHPZXp/+QU8ZKkvmE11G4DtJW+k1kg==} engines: {node: '>=14'} peerDependencies: @@ -6808,8 +6808,8 @@ packages: eslint: ^8.0.0 typescript: ^4.0.0 || ^5.0.0 dependencies: - '@babel/core': 7.24.3 - '@babel/eslint-parser': 7.23.10(@babel/core@7.24.3)(eslint@8.57.0) + '@babel/core': 7.24.4 + '@babel/eslint-parser': 7.23.10(@babel/core@7.24.4)(eslint@8.57.0) '@eslint-community/regexpp': 4.10.0 '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) @@ -11787,7 +11787,7 @@ packages: resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==} dev: false - /react-loader-spinner@5.4.5(@babel/core@7.24.3)(react-dom@18.2.0)(react@18.2.0): + /react-loader-spinner@5.4.5(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-32f+sb/v2tnNfyvnCCOS4fpyVHsGXjSyNo6QLniHcaj1XjKLxx14L2z0h6szRugOL8IEJ+53GPwNAdbkDqmy4g==} peerDependencies: react: ^16.0.0 || ^17.0.0 || ^18.0.0 @@ -11796,7 +11796,7 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 - styled-components: 5.3.11(@babel/core@7.24.3)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + styled-components: 5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) styled-tools: 1.7.2 transitivePeerDependencies: - '@babel/core' @@ -13210,7 +13210,7 @@ packages: engines: {node: '>=8'} dev: true - /styled-components@5.3.11(@babel/core@7.24.3)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): + /styled-components@5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==} engines: {node: '>=10'} peerDependencies: @@ -13223,7 +13223,7 @@ packages: '@emotion/is-prop-valid': 1.2.1 '@emotion/stylis': 0.8.5 '@emotion/unitless': 0.7.5 - babel-plugin-styled-components: 2.1.4(@babel/core@7.24.3)(styled-components@5.3.11) + babel-plugin-styled-components: 2.1.4(@babel/core@7.24.4)(styled-components@5.3.11) css-to-react-native: 3.2.0 hoist-non-react-statics: 3.3.2 react: 18.2.0 From 99c46777e5cf86ff2e4cddc2c18befa01a44631f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Apr 2024 00:44:07 +0000 Subject: [PATCH 18/54] 6.7.3-nightly.6 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d40add2ea6..e3118bc0c7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.5", + "version": "6.7.3-nightly.6", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 2ebb1c0598c016685f3e01f00cb8decd2b88784c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Apr 2024 00:46:47 +0000 Subject: [PATCH 19/54] Update submodules [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index 6105933653..90dd011d7f 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 6105933653001c80b0567415a5e7042a07ef2069 +Subproject commit 90dd011d7f1dbe8443ba16755f5aaa519f62cfec From b5edc4205e4100b470f84988aa2631d42b9a64b7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Apr 2024 00:48:17 +0000 Subject: [PATCH 20/54] Update browserslist data updates and linter fixes [skip ci] --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 77f9dfd65a..23a0e114b5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4667,7 +4667,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001605 + caniuse-lite: 1.0.30001606 electron-to-chromium: 1.4.710 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) @@ -4923,8 +4923,8 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001605: - resolution: {integrity: sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==} + /caniuse-lite@1.0.30001606: + resolution: {integrity: sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==} /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} From d0164d24cd0acdfdcca25b47468ec697695b0e88 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Apr 2024 00:48:18 +0000 Subject: [PATCH 21/54] 6.7.3-nightly.7 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3118bc0c7..14b3248e81 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.6", + "version": "6.7.3-nightly.7", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From dd2fde8f97aec1c0184115b24f764cb003c1fed7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Apr 2024 00:42:02 +0000 Subject: [PATCH 22/54] Update submodules [skip ci] --- recipes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes b/recipes index 90dd011d7f..099f029436 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 90dd011d7f1dbe8443ba16755f5aaa519f62cfec +Subproject commit 099f02943602d42d42bc20fd173f81af7da40625 From 336023f038c431329580652b42026fce0eae10f1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Apr 2024 00:43:29 +0000 Subject: [PATCH 23/54] Update browserslist data updates and linter fixes [skip ci] --- pnpm-lock.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23a0e114b5..ec7e404d5a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,7 +76,7 @@ dependencies: version: 4.14.0 '@superwf/mobx-react-router': specifier: 7.4.0 - version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.1) + version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.2) auto-launch: specifier: 5.0.6 version: 5.0.6 @@ -2916,7 +2916,7 @@ packages: resetable: 1.0.3 dev: false - /@superwf/mobx-react-router@7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.1): + /@superwf/mobx-react-router@7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.2): resolution: {integrity: sha512-3Mq3p1mTJPYpDkYzAzhFLBCPqP528pHyu2V3UFSwcGGPUiFqFFmz31RIRYFHF13anQ2joxwrSllKZj0NiLMFpw==} peerDependencies: history: '>=5' @@ -2925,7 +2925,7 @@ packages: dependencies: history: 5.3.0 mobx: 6.12.3 - path-to-regexp: 6.2.1 + path-to-regexp: 6.2.2 dev: false /@szmarczak/http-timer@4.0.6: @@ -4667,7 +4667,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001606 + caniuse-lite: 1.0.30001607 electron-to-chromium: 1.4.710 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) @@ -4923,8 +4923,8 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001606: - resolution: {integrity: sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==} + /caniuse-lite@1.0.30001607: + resolution: {integrity: sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==} /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} @@ -11117,8 +11117,8 @@ packages: resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==} dev: false - /path-to-regexp@6.2.1: - resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} + /path-to-regexp@6.2.2: + resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==} dev: false /path-type@4.0.0: From b0ff6d880e9d97bd2938f952df0cc50e1424182b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Apr 2024 00:43:31 +0000 Subject: [PATCH 24/54] 6.7.3-nightly.8 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14b3248e81..37e3a377dc 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.7.3-nightly.7", + "version": "6.7.3-nightly.8", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", From 31f524047446374788ed92440f194b18c90a1aed Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 13 Apr 2024 08:39:08 +0530 Subject: [PATCH 25/54] Upgrade electron to '29.3.0' and some other deps --- package.json | 26 +- pnpm-lock.yaml | 566 +++++++++--------- src/api/server/ServerApi.ts | 1 - .../settings/recipes/RecipeItem.tsx | 2 +- .../settings/recipes/RecipesDashboard.tsx | 22 +- 5 files changed, 297 insertions(+), 320 deletions(-) diff --git a/package.json b/package.json index 37e3a377dc..bfd8104ab3 100644 --- a/package.json +++ b/package.json @@ -69,8 +69,8 @@ "@krisdages/electron-process-manager": "3.0.0", "@mdi/js": "7.4.47", "@mdi/react": "1.6.1", - "@mui/icons-material": "5.15.14", - "@mui/material": "5.15.14", + "@mui/icons-material": "5.15.15", + "@mui/material": "5.15.15", "@octokit/core": "5.1.0", "@sentry/electron": "4.14.0", "@superwf/mobx-react-router": "7.4.0", @@ -78,7 +78,7 @@ "classnames": "2.5.1", "color": "4.2.3", "csstype": "3.1.3", - "darkreader": "4.9.80", + "darkreader": "4.9.83", "dbus-next": "0.10.2", "debug": "4.3.4", "electron-dl": "3.5.2", @@ -96,7 +96,7 @@ "languagedetect": "2.0.0", "lodash": "4.17.21", "macos-version": "5.2.1", - "markdown-to-jsx": "7.4.5", + "markdown-to-jsx": "7.4.6", "minimist": "1.2.8", "mobx": "6.12.3", "mobx-localstorage": "1.2.0", @@ -115,7 +115,7 @@ "react-dom": "18.2.0", "react-dropzone": "14.2.3", "react-electron-web-view": "2.0.1", - "react-intl": "6.6.4", + "react-intl": "6.6.5", "react-jss": "10.10.0", "react-loader-spinner": "5.4.5", "react-modal": "3.16.1", @@ -148,24 +148,24 @@ "@types/lodash": "4.17.0", "@types/minimist": "1.2.5", "@types/ms": "0.7.34", - "@types/node": "20.12.2", + "@types/node": "20.12.7", "@types/prop-types": "15.7.12", - "@types/react": "18.2.73", + "@types/react": "18.2.77", "@types/react-color": "3.0.12", - "@types/react-dom": "18.2.23", + "@types/react-dom": "18.2.25", "@types/react-transition-group": "4.4.10", "@types/route-parser": "0.1.7", "@types/semver": "7.5.8", - "@types/tar": "6.1.11", + "@types/tar": "6.1.12", "@types/uuid": "9.0.8", "@types/validator": "13.11.9", - "@typescript-eslint/eslint-plugin": "7.4.0", - "@typescript-eslint/parser": "7.3.1", + "@typescript-eslint/eslint-plugin": "7.6.0", + "@typescript-eslint/parser": "7.6.0", "all-contributors-cli": "6.26.1", "chalk": "5.3.0", "concurrently": "8.2.2", "cross-env": "7.0.3", - "electron": "29.2.0", + "electron": "29.3.0", "electron-builder": "24.13.3", "esbuild": "0.16.17", "esbuild-plugin-copy": "2.1.1", @@ -193,7 +193,7 @@ "simple-git": "3.24.0", "tiny-glob": "0.2.9", "ts-node": "10.9.2", - "typescript": "5.4.3", + "typescript": "5.4.5", "wait-on": "7.2.0" }, "pnpm": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ec7e404d5a..6b1daaa41e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,16 +46,16 @@ dependencies: version: 5.1.0 '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@29.2.0) + version: 2.1.2(electron@29.3.0) '@emotion/react': specifier: 11.11.4 - version: 11.11.4(@types/react@18.2.73)(react@18.2.0) + version: 11.11.4(@types/react@18.2.77)(react@18.2.0) '@emotion/styled': specifier: 11.11.5 - version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) + version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) '@krisdages/electron-process-manager': specifier: 3.0.0 - version: 3.0.0(@electron/remote@2.1.2)(electron@29.2.0)(rxjs@7.8.1) + version: 3.0.0(@electron/remote@2.1.2)(electron@29.3.0)(rxjs@7.8.1) '@mdi/js': specifier: 7.4.47 version: 7.4.47 @@ -63,11 +63,11 @@ dependencies: specifier: 1.6.1 version: 1.6.1 '@mui/icons-material': - specifier: 5.15.14 - version: 5.15.14(@mui/material@5.15.14)(@types/react@18.2.73)(react@18.2.0) + specifier: 5.15.15 + version: 5.15.15(@mui/material@5.15.15)(@types/react@18.2.77)(react@18.2.0) '@mui/material': - specifier: 5.15.14 - version: 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + specifier: 5.15.15 + version: 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0) '@octokit/core': specifier: 5.1.0 version: 5.1.0 @@ -90,8 +90,8 @@ dependencies: specifier: 3.1.3 version: 3.1.3 darkreader: - specifier: 4.9.80 - version: 4.9.80 + specifier: 4.9.83 + version: 4.9.83 dbus-next: specifier: 0.10.2 version: 0.10.2 @@ -144,8 +144,8 @@ dependencies: specifier: 5.2.1 version: 5.2.1 markdown-to-jsx: - specifier: 7.4.5 - version: 7.4.5(react@18.2.0) + specifier: 7.4.6 + version: 7.4.6(react@18.2.0) minimist: specifier: 1.2.8 version: 1.2.8 @@ -201,8 +201,8 @@ dependencies: specifier: 2.0.1 version: 2.0.1(react-dom@18.2.0)(react@18.2.0) react-intl: - specifier: 6.6.4 - version: 6.6.4(react@18.2.0)(typescript@5.4.3) + specifier: 6.6.5 + version: 6.6.5(react@18.2.0)(typescript@5.4.5) react-jss: specifier: 10.10.0 version: 10.10.0(react@18.2.0) @@ -269,7 +269,7 @@ devDependencies: version: 1.6.1 '@commitlint/cli': specifier: 19.2.1 - version: 19.2.1(@types/node@20.12.2)(typescript@5.4.3) + version: 19.2.1(@types/node@20.12.7)(typescript@5.4.5) '@commitlint/config-conventional': specifier: 19.1.0 version: 19.1.0 @@ -304,20 +304,20 @@ devDependencies: specifier: 0.7.34 version: 0.7.34 '@types/node': - specifier: 20.12.2 - version: 20.12.2 + specifier: 20.12.7 + version: 20.12.7 '@types/prop-types': specifier: 15.7.12 version: 15.7.12 '@types/react': - specifier: 18.2.73 - version: 18.2.73 + specifier: 18.2.77 + version: 18.2.77 '@types/react-color': specifier: 3.0.12 version: 3.0.12 '@types/react-dom': - specifier: 18.2.23 - version: 18.2.23 + specifier: 18.2.25 + version: 18.2.25 '@types/react-transition-group': specifier: 4.4.10 version: 4.4.10 @@ -328,8 +328,8 @@ devDependencies: specifier: 7.5.8 version: 7.5.8 '@types/tar': - specifier: 6.1.11 - version: 6.1.11 + specifier: 6.1.12 + version: 6.1.12 '@types/uuid': specifier: 9.0.8 version: 9.0.8 @@ -337,11 +337,11 @@ devDependencies: specifier: 13.11.9 version: 13.11.9 '@typescript-eslint/eslint-plugin': - specifier: 7.4.0 - version: 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + specifier: 7.6.0 + version: 7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/parser': - specifier: 7.3.1 - version: 7.3.1(eslint@8.57.0)(typescript@5.4.3) + specifier: 7.6.0 + version: 7.6.0(eslint@8.57.0)(typescript@5.4.5) all-contributors-cli: specifier: 6.26.1 version: 6.26.1 @@ -355,8 +355,8 @@ devDependencies: specifier: 7.0.3 version: 7.0.3 electron: - specifier: 29.2.0 - version: 29.2.0 + specifier: 29.3.0 + version: 29.3.0 electron-builder: specifier: 24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3) @@ -380,16 +380,16 @@ devDependencies: version: 19.0.4(eslint-plugin-import@2.29.1)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.34.1)(eslint@8.57.0) eslint-config-airbnb-typescript: specifier: 18.0.0 - version: 18.0.0(@typescript-eslint/eslint-plugin@7.4.0)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0) + version: 18.0.0(@typescript-eslint/eslint-plugin@7.6.0)(@typescript-eslint/parser@7.6.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0) eslint-config-prettier: specifier: 9.1.0 version: 9.1.0(eslint@8.57.0) eslint-plugin-import: specifier: 2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint@8.57.0) eslint-plugin-jest: specifier: 27.9.0 - version: 27.9.0(@typescript-eslint/eslint-plugin@7.4.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3) + version: 27.9.0(@typescript-eslint/eslint-plugin@7.6.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.5) eslint-plugin-jsx-a11y: specifier: 6.8.0 version: 6.8.0(eslint@8.57.0) @@ -404,7 +404,7 @@ devDependencies: version: 4.6.0(eslint@8.57.0) eslint-plugin-sonar: specifier: 0.13.2 - version: 0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) + version: 0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) eslint-plugin-unicorn: specifier: 51.0.1 version: 51.0.1(eslint@8.57.0) @@ -419,7 +419,7 @@ devDependencies: version: 3.0.1 jest: specifier: 29.7.0 - version: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + version: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) prettier: specifier: 3.2.5 version: 3.2.5 @@ -437,10 +437,10 @@ devDependencies: version: 0.2.9 ts-node: specifier: 10.9.2 - version: 10.9.2(@types/node@20.12.2)(typescript@5.4.3) + version: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) typescript: - specifier: 5.4.3 - version: 5.4.3 + specifier: 5.4.5 + version: 5.4.5 wait-on: specifier: 7.2.0 version: 7.2.0(debug@4.3.4) @@ -1248,14 +1248,14 @@ packages: engines: {node: '>=0.1.90'} dev: false - /@commitlint/cli@19.2.1(@types/node@20.12.2)(typescript@5.4.3): + /@commitlint/cli@19.2.1(@types/node@20.12.7)(typescript@5.4.5): resolution: {integrity: sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg==} engines: {node: '>=v18'} hasBin: true dependencies: '@commitlint/format': 19.0.3 '@commitlint/lint': 19.1.0 - '@commitlint/load': 19.2.0(@types/node@20.12.2)(typescript@5.4.3) + '@commitlint/load': 19.2.0(@types/node@20.12.7)(typescript@5.4.5) '@commitlint/read': 19.2.1 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -1324,7 +1324,7 @@ packages: '@commitlint/types': 19.0.3 dev: true - /@commitlint/load@19.2.0(@types/node@20.12.2)(typescript@5.4.3): + /@commitlint/load@19.2.0(@types/node@20.12.7)(typescript@5.4.5): resolution: {integrity: sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ==} engines: {node: '>=v18'} dependencies: @@ -1333,8 +1333,8 @@ packages: '@commitlint/resolve-extends': 19.1.0 '@commitlint/types': 19.0.3 chalk: 5.3.0 - cosmiconfig: 9.0.0(typescript@5.4.3) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.12.2)(cosmiconfig@9.0.0)(typescript@5.4.3) + cosmiconfig: 9.0.0(typescript@5.4.5) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.12.7)(cosmiconfig@9.0.0)(typescript@5.4.5) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -1496,12 +1496,12 @@ packages: - supports-color dev: true - /@electron/remote@2.1.2(electron@29.2.0): + /@electron/remote@2.1.2(electron@29.3.0): resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 29.2.0 + electron: 29.3.0 dev: false /@electron/universal@1.5.1: @@ -1575,7 +1575,7 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: false - /@emotion/react@11.11.4(@types/react@18.2.73)(react@18.2.0): + /@emotion/react@11.11.4(@types/react@18.2.77)(react@18.2.0): resolution: {integrity: sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==} peerDependencies: '@types/react': '*' @@ -1591,7 +1591,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 - '@types/react': 18.2.73 + '@types/react': 18.2.77 hoist-non-react-statics: 3.3.2 react: 18.2.0 dev: false @@ -1630,7 +1630,7 @@ packages: resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} dev: false - /@emotion/styled@11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0): + /@emotion/styled@11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0): resolution: {integrity: sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==} peerDependencies: '@emotion/react': ^11.0.0-rc.0 @@ -1643,11 +1643,11 @@ packages: '@babel/runtime': 7.23.9 '@emotion/babel-plugin': 11.11.0 '@emotion/is-prop-valid': 1.2.2 - '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) + '@emotion/react': 11.11.4(@types/react@18.2.77)(react@18.2.0) '@emotion/serialize': 1.1.4 '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 - '@types/react': 18.2.73 + '@types/react': 18.2.77 react: 18.2.0 dev: false @@ -2003,7 +2003,7 @@ packages: tslib: 2.6.2 dev: false - /@formatjs/intl@2.10.1(typescript@5.4.3): + /@formatjs/intl@2.10.1(typescript@5.4.5): resolution: {integrity: sha512-dsLG15U7xDi8yzKf4hcAWSsCaez3XrjTO2oaRHPyHtXLm1aEzYbDw6bClo/HMHu+iwS5GbDqT3DV+hYP2ylScg==} peerDependencies: typescript: ^4.7 || 5 @@ -2018,7 +2018,7 @@ packages: '@formatjs/intl-listformat': 7.5.5 intl-messageformat: 10.5.11 tslib: 2.6.2 - typescript: 5.4.3 + typescript: 5.4.5 dev: false /@gar/promisify@1.1.3: @@ -2099,7 +2099,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -2120,14 +2120,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -2155,7 +2155,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 jest-mock: 29.7.0 dev: true @@ -2182,7 +2182,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.2.0 - '@types/node': 20.12.2 + '@types/node': 20.12.7 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -2215,7 +2215,7 @@ packages: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.20 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -2303,7 +2303,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.12.2 + '@types/node': 20.12.7 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: true @@ -2362,15 +2362,15 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.2.0)(rxjs@7.8.1): + /@krisdages/electron-process-manager@3.0.0(@electron/remote@2.1.2)(electron@29.3.0)(rxjs@7.8.1): resolution: {integrity: sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==} peerDependencies: '@electron/remote': '>= 1.2.0' electron: '>= 10' rxjs: '>= 7' dependencies: - '@electron/remote': 2.1.2(electron@29.2.0) - electron: 29.2.0 + '@electron/remote': 2.1.2(electron@29.3.0) + electron: 29.3.0 electron-process-reporter: /@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0(rxjs@7.8.1) rxjs: 7.8.1 dev: false @@ -2445,7 +2445,7 @@ packages: prop-types: 15.8.1 dev: false - /@mui/base@5.0.0-beta.40(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): + /@mui/base@5.0.0-beta.40(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2458,22 +2458,22 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.73) - '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.77) + '@mui/utils': 5.15.14(@types/react@18.2.77)(react@18.2.0) '@popperjs/core': 2.11.8 - '@types/react': 18.2.73 + '@types/react': 18.2.77 clsx: 2.1.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@mui/core-downloads-tracker@5.15.14: - resolution: {integrity: sha512-on75VMd0XqZfaQW+9pGjSNiqW+ghc5E2ZSLRBXwcXl/C4YzjfyjrLPhrEpKnR9Uym9KXBvxrhoHfPcczYHweyA==} + /@mui/core-downloads-tracker@5.15.15: + resolution: {integrity: sha512-aXnw29OWQ6I5A47iuWEI6qSSUfH6G/aCsW9KmW3LiFqr7uXZBK4Ks+z8G+qeIub8k0T5CMqlT2q0L+ZJTMrqpg==} dev: false - /@mui/icons-material@5.15.14(@mui/material@5.15.14)(@types/react@18.2.73)(react@18.2.0): - resolution: {integrity: sha512-vj/51k7MdFmt+XVw94sl30SCvGx6+wJLsNYjZRgxhS6y3UtnWnypMOsm3Kmg8TN+P0dqwsjy4/fX7B1HufJIhw==} + /@mui/icons-material@5.15.15(@mui/material@5.15.15)(@types/react@18.2.77)(react@18.2.0): + resolution: {integrity: sha512-kkeU/pe+hABcYDH6Uqy8RmIsr2S/y5bP2rp+Gat4CcRjCcVne6KudS1NrZQhUCRysrTDCAhcbcf9gt+/+pGO2g==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 @@ -2484,13 +2484,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.73 + '@mui/material': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.77 react: 18.2.0 dev: false - /@mui/material@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-kEbRw6fASdQ1SQ7LVdWR5OlWV3y7Y54ZxkLzd6LV5tmz+NpO3MJKZXSfgR0LHMP7meKsPiMm4AuzV0pXDpk/BQ==} + /@mui/material@5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-3zvWayJ+E1kzoIsvwyEvkTUKVKt1AjchFFns+JtluHCuvxgKcLSRJTADw37k0doaRtVAsyh8bz9Afqzv+KYrIA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -2507,14 +2507,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) - '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) - '@mui/base': 5.0.0-beta.40(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) - '@mui/core-downloads-tracker': 5.15.14 - '@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.73) - '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) - '@types/react': 18.2.73 + '@emotion/react': 11.11.4(@types/react@18.2.77)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) + '@mui/base': 5.0.0-beta.40(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0) + '@mui/core-downloads-tracker': 5.15.15 + '@mui/system': 5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.77)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.77) + '@mui/utils': 5.15.14(@types/react@18.2.77)(react@18.2.0) + '@types/react': 18.2.77 '@types/react-transition-group': 4.4.10 clsx: 2.1.0 csstype: 3.1.3 @@ -2525,7 +2525,7 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.15.14(@types/react@18.2.73)(react@18.2.0): + /@mui/private-theming@5.15.14(@types/react@18.2.77)(react@18.2.0): resolution: {integrity: sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2536,8 +2536,8 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) - '@types/react': 18.2.73 + '@mui/utils': 5.15.14(@types/react@18.2.77)(react@18.2.0) + '@types/react': 18.2.77 prop-types: 15.8.1 react: 18.2.0 dev: false @@ -2557,15 +2557,15 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@emotion/cache': 11.11.0 - '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) - '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) + '@emotion/react': 11.11.4(@types/react@18.2.77)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/system@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.73)(react@18.2.0): - resolution: {integrity: sha512-auXLXzUaCSSOLqJXmsAaq7P96VPRXg2Rrz6OHNV7lr+kB8lobUF+/N84Vd9C4G/wvCXYPs5TYuuGBRhcGbiBGg==} + /@mui/system@5.15.15(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.77)(react@18.2.0): + resolution: {integrity: sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -2581,20 +2581,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@emotion/react': 11.11.4(@types/react@18.2.73)(react@18.2.0) - '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.73)(react@18.2.0) - '@mui/private-theming': 5.15.14(@types/react@18.2.73)(react@18.2.0) + '@emotion/react': 11.11.4(@types/react@18.2.77)(react@18.2.0) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) + '@mui/private-theming': 5.15.14(@types/react@18.2.77)(react@18.2.0) '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(react@18.2.0) - '@mui/types': 7.2.14(@types/react@18.2.73) - '@mui/utils': 5.15.14(@types/react@18.2.73)(react@18.2.0) - '@types/react': 18.2.73 + '@mui/types': 7.2.14(@types/react@18.2.77) + '@mui/utils': 5.15.14(@types/react@18.2.77)(react@18.2.0) + '@types/react': 18.2.77 clsx: 2.1.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/types@7.2.14(@types/react@18.2.73): + /@mui/types@7.2.14(@types/react@18.2.77): resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -2602,10 +2602,10 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 dev: false - /@mui/utils@5.15.14(@types/react@18.2.73)(react@18.2.0): + /@mui/utils@5.15.14(@types/react@18.2.77)(react@18.2.0): resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -2617,7 +2617,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 '@types/prop-types': 15.7.12 - '@types/react': 18.2.73 + '@types/react': 18.2.77 prop-types: 15.8.1 react: 18.2.0 react-is: 18.2.0 @@ -3000,7 +3000,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.12.2 + '@types/node': 20.12.7 '@types/responselike': 1.0.3 /@types/color-convert@2.0.3: @@ -3022,7 +3022,7 @@ packages: /@types/conventional-commits-parser@5.0.0: resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 dev: true /@types/debug@4.1.12: @@ -3035,25 +3035,25 @@ packages: resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 20.12.2 + '@types/node': 20.12.7 dev: true /@types/fs-extra@9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 dev: true /@types/graceful-fs@4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 dev: true /@types/hoist-non-react-statics@3.3.5: resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 hoist-non-react-statics: 3.3.2 dev: false @@ -3094,13 +3094,13 @@ packages: /@types/jsonfile@6.1.4: resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 dev: true /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 /@types/lodash@4.17.0: resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} @@ -3114,8 +3114,8 @@ packages: resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} dev: true - /@types/node@20.12.2: - resolution: {integrity: sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==} + /@types/node@20.12.7: + resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==} dependencies: undici-types: 5.26.5 @@ -3131,7 +3131,7 @@ packages: resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==} requiresBuild: true dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 xmlbuilder: 15.1.1 dev: true optional: true @@ -3142,23 +3142,23 @@ packages: /@types/react-color@3.0.12: resolution: {integrity: sha512-pr3uKE3lSvf7GFo1Rn2K3QktiZQFFrSgSGJ/3iMvSOYWt2pPAJ97rVdVfhWxYJZ8prAEXzoP2XX//3qGSQgu7Q==} dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 '@types/reactcss': 1.2.10 dev: true - /@types/react-dom@18.2.23: - resolution: {integrity: sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==} + /@types/react-dom@18.2.25: + resolution: {integrity: sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==} dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 dev: true /@types/react-transition-group@4.4.10: resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 - /@types/react@18.2.73: - resolution: {integrity: sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==} + /@types/react@18.2.77: + resolution: {integrity: sha512-CUT9KUUF+HytDM7WiXKLF9qUSg4tGImwy4FXTlfEDPEkkNUzJ7rVFolYweJ9fS1ljoIaP7M7Rdjc5eUm/Yu5AA==} dependencies: '@types/prop-types': 15.7.12 csstype: 3.1.3 @@ -3166,13 +3166,13 @@ packages: /@types/reactcss@1.2.10: resolution: {integrity: sha512-gf5qJ1wOYP8N5q9H8/5c3QZHQzu8ltPClhM0vEWuBu9SGg4KSzgpJd2TShEsQDwsYn+mtnJ1xHUdJyzj/r9WrA==} dependencies: - '@types/react': 18.2.73 + '@types/react': 18.2.77 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 /@types/route-parser@0.1.7: resolution: {integrity: sha512-haO+3HVio/4w+yuMJTjqfSo0ivOV8WnXaOReVD6QN729UGBEyizWNGc2Jd0OLsJDucIod4aJSsPLBeLj2uzMCQ==} @@ -3190,10 +3190,10 @@ packages: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true - /@types/tar@6.1.11: - resolution: {integrity: sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg==} + /@types/tar@6.1.12: + resolution: {integrity: sha512-FwbJPi9YuovB6ilnHrz8Y4pb0Fh6N7guFkbnlCl39ua893Qi5gkXui7LSDpTQMJCmA4z5f6SeSrTPQEWLdtFVw==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 minipass: 4.2.8 dev: true @@ -3225,10 +3225,10 @@ packages: resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} requiresBuild: true dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 optional: true - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): + /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5): resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3240,10 +3240,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 @@ -3251,14 +3251,14 @@ packages: ignore: 5.3.0 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.0.3(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/eslint-plugin@7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==} + /@typescript-eslint/eslint-plugin@7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5): + resolution: {integrity: sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -3269,25 +3269,25 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/scope-manager': 7.4.0 - '@typescript-eslint/type-utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/visitor-keys': 7.4.0 + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.6.0 + '@typescript-eslint/type-utils': 7.6.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.6.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.6.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 graphemer: 1.4.0 - ignore: 5.3.0 + ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.3.0(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==} + /@typescript-eslint/parser@7.6.0(eslint@8.57.0)(typescript@5.4.5): + resolution: {integrity: sha512-usPMPHcwX3ZoPWnBnhhorc14NJw9J4HpSXQX4urF2TPKG0au0XhJoZyX62fmvdHONUkmyUe74Hzm1//XA+BoYg==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3296,13 +3296,13 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 7.3.1 - '@typescript-eslint/types': 7.3.1 - '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3) - '@typescript-eslint/visitor-keys': 7.3.1 + '@typescript-eslint/scope-manager': 7.6.0 + '@typescript-eslint/types': 7.6.0 + '@typescript-eslint/typescript-estree': 7.6.0(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.6.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 - typescript: 5.4.3 + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true @@ -3323,23 +3323,15 @@ packages: '@typescript-eslint/visitor-keys': 6.21.0 dev: true - /@typescript-eslint/scope-manager@7.3.1: - resolution: {integrity: sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==} - engines: {node: ^18.18.0 || >=20.0.0} - dependencies: - '@typescript-eslint/types': 7.3.1 - '@typescript-eslint/visitor-keys': 7.3.1 - dev: true - - /@typescript-eslint/scope-manager@7.4.0: - resolution: {integrity: sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==} + /@typescript-eslint/scope-manager@7.6.0: + resolution: {integrity: sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==} engines: {node: ^18.18.0 || >=20.0.0} dependencies: - '@typescript-eslint/types': 7.4.0 - '@typescript-eslint/visitor-keys': 7.4.0 + '@typescript-eslint/types': 7.6.0 + '@typescript-eslint/visitor-keys': 7.6.0 dev: true - /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.3): + /@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.4.5): resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3349,18 +3341,18 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.0.3(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/type-utils@7.4.0(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==} + /@typescript-eslint/type-utils@7.6.0(eslint@8.57.0)(typescript@5.4.5): + resolution: {integrity: sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3369,12 +3361,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3) - '@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/typescript-estree': 7.6.0(typescript@5.4.5) + '@typescript-eslint/utils': 7.6.0(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.4(supports-color@5.5.0) eslint: 8.57.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.3.0(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true @@ -3389,17 +3381,12 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/types@7.3.1: - resolution: {integrity: sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==} - engines: {node: ^18.18.0 || >=20.0.0} - dev: true - - /@typescript-eslint/types@7.4.0: - resolution: {integrity: sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==} + /@typescript-eslint/types@7.6.0: + resolution: {integrity: sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==} engines: {node: ^18.18.0 || >=20.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.3): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.5): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3414,13 +3401,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.4.3) - typescript: 5.4.3 + tsutils: 3.21.0(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.3): + /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.5): resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3436,36 +3423,14 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 - transitivePeerDependencies: - - supports-color - dev: true - - /@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.3): - resolution: {integrity: sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==} - engines: {node: ^18.18.0 || >=20.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 7.3.1 - '@typescript-eslint/visitor-keys': 7.3.1 - debug: 4.3.4(supports-color@5.5.0) - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.3 - semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.0.3(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@7.4.0(typescript@5.4.3): - resolution: {integrity: sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==} + /@typescript-eslint/typescript-estree@7.6.0(typescript@5.4.5): + resolution: {integrity: sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: typescript: '*' @@ -3473,20 +3438,20 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 7.4.0 - '@typescript-eslint/visitor-keys': 7.4.0 + '@typescript-eslint/types': 7.6.0 + '@typescript-eslint/visitor-keys': 7.6.0 debug: 4.3.4(supports-color@5.5.0) globby: 11.1.0 is-glob: 4.0.3 - minimatch: 9.0.3 + minimatch: 9.0.4 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.4.3) - typescript: 5.4.3 + ts-api-utils: 1.3.0(typescript@5.4.5) + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.3): + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.5): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3497,7 +3462,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.5) eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.0 @@ -3506,7 +3471,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.3): + /@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.5): resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -3517,7 +3482,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.3) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -3525,8 +3490,8 @@ packages: - typescript dev: true - /@typescript-eslint/utils@7.4.0(eslint@8.57.0)(typescript@5.4.3): - resolution: {integrity: sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==} + /@typescript-eslint/utils@7.6.0(eslint@8.57.0)(typescript@5.4.5): + resolution: {integrity: sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -3534,9 +3499,9 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 - '@typescript-eslint/scope-manager': 7.4.0 - '@typescript-eslint/types': 7.4.0 - '@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3) + '@typescript-eslint/scope-manager': 7.6.0 + '@typescript-eslint/types': 7.6.0 + '@typescript-eslint/typescript-estree': 7.6.0(typescript@5.4.5) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -3560,19 +3525,11 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typescript-eslint/visitor-keys@7.3.1: - resolution: {integrity: sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==} - engines: {node: ^18.18.0 || >=20.0.0} - dependencies: - '@typescript-eslint/types': 7.3.1 - eslint-visitor-keys: 3.4.3 - dev: true - - /@typescript-eslint/visitor-keys@7.4.0: - resolution: {integrity: sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==} + /@typescript-eslint/visitor-keys@7.6.0: + resolution: {integrity: sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==} engines: {node: ^18.18.0 || >=20.0.0} dependencies: - '@typescript-eslint/types': 7.4.0 + '@typescript-eslint/types': 7.6.0 eslint-visitor-keys: 3.4.3 dev: true @@ -5393,7 +5350,7 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - /cosmiconfig-typescript-loader@5.0.0(@types/node@20.12.2)(cosmiconfig@9.0.0)(typescript@5.4.3): + /cosmiconfig-typescript-loader@5.0.0(@types/node@20.12.7)(cosmiconfig@9.0.0)(typescript@5.4.5): resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==} engines: {node: '>=v16'} peerDependencies: @@ -5401,10 +5358,10 @@ packages: cosmiconfig: '>=8.2' typescript: '>=4' dependencies: - '@types/node': 20.12.2 - cosmiconfig: 9.0.0(typescript@5.4.3) + '@types/node': 20.12.7 + cosmiconfig: 9.0.0(typescript@5.4.5) jiti: 1.21.0 - typescript: 5.4.3 + typescript: 5.4.5 dev: true /cosmiconfig@7.1.0: @@ -5418,7 +5375,7 @@ packages: yaml: 1.10.2 dev: false - /cosmiconfig@9.0.0(typescript@5.4.3): + /cosmiconfig@9.0.0(typescript@5.4.5): resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} engines: {node: '>=14'} peerDependencies: @@ -5431,7 +5388,7 @@ packages: import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 - typescript: 5.4.3 + typescript: 5.4.5 dev: true /crc-32@1.2.2: @@ -5456,7 +5413,7 @@ packages: dev: true optional: true - /create-jest@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): + /create-jest@29.7.0(@types/node@20.12.7)(ts-node@10.9.2): resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -5465,7 +5422,7 @@ packages: chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -5577,8 +5534,8 @@ packages: engines: {node: '>=12'} dev: true - /darkreader@4.9.80: - resolution: {integrity: sha512-4MxER8urVmzpf0Z98PGj9Z0nL8ZfAhIZLLcWtdTfy/xM15ciGIOSiRa+0DqJ52euiMBr5CH8DutEVLaDho0naA==} + /darkreader@4.9.83: + resolution: {integrity: sha512-8KVSMjhd6DUTpbXeP1t2jXp1UzOYQCj/84vD7Y6fFvSzFoRmJRcFNeeEu+JSxku3eXPwUM/vGNNRdoVulFZ5CQ==} dev: false /dashdash@1.14.1: @@ -6153,14 +6110,14 @@ packages: mkdirp: 0.5.6 dev: false - /electron@29.2.0: - resolution: {integrity: sha512-ALKrCN52RG4g9prx4DriXSPnY5WoiyRUCNp7zEVQuoiNOpHTNqMMpRidQAHzntV4hajF1LMWHVoBkwqIs1jHhg==} + /electron@29.3.0: + resolution: {integrity: sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true dependencies: '@electron/get': 2.0.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -6571,21 +6528,21 @@ packages: dependencies: confusing-browser-globals: 1.0.11 eslint: 8.57.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint@8.57.0) object.assign: 4.1.5 object.entries: 1.1.7 semver: 6.3.1 dev: true - /eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.4.0)(@typescript-eslint/parser@7.3.1)(eslint-plugin-import@2.29.1)(eslint@8.57.0): + /eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.6.0)(@typescript-eslint/parser@7.6.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0): resolution: {integrity: sha512-oc+Lxzgzsu8FQyFVa4QFaVKiitTYiiW3frB9KYW5OWdPrqFc7FzxgB20hP4cHMlr+MBzGcLl3jnCOVOydL9mIg==} peerDependencies: '@typescript-eslint/eslint-plugin': ^7.0.0 '@typescript-eslint/parser': ^7.0.0 eslint: ^8.56.0 dependencies: - '@typescript-eslint/eslint-plugin': 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/eslint-plugin': 7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0) transitivePeerDependencies: @@ -6604,7 +6561,7 @@ packages: dependencies: eslint: 8.57.0 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint@8.57.0) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) eslint-plugin-react: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) @@ -6631,7 +6588,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.3.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -6652,7 +6609,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -6660,7 +6617,7 @@ packages: - supports-color dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.6.0)(eslint@8.57.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: @@ -6670,7 +6627,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -6679,7 +6636,7 @@ packages: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.3.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -6695,7 +6652,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.4.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.3): + /eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.6.0)(eslint@8.57.0)(jest@29.7.0)(typescript@5.4.5): resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -6708,10 +6665,10 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 7.4.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/eslint-plugin': 7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 - jest: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + jest: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) transitivePeerDependencies: - supports-color - typescript @@ -6799,7 +6756,7 @@ packages: string.prototype.matchall: 4.0.11 dev: true - /eslint-plugin-sonar@0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3): + /eslint-plugin-sonar@0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5): resolution: {integrity: sha512-7mZkk4/E2tGtIi3OCNCTmEWthweWzoAj9YcsxxIDI38r7q4RDusWDpsdGHPZXp/+QU8ZKkvmE11G4DtJW+k1kg==} engines: {node: '>=14'} peerDependencies: @@ -6811,8 +6768,8 @@ packages: '@babel/core': 7.24.4 '@babel/eslint-parser': 7.23.10(@babel/core@7.24.4)(eslint@8.57.0) '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3) - '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5) builtin-modules: 3.3.0 bytes: 3.1.2 eslint: 8.57.0 @@ -6825,7 +6782,7 @@ packages: minimatch: 9.0.3 scslre: 0.3.0 tmp: 0.2.1 - typescript: 5.4.3 + typescript: 5.4.5 transitivePeerDependencies: - supports-color dev: true @@ -8242,6 +8199,11 @@ packages: engines: {node: '>= 4'} dev: true + /ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} + engines: {node: '>= 4'} + dev: true + /immutable@4.3.2: resolution: {integrity: sha512-oGXzbEDem9OOpDWZu88jGiYCvIsLHMvGw+8OXlpsvTFvIQplQbjg1B1cvKg8f7Hoch6+NGjpPsH1Fr+Mc2D1aA==} @@ -8953,7 +8915,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -8974,7 +8936,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): + /jest-cli@29.7.0(@types/node@20.12.7)(ts-node@10.9.2): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -8988,10 +8950,10 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + create-jest: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -9002,7 +8964,7 @@ packages: - ts-node dev: true - /jest-config@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): + /jest-config@29.7.0(@types/node@20.12.7)(ts-node@10.9.2): resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -9017,7 +8979,7 @@ packages: '@babel/core': 7.23.5 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 babel-jest: 29.7.0(@babel/core@7.23.5) chalk: 4.1.2 ci-info: 3.8.0 @@ -9037,7 +8999,7 @@ packages: pretty-format: 29.7.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@20.12.2)(typescript@5.4.3) + ts-node: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -9078,7 +9040,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 jest-mock: 29.7.0 jest-util: 29.7.0 dev: true @@ -9094,7 +9056,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.5 - '@types/node': 20.12.2 + '@types/node': 20.12.7 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -9145,7 +9107,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 jest-util: 29.7.0 dev: true @@ -9200,7 +9162,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -9231,7 +9193,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -9283,7 +9245,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -9308,7 +9270,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.12.2 + '@types/node': 20.12.7 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -9320,13 +9282,13 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.7 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true - /jest@29.7.0(@types/node@20.12.2)(ts-node@10.9.2): + /jest@29.7.0(@types/node@20.12.7)(ts-node@10.9.2): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -9339,7 +9301,7 @@ packages: '@jest/core': 29.7.0(ts-node@10.9.2) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.12.2)(ts-node@10.9.2) + jest-cli: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -10144,8 +10106,8 @@ packages: object-visit: 1.0.1 dev: false - /markdown-to-jsx@7.4.5(react@18.2.0): - resolution: {integrity: sha512-c8NB0H/ig+FOWssE9be0PKsYbCDhcWEkicxMnpdfUuHbFljnen4LAdgUShOyR/PgO3/qKvt9cwfQ0U/zQvZ44A==} + /markdown-to-jsx@7.4.6(react@18.2.0): + resolution: {integrity: sha512-3cyNxI/PwotvYkjg6KmFaN1uyN/7NqETteD2DobBB8ro/FR9jsHIh4Fi7ywAz0s9QHRKCmGlOUggs5GxSWACKA==} engines: {node: '>= 10'} peerDependencies: react: '>= 0.14.0' @@ -10301,6 +10263,13 @@ packages: brace-expansion: 2.0.1 dev: true + /minimatch@9.0.4: + resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} @@ -11735,8 +11704,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-intl@6.6.4(react@18.2.0)(typescript@5.4.3): - resolution: {integrity: sha512-bD+7hVTX3zBFI3z/ffIVZrNkCVK0/sQguQ/DqW5uZ6JFWsuiwOieVcLnmtFiUgMQZLdmwNl2Ur5c10RaO7NWBQ==} + /react-intl@6.6.5(react@18.2.0)(typescript@5.4.5): + resolution: {integrity: sha512-OErDPbGqus0QKVj77MGCC9Plbnys3CDQrq6Lw41c60pmeTdn41AhoS1SIzXG6SUlyF7qNN2AVqfrrIvHUgSyLQ==} peerDependencies: react: ^16.6.0 || 17 || 18 typescript: ^4.7 || 5 @@ -11746,16 +11715,16 @@ packages: dependencies: '@formatjs/ecma402-abstract': 1.18.2 '@formatjs/icu-messageformat-parser': 2.7.6 - '@formatjs/intl': 2.10.1(typescript@5.4.3) + '@formatjs/intl': 2.10.1(typescript@5.4.5) '@formatjs/intl-displaynames': 6.6.6 '@formatjs/intl-listformat': 7.5.5 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 18.2.73 + '@types/react': 18.2.77 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.5.11 react: 18.2.0 tslib: 2.6.2 - typescript: 5.4.3 + typescript: 5.4.5 dev: false /react-is@16.13.1: @@ -13552,16 +13521,25 @@ packages: dependencies: utf8-byte-length: 1.0.4 - /ts-api-utils@1.0.3(typescript@5.4.3): + /ts-api-utils@1.0.3(typescript@5.4.5): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.4.3 + typescript: 5.4.5 + dev: true + + /ts-api-utils@1.3.0(typescript@5.4.5): + resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} + engines: {node: '>=16'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.4.5 dev: true - /ts-node@10.9.2(@types/node@20.12.2)(typescript@5.4.3): + /ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -13580,14 +13558,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.12.2 + '@types/node': 20.12.7 acorn: 8.11.2 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.4.3 + typescript: 5.4.5 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -13617,14 +13595,14 @@ packages: engines: {node: '>=0.6.x'} dev: false - /tsutils@3.21.0(typescript@5.4.3): + /tsutils@3.21.0(typescript@5.4.5): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.4.3 + typescript: 5.4.5 dev: true /tunnel-agent@0.6.0: @@ -13784,8 +13762,8 @@ packages: hasBin: true dev: true - /typescript@5.4.3: - resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} + /typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} engines: {node: '>=14.17'} hasBin: true diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts index 58c6845ac9..69994114e0 100644 --- a/src/api/server/ServerApi.ts +++ b/src/api/server/ServerApi.ts @@ -462,7 +462,6 @@ export default class ServerApi { await sleep(10); - // @ts-expect-error No overload matches this call. await tar.x({ file: archivePath, cwd: recipeTempDirectory, diff --git a/src/components/settings/recipes/RecipeItem.tsx b/src/components/settings/recipes/RecipeItem.tsx index 432e4e6a18..0bf426da25 100644 --- a/src/components/settings/recipes/RecipeItem.tsx +++ b/src/components/settings/recipes/RecipeItem.tsx @@ -1,5 +1,5 @@ -import { Component, MouseEventHandler } from 'react'; import { observer } from 'mobx-react'; +import { Component, MouseEventHandler } from 'react'; import RecipePreview from '../../../models/RecipePreview'; interface IProps { diff --git a/src/components/settings/recipes/RecipesDashboard.tsx b/src/components/settings/recipes/RecipesDashboard.tsx index c7aeaa9b35..3408d8f6d2 100644 --- a/src/components/settings/recipes/RecipesDashboard.tsx +++ b/src/components/settings/recipes/RecipesDashboard.tsx @@ -1,20 +1,20 @@ -import { Component } from 'react'; +import { mdiOpenInNew } from '@mdi/js'; import { observer } from 'mobx-react'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; -import { NavLink } from 'react-router-dom'; +import { Component } from 'react'; +import { WrappedComponentProps, defineMessages, injectIntl } from 'react-intl'; import withStyles, { WithStylesProps } from 'react-jss'; -import { mdiOpenInNew } from '@mdi/js'; +import { NavLink } from 'react-router-dom'; +import { FERDIUM_SERVICE_REQUEST } from '../../../config'; +import RecipePreview from '../../../models/RecipePreview'; +import SearchInput from '../../ui/SearchInput'; import Button from '../../ui/button'; -import Input from '../../ui/input/index'; +import Appear from '../../ui/effects/Appear'; import { H1, H2, H3 } from '../../ui/headline'; -import SearchInput from '../../ui/SearchInput'; +import Icon from '../../ui/icon'; import Infobox from '../../ui/infobox/index'; -import RecipeItem from './RecipeItem'; +import Input from '../../ui/input/index'; import Loader from '../../ui/loader'; -import Appear from '../../ui/effects/Appear'; -import { FERDIUM_SERVICE_REQUEST } from '../../../config'; -import RecipePreview from '../../../models/RecipePreview'; -import Icon from '../../ui/icon'; +import RecipeItem from './RecipeItem'; const messages = defineMessages({ headline: { From 77b5f1481e06443862c6fa31a10fe9196f628f39 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Sat, 13 Apr 2024 10:05:38 +0530 Subject: [PATCH 26/54] Add codespell support (config, GH action to detect new typos) + make it fix some typos (#1648) --- .codespellrc | 9 ++++++++ .github/workflows/codespell.yml | 23 +++++++++++++++++++ CHANGELOG.md | 4 ++-- docs/MIGRATION.md | 2 +- docs/dbus/org.ferdium.Ferdium.xml | 2 +- scripts/migration/migrate-unix.sh | 2 +- src/@types/mobx-form.types.ts | 2 +- .../releaseNotes/ReleaseNotesDashboard.tsx | 4 ++-- .../settings/settings/EditSettingsForm.tsx | 4 ++-- src/features/publishDebugInfo/Component.tsx | 2 +- src/features/quickSwitch/Component.tsx | 2 +- src/helpers/translation-helpers.ts | 2 +- src/helpers/update-helpers.ts | 4 ++-- src/i18n/locales/en-US.json | 10 ++++---- .../resources/views/transfer.edge | 2 +- src/internal-server/start/routes.js | 2 +- src/webview/contextMenuBuilder.ts | 2 +- 17 files changed, 55 insertions(+), 23 deletions(-) create mode 100644 .codespellrc create mode 100644 .github/workflows/codespell.yml diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000000..5e3e024376 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,9 @@ +[codespell] +# Ref: https://github.com/codespell-project/codespell#using-a-config-file +skip = .git*,*.svg,*.css,.codespellrc,locales,pnpm-lock.yaml,i18n,config.ts,extensions.json +check-hidden = true +# Case sensitive names, or phrases (typically non-English), to ignore +# Python style regex. \b is a match at a word boundary +ignore-regex = \b(Manuel|Sie diesen|Sie den|l'authentification)\b +# Case insensitive comma separated list of words to ignore +# ignore-words-list = diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml new file mode 100644 index 0000000000..feadb9a34b --- /dev/null +++ b/.github/workflows/codespell.yml @@ -0,0 +1,23 @@ +# Codespell configuration is within .codespellrc +--- +name: Codespell + +on: + push: + branches: [develop] + pull_request: + branches: [develop] + +permissions: + contents: read + +jobs: + codespell: + name: Check for spelling errors + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Codespell + uses: codespell-project/actions-codespell@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 05b163a61d..6a88c9aa6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -192,7 +192,7 @@ - Fix default accent color to Ferdium gradient - Fix reload after resume and add idle time setting - Don't replace custom icon when service updates -- Workaroud for in-app Password Recovery +- Workaround for in-app Password Recovery - Fix navigation toolbar buttons not being clickable - Fix drag-n-drop not working if the service name is shown - Fix ribbon menu style on windows @@ -225,7 +225,7 @@ - Resurrect the electron-process-manager for Ferdium - Hide sidebar buttons toggled behind a hamburger menu - Add monochromatic Service icons option with Dim adjustment -- Add new service-level option where the user can choose whether to open links in Ferdium or in the default browser. Currently implimented only for discord, skype, steamchat and zoom. +- Add new service-level option where the user can choose whether to open links in Ferdium or in the default browser. Currently implemented only for discord, skype, steamchat and zoom. ### Services diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index bb1ca315db..a3a02db11a 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -12,7 +12,7 @@ The main advantage of using Ferdi with an account is that you have your configur ## Using Ferdi without an account i.e. Accountless -Accountless instances have all the same functionality as account-based ones with the exception of multi-machine syncronization. If you don't intend to use this app on multiple machines with regularly changing settings and lists of services, there's no benefit to having an online account. Having a backup of your `export.ferdi-data` whenever you make changes to your setup, provides a similarly secure (albeit slower and manual alternative) to automatic syncing that doesn't rely on a server's constant availability. +Accountless instances have all the same functionality as account-based ones with the exception of multi-machine synchronization. If you don't intend to use this app on multiple machines with regularly changing settings and lists of services, there's no benefit to having an online account. Having a backup of your `export.ferdi-data` whenever you make changes to your setup, provides a similarly secure (albeit slower and manual alternative) to automatic syncing that doesn't rely on a server's constant availability. ## Exporting diff --git a/docs/dbus/org.ferdium.Ferdium.xml b/docs/dbus/org.ferdium.Ferdium.xml index 0ee3953289..47da8ee893 100644 --- a/docs/dbus/org.ferdium.Ferdium.xml +++ b/docs/dbus/org.ferdium.Ferdium.xml @@ -22,7 +22,7 @@