react-native-notify-kit 10.4.0 → 10.4.2

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.4.0";
+export declare const version = "10.4.2";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.4.0';
+export const version = '10.4.2';
 //# sourceMappingURL=version.js.map

package/ios/RNNotifee/NotifeeApiModule.h

@@ -18,8 +18,7 @@
 #import <Foundation/Foundation.h>
 #import <NotifeeSpec/NotifeeSpec.h>
 #import <React/RCTEventEmitter.h>
-#import "NotifeeCore.h"
 
-@interface NotifeeApiModule : RCTEventEmitter <NativeNotifeeModuleSpec, NotifeeCoreDelegate>
+@interface NotifeeApiModule : RCTEventEmitter <NativeNotifeeModuleSpec>
 
 @end

package/ios/RNNotifee/NotifeeApiModule.mm

@@ -18,7 +18,11 @@
 #import "NotifeeApiModule.h"
 #import <React/RCTUtils.h>
 #import <UIKit/UIKit.h>
-#import "NotifeeCore+UNUserNotificationCenter.h"
+#import "../NotifeeCore/NotifeeCore+UNUserNotificationCenter.h"
+#import "../NotifeeCore/NotifeeCore.h"
+
+@interface NotifeeApiModule () <NotifeeCoreDelegate>
+@end
 
 @interface NotifeeCoreUNUserNotificationCenter (Rechain)
 - (void)rechainUserNotificationCenterDelegate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.4.0",
+  "version": "10.4.2",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible React Native notifications library for Android, iOS, FCM Mode, rich notifications, foreground services, and Expo CNG development builds.",
   "main": "dist/index.js",

package/plugin/build/ios/withNotifyKitIosNseFiles.js

@@ -4,11 +4,16 @@ const fs = require('fs');
 const path = require('path');
 
 const {
+  DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  DEFAULT_NSE_MARKETING_VERSION,
   renderNotificationServiceSwift,
   renderNseEntitlementsPlist,
   renderNseInfoPlist,
 } = require('../shared/nse/initNseCore');
 
+const MARKETING_VERSION_MARKER = '__NOTIFYKIT_NSE_MARKETING_VERSION__';
+const CURRENT_PROJECT_VERSION_MARKER = '__NOTIFYKIT_NSE_CURRENT_PROJECT_VERSION__';
+
 function withNotifyKitIosNseFiles(config, nseOptions) {
   if (!nseOptions.enabled) {
     return config;
@@ -22,13 +27,21 @@ function withNotifyKitIosNseFiles(config, nseOptions) {
       writeNotifyKitIosNseFiles(
         modConfig.modRequest.platformProjectRoot,
         nseOptions.targetName,
+        resolveNseVersionOptions(modConfig),
       );
       return modConfig;
     },
   ]);
 }
 
-function writeNotifyKitIosNseFiles(platformProjectRoot, targetName) {
+function writeNotifyKitIosNseFiles(
+  platformProjectRoot,
+  targetName,
+  versionOptions = {
+    marketingVersion: DEFAULT_NSE_MARKETING_VERSION,
+    currentProjectVersion: DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  },
+) {
   const targetDir = path.join(platformProjectRoot, targetName);
   fs.mkdirSync(targetDir, { recursive: true });
 
@@ -38,7 +51,8 @@ function writeNotifyKitIosNseFiles(platformProjectRoot, targetName) {
   );
   writeFileIfMissingOrIdentical(
     path.join(targetDir, 'Info.plist'),
-    renderNseInfoPlist({ targetName }),
+    renderNseInfoPlist({ targetName, ...versionOptions }),
+    contents => isGeneratedNseInfoPlist(contents, targetName),
   );
   writeFileIfMissingOrIdentical(
     path.join(targetDir, `${targetName}.entitlements`),
@@ -46,10 +60,44 @@ function writeNotifyKitIosNseFiles(platformProjectRoot, targetName) {
   );
 }
 
-function writeFileIfMissingOrIdentical(filePath, contents) {
+function resolveNseVersionOptions(config) {
+  return {
+    marketingVersion: optionalString(config.version) ?? DEFAULT_NSE_MARKETING_VERSION,
+    currentProjectVersion:
+      optionalString(config.ios?.buildNumber) ?? DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  };
+}
+
+function optionalString(value) {
+  return typeof value === 'string' ? value : undefined;
+}
+
+function isGeneratedNseInfoPlist(contents, targetName) {
+  const templateWithMarkers = renderNseInfoPlist({
+    targetName,
+    marketingVersion: MARKETING_VERSION_MARKER,
+    currentProjectVersion: CURRENT_PROJECT_VERSION_MARKER,
+  });
+  const escapedTemplate = escapeRegExp(templateWithMarkers)
+    .replace(MARKETING_VERSION_MARKER, '[^<]*')
+    .replace(CURRENT_PROJECT_VERSION_MARKER, '[^<]*');
+
+  return new RegExp(`^${escapedTemplate}$`).test(contents);
+}
+
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function writeFileIfMissingOrIdentical(filePath, contents, canOverwrite) {
   if (fs.existsSync(filePath)) {
     const currentContents = fs.readFileSync(filePath, 'utf8');
     if (currentContents !== contents) {
+      if (canOverwrite?.(currentContents)) {
+        fs.writeFileSync(filePath, contents, 'utf8');
+        return;
+      }
+
       throw new Error(
         `[react-native-notify-kit] Refusing to overwrite existing ${filePath}. ` +
           'Delete it or make it match the generated NotifyKit NSE template.',

package/plugin/build/ios/withNotifyKitIosNsePodfile.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
 
 const { patchPodfileForNotifyKitNse } = require('../shared/nse/patchPodfile');
@@ -14,11 +15,12 @@ function withNotifyKitIosNsePodfile(config, nseOptions) {
 
   return withPodfile(config, modConfig => {
     const { projectRoot, platformProjectRoot } = modConfig.modRequest;
-    const packagePathFromIos = resolveNotifyKitPackagePathFromIos(
-      projectRoot,
-      platformProjectRoot,
-    );
-    const hostUseFrameworks = detectPodfileUseFrameworks(modConfig.modResults.contents);
+    const packagePathFromIos = resolveNotifyKitPackagePathFromIos(projectRoot, platformProjectRoot);
+    const hostUseFrameworks = detectPodfileUseFrameworks(modConfig.modResults.contents, {
+      ignoredTargetName: nseOptions.targetName,
+      podfileProperties: readExpoPodfileProperties(platformProjectRoot),
+      env: process.env,
+    });
     const useFrameworks = resolveNseUseFrameworks(hostUseFrameworks, configuredUseFrameworks);
     const result = patchPodfileForNotifyKitNse(modConfig.modResults.contents, {
       targetName: nseOptions.targetName,
@@ -45,30 +47,56 @@ function normalizePodfilePath(filePath) {
   return filePath.replace(/\\/g, '/');
 }
 
-function detectPodfileUseFrameworks(contents) {
-  let detected = false;
+function detectPodfileUseFrameworks(contents, optionsOrIgnoredTargetName) {
+  const options =
+    typeof optionsOrIgnoredTargetName === 'string'
+      ? { ignoredTargetName: optionsOrIgnoredTargetName }
+      : (optionsOrIgnoredTargetName ?? {});
+  const targetBlocks = findTargetBlocks(contents);
+  const firstHostTarget = targetBlocks.find(
+    block => block.targetName !== options.ignoredTargetName,
+  );
+  let globalUseFrameworks = false;
+  let hostUseFrameworks = false;
+  let charIndex = 0;
 
   for (const line of contents.split('\n')) {
-    const stripped = line.replace(/#.*$/, '').trim();
-    if (!/^use_frameworks!(?:\s|$)/.test(stripped)) {
+    const detectedUseFrameworks = parseUseFrameworksLine(line, options);
+    if (detectedUseFrameworks === null) {
+      charIndex += line.length + 1;
       continue;
     }
 
-    if (/:linkage\s*=>\s*:static\b/.test(stripped) || /\blinkage:\s*:static\b/.test(stripped)) {
-      return 'static';
+    const targetBlock = findMostSpecificTargetBlock(targetBlocks, charIndex);
+    if (!targetBlock) {
+      globalUseFrameworks = mergeUseFrameworksDetection(globalUseFrameworks, detectedUseFrameworks);
+    } else if (targetBlock === firstHostTarget) {
+      hostUseFrameworks = mergeUseFrameworksDetection(hostUseFrameworks, detectedUseFrameworks);
     }
 
-    if (
-      /:linkage\s*=>\s*:dynamic\b/.test(stripped) ||
-      /\blinkage:\s*:dynamic\b/.test(stripped)
-    ) {
-      return 'dynamic';
+    charIndex += line.length + 1;
+  }
+
+  return hostUseFrameworks !== false ? hostUseFrameworks : globalUseFrameworks;
+}
+
+function readExpoPodfileProperties(platformProjectRoot) {
+  const propertiesPath = path.join(platformProjectRoot, 'Podfile.properties.json');
+
+  try {
+    const parsed = JSON.parse(fs.readFileSync(propertiesPath, 'utf8'));
+    return isPlainObject(parsed) ? parsed : {};
+  } catch (error) {
+    if (isFileNotFoundError(error)) {
+      return {};
     }
 
-    detected = true;
+    throw error;
   }
+}
 
-  return detected;
+function isFileNotFoundError(error) {
+  return isPlainObject(error) && error.code === 'ENOENT';
 }
 
 function resolveNseUseFrameworks(hostUseFrameworks, configuredUseFrameworks) {
@@ -110,6 +138,177 @@ function isPlainObject(value) {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
+function findTargetBlocks(contents) {
+  const targetPattern = /^[ \t]*target\s+['"]([^'"]+)['"]\s+do\b.*$/gm;
+  const blocks = [];
+  let match;
+
+  while ((match = targetPattern.exec(contents)) !== null) {
+    const endLineStart = findMatchingRubyBlockEnd(contents, match.index);
+    if (endLineStart === -1) {
+      continue;
+    }
+
+    blocks.push({
+      targetName: match[1],
+      startIndex: match.index,
+      endIndex: findLineEnd(contents, endLineStart),
+    });
+  }
+
+  return blocks;
+}
+
+function findMostSpecificTargetBlock(targetBlocks, charIndex) {
+  return targetBlocks
+    .filter(block => charIndex >= block.startIndex && charIndex < block.endIndex)
+    .sort((a, b) => b.startIndex - a.startIndex)[0];
+}
+
+function parseUseFrameworksLine(line, options) {
+  const stripped = stripRubyLineComment(line).trim();
+  if (!/^use_frameworks!(?:\s|$)/.test(stripped)) {
+    return null;
+  }
+
+  if (!isUseFrameworksConditionActive(stripped, options)) {
+    return null;
+  }
+
+  const podfilePropertyLinkage = getPodfilePropertyUseFrameworksLinkage(stripped, options);
+  if (podfilePropertyLinkage !== null) {
+    return podfilePropertyLinkage;
+  }
+
+  const envLinkage = getEnvUseFrameworksLinkage(stripped, options);
+  if (envLinkage !== null) {
+    return envLinkage;
+  }
+
+  if (/:linkage\s*=>\s*:static\b/.test(stripped) || /\blinkage:\s*:static\b/.test(stripped)) {
+    return 'static';
+  }
+
+  if (/:linkage\s*=>\s*:dynamic\b/.test(stripped) || /\blinkage:\s*:dynamic\b/.test(stripped)) {
+    return 'dynamic';
+  }
+
+  return true;
+}
+
+function mergeUseFrameworksDetection(current, detected) {
+  return detected;
+}
+
+function isUseFrameworksConditionActive(strippedLine, options) {
+  const condition = strippedLine.match(/\s+if\s+(.+)$/)?.[1]?.trim();
+  if (!condition) {
+    return true;
+  }
+
+  const podfilePropertyName = getPodfilePropertyName(condition);
+  if (podfilePropertyName !== null) {
+    return isRubyTruthy(options.podfileProperties?.[podfilePropertyName]);
+  }
+
+  const envName = getEnvName(condition);
+  if (envName !== null) {
+    return isRubyTruthy(options.env?.[envName]);
+  }
+
+  return true;
+}
+
+function getPodfilePropertyUseFrameworksLinkage(strippedLine, options) {
+  const propertyName = strippedLine.match(
+    /(?:\:linkage\s*=>|linkage:)\s*podfile_properties\[['"]([^'"]+)['"]\](?:\.to_sym)?/,
+  )?.[1];
+
+  return propertyName
+    ? normalizeUseFrameworksValue(options.podfileProperties?.[propertyName])
+    : null;
+}
+
+function getEnvUseFrameworksLinkage(strippedLine, options) {
+  const envName = strippedLine.match(
+    /(?:\:linkage\s*=>|linkage:)\s*ENV\[['"]([^'"]+)['"]\](?:\.to_sym)?/,
+  )?.[1];
+
+  return envName ? normalizeUseFrameworksValue(options.env?.[envName]) : null;
+}
+
+function normalizeUseFrameworksValue(value) {
+  if (value === 'static' || value === 'dynamic' || value === true) {
+    return value;
+  }
+
+  return null;
+}
+
+function getPodfilePropertyName(expression) {
+  return expression.match(/^podfile_properties\[['"]([^'"]+)['"]\]$/)?.[1] ?? null;
+}
+
+function getEnvName(expression) {
+  return expression.match(/^ENV\[['"]([^'"]+)['"]\]$/)?.[1] ?? null;
+}
+
+function isRubyTruthy(value) {
+  return value !== undefined && value !== null && value !== false;
+}
+
+function findLineEnd(content, lineStartIndex) {
+  const newlineIndex = content.indexOf('\n', lineStartIndex);
+  return newlineIndex === -1 ? content.length : newlineIndex + 1;
+}
+
+function findMatchingRubyBlockEnd(content, startIndex) {
+  const afterStart = content.slice(startIndex);
+  const lines = afterStart.split('\n');
+  let depth = 0;
+  let charIndex = startIndex;
+
+  for (const line of lines) {
+    const trimmed = stripRubyLineComment(line).trim();
+
+    depth += countRubyBlockOpeners(trimmed);
+
+    if (trimmed === 'end') {
+      depth--;
+      if (depth === 0) {
+        return charIndex;
+      }
+    }
+
+    charIndex += line.length + 1;
+  }
+
+  return -1;
+}
+
+function countRubyBlockOpeners(line) {
+  if (line.length === 0) {
+    return 0;
+  }
+
+  const startsWithKeywordBlock = /^(if|unless|case|begin|while|until|for|def|class|module)\b/.test(
+    line,
+  );
+  if (startsWithKeywordBlock) {
+    return 1;
+  }
+
+  if (/\bdo\b(\s*\|[^|]*\|)?\s*$/.test(line)) {
+    return 1;
+  }
+
+  return 0;
+}
+
+function stripRubyLineComment(line) {
+  return line.replace(/#.*$/, '');
+}
+
 function requireExpoConfigPlugins() {
   try {
     return require('expo/config-plugins');

package/plugin/build/ios/withNotifyKitIosNseXcodeProject.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const {
+  DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  DEFAULT_NSE_MARKETING_VERSION,
+} = require('../shared/nse/initNseCore');
 const {
   patchXcodeProjectForNotifyKitNse,
 } = require('../shared/nse/patchXcodeProject');
@@ -20,6 +24,7 @@ function withNotifyKitIosNseXcodeProject(config, nseOptions) {
       targetName: nseOptions.targetName,
       bundleIdentifier,
       parentTargetName: modConfig.modRequest.projectName,
+      ...resolveNseVersionOptions(modConfig),
     });
 
     if (result.didChange && !result.hostTargetUuid) {
@@ -32,6 +37,18 @@ function withNotifyKitIosNseXcodeProject(config, nseOptions) {
   });
 }
 
+function resolveNseVersionOptions(config) {
+  return {
+    marketingVersion: optionalString(config.version) ?? DEFAULT_NSE_MARKETING_VERSION,
+    currentProjectVersion:
+      optionalString(config.ios?.buildNumber) ?? DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  };
+}
+
+function optionalString(value) {
+  return typeof value === 'string' ? value : undefined;
+}
+
 function requireExpoConfigPlugins() {
   try {
     return require('expo/config-plugins');

package/plugin/build/shared/nse/initNseCore.js

@@ -4,6 +4,8 @@ const NSE_TARGET_NAME_PATTERN = /^[A-Za-z0-9_\-.]+$/;
 const NSE_BUNDLE_SUFFIX_PATTERN = /^\.[A-Za-z0-9\-.]+$/;
 
 const PRODUCT_BUNDLE_IDENTIFIER_PLACEHOLDER = '$(PRODUCT_BUNDLE_IDENTIFIER:default)';
+const DEFAULT_NSE_MARKETING_VERSION = '1.0';
+const DEFAULT_NSE_CURRENT_PROJECT_VERSION = '1';
 
 const NOTIFICATION_SERVICE_SWIFT = String.raw`import Foundation
 import UserNotifications
@@ -124,9 +126,9 @@ const NSE_INFO_PLIST_TEMPLATE = `<?xml version="1.0" encoding="UTF-8"?>
 \t<key>CFBundlePackageType</key>
 \t<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 \t<key>CFBundleShortVersionString</key>
-\t<string>1.0</string>
+\t<string>{{MARKETING_VERSION}}</string>
 \t<key>CFBundleVersion</key>
-\t<string>1</string>
+\t<string>{{CURRENT_PROJECT_VERSION}}</string>
 \t<key>NSExtension</key>
 \t<dict>
 \t\t<key>NSExtensionPointIdentifier</key>
@@ -185,7 +187,13 @@ function renderNotificationServiceSwift() {
 }
 
 function renderNseInfoPlist(options) {
-  return NSE_INFO_PLIST_TEMPLATE.replace(/\{\{TARGET_NAME\}\}/g, options.targetName);
+  const marketingVersion = options.marketingVersion ?? DEFAULT_NSE_MARKETING_VERSION;
+  const currentProjectVersion =
+    options.currentProjectVersion ?? DEFAULT_NSE_CURRENT_PROJECT_VERSION;
+
+  return NSE_INFO_PLIST_TEMPLATE.replace(/\{\{TARGET_NAME\}\}/g, options.targetName)
+    .replace(/\{\{MARKETING_VERSION\}\}/g, marketingVersion)
+    .replace(/\{\{CURRENT_PROJECT_VERSION\}\}/g, currentProjectVersion);
 }
 
 function renderNseEntitlementsPlist() {
@@ -211,6 +219,8 @@ function toRfc1034Identifier(value) {
 }
 
 module.exports = {
+  DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  DEFAULT_NSE_MARKETING_VERSION,
   deriveNseBundleIdentifier,
   renderNotificationServiceSwift,
   renderNseEntitlementsPlist,

package/plugin/build/shared/nse/patchPodfile.js

@@ -12,19 +12,34 @@ function patchPodfileForNotifyKitNse(podfileText, options) {
   const placement = options.placement ?? 'nested';
   const useFrameworks = options.useFrameworks ?? false;
 
-  if (!hasUncommentedTarget(patched, options.targetName)) {
-    const withNseTarget = insertNseTarget(
+  const existingNseTarget = findUncommentedTargetBlock(patched, options.targetName);
+
+  if (!existingNseTarget) {
+    if (!hasUncommentedTarget(patched, options.targetName)) {
+      const withNseTarget = insertNseTarget(
+        patched,
+        options.targetName,
+        packagePathFromIos,
+        placement,
+        useFrameworks,
+      );
+      if (withNseTarget === null) {
+        return { contents: patched, didChange: changed };
+      }
+      patched = withNseTarget;
+      changed = true;
+    }
+  } else if (placement === 'topLevel') {
+    const withUpdatedNseTarget = updateTopLevelNseTargetBlock(
       patched,
-      options.targetName,
+      existingNseTarget,
       packagePathFromIos,
-      placement,
       useFrameworks,
     );
-    if (withNseTarget === null) {
-      return { contents: patched, didChange: changed };
+    if (withUpdatedNseTarget !== patched) {
+      patched = withUpdatedNseTarget;
+      changed = true;
     }
-    patched = withNseTarget;
-    changed = true;
   }
 
   const withRnfbPatch = ensureRnfbPostInstallPatch(patched);
@@ -66,7 +81,7 @@ function insertNseTarget(content, targetName, packagePathFromIos, placement, use
 
 function buildNseTargetBlock(targetName, packagePathFromIos, placement, useFrameworks) {
   if (placement === 'topLevel') {
-    const useFrameworksLine = buildUseFrameworksLine(useFrameworks);
+    const useFrameworksLine = buildUseFrameworksLine(useFrameworks, '  ');
 
     return (
       `target '${targetName}' do\n` +
@@ -84,17 +99,57 @@ function buildNseTargetBlock(targetName, packagePathFromIos, placement, useFrame
   );
 }
 
-function buildUseFrameworksLine(useFrameworks) {
+function updateTopLevelNseTargetBlock(content, targetBlock, packagePathFromIos, useFrameworks) {
+  const originalBlock = content.slice(targetBlock.startIndex, targetBlock.endIndex);
+  const hasTrailingNewline = originalBlock.endsWith('\n');
+  const blockWithoutTrailingNewline = hasTrailingNewline
+    ? originalBlock.slice(0, -1)
+    : originalBlock;
+  const lines = blockWithoutTrailingNewline.split('\n');
+
+  if (lines.length < 2) {
+    return content;
+  }
+
+  const targetLine = lines[0];
+  const endLine = lines[lines.length - 1];
+  const targetIndent = targetLine.match(/^[ \t]*/)?.[0] ?? '';
+  const bodyIndent = `${targetIndent}  `;
+  const generatedLines = [
+    ...buildUseFrameworksLine(useFrameworks, bodyIndent).trimEnd().split('\n').filter(Boolean),
+    `${bodyIndent}pod 'RNNotifeeCore', :path => '${packagePathFromIos}'`,
+  ];
+  const preservedBodyLines = lines
+    .slice(1, -1)
+    .filter(line => !isUncommentedUseFrameworksLine(line))
+    .filter(line => !isUncommentedRnNotifeeCorePodLine(line))
+    .filter(line => !isUncommentedSearchPathInheritanceLine(line));
+  const updatedBlock =
+    [targetLine, ...generatedLines, ...preservedBodyLines, endLine].join('\n') +
+    (hasTrailingNewline ? '\n' : '');
+
+  if (updatedBlock === originalBlock) {
+    return content;
+  }
+
+  return (
+    content.slice(0, targetBlock.startIndex) +
+    updatedBlock +
+    content.slice(targetBlock.endIndex)
+  );
+}
+
+function buildUseFrameworksLine(useFrameworks, indent) {
   if (useFrameworks === 'static') {
-    return `  use_frameworks! :linkage => :static\n`;
+    return `${indent}use_frameworks! :linkage => :static\n`;
   }
 
   if (useFrameworks === 'dynamic') {
-    return `  use_frameworks! :linkage => :dynamic\n`;
+    return `${indent}use_frameworks! :linkage => :dynamic\n`;
   }
 
   if (useFrameworks === true) {
-    return `  use_frameworks!\n`;
+    return `${indent}use_frameworks!\n`;
   }
 
   return '';
@@ -241,6 +296,45 @@ function stripRubyLineComment(line) {
   return line.replace(/#.*$/, '');
 }
 
+function findUncommentedTargetBlock(content, targetName) {
+  const pattern = new RegExp(
+    `^[ \\t]*target\\s+['"]${escapeRegex(targetName)}['"]\\s+do\\b.*$`,
+    'gm',
+  );
+  let match;
+
+  while ((match = pattern.exec(content)) !== null) {
+    const line = match[0];
+    if (stripRubyLineComment(line).trim().length === 0) {
+      continue;
+    }
+
+    const endLineStart = findMatchingRubyBlockEnd(content, match.index);
+    if (endLineStart === -1) {
+      return null;
+    }
+
+    return {
+      startIndex: match.index,
+      endIndex: findLineEnd(content, endLineStart),
+    };
+  }
+
+  return null;
+}
+
+function isUncommentedUseFrameworksLine(line) {
+  return /^use_frameworks!(?:\s|$)/.test(stripRubyLineComment(line).trim());
+}
+
+function isUncommentedRnNotifeeCorePodLine(line) {
+  return /^pod\s+['"]RNNotifeeCore['"](?:\s|,|$)/.test(stripRubyLineComment(line).trim());
+}
+
+function isUncommentedSearchPathInheritanceLine(line) {
+  return /^inherit!\s+:search_paths\b/.test(stripRubyLineComment(line).trim());
+}
+
 function hasUncommentedTarget(content, targetName) {
   const pattern = new RegExp(`target\\s+['"]${escapeRegex(targetName)}['"]`);
   for (const line of content.split('\n')) {

package/plugin/build/shared/nse/patchXcodeProject.js

@@ -1,13 +1,44 @@
 'use strict';
 
 const crypto = require('crypto');
+const {
+  DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  DEFAULT_NSE_MARKETING_VERSION,
+} = require('./initNseCore');
 
 function patchXcodeProjectForNotifyKitNse(proj, options) {
-  const { targetName, bundleIdentifier, parentTargetName, deploymentTarget = '15.1' } = options;
+  const {
+    targetName,
+    bundleIdentifier,
+    parentTargetName,
+    deploymentTarget = '15.1',
+    marketingVersion = DEFAULT_NSE_MARKETING_VERSION,
+    currentProjectVersion = DEFAULT_NSE_CURRENT_PROJECT_VERSION,
+  } = options;
   const warnings = [];
+  const existingTargetUuid = findTargetByName(proj, targetName);
+
+  if (existingTargetUuid) {
+    const didChange = setBuildSettings(
+      proj,
+      existingTargetUuid,
+      targetName,
+      bundleIdentifier,
+      deploymentTarget,
+      marketingVersion,
+      currentProjectVersion,
+    );
+
+    if (!didChange) {
+      return { didChange: false, warnings };
+    }
 
-  if (targetExists(proj, targetName)) {
-    return { didChange: false, warnings };
+    return {
+      didChange: true,
+      targetUuid: existingTargetUuid,
+      hostTargetUuid: findHostTarget(proj, parentTargetName) ?? undefined,
+      warnings,
+    };
   }
 
   const target = proj.addTarget(targetName, 'app_extension', targetName);
@@ -40,7 +71,15 @@ function patchXcodeProjectForNotifyKitNse(proj, options) {
     stripRnfbInfoPlistInputPath(proj, hostUuid);
   }
 
-  setBuildSettings(proj, targetName, bundleIdentifier, deploymentTarget);
+  setBuildSettings(
+    proj,
+    targetUuid,
+    targetName,
+    bundleIdentifier,
+    deploymentTarget,
+    marketingVersion,
+    currentProjectVersion,
+  );
 
   return {
     didChange: true,
@@ -81,34 +120,101 @@ function findTargetByName(proj, name) {
   return null;
 }
 
-function targetExists(proj, name) {
-  return findTargetByName(proj, name) !== null;
-}
-
 function getTargetProductUuid(target) {
   const productReference = target.pbxNativeTarget && target.pbxNativeTarget.productReference;
   return typeof productReference === 'string' ? productReference : undefined;
 }
 
-function setBuildSettings(proj, targetName, bundleId, deploymentTarget) {
+function setBuildSettings(
+  proj,
+  targetUuid,
+  targetName,
+  bundleId,
+  deploymentTarget,
+  marketingVersion,
+  currentProjectVersion,
+) {
+  let didChange = false;
+
+  for (const settings of getTargetBuildSettings(proj, targetUuid, targetName)) {
+    didChange =
+      setBuildSetting(settings, 'INFOPLIST_FILE', `"${targetName}/Info.plist"`) || didChange;
+    didChange =
+      setBuildSetting(settings, 'PRODUCT_BUNDLE_IDENTIFIER', `"${bundleId}"`) || didChange;
+    didChange = setBuildSetting(settings, 'TARGETED_DEVICE_FAMILY', `"1,2"`) || didChange;
+    didChange =
+      setBuildSetting(settings, 'IPHONEOS_DEPLOYMENT_TARGET', deploymentTarget) || didChange;
+    didChange = setBuildSetting(settings, 'MARKETING_VERSION', marketingVersion) || didChange;
+    didChange =
+      setBuildSetting(settings, 'CURRENT_PROJECT_VERSION', currentProjectVersion) || didChange;
+    didChange = setBuildSetting(settings, 'SWIFT_VERSION', '5.0') || didChange;
+    didChange =
+      setBuildSetting(
+        settings,
+        'CODE_SIGN_ENTITLEMENTS',
+        `"${targetName}/${targetName}.entitlements"`,
+      ) || didChange;
+    didChange = setBuildSetting(settings, 'GENERATE_INFOPLIST_FILE', 'NO') || didChange;
+  }
+
+  return didChange;
+}
+
+function getTargetBuildSettings(proj, targetUuid, targetName) {
+  const target = proj.pbxNativeTargetSection()[targetUuid];
+  const buildConfigurationListUuid = target && target.buildConfigurationList;
   const configs = proj.pbxXCBuildConfigurationSection();
+  const settingsByConfigurationList = getBuildSettingsFromConfigurationList(
+    proj,
+    typeof buildConfigurationListUuid === 'string' ? buildConfigurationListUuid : undefined,
+    configs,
+  );
 
-  for (const [, value] of Object.entries(configs)) {
-    if (typeof value !== 'object') continue;
-    const config = value;
-    const settings = config.buildSettings;
-
-    if (!settings) continue;
-    if (settings.PRODUCT_NAME !== `"${targetName}"`) continue;
-
-    settings.INFOPLIST_FILE = `"${targetName}/Info.plist"`;
-    settings.PRODUCT_BUNDLE_IDENTIFIER = `"${bundleId}"`;
-    settings.TARGETED_DEVICE_FAMILY = `"1,2"`;
-    settings.IPHONEOS_DEPLOYMENT_TARGET = deploymentTarget;
-    settings.SWIFT_VERSION = '5.0';
-    settings.CODE_SIGN_ENTITLEMENTS = `"${targetName}/${targetName}.entitlements"`;
-    settings.GENERATE_INFOPLIST_FILE = 'NO';
+  if (settingsByConfigurationList.length > 0) {
+    return settingsByConfigurationList;
+  }
+
+  return Object.entries(configs)
+    .filter(([, value]) => typeof value === 'object' && value !== null)
+    .map(([, value]) => value)
+    .filter(config => {
+      const settings = config.buildSettings;
+      return settings?.PRODUCT_NAME === `"${targetName}"`;
+    })
+    .map(config => config.buildSettings);
+}
+
+function getBuildSettingsFromConfigurationList(proj, buildConfigurationListUuid, configs) {
+  if (!buildConfigurationListUuid) {
+    return [];
   }
+
+  const configurationLists = proj.hash.project.objects.XCConfigurationList;
+  const configurationList = configurationLists && configurationLists[buildConfigurationListUuid];
+  const buildConfigurations = Array.isArray(configurationList?.buildConfigurations)
+    ? configurationList.buildConfigurations
+    : [];
+
+  return buildConfigurations
+    .map(ref => ref?.value)
+    .filter(uuid => typeof uuid === 'string')
+    .map(uuid => configs[uuid])
+    .filter(config => typeof config === 'object' && config !== null)
+    .map(config => {
+      if (typeof config.buildSettings !== 'object' || config.buildSettings === null) {
+        config.buildSettings = {};
+      }
+      return config.buildSettings;
+    });
+}
+
+function setBuildSetting(settings, key, value) {
+  if (settings[key] === value) {
+    return false;
+  }
+
+  settings[key] = value;
+  return true;
 }
 
 function fixProductFileReference(proj, targetName) {

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '10.4.0';
+export const version = '10.4.2';