@bravemobile/react-native-code-push 12.1.2 → 12.1.4

package/cli/commands/initCommand/initAndroid.ts

@@ -44,7 +44,7 @@ export function modifyMainApplicationKt(mainApplicationContent: string) {
 }
 
 function addJsBundleFilePathArgument(mainApplicationContent: string) {
-    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
 
     if (!packageListArgumentPattern.test(mainApplicationContent)) {
         console.log('log: Could not find packageList argument while updating MainApplication.kt.');

package/cli/dist/commands/initCommand/initAndroid.js

@@ -34,7 +34,7 @@ export function modifyMainApplicationKt(mainApplicationContent) {
     throw new Error('Unsupported MainApplication.kt structure.');
 }
 function addJsBundleFilePathArgument(mainApplicationContent) {
-    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+    const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
     if (!packageListArgumentPattern.test(mainApplicationContent)) {
         console.log('log: Could not find packageList argument while updating MainApplication.kt.');
         return mainApplicationContent;

package/expo/plugin/withCodePushAndroid.js

@@ -1,7 +1,7 @@
 const { withMainApplication, WarningAggregator } = require('expo/config-plugins');
 
 const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
-const RN_082_MARKER = '  getDefaultReactHost(';
+const RN_082_MARKER = 'ExpoReactHostFactory.getDefaultReactHost(';
 const JS_BUNDLE_FILE_PATH_ARGUMENT = 'jsBundleFilePath = CodePush.getJSBundleFile()';
 
 function androidMainApplicationApplyImplementation(mainApplication, find, add, reverse = false) {
@@ -32,7 +32,7 @@ function addJsBundleFilePathArgument(mainApplication) {
     return mainApplication;
   }
 
-  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},\s*\n)/;
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)/;
 
   if (!packageListArgumentPattern.test(mainApplication)) {
     WarningAggregator.addWarningAndroid(
@@ -68,10 +68,19 @@ const withAndroidMainApplicationDependency = (config) => {
       if (action.modResults.contents.includes(RN_082_MARKER)) {
         action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
       } else {
+        // https://github.com/Soomgo-Mobile/react-native-code-push/issues/97
+        const isExpoSDK54 = config.sdkVersion?.startsWith('54.') ?? false;
+        const addingCode = isExpoSDK54
+          ? '        override fun getJSBundleFile(): String {\n' +
+            '          CodePush.getInstance(applicationContext, BuildConfig.DEBUG)\n' +
+            '          return CodePush.getJSBundleFile()\n' +
+            '        }\n'
+          : '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n';
         action.modResults.contents = androidMainApplicationApplyImplementation(
           action.modResults.contents,
           'object : DefaultReactNativeHost(this) {',
-          '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n');
+          addingCode,
+        );
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.1.2",
+  "version": "12.1.4",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -69,7 +69,7 @@
     "prepack": "npm run build:cli",
     "publish": "npm publish --access=public",
     "eslint": "eslint --quiet .",
-    "jest": "jest src/versioning/* && npm run --workspace cli test"
+    "jest": "jest src/versioning/* expo/* && npm run --workspace cli test"
   },
   "repository": {
     "type": "git",