Skip to content

Commit c26ecc7

Browse files
release
1 parent 9c1d9e6 commit c26ecc7

File tree

7 files changed

+90
-89
lines changed

7 files changed

+90
-89
lines changed

packages/react/src/components/DiffView.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { diffFontSizeName } from "@git-diff-view/utils";
55
import { memo, useEffect, useMemo, forwardRef, useImperativeHandle, useRef } from "react";
66
import * as React from "react";
77

8+
import { useIsMounted } from "../hooks/useIsMounted";
89
import { useUnmount } from "../hooks/useUnmount";
910

1011
import { DiffSplitView } from "./DiffSplitView";
@@ -114,6 +115,8 @@ const _InternalDiffView = <T extends unknown>(props: Omit<DiffViewProps<T>, "dat
114115

115116
const diffFileId = useMemo(() => diffFile.getId(), [diffFile]);
116117

118+
const isMounted = useIsMounted();
119+
117120
const wrapperRef = useRef<HTMLDivElement>();
118121

119122
// performance optimization
@@ -199,8 +202,7 @@ const _InternalDiffView = <T extends unknown>(props: Omit<DiffViewProps<T>, "dat
199202
}}
200203
>
201204
<div
202-
suppressHydrationWarning
203-
id={`diff-root${diffFileId}`}
205+
id={isMounted ? `diff-root${diffFileId}` : undefined}
204206
className={"diff-view-wrapper" + (className ? ` ${className}` : "")}
205207
style={style}
206208
>
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { useEffect, useState } from "react";
2+
3+
export const useIsMounted = () => {
4+
const [isMounted, setIsMounted] = useState(false);
5+
6+
useEffect(() => {
7+
setIsMounted(true);
8+
}, []);
9+
10+
return isMounted;
11+
};

packages/shiki/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"license": "MIT",
66
"version": "0.0.25",
77
"types": "index.d.ts",
8+
"main": "./dist/esm/index.mjs",
89
"type": "module",
910
"files": [
1011
"dist",

packages/vue/package.json

+1-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "MrWangJustToDo",
55
"license": "MIT",
66
"version": "0.0.25",
7-
"main": "index.js",
7+
"main": "./dist/vue-git-diff-view.mjs",
88
"type": "module",
99
"types": "index.d.ts",
1010
"files": [
@@ -35,19 +35,6 @@
3535
"./styles/*": "./dist/css/*",
3636
"./package.json": "./package.json"
3737
},
38-
"buildOptions": [
39-
{
40-
"input": "./src/index.withStyle.ts",
41-
"output": [
42-
{
43-
"dir": "./dist",
44-
"entryFileNames": "esm/index.mjs",
45-
"format": "esm",
46-
"sourcemap": true
47-
}
48-
]
49-
}
50-
],
5138
"keywords": [
5239
"diff component",
5340
"vue diff component"

pnpm-lock.yaml

+69-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/next-app-example/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@git-diff-view/react": "workspace:*",
1414
"react": "19.0.0",
1515
"react-dom": "19.0.0",
16-
"next": "15.1.2"
16+
"next": "^15.1.5"
1717
},
1818
"devDependencies": {
1919
"typescript": "^5",
@@ -23,6 +23,6 @@
2323
"postcss": "^8",
2424
"tailwindcss": "^3.4.1",
2525
"eslint": "^8",
26-
"eslint-config-next": "15.0.3"
26+
"eslint-config-next": "^15.1.5"
2727
}
2828
}

ui/next-page-example/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@git-diff-view/react": "workspace:*",
1313
"react": "19.0.0",
1414
"react-dom": "19.0.0",
15-
"next": "15.1.2"
15+
"next": "^15.1.5"
1616
},
1717
"devDependencies": {
1818
"typescript": "^5",
@@ -22,6 +22,6 @@
2222
"postcss": "^8",
2323
"tailwindcss": "^3.4.1",
2424
"eslint": "^8",
25-
"eslint-config-next": "15.0.3"
25+
"eslint-config-next": "^15.1.5"
2626
}
2727
}

0 commit comments

Comments
 (0)