Change prelink script for #223

src/ios/RNFetchBlob/RNFetchBlob.h

@@ -4,25 +4,26 @@
 //  Created by wkh237 on 2016/4/28.
 //
 
-// comment out this line if your RN project >= 0.40
-#define OLD_IMPORT
+//XXX: DO NO REMOVE THIS LINE IF YOU'RE USING IT ON RN > 0.40 PROJECT
+//#define RN040_IMPORT
+
 
 #ifndef RNFetchBlob_h
 #define RNFetchBlob_h
 
 
-#ifdef OLD_IMPORT
-#import "RCTBridgeModule.h"
-#import "RCTLog.h"
-#import "RCTRootView.h"
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTBridgeModule.h>
+#else
+#import "RCTBridgeModule.h"
+#import "RCTLog.h"
+#import "RCTRootView.h"
+#import "RCTBridge.h"
+#import "RCTEventDispatcher.h"
 #endif
 
 #import <UIKit/UIKit.h>

src/ios/RNFetchBlobFS.h

@@ -12,10 +12,10 @@
 #import "RNFetchBlob.h"
 
 #import <Foundation/Foundation.h>
-#ifdef OLD_IMPORT
-#import "RCTBridgeModule.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTBridgeModule.h>
+#else
+#import "RCTBridgeModule.h"
 #endif
 
 @import AssetsLibrary;

src/ios/RNFetchBlobFS.m

@@ -13,12 +13,12 @@
 #import "IOS7Polyfill.h"
 @import AssetsLibrary;
 
-#ifdef OLD_IMPORT
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcher.h>
+#else
+#import "RCTBridge.h"
+#import "RCTEventDispatcher.h"
 #endif
 
 

src/ios/RNFetchBlobNetwork.h

@@ -10,10 +10,10 @@
 #import "RNFetchBlobProgress.h"
 #import "RNFetchBlobFS.h"
 
-#ifdef OLD_IMPORT
-#import "RCTBridgeModule.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTBridgeModule.h>
+#else
+#import "RCTBridgeModule.h"
 #endif
 
 #ifndef RNFetchBlobNetwork_h

src/ios/RNFetchBlobNetwork.m

@@ -17,16 +17,16 @@
 #import <CommonCrypto/CommonDigest.h>
 #import "RNFetchBlobProgress.h"
 
-#ifdef OLD_IMPORT
-#import "RCTRootView.h"
-#import "RCTLog.h"
-#import "RCTEventDispatcher.h"
-#import "RCTBridge.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTRootView.h>
 #import <React/RCTLog.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTBridge.h>
+#else
+#import "RCTRootView.h"
+#import "RCTLog.h"
+#import "RCTEventDispatcher.h"
+#import "RCTBridge.h"
 #endif
 
 ////////////////////////////////////////

src/ios/RNFetchBlobReqBuilder.m

@@ -13,10 +13,10 @@
 #import "RNFetchBlobFS.h"
 #import "IOS7Polyfill.h"
 
-#ifdef OLD_IMPORT
-#import "RCTLog.h"
-#else
+#ifdef RN040_IMPORT
 #import <React/RCTLog.h>
+#else
+#import "RCTLog.h"
 #endif
 
 @interface RNFetchBlobReqBuilder()

src/scripts/prelink.js

@@ -21,13 +21,13 @@ try {
     console.log('adding OkHttp3 dependency to pre 0.28 project .. ok')
   }
   else if (VERSION >= 0.40) {
-    console.log('Remove OLD_IMPORT for RN >= 0.40 project ..')
+    console.log('Adding RN040_IMPORT for RN >= 0.40 project ..')
     glob('**/RNFetchBlob.h',{}, function(err, files) {
       if(Array.isArray(files)) {
         var target = process.cwd() + '/' + files[0];
         console.log('\033[92mPatching .. \033[97m' + target);
         var data = fs.readFileSync(target);
-        fs.writeFileSync(target, String(data).replace(/#define OLD_IMPORT/, ''));
+        fs.writeFileSync(target, String(data).replace(/\/\/#define RN040_IMPORT/, '#define RN040_IMPORT'));
         console.log('done.')
       }
     })