Skip to content

Commit f20c37e

Browse files
authored
fix: fixes for versions 309.5+ (#215)
2 parents 50aeb37 + 54168da commit f20c37e

File tree

19 files changed

+157
-97
lines changed

19 files changed

+157
-97
lines changed

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
# [1.11.0-dev.3](https://github.com/revenge-mod/revenge-bundle/compare/v1.11.0-dev.2...v1.11.0-dev.3) (2025-12-17)
2+
3+
4+
### Features
5+
6+
* **fonts:** memoize webview props ([a43af2c](https://github.com/revenge-mod/revenge-bundle/commit/a43af2cee9e43d989e39e59dd1c5ac9d7bdd12b4))
7+
8+
# [1.11.0-dev.2](https://github.com/revenge-mod/revenge-bundle/compare/v1.11.0-dev.1...v1.11.0-dev.2) (2025-12-17)
9+
10+
11+
### Bug Fixes
12+
13+
* **fonts:** re-add FontPreview ([8fe6c41](https://github.com/revenge-mod/revenge-bundle/commit/8fe6c41dad8e9b7a63a72bf42f899a98a25365d6))
14+
15+
16+
### Features
17+
18+
* add `react-native-webview` ([7fcf051](https://github.com/revenge-mod/revenge-bundle/commit/7fcf0510256fcc715cda200368f3bdf25e52fadd))
19+
20+
# [1.11.0-dev.1](https://github.com/revenge-mod/revenge-bundle/compare/v1.10.5...v1.11.0-dev.1) (2025-12-17)
21+
22+
23+
### Bug Fixes
24+
25+
* fix more colors ([b26b0db](https://github.com/revenge-mod/revenge-bundle/commit/b26b0dbd80cd16b08703c5f3688697b8dc5e34f8))
26+
* **fonts:** remove FontPreview ([8947785](https://github.com/revenge-mod/revenge-bundle/commit/8947785b609eaf892306a764b973260baa20853e))
27+
* remove Skia ([3b864fb](https://github.com/revenge-mod/revenge-bundle/commit/3b864fb9e6cee86e9a25c385065dd0fd960bea02))
28+
* **scripts:** fix \r for windows ([0c749f0](https://github.com/revenge-mod/revenge-bundle/commit/0c749f055794044e8ba4fd99680e3461764d26ab))
29+
* update colors for 309.5 ([961340c](https://github.com/revenge-mod/revenge-bundle/commit/961340c0f1159f3a813310d273f9f2030792985d))
30+
31+
32+
### Features
33+
34+
* **scripts:** skip hermes in `serve` script ([1185b47](https://github.com/revenge-mod/revenge-bundle/commit/1185b47de6cb9111da7c054303e7acde1b027ae7))
35+
136
## [1.10.5](https://github.com/revenge-mod/revenge-bundle/compare/v1.10.4...v1.10.5) (2025-11-14)
237

338

bun.lock

Lines changed: 4 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"@gullerya/object-observer": "^6.1.4",
4343
"@revenge-mod/devtools-client": "^1.1.3",
4444
"@revenge-mod/devtools-shared": "^1.0.2",
45-
"@shopify/react-native-skia": "^1.12.4",
4645
"@tanstack/react-query": "^5.83.0",
4746
"@types/chroma-js": "~2.4.5",
4847
"@types/lodash": "~4.17.20",
@@ -53,6 +52,7 @@
5352
"intl-messageformat": "^10.7.16",
5453
"moment": "2.22.2",
5554
"react-native-reanimated": "^3.18.0",
55+
"react-native-webview": "^13.16.0",
5656
"spitroast": "^1.4.4",
5757
"type-fest": "^4.41.0"
5858
}

scripts/adb.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export function getPackageName() {
1010
export function isADBAvailableAndAppInstalled() {
1111
try {
1212
const out = execSync(`adb shell pm list packages ${packageName}`);
13-
return out.toString().trim().split("\n").includes(`package:${packageName}`);
13+
return out.toString().trim().replace(/\r/g, "").split("\n").includes(`package:${packageName}`);
1414
} catch {
1515
return false;
1616
}

scripts/build.mjs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ const config = {
4646
js: "//# sourceURL=revenge"
4747
},
4848
loader: {
49-
".png": "dataurl"
49+
".png": "dataurl",
50+
".html": "text"
5051
},
5152
define: {
5253
window: "globalThis",
@@ -116,32 +117,34 @@ const config = {
116117
]
117118
};
118119

119-
export async function buildBundle(overrideConfig = {}) {
120+
export async function buildBundle(overrideConfig = {}, skipHermes) {
120121
context = {
121122
hash: releaseBranch ? execSync("git rev-parse --short HEAD").toString().trim() : crypto.randomBytes(8).toString("hex").slice(0, 7)
122123
};
123124

124125
const initialStartTime = performance.now();
125126
await build({ ...config, ...overrideConfig });
126127

127-
const paths = {
128-
win32: "win64-bin/hermesc.exe",
129-
darwin: "osx-bin/hermesc",
130-
linux: "linux64-bin/hermesc",
131-
};
128+
if (!skipHermes) {
129+
const paths = {
130+
win32: "win64-bin/hermesc.exe",
131+
darwin: "osx-bin/hermesc",
132+
linux: "linux64-bin/hermesc",
133+
};
132134

133-
if (!(process.platform in paths))
134-
throw new Error(`Unsupported platform: ${process.platform}`);
135+
if (!(process.platform in paths))
136+
throw new Error(`Unsupported platform: ${process.platform}`);
135137

136-
const sdksDir = "./node_modules/react-native/sdks";
137-
const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`;
138+
const sdksDir = "./node_modules/react-native/sdks";
139+
const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`;
138140

139-
const actualFile = overrideConfig.outfile ?? config.outfile;
141+
const actualFile = overrideConfig.outfile ?? config.outfile;
140142

141-
execFileSync(binPath, ["-finline", "-strict", "-O", "-g1", "-reuse-prop-cache", "-optimized-eval", "-emit-binary", "-Wno-undefined-variable", "-out", actualFile], {
142-
input: await readFile(actualFile),
143-
stdio: "pipe"
144-
});
143+
execFileSync(binPath, ["-finline", "-strict", "-O", "-g1", "-reuse-prop-cache", "-optimized-eval", "-emit-binary", "-Wno-undefined-variable", "-out", actualFile], {
144+
input: await readFile(actualFile),
145+
stdio: "pipe"
146+
});
147+
}
145148

146149
return {
147150
config,

scripts/serve.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function serve(options) {
1919
const { pathname } = url.parse(req.url || "", true);
2020
if (pathname?.endsWith(".js")) {
2121
try {
22-
const { config, context, timeTook } = await buildBundle();
22+
const { config, context, timeTook } = await buildBundle({}, true);
2323

2424
printBuildSuccess(
2525
context.hash,

shims/depsModule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
"moment": findByPropsLazy("isMoment"),
88
"chroma-js": findByPropsLazy("brewer"),
99
"lodash": findByPropsLazy("forEachRight"),
10-
"@shopify/react-native-skia": findByPropsLazy("useFont")
10+
"react-native-webview": findByPropsLazy("WebView")
1111
};

src/core/ui/components/AddonCard.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ const useStyles = createStyles({
3232
},
3333
headerLabel: {
3434
...TextStyleSheet["heading-md/semibold"],
35-
color: semanticColors.TEXT_NORMAL,
35+
color: semanticColors.TEXT_DEFAULT,
3636
},
3737
headerSubtitle: {
3838
...TextStyleSheet["text-md/semibold"],
3939
color: semanticColors.TEXT_MUTED,
4040
},
4141
descriptionLabel: {
4242
...TextStyleSheet["text-md/semibold"],
43-
color: semanticColors.TEXT_NORMAL,
43+
color: semanticColors.TEXT_DEFAULT,
4444
},
4545
actions: {
4646
flexDirection: "row-reverse",
4747
alignItems: "center",
4848
gap: 5
4949
},
5050
iconStyle: {
51-
tintColor: semanticColors.LOGO_PRIMARY,
51+
tintColor: semanticColors.INTERACTIVE_ICON_DEFAULT,
5252
opacity: 0.2,
5353
height: 64,
5454
width: 64,

src/core/ui/components/AddonPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
151151
return <View style={{ gap: 32, flexGrow: 1, justifyContent: "center", alignItems: "center" }}>
152152
<View style={{ gap: 8, alignItems: "center" }}>
153153
<Image source={findAssetId("empty_quick_switcher")!} />
154-
<Text variant="text-lg/semibold" color="text-normal">
154+
<Text variant="text-lg/semibold" color="text-default">
155155
Oops! Nothing to see here… yet!
156156
</Text>
157157
</View>
@@ -204,7 +204,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
204204
ListHeaderComponent={headerElement}
205205
ListEmptyComponent={() => <View style={{ gap: 12, padding: 12, alignItems: "center" }}>
206206
<Image source={findAssetId("devices_not_found")!} />
207-
<Text variant="text-lg/semibold" color="text-normal">
207+
<Text variant="text-lg/semibold" color="text-default">
208208
Hmmm... could not find that!
209209
</Text>
210210
</View>}

src/core/ui/settings/pages/Developer/AssetBrowser.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function AssetBrowser() {
1717
onChangeText={(v: string) => setSearch(v)}
1818
/>
1919
<View style={{ flex: 1, borderRadius: 16, paddingHorizontal: 12, overflow: 'hidden', backgroundColor: 'transparent' }}>
20-
<Text variant='text-sm/medium' color='text-danger' style={{ marginBottom: 16 }}>Some assets types cannot be displayed and will be marked in red.</Text>
20+
<Text variant='text-sm/medium' color='text-feedback-critical' style={{ marginBottom: 16 }}>Some assets types cannot be displayed and will be marked in red.</Text>
2121
<FlatList
2222
data={all.filter(a => a.name.includes(search) || a.id.toString() === search)}
2323
renderItem={({ item }: any) => <AssetDisplay asset={item} />}

0 commit comments

Comments
 (0)