Add support [email protected] (#1543)

Author: alexandergoncharov-zz

package.json

@@ -22,6 +22,7 @@
     "hoist-non-react-statics": "^2.3.1",
     "inquirer": "1.1.2",
     "plist": "3.0.1",
+    "semver": "^5.6.0",
     "xcode": "1.0.0"
   },
   "devDependencies": {

scripts/postlink/ios/postlink.js

@@ -4,6 +4,7 @@ var inquirer = require('inquirer');
 var path = require("path");
 var plist = require("plist");
 var xcode = require("xcode");
+var semver = require('semver');
 
 var package = require('../../../../../package.json');
 
@@ -40,36 +41,56 @@ module.exports = () => {
     }
 
     // 2. Modify jsCodeLocation value assignment
-    var jsCodeLocations = appDelegateContents.match(/(jsCodeLocation = .*)/g);
+    var reactNativeVersion = package && package.dependencies && package.dependencies["react-native"];
 
-    if (!jsCodeLocations) {
-        console.log('Couldn\'t find jsCodeLocation setting in AppDelegate.');
-    }
-    var newJsCodeLocationAssignmentStatement = "jsCodeLocation = [CodePush bundleURL];";
-    if (~appDelegateContents.indexOf(newJsCodeLocationAssignmentStatement)) {
-        console.log(`"jsCodeLocation" already pointing to "[CodePush bundleURL]".`);
+    if (!reactNativeVersion) {
+        console.log(`Can't take react-native version from package.json`);
+    } else if (semver.gte(semver.coerce(reactNativeVersion), "0.59.0")) {
+        var oldBundleUrl = "[[NSBundle mainBundle] URLForResource:@\"main\" withExtension:@\"jsbundle\"]";
+        var codePushBundleUrl = "[CodePush bundleURL]";
+
+        if (~appDelegateContents.indexOf(codePushBundleUrl)) {
+            console.log(`"BundleUrl" already pointing to "[CodePush bundleURL]".`);
+        } else {
+            if (~appDelegateContents.indexOf(oldBundleUrl)) {
+                appDelegateContents = appDelegateContents.replace(oldBundleUrl, codePushBundleUrl);
+            } else {
+                console.log(`AppDelegate isn't compatible for linking`);
+            }
+        }
     } else {
-        if (jsCodeLocations.length === 1) {
-            // If there is one `jsCodeLocation` it means that react-native app version is lower than 0.57.8 
-            // and we should replace this line with DEBUG ifdef statement and add CodePush call for Release case
-
-            var oldJsCodeLocationAssignmentStatement = jsCodeLocations[0];
-            var jsCodeLocationPatch = `
-                #ifdef DEBUG
-                    ${oldJsCodeLocationAssignmentStatement}
-                #else
-                    ${newJsCodeLocationAssignmentStatement}
-                #endif`;
-            appDelegateContents = appDelegateContents.replace(oldJsCodeLocationAssignmentStatement,
-                jsCodeLocationPatch);
-        } else if (jsCodeLocations.length === 2) {
-            // If there are two `jsCodeLocation` it means that react-native app version is higher than 0.57.8 or equal
-            // and we should replace the second one(Release case) with CodePush call
-
-            appDelegateContents = appDelegateContents.replace(jsCodeLocations[1],
-                newJsCodeLocationAssignmentStatement);
+        var jsCodeLocations = appDelegateContents.match(/(jsCodeLocation = .*)/g);
+
+        if (!jsCodeLocations) {
+            console.log('Couldn\'t find jsCodeLocation setting in AppDelegate.');
+        }
+
+        var newJsCodeLocationAssignmentStatement = "jsCodeLocation = [CodePush bundleURL];";
+        if (~appDelegateContents.indexOf(newJsCodeLocationAssignmentStatement)) {
+            console.log(`"jsCodeLocation" already pointing to "[CodePush bundleURL]".`);
         } else {
-            console.log(`AppDelegate isn't compatible for linking`);
+            if (jsCodeLocations.length === 1) {
+                // If there is one `jsCodeLocation` it means that react-native app version is lower than 0.57.8 
+                // and we should replace this line with DEBUG ifdef statement and add CodePush call for Release case
+
+                var oldJsCodeLocationAssignmentStatement = jsCodeLocations[0];
+                var jsCodeLocationPatch = `
+                    #ifdef DEBUG
+                        ${oldJsCodeLocationAssignmentStatement}
+                    #else
+                        ${newJsCodeLocationAssignmentStatement}
+                    #endif`;
+                appDelegateContents = appDelegateContents.replace(oldJsCodeLocationAssignmentStatement,
+                    jsCodeLocationPatch);
+            } else if (jsCodeLocations.length === 2) {
+                // If there are two `jsCodeLocation` it means that react-native app version is higher than 0.57.8 or equal
+                // and we should replace the second one(Release case) with CodePush call
+
+                appDelegateContents = appDelegateContents.replace(jsCodeLocations[1],
+                    newJsCodeLocationAssignmentStatement);
+            } else {
+                console.log(`AppDelegate isn't compatible for linking`);
+            }
         }
     }
 
@@ -111,7 +132,7 @@ module.exports = () => {
     // Helper that filters an array with AppDelegate.m paths for a path with the app name inside it
     // Should cover nearly all cases
     function findFileByAppName(array, appName) {
-        if (array.length === 0 || !appName) return null;
+        if (array.length === 0 || !appName) return null;
 
         for (var i = 0; i < array.length; i++) {
             var path = array[i];
@@ -206,4 +227,4 @@ module.exports = () => {
         //(see https://github.com/Microsoft/react-native-code-push/issues/534#issuecomment-302069326 for details)
         return path.resolve(path.dirname(xcodeProjectPath), '..', plistPathValue.replace(/^"(.*)"$/, '$1'));
     }
-}
+}