Skip to content

Commit ef6b05d

Browse files
committed
Merge remote-tracking branch 'origin/master' into cocalc-api-20250927
2 parents 689fecf + d317ca0 commit ef6b05d

Some content is hidden

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

72 files changed

+3532
-537
lines changed

src/.claude/commands/frontend.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# frontend
2+
3+
Build the frontend code for development, after changing files in the frontend package. This is done by compiling the static package in dev mode.
4+
5+
Run this command:
6+
7+
```bash
8+
cd packages/static && pnpm build-dev
9+
```

src/.claude/settings.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
"Bash(NODE_OPTIONS=--max-old-space-size=8192 ../node_modules/.bin/tsc --noEmit)",
66
"Bash(bash:*)",
77
"Bash(chmod:*)",
8+
"Bash(coffee:*)",
89
"Bash(curl:*)",
910
"Bash(docker run:*)",
1011
"Bash(find:*)",
1112
"Bash(gh pr view:*)",
1213
"Bash(gh:*)",
1314
"Bash(git add:*)",
15+
"Bash(git branch:*)",
1416
"Bash(git checkout:*)",
1517
"Bash(git commit:*)",
1618
"Bash(git push:*)",
@@ -19,19 +21,25 @@
1921
"Bash(node:*)",
2022
"Bash(npm show:*)",
2123
"Bash(npm view:*)",
24+
"Bash(npx ts-node:*)",
2225
"Bash(npx tsc:*)",
2326
"Bash(pnpm add:*)",
2427
"Bash(pnpm audit:*)",
28+
"Bash(pnpm benchmark:*)",
29+
"Bash(pnpm build-dev:*)",
2530
"Bash(pnpm build:*)",
31+
"Bash(pnpm exec tsc:*)",
2632
"Bash(pnpm i18n:*)",
2733
"Bash(pnpm i18n:compile:*)",
2834
"Bash(pnpm i18n:download:*)",
2935
"Bash(pnpm i18n:extract:*)",
3036
"Bash(pnpm i18n:upload:*)",
37+
"Bash(pnpm i18n:*:*)",
3138
"Bash(pnpm info:*)",
3239
"Bash(pnpm list:*)",
3340
"Bash(pnpm remove:*)",
3441
"Bash(pnpm run:*)",
42+
"Bash(pnpm test:*)",
3543
"Bash(pnpm ts-build:*)",
3644
"Bash(pnpm tsc:*)",
3745
"Bash(pnpm update:*)",
@@ -41,6 +49,7 @@
4149
"Bash(psql:*)",
4250
"Bash(python3:*)",
4351
"Bash(uv:*)",
52+
"Bash(timeout:*)",
4453
"WebFetch",
4554
"WebSearch",
4655
"mcp__cclsp__find_definition",
@@ -49,6 +58,7 @@
4958
"mcp__github__get_issue_comments",
5059
"mcp__github__get_pull_request",
5160
"mcp__github__get_pull_request_comments",
61+
"mcp__github__get_pull_request_files",
5262
"mcp__github__get_pull_request_status",
5363
"mcp__github__list_workflow_runs",
5464
"mcp__github__list_workflows"

.vscode/settings.json renamed to src/.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@
2222
],
2323
"search.useGlobalIgnoreFiles": true,
2424
"search.useParentIgnoreFiles": true,
25-
"search.followSymlinks": false
25+
"search.followSymlinks": false,
26+
"typescript.preferences.includePackageJsonAutoImports": "off",
27+
"typescript.disableAutomaticTypeAcquisition": true,
28+
"typescript.tsc.autoDetect": "off",
29+
"typescript.suggest.autoImports": "off"
2630
}

src/AGENTS.md

Lines changed: 319 additions & 0 deletions
Large diffs are not rendered by default.

src/CLAUDE.md

Lines changed: 0 additions & 317 deletions
This file was deleted.

src/CLAUDE.md

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

src/GEMINI.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/packages/backend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@types/debug": "^4.1.12",
4747
"@types/jest": "^30.0.0",
4848
"awaiting": "^3.0.0",
49-
"better-sqlite3": "^12.2.0",
49+
"better-sqlite3": "^12.4.1",
5050
"chokidar": "^3.6.0",
5151
"debug": "^4.4.0",
5252
"fs-extra": "^11.2.0",
@@ -57,7 +57,7 @@
5757
"rimraf": "^5.0.5",
5858
"shell-escape": "^0.2.0",
5959
"tmp-promise": "^3.0.3",
60-
"zstd-napi": "^0.0.10"
60+
"zstd-napi": "^0.0.12"
6161
},
6262
"repository": {
6363
"type": "git",

src/packages/conat/socket/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export class ConatSocketServer extends ConatSocketBase {
211211
try {
212212
await socket.end({ timeout });
213213
} catch (err) {
214-
console.log("WARNING: error ending socket -- ${err}");
214+
console.log(`WARNING: error ending socket -- ${err}`);
215215
}
216216
};
217217
await Promise.all(Object.keys(this.sockets).map(end));

src/packages/frontend/components/icon.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ import {
229229
XOutlined,
230230
YoutubeFilled,
231231
YoutubeOutlined,
232+
ZoomInOutlined,
233+
ZoomOutOutlined,
232234
} from "@ant-design/icons";
233235

234236
// Unfortunately -- "error TS7056: The inferred type of this node exceeds the maximum length the
@@ -528,8 +530,8 @@ const IconSpec = {
528530
scheme: { IconFont: "scheme" },
529531
scissors: ScissorOutlined,
530532
search: SearchOutlined,
531-
"search-minus": MinusOutlined, // we actually use this for zoom
532-
"search-plus": PlusOutlined,
533+
"search-minus": ZoomOutOutlined,
534+
"search-plus": ZoomInOutlined,
533535
"select-outlined": SelectOutlined,
534536
settings: SettingOutlined,
535537
server: CloudServerOutlined,
@@ -635,6 +637,8 @@ const IconSpec = {
635637
"merge-cells-outlined": MergeCellsOutlined,
636638
"fork-outlined": ForkOutlined,
637639
"to-top-outlined": ToTopOutlined,
640+
"column-width": ColumnWidthOutlined,
641+
"column-height": ColumnHeightOutlined,
638642
} as const;
639643

640644
// Icon Fonts coming from https://www.iconfont.cn/?lang=en-us

0 commit comments

Comments
 (0)