fix(expo): use expo-build-properties to create the config plugin (#1618)

* fix: use expo-build-properties to build the plugin

Instead of manually recreating everything, I've just used expo-build-properties.

This fixes that plugin so that it does not override other manifest queries from other plugins but gracefully merges everything.

* fix: yarn lock dedupe

* chore: remove potential duplicates from android permissions

---------

Co-authored-by: Jean-Baptiste LARRIVIERE <[email protected]>
Co-authored-by: Mateus Andrade <[email protected]>

Author: 3 people

README.md

@@ -33,7 +33,8 @@ Configure you `app.config.ts` or `app.json` to use the permissions needed by the
           "com.instagram.android",
           "com.twitter.android",
           "com.zhiliaoapp.musically",
-        ]
+        ],
+        "enableBase64ShareAndroid": true
       }
     ]
   ]
@@ -63,6 +64,12 @@ Configure you `app.config.ts` or `app.json` to use the permissions needed by the
 </queries>
 ```
 
+`enableBase64ShareAndroid` will take care of adding the permission to the AndroidManifest.xml.
+
+```xml
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+```
+
 And prebuild the project with `expo prebuild`.
 
 ## Bare React Native

package.json

@@ -48,6 +48,7 @@
     "babel-jest": "^29.7.0",
     "eslint": "^8.53.0",
     "eslint-config-satya164": "^3.2.0",
+    "expo-build-properties": "^0.13.1",
     "husky": "^4.3.0",
     "jest": "^29.7.0",
     "lint-staged": "^15.0.2",

plugin/src/index.ts

@@ -1,100 +1,53 @@
-import {
-  withAndroidManifest,
-  createRunOncePlugin,
-  ExportedConfigWithProps,
-  ExportedConfig,
-} from '@expo/config-plugins';
-
-// eslint-disable-next-line import/no-commonjs, @typescript-eslint/no-var-requires
-const pkg = require('../../package.json');
+import { ExportedConfig } from '@expo/config-plugins';
+import { withBuildProperties } from 'expo-build-properties';
 
 /**
- * @type {import('./types').ManifestQueries}
- * what we are trying to add:
- * <queries>
-    <package android:name="com.facebook.katana"/>
-    <package android:name="com.instagram.android"/>
-    <package android:name="com.twitter.android"/>
-    <package android:name="com.zhiliaoapp.musically"/>
-    <intent></intent>
-      <action android:name="android.intent.action.VIEW"/>
-      <category android:name="android.intent.category.BROWSABLE"/>
-      <data android:scheme="https"/>
-    </intent>
-  </queries>
+ * Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
  */
-
-/**
- * @param {import('@expo/config-plugins').ExportedConfig} config
- */
-const withAndroidManifestService = (config: ExportedConfig, props: WithSocialShareProps) => {
-  return withAndroidManifest(config, (config: ExportedConfigWithProps) => {
-    config.modResults.manifest = {
-      ...config.modResults.manifest,
-      queries: {
-        package: props?.android?.map((social) => ({
-          $: {
-            'android:name': social,
-          },
-        })),
-        intent: [
-          {
-            action: {
-              $: {
-                'android:name': 'android.intent.action.VIEW',
-              },
-            },
-            category: {
-              $: {
-                'android:name': 'android.intent.category.BROWSABLE',
-              },
-            },
-            data: {
-              $: {
-                'android:scheme': 'https',
-              },
-            },
-          },
-        ],
-      },
-    };
-
-    return config;
-  });
-};
-
-/**
-* Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
-*/
-const getIOSQuerySchemes = (config: ExportedConfig): Array<string> => {
+const getIOSQuerySchemes = (config: ExportedConfig): string[] => {
   return Array.isArray(config.ios?.infoPlist?.LSApplicationQueriesSchemes)
     ? config.ios?.infoPlist?.LSApplicationQueriesSchemes ?? []
     : [];
-}
+};
 
-const withInfoPlist = (config: ExportedConfig, props: WithSocialShareProps) => {
-  return {
-    ...config,
-    ios: {
-      ...config.ios,
-      infoPlist: {
-        ...config.ios?.infoPlist,
-        LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...props?.ios ?? []]
+export default (
+  config: ExportedConfig,
+  props: {
+    enableBase64ShareAndroid?: boolean;
+    android?: string[];
+    ios?: string[];
+  },
+) => {
+  return withBuildProperties(
+    {
+      ...config,
+      android: {
+        ...config.android,
+        ...(props.enableBase64ShareAndroid
+          ? {
+              permissions: [
+                ...new Set([
+                  ...(config.android?.permissions ?? []),
+                  'android.permission.WRITE_EXTERNAL_STORAGE',
+                ]),
+              ],
+            }
+          : {}),
+      },
+      ios: {
+        ...config.ios,
+        infoPlist: {
+          ...config.ios?.infoPlist,
+          LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...(props?.ios ?? [])],
+        },
       },
     },
-  };
-};
-
-type WithSocialShareProps = {
-  ios: string[];
-  android: string[];
+    {
+      android: {
+        manifestQueries: {
+          package: props.android ?? [],
+        },
+      },
+    },
+  );
 };
-
-function withSocialShare(config: ExportedConfig, props: WithSocialShareProps) {
-  config = withAndroidManifestService(config, props); // Android
-  config = withInfoPlist(config, props); // iOS
-  return config;
-}
-
-// eslint-disable-next-line import/no-commonjs
-module.exports = createRunOncePlugin(withSocialShare, pkg.name, pkg.version);