Improve post-linking process (#639)

Author: Nikita Matrosov

scripts/postlink/android/postlink.js

@@ -2,10 +2,31 @@ var fs = require("fs");
 var glob = require("glob");
 var path = require("path");
 
-var ignoreNodeModules = { ignore: "node_modules/**" };
-var mainApplicationPath = glob.sync("**/MainApplication.java", ignoreNodeModules)[0];
-var mainActivityPath = glob.sync("**/MainActivity.java", ignoreNodeModules)[0];
+var ignoreFolders = { ignore: ["node_modules/**", "**/build/**"] };
 var buildGradlePath = path.join("android", "app", "build.gradle");
+var manifestPath = glob.sync("**/AndroidManifest.xml", ignoreFolders)[0];
+
+function findMainApplication() {
+    if (!manifestPath) {
+        return null;
+    }
+
+    var manifest = fs.readFileSync(manifestPath, "utf8");
+
+    // Android manifest must include single 'application' element
+    var matchResult = manifest.match(/application\s+android:name\s*=\s*"(.*?)"/);
+    if (matchResult) {
+        var appName = matchResult[1];
+    } else {
+        return null;
+    }
+    
+    var nameParts = appName.split('.');
+    var searchPath = glob.sync("**/" + nameParts[nameParts.length - 1] + ".java", ignoreFolders)[0];
+    return searchPath;
+}
+
+var mainApplicationPath = findMainApplication() || glob.sync("**/MainApplication.java", ignoreFolders)[0];
 
 // 1. Add the getJSBundleFile override
 var getJSBundleFileOverride = `
@@ -30,20 +51,34 @@ if (mainApplicationPath) {
         fs.writeFileSync(mainApplicationPath, mainApplicationContents);
     }
 } else {
-    var mainActivityContents = fs.readFileSync(mainActivityPath, "utf8");
-    if (isAlreadyOverridden(mainActivityContents)) {
-        console.log(`"getJSBundleFile" is already overridden`);
+    var mainActivityPath = glob.sync("**/MainActivity.java", ignoreFolders)[0];
+    if (mainActivityPath) {
+        var mainActivityContents = fs.readFileSync(mainActivityPath, "utf8");
+        if (isAlreadyOverridden(mainActivityContents)) {
+            console.log(`"getJSBundleFile" is already overridden`);
+        } else {
+            var mainActivityClassDeclaration = "public class MainActivity extends ReactActivity {";
+            mainActivityContents = mainActivityContents.replace(mainActivityClassDeclaration,
+                `${mainActivityClassDeclaration}\n${getJSBundleFileOverride}`);
+            fs.writeFileSync(mainActivityPath, mainActivityContents);
+        }
     } else {
-        var mainActivityClassDeclaration = "public class MainActivity extends ReactActivity {";
-        mainActivityContents = mainActivityContents.replace(mainActivityClassDeclaration,
-            `${mainActivityClassDeclaration}\n${getJSBundleFileOverride}`);
-        fs.writeFileSync(mainActivityPath, mainActivityContents);
+        console.error(`Couldn't find Android application entry point. You might need to update it manually. \
+Please refer to plugin configuration section for Android at \
+https://github.com/microsoft/react-native-code-push#plugin-configuration-android for more details`);
     }
 }
 
+if (!fs.existsSync(buildGradlePath)) {
+    console.error(`Couldn't find build.gradle file. You might need to update it manually. \
+Please refer to plugin installation section for Android at \
+https://github.com/microsoft/react-native-code-push#plugin-installation-android---manual`);
+    return;
+}
+
 // 2. Add the codepush.gradle build task definitions
 var buildGradleContents = fs.readFileSync(buildGradlePath, "utf8");
-var reactGradleLink = buildGradleContents.match(/\napply from: ".*?react\.gradle"/)[0];
+var reactGradleLink = buildGradleContents.match(/\napply from: ["'].*?react\.gradle["']/)[0];
 var codePushGradleLink = `apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"`;
 if (~buildGradleContents.indexOf(codePushGradleLink)) {
     console.log(`"codepush.gradle" is already linked in the build definition`);

scripts/postlink/ios/postlink.js

@@ -6,19 +6,22 @@ var plist = require("plist");
 var package = require('../../../../../package.json');
 
 var ignoreNodeModules = { ignore: "node_modules/**" };
-var appDelegatePaths = glob.sync("**/AppDelegate.m", ignoreNodeModules);
+var appDelegatePaths = glob.sync("**/AppDelegate.+(mm|m)", ignoreNodeModules);
 
 // Fix for https://github.com/Microsoft/react-native-code-push/issues/477
 // Typical location of AppDelegate.m for newer RN versions: $PROJECT_ROOT/ios/<project_name>/AppDelegate.m
 // Let's try to find that path by filtering the whole array for any path containing <project_name>
 // If we can't find it there, play dumb and pray it is the first path we find.
 var appDelegatePath = findFileByAppName(appDelegatePaths, package ? package.name : null) || appDelegatePaths[0];
 
-// Glob only allows foward slashes in patterns: https://www.npmjs.com/package/glob#windows
-var plistPath = glob.sync(path.join(path.dirname(appDelegatePath), "*Info.plist").replace(/\\/g, "/"), ignoreNodeModules)[0];
+if (!appDelegatePath) {
+    console.log(`Couldn't find AppDelegate. You might need to update it manually \
+Please refer to plugin configuration section for iOS at \
+https://github.com/microsoft/react-native-code-push#plugin-configuration-ios`);
+    return;
+}
 
 var appDelegateContents = fs.readFileSync(appDelegatePath, "utf8");
-var plistContents = fs.readFileSync(plistPath, "utf8");
 
 // 1. Add the header import statement
 var codePushHeaderImportStatement = `#import "CodePush.h"`;
@@ -46,6 +49,14 @@ if (~appDelegateContents.indexOf(newJsCodeLocationAssignmentStatement)) {
         jsCodeLocationPatch);
 }
 
+var plistPath = glob.sync(`**/${package.name}/*Info.plist`, ignoreNodeModules)[0];
+if (!plistPath) {
+    console.log("Couldn't find .plist file");
+    return;
+}
+
+var plistContents = fs.readFileSync(plistPath, "utf8");
+
 // 3. Add CodePushDeploymentKey to plist file
 var parsedInfoPlist = plist.parse(plistContents);
 if (parsedInfoPlist.CodePushDeploymentKey) {