expo-iap 2.3.0 → 2.3.1-rc.1

package/iap.md

@@ -209,8 +209,8 @@ Transactions map to `Purchase` or `SubscriptionPurchase` with platform-specific
 Below is a simple example of fetching products and making a purchase with `expo-iap` in a managed workflow, updated to use the new `requestPurchase` signature:
 
 ```tsx
-import {useEffect, useState} from 'react';
-import {Button, Text, View} from 'react-native';
+import { useEffect, useState } from 'react';
+import { Button, Text, View } from 'react-native';
 import {
   initConnection,
   endConnection,
@@ -237,7 +237,7 @@ export default function SimpleIAP() {
 
     const purchaseListener = purchaseUpdatedListener(async (purchase) => {
       if (purchase) {
-        await finishTransaction({purchase, isConsumable: true});
+        await finishTransaction({ purchase, isConsumable: true });
         alert('Purchase completed!');
       }
     });
@@ -252,12 +252,12 @@ export default function SimpleIAP() {
   const buyItem = async () => {
     if (!product) return;
     await requestPurchase({
-      request: {skus: [product.id]}, // Android expects 'skus'; iOS would use 'sku'
+      request: { skus: [product.id] }, // Android expects 'skus'; iOS would use 'sku'
     });
   };
 
   return (
-    <View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
+    <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
       <Text>{isConnected ? 'Connected' : 'Connecting...'}</Text>
       {product ? (
         <>
@@ -277,7 +277,7 @@ export default function SimpleIAP() {
 The `useIAP` hook simplifies managing in-app purchases. Below is an example updated to use the new `requestPurchase` signature:
 
 ```tsx
-import {useEffect, useState} from 'react';
+import { useEffect, useState } from 'react';
 import {
   SafeAreaView,
   ScrollView,
@@ -289,20 +289,12 @@ import {
   InteractionManager,
   Alert,
 } from 'react-native';
-import {useIAP} from 'expo-iap';
-import type {ProductPurchase, SubscriptionProduct} from 'expo-iap';
+import { useIAP } from 'expo-iap';
+import type { ProductPurchase, SubscriptionProduct } from 'expo-iap';
 
 // Define SKUs
-const productSkus = [
-  'cpk.points.1000',
-  'cpk.points.5000',
-  'cpk.points.10000',
-  'cpk.points.30000',
-];
-const subscriptionSkus = [
-  'cpk.membership.monthly.bronze',
-  'cpk.membership.monthly.silver',
-];
+const productSkus = ['cpk.points.1000', 'cpk.points.5000', 'cpk.points.10000', 'cpk.points.30000'];
+const subscriptionSkus = ['cpk.membership.monthly.bronze', 'cpk.membership.monthly.silver'];
 
 // Define operations
 const operations = ['getProducts', 'getSubscriptions'] as const;
@@ -329,10 +321,7 @@ export default function IAPWithHook() {
 
     const initializeIAP = async () => {
       try {
-        await Promise.all([
-          getProducts(productSkus),
-          getSubscriptions(subscriptionSkus),
-        ]);
+        await Promise.all([getProducts(productSkus), getSubscriptions(subscriptionSkus)]);
         setIsReady(true);
       } catch (error) {
         console.error('Error initializing IAP:', error);
@@ -400,10 +389,7 @@ export default function IAPWithHook() {
       <View style={styles.buttons}>
         <ScrollView contentContainerStyle={styles.buttonsWrapper} horizontal>
           {operations.map((operation) => (
-            <Pressable
-              key={operation}
-              onPress={() => handleOperation(operation)}
-            >
+            <Pressable key={operation} onPress={() => handleOperation(operation)}>
               <View style={styles.buttonView}>
                 <Text>{operation}</Text>
               </View>
@@ -415,10 +401,10 @@ export default function IAPWithHook() {
         {!isReady ? (
           <Text>Loading...</Text>
         ) : (
-          <View style={{gap: 12}}>
-            <Text style={{fontSize: 20}}>Products</Text>
+          <View style={{ gap: 12 }}>
+            <Text style={{ fontSize: 20 }}>Products</Text>
             {products.map((item) => (
-              <View key={item.id} style={{gap: 12}}>
+              <View key={item.id} style={{ gap: 12 }}>
                 <Text>
                   {item.title} -{' '}
                   {item.platform === 'android'
@@ -429,24 +415,20 @@ export default function IAPWithHook() {
                   title="Buy"
                   onPress={() =>
                     requestPurchase({
-                      request:
-                        item.platform === 'android'
-                          ? {skus: [item.id]}
-                          : {sku: item.id},
+                      request: item.platform === 'android' ? { skus: [item.id] } : { sku: item.id },
                     })
                   }
                 />
               </View>
             ))}
 
-            <Text style={{fontSize: 20}}>Subscriptions</Text>
+            <Text style={{ fontSize: 20 }}>Subscriptions</Text>
             {subscriptions.map((item) => (
-              <View key={item.id} style={{gap: 12}}>
+              <View key={item.id} style={{ gap: 12 }}>
                 <Text>
                   {item.title || item.displayName} -{' '}
                   {item.platform === 'android' && item.subscriptionOfferDetails
-                    ? item.subscriptionOfferDetails[0]?.pricingPhases
-                        .pricingPhaseList[0].formattedPrice
+                    ? item.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList[0].formattedPrice
                     : item.displayPrice}
                 </Text>
                 <Button
@@ -463,7 +445,7 @@ export default function IAPWithHook() {
                                   offerToken: offer.offerToken,
                                 })) || [],
                             }
-                          : {sku: item.id},
+                          : { sku: item.id },
                       type: 'subs',
                     })
                   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.3.0",
+  "version": "2.3.1-rc.1",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withIAP.js

@@ -2,63 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("expo/config-plugins");
 const pkg = require('../../package.json');
-const addLineToGradle = (content, anchor, lineToAdd, offset = 1) => {
-    const lines = content.split('\n');
-    const index = lines.findIndex((line) => line.match(anchor));
-    if (index === -1) {
-        console.warn(`Anchor "${anchor}" not found in build.gradle. Appending to end.`);
-        lines.push(lineToAdd);
+const BILLING_PERMISSION = 'com.android.vending.BILLING';
+const BILLING_DEP = `    implementation "com.android.billingclient:billing-ktx:7.0.0"`;
+const GMS_DEP = `    implementation "com.google.android.gms:play-services-base:18.1.0"`;
+/**
+ * Injects implementation lines into app/build.gradle
+ */
+function modifyAppBuildGradle(buildGradle) {
+    const lines = buildGradle.split('\n');
+    const anchor = /dependencies\s*{/;
+    const index = lines.findIndex((line) => anchor.test(line));
+    if (index !== -1) {
+        if (!buildGradle.includes(BILLING_DEP)) {
+            lines.splice(index + 1, 0, BILLING_DEP);
+        }
+        if (!buildGradle.includes(GMS_DEP)) {
+            lines.splice(index + 2, 0, GMS_DEP);
+        }
     }
     else {
-        lines.splice(index + offset, 0, lineToAdd);
+        console.warn('Could not find dependencies block in app/build.gradle');
     }
     return lines.join('\n');
-};
-const modifyProjectBuildGradle = (gradle) => {
-    let modified = gradle;
-    // 1. supportLibVersion
-    const supportLib = `supportLibVersion = "28.0.0"`;
-    if (!modified.includes(supportLib)) {
-        modified = addLineToGradle(modified, /ext\s*{/, supportLib);
-    }
-    // 2. billing library
-    const billingDep = `    implementation "com.android.billingclient:billing-ktx:7.0.0"`;
-    const gmsDep = `    implementation "com.google.android.gms:play-services-base:18.1.0"`;
-    if (!modified.includes(billingDep)) {
-        modified = addLineToGradle(modified, /dependencies\s*{/, billingDep);
-    }
-    if (!modified.includes(gmsDep)) {
-        modified = addLineToGradle(modified, /dependencies\s*{/, gmsDep, 1);
-    }
-    return modified;
-};
+}
+/**
+ * Adds BILLING permission to AndroidManifest.xml
+ */
 const withIAPAndroid = (config) => {
-    config = (0, config_plugins_1.withProjectBuildGradle)(config, (config) => {
-        config.modResults.contents = modifyProjectBuildGradle(config.modResults.contents);
+    config = (0, config_plugins_1.withAppBuildGradle)(config, (config) => {
+        config.modResults.contents = modifyAppBuildGradle(config.modResults.contents);
         return config;
     });
     config = (0, config_plugins_1.withAndroidManifest)(config, (config) => {
         const manifest = config.modResults;
-        if (!manifest.manifest['uses-permission']) {
-            manifest.manifest['uses-permission'] = [];
-        }
-        const permissions = manifest.manifest['uses-permission'];
-        const billingPerm = { $: { 'android:name': 'com.android.vending.BILLING' } };
-        const alreadyExists = permissions.some((p) => p.$['android:name'] === 'com.android.vending.BILLING');
+        const permissions = manifest.manifest['uses-permission'] ?? [];
+        const alreadyExists = permissions.some((p) => p.$['android:name'] === BILLING_PERMISSION);
         if (!alreadyExists) {
-            permissions.push(billingPerm);
-            console.log('✅ Added com.android.vending.BILLING to AndroidManifest.xml');
+            permissions.push({ $: { 'android:name': BILLING_PERMISSION } });
+            manifest.manifest['uses-permission'] = permissions;
+            console.log(`✅ Added ${BILLING_PERMISSION} to AndroidManifest.xml`);
         }
         else {
-            console.log('ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml');
+            console.log(`ℹ️ ${BILLING_PERMISSION} already exists in AndroidManifest.xml`);
         }
         return config;
     });
     return config;
 };
+/**
+ * Main plugin entry
+ */
 const withIAP = (config, _props) => {
     try {
-        console.log('🛠️ Applying expo-iap config plugin...');
+        console.log('🛠️ Applying expo-iap plugin...');
         return withIAPAndroid(config);
     }
     catch (error) {

package/plugin/src/withIAP.ts

@@ -1,57 +1,45 @@
 import {
+  ConfigPlugin,
   WarningAggregator,
   withAndroidManifest,
-  withProjectBuildGradle,
-  ConfigPlugin,
+  withAppBuildGradle,
   createRunOncePlugin,
 } from 'expo/config-plugins';
 
 const pkg = require('../../package.json');
 
-const addLineToGradle = (
-  content: string,
-  anchor: RegExp | string,
-  lineToAdd: string,
-  offset: number = 1,
-): string => {
-  const lines = content.split('\n');
-  const index = lines.findIndex((line) => line.match(anchor));
-  if (index === -1) {
-    console.warn(
-      `Anchor "${anchor}" not found in build.gradle. Appending to end.`,
-    );
-    lines.push(lineToAdd);
-  } else {
-    lines.splice(index + offset, 0, lineToAdd);
-  }
-  return lines.join('\n');
-};
-
-const modifyProjectBuildGradle = (gradle: string): string => {
-  let modified = gradle;
+const BILLING_PERMISSION = 'com.android.vending.BILLING';
+const BILLING_DEP = `    implementation "com.android.billingclient:billing-ktx:7.0.0"`;
+const GMS_DEP = `    implementation "com.google.android.gms:play-services-base:18.1.0"`;
 
-  // 1. supportLibVersion
-  const supportLib = `supportLibVersion = "28.0.0"`;
-  if (!modified.includes(supportLib)) {
-    modified = addLineToGradle(modified, /ext\s*{/, supportLib);
-  }
+/**
+ * Injects implementation lines into app/build.gradle
+ */
+function modifyAppBuildGradle(buildGradle: string): string {
+  const lines = buildGradle.split('\n');
+  const anchor = /dependencies\s*{/;
+  const index = lines.findIndex((line) => anchor.test(line));
 
-  // 2. billing library
-  const billingDep = `    implementation "com.android.billingclient:billing-ktx:7.0.0"`;
-  const gmsDep = `    implementation "com.google.android.gms:play-services-base:18.1.0"`;
-  if (!modified.includes(billingDep)) {
-    modified = addLineToGradle(modified, /dependencies\s*{/, billingDep);
-  }
-  if (!modified.includes(gmsDep)) {
-    modified = addLineToGradle(modified, /dependencies\s*{/, gmsDep, 1);
+  if (index !== -1) {
+    if (!buildGradle.includes(BILLING_DEP)) {
+      lines.splice(index + 1, 0, BILLING_DEP);
+    }
+    if (!buildGradle.includes(GMS_DEP)) {
+      lines.splice(index + 2, 0, GMS_DEP);
+    }
+  } else {
+    console.warn('Could not find dependencies block in app/build.gradle');
   }
 
-  return modified;
-};
+  return lines.join('\n');
+}
 
+/**
+ * Adds BILLING permission to AndroidManifest.xml
+ */
 const withIAPAndroid: ConfigPlugin = (config) => {
-  config = withProjectBuildGradle(config, (config) => {
-    config.modResults.contents = modifyProjectBuildGradle(
+  config = withAppBuildGradle(config, (config) => {
+    config.modResults.contents = modifyAppBuildGradle(
       config.modResults.contents,
     );
     return config;
@@ -59,24 +47,19 @@ const withIAPAndroid: ConfigPlugin = (config) => {
 
   config = withAndroidManifest(config, (config) => {
     const manifest = config.modResults;
-    if (!manifest.manifest['uses-permission']) {
-      manifest.manifest['uses-permission'] = [];
-    }
-
-    const permissions = manifest.manifest['uses-permission'];
-    const billingPerm = {$: {'android:name': 'com.android.vending.BILLING'}};
+    const permissions = manifest.manifest['uses-permission'] ?? [];
 
     const alreadyExists = permissions.some(
-      (p) => p.$['android:name'] === 'com.android.vending.BILLING',
+      (p) => p.$['android:name'] === BILLING_PERMISSION,
     );
+
     if (!alreadyExists) {
-      permissions.push(billingPerm);
-      console.log(
-        '✅ Added com.android.vending.BILLING to AndroidManifest.xml',
-      );
+      permissions.push({$: {'android:name': BILLING_PERMISSION}});
+      manifest.manifest['uses-permission'] = permissions;
+      console.log(`✅ Added ${BILLING_PERMISSION} to AndroidManifest.xml`);
     } else {
       console.log(
-        'ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml',
+        `ℹ️ ${BILLING_PERMISSION} already exists in AndroidManifest.xml`,
       );
     }
 
@@ -86,9 +69,12 @@ const withIAPAndroid: ConfigPlugin = (config) => {
   return config;
 };
 
+/**
+ * Main plugin entry
+ */
 const withIAP: ConfigPlugin = (config, _props) => {
   try {
-    console.log('🛠️ Applying expo-iap config plugin...');
+    console.log('🛠️ Applying expo-iap plugin...');
     return withIAPAndroid(config);
   } catch (error) {
     WarningAggregator.addWarningAndroid(