Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
with:
bun-version: latest
- run: bun i --frozen-lockfile
- run: bunx nx run-many -t lint test
- run: bunx nx run-many -t lint test typecheck
- run: bunx nx build desktop --configuration=dev
9 changes: 9 additions & 0 deletions apps/desktop/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
"command": "\"node_modules/.bin/electrobun\" dev"
}
},
"lint": {
"executor": "@nx/eslint:lint"
},
"typecheck": {
"executor": "nx:run-commands",
"options": {
"command": "tsc -p apps/desktop/tsconfig.json --noEmit"
}
},
"build": {
"executor": "nx:run-commands",
"dependsOn": [{ "target": "build", "projects": ["app"] }],
Expand Down
9 changes: 8 additions & 1 deletion apps/desktop/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": { "lib": ["DOM"] },
"compilerOptions": {
"lib": ["DOM"],
// ponytail: electrobun/bun ships raw .ts source that fails these two
// flags (blackboardsh/electrobun#516) — relax here, not workspace-wide.
// Drop once that lands upstream.
"exactOptionalPropertyTypes": false,
"noImplicitReturns": false
},
"include": ["src/**/*.ts"]
}
39 changes: 16 additions & 23 deletions eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,9 @@ export default [
plugins: {
'simple-import-sort': simpleImportSort,
'unused-imports': unusedImports,
tailwindcss,
},
// Resolved relative to the nearest eslint.config.ts/package.json above
// the linted file — that's apps/app/, not the workspace root.
settings: {
tailwindcss: { cssConfigPath: './src/styles.css' },
},
// Override the preset's severities and add the workspace's own rules.
rules: {
'tailwindcss/classnames-order': 'error',
'tailwindcss/no-arbitrary-value': 'error',
'tailwindcss/no-unnecessary-arbitrary-value': 'error',
'tailwindcss/no-custom-classname': [
'error',
// { whitelist: ['custom\\-*'] },
],
'tailwindcss/no-contradicting-classname': 'error',
'@nx/enforce-module-boundaries': [
'error',
{
Expand Down Expand Up @@ -61,13 +47,28 @@ export default [
},
},
{
files: ['**/*.html'],
// Scoped to apps/app: it's the only project with Tailwind CSS.
// apps/desktop is a Bun main-process shell with no styles.css to check against.
files: ['apps/app/**/*.ts', 'apps/app/**/*.html'],
plugins: {
tailwindcss,
},
settings: {
tailwindcss: { cssConfigPath: './src/styles.css' },
},
rules: {
'tailwindcss/classnames-order': 'error',
'tailwindcss/no-arbitrary-value': 'error',
'tailwindcss/no-unnecessary-arbitrary-value': 'error',
'tailwindcss/no-custom-classname': [
'error',
// { whitelist: ['custom\\-*'] },
],
'tailwindcss/no-contradicting-classname': 'error',
},
},
{
files: ['**/*.html'],
rules: {
'@angular-eslint/template/attributes-order': [
'error',
Expand All @@ -83,14 +84,6 @@ export default [
],
},
],
'tailwindcss/classnames-order': 'error',
'tailwindcss/no-arbitrary-value': 'error',
'tailwindcss/no-unnecessary-arbitrary-value': 'error',
'tailwindcss/no-custom-classname': [
'error',
// { whitelist: ['custom\\-*'] },
],
'tailwindcss/no-contradicting-classname': 'error',
},
},
];
Loading