diff options
| author | xuatz <xzlow10@gmail.com> | 2025-06-22 20:29:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-22 12:29:30 +0100 |
| commit | d5e2973dce617f451e4eb07491b3a6874ea6ca47 (patch) | |
| tree | 9e134ac8c0b263cec755068082ca61c9646efd21 /packages | |
| parent | 91a9d3c1aee04d77b2a2d022821f4a7a38e315f3 (diff) | |
| download | karakeep-d5e2973dce617f451e4eb07491b3a6874ea6ca47.tar.zst | |
chore: migrate away from eslint to oxlint (#1642)
* chore: migrate away from eslint to oxlint
* revert turbo task name lint
* it seems like we can remove the seemingly default globals
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/api/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/api/package.json | 11 | ||||
| -rw-r--r-- | packages/db/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/db/package.json | 7 | ||||
| -rw-r--r-- | packages/e2e_tests/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/e2e_tests/package.json | 11 | ||||
| -rw-r--r-- | packages/open-api/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/open-api/package.json | 10 | ||||
| -rw-r--r-- | packages/sdk/.oxlintrc.json | 23 | ||||
| -rw-r--r-- | packages/sdk/package.json | 14 | ||||
| -rw-r--r-- | packages/shared-react/.oxlintrc.json | 34 | ||||
| -rw-r--r-- | packages/shared-react/package.json | 10 | ||||
| -rw-r--r-- | packages/shared/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/shared/package.json | 11 | ||||
| -rw-r--r-- | packages/shared/searchQueryParser.ts | 6 | ||||
| -rw-r--r-- | packages/trpc/.oxlintrc.json | 22 | ||||
| -rw-r--r-- | packages/trpc/package.json | 11 | ||||
| -rw-r--r-- | packages/trpc/routers/users.ts | 2 |
18 files changed, 206 insertions, 76 deletions
diff --git a/packages/api/.oxlintrc.json b/packages/api/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/api/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/api/package.json b/packages/api/package.json index 82b2b9d0..d51b108b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -8,8 +8,8 @@ "typecheck": "tsc --noEmit", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", - "lint": "eslint .", - "lint:fix": "eslint . --fix", + "lint": "oxlint .", + "lint:fix": "oxlint . --fix", "test": "vitest" }, "dependencies": { @@ -22,7 +22,6 @@ "zod": "^3.24.2" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@types/bcryptjs": "^2.4.6", @@ -31,11 +30,5 @@ "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/db/.oxlintrc.json b/packages/db/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/db/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/db/package.json b/packages/db/package.json index e7819457..88dc80cd 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -20,18 +20,11 @@ "tsx": "^4.7.1" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", "@types/better-sqlite3": "^7.6.11", "drizzle-kit": "^0.30.01" }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/e2e_tests/.oxlintrc.json b/packages/e2e_tests/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/e2e_tests/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/e2e_tests/package.json b/packages/e2e_tests/package.json index 9245d366..3f110838 100644 --- a/packages/e2e_tests/package.json +++ b/packages/e2e_tests/package.json @@ -8,8 +8,8 @@ "typecheck": "tsc --noEmit", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", - "lint": "eslint .", - "lint:fix": "eslint . --fix", + "lint": "oxlint .", + "lint:fix": "oxlint . --fix", "test": "vitest run", "test:watch": "vitest" }, @@ -19,17 +19,10 @@ "superjson": "^2.2.1" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/open-api/.oxlintrc.json b/packages/open-api/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/open-api/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/open-api/package.json b/packages/open-api/package.json index 900af481..d88543a9 100644 --- a/packages/open-api/package.json +++ b/packages/open-api/package.json @@ -10,7 +10,6 @@ "zod": "^3.24.2" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "tsx": "^4.7.1" @@ -20,14 +19,9 @@ "generate": "tsx index.ts", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", - "lint": "eslint ." + "lint": "oxlint .", + "lint:fix": "oxlint . --fix" }, "main": "index.ts", - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/sdk/.oxlintrc.json b/packages/sdk/.oxlintrc.json new file mode 100644 index 00000000..8d9e82f8 --- /dev/null +++ b/packages/sdk/.oxlintrc.json @@ -0,0 +1,23 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml", + "src/karakeep-api.d.ts" + ] +} diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ea23a8cd..c431974a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -18,7 +18,6 @@ "types": "./dist/index.d.ts" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", @@ -30,8 +29,8 @@ "scripts": { "build": "vite build", "run": "tsx src/index.ts", - "lint": "eslint .", - "lint:fix": "eslint . --fix", + "lint": "oxlint .", + "lint:fix": "oxlint . --fix", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", "typecheck": "tsc --noEmit" @@ -41,15 +40,6 @@ "url": "git+https://github.com/karakeep-app/karakeep.git", "directory": "packages/sdk" }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ], - "ignorePatterns": [ - "src/karakeep-api.d.ts" - ] - }, "prettier": "@karakeep/prettier-config", "dependencies": { "openapi-fetch": "^0.13.3" diff --git a/packages/shared-react/.oxlintrc.json b/packages/shared-react/.oxlintrc.json new file mode 100644 index 00000000..91dc201f --- /dev/null +++ b/packages/shared-react/.oxlintrc.json @@ -0,0 +1,34 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json", + "../../tooling/oxlint/oxlint-react.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true, + "browser": true, + "es2022": true, + "node": true + }, + "globals": { + "React": "writeable" + }, + "settings": { + "react": { + "version": "detect" + } + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + ".next", + "dist", + "build", + "pnpm-lock.yaml" + ] +} diff --git a/packages/shared-react/package.json b/packages/shared-react/package.json index b4f9f242..abc2a7fa 100644 --- a/packages/shared-react/package.json +++ b/packages/shared-react/package.json @@ -11,7 +11,6 @@ "superjson": "^2.2.1" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0" }, @@ -27,14 +26,7 @@ "scripts": { "typecheck": "tsc --noEmit", "format": "prettier . --ignore-path ../../.prettierignore", - "lint": "eslint ." - }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base", - "@karakeep/eslint-config/react" - ] + "lint": "oxlint ." }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared/.oxlintrc.json b/packages/shared/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/shared/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/shared/package.json b/packages/shared/package.json index 478fb77d..691e1d25 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -17,7 +17,6 @@ "zod-to-json-schema": "^3.24.3" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "vitest": "^1.6.1" @@ -26,16 +25,10 @@ "typecheck": "tsc --noEmit", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", - "lint": "eslint .", - "lint:fix": "eslint . --fix", + "lint": "oxlint .", + "lint:fix": "oxlint . --fix", "test": "vitest" }, "main": "index.ts", - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared/searchQueryParser.ts b/packages/shared/searchQueryParser.ts index 80f033b0..9a29a8b7 100644 --- a/packages/shared/searchQueryParser.ts +++ b/packages/shared/searchQueryParser.ts @@ -224,7 +224,7 @@ MATCHER.setPattern( inverse: !!minus, }, }; - } catch (e) { + } catch { return { // If parsing the date fails, emit it as pure text text: (minus?.text ?? "") + qualifier.text + ident, @@ -241,7 +241,7 @@ MATCHER.setPattern( inverse: !!minus, }, }; - } catch (e) { + } catch { return { // If parsing the date fails, emit it as pure text text: (minus?.text ?? "") + qualifier.text + ident, @@ -258,7 +258,7 @@ MATCHER.setPattern( relativeDate: { direction, amount, unit }, }, }; - } catch (e) { + } catch { return { // If parsing the relative time fails, emit it as pure text text: (minus?.text ?? "") + qualifier.text + ident, diff --git a/packages/trpc/.oxlintrc.json b/packages/trpc/.oxlintrc.json new file mode 100644 index 00000000..44a3dcef --- /dev/null +++ b/packages/trpc/.oxlintrc.json @@ -0,0 +1,22 @@ +{ + "$schema": "../../node_modules/oxlint/configuration_schema.json", + "extends": [ + "../../tooling/oxlint/oxlint-base.json" + ], + "categories": { + "correctness": "warn" + }, + "env": { + "builtin": true, + "commonjs": true + }, + "ignorePatterns": [ + "**/*.config.js", + "**/*.config.cjs", + "**/.eslintrc.cjs", + "**/.next", + "**/dist", + "**/build", + "**/pnpm-lock.yaml" + ] +} diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 5b5bad86..b0280d6d 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -8,8 +8,8 @@ "typecheck": "tsc --noEmit", "format": "prettier . --ignore-path ../../.prettierignore", "format:fix": "prettier . --write --ignore-path ../../.prettierignore", - "lint": "eslint .", - "lint:fix": "eslint . --fix", + "lint": "oxlint .", + "lint:fix": "oxlint . --fix", "test": "vitest" }, "dependencies": { @@ -24,7 +24,6 @@ "zod": "^3.24.2" }, "devDependencies": { - "@karakeep/eslint-config": "workspace:^0.2.0", "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@types/bcryptjs": "^2.4.6", @@ -32,11 +31,5 @@ "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" }, - "eslintConfig": { - "root": true, - "extends": [ - "@karakeep/eslint-config/base" - ] - }, "prettier": "@karakeep/prettier-config" } diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts index 87923f94..bc1064e8 100644 --- a/packages/trpc/routers/users.ts +++ b/packages/trpc/routers/users.ts @@ -178,7 +178,7 @@ export const usersAppRouter = router({ let user; try { user = await validatePassword(ctx.user.email, input.currentPassword); - } catch (e) { + } catch { throw new TRPCError({ code: "UNAUTHORIZED" }); } invariant(user.id, ctx.user.id); |
