expo-build-properties 0.12.1 → 0.12.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.12.2 — 2024-06-05
+
+### 🐛 Bug fixes
+
+- Improved android manifest queries, preventing overrides of <package> tags and splitting <provider> instead of merging them into one string ([#29418](https://github.com/expo/expo/pull/29418) by [@Titozzz](https://github.com/Titozzz))
+
 ## 0.12.1 — 2024-05-06
 
 ### 🎉 New features

package/build/android.js

@@ -191,15 +191,14 @@ const withAndroidQueries = (config, props) => {
         const { manifestQueries } = props.android;
         // Default template adds a single intent to the `queries` tag
         const defaultIntents = config.modResults.manifest.queries.map((q) => q.intent ?? []).flat() ?? [];
-        const additionalQueries = {
-            package: (0, androidQueryUtils_1.renderQueryPackages)(manifestQueries.package),
+        const defaultPackages = config.modResults.manifest.queries.map((q) => q.package ?? []).flat() ?? [];
+        const defaultProviders = config.modResults.manifest.queries.map((q) => q.provider ?? []).flat() ?? [];
+        const newQueries = {
+            package: [...defaultPackages, ...(0, androidQueryUtils_1.renderQueryPackages)(manifestQueries.package)],
             intent: [...defaultIntents, ...(0, androidQueryUtils_1.renderQueryIntents)(manifestQueries.intent)],
+            provider: [...defaultProviders, ...(0, androidQueryUtils_1.renderQueryProviders)(manifestQueries.provider)],
         };
-        const provider = (0, androidQueryUtils_1.renderQueryProviders)(manifestQueries.provider);
-        if (provider != null) {
-            additionalQueries.provider = provider;
-        }
-        config.modResults.manifest.queries = [additionalQueries];
+        config.modResults.manifest.queries = [newQueries];
         return config;
     });
 };

package/build/androidQueryUtils.d.ts

@@ -3,8 +3,8 @@ export declare function renderQueryProviders(data?: string | string[]): {
     $: {
         'android:authorities': string;
     };
-} | undefined;
-export declare function renderQueryPackages(data: string | string[]): {
+}[];
+export declare function renderQueryPackages(data?: string | string[]): {
     $: {
         'android:name': string;
     };

package/build/androidQueryUtils.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderQueryIntents = exports.renderQueryPackages = exports.renderQueryProviders = void 0;
 function renderQueryProviders(data) {
-    const dataStr = Array.isArray(data) ? data.join(';') : data;
-    return dataStr ? { $: { 'android:authorities': dataStr } } : undefined;
+    return (Array.isArray(data) ? data : [data]).filter(Boolean).map((datum) => ({
+        $: {
+            'android:authorities': datum,
+        },
+    }));
 }
 exports.renderQueryProviders = renderQueryProviders;
 function renderQueryPackages(data) {

package/build/pluginConfig.d.ts

@@ -333,9 +333,9 @@ export interface PluginConfigTypeAndroidPackagingOptions {
 }
 export interface PluginConfigTypeAndroidQueries {
     /**
-     * Specifies a single app that your app intends to access. This other app might integrate with your app, or your app might use services that the other app provides.
+     * Specifies one or more apps that your app intends to access. These other apps might integrate with your app, or your app might use services that these other apps provide.
      */
-    package: string[];
+    package?: string[];
     /**
      * Specifies an intent filter signature. Your app can discover other apps that have matching <intent-filter> elements.
      * These intents have restrictions compared to typical intent filter signatures.

package/build/pluginConfig.js

@@ -107,10 +107,9 @@ const schema = {
                 usesCleartextTraffic: { type: 'boolean', nullable: true },
                 useLegacyPackaging: { type: 'boolean', nullable: true },
                 manifestQueries: {
-                    required: ['package'],
                     type: 'object',
                     properties: {
-                        package: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: false },
+                        package: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: true },
                         intent: {
                             type: 'array',
                             items: {
@@ -131,7 +130,7 @@ const schema = {
                             },
                             nullable: true,
                         },
-                        provider: { type: 'array', items: { type: 'string' }, nullable: true },
+                        provider: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: true },
                     },
                     nullable: true,
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-build-properties",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Config plugin to customize native build properties on prebuild",
   "main": "build/withBuildProperties.js",
   "types": "build/withBuildProperties.d.ts",
@@ -40,5 +40,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "7995f30a8d2af4836f3aef9fe322e9403fc23d34"
+  "gitHead": "2da3ee1a1cfc03b58ee2988529ad941641330f99"
 }

package/src/android.ts

@@ -231,18 +231,18 @@ export const withAndroidQueries: ConfigPlugin<PluginConfigType> = (config, props
     // Default template adds a single intent to the `queries` tag
     const defaultIntents =
       config.modResults.manifest.queries.map((q) => q.intent ?? []).flat() ?? [];
+    const defaultPackages =
+      config.modResults.manifest.queries.map((q) => q.package ?? []).flat() ?? [];
+    const defaultProviders =
+      config.modResults.manifest.queries.map((q) => q.provider ?? []).flat() ?? [];
 
-    const additionalQueries: AndroidConfig.Manifest.ManifestQuery = {
-      package: renderQueryPackages(manifestQueries.package),
+    const newQueries: AndroidConfig.Manifest.ManifestQuery = {
+      package: [...defaultPackages, ...renderQueryPackages(manifestQueries.package)],
       intent: [...defaultIntents, ...renderQueryIntents(manifestQueries.intent)],
+      provider: [...defaultProviders, ...renderQueryProviders(manifestQueries.provider)],
     };
 
-    const provider = renderQueryProviders(manifestQueries.provider);
-    if (provider != null) {
-      additionalQueries.provider = provider;
-    }
-
-    config.modResults.manifest.queries = [additionalQueries];
+    config.modResults.manifest.queries = [newQueries];
     return config;
   });
 };

package/src/androidQueryUtils.ts

@@ -1,14 +1,17 @@
 import { PluginConfigTypeAndroidQueriesIntent } from './pluginConfig';
 
 export function renderQueryProviders(data?: string | string[]) {
-  const dataStr = Array.isArray(data) ? data.join(';') : data;
-  return dataStr ? { $: { 'android:authorities': dataStr } } : undefined;
+  return (Array.isArray(data) ? data : [data]).filter(Boolean).map((datum) => ({
+    $: {
+      'android:authorities': datum as string,
+    },
+  }));
 }
 
-export function renderQueryPackages(data: string | string[]) {
+export function renderQueryPackages(data?: string | string[]) {
   return (Array.isArray(data) ? data : [data]).filter(Boolean).map((datum) => ({
     $: {
-      'android:name': datum,
+      'android:name': datum as string,
     },
   }));
 }

package/src/pluginConfig.ts

@@ -372,9 +372,9 @@ export interface PluginConfigTypeAndroidPackagingOptions {
 
 export interface PluginConfigTypeAndroidQueries {
   /**
-   * Specifies a single app that your app intends to access. This other app might integrate with your app, or your app might use services that the other app provides.
+   * Specifies one or more apps that your app intends to access. These other apps might integrate with your app, or your app might use services that these other apps provide.
    */
-  package: string[];
+  package?: string[];
   /**
    * Specifies an intent filter signature. Your app can discover other apps that have matching <intent-filter> elements.
    * These intents have restrictions compared to typical intent filter signatures.
@@ -513,10 +513,9 @@ const schema: JSONSchemaType<PluginConfigType> = {
         useLegacyPackaging: { type: 'boolean', nullable: true },
 
         manifestQueries: {
-          required: ['package'],
           type: 'object',
           properties: {
-            package: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: false },
+            package: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: true },
             intent: {
               type: 'array',
               items: {
@@ -537,7 +536,7 @@ const schema: JSONSchemaType<PluginConfigType> = {
               },
               nullable: true,
             },
-            provider: { type: 'array', items: { type: 'string' }, nullable: true },
+            provider: { type: 'array', items: { type: 'string' }, minItems: 1, nullable: true },
           },
           nullable: true,
         },