diff --git a/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java b/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java index 349a1b89..a0380248 100644 --- a/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java +++ b/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java @@ -36,7 +36,7 @@ public class VersionController { @GetMapping public VersionInfo version() { - if ("dev".equals(version)) { + if (version.endsWith("-SNAPSHOT")) { return VersionInfo.builder() .currentVersion(version) .latestVersion(version).build(); diff --git a/web/src/components/code-viewer.tsx b/web/src/components/code-viewer.tsx index f193bc37..a9aab28d 100644 --- a/web/src/components/code-viewer.tsx +++ b/web/src/components/code-viewer.tsx @@ -1,5 +1,6 @@ -import { Button, type ButtonProps } from "@/components/ui/button"; +import { Button, buttonVariants } from "@/components/ui/button"; import { cn } from "@/lib/utils"; +import { VariantProps } from "class-variance-authority"; import { Check, Copy } from "lucide-react"; import { type HTMLProps, type ReactNode, useCallback, useEffect, useState } from "react"; import { CopyToClipboard } from "react-copy-to-clipboard"; @@ -8,12 +9,12 @@ import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"; import { materialDark } from "react-syntax-highlighter/dist/esm/styles/prism"; import { toast } from "sonner"; -interface CopyButtonProps extends ButtonProps { +interface CopyButtonProps extends React.ComponentProps<"button"> { value: string; src?: string; } -export function CopyButton({ value }: Readonly) { +export function CopyButton({ value }: Readonly>) { const [hasCopied, setHasCopied] = useState(false); const { t } = useTranslation(); diff --git a/web/src/components/version-badge.tsx b/web/src/components/version-badge.tsx index 40bebcc6..60f923c5 100644 --- a/web/src/components/version-badge.tsx +++ b/web/src/components/version-badge.tsx @@ -25,7 +25,6 @@ const VersionBadge: React.FC = () => { }); const inProduction = env.MODE === "production"; const { t } = useTranslation(); - const version = data?.currentVersion === "dev" ? data?.currentVersion : `v${data?.currentVersion}`; return (
@@ -77,11 +76,11 @@ const VersionBadge: React.FC = () => { )} {data && (!data.hasUpdate || !inProduction) && ( )}