Skip to content

Commit 62b49ab

Browse files
authored
Fix incompatibilities with package.json (#8949)
1 parent 375b852 commit 62b49ab

File tree

7 files changed

+112
-29
lines changed

7 files changed

+112
-29
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"husky": "^9.1.7",
8585
"json": "^11.0.0",
8686
"lint-staged": "^16.1.6",
87-
"memfs": "^4.17.2",
87+
"memfs": "^4.42.0",
8888
"mnemonist": "^0.40.3",
8989
"mock-fs": "^5.5.0",
9090
"msw": "^2.10.4",

packages/a2a-server/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "dist",
5-
"lib": ["DOM", "DOM.Iterable", "ES2021"],
5+
"lib": ["DOM", "DOM.Iterable", "ES2023"],
66
"composite": true,
77
"types": ["node", "vitest/globals"]
88
},

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"diff": "^7.0.0",
3939
"dotenv": "^17.1.0",
4040
"fzf": "^0.5.2",
41-
"glob": "^10.4.1",
41+
"glob": "^10.4.5",
4242
"highlight.js": "^11.11.1",
4343
"ink": "^6.2.3",
4444
"ink-gradient": "^3.0.0",

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import { act } from 'react';
1010
import { renderHook, waitFor } from '@testing-library/react';
1111
import { useGitBranchName } from './useGitBranchName.js';
1212
import { fs, vol } from 'memfs'; // For mocking fs
13-
14-
import type { FSWatcher } from 'memfs/lib/volume.js';
1513
import { spawnAsync as mockSpawnAsync } from '@google/gemini-cli-core';
1614

1715
// Mock @google/gemini-cli-core
@@ -207,7 +205,7 @@ describe('useGitBranchName', () => {
207205
const closeMock = vi.fn();
208206
const watchMock = vi.spyOn(fs, 'watch').mockReturnValue({
209207
close: closeMock,
210-
} as unknown as FSWatcher);
208+
} as unknown as ReturnType<typeof fs.watch>);
211209

212210
(mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue(
213211
{

packages/core/src/ide/ide-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ export class IdeClient {
675675
return new Response(response.body as ReadableStream<unknown> | null, {
676676
status: response.status,
677677
statusText: response.statusText,
678-
headers: response.headers,
678+
headers: [...response.headers.entries()],
679679
});
680680
};
681681
}

packages/core/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "dist",
5-
"lib": ["DOM", "DOM.Iterable", "ES2021"],
5+
"lib": ["DOM", "DOM.Iterable", "ES2023"],
66
"composite": true,
77
"types": ["node", "vitest/globals"]
88
},

0 commit comments

Comments
 (0)