Skip to content

Commit 871dff2

Browse files
author
Matthew Valancy
committed
Fix ESLint configuration and Docker paths after repository reorganization
- Add ESLint dependencies to core and server packages - Create CommonJS ESLint configs for core and server packages - Update Docker Compose context paths to work from deployment/ folder - Fix volume mount paths in docker-compose.yml - Ensure all linting and type checking passes across packages
1 parent b5c4f63 commit 871dff2

5 files changed

Lines changed: 89 additions & 13 deletions

File tree

deployment/docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- "5432:5432"
1212
volumes:
1313
- postgres_data:/var/lib/postgresql/data
14-
- ./scripts/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
14+
- ../scripts/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
1515
healthcheck:
1616
test: ["CMD-SHELL", "pg_isready -U graphdone"]
1717
interval: 10s
@@ -32,7 +32,7 @@ services:
3232

3333
server:
3434
build:
35-
context: .
35+
context: ..
3636
dockerfile: packages/server/Dockerfile
3737
environment:
3838
- NODE_ENV=production
@@ -47,7 +47,7 @@ services:
4747
redis:
4848
condition: service_healthy
4949
volumes:
50-
- ./packages/server/.env:/app/.env
50+
- ../packages/server/.env:/app/.env
5151
healthcheck:
5252
test: ["CMD", "curl", "-f", "http://localhost:4000/health"]
5353
interval: 30s
@@ -56,7 +56,7 @@ services:
5656

5757
web:
5858
build:
59-
context: .
59+
context: ..
6060
dockerfile: packages/web/Dockerfile
6161
environment:
6262
- VITE_GRAPHQL_URL=http://localhost:4000/graphql
@@ -66,7 +66,7 @@ services:
6666
depends_on:
6767
- server
6868
volumes:
69-
- ./packages/web/.env:/app/.env
69+
- ../packages/web/.env:/app/.env
7070

7171
volumes:
7272
postgres_data:

packages/core/eslint.config.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
const js = require('@eslint/js');
2+
const typescript = require('@typescript-eslint/eslint-plugin');
3+
const typescriptParser = require('@typescript-eslint/parser');
4+
const globals = require('globals');
5+
6+
module.exports = [
7+
js.configs.recommended,
8+
{
9+
files: ['**/*.ts'],
10+
languageOptions: {
11+
parser: typescriptParser,
12+
parserOptions: {
13+
ecmaVersion: 'latest',
14+
sourceType: 'module',
15+
},
16+
globals: {
17+
...globals.node,
18+
},
19+
},
20+
plugins: {
21+
'@typescript-eslint': typescript,
22+
},
23+
rules: {
24+
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
25+
'@typescript-eslint/no-explicit-any': 'warn',
26+
'no-console': 'warn',
27+
'prefer-const': 'warn',
28+
'no-unused-vars': 'off',
29+
},
30+
},
31+
{
32+
ignores: ['dist/', 'node_modules/', '*.js', '*.mjs'],
33+
},
34+
];

packages/core/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@
1818
},
1919
"devDependencies": {
2020
"@types/uuid": "^9.0.7",
21+
"@typescript-eslint/eslint-plugin": "^8.39.1",
22+
"@typescript-eslint/parser": "^8.39.1",
2123
"@vitest/coverage-v8": "^1.0.0",
24+
"eslint": "^9.33.0",
25+
"globals": "^16.3.0",
2226
"vitest": "^1.0.0"
2327
},
2428
"files": [
2529
"dist",
2630
"src"
2731
],
2832
"license": "MIT"
29-
}
33+
}

packages/server/eslint.config.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
const js = require('@eslint/js');
2+
const typescript = require('@typescript-eslint/eslint-plugin');
3+
const typescriptParser = require('@typescript-eslint/parser');
4+
const globals = require('globals');
5+
6+
module.exports = [
7+
js.configs.recommended,
8+
{
9+
files: ['**/*.ts'],
10+
languageOptions: {
11+
parser: typescriptParser,
12+
parserOptions: {
13+
ecmaVersion: 'latest',
14+
sourceType: 'module',
15+
},
16+
globals: {
17+
...globals.node,
18+
},
19+
},
20+
plugins: {
21+
'@typescript-eslint': typescript,
22+
},
23+
rules: {
24+
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
25+
'@typescript-eslint/no-explicit-any': 'warn',
26+
'no-console': 'warn',
27+
'prefer-const': 'warn',
28+
'no-unused-vars': 'off',
29+
},
30+
},
31+
{
32+
ignores: ['dist/', 'node_modules/', '*.js', '*.mjs'],
33+
},
34+
];

packages/server/package.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,27 @@
1717
"db:studio": "prisma studio"
1818
},
1919
"dependencies": {
20-
"@graphdone/core": "*",
2120
"@apollo/server": "^4.9.0",
22-
"@prisma/client": "^5.7.0",
23-
"graphql": "^16.8.0",
24-
"graphql-scalars": "^1.22.0",
21+
"@graphdone/core": "*",
2522
"@graphql-tools/schema": "^10.0.0",
23+
"@prisma/client": "^5.7.0",
2624
"cors": "^2.8.5",
2725
"dotenv": "^16.3.0",
2826
"express": "^4.18.0",
29-
"ws": "^8.14.0",
30-
"graphql-ws": "^5.14.0"
27+
"graphql": "^16.8.0",
28+
"graphql-scalars": "^1.22.0",
29+
"graphql-ws": "^5.14.0",
30+
"ws": "^8.14.0"
3131
},
3232
"devDependencies": {
3333
"@types/cors": "^2.8.0",
3434
"@types/express": "^4.17.0",
3535
"@types/ws": "^8.5.0",
36+
"@typescript-eslint/eslint-plugin": "^8.39.1",
37+
"@typescript-eslint/parser": "^8.39.1",
3638
"@vitest/coverage-v8": "^1.0.0",
39+
"eslint": "^9.33.0",
40+
"globals": "^16.3.0",
3741
"prisma": "^5.7.0",
3842
"tsx": "^4.6.0",
3943
"vitest": "^1.0.0"
@@ -44,4 +48,4 @@
4448
"prisma"
4549
],
4650
"license": "MIT"
47-
}
51+
}

0 commit comments

Comments
 (0)