Merge pull request #10 from ExodusMovement/@cawfree/bundle-support

Add asset bundle support

Author: andrewtoth

android/src/main/java/com/rnthreads/RNFileReaderPackage.java

@@ -77,8 +77,13 @@ public void startThread(final String jsFileName, final Promise promise) {
             : createReleaseBundleLoader(jsFileName, jsFileSlug);
 
     try {
-      ArrayList<ReactPackage> threadPackages = new ArrayList<ReactPackage>(Arrays.asList(additionalThreadPackages));
-      threadPackages.add(0, new ThreadBaseReactPackage(getReactInstanceManager()));
+      ArrayList<ReactPackage> threadPackages = new ArrayList<ReactPackage>();
+      // react-native-threads
+      threadPackages.add(new ThreadBaseReactPackage(getReactInstanceManager()));
+      // react native runtime
+      threadPackages.addAll(getReactInstanceManager().getPackages());
+      // thread-specific native modules
+      threadPackages.addAll(Arrays.asList(additionalThreadPackages));
 
       ReactContextBuilder threadContextBuilder = new ReactContextBuilder(getReactApplicationContext())
               .setJSBundleLoader(bundleLoader)
@@ -204,7 +209,7 @@ private JSBundleLoader createDevBundleLoader(String jsFileName, String jsFileSlu
 
   private JSBundleLoader createReleaseBundleLoader(String jsFileName, String jsFileSlug) {
     Log.d(TAG, "createReleaseBundleLoader - reading file from assets");
-    return JSBundleLoader.createAssetLoader(reactApplicationContext, "assets://threads/" + jsFileSlug + ".bundle", false);
+    return JSBundleLoader.createAssetLoader(reactApplicationContext, "assets://" + jsFileSlug + ".jsbundle", false);
   }
 
   private ReactInstanceManager getReactInstanceManager() {

android/src/main/java/com/rnthreads/RNThreadModule.java

@@ -10,32 +10,14 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.rnthreads.RNFileReaderPackage;
-
 public class RNThreadPackage implements ReactPackage {
 
     private ReactNativeHost reactNativeHost;
     private ReactPackage additionalThreadPackages[];
 
     public RNThreadPackage(ReactNativeHost pReactNativeHost, ReactPackage ...pAdditionalThreadPackages) {
         this.reactNativeHost = pReactNativeHost;
-
-        // You can add more packages here if you find that using some
-        // vanilla RN functionality leaves the background thread unable
-        // to mount properly.
-        ReactPackage[] extraPackages = {
-            new RNFileReaderPackage() /* https://github.com/facebook/react-native/blob/7ea7d946c643f076c29bcf11b927f7569e3c516f/Libraries/Core/setUpXHR.js#L31 */
-            // ...
-        };
-
-        // Create an array large enough to acommodate for both
-        // the user-defined `pAdditionalThreadPackages` and the
-        // `extraPackages`:
-        this.additionalThreadPackages = new ReactPackage[pAdditionalThreadPackages.length + extraPackages.length];
-
-        // i.e. [...pAdditionalThreadPackages, ...extraPackages];
-        System.arraycopy(pAdditionalThreadPackages, 0, this.additionalThreadPackages, 0, pAdditionalThreadPackages.length);
-        System.arraycopy(extraPackages, 0, this.additionalThreadPackages, pAdditionalThreadPackages.length, extraPackages.length);
+        this.additionalThreadPackages = pAdditionalThreadPackages;
     }
 
     @Override
@@ -49,4 +31,4 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
                 new RNThreadModule(reactContext, reactNativeHost, additionalThreadPackages)
         );
     }
-}
+}

android/src/main/java/com/rnthreads/RNThreadPackage.java

@@ -30,23 +30,7 @@ public ThreadBaseReactPackage(ReactInstanceManager reactInstanceManager) {
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext catalystApplicationContext) {
-        return Arrays.<NativeModule>asList(
-                // Core list
-                new AndroidInfoModule(catalystApplicationContext),
-                new ExceptionsManagerModule(reactInstanceManager.getDevSupportManager()),
-                new AppStateModule(catalystApplicationContext),
-                new TimingModule(catalystApplicationContext, reactInstanceManager.getDevSupportManager()),
-                new UIManagerStubModule(catalystApplicationContext),
-                new SourceCodeModule(catalystApplicationContext),
-                new JSCHeapCapture(catalystApplicationContext),
-
-                // Main list
-                new IntentModule(catalystApplicationContext),
-                new NetworkingModule(catalystApplicationContext),
-                new VibrationModule(catalystApplicationContext),
-                new WebSocketModule(catalystApplicationContext),
-                new ThreadSelfModule(catalystApplicationContext)
-        );
+        return Arrays.<NativeModule>asList(new ThreadSelfModule(catalystApplicationContext));
     }
 
     @Override

android/src/main/java/com/rnthreads/ThreadBaseReactPackage.java

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native-community',
+};

android/src/main/java/com/rnthreads/UIManagerStubModule.java

@@ -0,0 +1,64 @@
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+ios/.xcode.env.local
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
+
+# Bundle artifact
+*.jsbundle
+
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/bundle/
+.bundle
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*

example/.eslintrc.js

@@ -0,0 +1 @@
+18

example/.gitignore

@@ -0,0 +1,7 @@
+module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: 'all',
+};

example/.node-version

@@ -0,0 +1 @@
+{}