diff options
| -rw-r--r-- | packages/plugins-queue-liteque/package.json | 26 | ||||
| -rw-r--r-- | packages/plugins-queue-liteque/tsconfig.json | 10 | ||||
| -rw-r--r-- | packages/plugins-queue-restate/.oxlintrc.json | 19 | ||||
| -rw-r--r-- | packages/plugins-queue-restate/tsconfig.json | 10 | ||||
| -rw-r--r-- | packages/plugins-search-meilisearch/.oxlintrc.json | 19 | ||||
| -rw-r--r-- | packages/plugins-search-meilisearch/package.json | 26 | ||||
| -rw-r--r-- | packages/plugins/.oxlintrc.json (renamed from packages/plugins-queue-liteque/.oxlintrc.json) | 0 | ||||
| -rw-r--r-- | packages/plugins/package.json (renamed from packages/plugins-queue-restate/package.json) | 11 | ||||
| -rw-r--r-- | packages/plugins/queue-liteque/index.ts (renamed from packages/plugins-queue-liteque/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-liteque/src/index.ts (renamed from packages/plugins-queue-liteque/src/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/index.ts (renamed from packages/plugins-queue-restate/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/admin.ts (renamed from packages/plugins-queue-restate/src/admin.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/env.ts (renamed from packages/plugins-queue-restate/src/env.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/idProvider.ts (renamed from packages/plugins-queue-restate/src/idProvider.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/index.ts (renamed from packages/plugins-queue-restate/src/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/semaphore.ts (renamed from packages/plugins-queue-restate/src/semaphore.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/service.ts (renamed from packages/plugins-queue-restate/src/service.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/tests/docker-compose.yml (renamed from packages/plugins-queue-restate/src/tests/docker-compose.yml) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/tests/queue.test.ts (renamed from packages/plugins-queue-restate/src/tests/queue.test.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/tests/setup/startContainers.ts (renamed from packages/plugins-queue-restate/src/tests/setup/startContainers.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/queue-restate/src/tests/utils.ts (renamed from packages/plugins-queue-restate/src/tests/utils.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/search-meilisearch/index.ts (renamed from packages/plugins-search-meilisearch/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/search-meilisearch/src/env.ts (renamed from packages/plugins-search-meilisearch/src/env.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/search-meilisearch/src/index.ts (renamed from packages/plugins-search-meilisearch/src/index.ts) | 0 | ||||
| -rw-r--r-- | packages/plugins/tsconfig.json (renamed from packages/plugins-search-meilisearch/tsconfig.json) | 0 | ||||
| -rw-r--r-- | packages/plugins/vitest.config.ts (renamed from packages/plugins-queue-restate/vitest.config.ts) | 4 | ||||
| -rw-r--r-- | packages/shared-server/package.json | 4 | ||||
| -rw-r--r-- | packages/shared-server/src/plugins.ts | 6 | ||||
| -rw-r--r-- | pnpm-lock.yaml | 80 |
29 files changed, 33 insertions, 182 deletions
diff --git a/packages/plugins-queue-liteque/package.json b/packages/plugins-queue-liteque/package.json deleted file mode 100644 index bb4b1aac..00000000 --- a/packages/plugins-queue-liteque/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/package.json", - "name": "@karakeep/plugins-queue-liteque", - "version": "0.1.0", - "private": true, - "type": "module", - "scripts": { - "typecheck": "tsc --noEmit", - "format": "prettier . --cache --ignore-path ../../.prettierignore --check", - "format:fix": "prettier . --cache --ignore-path ../../.prettierignore --write", - "lint": "oxlint .", - "lint:fix": "oxlint . --fix", - "test": "vitest" - }, - "dependencies": { - "@karakeep/shared": "workspace:*", - "liteque": "^0.6.2" - }, - "devDependencies": { - "@karakeep/prettier-config": "workspace:^0.1.0", - "@karakeep/tsconfig": "workspace:^0.1.0", - "vite-tsconfig-paths": "^4.3.1", - "vitest": "^3.2.4" - }, - "prettier": "@karakeep/prettier-config" -} diff --git a/packages/plugins-queue-liteque/tsconfig.json b/packages/plugins-queue-liteque/tsconfig.json deleted file mode 100644 index 3bfa695c..00000000 --- a/packages/plugins-queue-liteque/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@karakeep/tsconfig/node.json", - "include": ["**/*.ts"], - "exclude": ["node_modules"], - "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" - } -} - diff --git a/packages/plugins-queue-restate/.oxlintrc.json b/packages/plugins-queue-restate/.oxlintrc.json deleted file mode 100644 index 79ba0255..00000000 --- a/packages/plugins-queue-restate/.oxlintrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "../../node_modules/oxlint/configuration_schema.json", - "extends": [ - "../../tooling/oxlint/oxlint-base.json" - ], - "env": { - "builtin": true, - "commonjs": true - }, - "ignorePatterns": [ - "**/*.config.js", - "**/*.config.cjs", - "**/.eslintrc.cjs", - "**/.next", - "**/dist", - "**/build", - "**/pnpm-lock.yaml" - ] -} diff --git a/packages/plugins-queue-restate/tsconfig.json b/packages/plugins-queue-restate/tsconfig.json deleted file mode 100644 index 3bfa695c..00000000 --- a/packages/plugins-queue-restate/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@karakeep/tsconfig/node.json", - "include": ["**/*.ts"], - "exclude": ["node_modules"], - "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" - } -} - diff --git a/packages/plugins-search-meilisearch/.oxlintrc.json b/packages/plugins-search-meilisearch/.oxlintrc.json deleted file mode 100644 index 79ba0255..00000000 --- a/packages/plugins-search-meilisearch/.oxlintrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$schema": "../../node_modules/oxlint/configuration_schema.json", - "extends": [ - "../../tooling/oxlint/oxlint-base.json" - ], - "env": { - "builtin": true, - "commonjs": true - }, - "ignorePatterns": [ - "**/*.config.js", - "**/*.config.cjs", - "**/.eslintrc.cjs", - "**/.next", - "**/dist", - "**/build", - "**/pnpm-lock.yaml" - ] -} diff --git a/packages/plugins-search-meilisearch/package.json b/packages/plugins-search-meilisearch/package.json deleted file mode 100644 index c9482731..00000000 --- a/packages/plugins-search-meilisearch/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/package.json", - "name": "@karakeep/plugins-search-meilisearch", - "version": "0.1.0", - "private": true, - "type": "module", - "scripts": { - "typecheck": "tsc --noEmit", - "format": "prettier . --cache --ignore-path ../../.prettierignore --check", - "format:fix": "prettier . --cache --ignore-path ../../.prettierignore --write", - "lint": "oxlint .", - "lint:fix": "oxlint . --fix", - "test": "vitest" - }, - "dependencies": { - "@karakeep/shared": "workspace:*", - "meilisearch": "^0.45.0" - }, - "devDependencies": { - "@karakeep/prettier-config": "workspace:^0.1.0", - "@karakeep/tsconfig": "workspace:^0.1.0", - "vite-tsconfig-paths": "^4.3.1", - "vitest": "^3.2.4" - }, - "prettier": "@karakeep/prettier-config" -} diff --git a/packages/plugins-queue-liteque/.oxlintrc.json b/packages/plugins/.oxlintrc.json index 79ba0255..79ba0255 100644 --- a/packages/plugins-queue-liteque/.oxlintrc.json +++ b/packages/plugins/.oxlintrc.json diff --git a/packages/plugins-queue-restate/package.json b/packages/plugins/package.json index 16681150..8b3f73f7 100644 --- a/packages/plugins-queue-restate/package.json +++ b/packages/plugins/package.json @@ -1,9 +1,14 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@karakeep/plugins-queue-restate", + "name": "@karakeep/plugins", "version": "0.1.0", "private": true, "type": "module", + "exports": { + "./queue-liteque": "./queue-liteque/index.ts", + "./queue-restate": "./queue-restate/index.ts", + "./search-meilisearch": "./search-meilisearch/index.ts" + }, "scripts": { "typecheck": "tsc --noEmit", "format": "prettier . --cache --ignore-path ../../.prettierignore --check", @@ -15,7 +20,9 @@ "dependencies": { "@karakeep/shared": "workspace:*", "@restatedev/restate-sdk": "^1.9.0", - "@restatedev/restate-sdk-clients": "^1.9.0" + "@restatedev/restate-sdk-clients": "^1.9.0", + "liteque": "^0.6.2", + "meilisearch": "^0.45.0" }, "devDependencies": { "@karakeep/prettier-config": "workspace:^0.1.0", diff --git a/packages/plugins-queue-liteque/index.ts b/packages/plugins/queue-liteque/index.ts index c3f7f03b..c3f7f03b 100644 --- a/packages/plugins-queue-liteque/index.ts +++ b/packages/plugins/queue-liteque/index.ts diff --git a/packages/plugins-queue-liteque/src/index.ts b/packages/plugins/queue-liteque/src/index.ts index ddc2181c..ddc2181c 100644 --- a/packages/plugins-queue-liteque/src/index.ts +++ b/packages/plugins/queue-liteque/src/index.ts diff --git a/packages/plugins-queue-restate/index.ts b/packages/plugins/queue-restate/index.ts index d313615c..d313615c 100644 --- a/packages/plugins-queue-restate/index.ts +++ b/packages/plugins/queue-restate/index.ts diff --git a/packages/plugins-queue-restate/src/admin.ts b/packages/plugins/queue-restate/src/admin.ts index dddc8f00..dddc8f00 100644 --- a/packages/plugins-queue-restate/src/admin.ts +++ b/packages/plugins/queue-restate/src/admin.ts diff --git a/packages/plugins-queue-restate/src/env.ts b/packages/plugins/queue-restate/src/env.ts index 01175e86..01175e86 100644 --- a/packages/plugins-queue-restate/src/env.ts +++ b/packages/plugins/queue-restate/src/env.ts diff --git a/packages/plugins-queue-restate/src/idProvider.ts b/packages/plugins/queue-restate/src/idProvider.ts index ee85f46f..ee85f46f 100644 --- a/packages/plugins-queue-restate/src/idProvider.ts +++ b/packages/plugins/queue-restate/src/idProvider.ts diff --git a/packages/plugins-queue-restate/src/index.ts b/packages/plugins/queue-restate/src/index.ts index bedc26af..bedc26af 100644 --- a/packages/plugins-queue-restate/src/index.ts +++ b/packages/plugins/queue-restate/src/index.ts diff --git a/packages/plugins-queue-restate/src/semaphore.ts b/packages/plugins/queue-restate/src/semaphore.ts index ad636f98..ad636f98 100644 --- a/packages/plugins-queue-restate/src/semaphore.ts +++ b/packages/plugins/queue-restate/src/semaphore.ts diff --git a/packages/plugins-queue-restate/src/service.ts b/packages/plugins/queue-restate/src/service.ts index de5b070f..de5b070f 100644 --- a/packages/plugins-queue-restate/src/service.ts +++ b/packages/plugins/queue-restate/src/service.ts diff --git a/packages/plugins-queue-restate/src/tests/docker-compose.yml b/packages/plugins/queue-restate/src/tests/docker-compose.yml index f24c2921..f24c2921 100644 --- a/packages/plugins-queue-restate/src/tests/docker-compose.yml +++ b/packages/plugins/queue-restate/src/tests/docker-compose.yml diff --git a/packages/plugins-queue-restate/src/tests/queue.test.ts b/packages/plugins/queue-restate/src/tests/queue.test.ts index e59d47cb..e59d47cb 100644 --- a/packages/plugins-queue-restate/src/tests/queue.test.ts +++ b/packages/plugins/queue-restate/src/tests/queue.test.ts diff --git a/packages/plugins-queue-restate/src/tests/setup/startContainers.ts b/packages/plugins/queue-restate/src/tests/setup/startContainers.ts index 7d9dea5c..7d9dea5c 100644 --- a/packages/plugins-queue-restate/src/tests/setup/startContainers.ts +++ b/packages/plugins/queue-restate/src/tests/setup/startContainers.ts diff --git a/packages/plugins-queue-restate/src/tests/utils.ts b/packages/plugins/queue-restate/src/tests/utils.ts index e02d2dee..e02d2dee 100644 --- a/packages/plugins-queue-restate/src/tests/utils.ts +++ b/packages/plugins/queue-restate/src/tests/utils.ts diff --git a/packages/plugins-search-meilisearch/index.ts b/packages/plugins/search-meilisearch/index.ts index 3496d52f..3496d52f 100644 --- a/packages/plugins-search-meilisearch/index.ts +++ b/packages/plugins/search-meilisearch/index.ts diff --git a/packages/plugins-search-meilisearch/src/env.ts b/packages/plugins/search-meilisearch/src/env.ts index c06fdd55..c06fdd55 100644 --- a/packages/plugins-search-meilisearch/src/env.ts +++ b/packages/plugins/search-meilisearch/src/env.ts diff --git a/packages/plugins-search-meilisearch/src/index.ts b/packages/plugins/search-meilisearch/src/index.ts index 30da4a64..30da4a64 100644 --- a/packages/plugins-search-meilisearch/src/index.ts +++ b/packages/plugins/search-meilisearch/src/index.ts diff --git a/packages/plugins-search-meilisearch/tsconfig.json b/packages/plugins/tsconfig.json index a795b96a..a795b96a 100644 --- a/packages/plugins-search-meilisearch/tsconfig.json +++ b/packages/plugins/tsconfig.json diff --git a/packages/plugins-queue-restate/vitest.config.ts b/packages/plugins/vitest.config.ts index 73e0e1b9..3d5f33f7 100644 --- a/packages/plugins-queue-restate/vitest.config.ts +++ b/packages/plugins/vitest.config.ts @@ -6,9 +6,9 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ plugins: [tsconfigPaths()], test: { - globalSetup: ["./src/tests/setup/startContainers.ts"], + globalSetup: ["./queue-restate/src/tests/setup/startContainers.ts"], teardownTimeout: 30000, - include: ["src/tests/**/*.test.ts"], + include: ["**/src/tests/**/*.test.ts"], testTimeout: 60000, }, }); diff --git a/packages/shared-server/package.json b/packages/shared-server/package.json index d18eb4a0..578c3330 100644 --- a/packages/shared-server/package.json +++ b/packages/shared-server/package.json @@ -6,9 +6,7 @@ "type": "module", "dependencies": { "@karakeep/db": "workspace:^0.1.0", - "@karakeep/plugins-queue-liteque": "workspace:^0.1.0", - "@karakeep/plugins-queue-restate": "workspace:^0.1.0", - "@karakeep/plugins-search-meilisearch": "workspace:^0.1.0", + "@karakeep/plugins": "workspace:^0.1.0", "@karakeep/shared": "workspace:^0.1.0" }, "devDependencies": { diff --git a/packages/shared-server/src/plugins.ts b/packages/shared-server/src/plugins.ts index de08b9b0..97503403 100644 --- a/packages/shared-server/src/plugins.ts +++ b/packages/shared-server/src/plugins.ts @@ -7,9 +7,9 @@ export async function loadAllPlugins() { } // Load plugins here. Order of plugin loading matter. // Queue provider(s) - await import("@karakeep/plugins-queue-liteque"); - await import("@karakeep/plugins-queue-restate"); - await import("@karakeep/plugins-search-meilisearch"); + await import("@karakeep/plugins/queue-liteque"); + await import("@karakeep/plugins/queue-restate"); + await import("@karakeep/plugins/search-meilisearch"); PluginManager.logAllPlugins(); pluginsLoaded = true; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a95e9699..4d89fc27 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1148,29 +1148,7 @@ importers: specifier: ^4.8.1 version: 4.20.3 - packages/plugins-queue-liteque: - dependencies: - '@karakeep/shared': - specifier: workspace:* - version: link:../shared - liteque: - specifier: ^0.6.2 - version: 0.6.2(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/react@19.2.2)(better-sqlite3@11.3.0)(kysely@0.28.5)(react@19.1.0) - devDependencies: - '@karakeep/prettier-config': - specifier: workspace:^0.1.0 - version: link:../../tooling/prettier - '@karakeep/tsconfig': - specifier: workspace:^0.1.0 - version: link:../../tooling/typescript - vite-tsconfig-paths: - specifier: ^4.3.1 - version: 4.3.2(typescript@5.8.3)(vite@7.0.6(@types/node@22.15.30)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(terser@5.41.0)(tsx@4.20.3)(yaml@2.8.0)) - vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@22.15.30)(happy-dom@20.0.8)(jiti@2.4.2)(jsdom@27.0.1(postcss@8.5.6))(lightningcss@1.30.1)(sass@1.89.1)(terser@5.41.0)(tsx@4.20.3)(yaml@2.8.0) - - packages/plugins-queue-restate: + packages/plugins: dependencies: '@karakeep/shared': specifier: workspace:* @@ -1181,25 +1159,9 @@ importers: '@restatedev/restate-sdk-clients': specifier: ^1.9.0 version: 1.9.0 - devDependencies: - '@karakeep/prettier-config': - specifier: workspace:^0.1.0 - version: link:../../tooling/prettier - '@karakeep/tsconfig': - specifier: workspace:^0.1.0 - version: link:../../tooling/typescript - vite-tsconfig-paths: - specifier: ^4.3.1 - version: 4.3.2(typescript@5.8.3)(vite@7.0.6(@types/node@22.15.30)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(terser@5.41.0)(tsx@4.20.3)(yaml@2.8.0)) - vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@22.15.30)(happy-dom@20.0.8)(jiti@2.4.2)(jsdom@27.0.1(postcss@8.5.6))(lightningcss@1.30.1)(sass@1.89.1)(terser@5.41.0)(tsx@4.20.3)(yaml@2.8.0) - - packages/plugins-search-meilisearch: - dependencies: - '@karakeep/shared': - specifier: workspace:* - version: link:../shared + liteque: + specifier: ^0.6.2 + version: 0.6.2(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/react@19.2.2)(better-sqlite3@11.3.0)(kysely@0.28.5)(react@19.1.0) meilisearch: specifier: ^0.45.0 version: 0.45.0 @@ -1336,15 +1298,9 @@ importers: '@karakeep/db': specifier: workspace:^0.1.0 version: link:../db - '@karakeep/plugins-queue-liteque': - specifier: workspace:^0.1.0 - version: link:../plugins-queue-liteque - '@karakeep/plugins-queue-restate': + '@karakeep/plugins': specifier: workspace:^0.1.0 - version: link:../plugins-queue-restate - '@karakeep/plugins-search-meilisearch': - specifier: workspace:^0.1.0 - version: link:../plugins-search-meilisearch + version: link:../plugins '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../shared @@ -15699,7 +15655,7 @@ snapshots: '@babel/helper-member-expression-to-functions@7.27.1': dependencies: '@babel/traverse': 7.28.0 - '@babel/types': 7.28.1 + '@babel/types': 7.28.5 transitivePeerDependencies: - supports-color @@ -15730,7 +15686,7 @@ snapshots: '@babel/helper-optimise-call-expression@7.27.1': dependencies: - '@babel/types': 7.28.1 + '@babel/types': 7.28.5 '@babel/helper-plugin-utils@7.27.1': {} @@ -21179,7 +21135,7 @@ snapshots: '@types/react-router@5.1.20': dependencies: '@types/history': 4.7.11 - '@types/react': 19.1.8 + '@types/react': 19.2.2 '@types/react-syntax-highlighter@15.5.13': dependencies: @@ -21359,7 +21315,7 @@ snapshots: '@vue/compiler-core@3.5.16': dependencies: - '@babel/parser': 7.28.0 + '@babel/parser': 7.28.5 '@vue/shared': 3.5.16 entities: 4.5.0 estree-walker: 2.0.2 @@ -21814,7 +21770,7 @@ snapshots: babel-plugin-jest-hoist@29.6.3: dependencies: '@babel/template': 7.27.2 - '@babel/types': 7.28.1 + '@babel/types': 7.28.5 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.7 @@ -24698,7 +24654,7 @@ snapshots: history@4.10.1: dependencies: - '@babel/runtime': 7.27.6 + '@babel/runtime': 7.28.4 loose-envify: 1.4.0 resolve-pathname: 3.0.0 tiny-invariant: 1.3.3 @@ -25255,7 +25211,7 @@ snapshots: istanbul-lib-instrument@5.2.1: dependencies: '@babel/core': 7.26.0 - '@babel/parser': 7.28.0 + '@babel/parser': 7.28.5 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 6.3.1 @@ -26449,7 +26405,7 @@ snapshots: metro-file-map@0.82.5: dependencies: - debug: 4.4.1(supports-color@10.0.0) + debug: 4.4.3 fb-watchman: 2.0.2 flow-enums-runtime: 0.0.6 graceful-fs: 4.2.11 @@ -26504,7 +26460,7 @@ snapshots: metro-transform-plugins@0.82.5: dependencies: '@babel/core': 7.26.0 - '@babel/generator': 7.28.0 + '@babel/generator': 7.28.5 '@babel/template': 7.27.2 '@babel/traverse': 7.28.0 flow-enums-runtime: 0.0.6 @@ -26515,9 +26471,9 @@ snapshots: metro-transform-worker@0.82.5: dependencies: '@babel/core': 7.26.0 - '@babel/generator': 7.28.0 - '@babel/parser': 7.28.0 - '@babel/types': 7.28.1 + '@babel/generator': 7.28.5 + '@babel/parser': 7.28.5 + '@babel/types': 7.28.5 flow-enums-runtime: 0.0.6 metro: 0.82.5 metro-babel-transformer: 0.82.5 |
