Skip to content

Commit ae2b523

Browse files
authored
fix(mobile): bump react-native-shiki-engine to 0.3.12 (pingdotgg#3120)
1 parent 75b3b3c commit ae2b523

4 files changed

Lines changed: 372 additions & 355 deletions

File tree

apps/mobile/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
"@noble/hashes": "catalog:",
5050
"@pierre/diffs": "catalog:",
5151
"@react-native-menu/menu": "^2.0.0",
52-
"@shikijs/core": "3.23.0",
53-
"@shikijs/engine-javascript": "3.23.0",
54-
"@shikijs/langs": "3.23.0",
55-
"@shikijs/themes": "3.23.0",
52+
"@shikijs/core": "4.2.0",
53+
"@shikijs/engine-javascript": "4.2.0",
54+
"@shikijs/langs": "4.2.0",
55+
"@shikijs/themes": "4.2.0",
5656
"@t3tools/client-runtime": "workspace:*",
5757
"@t3tools/contracts": "workspace:*",
5858
"@t3tools/mobile-markdown-text": "file:./modules/t3-markdown-text",
@@ -98,10 +98,10 @@
9898
"react-native-reanimated": "4.3.1",
9999
"react-native-safe-area-context": "~5.7.0",
100100
"react-native-screens": "4.25.2",
101-
"react-native-shiki-engine": "^0.3.9",
101+
"react-native-shiki-engine": "^0.3.12",
102102
"react-native-svg": "15.15.4",
103103
"react-native-worklets": "0.8.3",
104-
"shiki": "3.23.0",
104+
"shiki": "4.2.0",
105105
"tailwind-merge": "^3.5.0",
106106
"uniwind": "^1.6.2"
107107
},

patches/@pierre%2Fdiffs@1.3.0-beta.4.patch renamed to patches/@pierre%2Fdiffs@1.3.0-beta.5.patch

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
diff --git a/dist/editor/editor.js b/dist/editor/editor.js
2-
index 4346c77a4e43a98c8524ea5186559fdee7433174..bb2a7ecd1d7f497916a5f220215d5191b095575b 100644
2+
index e8013fc6eb6f243a6c912facf3fc0319ac66a8d0..80c82df4cdeb828bd331f5ec2f443d216bedc304 100644
33
--- a/dist/editor/editor.js
44
+++ b/dist/editor/editor.js
5-
@@ -77,16 +77,13 @@ var Editor = class {
5+
@@ -77,15 +77,12 @@ var Editor = class {
66
this.#options = options;
77
}
88
edit(component) {
99
- const { useTokenTransformer, enableGutterUtility, enableLineSelection, expandUnchanged, diffStyle, lineHoverHighlight,...rest } = component.options;
10-
- if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || expandUnchanged !== true && Object.hasOwn(component, "fileDiff") || diffStyle === "unified" || lineHoverHighlight !== "disabled") {
1110
+ const { useTokenTransformer, expandUnchanged, diffStyle,...rest } = component.options;
12-
+ if (useTokenTransformer !== true || expandUnchanged !== true && Object.hasOwn(component, "fileDiff") || diffStyle === "unified") {
11+
const isDiff = component.type === "file-diff";
12+
- if (useTokenTransformer !== true || enableGutterUtility === true || enableLineSelection === true || lineHoverHighlight !== "disabled" || expandUnchanged !== true && isDiff || diffStyle === "unified" && isDiff) {
13+
+ if (useTokenTransformer !== true || expandUnchanged !== true && isDiff || diffStyle === "unified" && isDiff) {
1314
component.setOptions({
1415
...rest,
1516
useTokenTransformer: true,
1617
- enableGutterUtility: false,
1718
- enableLineSelection: false,
19+
- lineHoverHighlight: "disabled",
1820
expandUnchanged: true,
19-
- diffStyle: "split",
20-
- lineHoverHighlight: "disabled"
21-
+ diffStyle: "split"
21+
diffStyle: "split"
2222
});
23-
component.rerender();
24-
}
25-
@@ -481,6 +478,7 @@ var Editor = class {
23+
@@ -511,6 +508,7 @@ var Editor = class {
2624
return lineNumber - 1;
2725
};
2826
this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
@@ -47,7 +45,7 @@ index cb8e2026fb5d7a19f489c0a2402efbcb7dff3322..510fad6364d4a2214c7dd65fe2b114f1
4745
return merged;
4846
}
4947
diff --git a/package.json b/package.json
50-
index cff9c6b2a955e7568f44279a5b706da164c4f142..3d1f25f8bd1be682549677718d9ed8433872c854 100644
48+
index d1558633de87044b7aa96cff09443db11f163cec..c0b16f0a0bec6fba2026f24f38b2c0a8fa06af7c 100644
5149
--- a/package.json
5250
+++ b/package.json
5351
@@ -55,6 +55,18 @@

0 commit comments

Comments
 (0)