@capgo/capacitor-patch 8.0.0 → 8.1.0

package/README.md

@@ -130,6 +130,12 @@ Catalog entries use this shape:
 
 For generated native project files, use `"phase": "native"` and `"target": { "type": "native" }`. Diff paths are relative to the app root. For package patches, diff paths are relative to the target package root.
 
+### Built-in patches
+
+| ID                                     | Source                                                             | Target              | Description                                                                                         |
+| -------------------------------------- | ------------------------------------------------------------------ | ------------------- | --------------------------------------------------------------------------------------------------- |
+| `capacitor-cli-spm-ios-minor-platform` | [Capacitor+ #38](https://github.com/Cap-go/capacitor-plus/pull/38) | `@capacitor/cli` v8 | Keeps iOS SPM `Package.swift` generation from truncating deployment targets such as `15.5` to `15`. |
+
 ## Compatibility
 
 | Plugin version | Capacitor compatibility | Maintained |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-patch",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "description": "Capacitor plugin for applying vetted Capgo patches during cap sync and cap update.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/patches/capacitor-cli-spm-ios-minor-platform.patch

@@ -0,0 +1,40 @@
+diff --git a/dist/ios/common.js b/dist/ios/common.js
+--- a/dist/ios/common.js
++++ b/dist/ios/common.js
+@@ -124,3 +124,28 @@ function getMajoriOSVersion(config) {
+     return iosVersion;
+ }
+ exports.getMajoriOSVersion = getMajoriOSVersion;
++function getMajorMinoriOSVersion(config) {
++    const pbx = (0, fs_extra_1.readFileSync)((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
++    const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
++    const startIndex = pbx.indexOf(searchString);
++    if (startIndex === -1) {
++        return '';
++    }
++    const valueStart = startIndex + searchString.length;
++    const endIndex = pbx.indexOf(';', valueStart);
++    const newlineIndex = pbx.indexOf('\n', valueStart);
++    const actualEnd = endIndex !== -1 && newlineIndex !== -1
++        ? Math.min(endIndex, newlineIndex)
++        : endIndex !== -1
++            ? endIndex
++            : newlineIndex !== -1
++                ? newlineIndex
++                : pbx.length;
++    let iosVersion = pbx.substring(valueStart, actualEnd).trim();
++    if (iosVersion.endsWith('.0')) {
++        iosVersion = iosVersion.slice(0, -2);
++    }
++    return iosVersion;
++}
++exports.getMajorMinoriOSVersion = getMajorMinoriOSVersion;
+diff --git a/dist/util/spm.js b/dist/util/spm.js
+--- a/dist/util/spm.js
++++ b/dist/util/spm.js
+@@ -89,1 +89,1 @@
+-    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
++    const iosVersion = (0, common_2.getMajorMinoriOSVersion)(config);
+@@ -98,1 +98,1 @@
+-    platforms: [.iOS(.v${iosVersion})],
++    platforms: [.iOS(${iosVersion.includes('.') ? `"${iosVersion}"` : `.v${iosVersion}`})],

package/patches/catalog.json

@@ -1 +1,23 @@
-[]
+[
+  {
+    "id": "capacitor-cli-spm-ios-minor-platform",
+    "title": "Generate SPM Package.swift with the full iOS deployment target",
+    "recommended": true,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/cli",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "capacitorPlusPr": "https://github.com/Cap-go/capacitor-plus/pull/38",
+      "author": "WcaleNieWolny",
+      "mergedAt": "2025-12-16T13:50:22Z"
+    },
+    "upstream": {
+      "status": "not-merged-as-of-2026-05-12",
+      "officialRepository": "https://github.com/ionic-team/capacitor"
+    },
+    "patchFile": "patches/capacitor-cli-spm-ios-minor-platform.patch"
+  }
+]

package/scripts/capacitor-patch/diff.mjs

@@ -76,7 +76,7 @@ export function parseUnifiedDiff(diffText) {
     index += 1;
     const hunks = [];
 
-    while (index < lines.length && !lines[index].startsWith('--- ')) {
+    while (index < lines.length && !lines[index].startsWith('--- ') && !lines[index].startsWith('diff --git ')) {
       if (!lines[index].startsWith('@@ ')) {
         index += 1;
         continue;
@@ -89,7 +89,12 @@ export function parseUnifiedDiff(diffText) {
 
       index += 1;
       const hunkLines = [];
-      while (index < lines.length && !lines[index].startsWith('@@ ') && !lines[index].startsWith('--- ')) {
+      while (
+        index < lines.length &&
+        !lines[index].startsWith('@@ ') &&
+        !lines[index].startsWith('--- ') &&
+        !lines[index].startsWith('diff --git ')
+      ) {
         if (lines[index].startsWith('\\')) {
           index += 1;
           continue;
@@ -152,11 +157,12 @@ function applyHunks(content, hunks, reverse, relativePath) {
       }
     }
 
-    const start = Math.max(0, (reverse ? hunk.newStart : hunk.oldStart) - 1 + offset);
-    if (!matchesAt(lines, start, expected)) {
-      throw new PatchApplyError(`Patch hunk does not match ${relativePath} at line ${start + 1}.`, {
+    const preferredStart = Math.max(0, (reverse ? hunk.newStart : hunk.oldStart) - 1 + offset);
+    const start = resolveHunkStart(lines, preferredStart, expected, relativePath);
+    if (start === -1) {
+      throw new PatchApplyError(`Patch hunk does not match ${relativePath} at line ${preferredStart + 1}.`, {
         file: relativePath,
-        line: start + 1,
+        line: preferredStart + 1,
       });
     }
 
@@ -208,6 +214,31 @@ function matchesAt(lines, start, expected) {
   return expected.every((line, index) => lines[start + index] === line);
 }
 
+function resolveHunkStart(lines, preferredStart, expected, relativePath) {
+  if (matchesAt(lines, preferredStart, expected)) {
+    return preferredStart;
+  }
+
+  const matches = [];
+  for (let index = 0; index <= lines.length - expected.length; index += 1) {
+    if (index !== preferredStart && matchesAt(lines, index, expected)) {
+      matches.push(index);
+    }
+  }
+
+  if (matches.length === 1) {
+    return matches[0];
+  }
+
+  if (matches.length > 1) {
+    throw new PatchApplyError(`Patch hunk matches multiple locations in ${relativePath}.`, {
+      file: relativePath,
+    });
+  }
+
+  return -1;
+}
+
 function assertInsideRoot(rootDir, absolutePath) {
   const relative = path.relative(path.resolve(rootDir), absolutePath);
   if (relative.startsWith('..') || path.isAbsolute(relative)) {