Skip to content

Expo Support for New Architecture (Android) #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmsbernard merged 3 commits into from
Apr 9, 2026
Merged

Expo Support for New Architecture (Android) #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
babcfbc
change insert location for new architecture (android)
benbitrise Mar 26, 2026
dcd648b
new anchor point
benbitrise Mar 26, 2026
8c1d25b
82 not 83
benbitrise Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions expo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,36 @@ const withAndroidMainApplication = (config) => {
}
}

// --- 4. Add getJSBundleFile method ---
const getJSBundleFileMethodString = `
override fun getJSBundleFile(): String {
return CodePush.getJSBundleFile()
}`;
const hermesEnabledAnchor = /(override\s+val\s+isHermesEnabled:\s*Boolean\s*=\s*BuildConfig\.IS_HERMES_ENABLED)\s*\n/m;

if (!content.includes("override fun getJSBundleFile(): String")) {
if (hermesEnabledAnchor.test(content)) {
content = content.replace(hermesEnabledAnchor, `$1\n${getJSBundleFileMethodString}\n`);
} else {
WarningAggregator.addWarningAndroid('codepush-plugin', 'Could not find `isHermesEnabled` property to anchor `getJSBundleFile()` insertion. Please review `MainApplication.kt`.');
// --- 4. Wire up CodePush bundle file ---
if (!content.includes("CodePush.getJSBundleFile()")) {
const hermesEnabledAnchor = /(override\s+val\s+isHermesEnabled:\s*Boolean\s*=\s*BuildConfig\.IS_HERMES_ENABLED)\s*\n/m;
if (hermesEnabledAnchor.test(content)) {
// RN < 0.82: uses ReactNativeHost with getJSBundleFile() override
const getJSBundleFileMethodString = `
override fun getJSBundleFile(): String {
return CodePush.getJSBundleFile()
}`;
content = content.replace(hermesEnabledAnchor, `$1\n${getJSBundleFileMethodString}\n`);
} else {
// RN 0.82+: uses ReactHost via getDefaultReactHost() — pass jsBundleFilePath parameter
// Match the closing parenthesis of the getDefaultReactHost() call
const reactHostCallRegex = /(getDefaultReactHost\([\s\S]*?packageList\s*=[\s\S]*?\})([\s\S]*?\))/m;
if (reactHostCallRegex.test(content)) {
content = content.replace(reactHostCallRegex, (match, beforeClose, closing) => {
// Check if jsBundleFilePath is already set
if (match.includes('jsBundleFilePath')) return match;
// Insert the parameter before the closing parentheses
return `${beforeClose},\n jsBundleFilePath = CodePush.getJSBundleFile()${closing}`;
});
} else {
WarningAggregator.addWarningAndroid(
'codepush-plugin',
'Could not find getDefaultReactHost() call in MainApplication. CodePush bundle file path not configured.'
);
}
}
}
}


modConfig.modResults.contents = content;
return modConfig;
});
Expand Down