Skip to content

Commit cc2d9ad

Browse files
committed
Merge branch 'main' into ios26-headers
2 parents 361aaf2 + 467c732 commit cc2d9ad

330 files changed

Lines changed: 11493 additions & 8038 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/android.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
run: eas build --platform android --local --output ${{ github.workspace }}/app-release.aab
3737
env:
3838
EAS_SKIP_AUTO_FINGERPRINT: "1"
39+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
3940

4041
- name: Upload AAB artifact
4142
uses: actions/upload-artifact@v4

.github/workflows/ios.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
run: eas build --platform ios --local --non-interactive --output ${{ github.workspace }}/app-release.ipa
2828
env:
2929
EAS_SKIP_AUTO_FINGERPRINT: "1"
30+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
3031

3132
- name: Upload IPA artifact
3233
uses: actions/upload-artifact@v4

.oxfmtrc.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"sortTailwindcss": {
4+
"config": "tooling/tailwind/web.ts",
5+
"functions": [
6+
"cn",
7+
"cva"
8+
]
9+
},
10+
"importOrder": [
11+
"<TYPES>",
12+
"^(react/(.*)$)|^(react$)|^(react-native(.*)$)",
13+
"^(next/(.*)$)|^(next$)",
14+
"^(expo(.*)$)|^(expo$)",
15+
"<THIRD_PARTY_MODULES>",
16+
"",
17+
"<TYPES>^@karakeep",
18+
"^@karakeep/(.*)$",
19+
"",
20+
"<TYPES>^[.|..|~]",
21+
"^~/",
22+
"^[../]",
23+
"^[./]"
24+
],
25+
"importOrderParserPlugins": [
26+
"typescript",
27+
"jsx",
28+
"decorators-legacy"
29+
],
30+
"importOrderTypeScriptVersion": "4.4.0",
31+
"printWidth": 80,
32+
"sortPackageJson": false,
33+
"ignorePatterns": [
34+
".next",
35+
"build",
36+
"coverage",
37+
".vscode*",
38+
"node_modules",
39+
"dist",
40+
"*.md",
41+
"*.json",
42+
".env",
43+
".env.*",
44+
"**/migrations/**",
45+
"packages/open-api/karakeep-openapi-spec.json",
46+
"apps/web/public/workbox-*.js",
47+
"pnpm-lock.yaml",
48+
"package-lock.json",
49+
"yarn.lock",
50+
"**/.expo/**",
51+
"apps/mobile/android",
52+
"apps/mobile/ios"
53+
]
54+
}

.prettierignore

Lines changed: 0 additions & 24 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

AGENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Karakeep is a monorepo project managed with Turborepo. It appears to be a web ap
99
- **Frontend:** Next.js, React, TypeScript, Tailwind CSS
1010
- **Backend:** Hono (a lightweight web framework), tRPC
1111
- **Database:** Drizzle ORM (likely with a relational database like PostgreSQL or SQLite)
12-
- **Tooling:** Prettier,oxlint, Vitest, pnpm
12+
- **Tooling:** Oxfmt, oxlint, Vitest, pnpm
1313

1414
## Project Structure
1515

@@ -45,7 +45,7 @@ The project is organized into `apps` and `packages`:
4545

4646
- **Package Manager:** pnpm
4747
- **Build System:** Turborepo
48-
- **Code Formatting:** Prettier
48+
- **Code Formatting:** Oxfmt
4949
- **Linting:** oxlint
5050
- **Testing:** Vitest
5151

apps/browser-extension/.oxlintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"settings": {
1818
"react": {
19-
"version": "detect"
19+
"version": "19"
2020
}
2121
},
2222
"ignorePatterns": [

apps/browser-extension/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"scripts": {
77
"dev": "vite",
88
"build": "tsc && vite build",
9-
"format": "prettier . --cache --check",
10-
"format:fix": "prettier . --cache --write",
9+
"format": "oxfmt --check .",
10+
"format:fix": "oxfmt .",
1111
"lint": "oxlint .",
1212
"lint:fix": "oxlint . --fix",
1313
"preview": "vite preview",
@@ -42,7 +42,6 @@
4242
},
4343
"devDependencies": {
4444
"@crxjs/vite-plugin": "2.2.0",
45-
"@karakeep/prettier-config": "workspace:^0.1.0",
4645
"@karakeep/tailwind-config": "workspace:^0.1.0",
4746
"@karakeep/tsconfig": "workspace:^0.1.0",
4847
"@types/chrome": "^0.0.260",
@@ -54,6 +53,5 @@
5453
"tailwindcss": "^3.4.1",
5554
"typescript": "^5.9",
5655
"vite": "^7.0.6"
57-
},
58-
"prettier": "@karakeep/prettier-config"
56+
}
5957
}

apps/browser-extension/src/components/ui/badge.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ const badgeVariants = cva(
2525
);
2626

2727
export interface BadgeProps
28-
extends React.HTMLAttributes<HTMLDivElement>,
28+
extends
29+
React.HTMLAttributes<HTMLDivElement>,
2930
VariantProps<typeof badgeVariants> {}
3031

3132
function Badge({ className, variant, ...props }: BadgeProps) {

apps/browser-extension/src/components/ui/button.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ const buttonVariants = cva(
3535
);
3636

3737
export interface ButtonProps
38-
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
38+
extends
39+
React.ButtonHTMLAttributes<HTMLButtonElement>,
3940
VariantProps<typeof buttonVariants> {
4041
asChild?: boolean;
4142
}

0 commit comments

Comments
 (0)