react-native-share 12.1.1 → 12.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-share",
   "description": "Social share, sending simple data to other apps.",
-  "version": "12.1.1",
+  "version": "12.1.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-native-community/react-native-share.git"
@@ -98,7 +98,7 @@
     "start": "react-native start",
     "start:android": "react-native run-android",
     "start:ios": "react-native run-ios",
-    "lint": "eslint \"src/**/*.{js,ts,tsx}\"  --max-warnings=0",
+    "lint": "eslint \"src/**/*.{js,ts,tsx}\" \"plugin/src/**/*.{js,ts,tsx}\" --max-warnings=0",
     "typescript": "tsc --noEmit",
     "build:expo-plugin": "tsc --project ./plugin/tsconfig.json",
     "validate": "yarn lint && yarn typescript",

package/plugin/build/index.d.ts

@@ -1,4 +1,9 @@
 import { ExportedConfig } from '@expo/config-plugins';
+/**
+ * Currently there are noway to get manifest queries config directly
+ * So we parse AndroidManifest.xml to get the queries packages.
+ */
+export declare function getManifestQueriesPackagesSync(manifestPath: string): string[];
 declare const _default: (config: ExportedConfig, props: {
     enableBase64ShareAndroid?: boolean;
     android?: string[];

package/plugin/build/index.js

@@ -1,5 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getManifestQueriesPackagesSync = void 0;
+const fs = __importStar(require("fs"));
 const expo_build_properties_1 = require("expo-build-properties");
 /**
  * Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
@@ -9,7 +34,41 @@ const getIOSQuerySchemes = (config) => {
         ? config.ios?.infoPlist?.LSApplicationQueriesSchemes ?? []
         : [];
 };
+/**
+ * Currently there are noway to get manifest queries config directly
+ * So we parse AndroidManifest.xml to get the queries packages.
+ */
+function getManifestQueriesPackagesSync(manifestPath) {
+    if (!fs.existsSync(manifestPath))
+        return [];
+    const xml = fs.readFileSync(manifestPath, 'utf8');
+    const queriesSection = xml.match(/<queries>[\s\S]*?<\/queries>/);
+    if (!queriesSection)
+        return [];
+    const matches = [...queriesSection[0].matchAll(/<package[^>]*android:name="([^"]+)"[^>]*\/>/g)];
+    return matches.map((m) => m[1]);
+}
+exports.getManifestQueriesPackagesSync = getManifestQueriesPackagesSync;
 exports.default = (config, props) => {
+    let manifestPath = './android/app/src/main/AndroidManifest.xml';
+    if (config.android?.publishManifestPath) {
+        manifestPath = config.android.publishManifestPath;
+    }
+    const currentManifestQueries = getManifestQueriesPackagesSync(manifestPath);
+    const updatedManifestQueries = (props.android ?? []).filter((p) => !currentManifestQueries.includes(p));
+    const propConfig = {
+        android: {},
+    };
+    /**
+     * manifestQueries.package = [] would crashes the prebuild
+     */
+    if (updatedManifestQueries.length > 0) {
+        propConfig.android = {
+            manifestQueries: {
+                package: updatedManifestQueries,
+            },
+        };
+    }
     return (0, expo_build_properties_1.withBuildProperties)({
         ...config,
         android: {
@@ -32,11 +91,5 @@ exports.default = (config, props) => {
                 LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...(props?.ios ?? [])],
             },
         },
-    }, {
-        android: {
-            manifestQueries: {
-                package: props.android ?? [],
-            },
-        },
-    });
+    }, propConfig);
 };

package/plugin/src/index.ts

@@ -1,3 +1,5 @@
+import * as fs from 'fs';
+
 import { ExportedConfig } from '@expo/config-plugins';
 import { withBuildProperties } from 'expo-build-properties';
 
@@ -10,6 +12,19 @@ const getIOSQuerySchemes = (config: ExportedConfig): string[] => {
     : [];
 };
 
+/**
+ * Currently there are noway to get manifest queries config directly
+ * So we parse AndroidManifest.xml to get the queries packages.
+ */
+export function getManifestQueriesPackagesSync(manifestPath: string): string[] {
+  if (!fs.existsSync(manifestPath)) return [];
+  const xml = fs.readFileSync(manifestPath, 'utf8');
+  const queriesSection = xml.match(/<queries>[\s\S]*?<\/queries>/);
+  if (!queriesSection) return [];
+  const matches = [...queriesSection[0].matchAll(/<package[^>]*android:name="([^"]+)"[^>]*\/>/g)];
+  return matches.map((m) => m[1]);
+}
+
 export default (
   config: ExportedConfig,
   props: {
@@ -18,6 +33,30 @@ export default (
     ios?: string[];
   },
 ) => {
+  let manifestPath = './android/app/src/main/AndroidManifest.xml';
+  if (config.android?.publishManifestPath) {
+    manifestPath = config.android.publishManifestPath;
+  }
+  const currentManifestQueries = getManifestQueriesPackagesSync(manifestPath);
+  const updatedManifestQueries = (props.android ?? []).filter(
+    (p) => !currentManifestQueries.includes(p),
+  );
+
+  const propConfig = {
+    android: {},
+  };
+
+  /**
+   * manifestQueries.package = [] would crashes the prebuild
+   */
+  if (updatedManifestQueries.length > 0) {
+    propConfig.android = {
+      manifestQueries: {
+        package: updatedManifestQueries,
+      },
+    };
+  }
+
   return withBuildProperties(
     {
       ...config,
@@ -42,12 +81,6 @@ export default (
         },
       },
     },
-    {
-      android: {
-        manifestQueries: {
-          package: props.android ?? [],
-        },
-      },
-    },
+    propConfig,
   );
 };