make ExcludeArchs, optional

morrowdigital · Jan 25, 2024 · 5532fc4 · 5532fc4
1 parent 56812e0
commit 5532fc4
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -43,4 +43,37 @@ In your app.json `plugins` array:
 }
 ```
 
-Note: This plugin enables by default the watermelon JSI interface in Android.
+## JSI support for Android
+
+This plugin installs automatically JSI support for Android builds, as per [WatermelonDB for Android instructions](https://watermelondb.dev/docs/Installation#android-react-native).
+If you wish to disable JSI support during build you may add the option in config plugin:
+```json
+  [
+    "@morrowdigital/watermelondb-expo-plugin",
+    { "disableJSI": true }
+  ]
+```
+
+## Build errors with M1 architectures for simulators
+
+There have been errors building with M1 architectures for simulators on iOS, with Error:
+```
+No such module 'ExpoModulesCore' 
+```
+See these discussions:
+* [https://github.com/morrowdigital/watermelondb-expo-plugin/issues/20](https://github.com/morrowdigital/watermelondb-expo-plugin/issues/20)
+* [https://github.com/morrowdigital/watermelondb-expo-plugin/issues/34](https://github.com/morrowdigital/watermelondb-expo-plugin/issues/34)
+* [https://github.com/facebook/react-native/issues/32704#issuecomment-1174458011](https://github.com/facebook/react-native/issues/32704#issuecomment-1174458011)
+
+This plugin will NOT add the `arm64` in  `Exlcuded_Archs`, in SDK 50 builds:
+```
+'"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"'
+```
+
+If you wish to add the above in configuration, you can add it with option:
+```json
+  [
+    "@morrowdigital/watermelondb-expo-plugin",
+    { "excludeSimArch": true }
+  ]
+```
diff --git a/build/withWatermelon.d.ts b/build/withWatermelon.d.ts
@@ -1,4 +1,9 @@
 import { ExpoConfig } from "@expo/config-types";
-export declare function withSDK50(config: ExpoConfig): ExpoConfig;
+type Options = {
+    disableJsi?: boolean;
+    databases?: string[];
+    excludeSimArch?: boolean;
+};
+export declare function withSDK50(options: Options): (config: ExpoConfig) => ExpoConfig;
 declare const _default: (config: any, options: any) => any;
 export default _default;
diff --git a/build/withWatermelon.js b/build/withWatermelon.js
@@ -259,23 +259,30 @@ const withWatermelonDBAndroidJSI = (config, options) => {
     return mainApplication(settingGradle(buildGradle(config)));
 };
 // @ts-ignore
-function withSDK50(config) {
-    // Android
-    let currentConfig = settingGradle(config);
-    currentConfig = buildGradle(currentConfig);
-    currentConfig = proGuardRules(currentConfig);
-    currentConfig = mainApplication(currentConfig);
-    // iOS
-    currentConfig = setWmelonBridgingHeader(currentConfig);
-    currentConfig = withCocoaPods(currentConfig);
-    currentConfig = withExcludedSimulatorArchitectures(currentConfig);
-    return currentConfig;
+function withSDK50(options) {
+    return (config) => {
+        let currentConfig = config;
+        // Android
+        if (options?.disableJsi !== true) {
+            currentConfig = settingGradle(config);
+            currentConfig = buildGradle(currentConfig);
+            currentConfig = proGuardRules(currentConfig);
+            currentConfig = mainApplication(currentConfig);
+        }
+        // iOS
+        currentConfig = setWmelonBridgingHeader(currentConfig);
+        currentConfig = withCocoaPods(currentConfig);
+        if (options?.excludeSimArch === true) {
+            currentConfig = withExcludedSimulatorArchitectures(currentConfig);
+        }
+        return currentConfig;
+    };
 }
 exports.withSDK50 = withSDK50;
 // @ts-ignore
 exports.default = (config, options) => {
     if (config.sdkVersion >= '50.0.0') {
-        return withSDK50(config);
+        return withSDK50(options)(config);
     }
     ;
     if (config.sdkVersion < '50.0.0') {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@morrowdigital/watermelondb-expo-plugin",
-  "version": "2.3.0-beta1",
+  "version": "2.3.0-beta2",
   "main": "build/withWatermelon.js",
   "types": "build/withWatermelon.d.ts",
   "license": "MIT",

diff --git a/src/withWatermelon.ts b/src/withWatermelon.ts
@@ -18,6 +18,7 @@ const fs = filesys.promises;
 type Options = {
   disableJsi?: boolean;
   databases?: string[];
+  excludeSimArch?: boolean;
 }
 
 /**
@@ -144,7 +145,7 @@ function proGuardRules(config: ExpoConfig): ExpoConfig {
 /**
  * Platform: Android
  *  */
-function addFlipperDb(config: ExportedConfigWithProps, databases: string[]) {
+function addFlipperDb(config: ExpoConfig, databases: string[]) {
   return withDangerousMod(config, [
     "android",
     async (config) => {
@@ -202,7 +203,7 @@ import java.util.ArrayList;`,
 
       return config;
     },
-  ]);
+  ]) as ExpoConfig;
 }
 
 function setWmelonBridgingHeader(config: ExpoConfig): ExpoConfig {
@@ -384,32 +385,41 @@ const withWatermelonDBAndroidJSI = (config: ExpoConfig, options: Options) => {
   return mainApplication(settingGradle(buildGradle(config)));
 };
 
+
 // @ts-ignore
-export function withSDK50(config: ExpoConfig): ExpoConfig {
-  // Android
-  let currentConfig = settingGradle(config);
-  currentConfig = buildGradle(currentConfig);
-  currentConfig = proGuardRules(currentConfig);
-  currentConfig = mainApplication(currentConfig);
-  // iOS
-  currentConfig = setWmelonBridgingHeader(currentConfig);
-  currentConfig = withCocoaPods(currentConfig);
-  currentConfig = withExcludedSimulatorArchitectures(currentConfig);
-  return currentConfig as ExpoConfig;
+export function withSDK50(options: Options) {
+  return (config: ExpoConfig): ExpoConfig => {
+    let currentConfig: ExpoConfig = config;
+    // Android
+    if (options?.disableJsi !== true) {
+      currentConfig = settingGradle(config);
+      currentConfig = buildGradle(currentConfig);
+      currentConfig = proGuardRules(currentConfig);
+      currentConfig = mainApplication(currentConfig);
+    }
+
+    // iOS
+    currentConfig = setWmelonBridgingHeader(currentConfig);
+    currentConfig = withCocoaPods(currentConfig);
+    if (options?.excludeSimArch === true) {
+      currentConfig = withExcludedSimulatorArchitectures(currentConfig);
+    }
+
+    return currentConfig as ExpoConfig;
+  }
 }
 
 // @ts-ignore
 export default (config, options) => {
   if (config.sdkVersion >= '50.0.0') {
-    return withSDK50(config);
+    return withSDK50(options)(config);
   };
 
   if (config.sdkVersion < '50.0.0') {
     config = setAndroidMainApplication(config);
     config = addFlipperDb(config, options?.databases ?? []);
     config = withWatermelonDBAndroidJSI(setWmelonBridgingHeader(config), options);
     config = withCocoaPods(config);
-
     config = withExcludedSimulatorArchitectures(config);
   }