chore: code-push-next 의 코드 변경 내용 적용 및 codegen 충돌 수정

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@ What actually happens?
 
 ### Reproducible Demo
 
-* Download https://github.com/microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.71.19 react-native-code-push@9.0.0` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
+* Download https://github.com/microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.71.19 react-native-code-push@9.0.1` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
 * If you can't reproduce the bug on it, provide us as much info as possible about your project
 
 ### Environment

.gitignore

@@ -191,6 +191,6 @@ Ankh.NoLoad
 Examples/testapp_rn
 
 # Android debug build files (conflict ignoring #Visual Studio files)
-!android/app/src/debug/
+!android/src/debug/
 
-**/*.tgz
+**/*.tgz

CodePush.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.license        = package['license']
   s.homepage       = package['homepage']
-  s.source         = { :git => 'https://github.com/microsoft/react-native-code-push.git', :tag => "v#{s.version}"}
+  s.source         = { :git => 'https://github.com/CodePushNext/react-native-code-push.git', :tag => "v#{s.version}"}
   s.ios.deployment_target = '15.5'
   s.tvos.deployment_target = '15.5'
   s.preserve_paths = '*.js'

Examples/CodePushDemoApp/App.js

@@ -9,7 +9,7 @@ import {
   View,
 } from 'react-native';
 
-import CodePush from "react-native-code-push";
+import CodePush from "@chlee1001/react-native-code-push";
 
 class App extends Component<{}> {
   constructor() {

Examples/CodePushDemoApp/android/settings.gradle

@@ -1,4 +1,3 @@
 rootProject.name = 'CodePushDemoApp'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
-include ':app', ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':app'

Examples/CodePushDemoApp/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "17.0.2",
     "react-native": "0.68.5",
-    "react-native-code-push": "8.1.0"
+    "@chlee1001/react-native-code-push": "8.1.0"
   },
   "resolutions": {
     "strip-ansi": "^6.0.1",

Examples/CodePushDemoAppCpp/App.js

@@ -11,7 +11,7 @@ import {
   View,
 } from 'react-native';
 
-import CodePush from "react-native-code-push";
+import CodePush from "@chlee1001/react-native-code-push";
 
 class App extends Component<{}> {
   constructor() {
@@ -86,7 +86,7 @@ class App extends Component<{}> {
       this.codePushDownloadDidProgress.bind(this)
     );
   }
-  
+
   restartApp() {
 	  CodePush.restartApp();
   }

Examples/CodePushDemoAppCpp/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "react": "^17.0.2",
     "react-native": "^0.68.5",
-    "react-native-code-push": "^8.1.0",
+    "@chlee1001/react-native-code-push": "^8.1.0",
     "react-native-windows": "^1.0.0"
   },
   "resolutions": {

Examples/CodePushDemoAppNewArch/android/app/build.gradle

@@ -117,3 +117,5 @@ dependencies {
         implementation jscFlavor
     }
 }
+
+apply from: "../../node_modules/@chlee1001/react-native-code-push/android/codepush.gradle"

Examples/CodePushDemoAppNewArch/android/app/src/main/java/com/codepushdemoappnewarch/MainApplication.kt

@@ -17,35 +17,27 @@ import com.microsoft.codepush.react.CodePush
 @OptIn(UnstableReactNativeAPI::class)
 class MainApplication : Application(), ReactApplication {
 
+    val defaultPackageList by lazy {
+      PackageList(this).packages.apply {
+        // Packages that cannot be autolinked yet can be added manually here, for example:
+        // add(MyReactNativePackage())
+      }
+    }
+
     override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-            }
+        override fun getPackages(): List<ReactPackage> = defaultPackageList
 
         override fun getJSMainModuleName(): String = "index"
 
         override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()
 
         override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
       }
 
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(
-        applicationContext,
-        PackageList(this).packages.apply {
-            // Packages that cannot be autolinked yet can be added manually here, for example:
-            // add(MyReactNativePackage())
-        },
-        jsMainModulePath = "index",
-        jsBundleAssetPath = "index.android.bundle",
-        jsBundleFilePath = CodePush.getJSBundleFile(),
-        isHermesEnabled = BuildConfig.IS_HERMES_ENABLED,
-        useDevSupport = BuildConfig.DEBUG,
-    )
+  override val reactHost: ReactHost get() = getDefaultReactHost(this, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()

Examples/CodePushDemoAppNewArch/android/settings.gradle

@@ -2,6 +2,5 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'CodePushDemoAppNewArch'
-include ':app', ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

Examples/CodePushDemoAppNewArch/ios/CodePushDemoAppNewArch.xcodeproj/project.pbxproj

@@ -471,6 +471,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = CodePushDemoAppNewArch/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -498,6 +499,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = CodePushDemoAppNewArch/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -586,10 +588,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -658,10 +657,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

Examples/CodePushDemoAppNewArch/ios/CodePushDemoAppNewArch.xcodeproj/xcshareddata/xcschemes/CodePushDemoAppNewArch.xcscheme

@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Examples/CodePushDemoAppNewArch/ios/CodePushDemoAppNewArch/AppDelegate.mm

@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
+#import <CodePush/CodePush.h>
 
 #import <React/RCTBundleURLProvider.h>
 
@@ -24,7 +25,7 @@ - (NSURL *)bundleURL
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
-  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+  return [CodePush bundleURL];
 #endif
 }
 

Examples/CodePushDemoAppNewArch/ios/Podfile.lock

@@ -1,12 +1,20 @@
 PODS:
+  - Base64 (1.1.2)
   - boost (1.84.0)
+  - CodePush (8.1.0):
+    - Base64 (~> 1.1)
+    - JWT (~> 3.0.0-beta.12)
+    - React-Core
+    - SSZipArchive (~> 2.2.2)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.76.0)
   - fmt (9.1.0)
   - glog (0.3.5)
   - hermes-engine (0.76.0):
     - hermes-engine/Pre-built (= 0.76.0)
   - hermes-engine/Pre-built (0.76.0)
+  - JWT (3.0.0-beta.14):
+    - Base64 (~> 1.1.2)
   - RCT-Folly (2024.01.01.00):
     - boost
     - DoubleConversion
@@ -1510,10 +1518,12 @@ PODS:
     - React-perflogger (= 0.76.0)
     - React-utils (= 0.76.0)
   - SocketRocket (0.7.1)
+  - SSZipArchive (2.2.3)
   - Yoga (0.0.0)
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
+  - CodePush (from `../node_modules/react-native-code-push`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
@@ -1581,11 +1591,16 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - Base64
+    - JWT
     - SocketRocket
+    - SSZipArchive
 
 EXTERNAL SOURCES:
   boost:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
+  CodePush:
+    :path: "../node_modules/react-native-code-push"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -1713,12 +1728,15 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost: 1dca942403ed9342f98334bf4c3621f011aa7946
+  CodePush: 255d7607f428dcbec39085f81a206b170e01d012
   DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
   FBLazyVector: aa59bef5c46e93168bffcf3dc37ee1e176de799a
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 9de51d2f67336348a6cd5b686330e436d1dbd522
+  JWT: ef71dfb03e1f842081e64dc42eef0e164f35d251
   RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
   RCTDeprecation: 4c2c4a088b6f0ccfcbd53c9d5614b0238ad57909
   RCTRequired: 2d8a683a7848bc0baf5883f0792c1ac43f6267b5
@@ -1729,16 +1747,16 @@ SPEC CHECKSUMS:
   React-CoreModules: ac0a55891bcb72a9f8c6631128e7cbbf9ce06b65
   React-cxxreact: fec14d0078f627985b2cce98f90458e969a848ae
   React-debug: c185808d0674717d0d408d7ce45a7343f0072199
-  React-defaultsnativemodule: 4340736904471e594da5568971f401440a96277e
-  React-domnativemodule: 084716bdc086debd25c4311058567ae2699f506a
+  React-defaultsnativemodule: 5dc781a1e3274cbb6d6d3e91f5bf9914a258115d
+  React-domnativemodule: f81f69be048840a0efcf0add685ad0cf5583fb5f
   React-Fabric: 8de8a37b62f81d264302462cf33c69b97faf9979
   React-FabricComponents: 777f5e4fdc39355fa0275412a3b8f2430a7bef1d
   React-FabricImage: 9202f25c36040de738cd486ea6b8480f2d62b05f
   React-featureflags: 51f1373ac42cefac4936c62be46dbe2a1f9f1f7d
-  React-featureflagsnativemodule: 0d84b94449c0768cca16ab1622d46354fd452946
+  React-featureflagsnativemodule: 59083d49f82a50aecba32e1cddb791ca362df198
   React-graphics: 4508c3473dd97c76d627938bfa0c304abc37e3b0
   React-hermes: 9d2b208eb88bfd4eb156064a831bec2f01e8165d
-  React-idlecallbacksnativemodule: 0c87d8ed6f305d7484a2668b9ef35643261899f8
+  React-idlecallbacksnativemodule: fc31bde9dc276e78d4289b4fd209b5fbe762600b
   React-ImageManager: f046a503ff853fc5aec31db274c03cea239e5de4
   React-jserrorhandler: a03ee04881559e8a0cdcd0cb7dbbc4d1c78edc9d
   React-jsi: b7efc160dd211f6a3999cdc4a2c9fc2bbcda05db
@@ -1747,16 +1765,16 @@ SPEC CHECKSUMS:
   React-jsitracing: 043658000ac681e8aa5f3ee61690e0686da01bfe
   React-logger: d1a89c7d9b3c847eb63eb85724c54b06cae2c939
   React-Mapbuffer: b0b4ace5b62b269f3838df26ba2d8b4f39f90783
-  React-microtasksnativemodule: 1f580b56eca388dbc696a083ba6125e869194415
+  React-microtasksnativemodule: 0b7db04c18f6bb01ef5b1f9007c3229abecc35dd
   React-nativeconfig: 72c10ff34863148ef90df9c9c8eacba99d2faaaa
   React-NativeModulesApple: 5ec49182fa000b2215ee1bed03e2867f8323ccf5
   React-perflogger: 073c7a8a436b3fe724f1df34e9d1f3db1d25fe74
   React-performancetimeline: 52f8e3b73b98dad5d5ba360035ad0be294087bd8
   React-RCTActionSheet: 96cf4d93fccb7a96ba1867e173c586e7ad9cd5cc
   React-RCTAnimation: bcd2356245abffd232ea8d4d5b64ae0bf93c7ef0
-  React-RCTAppDelegate: 8abd8ea3f8b868ce9cfc63e1b566b3de75b742d0
+  React-RCTAppDelegate: 20242d0ddf9348f8de10e5750d8c0844e222b0e3
   React-RCTBlob: 7fadfb83ce2bb5580b73368384fe242aaa6ddbc6
-  React-RCTFabric: d389235d2a28dc767baf7a94f35997f7bb56194c
+  React-RCTFabric: 504fe0307b1e72d093aa84e1c5ccb26d1bca66e3
   React-RCTImage: fdf95e50ad94842fd9c508ed36d9bfd6e1ffa8ef
   React-RCTLinking: 76a398421d9a26422e5733439e2a9d13f19e5a99
   React-RCTNetwork: 2bf6ca74a1a14648f6985cfbfc4f8813fa66e6a4
@@ -1776,6 +1794,7 @@ SPEC CHECKSUMS:
   ReactCodegen: dbfef1fef26f42c900bb1884fa149d49d501d64d
   ReactCommon: 429ca28cd813c31359c73ffac6dc24f93347d522
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
+  SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
   Yoga: f8ec45ce98bba1bc93dd28f2ee37215180e6d2b6
 
 PODFILE CHECKSUM: de9556319c6d177cc038861b6e8a4c1189ce67bd

Examples/CodePushDemoAppNewArch/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "18.3.1",
     "react-native": "0.76.0",
-    "react-native-code-push": "file:../.."
+    "@chlee1001/react-native-code-push": "file:../.."
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",