Skip to content

Commit 4ff4444

Browse files
oscartbeaumontoscartbeaumont
committed
add biome
drop eslint + prettier fix use gitignore `pnpm format` add CI workflow fix lockfile ignore revs split lint and format CI workflow
1 parent 038e153 commit 4ff4444

File tree

696 files changed

+91292
-90278
lines changed

Some content is hidden

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

696 files changed

+91292
-90278
lines changed

‎.eslintrc.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = {
2-
root: true,
3-
// This tells ESLint to load the config from the package `eslint-config-custom`
4-
extends: ["custom"],
5-
settings: {
6-
next: {
7-
rootDir: ["apps/*/"],
8-
},
9-
},
2+
root: true,
3+
// This tells ESLint to load the config from the package `eslint-config-custom`
4+
extends: ["custom"],
5+
settings: {
6+
next: {
7+
rootDir: ["apps/*/"],
8+
},
9+
},
1010
};

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d3b3a0bb176ac922bc623271fc64a60cf7f5bd8b

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,21 @@ jobs:
4545
- name: Typecheck
4646
run: pnpm typecheck
4747

48+
format-biome:
49+
name: Format (Biome)
50+
runs-on: ubuntu-latest
51+
steps:
52+
- name: Checkout
53+
uses: actions/checkout@v4
54+
55+
- name: Setup Biome
56+
uses: biomejs/setup-biome@v2
57+
with:
58+
version: latest
59+
60+
- name: Run Biome
61+
run: biome ci . --linter-enabled=false
62+
4863
format-rust:
4964
name: Format (Cargo)
5065
runs-on: ubuntu-latest
@@ -105,6 +120,21 @@ jobs:
105120
with:
106121
args: --workspace --all-features --locked
107122

123+
lint-biome:
124+
name: Lint (Biome)
125+
runs-on: ubuntu-latest
126+
steps:
127+
- name: Checkout
128+
uses: actions/checkout@v4
129+
130+
- name: Setup Biome
131+
uses: biomejs/setup-biome@v2
132+
with:
133+
version: latest
134+
135+
- name: Run Biome
136+
run: biome ci .
137+
108138
build-desktop:
109139
name: Build Desktop
110140
strategy:

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
2+
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
33
}

‎apps/desktop/.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
2+
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
33
}

‎apps/desktop/app.config.ts‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ import { defineConfig } from "@solidjs/start/config";
33
import tsconfigPaths from "vite-tsconfig-paths";
44

55
export default defineConfig({
6-
ssr: false,
7-
server: { preset: "static" },
8-
// https://vitejs.dev/config
9-
vite: () => ({
10-
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
11-
// 1. tauri expects a fixed port, fail if that port is not available
12-
server: {
13-
port: 3001,
14-
strictPort: true,
15-
watch: {
16-
// 2. tell vite to ignore watching `src-tauri`
17-
ignored: ["**/src-tauri/**"],
18-
},
19-
},
20-
// 3. to make use of `TAURI_DEBUG` and other env variables
21-
// https://tauri.studio/v1/api/config#buildconfig.beforedevcommand
22-
envPrefix: ["VITE_", "TAURI_"],
23-
assetsInclude: ["**/*.riv"],
24-
plugins: [
25-
capUIPlugin,
26-
tsconfigPaths({
27-
// If this isn't set Vinxi hangs on startup
28-
root: ".",
29-
}),
30-
],
31-
define: {
32-
"import.meta.vitest": "undefined",
33-
},
34-
}),
6+
ssr: false,
7+
server: { preset: "static" },
8+
// https://vitejs.dev/config
9+
vite: () => ({
10+
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
11+
// 1. tauri expects a fixed port, fail if that port is not available
12+
server: {
13+
port: 3001,
14+
strictPort: true,
15+
watch: {
16+
// 2. tell vite to ignore watching `src-tauri`
17+
ignored: ["**/src-tauri/**"],
18+
},
19+
},
20+
// 3. to make use of `TAURI_DEBUG` and other env variables
21+
// https://tauri.studio/v1/api/config#buildconfig.beforedevcommand
22+
envPrefix: ["VITE_", "TAURI_"],
23+
assetsInclude: ["**/*.riv"],
24+
plugins: [
25+
capUIPlugin,
26+
tsconfigPaths({
27+
// If this isn't set Vinxi hangs on startup
28+
root: ".",
29+
}),
30+
],
31+
define: {
32+
"import.meta.vitest": "undefined",
33+
},
34+
}),
3535
});

‎apps/desktop/package.json‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
11
{
2-
"name": "@cap/desktop",
3-
"type": "module",
4-
"scripts": {
5-
"dev": "pnpm -w cap-setup && dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri dev",
6-
"build:tauri": "dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri build",
7-
"preparescript": "node scripts/prepare.js",
8-
"localdev": "dotenv -e ../../.env -- vinxi dev --port 3001",
9-
"build": "vinxi build",
10-
"tauri": "tauri"
11-
},
12-
"dependencies": {
13-
"@aerofoil/rive-solid-canvas": "^2.1.4",
14-
"@cap/database": "workspace:*",
15-
"@cap/ui-solid": "workspace:*",
16-
"@cap/utils": "workspace:*",
17-
"@cap/web-api-contract": "workspace:*",
18-
"@corvu/tooltip": "^0.2.1",
19-
"@intercom/messenger-js-sdk": "^0.0.14",
20-
"@kobalte/core": "^0.13.7",
21-
"@radix-ui/colors": "^3.0.0",
22-
"@rive-app/canvas": "^2.26.7",
23-
"@solid-primitives/bounds": "^0.0.122",
24-
"@solid-primitives/context": "^0.2.3",
25-
"@solid-primitives/date": "^2.0.23",
26-
"@solid-primitives/deep": "^0.2.9",
27-
"@solid-primitives/event-bus": "^1.1.1",
28-
"@solid-primitives/event-listener": "^2.3.3",
29-
"@solid-primitives/history": "^0.1.5",
30-
"@solid-primitives/memo": "^1.4.2",
31-
"@solid-primitives/mouse": "^2.1.2",
32-
"@solid-primitives/refs": "^1.0.8",
33-
"@solid-primitives/resize-observer": "^2.0.26",
34-
"@solid-primitives/scheduled": "^1.4.3",
35-
"@solid-primitives/storage": "^4.0.0",
36-
"@solid-primitives/timer": "^1.3.9",
37-
"@solid-primitives/websocket": "^1.2.2",
38-
"@solidjs/router": "^0.14.2",
39-
"@solidjs/start": "^1.1.3",
40-
"@tanstack/solid-query": "^5.51.21",
41-
"@tauri-apps/api": "2.5.0",
42-
"@tauri-apps/plugin-clipboard-manager": "^2.2.1",
43-
"@tauri-apps/plugin-deep-link": "^2.2.0",
44-
"@tauri-apps/plugin-dialog": "2.0.1",
45-
"@tauri-apps/plugin-fs": "2.2.0",
46-
"@tauri-apps/plugin-http": "^2.4.4",
47-
"@tauri-apps/plugin-notification": "2.0.0",
48-
"@tauri-apps/plugin-opener": "^2.2.6",
49-
"@tauri-apps/plugin-os": "2.0.0",
50-
"@tauri-apps/plugin-process": "2.0.0",
51-
"@tauri-apps/plugin-shell": ">=2.0.1",
52-
"@tauri-apps/plugin-store": "2.1.0",
53-
"@tauri-apps/plugin-updater": "2.0.0",
54-
"@ts-rest/core": "^3.52.1",
55-
"@types/react-tooltip": "^4.2.4",
56-
"cva": "npm:class-variance-authority@^0.7.0",
57-
"effect": "^3.17.7",
58-
"mp4box": "^0.5.2",
59-
"posthog-js": "^1.215.3",
60-
"solid-js": "^1.9.3",
61-
"solid-markdown": "^2.0.13",
62-
"solid-presence": "^0.1.8",
63-
"solid-toast": "^0.5.0",
64-
"solid-transition-group": "^0.2.3",
65-
"unplugin-auto-import": "^0.18.2",
66-
"unplugin-icons": "^0.19.2",
67-
"uuid": "^9.0.1",
68-
"vinxi": "^0.5.6",
69-
"webcodecs": "^0.1.0",
70-
"zod": "^3.25.76"
71-
},
72-
"devDependencies": {
73-
"@fontsource/geist-sans": "^5.0.3",
74-
"@iconify/json": "^2.2.239",
75-
"@tauri-apps/cli": ">=2.1.0",
76-
"@total-typescript/ts-reset": "^0.6.1",
77-
"@types/dom-webcodecs": "^0.1.11",
78-
"@types/uuid": "^9.0.8",
79-
"cross-env": "^7.0.3",
80-
"typescript": "^5.8.3",
81-
"vite": "^6.3.5",
82-
"vite-tsconfig-paths": "^5.0.1",
83-
"vitest": "~2.1.9"
84-
}
2+
"name": "@cap/desktop",
3+
"type": "module",
4+
"scripts": {
5+
"dev": "pnpm -w cap-setup && dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri dev",
6+
"build:tauri": "dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri build",
7+
"preparescript": "node scripts/prepare.js",
8+
"localdev": "dotenv -e ../../.env -- vinxi dev --port 3001",
9+
"build": "vinxi build",
10+
"tauri": "tauri"
11+
},
12+
"dependencies": {
13+
"@aerofoil/rive-solid-canvas": "^2.1.4",
14+
"@cap/database": "workspace:*",
15+
"@cap/ui-solid": "workspace:*",
16+
"@cap/utils": "workspace:*",
17+
"@cap/web-api-contract": "workspace:*",
18+
"@corvu/tooltip": "^0.2.1",
19+
"@intercom/messenger-js-sdk": "^0.0.14",
20+
"@kobalte/core": "^0.13.7",
21+
"@radix-ui/colors": "^3.0.0",
22+
"@rive-app/canvas": "^2.26.7",
23+
"@solid-primitives/bounds": "^0.0.122",
24+
"@solid-primitives/context": "^0.2.3",
25+
"@solid-primitives/date": "^2.0.23",
26+
"@solid-primitives/deep": "^0.2.9",
27+
"@solid-primitives/event-bus": "^1.1.1",
28+
"@solid-primitives/event-listener": "^2.3.3",
29+
"@solid-primitives/history": "^0.1.5",
30+
"@solid-primitives/memo": "^1.4.2",
31+
"@solid-primitives/mouse": "^2.1.2",
32+
"@solid-primitives/refs": "^1.0.8",
33+
"@solid-primitives/resize-observer": "^2.0.26",
34+
"@solid-primitives/scheduled": "^1.4.3",
35+
"@solid-primitives/storage": "^4.0.0",
36+
"@solid-primitives/timer": "^1.3.9",
37+
"@solid-primitives/websocket": "^1.2.2",
38+
"@solidjs/router": "^0.14.2",
39+
"@solidjs/start": "^1.1.3",
40+
"@tanstack/solid-query": "^5.51.21",
41+
"@tauri-apps/api": "2.5.0",
42+
"@tauri-apps/plugin-clipboard-manager": "^2.2.1",
43+
"@tauri-apps/plugin-deep-link": "^2.2.0",
44+
"@tauri-apps/plugin-dialog": "2.0.1",
45+
"@tauri-apps/plugin-fs": "2.2.0",
46+
"@tauri-apps/plugin-http": "^2.4.4",
47+
"@tauri-apps/plugin-notification": "2.0.0",
48+
"@tauri-apps/plugin-opener": "^2.2.6",
49+
"@tauri-apps/plugin-os": "2.0.0",
50+
"@tauri-apps/plugin-process": "2.0.0",
51+
"@tauri-apps/plugin-shell": ">=2.0.1",
52+
"@tauri-apps/plugin-store": "2.1.0",
53+
"@tauri-apps/plugin-updater": "2.0.0",
54+
"@ts-rest/core": "^3.52.1",
55+
"@types/react-tooltip": "^4.2.4",
56+
"cva": "npm:class-variance-authority@^0.7.0",
57+
"effect": "^3.17.7",
58+
"mp4box": "^0.5.2",
59+
"posthog-js": "^1.215.3",
60+
"solid-js": "^1.9.3",
61+
"solid-markdown": "^2.0.13",
62+
"solid-presence": "^0.1.8",
63+
"solid-toast": "^0.5.0",
64+
"solid-transition-group": "^0.2.3",
65+
"unplugin-auto-import": "^0.18.2",
66+
"unplugin-icons": "^0.19.2",
67+
"uuid": "^9.0.1",
68+
"vinxi": "^0.5.6",
69+
"webcodecs": "^0.1.0",
70+
"zod": "^3.25.76"
71+
},
72+
"devDependencies": {
73+
"@fontsource/geist-sans": "^5.0.3",
74+
"@iconify/json": "^2.2.239",
75+
"@tauri-apps/cli": ">=2.1.0",
76+
"@total-typescript/ts-reset": "^0.6.1",
77+
"@types/dom-webcodecs": "^0.1.11",
78+
"@types/uuid": "^9.0.8",
79+
"cross-env": "^7.0.3",
80+
"typescript": "^5.8.3",
81+
"vite": "^6.3.5",
82+
"vite-tsconfig-paths": "^5.0.1",
83+
"vitest": "~2.1.9"
84+
}
8585
}

0 commit comments

Comments
 (0)