refactor: apply code review feedback

- Change bridgingHeaderPath to bridgingHeaderFile
- Add bridging header manual setup reference link
- Fix expo setup readme order

Author: saseungmin

README.md

@@ -35,30 +35,7 @@ The following changes are optional but recommended for cleaning up the old confi
 npm install @bravemobile/react-native-code-push
 ```
 
-### 2. Expo Setup
-For Expo projects, you can use the automated config plugin instead of manual setup.
-
-**Add plugin to your Expo configuration:**
-```js
-// app.config.js
-export default {
-  expo: {
-    plugins: ["@bravemobile/react-native-code-push"],
-  },
-};
-```
-
-**Run prebuild to apply changes:**
-```bash
-npx expo prebuild
-```
-
->[!NOTE] The plugin automatically handles all native iOS and Android code modifications. No manual editing of AppDelegate, MainApplication, or gradle files is required.
-
-**Requirements**
-Expo SDK: 50.0.0 or higher
-
-### 3. iOS Setup
+### 2. iOS Setup
 
 #### (1) Install CocoaPods Dependencies
 
@@ -133,7 +110,7 @@ Then, edit `AppDelegate.swift` like below.
 ```
 
 
-### 4. Android Setup
+### 3. Android Setup
 
 #### (1) Edit `android/app/build.gradle`
 
@@ -184,6 +161,30 @@ Add the following line to the end of the file.
   }
 ```
 
+### 4. Expo Setup
+For Expo projects, you can use the automated config plugin instead of manual setup.
+
+**Add plugin to your Expo configuration:**
+```js
+// app.config.js
+export default {
+  expo: {
+    plugins: ["@bravemobile/react-native-code-push"],
+  },
+};
+```
+
+**Run prebuild to apply changes:**
+```bash
+npx expo prebuild
+```
+
+> [!NOTE]
+> The plugin automatically handles all native iOS and Android code modifications. No manual editing of AppDelegate, MainApplication, or gradle files is required.
+
+**Requirements**
+Expo SDK: 50.0.0 or higher
+
 ### 5. "CodePush-ify" Your App
 
 The root component of your app should be wrapped with a higher-order component.

expo/plugin/withCodePushAndroid.js

@@ -31,7 +31,7 @@ function androidMainApplicationApplyImplementation(
     Please add "${add.replace(/\n/g, '').trim()}" to the MainApplication.kt.
     Supported format: Expo SDK default template.
 
-    Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#4-android-setup
+    Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#3-android-setup
     `,
   );
 

expo/plugin/withCodePushIos.js

@@ -24,14 +24,14 @@ function iosApplyImplementation(
     Please ${replace ? 'replace' : 'add'} "${add.replace(/\n/g, '').trim()}" to the AppDelegate.(m|swift).
     Supported format: Expo SDK default template.
 
-    iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#3-ios-setup
+    iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-ios-setup
     `,
   );
 
   return appDelegate;
 }
 
-function getBridgingHeaderPathFromXcode(project) {
+function getBridgingHeaderFileFromXcode(project) {
   const buildConfigs = project.pbxXCBuildConfigurationSection();
 
   for (const key in buildConfigs) {
@@ -41,11 +41,11 @@ function getBridgingHeaderPathFromXcode(project) {
       config.buildSettings &&
       config.buildSettings['SWIFT_OBJC_BRIDGING_HEADER']
     ) {
-      const bridgingHeaderPath = config.buildSettings[
+      const bridgingHeaderFile = config.buildSettings[
         'SWIFT_OBJC_BRIDGING_HEADER'
       ].replace(/"/g, '');
 
-      return bridgingHeaderPath;
+      return bridgingHeaderFile;
     }
   }
   return null;
@@ -97,22 +97,22 @@ const withIosBridgingHeader = (config) => {
     const appDelegate = getAppDelegate(projectRoot);
 
     if (appDelegate.language === 'swift') {
-      const bridgingHeaderPath = getBridgingHeaderPathFromXcode(
+      const bridgingHeaderFile = getBridgingHeaderFileFromXcode(
         action.modResults,
       );
 
-      const bridgingHeaderFilePath = path.join(
+      const bridgingHeaderPath = path.join(
         action.modRequest.platformProjectRoot,
-        bridgingHeaderPath,
+        bridgingHeaderFile,
       );
 
-      if (fs.existsSync(bridgingHeaderFilePath)) {
-        let content = fs.readFileSync(bridgingHeaderFilePath, 'utf8');
+      if (fs.existsSync(bridgingHeaderPath)) {
+        let content = fs.readFileSync(bridgingHeaderPath, 'utf8');
         const codePushImport = '#import <CodePush/CodePush.h>';
 
         if (!content.includes(codePushImport)) {
           content += `${codePushImport}\n`;
-          fs.writeFileSync(bridgingHeaderFilePath, content);
+          fs.writeFileSync(bridgingHeaderPath, content);
         }
 
         return action;
@@ -121,11 +121,12 @@ const withIosBridgingHeader = (config) => {
       WarningAggregator.addWarningIOS(
         'withIosBridgingHeader',
         `
-        Failed to detect ${bridgingHeaderFilePath} file.
+        Failed to detect ${bridgingHeaderPath} file.
         Please add CodePush integration manually:
         #import <CodePush/CodePush.h>
 
         Supported format: Expo SDK default template.
+        iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-edit-appdelegate-code
         `
       );