Skip to content

Commit f25ca5d

Browse files
authored
Merge pull request #21 from mininxd/main
Fix Type Errors and Build Failures Across Core Packages
2 parents 2fbeb6b + cbc155c commit f25ca5d

14 files changed

Lines changed: 5304 additions & 3662 deletions

File tree

package-lock.json

Lines changed: 5237 additions & 3619 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -85,44 +85,45 @@
8585
"LICENSE"
8686
],
8787
"devDependencies": {
88-
"@types/marked": "^5.0.2",
88+
"@types/marked": "^6.0.0",
8989
"@types/mime-types": "^3.0.1",
9090
"@types/minimatch": "^5.1.2",
9191
"@types/mock-fs": "^4.13.4",
9292
"@types/qrcode-terminal": "^0.12.2",
9393
"@types/shell-quote": "^1.7.5",
94-
"@types/uuid": "^10.0.0",
95-
"@vitest/coverage-v8": "^3.1.1",
96-
"@vitest/eslint-plugin": "^1.3.4",
97-
"@yao-pkg/pkg": "^6.7.0",
98-
"concurrently": "^9.2.0",
99-
"cross-env": "^7.0.3",
100-
"esbuild": "^0.25.0",
101-
"eslint": "^9.24.0",
102-
"eslint-config-prettier": "^10.1.2",
103-
"eslint-plugin-import": "^2.31.0",
94+
"@types/uuid": "^11.0.0",
95+
"@vitest/coverage-v8": "^4.0.14",
96+
"@vitest/eslint-plugin": "^1.5.0",
97+
"@yao-pkg/pkg": "^6.10.1",
98+
"concurrently": "^9.2.1",
99+
"cross-env": "^10.1.0",
100+
"esbuild": "^0.27.0",
101+
"eslint": "^9.39.1",
102+
"eslint-config-prettier": "^10.1.8",
103+
"eslint-plugin-import": "^2.32.0",
104104
"eslint-plugin-license-header": "^0.8.0",
105105
"eslint-plugin-react": "^7.37.5",
106-
"eslint-plugin-react-hooks": "^5.2.0",
107-
"glob": "^10.4.5",
108-
"globals": "^16.0.0",
106+
"eslint-plugin-react-hooks": "^7.0.1",
107+
"glob": "^13.0.0",
108+
"globals": "^16.5.0",
109109
"json": "^11.0.0",
110110
"lodash": "^4.17.21",
111-
"memfs": "^4.17.2",
111+
"memfs": "^4.51.0",
112112
"mnemonist": "^0.40.3",
113113
"mock-fs": "^5.5.0",
114-
"msw": "^2.10.4",
115-
"prettier": "^3.5.3",
116-
"react-devtools-core": "^4.28.5",
117-
"tsx": "^4.20.3",
118-
"typescript-eslint": "^8.30.1",
119-
"vitest": "^3.2.4",
120-
"yargs": "^17.7.2"
114+
"msw": "^2.12.3",
115+
"prettier": "^3.7.1",
116+
"react-devtools-core": "^7.0.1",
117+
"tsx": "^4.20.6",
118+
"typescript-eslint": "^8.48.0",
119+
"vitest": "^4.0.14",
120+
"yargs": "^18.0.0"
121121
},
122122
"dependencies": {
123-
"@lvce-editor/ripgrep": "^1.6.0",
124-
"simple-git": "^3.28.0",
125-
"strip-ansi": "^7.1.0"
123+
"@lvce-editor/ripgrep": "^4.1.0",
124+
"simple-git": "^3.30.0",
125+
"strip-ansi": "^7.1.2",
126+
"vite": "^7.2.4"
126127
},
127128
"optionalDependencies": {
128129
"@lydell/node-pty": "1.1.0",

packages/api-server/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
"clean": "rm -rf dist"
2424
},
2525
"dependencies": {
26+
"@google/genai": "1.9.0",
2627
"@kolosal-ai/kolosal-ai-core": "file:../core",
27-
"@google/genai": "1.9.0"
28+
"vite": "7.2.4"
2829
},
2930
"devDependencies": {
3031
"@types/node": "^22.9.0",
3132
"typescript": "^5.6.3",
32-
"vitest": "^2.1.4"
33+
"vitest": "^4.0.14"
3334
},
3435
"license": "Apache-2.0",
3536
"keywords": [
@@ -48,4 +49,4 @@
4849
"url": "https://github.com/kolosalAI/kolosal-cli/issues"
4950
},
5051
"homepage": "https://github.com/kolosalAI/kolosal-cli/tree/main/packages/api-server"
51-
}
52+
}

packages/api-server/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"rootDir": "src",
66
"declaration": true,
77
"declarationMap": true,
8-
"sourceMap": true
8+
"sourceMap": true,
9+
"types": ["node"]
910
},
1011
"include": [
1112
"src/**/*"

packages/cli/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,40 @@
5555
"qrcode-terminal": "^0.12.0",
5656
"react": "^19.1.0",
5757
"read-package-up": "^11.0.0",
58-
"simple-git": "^3.28.0",
5958
"shell-quote": "^1.8.3",
59+
"simple-git": "^3.28.0",
6060
"string-width": "^7.1.0",
6161
"strip-ansi": "^7.1.0",
6262
"strip-json-comments": "^3.1.1",
6363
"undici": "^7.10.0",
6464
"update-notifier": "^7.3.1",
65+
"uuid": "^9.0.1",
6566
"yargs": "^17.7.2",
6667
"zod": "^3.23.8"
6768
},
6869
"devDependencies": {
6970
"@babel/runtime": "^7.27.6",
7071
"@google/gemini-cli-test-utils": "file:../test-utils",
72+
"@kolosal-code/kolosal-code-test-utils": "file:../test-utils",
7173
"@testing-library/react": "^16.3.0",
7274
"@types/command-exists": "^1.2.3",
7375
"@types/diff": "^7.0.2",
7476
"@types/dotenv": "^6.1.1",
7577
"@types/lodash-es": "^4.17.12",
78+
"@types/minimatch": "^6.0.0",
7679
"@types/node": "^20.11.24",
7780
"@types/react": "^19.1.8",
7881
"@types/react-dom": "^19.1.6",
7982
"@types/semver": "^7.7.0",
8083
"@types/shell-quote": "^1.7.5",
84+
"@types/uuid": "^11.0.0",
8185
"@types/yargs": "^17.0.32",
8286
"ink-testing-library": "^4.0.0",
8387
"jsdom": "^26.1.0",
8488
"pretty-format": "^30.0.2",
8589
"react-dom": "^19.1.0",
8690
"typescript": "^5.3.3",
87-
"vitest": "^3.1.1",
88-
"@kolosal-code/kolosal-code-test-utils": "file:../test-utils"
91+
"vitest": "^3.1.1"
8992
},
9093
"engines": {
9194
"node": ">=20"

packages/cli/src/ui/hooks/useGitBranchName.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import { useGitBranchName } from './useGitBranchName.js';
1212
import { fs, vol } from 'memfs'; // For mocking fs
1313
import { EventEmitter } from 'node:events';
1414
import { exec as mockExec, type ChildProcess } from 'node:child_process';
15-
import type { FSWatcher } from 'memfs/lib/volume.js';
15+
16+
// Define FSWatcher type based on memfs
17+
type FSWatcher = ReturnType<typeof fs.watch>;
1618

1719
// Mock child_process
1820
vi.mock('child_process');

packages/cli/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outDir": "dist",
55
"jsx": "react-jsx",
66
"lib": ["DOM", "DOM.Iterable", "ES2023"],
7-
"types": ["node", "vitest/globals"]
7+
"types": ["node"]
88
},
99
"include": [
1010
"index.ts",

packages/core/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"@types/fast-levenshtein": "^0.0.4",
8080
"@types/minimatch": "^5.1.2",
8181
"@types/picomatch": "^4.0.1",
82+
"@types/uuid": "^11.0.0",
8283
"@types/ws": "^8.5.10",
8384
"typescript": "^5.3.3",
8485
"vitest": "^3.1.1"

packages/core/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outDir": "dist",
55
"lib": ["DOM", "DOM.Iterable", "ES2021"],
66
"composite": true,
7-
"types": ["node", "vitest/globals"]
7+
"types": ["node"]
88
},
99
"include": ["index.ts", "src/**/*.ts", "src/**/*.json"],
1010
"exclude": ["node_modules", "dist"]

packages/desktop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
},
1515
"devDependencies": {
1616
"@tauri-apps/cli": "^1.5.8",
17-
"vite": "^5.0.8"
17+
"vite": "^7.2.4"
1818
}
19-
}
19+
}

0 commit comments

Comments
 (0)