From 17ff899218d1af8230c1c0b3173e53edb0c3555a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:55:25 +0000 Subject: [PATCH 1/6] chore(deps): bump tailwind-merge from 2.4.0 to 2.5.1 in /backend Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.4.0 to 2.5.1. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.4.0...v2.5.1) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- backend/package-lock.json | 8 ++++---- backend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 4bd4d66a4e..7c2114d034 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -41,7 +41,7 @@ "nprogress": "^0.2.0", "pretty-bytes": "^6.1.1", "svelte-intersection-observer": "^1.0.0", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.1", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.9", "vite": "^5.4.0", @@ -3549,9 +3549,9 @@ } }, "node_modules/tailwind-merge": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz", - "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.1.tgz", + "integrity": "sha512-1zKDdExKvNltulO+J0x/Rqv40xQn78FHsEQVn3rxt8e4HdebRIT6o6zGeLYlGuxd3Efue9Y69qsp8vKwEhuEeg==", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/backend/package.json b/backend/package.json index 6eab636cad..97ba598079 100644 --- a/backend/package.json +++ b/backend/package.json @@ -44,7 +44,7 @@ "nprogress": "^0.2.0", "pretty-bytes": "^6.1.1", "svelte-intersection-observer": "^1.0.0", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.1", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.9", "vite": "^5.4.0", From fa5b4f0de68e2e34d378bf9fcd5b1818064daf2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:47:59 +0000 Subject: [PATCH 2/6] chore(deps-dev): bump tailwind-merge from 2.4.0 to 2.5.1 in /seeder Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.4.0 to 2.5.1. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.4.0...v2.5.1) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- seeder/package-lock.json | 10 ++++------ seeder/package.json | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/seeder/package-lock.json b/seeder/package-lock.json index 3620120e41..38df193d1e 100644 --- a/seeder/package-lock.json +++ b/seeder/package-lock.json @@ -9,7 +9,6 @@ "version": "1.0.0", "hasInstallScript": true, "dependencies": { - "@coreproject-moe/icons": "^0.0.11", "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", "electron-updater": "^6.1.7" @@ -35,7 +34,7 @@ "prettier": "^3.3.2", "prettier-plugin-tailwindcss": "^0.6.6", "solid-js": "^1.8.20", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.1", "tailwindcss": "^3.4.9", "terser": "^5.31.5", "typescript": "^5.5.2", @@ -8218,11 +8217,10 @@ } }, "node_modules/tailwind-merge": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz", - "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.1.tgz", + "integrity": "sha512-1zKDdExKvNltulO+J0x/Rqv40xQn78FHsEQVn3rxt8e4HdebRIT6o6zGeLYlGuxd3Efue9Y69qsp8vKwEhuEeg==", "dev": true, - "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/seeder/package.json b/seeder/package.json index d893c18b73..2ea5f101eb 100644 --- a/seeder/package.json +++ b/seeder/package.json @@ -44,7 +44,7 @@ "prettier": "^3.3.2", "prettier-plugin-tailwindcss": "^0.6.6", "solid-js": "^1.8.20", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.1", "tailwindcss": "^3.4.9", "terser": "^5.31.5", "typescript": "^5.5.2", From 4c2620b075238197c2005e57a1c2f1aa2632ed92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:47:41 +0000 Subject: [PATCH 3/6] chore(deps): bump electron-updater from 6.3.2 to 6.3.3 in /seeder Bumps [electron-updater](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-updater) from 6.3.2 to 6.3.3. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-updater/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/commits/electron-updater@6.3.3/packages/electron-updater) --- updated-dependencies: - dependency-name: electron-updater dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- seeder/package-lock.json | 8 ++++---- seeder/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/seeder/package-lock.json b/seeder/package-lock.json index 38df193d1e..85d442ae1a 100644 --- a/seeder/package-lock.json +++ b/seeder/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", - "electron-updater": "^6.1.7" + "electron-updater": "^6.3.3" }, "devDependencies": { "@coreproject-moe/icons": "^0.0.13", @@ -4592,9 +4592,9 @@ "license": "ISC" }, "node_modules/electron-updater": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.2.tgz", - "integrity": "sha512-bEpuZ1IRnMtvZZaWeYi9ocX90Cnk+/impZ/08r6GQkfOMqECtKC2IjvxHcDk2VpWO8QZzK0+MUNaBiO81CGvQQ==", + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.3.tgz", + "integrity": "sha512-Kj1u6kfyxUyatnspvKa6qhGn82rMZfUD03WOvCGJ12PyRss/AC8kkYsN9IrJihKTlN8nRwTjZ1JM2UUXoD0KsA==", "dependencies": { "builder-util-runtime": "9.2.5", "fs-extra": "^10.1.0", diff --git a/seeder/package.json b/seeder/package.json index 2ea5f101eb..93675e3857 100644 --- a/seeder/package.json +++ b/seeder/package.json @@ -21,7 +21,7 @@ "dependencies": { "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", - "electron-updater": "^6.1.7" + "electron-updater": "^6.3.3" }, "devDependencies": { "@coreproject-moe/icons": "^0.0.13", From 923441590ee529716cbf29a52a3e19ef4bf782e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:39:35 +0000 Subject: [PATCH 4/6] chore(deps): bump gunicorn from 22.0.0 to 23.0.0 in /backend Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 22.0.0 to 23.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/22.0.0...23.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- backend/poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index d7556dc327..8a4e9b9af2 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -925,13 +925,13 @@ Django = ">=2.2" [[package]] name = "gunicorn" -version = "22.0.0" +version = "23.0.0" description = "WSGI HTTP Server for UNIX" optional = false python-versions = ">=3.7" files = [ - {file = "gunicorn-22.0.0-py3-none-any.whl", hash = "sha256:350679f91b24062c86e386e198a15438d53a7a8207235a78ba1b53df4c4378d9"}, - {file = "gunicorn-22.0.0.tar.gz", hash = "sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63"}, + {file = "gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d"}, + {file = "gunicorn-23.0.0.tar.gz", hash = "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec"}, ] [package.dependencies] From 0cec5304503625e3f686e859bc7faa8b812fdc78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:36:49 +0000 Subject: [PATCH 5/6] chore(deps): bump actions/setup-node from 3 to 4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/seeder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/seeder.yml b/.github/workflows/seeder.yml index ccd377ec7b..6b50693196 100644 --- a/.github/workflows/seeder.yml +++ b/.github/workflows/seeder.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout Seeder uses: actions/checkout@v4 - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: cache: 'npm' cache-dependency-path: seeder/package-lock.json From 873d489c3785037e2f07ad0faccc54f85e255cae Mon Sep 17 00:00:00 2001 From: moonlit_grace Date: Mon, 12 Aug 2024 21:59:02 +0530 Subject: [PATCH 6/6] refactor(seeder): better IPC handling (#3964) * dunn * Revert "Merge branch 'master' into dunn" This reverts commit 9c9bb015d0a2bbfd92a571fc82e76d0f7b8d8d43, reversing changes made to df1baaeaa38e086492476a301c0a347e397246a2. * Fix * Allow for splitting bundle * Remove false eslint message * Fix random shitty error * add --------- Co-authored-by: baseplate-admin <61817579+baseplate-admin@users.noreply.github.com> --- seeder/src/main/index.ts | 2 +- seeder/src/main/interfaces/shiinobi.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/seeder/src/main/index.ts b/seeder/src/main/index.ts index 3a5edff12f..45785c2e4f 100644 --- a/seeder/src/main/index.ts +++ b/seeder/src/main/index.ts @@ -61,7 +61,7 @@ app.whenReady().then(() => { ipcMain.handle("get-app-version", () => app.getVersion()); // Shiinobi Object.entries(IPC_MAPPING).forEach((item) => { - ipcMain.handle(item[0], item[1]); + ipcMain.handle(item[0], async () => await item[1]()); }); createWindow(); diff --git a/seeder/src/main/interfaces/shiinobi.ts b/seeder/src/main/interfaces/shiinobi.ts index a5aca72e6c..deca61f54a 100644 --- a/seeder/src/main/interfaces/shiinobi.ts +++ b/seeder/src/main/interfaces/shiinobi.ts @@ -67,9 +67,9 @@ class Shiinobi { }); } - public async get_myanimelist_staff_urls() { + public get_myanimelist_staff_urls = async () => { return await this.#spawn({ command: "get-myanimelist-staff-urls" }); - } + }; } export { Shiinobi };