fix: fixes for versions 309.5+ (#215)

Author: nexpid

CHANGELOG.md

@@ -1,3 +1,38 @@
+# [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)
+
+
+### Features
+
+* **fonts:** memoize webview props ([a43af2c](https://github.com/revenge-mod/revenge-bundle/commit/a43af2cee9e43d989e39e59dd1c5ac9d7bdd12b4))
+
+# [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)
+
+
+### Bug Fixes
+
+* **fonts:** re-add FontPreview ([8fe6c41](https://github.com/revenge-mod/revenge-bundle/commit/8fe6c41dad8e9b7a63a72bf42f899a98a25365d6))
+
+
+### Features
+
+* add `react-native-webview` ([7fcf051](https://github.com/revenge-mod/revenge-bundle/commit/7fcf0510256fcc715cda200368f3bdf25e52fadd))
+
+# [1.11.0-dev.1](https://github.com/revenge-mod/revenge-bundle/compare/v1.10.5...v1.11.0-dev.1) (2025-12-17)
+
+
+### Bug Fixes
+
+* fix more colors ([b26b0db](https://github.com/revenge-mod/revenge-bundle/commit/b26b0dbd80cd16b08703c5f3688697b8dc5e34f8))
+* **fonts:** remove FontPreview ([8947785](https://github.com/revenge-mod/revenge-bundle/commit/8947785b609eaf892306a764b973260baa20853e))
+* remove Skia ([3b864fb](https://github.com/revenge-mod/revenge-bundle/commit/3b864fb9e6cee86e9a25c385065dd0fd960bea02))
+* **scripts:** fix \r for windows ([0c749f0](https://github.com/revenge-mod/revenge-bundle/commit/0c749f055794044e8ba4fd99680e3461764d26ab))
+* update colors for 309.5 ([961340c](https://github.com/revenge-mod/revenge-bundle/commit/961340c0f1159f3a813310d273f9f2030792985d))
+
+
+### Features
+
+* **scripts:** skip hermes in `serve` script ([1185b47](https://github.com/revenge-mod/revenge-bundle/commit/1185b47de6cb9111da7c054303e7acde1b027ae7))
+
 ## [1.10.5](https://github.com/revenge-mod/revenge-bundle/compare/v1.10.4...v1.10.5) (2025-11-14)
 
 

bun.lock

@@ -42,7 +42,6 @@
         "@gullerya/object-observer": "^6.1.4",
         "@revenge-mod/devtools-client": "^1.1.3",
         "@revenge-mod/devtools-shared": "^1.0.2",
-        "@shopify/react-native-skia": "^1.12.4",
         "@tanstack/react-query": "^5.83.0",
         "@types/chroma-js": "~2.4.5",
         "@types/lodash": "~4.17.20",
@@ -53,6 +52,7 @@
         "intl-messageformat": "^10.7.16",
         "moment": "2.22.2",
         "react-native-reanimated": "^3.18.0",
+        "react-native-webview": "^13.16.0",
         "spitroast": "^1.4.4",
         "type-fest": "^4.41.0"
     }

package.json

@@ -10,7 +10,7 @@ export function getPackageName() {
 export function isADBAvailableAndAppInstalled() {
     try {
         const out = execSync(`adb shell pm list packages ${packageName}`);
-        return out.toString().trim().split("\n").includes(`package:${packageName}`);
+        return out.toString().trim().replace(/\r/g, "").split("\n").includes(`package:${packageName}`);
     } catch {
         return false;
     }

scripts/adb.mjs

@@ -46,7 +46,8 @@ const config = {
         js: "//# sourceURL=revenge"
     },
     loader: {
-        ".png": "dataurl"
+        ".png": "dataurl",
+        ".html": "text"
     },
     define: {
         window: "globalThis",
@@ -116,32 +117,34 @@ const config = {
     ]
 };
 
-export async function buildBundle(overrideConfig = {}) {
+export async function buildBundle(overrideConfig = {}, skipHermes) {
     context = {
         hash: releaseBranch ? execSync("git rev-parse --short HEAD").toString().trim() : crypto.randomBytes(8).toString("hex").slice(0, 7)
     };
 
     const initialStartTime = performance.now();
     await build({ ...config, ...overrideConfig });
 
-    const paths = {
-        win32: "win64-bin/hermesc.exe",
-        darwin: "osx-bin/hermesc",
-        linux: "linux64-bin/hermesc",
-    };
+    if (!skipHermes) {
+        const paths = {
+            win32: "win64-bin/hermesc.exe",
+            darwin: "osx-bin/hermesc",
+            linux: "linux64-bin/hermesc",
+        };
 
-    if (!(process.platform in paths))
-        throw new Error(`Unsupported platform: ${process.platform}`);
+        if (!(process.platform in paths))
+            throw new Error(`Unsupported platform: ${process.platform}`);
 
-    const sdksDir = "./node_modules/react-native/sdks";
-    const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`;
+        const sdksDir = "./node_modules/react-native/sdks";
+        const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`;
 
-    const actualFile = overrideConfig.outfile ?? config.outfile;
+        const actualFile = overrideConfig.outfile ?? config.outfile;
 
-    execFileSync(binPath, ["-finline", "-strict", "-O", "-g1", "-reuse-prop-cache", "-optimized-eval", "-emit-binary", "-Wno-undefined-variable", "-out", actualFile], {
-        input: await readFile(actualFile),
-        stdio: "pipe"
-    });
+        execFileSync(binPath, ["-finline", "-strict", "-O", "-g1", "-reuse-prop-cache", "-optimized-eval", "-emit-binary", "-Wno-undefined-variable", "-out", actualFile], {
+            input: await readFile(actualFile),
+            stdio: "pipe"
+        });
+    }
 
     return {
         config,

scripts/build.mjs

@@ -19,7 +19,7 @@ export function serve(options) {
         const { pathname } = url.parse(req.url || "", true);
         if (pathname?.endsWith(".js")) {
             try {
-                const { config, context, timeTook } = await buildBundle();
+                const { config, context, timeTook } = await buildBundle({}, true);
 
                 printBuildSuccess(
                     context.hash,

scripts/serve.mjs

@@ -7,5 +7,5 @@ module.exports = {
     "moment": findByPropsLazy("isMoment"),
     "chroma-js": findByPropsLazy("brewer"),
     "lodash": findByPropsLazy("forEachRight"),
-    "@shopify/react-native-skia": findByPropsLazy("useFont")
+    "react-native-webview": findByPropsLazy("WebView")
 };

shims/depsModule.ts

@@ -32,23 +32,23 @@ const useStyles = createStyles({
     },
     headerLabel: {
         ...TextStyleSheet["heading-md/semibold"],
-        color: semanticColors.TEXT_NORMAL,
+        color: semanticColors.TEXT_DEFAULT,
     },
     headerSubtitle: {
         ...TextStyleSheet["text-md/semibold"],
         color: semanticColors.TEXT_MUTED,
     },
     descriptionLabel: {
         ...TextStyleSheet["text-md/semibold"],
-        color: semanticColors.TEXT_NORMAL,
+        color: semanticColors.TEXT_DEFAULT,
     },
     actions: {
         flexDirection: "row-reverse",
         alignItems: "center",
         gap: 5
     },
     iconStyle: {
-        tintColor: semanticColors.LOGO_PRIMARY,
+        tintColor: semanticColors.INTERACTIVE_ICON_DEFAULT,
         opacity: 0.2,
         height: 64,
         width: 64,

src/core/ui/components/AddonCard.tsx

@@ -151,7 +151,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
         return <View style={{ gap: 32, flexGrow: 1, justifyContent: "center", alignItems: "center" }}>
             <View style={{ gap: 8, alignItems: "center" }}>
                 <Image source={findAssetId("empty_quick_switcher")!} />
-                <Text variant="text-lg/semibold" color="text-normal">
+                <Text variant="text-lg/semibold" color="text-default">
                     Oops! Nothing to see here… yet!
                 </Text>
             </View>
@@ -204,7 +204,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
                 ListHeaderComponent={headerElement}
                 ListEmptyComponent={() => <View style={{ gap: 12, padding: 12, alignItems: "center" }}>
                     <Image source={findAssetId("devices_not_found")!} />
-                    <Text variant="text-lg/semibold" color="text-normal">
+                    <Text variant="text-lg/semibold" color="text-default">
                         Hmmm... could not find that!
                     </Text>
                 </View>}

src/core/ui/components/AddonPage.tsx

@@ -17,7 +17,7 @@ export default function AssetBrowser() {
                     onChangeText={(v: string) => setSearch(v)}
                 />
                 <View style={{ flex: 1, borderRadius: 16, paddingHorizontal: 12, overflow: 'hidden', backgroundColor: 'transparent' }}>
-                    <Text variant='text-sm/medium' color='text-danger' style={{ marginBottom: 16 }}>Some assets types cannot be displayed and will be marked in red.</Text>
+                    <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>
                     <FlatList
                         data={all.filter(a => a.name.includes(search) || a.id.toString() === search)}
                         renderItem={({ item }: any) => <AssetDisplay asset={item} />}