Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(reviews): suggestion fixes from ai bots

justinc3e97dffbb20
diff --git a/apps/web/src/components/activity/comment-editor.tsx b/apps/web/src/components/activity/comment-editor.tsx
index 24c74bc2f..e7ede83f2 100644
--- a/apps/web/src/components/activity/comment-editor.tsx
+++ b/apps/web/src/components/activity/comment-editor.tsx
@@ -35,7 +35,7 @@ import {
import type { MouseEvent as ReactMouseEvent } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { bundledLanguages, type Highlighter } from "shiki";
+import type { Highlighter } from "shiki";
import { AttachmentCard } from "@/components/task/extensions/attachment-card";
import { EmbedBlock } from "@/components/task/extensions/embed-block";
import { KaneoIssueLink } from "@/components/task/extensions/kaneo-issue-link";
@@ -70,7 +70,6 @@ import {
normalizeUrl,
} from "@/lib/editor-url-utils";
import { isInCodeBlockLanguagePicker } from "@/lib/is-in-codeblock-language-picker";
-import { getSharedShikiHighlighter } from "@/lib/shiki-highlighter";
import { toast } from "@/lib/toast";
import { uploadTaskImage } from "@/lib/upload-task-image";
@@ -255,9 +254,8 @@ export default function CommentEditor({
})),
[t],
);
- const availableShikiLanguages = useMemo(
- () => new Set(Object.keys(bundledLanguages)),
- [],
+ const [availableShikiLanguages, setAvailableShikiLanguages] = useState(
+ () => new Set<string>(),
);
const toShikiLanguage = useCallback(
(language: string) => {
@@ -574,11 +572,17 @@ export default function CommentEditor({
useEffect(() => {
let mounted = true;
- void getSharedShikiHighlighter()
- .then((instance) => {
+ void Promise.all([
+ import("@/lib/shiki-highlighter").then(({ getSharedShikiHighlighter }) =>
+ getSharedShikiHighlighter(),
+ ),
+ import("shiki"),
+ ])
+ .then(([instance, { bundledLanguages: languages }]) => {
if (!mounted) return;
shikiHighlighterRef.current = instance;
setShikiHighlighter(instance);
+ setAvailableShikiLanguages(new Set(Object.keys(languages)));
})
.catch((err) => {
// Shared initializer resets its cached promise on rejection so a
diff --git a/apps/web/src/components/task/task-description.tsx b/apps/web/src/components/task/task-description.tsx
index 4f7f3903f..f83c91b10 100644
--- a/apps/web/src/components/task/task-description.tsx
+++ b/apps/web/src/components/task/task-description.tsx
@@ -48,7 +48,7 @@ import {
useState,
} from "react";
import { useTranslation } from "react-i18next";
-import { bundledLanguages, type Highlighter } from "shiki";
+import type { Highlighter } from "shiki";
import { Button } from "@/components/ui/button";
import { Dialog, DialogPopup } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
@@ -72,7 +72,6 @@ import {
normalizeUrl,
} from "@/lib/editor-url-utils";
import { isInCodeBlockLanguagePicker } from "@/lib/is-in-codeblock-language-picker";
-import { getSharedShikiHighlighter } from "@/lib/shiki-highlighter";
import { toast } from "@/lib/toast";
import { uploadTaskImage } from "@/lib/upload-task-image";
import { AttachmentCard } from "./extensions/attachment-card";
@@ -348,9 +347,8 @@ export default function TaskDescription({ taskId }: TaskDescriptionProps) {
updateTaskRef.current = updateTaskDescription;
}, [task, taskId, updateTaskDescription]);
- const shikiSupportedLanguages = useMemo(
- () => new Set([...Object.keys(bundledLanguages), "text"]),
- [],
+ const [shikiSupportedLanguages, setShikiSupportedLanguages] = useState(
+ () => new Set<string>(["text"]),
);
const toShikiLanguage = useCallback(
(language: string) => SHIKI_LANGUAGE_ALIASES[language] || language,
@@ -559,11 +557,19 @@ export default function TaskDescription({ taskId }: TaskDescriptionProps) {
useEffect(() => {
let isDisposed = false;
- void getSharedShikiHighlighter()
- .then((nextHighlighter) => {
+ void Promise.all([
+ import("@/lib/shiki-highlighter").then(({ getSharedShikiHighlighter }) =>
+ getSharedShikiHighlighter(),
+ ),
+ import("shiki"),
+ ])
+ .then(([nextHighlighter, { bundledLanguages: languages }]) => {
shikiHighlighterRef.current = nextHighlighter;
if (!isDisposed) {
setShikiHighlighter(nextHighlighter);
+ setShikiSupportedLanguages(
+ new Set([...Object.keys(languages), "text"]),
+ );
}
})
.catch((error) => {