expo-iap 3.1.1-rc.2 → 3.1.2

package/plugin/src/withIAP.ts

@@ -6,11 +6,9 @@ import {
   withAppBuildGradle,
   withDangerousMod,
 } from 'expo/config-plugins';
-import type {ExpoConfig} from '@expo/config-types';
 import * as fs from 'fs';
 import * as path from 'path';
 import withLocalOpenIAP from './withLocalOpenIAP';
-import type {ExpoIapPluginCommonOptions} from './expoConfig.augmentation';
 
 const pkg = require('../../package.json');
 const openiapVersions = JSON.parse(
@@ -20,10 +18,6 @@ const openiapVersions = JSON.parse(
   ),
 );
 const OPENIAP_ANDROID_VERSION = openiapVersions.google;
-const AUTOLINKING_CONFIG_PATH = path.resolve(
-  __dirname,
-  '../../expo-module.config.json',
-);
 
 // Log a message only once per Node process
 const logOnce = (() => {
@@ -56,7 +50,7 @@ const addLineToGradle = (
   return lines.join('\n');
 };
 
-export const modifyAppBuildGradle = (
+const modifyAppBuildGradle = (
   gradle: string,
   language: 'groovy' | 'kotlin',
 ): string => {
@@ -144,136 +138,7 @@ const withIapAndroid: ConfigPlugin<{addDeps?: boolean} | void> = (
 };
 
 /** Ensure Podfile uses CocoaPods CDN and no stale local OpenIAP entry remains. */
-type WithIapIosOptions = {
-  enableOnside?: boolean;
-};
-
-const ensureOnsidePod = (content: string): string => {
-  const podLine =
-    "  pod 'OnsideKit', :git => 'https://github.com/onside-io/OnsideKit-iOS.git'";
-  const podRegex = /^\s*pod\s+'OnsideKit'\b.*$/m;
-
-  if (podRegex.test(content)) {
-    return content;
-  }
-
-  const targetMatch = content.match(/target\s+'[^']+'\s+do\s*\n/);
-  if (!targetMatch) {
-    WarningAggregator.addWarningIOS(
-      'expo-iap',
-      'Could not find a target block in Podfile when adding OnsideKit; skipping installation.',
-    );
-    return content;
-  }
-
-  const insertIndex = targetMatch.index! + targetMatch[0].length;
-  const before = content.slice(0, insertIndex);
-  const after = content.slice(insertIndex);
-
-  logOnce('📦 expo-iap: Added OnsideKit pod to Podfile');
-
-  return `${before}${podLine}\n${after}`;
-};
-
-export type AutolinkState = {expoIap: boolean; onside: boolean};
-
-type AutolinkEntry = {name: string; enable: boolean};
-
-export function computeAutolinkModules(
-  existing: string[],
-  desired: AutolinkEntry[],
-): {modules: string[]; added: string[]; removed: string[]} {
-  let modules = [...existing];
-  const added: string[] = [];
-  const removed: string[] = [];
-
-  for (const entry of desired) {
-    const hasModule = modules.includes(entry.name);
-    if (entry.enable && !hasModule) {
-      modules = [...modules, entry.name];
-      added.push(entry.name);
-    } else if (!entry.enable && hasModule) {
-      modules = modules.filter((module) => module !== entry.name);
-      removed.push(entry.name);
-    }
-  }
-
-  return {modules, added, removed};
-}
-
-const syncAutolinking = (state: AutolinkState) => {
-  if (!fs.existsSync(AUTOLINKING_CONFIG_PATH)) {
-    return;
-  }
-
-  try {
-    const raw = fs.readFileSync(AUTOLINKING_CONFIG_PATH, 'utf8');
-    const config = JSON.parse(raw);
-    const iosConfig = config.ios ?? (config.ios = {});
-    const existing: string[] = Array.isArray(iosConfig.modules)
-      ? iosConfig.modules.filter((module: string) => module !== 'OneSideModule')
-      : [];
-
-    const desiredEntries: {
-      name: string;
-      enable: boolean;
-      addLog: string;
-      removeLog: string;
-    }[] = [
-      {
-        name: 'ExpoIapModule',
-        enable: state.expoIap,
-        addLog: '🔗 expo-iap: Enabled ExpoIapModule autolinking',
-        removeLog: '🧹 expo-iap: Disabled ExpoIapModule autolinking',
-      },
-      {
-        name: 'OnsideIapModule',
-        enable: state.onside,
-        addLog: '🔗 expo-iap: Enabled OnsideIapModule autolinking',
-        removeLog: '🧹 expo-iap: Disabled OnsideIapModule autolinking',
-      },
-    ];
-
-    const {
-      modules: nextModules,
-      added,
-      removed,
-    } = computeAutolinkModules(
-      existing,
-      desiredEntries.map(({name, enable}) => ({name, enable})),
-    );
-
-    for (const name of added) {
-      const entry = desiredEntries.find((candidate) => candidate.name === name);
-      if (entry) {
-        logOnce(entry.addLog);
-      }
-    }
-
-    for (const name of removed) {
-      const entry = desiredEntries.find((candidate) => candidate.name === name);
-      if (entry) {
-        logOnce(entry.removeLog);
-      }
-    }
-
-    if (added.length > 0 || removed.length > 0) {
-      iosConfig.modules = nextModules;
-      fs.writeFileSync(
-        AUTOLINKING_CONFIG_PATH,
-        `${JSON.stringify(config, null, 2)}\n`,
-        'utf8',
-      );
-    }
-  } catch (error) {
-    WarningAggregator.addWarningIOS(
-      'expo-iap',
-      `Failed to sync Expo IAP autolinking modules: ${String(error)}`,
-    );
-  }
-};
-
-const withIapIOS: ConfigPlugin<WithIapIosOptions | void> = (config, props) => {
+const withIapIOS: ConfigPlugin = (config) => {
   return withDangerousMod(config, [
     'ios',
     async (config) => {
@@ -301,134 +166,33 @@ const withIapIOS: ConfigPlugin<WithIapIosOptions | void> = (config, props) => {
         logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
       }
 
-      // 3) Optionally install OnsideKit when enabled in config
-      if (props?.enableOnside) {
-        content = ensureOnsidePod(content);
-      }
-
       fs.writeFileSync(podfilePath, content);
       return config;
     },
   ]);
 };
 
-export interface ModuleSelectionResult {
-  selection: 'auto' | 'expo-iap' | 'onside';
-  includeExpoIap: boolean;
-  includeOnside: boolean;
-}
-
-type ModuleKey = 'expoIap' | 'onside';
-
-type ModuleRules = Record<
-  ModuleKey,
-  {
-    when: Partial<Record<ModuleSelectionResult['selection'], boolean>>;
-    default: (args: {
-      config: ExpoConfig;
-      options?: ExpoIapPluginCommonOptions;
-    }) => boolean;
-  }
->;
-
-const MODULE_RULES: ModuleRules = {
-  expoIap: {
-    when: {
-      'expo-iap': true,
-      onside: false,
-    },
-    default: ({options}) => options?.modules?.expoIap ?? true,
-  },
-  onside: {
-    when: {
-      'expo-iap': false,
-      onside: true,
-    },
-    default: ({config, options}) =>
-      options?.modules?.onside ?? config.ios?.onside?.enabled ?? true,
-  },
-};
-
-export function resolveModuleSelection(
-  config: ExpoConfig,
-  options?: ExpoIapPluginCommonOptions | void,
-): ModuleSelectionResult {
-  const normalizedOptions = (options ?? undefined) as
-    | ExpoIapPluginCommonOptions
-    | undefined;
-
-  const selection = normalizedOptions?.module ?? 'auto';
-
-  const includeExpoIap = pickModuleState(
-    'expoIap',
-    selection,
-    config,
-    normalizedOptions,
-  );
-  const includeOnside = pickModuleState(
-    'onside',
-    selection,
-    config,
-    normalizedOptions,
-  );
-
-  return {selection, includeExpoIap, includeOnside};
-}
-
-function pickModuleState(
-  key: ModuleKey,
-  selection: ModuleSelectionResult['selection'],
-  config: ExpoConfig,
-  options?: ExpoIapPluginCommonOptions,
-): boolean {
-  const rules = MODULE_RULES[key];
-  const explicit = rules.when[selection];
-  if (explicit !== undefined) {
-    return explicit;
-  }
-  const override = options?.modules?.[key];
-  if (override !== undefined) {
-    return override;
-  }
-  return rules.default({config, options});
+export interface ExpoIapPluginOptions {
+  /** Local development path for OpenIAP library */
+  localPath?:
+    | string
+    | {
+        ios?: string;
+        android?: string;
+      };
+  /** Enable local development mode */
+  enableLocalDev?: boolean;
 }
 
-const withIAP: ConfigPlugin<ExpoIapPluginCommonOptions | void> = (
+const withIap: ConfigPlugin<ExpoIapPluginOptions | void> = (
   config,
   options,
 ) => {
   try {
-    const {includeExpoIap, includeOnside} = resolveModuleSelection(
-      config as ExpoConfig,
-      options,
-    );
-
-    const autolinkState: AutolinkState = {
-      expoIap: includeExpoIap,
-      onside: includeOnside,
-    };
-
-    if (includeOnside) {
-      config.ios = {
-        ...config.ios,
-        onside: {
-          ...(config.ios?.onside ?? {}),
-          enabled: true,
-        },
-      } as typeof config.ios;
-    } else if (config.ios?.onside?.enabled) {
-      config.ios.onside.enabled = false;
-    }
-
     // Respect explicit flag; fall back to presence of localPath only when flag is unset
     const isLocalDev = options?.enableLocalDev ?? !!options?.localPath;
-    const shouldConfigureAndroid = includeExpoIap;
-    const shouldAddAndroidDeps = includeExpoIap && !isLocalDev;
-
-    // Apply Android modifications (skip when Expo IAP disabled)
-    let result = shouldConfigureAndroid
-      ? withIapAndroid(config, {addDeps: shouldAddAndroidDeps})
-      : config;
+    // Apply Android modifications (skip adding deps when linking local module)
+    let result = withIapAndroid(config, {addDeps: !isLocalDev});
 
     // iOS: choose one path to avoid overlap
     if (isLocalDev) {
@@ -458,14 +222,10 @@ const withIAP: ConfigPlugin<ExpoIapPluginCommonOptions | void> = (
       }
     } else {
       // Ensure iOS Podfile is set up to resolve public CocoaPods specs
-      result = withIapIOS(result, {enableOnside: includeOnside});
-      if (includeExpoIap) {
-        logOnce('📦 [expo-iap] Using OpenIAP from CocoaPods');
-      }
+      result = withIapIOS(result);
+      logOnce('📦 [expo-iap] Using OpenIAP from CocoaPods');
     }
 
-    syncAutolinking(autolinkState);
-
     return result;
   } catch (error) {
     WarningAggregator.addWarningAndroid(
@@ -477,4 +237,4 @@ const withIAP: ConfigPlugin<ExpoIapPluginCommonOptions | void> = (
   }
 };
 
-export default createRunOncePlugin(withIAP, pkg.name, pkg.version);
+export default createRunOncePlugin(withIap, pkg.name, pkg.version);

package/plugin/tsconfig.json

@@ -2,8 +2,7 @@
   "extends": "expo-module-scripts/tsconfig.plugin",
   "compilerOptions": {
     "outDir": "build",
-    "rootDir": "src",
-    "isolatedModules": true
+    "rootDir": "src"
   },
   "include": ["./src"],
   "exclude": ["**/__mocks__/*", "**/__tests__/*"]

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/expoconfig.augmentation.d.ts","./src/withiap.ts","./src/withlocalopeniap.ts"],"version":"5.9.2"}
+{"root":["./src/expoConfig.augmentation.d.ts","./src/withIAP.ts","./src/withLocalOpenIAP.ts"],"version":"5.9.2"}

package/src/ExpoIapModule.ts

@@ -1,51 +1,10 @@
-import {requireNativeModule, UnavailabilityError} from 'expo-modules-core';
+import {requireNativeModule} from 'expo-modules-core';
 
-type NativeIapModuleName = 'ExpoIapOnside' | 'ExpoIap';
-
-const {module: ExpoIapModule, name: resolvedNativeModuleName} =
-  resolveNativeModule();
-
-export const USING_ONSIDE_SDK = resolvedNativeModuleName === 'ExpoIapOnside';
+// It loads the native module object from the JSI or falls back to
+// the bridge module (from NativeModulesProxy) if the remote debugger is on.
+const ExpoIapModule = requireNativeModule('ExpoIap');
 
 // Platform-specific error codes from native modules
 export const NATIVE_ERROR_CODES = ExpoIapModule.ERROR_CODES || {};
 
 export default ExpoIapModule;
-
-function resolveNativeModule(): {
-  module: any;
-  name: NativeIapModuleName;
-} {
-  const candidates: NativeIapModuleName[] = ['ExpoIapOnside', 'ExpoIap'];
-
-  for (const name of candidates) {
-    try {
-      const module = requireNativeModule(name);
-      return {module, name};
-    } catch (error) {
-      if (name === 'ExpoIapOnside' && isMissingModuleError(error, name)) {
-        // Onside module is optional. If unavailable, fall back to ExpoIap.
-        continue;
-      }
-
-      throw error;
-    }
-  }
-
-  throw new UnavailabilityError(
-    'expo-iap',
-    'ExpoIap native module is unavailable',
-  );
-}
-
-function isMissingModuleError(error: unknown, moduleName: string): boolean {
-  if (error instanceof UnavailabilityError) {
-    return true;
-  }
-
-  if (error instanceof Error) {
-    return error.message.includes(`Cannot find native module '${moduleName}'`);
-  }
-
-  return false;
-}

package/src/useIAP.ts

@@ -49,8 +49,6 @@ import {
 type UseIap = {
   connected: boolean;
   products: Product[];
-  promotedProductsIOS: Purchase[];
-  promotedProductIdIOS?: string;
   subscriptions: ProductSubscription[];
   availablePurchases: Purchase[];
   promotedProductIOS?: Product;
@@ -96,12 +94,10 @@ export interface UseIAPOptions {
 export function useIAP(options?: UseIAPOptions): UseIap {
   const [connected, setConnected] = useState<boolean>(false);
   const [products, setProducts] = useState<Product[]>([]);
-  const [promotedProductsIOS] = useState<Purchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<ProductSubscription[]>([]);
 
   const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>([]);
   const [promotedProductIOS, setPromotedProductIOS] = useState<Product>();
-  const [promotedProductIdIOS] = useState<string>();
   const [activeSubscriptions, setActiveSubscriptions] = useState<
     ActiveSubscription[]
   >([]);
@@ -141,7 +137,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const subscriptionsRef = useRef<{
     purchaseUpdate?: EventSubscription;
     purchaseError?: EventSubscription;
-    promotedProductsIOS?: EventSubscription;
     promotedProductIOS?: EventSubscription;
   }>({});
 
@@ -376,7 +371,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
 
     if (Platform.OS === 'ios') {
       // iOS promoted products listener
-      subscriptionsRef.current.promotedProductsIOS = promotedProductListenerIOS(
+      subscriptionsRef.current.promotedProductIOS = promotedProductListenerIOS(
         (product: Product) => {
           setPromotedProductIOS(product);
 
@@ -394,9 +389,9 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       // If connection failed, clean up listeners
       console.warn('[useIAP] Connection failed, cleaning up listeners...');
       subscriptionsRef.current.purchaseUpdate?.remove();
-      subscriptionsRef.current.promotedProductsIOS?.remove();
+      subscriptionsRef.current.promotedProductIOS?.remove();
       subscriptionsRef.current.purchaseUpdate = undefined;
-      subscriptionsRef.current.promotedProductsIOS = undefined;
+      subscriptionsRef.current.promotedProductIOS = undefined;
       // Keep purchaseError listener registered to capture subsequent retries
       return;
     }
@@ -409,7 +404,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     return () => {
       currentSubscriptions.purchaseUpdate?.remove();
       currentSubscriptions.purchaseError?.remove();
-      currentSubscriptions.promotedProductsIOS?.remove();
       currentSubscriptions.promotedProductIOS?.remove();
       endConnection();
       setConnected(false);
@@ -419,8 +413,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   return {
     connected,
     products,
-    promotedProductsIOS,
-    promotedProductIdIOS,
     subscriptions,
     finishTransaction,
     availablePurchases,

package/build/utils/constants.d.ts

@@ -1,6 +0,0 @@
-export declare const CONSUMABLE_PRODUCT_IDS: string[];
-export declare const NON_CONSUMABLE_PRODUCT_IDS: string[];
-export declare const PRODUCT_IDS: string[];
-export declare const SUBSCRIPTION_PRODUCT_IDS: string[];
-export declare const DEFAULT_SUBSCRIPTION_PRODUCT_ID: string;
-//# sourceMappingURL=constants.d.ts.map

package/build/utils/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,EAAE,MAAM,EAG1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,MAAM,EAE9C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,EAG/B,CAAC;AAGF,eAAO,MAAM,wBAAwB,EAAE,MAAM,EAA+B,CAAC;AAG7E,eAAO,MAAM,+BAA+B,QAA8B,CAAC"}

package/build/utils/constants.js

@@ -1,19 +0,0 @@
-// Centralized product ID constants for examples and internal usage
-// Rename guide: subscriptionIds -> SUBSCRIPTION_PRODUCT_IDS, PRODUCT_IDS remains the same name
-// One-time purchase product IDs split by consumption behavior
-export const CONSUMABLE_PRODUCT_IDS = [
-    'dev.hyo.martie.10bulbs',
-    'dev.hyo.martie.30bulbs',
-];
-export const NON_CONSUMABLE_PRODUCT_IDS = [
-    'dev.hyo.martie.certified',
-];
-export const PRODUCT_IDS = [
-    ...CONSUMABLE_PRODUCT_IDS,
-    ...NON_CONSUMABLE_PRODUCT_IDS,
-];
-// Subscription product IDs
-export const SUBSCRIPTION_PRODUCT_IDS = ['dev.hyo.martie.premium'];
-// Optionally export a single default subscription for convenience
-export const DEFAULT_SUBSCRIPTION_PRODUCT_ID = SUBSCRIPTION_PRODUCT_IDS[0];
-//# sourceMappingURL=constants.js.map

package/build/utils/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,+FAA+F;AAE/F,8DAA8D;AAC9D,MAAM,CAAC,MAAM,sBAAsB,GAAa;IAC9C,wBAAwB;IACxB,wBAAwB;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAa;IAClD,0BAA0B;CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAa;IACnC,GAAG,sBAAsB;IACzB,GAAG,0BAA0B;CAC9B,CAAC;AAEF,2BAA2B;AAC3B,MAAM,CAAC,MAAM,wBAAwB,GAAa,CAAC,wBAAwB,CAAC,CAAC;AAE7E,kEAAkE;AAClE,MAAM,CAAC,MAAM,+BAA+B,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC","sourcesContent":["// Centralized product ID constants for examples and internal usage\n// Rename guide: subscriptionIds -> SUBSCRIPTION_PRODUCT_IDS, PRODUCT_IDS remains the same name\n\n// One-time purchase product IDs split by consumption behavior\nexport const CONSUMABLE_PRODUCT_IDS: string[] = [\n  'dev.hyo.martie.10bulbs',\n  'dev.hyo.martie.30bulbs',\n];\n\nexport const NON_CONSUMABLE_PRODUCT_IDS: string[] = [\n  'dev.hyo.martie.certified',\n];\n\nexport const PRODUCT_IDS: string[] = [\n  ...CONSUMABLE_PRODUCT_IDS,\n  ...NON_CONSUMABLE_PRODUCT_IDS,\n];\n\n// Subscription product IDs\nexport const SUBSCRIPTION_PRODUCT_IDS: string[] = ['dev.hyo.martie.premium'];\n\n// Optionally export a single default subscription for convenience\nexport const DEFAULT_SUBSCRIPTION_PRODUCT_ID = SUBSCRIPTION_PRODUCT_IDS[0];\n"]}